diff --git a/CHANGELOG b/CHANGELOG
index 7fc5835a7..bfb5ad2b2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,44 @@
+Hubzilla 1.10
+	Wiki:
+		Lots of enhanced functionality, usability improvements, and bugfixes from v1.8
+		Turned into an optional feature (default on) but disabled in UNO
+	Sync: 
+		Items are now relocated (links patched) when syncing to clones
+	Access Tokens:
+		New feature - allows members to create access controlled guest logins and create/share 'dropbox' style links to protected resources.
+	UI:
+		Use icons instead of iconic text constructs
+		Only request geolocation permission when creating a post, not on page load
+		provide 'redeliver' option on Delivery Report page for when things really stuff up
+		CalDAV/CardDAV management pages with heaps of functionality 
+	Lib:
+		z_fetch_url() updated to accept different request methods and request bodies
+		item_store(), item_store_update() now return the stored items
+		vcard microformat changes to remain spec compliant
+		microformat meta tags added to post/comments
+		AbConfig API changed to use channel_id rather than channel_hash, which was overly complicated to use
+		SuperCurl class added to provide a framework for re-use of obscure CURL options
+		Allow absolute links to CSS/JS files on CDN
+		Add Let'sEncrypt intermediate cert to lib in case you forget to install it on the server
+		Update fullcalendar and jquery (3.1) libs
+		Update sabre/dav to 3.2.0
+		Change content export from a month/year system to begin/end
+		Use streaming I/O for delivering large photos
+		Allow multiple App description files in a single plugin directory
+		optimise a couple of troublesome/inefficient SQL queries
+		avoid sending clone sync packets to dead sites
+	Resolved Issues:
+		channel home page not providing content to clients with javascript disabled
+		Replace '@' obfuscation with html entity rather than the unicode look-alike
+		xchan_query() failing to detect duplicates, resulting in inefficient queries
+		issues with 'use existing photo' for profile photo
+		layout editor "list all layouts" returned empty
+		oembed - better detect video file URLs so they aren't loaded into memory.
+		handcrafted bbcode tables could end up with way too much whitespace due to CRLF translation 
+		refresh permissions whitescreen in 1.8
+		force immediate profile photo update on local site
+		regression: 'save bookmarks' post action missing
+
 Hubzilla 1.8
 	Administration:
 		Cleanup and resolve some edge cases with addon repository manager
diff --git a/README.md b/README.md
index 8a6c003fc..9929f6a16 100644
--- a/README.md
+++ b/README.md
@@ -47,4 +47,16 @@ Possible website applications include
 <em><a href="https://github.com/redmatrix/hubzilla/blob/master/install/INSTALL.txt">Installing Hubzilla</a></em> 
 </p>
 
+**Who Are We and What Are Our Principles?**
+
+The Hubzilla community is powered by passionate volunteers creating an open source **commons** of decentralised services which are highly integrated and can rival the feature set of centralised providers. We are open to sponsorship and donations to cover expenses and compensate for our time and energy, however the project core is basically non-profit and is not designed for the purpose of commercial gain or exploitation. 
+
+Some sites may include monetisation strategies such as subscriptions and *freemium* models where members pay for resources they consume beyond a basic level. The project community supports such monetisation initiatives (nobody should be forced to pay "out of pocket" to provide a service to others), but we maintain the **commons** to provide open and free access of the software to all. 
+
+The software is not designed for data collection of its members or providing advertising. We don't have a need or desire for these things and feel that software built around these goals is poorly designed and represents compromised principles and ethics. 
+
+As a project, we are inclusive of all beliefs and cultures and do what we are able to provide an environment that is free from hostility and harrassment. Whether or not we succeed in this endaevour requires constant vigilance and help from all members of the community, working together to build an inter-networking tool with amazing potential. 
+
+
+
 [![Build Status](https://travis-ci.org/redmatrix/hubzilla.svg)](https://travis-ci.org/redmatrix/hubzilla)
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
index f23cb14dc..c6e82b13a 100644
--- a/Zotlabs/Daemon/Cron.php
+++ b/Zotlabs/Daemon/Cron.php
@@ -41,7 +41,6 @@ class Cron {
 		require_once('include/sharedwithme.php');
 		apply_updates();
 	
-
 		// expire any expired mail
 
 		q("delete from mail where expires != '%s' and expires < %s ",
@@ -63,6 +62,15 @@ class Cron {
 		}
 
 
+		// delete expired access tokens
+
+		q("delete from atoken where atoken_expires != '%s' && atoken_expires < %s",
+			dbesc(NULL_DATE),
+			db_utcnow()
+		);
+
+
+
 		// Ensure that every channel pings a directory server once a month. This way we can discover
 		// channels and sites that quietly vanished and prevent the directory from accumulating stale
 		// or dead entries.
@@ -93,6 +101,18 @@ class Cron {
 					intval($rr['id'])
 				);
 				if($x) {
+					$z = q("select * from item where id = %d",
+						intval($message_id)
+					);
+					if($z) {
+						xchan_query($z);
+						$sync_item = fetch_post_tags($z);
+						build_sync_packet($sync_item[0]['uid'],
+							[ 
+								'item' => [ encode_item($sync_item[0],true) ]
+							]
+						);
+					}
 					Master::Summon(array('Notifier','wall-new',$rr['id']));
 				}
 			}
diff --git a/Zotlabs/Daemon/Cron_weekly.php b/Zotlabs/Daemon/Cron_weekly.php
index 1d8420947..ba4b67ff5 100644
--- a/Zotlabs/Daemon/Cron_weekly.php
+++ b/Zotlabs/Daemon/Cron_weekly.php
@@ -15,7 +15,6 @@ class Cron_weekly {
 
 		call_hooks('cron_weekly',datetime_convert());
 
-
 		z_check_cert();
 
 		require_once('include/hubloc.php');
diff --git a/Zotlabs/Daemon/CurlAuth.php b/Zotlabs/Daemon/CurlAuth.php
new file mode 100644
index 000000000..be12bc779
--- /dev/null
+++ b/Zotlabs/Daemon/CurlAuth.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Zotlabs\Daemon;
+
+// generate a curl compatible cookie file with an authenticated session for the given channel_id. 
+// If this file is then used with curl and the destination url is sent through zid() or manually 
+// manipulated to add a zid, it should allow curl to provide zot magic-auth across domains.
+
+// Handles expiration of stale cookies currently by deleting them and rewriting the file.  
+
+class CurlAuth {
+
+	static public function run($argc,$argv) {
+
+		if($argc != 2)
+			killme();
+
+		\App::$session->start();
+
+		$_SESSION['authenticated'] = 1;
+		$_SESSION['uid'] = $argv[1];
+
+		$x = session_id();
+
+		$f = 'store/[data]/cookie_' . $argv[1];
+		$c = 'store/[data]/cookien_' . $argv[1];
+
+		$e = file_exists($f);
+
+		$output = '';
+
+		if($e) {
+			$lines = file($f);
+			if($lines) {
+				foreach($lines as $line) {
+					if(strlen($line) > 0 && $line[0] != '#' && substr_count($line, "\t") == 6) {
+						$tokens = explode("\t", $line);
+						$tokens = array_map('trim', $tokens);
+						if($tokens[4] > time()) {
+							$output .= $line . "\n";
+						}
+					}
+					else
+						$output .= $line;
+				}
+			}
+		}
+		$t = time() + (24 * 3600);
+		file_put_contents($f, $output . 'HttpOnly_' . \App::get_hostname() . "\tFALSE\t/\tTRUE\t$t\tPHPSESSID\t" . $x, (($e) ? FILE_APPEND : 0));
+
+		file_put_contents($c,$x);
+
+		killme();
+	}
+}
\ No newline at end of file
diff --git a/Zotlabs/Daemon/Expire.php b/Zotlabs/Daemon/Expire.php
index 0ba83b240..215513e87 100644
--- a/Zotlabs/Daemon/Expire.php
+++ b/Zotlabs/Daemon/Expire.php
@@ -38,7 +38,7 @@ class Expire {
 
 		logger('site_expire: ' . $site_expire);
 
-		$r = q("SELECT channel_id, channel_address, channel_pageflags, channel_expire_days from channel where true");
+		$r = q("SELECT channel_id, channel_system, channel_address, channel_expire_days from channel where true");
 
 		if ($r) {
 			foreach ($r as $rr) {
diff --git a/Zotlabs/Daemon/README.md b/Zotlabs/Daemon/README.md
new file mode 100644
index 000000000..cb5b00a56
--- /dev/null
+++ b/Zotlabs/Daemon/README.md
@@ -0,0 +1,43 @@
+Daemon (background) Processes
+=============================
+
+
+This directory provides background tasks which are executed by a 
+command-line process and detached from normal web processing.
+
+Background tasks are invoked by calling
+
+
+	Zotlabs\Daemon\Master::Summon([ $cmd, $arg1, $argn... ]); 
+
+The Master class loads the desired command file and passes the arguments.
+
+
+To create a background task 'Foo' use the following template.
+
+	<?php
+	
+	namespace Zotlabs\Daemon;
+	
+	class Foo {
+	
+		static public function run($argc,$argv) {
+			// do something
+		}
+	}
+
+
+The Master class "summons" the command by creating an executable script
+from the provided arguments, then it invokes "Release" to execute the script
+detached from web processing. This process calls the static::run() function
+with any command line arguments using the traditional argc, argv format. 
+
+Please note: These are *real* $argc, $argv variables passed from the command
+line, and not the parsed argc() and argv() functions/variables which were 
+obtained from parsing path components of the request URL by web processes.
+
+Background processes do not emit displayable output except through logs. They 
+should also not make any assumptions about their HTML and web environment 
+(as they do not have a web environment), particularly with respect to global
+variables such as $_SERVER, $_REQUEST, $_GET, $_POST, $_COOKIES, and $_SESSION.
+
diff --git a/Zotlabs/Lib/AbConfig.php b/Zotlabs/Lib/AbConfig.php
index f2d6522b9..cab59abbd 100644
--- a/Zotlabs/Lib/AbConfig.php
+++ b/Zotlabs/Lib/AbConfig.php
@@ -5,18 +5,20 @@ namespace Zotlabs\Lib;
 
 class AbConfig {
 
-	static public function Load($chash,$xhash) {
-		$r = q("select * from abconfig where chan = '%s' and xchan = '%s'",
-			dbesc($chash),
+	static public function Load($chan,$xhash,$family = '') {
+		if($family)
+			$where = sprintf(" and family = '%s' ",dbesc($family));
+		$r = q("select * from abconfig where chan = %d and xchan = '%s' $where",
+			intval($chan),
 			dbesc($xhash)
 		);
 		return $r;
 	}
 
 
-	static public function Get($chash,$xhash,$family,$key) {
-		$r = q("select * from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' limit 1",
-			dbesc($chash),
+	static public function Get($chan,$xhash,$family,$key) {
+		$r = q("select * from abconfig where chan = %d and xchan = '%s' and cat = '%s' and k = '%s' limit 1",
+			intval($chan),
 			dbesc($xhash),
 			dbesc($family),
 			dbesc($key)		
@@ -28,14 +30,14 @@ class AbConfig {
 	}
 
 
-	static public function Set($chash,$xhash,$family,$key,$value) {
+	static public function Set($chan,$xhash,$family,$key,$value) {
 
 		$dbvalue = ((is_array($value))  ? serialize($value) : $value);
 		$dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue)  : $dbvalue);
 
-		if(self::Get($chash,$xhash,$family,$key) === false) {
-			$r = q("insert into abconfig ( chan, xchan, cat, k, v ) values ( '%s', '%s', '%s', '%s', '%s' ) ",
-				dbesc($chash),
+		if(self::Get($chan,$xhash,$family,$key) === false) {
+			$r = q("insert into abconfig ( chan, xchan, cat, k, v ) values ( %d, '%s', '%s', '%s', '%s' ) ",
+				intval($chan),
 				dbesc($xhash),
 				dbesc($family),
 				dbesc($key),
@@ -43,9 +45,9 @@ class AbConfig {
 			);
 		}
 		else {
-			$r = q("update abconfig set v = '%s' where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ",
+			$r = q("update abconfig set v = '%s' where chan = %d and xchan = '%s' and cat = '%s' and k = '%s' ",
 				dbesc($dbvalue),		
-				dbesc($chash),
+				dbesc($chan),
 				dbesc($xhash),
 				dbesc($family),
 				dbesc($key)
@@ -58,10 +60,10 @@ class AbConfig {
 	}
 
 
-	static public function Delete($chash,$xhash,$family,$key) {
+	static public function Delete($chan,$xhash,$family,$key) {
 
-		$r = q("delete from abconfig where chan = '%s' and xchan = '%s' and cat = '%s' and k = '%s' ",
-			dbesc($chash),
+		$r = q("delete from abconfig where chan = %d and xchan = '%s' and cat = '%s' and k = '%s' ",
+			intval($chan),
 			dbesc($xhash),
 			dbesc($family),
 			dbesc($key)
@@ -70,4 +72,4 @@ class AbConfig {
 		return $r;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 20556212a..19ed1b612 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -33,8 +33,9 @@ class Apps {
 		$files = glob('addon/*/*.apd');
 		if($files) {
 			foreach($files as $f) {
-				$n = basename($f,'.apd');
-				if(plugin_is_installed($n)) {
+				$path = explode('/',$f);
+				$plugin = $path[1];
+				if(plugin_is_installed($plugin)) {
 					$x = self::parse_app_description($f,$translate);
 					if($x) {
 						$ret[] = $x;
diff --git a/Zotlabs/Lib/Cache.php b/Zotlabs/Lib/Cache.php
new file mode 100644
index 000000000..35c8f56ad
--- /dev/null
+++ b/Zotlabs/Lib/Cache.php
@@ -0,0 +1,46 @@
+<?php /** @file */
+
+namespace Zotlabs\Lib;
+
+	/**
+	 *  cache api
+	 */
+	 
+class Cache {
+	public static function get($key) {
+		$r = q("SELECT v FROM cache WHERE k = '%s' limit 1",
+			dbesc($key)
+		);
+			
+		if ($r)
+			return $r[0]['v'];
+		return null;
+	}
+		
+	public static function set($key,$value) {
+
+		$r = q("SELECT * FROM cache WHERE k = '%s' limit 1",
+			dbesc($key)
+		);
+		if($r) {
+			q("UPDATE cache SET v = '%s', updated = '%s' WHERE k = '%s'",
+				dbesc($value),
+				dbesc(datetime_convert()),
+				dbesc($key));
+		}
+		else {
+			q("INSERT INTO cache ( k, v, updated) VALUES ('%s','%s','%s')",
+				dbesc($key),
+				dbesc($value),
+				dbesc(datetime_convert()));
+		}
+	}
+
+		
+	public static function clear() {
+		q("DELETE FROM cache WHERE updated < '%s'",
+			dbesc(datetime_convert('UTC','UTC',"now - 30 days")));			
+	}
+		
+}
+	 
diff --git a/include/PermissionDescription.php b/Zotlabs/Lib/PermissionDescription.php
similarity index 99%
rename from include/PermissionDescription.php
rename to Zotlabs/Lib/PermissionDescription.php
index 1f7799406..55aac2dea 100644
--- a/include/PermissionDescription.php
+++ b/Zotlabs/Lib/PermissionDescription.php
@@ -1,6 +1,6 @@
 <?php
 
-if(class_exists('PermissionDescription')) return;
+namespace Zotlabs\Lib;
 
 require_once("include/permissions.php");
 require_once("include/language.php");
diff --git a/Zotlabs/Lib/SuperCurl.php b/Zotlabs/Lib/SuperCurl.php
new file mode 100644
index 000000000..1c8583ff5
--- /dev/null
+++ b/Zotlabs/Lib/SuperCurl.php
@@ -0,0 +1,127 @@
+<?php
+
+namespace Zotlabs\Lib;
+
+/**
+ * @brief wrapper for z_fetch_url() which can be instantiated with several built-in parameters and 
+ * these can be modified and re-used. Useful for CalDAV and other processes which need to authenticate
+ * and set lots of CURL options (many of which stay the same from one call to the next). 
+ */
+
+
+
+
+class SuperCurl {
+
+	
+    private $auth;
+    private $url;
+
+	private $curlopt = array();
+
+	private $headers = null;
+    public $filepos = 0;
+	public $filehandle = 0;
+    public $request_data = '';
+
+	private $request_method = 'GET';
+	private $upload = false;
+	private $cookies = false;
+
+
+    private function set_data($s) {
+        $this->request_data = $s;
+        $this->filepos = 0;
+    }
+
+    public function curl_read($ch,$fh,$size) {
+
+        if($this->filepos < 0) {
+            unset($fh);
+            return '';
+        }
+
+        $s = substr($this->request_data,$this->filepos,$size);
+
+        if(strlen($s) < $size)
+            $this->filepos = (-1);
+        else
+            $this->filepos = $this->filepos + $size;
+
+        return $s;
+    }
+
+
+	public function __construct($opts = array()) {
+		$this->set($opts);
+	}
+
+	private function set($opts = array()) {
+		if($opts) {
+			foreach($opts as $k => $v) {
+				switch($k) {
+					case 'http_auth':
+						$this->auth = $v;
+						break;
+					case 'magicauth':
+						// currently experimental
+						$this->magicauth = $v;
+						\Zotlabs\Daemon\Master::Summon([ 'CurlAuth', $v ]);
+						break;
+					case 'custom':
+						$this->request_method = $v;
+						break;
+					case 'url':
+						$this->url = $v;
+						break;
+					case 'data':
+						$this->set_data($v);
+						if($v) {
+							$this->upload = true;
+						}
+						else {
+							$this->upload = false;
+						}							
+						break;
+					case 'headers':
+						$this->headers = $v;
+						break;
+					default:
+						$this->curlopts[$k] = $v;
+						break;
+				}
+			}
+		}
+	}
+
+	function exec() {
+		$opts = $this->curlopts;
+		$url = $this->url;
+		if($this->auth)
+			$opts['http_auth'] = $this->auth;
+		if($this->magicauth) {
+			$opts['cookiejar']  = 'store/[data]/cookie_' . $this->magicauth;
+			$opts['cookiefile'] = 'store/[data]/cookie_' . $this->magicauth;
+			$opts['cookie'] = 'PHPSESSID=' . trim(file_get_contents('store/[data]/cookien_' . $this->magicauth));
+			$c = channelx_by_n($this->magicauth);
+			if($c)
+				$url = zid($this->url,$c['channel_address'] . '@' . \App::get_hostname());
+		}	
+		if($this->custom)
+			$opts['custom'] = $this->custom;
+		if($this->headers)
+			$opts['headers'] = $this->headers;
+		if($this->upload) {
+			$opts['upload'] = true;
+			$opts['infile'] = $this->filehandle;
+			$opts['infilesize'] = strlen($this->request_data);
+			$opts['readfunc'] = [ $this, 'curl_read' ] ;
+		}
+
+		$recurse = 0;
+		return z_fetch_url($this->url,true,$recurse,(($opts) ? $opts : null)); 
+		
+	}
+		
+	
+}
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index f724ac95d..638afeb6b 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -248,7 +248,7 @@ class ThreadItem {
 		$has_bookmarks = false;
 		if(is_array($item['term'])) {
 			foreach($item['term'] as $t) {
-				if(!UNO && $t['type'] == TERM_BOOKMARK)
+				if(!UNO && $t['ttype'] == TERM_BOOKMARK)
 					$has_bookmarks = true;
 			}
 		}
@@ -418,7 +418,7 @@ class ThreadItem {
 			if(($nb_children > $visible_comments) || ($thread_level > 1)) {
 				$result['children'][0]['comment_firstcollapsed'] = true;
 				$result['children'][0]['num_comments'] = $comment_count_txt;
-				$result['children'][0]['hide_text'] = t('[+] show all');
+				$result['children'][0]['hide_text'] = sprintf( t('%s show all'), '<i class="fa fa-chevron-down"></i>');
 				if($thread_level > 1) {
 					$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
 				}
diff --git a/Zotlabs/Module/Achievements.php b/Zotlabs/Module/Achievements.php
index 8ddefb3e5..1529448d3 100644
--- a/Zotlabs/Module/Achievements.php
+++ b/Zotlabs/Module/Achievements.php
@@ -18,7 +18,7 @@ class Achievements extends \Zotlabs\Web\Controller {
 	
 		$profile = 0;
 		$profile = argv(1);		
-		profile_load($a,$which,$profile);
+		profile_load($which,$profile);
 	
 		$r = q("select channel_id from channel where channel_address = '%s'",
 				dbesc($which)
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 2bc4ba62d..76a001fdd 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -1,7 +1,18 @@
 <?php
 namespace Zotlabs\Module;
 
-/* ACL selector json backend */
+/*
+ * ACL selector json backend 
+ * This module provides JSON lists of connections and local/remote channels
+ * (xchans) to populate various tools such as the ACL (AccessControlList) popup
+ * and various auto-complete functions (such as email recipients, search, and 
+ * mention targets.
+ * There are two primary output structural formats. One for the ACL widget and
+ * the other for auto-completion.
+ * Many of the  behaviour variations are triggered on the use of single character keys
+ * however this functionality has grown in an ad-hoc manner and has gotten quite messy over time.    
+ */
+
 require_once("include/acl_selectors.php");
 require_once("include/group.php");
 
@@ -10,40 +21,63 @@ class Acl extends \Zotlabs\Web\Controller {
 
 	function init(){
 	
-	//	logger('mod_acl: ' . print_r($_REQUEST,true));
+		//	logger('mod_acl: ' . print_r($_REQUEST,true));
 	
-		$start = (x($_REQUEST,'start')?$_REQUEST['start']:0);
-		$count = (x($_REQUEST,'count')?$_REQUEST['count']:100);
-		$search = (x($_REQUEST,'search')?$_REQUEST['search']:"");
-		$type = (x($_REQUEST,'type')?$_REQUEST['type']:"");
-		$noforums = (x($_REQUEST,'n') ? $_REQUEST['n'] : false);	
+		$start    = (x($_REQUEST,'start')  ? $_REQUEST['start']  : 0);
+		$count    = (x($_REQUEST,'count')  ? $_REQUEST['count']  : 500);
+		$search   = (x($_REQUEST,'search') ? $_REQUEST['search'] : '');
+		$type     = (x($_REQUEST,'type')   ? $_REQUEST['type']   : '');
+		$noforums = (x($_REQUEST,'n')      ? $_REQUEST['n']      : false);	
+
+
+		// $type = 
+		//  ''   =>  standard ACL request
+		//  'g'  =>  Groups only ACL request
+		//  'c'  =>  Connections only ACL request or editor (textarea) mention request
+		// $_REQUEST['search'] contains ACL search text.
+
+
+		// $type =
+		//  'm'  =>  autocomplete private mail recipient (checks post_mail permission)
+		//  'a'  =>  autocomplete connections (mod_connections, mod_poke, mod_sources, mod_photos)
+		//  'x'  =>  nav search bar autocomplete (match any xchan)
+		// $_REQUEST['query'] contains autocomplete search text.
 	
-		// List of channels whose connections to also suggest, e.g. currently viewed channel or channels mentioned in a post
+		// List of channels whose connections to also suggest, 
+		// e.g. currently viewed channel or channels mentioned in a post
+
 		$extra_channels = (x($_REQUEST,'extra_channels') ? $_REQUEST['extra_channels'] : array());
 	
-		// For use with jquery.autocomplete for private mail completion
+		// The different autocomplete libraries use different names for the search text
+		// parameter. Internaly we'll use $search to represent the search text no matter
+		// what request variable it was attached to. 
 	
-		if(x($_REQUEST,'query') && strlen($_REQUEST['query'])) {
-			if(! $type)
-				$type = 'm';
+		if(array_key_exists('query',$_REQUEST)) {
 			$search = $_REQUEST['query'];
 		}
 	
-		if(!(local_channel()))
-			if(!($type == 'x' || $type == 'c'))
-				killme();
+		if( (! local_channel()) && (! ($type == 'x' || $type == 'c')))
+			killme();
 	
-		if ($search != "") {
+		if($search) {
 			$sql_extra = " AND `name` LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ";
 			$sql_extra2 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc($search) . ((strpos($search,'@') === false) ? "%@%'"  : "%'")) . ") ";
 	
-			// This horrible mess is needed because position also returns 0 if nothing is found. W/ould be MUCH easier if it instead returned a very large value
-			// Otherwise we could just order by LEAST(POSITION($search IN xchan_name),POSITION($search IN xchan_addr)).
-			$order_extra2 = "CASE WHEN xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) ." then POSITION('".dbesc($search)."' IN xchan_name) else position('".dbesc($search)."' IN xchan_addr) end, ";
+			// This horrible mess is needed because position also returns 0 if nothing is found. 
+			// Would be MUCH easier if it instead returned a very large value
+			// Otherwise we could just 
+			// order by LEAST(POSITION($search IN xchan_name),POSITION($search IN xchan_addr)).
+
+			$order_extra2 = "CASE WHEN xchan_name LIKE " 
+					. protect_sprintf( "'%" . dbesc($search) . "%'" ) 
+					. " then POSITION('" . dbesc($search) 
+					. "' IN xchan_name) else position('" . dbesc($search) . "' IN xchan_addr) end, ";
+
 			$col = ((strpos($search,'@') !== false) ? 'xchan_addr' : 'xchan_name' );
 			$sql_extra3 = "AND $col like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ";
 	
-		} else {
+		}
+		else {
 			$sql_extra = $sql_extra2 = $sql_extra3 = "";
 		}
 		
@@ -51,7 +85,7 @@ class Acl extends \Zotlabs\Web\Controller {
 		$groups = array();
 		$contacts = array();
 		
-		if ($type=='' || $type=='g'){
+		if($type == '' || $type == 'g') {
 	
 			$r = q("SELECT `groups`.`id`, `groups`.`hash`, `groups`.`gname`
 					FROM `groups`,`group_member` 
@@ -82,7 +116,7 @@ class Acl extends \Zotlabs\Web\Controller {
 			}
 		}
 	
-		if ($type=='' || $type=='c') {
+		if($type == '' || $type == 'c') {
 			$extra_channels_sql  = ''; 
 			// Only include channels who allow the observer to view their permissions
 			foreach($extra_channels as $channel) {
@@ -96,13 +130,40 @@ class Acl extends \Zotlabs\Web\Controller {
 			if(local_channel()) {
 				if($extra_channels_sql != '')
 					$extra_channels_sql = " OR (abook_channel IN ($extra_channels_sql)) and abook_hidden = 0 ";
+
+				$r2 = null;
+
+				$r1 = q("select * from atoken where atoken_uid = %d",
+					intval(local_channel())
+				);
+				if($r1) {
+					require_once('include/security.php');
+					$r2 = array();
+					foreach($r1 as $rr) {
+						$x = atoken_xchan($rr);
+						$r2[] = [ 
+							'id' => 'a' . $rr['atoken_id'] ,
+							'hash' => $x['xchan_hash'],
+							'name' => $x['xchan_name'],
+							'micro' => $x['xchan_photo_m'],
+							'url' => z_root(),
+							'nick' => $x['xchan_addr'],
+							'abook_their_perms' => 0,
+							'abook_flags' => 0,
+							'abook_self' => 0
+						];
+					}
+				} 
+
 	
 				$r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self 
 					FROM abook left join xchan on abook_xchan = xchan_hash 
 					WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
 					intval(local_channel())
 				);
-	
+				if($r2)
+					$r = array_merge($r2,$r);
+
 			}
 			else { // Visitors
 				$r = q("SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self
@@ -161,7 +222,7 @@ class Acl extends \Zotlabs\Web\Controller {
 		}
 		elseif($type == 'm') {
 	
-			$r = q("SELECT xchan_hash as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url 
+			$r = q("SELECT xchan_hash as hash, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url 
 				FROM abook left join xchan on abook_xchan = xchan_hash
 				WHERE abook_channel = %d and ( (abook_their_perms = null) or (abook_their_perms & %d )>0)
 				and xchan_deleted = 0
@@ -171,7 +232,7 @@ class Acl extends \Zotlabs\Web\Controller {
 				intval(PERMS_W_MAIL)
 			);
 		}
-		elseif(($type == 'a') || ($type == 'p')) {
+		elseif($type == 'a') {
 	
 			$r = q("SELECT abook_id as id, xchan_name as name, xchan_hash as hash, xchan_addr as nick, xchan_photo_s as micro, xchan_network as network, xchan_url as url, xchan_addr as attag , abook_their_perms FROM abook left join xchan on abook_xchan = xchan_hash
 				WHERE abook_channel = %d
@@ -296,7 +357,7 @@ class Acl extends \Zotlabs\Web\Controller {
 			$url = $directory['url'] . '/dirsearch';
 		}
 	
-		$count = (x($_REQUEST,'count')?$_REQUEST['count']:100);
+		$count = (x($_REQUEST,'count') ?  $_REQUEST['count'] : 100);
 		if($url) {
 			$query = $url . '?f=' ;
 			$query .= '&name=' . urlencode($search) . "&limit=$count" . (($address) ? '&address=' . urlencode($search) : '');
diff --git a/Zotlabs/Module/Block.php b/Zotlabs/Module/Block.php
index 062befdb5..e671730f6 100644
--- a/Zotlabs/Module/Block.php
+++ b/Zotlabs/Module/Block.php
@@ -12,7 +12,7 @@ class Block extends \Zotlabs\Web\Controller {
 	
 		$which = argv(1);
 		$profile = 0;
-		profile_load($a,$which,$profile);
+		profile_load($which,$profile);
 	
 		if(\App::$profile['profile_uid'])
 			head_set_icon(\App::$profile['thumb']);
@@ -52,8 +52,8 @@ class Block extends \Zotlabs\Web\Controller {
 		require_once('include/security.php');
 		$sql_options = item_permissions_sql($u[0]['channel_id']);
 	
-		$r = q("select item.* from item left join item_id on item.id = item_id.iid
-			where item.uid = %d and sid = '%s' and service = 'BUILDBLOCK' and 
+		$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
+			where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and iconfig.k = 'BUILDBLOCK' and 
 			item_type = %d $sql_options $revision limit 1",
 			intval($u[0]['channel_id']),
 			dbesc($page_id),
@@ -64,8 +64,8 @@ class Block extends \Zotlabs\Web\Controller {
 	
 			// Check again with no permissions clause to see if it is a permissions issue
 	
-			$x = q("select item.* from item left join item_id on item.id = item_id.iid
-			where item.uid = %d and sid = '%s' and service = 'BUILDBLOCK' and 
+			$x = q("select item.* from item left join iconfig on item.id = iconfig.iid
+			where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and iconfig.k = 'BUILDBLOCK' and 
 			item_type = %d $revision limit 1",
 				intval($u[0]['channel_id']),
 				dbesc($page_id),
diff --git a/Zotlabs/Module/Blocks.php b/Zotlabs/Module/Blocks.php
index 32650a090..e6a97794d 100644
--- a/Zotlabs/Module/Blocks.php
+++ b/Zotlabs/Module/Blocks.php
@@ -22,12 +22,12 @@ class Blocks extends \Zotlabs\Web\Controller {
 		else
 			return;
 	
-		profile_load($a,$which);
+		profile_load($which);
 	
 	}
 	
 	
-		function get() {
+	function get() {
 	
 		if(! \App::$profile) {
 			notice( t('Requested profile is not available.') . EOL );
@@ -111,8 +111,11 @@ class Blocks extends \Zotlabs\Web\Controller {
 	
 		$editor = status_editor($a,$x);
 	
-		$r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id
-			where item_id.uid = %d and service = 'BUILDBLOCK' and item_type = %d order by item.created desc",
+
+		$r = q("select iconfig.iid, iconfig.k, iconfig.v, mid, title, body, mimetype, created, edited from iconfig 
+			left join item on iconfig.iid = item.id
+			where uid = %d and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' 
+			and item_type = %d order by item.created desc",
 			intval($owner),
 			intval(ITEM_TYPE_BLOCK)
 		);
@@ -129,12 +132,12 @@ class Blocks extends \Zotlabs\Web\Controller {
 					'created'   => $rr['created'],
 					'edited'    => $rr['edited'],
 					'mimetype'  => $rr['mimetype'],
-					'pagetitle' => $rr['sid'],
+					'pagetitle' => $rr['v'],
 					'mid'       => $rr['mid']
 				);
 				$pages[$rr['iid']][] = array(
 					'url' => $rr['iid'],
-					'name' => $rr['sid'],
+					'name' => $rr['v'],
 					'title' => $rr['title'],
 					'created' => $rr['created'],
 					'edited' => $rr['edited'],
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php
index 1da42684d..fd4169e68 100644
--- a/Zotlabs/Module/Cal.php
+++ b/Zotlabs/Module/Cal.php
@@ -20,7 +20,7 @@ class Cal extends \Zotlabs\Web\Controller {
 		if(argc() > 1) {
 			$nick = argv(1);
 	
-			profile_load($a,$nick);
+			profile_load($nick);
 	
 			$channelx = channelx_by_nick($nick);
 	
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 29bfcbc3c..c74802ec5 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -9,7 +9,6 @@ require_once('include/security.php');
 require_once('include/conversation.php');
 require_once('include/acl_selectors.php');
 require_once('include/permissions.php');
-require_once('include/PermissionDescription.php');
 
 class Channel extends \Zotlabs\Web\Controller {
 
@@ -48,7 +47,7 @@ class Channel extends \Zotlabs\Web\Controller {
 		// Run profile_load() here to make sure the theme is set before
 		// we start loading content
 
-		profile_load($a,$which,$profile);
+		profile_load($which,$profile);
 
 	}
 
@@ -133,7 +132,7 @@ class Channel extends \Zotlabs\Web\Controller {
 					'default_location' => (($is_owner) ? \App::$profile['channel_location'] : ''),
 					'nickname' => \App::$profile['channel_address'],
 					'lockstate' => (((strlen(\App::$profile['channel_allow_cid'])) || (strlen(\App::$profile['channel_allow_gid'])) || (strlen(\App::$profile['channel_deny_cid'])) || (strlen(\App::$profile['channel_deny_gid']))) ? 'lock' : 'unlock'),
-					'acl' => (($is_owner) ? populate_acl($channel_acl,true, \PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
+					'acl' => (($is_owner) ? populate_acl($channel_acl,true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post') : ''),
 					'showacl' => (($is_owner) ? 'yes' : ''),
 					'bang' => '',
 					'visitor' => (($is_owner || $observer) ? true : false),
diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php
index 026e8369a..ff55a9319 100644
--- a/Zotlabs/Module/Chat.php
+++ b/Zotlabs/Module/Chat.php
@@ -39,7 +39,7 @@ class Chat extends \Zotlabs\Web\Controller {
 		// Run profile_load() here to make sure the theme is set before
 		// we start loading content
 	
-		profile_load($a,$which,$profile);
+		profile_load($which,$profile);
 	
 	}
 	
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php
index b691475ce..68d84e070 100644
--- a/Zotlabs/Module/Cloud.php
+++ b/Zotlabs/Module/Cloud.php
@@ -13,6 +13,9 @@ use \Zotlabs\Storage;
 // composer autoloader for SabreDAV
 require_once('vendor/autoload.php');
 
+require_once('include/attach.php');
+
+
 /**
  * @brief Fires up the SabreDAV server.
  *
@@ -23,7 +26,6 @@ require_once('vendor/autoload.php');
 class Cloud extends \Zotlabs\Web\Controller {
 
 	function init() {
-		require_once('include/reddav.php');
 	
 		if (! is_dir('store'))
 			os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false);
@@ -37,7 +39,7 @@ class Cloud extends \Zotlabs\Web\Controller {
 		\App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . z_root() . '/feed/' . $which . '" />' . "\r\n";
 	
 		if ($which)
-			profile_load($a, $which, $profile);
+			profile_load( $which, $profile);
 	
 		$auth = new \Zotlabs\Storage\BasicAuth();
 	
@@ -79,17 +81,6 @@ class Cloud extends \Zotlabs\Web\Controller {
 	
 		$is_readable = false;
 	
-		if($_SERVER['REQUEST_METHOD'] === 'GET') {
-			try { 
-				$x = RedFileData('/' . \App::$cmd, $auth);
-			}
-			catch(\Exception $e) {
-				if($e instanceof Sabre\DAV\Exception\Forbidden) {
-					http_status_exit(401, 'Permission denied.');
-				}
-			}
-		}
-	
 		// provide a directory view for the cloud in Hubzilla
 		$browser = new \Zotlabs\Storage\Browser($auth);
 		$auth->setBrowserPlugin($browser);
diff --git a/Zotlabs/Module/Common.php b/Zotlabs/Module/Common.php
index 1c428d256..2f3c57267 100644
--- a/Zotlabs/Module/Common.php
+++ b/Zotlabs/Module/Common.php
@@ -21,7 +21,7 @@ class Common extends \Zotlabs\Web\Controller {
 		);
 	
 		if($x)
-			profile_load($a,$x[0]['channel_address'],0);
+			profile_load($x[0]['channel_address'],0);
 	
 	}
 	
diff --git a/Zotlabs/Module/Connect.php b/Zotlabs/Module/Connect.php
index f68e0baac..962c05cce 100644
--- a/Zotlabs/Module/Connect.php
+++ b/Zotlabs/Module/Connect.php
@@ -26,7 +26,7 @@ class Connect extends \Zotlabs\Web\Controller {
 		if($r)
 			\App::$data['channel'] = $r[0];
 	
-		profile_load($a,$which,'');
+		profile_load($which,'');
 	}
 	
 		function post() {
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 4f700e2e7..7db4950b1 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -16,14 +16,14 @@ require_once('include/zot.php');
 require_once('include/widgets.php');
 require_once('include/photos.php');
 
-/* @brief Initialize the connection-editor
- *
- *
- */
-
 
 class Connedit extends \Zotlabs\Web\Controller {
 
+	/* @brief Initialize the connection-editor
+	 *
+	 *
+	 */
+
 	function init() {
 	
 		if(! local_channel())
@@ -51,7 +51,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 	 *
 	 */
 	
-		function post() {
+	function post() {
 	
 		if(! local_channel())
 			return;
@@ -219,7 +219,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 			//Update profile photo permissions
 	
 			logger('A new profile was assigned - updating profile photos');
-			profile_photo_set_profile_perms($profile_id);
+			profile_photo_set_profile_perms(local_channel(),$profile_id);
 	
 		}
 	
@@ -345,7 +345,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 			unset($clone['abook_account']);
 			unset($clone['abook_channel']);
 	
-			$abconfig = load_abconfig($channel['channel_hash'],$clone['abook_xchan']);
+			$abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']);
 			if($abconfig)
 				$clone['abconfig'] = $abconfig;
 	
@@ -357,7 +357,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 	 *
 	 */
 	
-		function get() {
+	function get() {
 	
 		$sort_type = 0;
 		$o = '';
@@ -418,7 +418,13 @@ class Connedit extends \Zotlabs\Web\Controller {
 				goaway(z_root() . '/connedit/' . $contact_id);
 	
 			}
-	
+			if($cmd === 'resetphoto') {
+				q("update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s' limit 1",
+					dbesc($orig_record[0]['xchan_hash'])
+				);
+				$cmd = 'refresh';
+			}	
+
 			if($cmd === 'refresh') {
 				if($orig_record[0]['xchan_network'] === 'zot') {
 					if(! zot_refresh($orig_record[0],\App::get_channel()))
diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php
index a72c3389f..886958b37 100644
--- a/Zotlabs/Module/Cover_photo.php
+++ b/Zotlabs/Module/Cover_photo.php
@@ -29,7 +29,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 		}
 	
 		$channel = \App::get_channel();
-		profile_load($a,$channel['channel_address']);
+		profile_load($channel['channel_address']);
 	
 	}
 	
@@ -40,7 +40,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 	 *
 	 */
 	
-		function post() {
+	function post() {
 	
 		if(! local_channel()) {
 			return;
@@ -50,7 +50,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 		
 		check_form_security_token_redirectOnErr('/cover_photo', 'cover_photo');
 	        
-		if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) {
+		if((array_key_exists('cropfinal',$_POST)) && ($_POST['cropfinal'] == 1)) {
 	
 			// phase 2 - we have finished cropping
 	
@@ -271,7 +271,7 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 	 */
 	
 	
-		function get() {
+	function get() {
 	
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL );
diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php
index 2fddabe19..aaf69844c 100644
--- a/Zotlabs/Module/Dav.php
+++ b/Zotlabs/Module/Dav.php
@@ -14,6 +14,7 @@ use \Zotlabs\Storage;
 // composer autoloader for SabreDAV
 require_once('vendor/autoload.php');
 
+require_once('include/attach.php');
 
 /**
  * @brief Fires up the SabreDAV server.
@@ -44,60 +45,16 @@ class Dav extends \Zotlabs\Web\Controller {
 			}
 		}
 
-		require_once('include/reddav.php');
-	
 		if (! is_dir('store'))
 			os_mkdir('store', STORAGE_DEFAULT_PERMISSIONS, false);
 	
-		$which = null;
 		if (argc() > 1)
-			$which = argv(1);
+			profile_load(argv(1),0);
 	
-		$profile = 0;
-	
-		\App::$page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . z_root() . '/feed/' . $which . '" />' . "\r\n";
-	
-		if ($which)
-			profile_load($a, $which, $profile);
-	
-
-
 
 		$auth = new \Zotlabs\Storage\BasicAuth();
-		$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . 'WebDAV');
+		$auth->setRealm(ucfirst(\Zotlabs\Lib\System::get_platform_name()) . ' ' . 'WebDAV');
 
-//		$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function($userName,$password) {
-//			if(account_verify_password($userName,$password))
-//				return true;
-//			return false;
-//		});
-
-//		$ob_hash = get_observer_hash();
-	
-//		if ($ob_hash) {
-//			if (local_channel()) {
-//				$channel = \App::get_channel();
-//				$auth->setCurrentUser($channel['channel_address']);
-//				$auth->channel_id = $channel['channel_id'];
-//				$auth->channel_hash = $channel['channel_hash'];
-//				$auth->channel_account_id = $channel['channel_account_id'];
-//				if($channel['channel_timezone'])
-//					$auth->setTimezone($channel['channel_timezone']);
-//			}
-//			$auth->observer = $ob_hash;
-//		}
-	
-//		if ($_GET['davguest'])
-//			$_SESSION['davguest'] = true;
-	
-//		$_SERVER['QUERY_STRING'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['QUERY_STRING']);
-//		$_SERVER['QUERY_STRING'] = strip_zids($_SERVER['QUERY_STRING']);
-//		$_SERVER['QUERY_STRING'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism', '', $_SERVER['QUERY_STRING']);
-//	
-//		$_SERVER['REQUEST_URI'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['REQUEST_URI']);
-//		$_SERVER['REQUEST_URI'] = strip_zids($_SERVER['REQUEST_URI']);
-//		$_SERVER['REQUEST_URI'] = preg_replace('/[\?&]davguest=(.*?)([\?&]|$)/ism', '', $_SERVER['REQUEST_URI']);
-	
 		$rootDirectory = new \Zotlabs\Storage\Directory('/', $auth);
 	
 		// A SabreDAV server-object
@@ -114,48 +71,13 @@ class Dav extends \Zotlabs\Web\Controller {
 	
 		$server->addPlugin($lockPlugin);
 	
-		// The next section of code allows us to bypass prompting for http-auth if a
-		// FILE is being accessed anonymously and permissions allow this. This way
-		// one can create hotlinks to public media files in their cloud and anonymous
-		// viewers won't get asked to login.
-		// If a DIRECTORY is accessed or there are permission issues accessing the
-		// file and we aren't previously authenticated via zot, prompt for HTTP-auth.
-		// This will be the default case for mounting a DAV directory. 
-		// In order to avoid prompting for passwords for viewing a DIRECTORY, add
-		// the URL query parameter 'davguest=1'.
-	
-//		$isapublic_file = false;
-//		$davguest = ((x($_SESSION, 'davguest')) ? true : false);
-	
-//		if ((! $auth->observer) && ($_SERVER['REQUEST_METHOD'] === 'GET')) {
-//			try { 
-//				$x = RedFileData('/' . \App::$cmd, $auth);
-//				if($x instanceof \Zotlabs\Storage\File)
-//					$isapublic_file = true;
-//			}
-//			catch (Exception $e) {
-//				$isapublic_file = false;
-//			}
-//		}
-	
-//		if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) {
-//			try {
-//				$auth->Authenticate($server, t('$Projectname channel'));
-//			}
-//			catch (Exception $e) {
-//				logger('mod_cloud: auth exception' . $e->getMessage());
-//				http_status_exit($e->getHTTPCode(), $e->getMessage());
-//			}
-//		}
-	
-	//	require_once('Zotlabs/Storage/Browser.php');
 		// provide a directory view for the cloud in Hubzilla
 		$browser = new \Zotlabs\Storage\Browser($auth);
 		$auth->setBrowserPlugin($browser);
 	
 		// Experimental QuotaPlugin
-	//	require_once('Zotlabs/Storage/QuotaPlugin.php');
-	//	$server->addPlugin(new \Zotlabs\Storage\QuotaPlugin($auth));
+		// require_once('Zotlabs/Storage/QuotaPlugin.php');
+		// $server->addPlugin(new \Zotlabs\Storage\QuotaPlugin($auth));
 	
 		// All we need to do now, is to fire up the server
 		$server->exec();
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index c1a0d84bc..d1d4edc7d 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -106,12 +106,13 @@ class Display extends \Zotlabs\Web\Controller {
 			$x = q("select * from channel where channel_id = %d limit 1",
 				intval($target_item['uid'])
 			);
-			$y = q("select * from item_id where uid = %d and service = 'WEBPAGE' and iid = %d limit 1",
+			$y = q("select * from iconfig left join item on iconfig.iid = item.id 
+				where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item.id = %d limit 1",
 				intval($target_item['uid']),
 				intval($target_item['id'])
 			);
 			if($x && $y) {
-				goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['sid']);
+				goaway(z_root() . '/page/' . $x[0]['channel_address'] . '/' . $y[0]['v']);
 			}
 			else {
 				notice( t('Page not found.') . EOL);
diff --git a/Zotlabs/Module/Dreport.php b/Zotlabs/Module/Dreport.php
index e8709c952..d2933b464 100644
--- a/Zotlabs/Module/Dreport.php
+++ b/Zotlabs/Module/Dreport.php
@@ -16,7 +16,24 @@ class Dreport extends \Zotlabs\Web\Controller {
 		$channel = \App::get_channel();
 		
 		$mid = ((argc() > 1) ? argv(1) : '');
-	
+
+		if($mid === 'push') {
+			$table = 'push';
+			$mid = ((argc() > 2) ? argv(2) : '');
+			if($mid) {	
+				$i = q("select id from item where mid = '%s' and author_xchan = '%s' and uid = %d",
+					dbesc($mid),
+					dbesc($channel['channel_hash']),
+					intval($channel['channel_id'])
+				);
+				if($i) {
+					\Zotlabs\Daemon\Master::Summon([ 'Notifier', 'edit_post', $i[0]['id'] ]);
+				}
+			}
+			sleep(3);
+			goaway(z_root() . '/dreport/' . urlencode($mid));
+		}
+
 		if($mid === 'mail') {
 			$table = 'mail';
 			$mid = ((argc() > 2) ? argv(2) : '');
@@ -59,11 +76,7 @@ class Dreport extends \Zotlabs\Web\Controller {
 			notice( t('no results') . EOL);
 			return;
 		}
-	
-		$o .= '<div class="generic-content-wrapper-styled">';
-		$o .= '<h2>' . sprintf( t('Delivery report for %1$s'),substr($mid,0,32)) . '...' . '</h2>';
-		$o .= '<table>';
-	
+		
 		for($x = 0; $x < count($r); $x++ ) {
 			$r[$x]['name'] = escape_tags(substr($r[$x]['dreport_recip'],strpos($r[$x]['dreport_recip'],' ')));
 	
@@ -119,13 +132,25 @@ class Dreport extends \Zotlabs\Web\Controller {
 		}
 	
 		usort($r,'self::dreport_gravity_sort');
-			
-	
+
+		$entries = array();
 		foreach($r as $rr) {
-			$o .= '<tr><td width="40%">' . $rr['name'] . '</td><td width="20%">' . escape_tags($rr['dreport_result']) . '</td><td width="20%">' . escape_tags($rr['dreport_time']) . '</td></tr>';
+			$entries[] = [ 
+				'name' => $rr['name'],					
+				'result' => escape_tags($rr['dreport_result']),
+				'time' => escape_tags(datetime_convert('UTC',date_default_timezone_get(),$rr['dreport_time']))
+			];
 		}
-		$o .= '</table>';
-		$o .= '</div>';
+
+		$o = replace_macros(get_markup_template('dreport.tpl'), array(
+			'$title' => sprintf( t('Delivery report for %1$s'),substr($mid,0,32)) . '...',
+			'$table' => $table,
+			'$mid' => urlencode($mid),
+			'$options' => t('Options'),
+			'$push' => t('Redeliver'),
+			'$entries' => $entries
+		));
+	
 	
 		return $o;
 	
diff --git a/Zotlabs/Module/Editblock.php b/Zotlabs/Module/Editblock.php
index fb86557f2..6a9fa5f2d 100644
--- a/Zotlabs/Module/Editblock.php
+++ b/Zotlabs/Module/Editblock.php
@@ -21,7 +21,7 @@ class Editblock extends \Zotlabs\Web\Controller {
 		else
 			return;
 
-		profile_load($a,$which);
+		profile_load($which);
 
 	}
 
@@ -85,11 +85,11 @@ class Editblock extends \Zotlabs\Web\Controller {
 			intval($owner)
 		);
 		if($itm) {
-			$item_id = q("select * from item_id where service = 'BUILDBLOCK' and iid = %d limit 1",
+			$item_id = q("select * from iconfig where cat = 'system' and k = 'BUILDBLOCK' and iid = %d limit 1",
 				intval($itm[0]['id'])
 			);
 			if($item_id)
-				$block_title = $item_id[0]['sid'];
+				$block_title = $item_id[0]['v'];
 		}
 		else {
 			notice( t('Item not found') . EOL);
diff --git a/Zotlabs/Module/Editlayout.php b/Zotlabs/Module/Editlayout.php
index 5028882d2..26732dc77 100644
--- a/Zotlabs/Module/Editlayout.php
+++ b/Zotlabs/Module/Editlayout.php
@@ -21,7 +21,7 @@ class Editlayout extends \Zotlabs\Web\Controller {
 		else
 			return;
 
-		profile_load($a,$which);
+		profile_load($which);
 
 	}
 
@@ -96,11 +96,12 @@ class Editlayout extends \Zotlabs\Web\Controller {
 			intval($owner)
 		);
 
-		$item_id = q("select * from item_id where service = 'PDL' and iid = %d limit 1",
+		$item_id = q("select * from iconfig where cat = 'system' and k = 'PDL' and iid = %d limit 1",
 			intval($itm[0]['id'])
 		);
 		if($item_id)
-			$layout_title = $item_id[0]['sid'];
+			$layout_title = $item_id[0]['v'];
+
 
 		$rp = 'layouts/' . $which;
 
diff --git a/Zotlabs/Module/Editwebpage.php b/Zotlabs/Module/Editwebpage.php
index 1b5c320a0..be4803a07 100644
--- a/Zotlabs/Module/Editwebpage.php
+++ b/Zotlabs/Module/Editwebpage.php
@@ -4,7 +4,6 @@ namespace Zotlabs\Module;
 require_once('include/channel.php');
 require_once('include/acl_selectors.php');
 require_once('include/conversation.php');
-require_once('include/PermissionDescription.php');
 
 
 class Editwebpage extends \Zotlabs\Web\Controller {
@@ -23,7 +22,7 @@ class Editwebpage extends \Zotlabs\Web\Controller {
 		else
 			return;
 
-		profile_load($a,$which);
+		profile_load($which);
 
 	}
 
@@ -114,11 +113,11 @@ class Editwebpage extends \Zotlabs\Web\Controller {
 				$itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key);
 		}
 
-		$item_id = q("select * from item_id where service = 'WEBPAGE' and iid = %d limit 1",
+		$item_id = q("select * from iconfig where cat = 'system' and k = 'WEBPAGE' and iid = %d limit 1",
 			intval($itm[0]['id'])
 		);
 		if($item_id)
-			$page_title = $item_id[0]['sid'];
+			$page_title = $item_id[0]['v'];
 
 		$mimetype = $itm[0]['mimetype'];
 
@@ -151,7 +150,7 @@ class Editwebpage extends \Zotlabs\Web\Controller {
 			'body' => undo_post_tagging($itm[0]['body']),
 			'post_id' => $post_id,
 			'visitor' => ($is_owner) ? true : false,
-			'acl' => populate_acl($itm[0],false,\PermissionDescription::fromGlobalPermission('view_pages')),
+			'acl' => populate_acl($itm[0],false,\Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')),
 			'showacl' => ($is_owner) ? true : false,
 			'mimetype' => $mimetype,
 			'mimeselect' => true,
diff --git a/Zotlabs/Module/Embedphotos.php b/Zotlabs/Module/Embedphotos.php
new file mode 100644
index 000000000..0dac873c5
--- /dev/null
+++ b/Zotlabs/Module/Embedphotos.php
@@ -0,0 +1,180 @@
+<?php
+namespace Zotlabs\Module;
+
+/**
+ *
+ * This is the POST destination for the embedphotos button
+ *
+ */  
+
+
+class Embedphotos extends \Zotlabs\Web\Controller {
+
+	function get() {
+		
+	}
+
+	function post() {
+		
+    if (argc() > 1 && argv(1) === 'album') {
+        // API: /embedphotos/album
+        $name = (x($_POST,'name') ? $_POST['name'] : null );
+        if (!$name) {
+            json_return_and_die(array('errormsg' => 'Error retrieving album', 'status' => false));
+        }
+        $album = $this->embedphotos_widget_album(array('channel' => \App::get_channel(), 'album' => $name));
+        json_return_and_die(array('status' => true, 'content' => $album));
+
+    }
+    if (argc() > 1 && argv(1) === 'albumlist') {
+        // API: /embedphotos/albumlist
+        $album_list = $this->embedphotos_album_list($a);
+        json_return_and_die(array('status' => true, 'albumlist' => $album_list));
+
+    }
+    if (argc() > 1 && argv(1) === 'photolink') {
+        // API: /embedphotos/photolink
+        $href = (x($_POST,'href') ? $_POST['href'] : null );
+        if (!$href) {
+            json_return_and_die(array('errormsg' => 'Error retrieving link ' . $href, 'status' => false));
+        }
+        $resource_id = array_pop(explode("/", $href));
+        $r = q("SELECT obj from item where resource_type = 'photo' and resource_id = '%s' limit 1",
+			dbesc($resource_id)
+		);
+        if(!$r) {
+            json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false));
+        }
+        $obj = json_decode($r[0]['obj'], true);
+        if(x($obj,'body')) {
+            $photolink = $obj['body'];
+        } elseif (x($obj,'bbcode')) {
+            $photolink = $obj['bbcode'];
+        } else {
+            json_return_and_die(array('errormsg' => 'Error retrieving resource ' . $resource_id, 'status' => false));
+        }
+        json_return_and_die(array('status' => true, 'photolink' => $photolink));
+
+    }
+	}
+	
+	
+/**
+ * Copied from include/widgets.php::widget_album() with a modification to get the profile_uid from
+ * the input array as in widget_item()
+ * @param type $name
+ * @return string
+ */
+function embedphotos_widget_album($args) {
+
+    $channel_id = 0;
+    if(array_key_exists('channel',$args))
+            $channel = $args['channel'];
+            $channel_id = intval($channel['channel_id']);
+    if(! $channel_id)
+            $channel_id = \App::$profile_uid;
+    if(! $channel_id)
+            return '';
+		$owner_uid = $channel_id;
+    require_once('include/security.php');
+    $sql_extra = permissions_sql($channel_id);
+
+    if(! perm_is_allowed($channel_id,get_observer_hash(),'view_storage'))
+            return '';
+
+    if($args['album'])
+            $album = $args['album'];
+    if($args['title'])
+            $title = $args['title'];
+
+		/** 
+		 * This may return incorrect permissions if you have multiple directories of the same name.
+		 * It is a limitation of the photo table using a name for a photo album instead of a folder hash
+		 */
+
+		if($album) {
+			$x = q("select hash from attach where filename = '%s' and uid = %d limit 1",
+				dbesc($album),
+				intval($owner_uid)
+			);
+			if($x) {
+				$y = attach_can_view_folder($owner_uid,get_observer_hash(),$x[0]['hash']);
+				if(! $y)
+					return '';
+			}
+		}
+
+		$order = 'DESC';
+
+		$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
+				(SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) $sql_extra GROUP BY resource_id) ph 
+				ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
+			ORDER BY created $order",
+			intval($owner_uid),
+			dbesc($album),
+			intval(PHOTO_NORMAL),
+			intval(PHOTO_PROFILE)
+		);
+
+		$photos = array();
+			if(count($r)) {
+				$twist = 'rotright';
+				foreach($r as $rr) {
+	
+					if($twist == 'rotright')
+						$twist = 'rotleft';
+					else
+						$twist = 'rotright';
+					
+					$ext = $phototypes[$rr['mimetype']];
+	
+					$imgalt_e = $rr['filename'];
+					$desc_e = $rr['description'];
+	
+					$imagelink = (z_root() . '/photos/' . \App::$data['channel']['channel_address'] . '/image/' . $rr['resource_id']
+					. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''));
+	
+					$photos[] = array(
+						'id' => $rr['id'],
+						'twist' => ' ' . $twist . rand(2,4),
+						'link' => $imagelink,
+						'title' => t('View Photo'),
+						'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext,
+						'alt' => $imgalt_e,
+						'desc'=> $desc_e,
+						'ext' => $ext,
+						'hash'=> $rr['resource_id'],
+						'unknown' => t('Unknown')
+					);
+				}
+			}
+
+		$tpl = get_markup_template('photo_album.tpl');
+		$o .= replace_macros($tpl, array(
+			'$photos' => $photos,
+			'$album' => (($title) ? $title : $album),
+			'$album_id' => rand(),
+			'$album_edit' => array(t('Edit Album'), $album_edit),
+			'$can_post' => false,
+			'$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
+			'$order' => false,
+			'$upload_form' => $upload_form,
+			'$no_fullscreen_btn' => true
+		));
+
+		return $o;
+}
+
+
+function embedphotos_album_list($a) {
+    $o = '';
+    require_once('include/photos.php');
+    $p = photos_albums_list(\App::get_channel(), \App::get_observer());
+    if ($p['success']) {
+        return $p['albums'];
+    } else {
+        return null;
+    }
+}
+
+}
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index 3f3f9fb4c..def5c437b 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -6,7 +6,6 @@ require_once('include/bbcode.php');
 require_once('include/datetime.php');
 require_once('include/event.php');
 require_once('include/items.php');
-require_once('include/PermissionDescription.php');
 
 
 class Events extends \Zotlabs\Web\Controller {
@@ -471,7 +470,7 @@ class Events extends \Zotlabs\Web\Controller {
 				'$permissions' => t('Permission settings'),
 				// populating the acl dialog was a permission description from view_stream because Cal.php, which
 				// displays events, says "since we don't currently have an event permission - use the stream permission"
-				'$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \PermissionDescription::fromGlobalPermission('view_stream'))),
+				'$acl' => (($orig_event['event_xchan']) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $perm_defaults), false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'))),
 				'$submit' => t('Submit'),
 				'$advanced' => t('Advanced Options')
 	
@@ -668,8 +667,10 @@ class Events extends \Zotlabs\Web\Controller {
 				'$export'	=> array(z_root()."/events/$y/$m/export",t('Export'),'',''),
 				'$calendar'	=> cal($y,$m,$links, ' eventcal'),
 				'$events'	=> $events,
-				'$upload'	=> t('Import'),
-				'$submit'	=> t('Submit'),
+				'$view_label'   => t('View'),
+				'$month'        => t('Month'),
+				'$week'         => t('Week'),
+				'$day'          => t('Day'),
 				'$prev'		=> t('Previous'),
 				'$next'		=> t('Next'),
 				'$today'	=> t('Today'),
diff --git a/Zotlabs/Module/Filestorage.php b/Zotlabs/Module/Filestorage.php
index 2861f31be..c3ef22e32 100644
--- a/Zotlabs/Module/Filestorage.php
+++ b/Zotlabs/Module/Filestorage.php
@@ -6,7 +6,6 @@ namespace Zotlabs\Module;
  */
 
 require_once('include/attach.php');
-require_once('include/PermissionDescription.php');
 
 
 /**
@@ -134,7 +133,7 @@ class Filestorage extends \Zotlabs\Web\Controller {
 			$cloudpath = get_cloudpath($f) . (intval($f['is_dir']) ? '?f=&davguest=1' : '');
 			$parentpath = get_parent_cloudpath($channel['channel_id'], $channel['channel_address'], $f['hash']);
 	
-			$aclselect_e = populate_acl($f, false, \PermissionDescription::fromGlobalPermission('view_storage'));
+			$aclselect_e = populate_acl($f, false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage'));
 			$is_a_dir = (intval($f['is_dir']) ? true : false);
 	
 			$lockstate = (($f['allow_cid'] || $f['allow_gid'] || $f['deny_cid'] || $f['deny_gid']) ? 'lock' : 'unlock'); 
diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php
index 1df382a89..3641330c9 100644
--- a/Zotlabs/Module/Follow.php
+++ b/Zotlabs/Module/Follow.php
@@ -43,7 +43,7 @@ class Follow extends \Zotlabs\Web\Controller {
 		unset($clone['abook_account']);
 		unset($clone['abook_channel']);
 	
-		$abconfig = load_abconfig($channel['channel_hash'],$clone['abook_xchan']);
+		$abconfig = load_abconfig($channel['channel_id'],$clone['abook_xchan']);
 		if($abconfig)
 			$clone['abconfig'] = $abconfig;
 	
diff --git a/Zotlabs/Module/Hcard.php b/Zotlabs/Module/Hcard.php
index 2636e676b..93c8d3ece 100644
--- a/Zotlabs/Module/Hcard.php
+++ b/Zotlabs/Module/Hcard.php
@@ -40,7 +40,7 @@ class Hcard extends \Zotlabs\Web\Controller {
 	        }
 	    }
 	
-		profile_load($a,$which,$profile);
+		profile_load($which,$profile);
 	
 	
 	}
diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php
index f3ba96fdd..79449c3b2 100644
--- a/Zotlabs/Module/Home.php
+++ b/Zotlabs/Module/Home.php
@@ -28,6 +28,19 @@ class Home extends \Zotlabs\Web\Controller {
 	
 			goaway($dest);
 		}
+
+		if(remote_channel() && (! $splash) && $_SESSION['atoken']) {
+			$r = q("select * from atoken where atoken_id = %d",
+				intval($_SESSION['atoken'])
+			);
+			if($r) {
+				$x = channelx_by_n($r[0]['atoken_uid']);
+				if($x) {
+					goaway(z_root() . '/channel/' . $x['channel_address']);
+				}
+			}
+		} 
+
 	
 		if(get_account_id() && ! $splash) {
 			goaway(z_root() . '/new_channel');
diff --git a/Zotlabs/Module/Id.php b/Zotlabs/Module/Id.php
index 6a94b57f5..e053bf99c 100644
--- a/Zotlabs/Module/Id.php
+++ b/Zotlabs/Module/Id.php
@@ -57,7 +57,7 @@ class Id extends \Zotlabs\Web\Controller {
 	
 		$profile = '';
 		$channel = \App::get_channel();
-		profile_load($a,$which,$profile);
+		profile_load($which,$profile);
 	
 		$op = new MysqlProvider;
 		$op->server();
diff --git a/Zotlabs/Module/Impel.php b/Zotlabs/Module/Impel.php
index e326f7818..735c311d0 100644
--- a/Zotlabs/Module/Impel.php
+++ b/Zotlabs/Module/Impel.php
@@ -137,9 +137,7 @@ class Impel extends \Zotlabs\Web\Controller {
 				require_once('library/urlify/URLify.php');
 				$pagetitle = strtolower(\URLify::transliterate($j['pagetitle']));
 			}
-	
-	
-	
+		
 			// Verify ability to use html or php!!!
 	
 		    $execflag = false;
@@ -154,21 +152,14 @@ class Impel extends \Zotlabs\Web\Controller {
 				}
 			}
 	
-			$remote_id = 0;
-	
-			$z = q("select * from item_id where sid = '%s' and service = '%s' and uid = %d limit 1",
-				dbesc($pagetitle),
-				dbesc($namespace),
-				intval(local_channel())
-			);
-	
 			$i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1",
 				dbesc($arr['mid']),
 				intval(local_channel())
 			);
+
+			\Zotlabs\Lib\IConfig::Set($arr,'system',$namespace,(($pagetitle) ? $pagetitle : substr($arr['mid'],0,16)),true);
 	
-			if($z && $i) {
-				$remote_id = $z[0]['id'];
+			if($i) {
 				$arr['id'] = $i[0]['id'];
 				// don't update if it has the same timestamp as the original
 				if($arr['edited'] > $i[0]['edited'])
@@ -182,12 +173,12 @@ class Impel extends \Zotlabs\Web\Controller {
 						intval(local_channel())
 					);
 				}
-				$x = item_store($arr,$execflag);
+				else
+					$x = item_store($arr,$execflag);
 			}
 	
-			if($x['success']) {
+			if($x && $x['success']) {
 				$item_id = $x['item_id'];
-				update_remote_id($channel,$item_id,$arr['item_type'],$pagetitle,$namespace,$remote_id,$arr['mid']);
 			}
 		}
 	
@@ -199,7 +190,8 @@ class Impel extends \Zotlabs\Web\Controller {
 			notice( sprintf( t('%s element installation failed'), $installed_type)); 
 		}
 	
-	//??? should perhaps return ret? 
+		//??? should perhaps return ret? 
+
 		json_return_and_die(true);
 	
 	}
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index 122e27e90..e34f5e49e 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -131,6 +131,8 @@ class Import extends \Zotlabs\Web\Controller {
 	
 		// import channel
 	
+		$relocate = ((array_key_exists('relocate',$data)) ? $data['relocate'] : null);
+
 		if(array_key_exists('channel',$data)) {
 	
 			if($completed < 1) {
@@ -387,8 +389,7 @@ class Import extends \Zotlabs\Web\Controller {
 					if($abconfig) {
 						// @fixme does not handle sync of del_abconfig
 						foreach($abconfig as $abc) {
-							if($abc['chan'] === $channel['channel_hash'])
-								set_abconfig($abc['chan'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']);
+							set_abconfig($channel['channel_id'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']);
 						}
 					}
 	
@@ -475,7 +476,7 @@ class Import extends \Zotlabs\Web\Controller {
 			import_events($channel,$data['event']);
 	
 		if(is_array($data['event_item']))
-			import_items($channel,$data['event_item']);
+			import_items($channel,$data['event_item'],false,$relocate);
 	
 		if(is_array($data['menu']))
 			import_menus($channel,$data['menu']);
@@ -486,7 +487,7 @@ class Import extends \Zotlabs\Web\Controller {
 		$saved_notification_flags = notifications_off($channel['channel_id']);
 	
 		if($import_posts && array_key_exists('item',$data) && $data['item'])
-			import_items($channel,$data['item']);
+			import_items($channel,$data['item'],false,$relocate);
 	
 		notifications_on($channel['channel_id'],$saved_notification_flags);
 	
diff --git a/Zotlabs/Module/Import_items.php b/Zotlabs/Module/Import_items.php
index a862836c5..f20cbfe7e 100644
--- a/Zotlabs/Module/Import_items.php
+++ b/Zotlabs/Module/Import_items.php
@@ -78,6 +78,8 @@ class Import_items extends \Zotlabs\Web\Controller {
 	//	logger('import: data: ' . print_r($data,true));
 	//	print_r($data);
 	
+		if(! is_array($data))
+			return;
 	
 		if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) {
 			$v1 = substr($data['compatibility']['database'],-4);
@@ -92,7 +94,7 @@ class Import_items extends \Zotlabs\Web\Controller {
 	
 	
 		if(array_key_exists('item',$data) && $data['item']) {
-			import_items($channel,$data['item']);
+			import_items($channel,$data['item'],false,((array_key_exists('relocate',$data)) ? $data['relocate'] : null));
 		}
 	
 		if(array_key_exists('item_id',$data) && $data['item_id']) {
@@ -106,7 +108,7 @@ class Import_items extends \Zotlabs\Web\Controller {
 	
 	
 	
-		function get() {
+	function get() {
 	
 		if(! local_channel()) {
 			notice( t('Permission denied') . EOL);
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 2601feb0a..b54099d74 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Zotlabs\Module;
 
 /**
@@ -92,7 +93,7 @@ class Item extends \Zotlabs\Web\Controller {
 	
 		$origin = (($api_source && array_key_exists('origin',$_REQUEST)) ? intval($_REQUEST['origin']) : 1);
 	
-		// To represent message-ids on other networks - this will create an item_id record
+		// To represent message-ids on other networks - this will create an iconfig record
 	
 		$namespace = (($api_source && array_key_exists('namespace',$_REQUEST)) ? strip_tags($_REQUEST['namespace']) : '');
 		$remote_id = (($api_source && array_key_exists('remote_id',$_REQUEST)) ? strip_tags($_REQUEST['remote_id']) : '');
@@ -182,7 +183,9 @@ class Item extends \Zotlabs\Web\Controller {
 			}
 	
 			// can_comment_on_post() needs info from the following xchan_query 
-			xchan_query($r);
+			// This may be from the discover tab which means we need to correct the effective uid
+
+			xchan_query($r,true,(($r[0]['uid'] == local_channel()) ? 0 : local_channel()));
 	
 			$parent_item = $r[0];
 			$parent = $r[0]['id'];
@@ -229,7 +232,7 @@ class Item extends \Zotlabs\Web\Controller {
 	
 		if($namespace && $remote_id) {
 			// It wasn't an internally generated post - see if we've got an item matching this remote service id
-			$i = q("select iid from item_id where service = '%s' and sid = '%s' limit 1",
+			$i = q("select iid from iconfig where cat = 'system' and k = '%s' and v = '%s' limit 1",
 				dbesc($namespace),
 				dbesc($remote_id) 
 			);
@@ -534,7 +537,7 @@ class Item extends \Zotlabs\Web\Controller {
 			}
 	
 			/**
-			 * fix naked links by passing through a callback to see if this is a red site
+			 * fix naked links by passing through a callback to see if this is a hubzilla site
 			 * (already known to us) which will get a zrl, otherwise link with url, add bookmark tag to both.
 			 * First protect any url inside certain bbcode tags so we don't double link it.
 			 */
@@ -833,21 +836,23 @@ class Item extends \Zotlabs\Web\Controller {
 		if($orig_post)
 			$datarray['edit'] = true;
 	
+		// suppress duplicates, *unless* you're editing an existing post. This could get picked up
+		// as a duplicate if you're editing it very soon after posting it initially and you edited
+		// some attribute besides the content, such as title or categories. 
+
 		if(feature_enabled($profile_uid,'suppress_duplicates') && (! $orig_post)) {
 	
-			$z = q("select created from item where uid = %d and body = '%s'",
+			$z = q("select created from item where uid = %d and created > %s - INTERVAL %s and body = '%s' limit 1",
 				intval($profile_uid),
+				db_utcnow(),
+				db_quoteinterval('2 MINUTE'),
 				dbesc($body)
 			);
 	
 			if($z) {
-				foreach($z as $zz) {
-					if($zz['created'] > datetime_convert('UTC','UTC', 'now - 2 minutes')) {
-						$datarray['cancel'] = 1;
-						notice( t('Duplicate post suppressed.') . EOL);
-						logger('Duplicate post. Faking plugin cancel.');
-					}
-				}
+				$datarray['cancel'] = 1;
+				notice( t('Duplicate post suppressed.') . EOL);
+				logger('Duplicate post. Faking plugin cancel.');
 			}
 		}
 	
@@ -880,13 +885,21 @@ class Item extends \Zotlabs\Web\Controller {
 			}
 		}
 	
+		if($webpage) {
+			Zlib\IConfig::Set($datarray,'system', webpage_to_namespace($webpage),
+				(($pagetitle) ? $pagetitle : substr($datarray['mid'],0,16)),true);
+		}
+		elseif($namespace) {
+			Zlib\IConfig::Set($datarray,'system', $namespace,
+				(($remote_id) ? $remote_id : substr($datarray['mid'],0,16)),true);
+		}
+
+
 		if($orig_post) {
 			$datarray['id'] = $post_id;
 	
-			item_store_update($datarray,$execflag);
-	
-			update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid);
-	
+			$x = item_store_update($datarray,$execflag);
+			
 			if(! $parent) {
 				$r = q("select * from item where id = %d",
 					intval($post_id)
@@ -894,10 +907,7 @@ class Item extends \Zotlabs\Web\Controller {
 				if($r) {
 					xchan_query($r);
 					$sync_item = fetch_post_tags($r);
-					$rid = q("select * from item_id where iid = %d",
-						intval($post_id)
-					);
-					build_sync_packet($uid,array('item' => array(encode_item($sync_item[0],true)),'item_id' => $rid));
+					build_sync_packet($profile_uid,array('item' => array(encode_item($sync_item[0],true))));
 				}
 			}
 			if(! $nopush)
@@ -978,10 +988,7 @@ class Item extends \Zotlabs\Web\Controller {
 			goaway(z_root() . "/" . $return_path );
 			// NOTREACHED
 		}
-	
-	
-		update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid);
-	
+		
 		if(($parent) && ($parent != $post_id)) {
 			// Store the comment signature information in case we need to relay to Diaspora
 			//$ditem = $datarray;
@@ -995,10 +1002,7 @@ class Item extends \Zotlabs\Web\Controller {
 			if($r) {
 				xchan_query($r);
 				$sync_item = fetch_post_tags($r);
-				$rid = q("select * from item_id where iid = %d",
-					intval($post_id)
-				);
-				build_sync_packet($uid,array('item' => array(encode_item($sync_item[0],true)),'item_id' => $rid));
+				build_sync_packet($profile_uid,array('item' => array(encode_item($sync_item[0],true))));
 			}
 		}
 	
@@ -1012,11 +1016,6 @@ class Item extends \Zotlabs\Web\Controller {
 	
 		logger('post_complete');
 	
-	
-	
-	
-	
-	
 		// figure out how to return, depending on from whence we came
 	
 		if($api_source)
diff --git a/Zotlabs/Module/Layouts.php b/Zotlabs/Module/Layouts.php
index 9b9fc22f3..c07f65ce1 100644
--- a/Zotlabs/Module/Layouts.php
+++ b/Zotlabs/Module/Layouts.php
@@ -21,7 +21,7 @@ class Layouts extends \Zotlabs\Web\Controller {
 		else
 			return;
 
-		profile_load($a,$which);
+		profile_load($which);
 
 	}
 
@@ -90,13 +90,14 @@ class Layouts extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		//This feature is not exposed in redbasic ui since it is not clear why one would want to
-		//download a json encoded pdl file - we dont have a possibility to import it.
-		//Use the buildin share/install feature instead.
+		// This feature is not exposed in redbasic ui since it is not clear why one would want to
+		// download a json encoded pdl file - we dont have a possibility to import it.
+		// Use the buildin share/install feature instead.
+
 		if((argc() > 3) && (argv(2) === 'share') && (argv(3))) {
-			$r = q("select sid, service, mimetype, title, body  from item_id 
-				left join item on item.id = item_id.iid 
-				where item_id.uid = %d and item.mid = '%s' and service = 'PDL' order by sid asc",
+			$r = q("select iconfig.v, iconfig.k, mimetype, title, body from iconfig 
+				left join item on item.id = iconfig.iid 
+				where uid = %d and mid = '%s' and iconfig.cat = 'system' and iconfig.k = 'PDL' order by iconfig.v asc",
 				intval($owner),
 				dbesc(argv(3))
 			);
@@ -141,8 +142,9 @@ class Layouts extends \Zotlabs\Web\Controller {
 
 		$editor = status_editor($a,$x);
 
-		$r = q("select iid, sid, mid, title, body, mimetype, created, edited, item_type from item_id left join item on item_id.iid = item.id
-			where item_id.uid = %d and service = 'PDL' and item_type = %d order by item.created desc",
+		$r = q("select iconfig.iid, iconfig.v, mid, title, body, mimetype, created, edited, item_type from iconfig 
+			left join item on iconfig.iid = item.id
+			where uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' and item_type = %d order by item.created desc",
 			intval($owner),
 			intval(ITEM_TYPE_PDL)
 		);
@@ -164,7 +166,7 @@ class Layouts extends \Zotlabs\Web\Controller {
 				);
 				$pages[$rr['iid']][] = array(
 					'url' => $rr['iid'],
-					'title' => $rr['sid'],
+					'title' => $rr['v'],
 					'descr' => $rr['title'],
 					'mid' => $rr['mid'],
 					'created' => $rr['created'],
diff --git a/Zotlabs/Module/Lockview.php b/Zotlabs/Module/Lockview.php
index 4776e1c56..d86a3c1d8 100644
--- a/Zotlabs/Module/Lockview.php
+++ b/Zotlabs/Module/Lockview.php
@@ -1,17 +1,31 @@
 <?php
 namespace Zotlabs\Module;
 
-
+require_once('include/security.php');
 
 class Lockview extends \Zotlabs\Web\Controller {
 
 	function get() {
+
+		$atokens = array();
+
+		if(local_channel()) {
+			$at = q("select * from atoken where atoken_uid = %d",
+				intval(local_channel())
+			);
+			if($at) {
+				foreach($at as $t) {
+					$atokens[] = atoken_xchan($t);
+				}
+			}
+		}
 	  
 		$type = ((argc() > 1) ? argv(1) : 0);
 		if (is_numeric($type)) {
 			$item_id = intval($type);
 			$type='item';
-		} else {
+		} 
+		else {
 			$item_id = ((argc() > 2) ? intval(argv(2)) : 0);
 		}
 	  
@@ -98,6 +112,13 @@ class Lockview extends \Zotlabs\Web\Controller {
 			if($r)
 				foreach($r as $rr) 
 					$l[] = '<li>' . $rr['xchan_name'] . '</li>';
+			if($atokens) {
+				foreach($atokens as $at) {
+					if(in_array("'" . $at['xchan_hash'] . "'",$allowed_users)) {	
+						$l[] = '<li>' . $at['xchan_name'] . '</li>';
+					}
+				}
+			}
 		}
 		if(count($deny_groups)) {
 			$r = q("SELECT gname FROM `groups` WHERE hash IN ( " . implode(', ', $deny_groups) . " )");
@@ -110,6 +131,16 @@ class Lockview extends \Zotlabs\Web\Controller {
 			if($r)
 				foreach($r as $rr) 
 					$l[] = '<li><strike>' . $rr['xchan_name'] . '</strike></li>';
+
+			if($atokens) {
+				foreach($atokens as $at) {
+					if(in_array("'" . $at['xchan_hash'] . "'",$deny_users)) {	
+						$l[] = '<li><strike>' . $at['xchan_name'] . '</strike></li>';
+					}
+				}
+			}
+
+
 		}
 	
 		echo $o . implode($l);
diff --git a/Zotlabs/Module/Login.php b/Zotlabs/Module/Login.php
index ff75e5268..ae35b922f 100644
--- a/Zotlabs/Module/Login.php
+++ b/Zotlabs/Module/Login.php
@@ -7,6 +7,9 @@ class Login extends \Zotlabs\Web\Controller {
 	function get() {
 		if(local_channel())
 			goaway(z_root());
+		if(remote_channel() && $_SESSION['atoken'])
+			goaway(z_root());
+
 		return login((\App::$config['system']['register_policy'] == REGISTER_CLOSED) ? false : true);
 	}
 	
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 87ed326e2..3b88cd8d6 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -6,8 +6,6 @@ require_once('include/group.php');
 require_once('include/contact_widgets.php');
 require_once('include/conversation.php');
 require_once('include/acl_selectors.php');
-require_once('include/PermissionDescription.php');
-
 
 
 class Network extends \Zotlabs\Web\Controller {
@@ -171,7 +169,7 @@ class Network extends \Zotlabs\Web\Controller {
 				'default_location' => $channel['channel_location'],
 				'nickname'         => $channel['channel_address'],
 				'lockstate'        => (($private_editing || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-				'acl'              => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, \PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
+				'acl'              => populate_acl((($private_editing) ? $def_acl : $channel_acl), true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
 				'bang'             => (($private_editing) ? '!' : ''),
 				'visitor'          => true,
 				'profile_uid'      => local_channel(),
diff --git a/Zotlabs/Module/New_channel.php b/Zotlabs/Module/New_channel.php
index 30d7c83c6..26883b6e2 100644
--- a/Zotlabs/Module/New_channel.php
+++ b/Zotlabs/Module/New_channel.php
@@ -62,7 +62,7 @@ class New_channel extends \Zotlabs\Web\Controller {
 	
 	}
 	
-		function post() {
+	function post() {
 	
 		$arr = $_POST;
 	
@@ -96,7 +96,7 @@ class New_channel extends \Zotlabs\Web\Controller {
 	
 	}
 	
-		function get() {
+	function get() {
 	
 		$acc = \App::get_account();
 	
@@ -125,9 +125,9 @@ class New_channel extends \Zotlabs\Web\Controller {
 			}
 		}
 	
-		$name = array('name', t('Name or caption'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"'));
+		$name = array('name', t('Name or caption'), ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''), t('Examples: "Bob Jameson", "Lisa and her Horses", "Soccer", "Aviation Group"'), "*");
 		$nickhub = '@' . \App::get_hostname();
-		$nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), sprintf( t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub));
+		$nickname = array('nickname', t('Choose a short nickname'), ((x($_REQUEST,'nickname')) ? $_REQUEST['nickname'] : ''), sprintf( t('Your nickname will be used to create an easy to remember channel address e.g. nickname%s'), $nickhub), "*");
 		$privacy_role = ((x($_REQUEST,'permissions_role')) ? $_REQUEST['permissions_role'] :  "" );
 		$role = array('permissions_role' , t('Channel role and privacy'), ($privacy_role) ? $privacy_role : 'social', t('Select a channel role with your privacy requirements.') . ' <a href="help/roles" target="_blank">' . t('Read more about roles') . '</a>',get_roles());
 	
diff --git a/Zotlabs/Module/Openid.php b/Zotlabs/Module/Openid.php
index 7a6e4a81f..8cbc6d2fd 100644
--- a/Zotlabs/Module/Openid.php
+++ b/Zotlabs/Module/Openid.php
@@ -48,7 +48,7 @@ class Openid extends \Zotlabs\Web\Controller {
 									$_SESSION['uid'] = $r[0]['channel_id'];
 									$_SESSION['account_id'] = $r[0]['channel_account_id'];
 									$_SESSION['authenticated'] = true;
-									authenticate_success($record,true,true,true,true);
+									authenticate_success($record,$r[0],true,true,true,true);
 									goaway(z_root());
 								}
 							}
diff --git a/Zotlabs/Module/Page.php b/Zotlabs/Module/Page.php
index 14273614c..6ef285dd0 100644
--- a/Zotlabs/Module/Page.php
+++ b/Zotlabs/Module/Page.php
@@ -13,7 +13,7 @@ class Page extends \Zotlabs\Web\Controller {
 	
 		$which = argv(1);
 		$profile = 0;
-		profile_load($a,$which,$profile);
+		profile_load($which,$profile);
 	
 	
 	
@@ -65,9 +65,10 @@ class Page extends \Zotlabs\Web\Controller {
 		require_once('include/security.php');
 		$sql_options = item_permissions_sql($u[0]['channel_id']);
 	
-		$r = q("select item.* from item left join item_id on item.id = item_id.iid
-			where item.uid = %d and sid = '%s' and item.item_delayed = 0 and (( service = 'WEBPAGE' and item_type = %d ) 
-			OR ( service = 'PDL' AND item_type = %d )) $sql_options $revision limit 1",
+		$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
+			where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 
+			and (( iconfig.k = 'WEBPAGE' and item_type = %d ) 
+			OR ( iconfig.k = 'PDL' AND item_type = %d )) $sql_options $revision limit 1",
 			intval($u[0]['channel_id']),
 			dbesc($page_id),
 			intval(ITEM_TYPE_WEBPAGE),
@@ -77,9 +78,9 @@ class Page extends \Zotlabs\Web\Controller {
 	
 			// Check again with no permissions clause to see if it is a permissions issue
 	
-			$x = q("select item.* from item left join item_id on item.id = item_id.iid
-			where item.uid = %d and sid = '%s' and item.item_delayed = 0 and service = 'WEBPAGE' and 
-			item_type = %d $revision limit 1",
+			$x = q("select item.* from item left join iconfig on item.id = iconfig.iid
+			where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' and item.item_delayed = 0 
+			and iconfig.k = 'WEBPAGE' and item_type = %d $revision limit 1",
 				intval($u[0]['channel_id']),
 				dbesc($page_id),
 				intval(ITEM_TYPE_WEBPAGE)
@@ -119,11 +120,8 @@ class Page extends \Zotlabs\Web\Controller {
 		\App::$data['webpage'] = $r;
 	
 	}
-	
-	
-	
-	
-		function get() {
+		
+	function get() {
 	
 		$r = \App::$data['webpage'];
 		if(! $r)
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index 92c9ac3c0..66aaec49f 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -2,6 +2,7 @@
 namespace Zotlabs\Module;
 
 require_once('include/security.php');
+require_once('include/attach.php');
 require_once('include/photo/photo_driver.php');
 
 
@@ -10,6 +11,8 @@ class Photo extends \Zotlabs\Web\Controller {
 	function init() {
 	
 		$prvcachecontrol = false;
+		$streaming = null;
+		$channel = null;
 	
 		switch(argc()) {
 			case 4:
@@ -62,7 +65,7 @@ class Photo extends \Zotlabs\Web\Controller {
 				intval($uid),
 				intval(PHOTO_PROFILE)
 			);
-			if(count($r)) {
+			if($r) {
 				$data = dbunescbin($r[0]['content']);
 				$mimetype = $r[0]['mimetype'];
 			}
@@ -79,7 +82,7 @@ class Photo extends \Zotlabs\Web\Controller {
 			 * Other photos
 			 */
 	
-		        /* Check for a cookie to indicate display pixel density, in order to detect high-resolution
+			/* Check for a cookie to indicate display pixel density, in order to detect high-resolution
 			   displays. This procedure was derived from the "Retina Images" by Jeremey Worboys,
 			   used in accordance with the Creative Commons Attribution 3.0 Unported License.
 			   Project link: https://github.com/Retina-Images/Retina-Images
@@ -131,6 +134,8 @@ class Photo extends \Zotlabs\Web\Controller {
 	
 				$sql_extra = permissions_sql($r[0]['uid']);
 	
+				$channel = channelx_by_n($r[0]['uid']);
+
 				// Now we'll see if we can access the photo
 	
 				$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND imgscale = %d $sql_extra LIMIT 1",
@@ -141,8 +146,9 @@ class Photo extends \Zotlabs\Web\Controller {
 				if($r && $allowed) {
 					$data = dbunescbin($r[0]['content']);
 					$mimetype = $r[0]['mimetype'];
-					if(intval($r[0]['os_storage']))
-						$data = file_get_contents($data);
+					if(intval($r[0]['os_storage'])) {
+						$streaming = $data;
+					}
 				}
 				else {
 	
@@ -242,7 +248,25 @@ class Photo extends \Zotlabs\Web\Controller {
 			header("Cache-Control: max-age=" . $cache);
 	
 		}
-		echo $data;
+
+		// If it's a file resource, stream it. 
+
+		if($streaming && $channel) {
+			if(strpos($streaming,'store') !== false)
+				$istream = fopen($streaming,'rb');
+			else
+				$istream = fopen('store/' . $channel['channel_address'] . '/' . $streaming,'rb');
+			$ostream = fopen('php://output','wb');
+			if($istream && $ostream) {
+				pipe_streams($istream,$ostream);
+				fclose($istream);
+				fclose($ostream);
+			}
+		}
+		else {
+			echo $data;
+		}
+
 		killme();
 		// NOTREACHED
 	}
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 1bdc23897..1eeab1461 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -9,8 +9,6 @@ require_once('include/bbcode.php');
 require_once('include/security.php');
 require_once('include/attach.php');
 require_once('include/text.php');
-require_once('include/PermissionDescription.php');
-
 
 
 class Photos extends \Zotlabs\Web\Controller {
@@ -27,7 +25,7 @@ class Photos extends \Zotlabs\Web\Controller {
 		if(argc() > 1) {
 			$nick = argv(1);
 	
-			profile_load($a,$nick);
+			profile_load($nick);
 	
 			$channelx = channelx_by_nick($nick);
 	
@@ -633,7 +631,7 @@ class Photos extends \Zotlabs\Web\Controller {
 				$lockstate = (($acl->is_private()) ? 'lock' : 'unlock');
 			}
 	
-			$aclselect = (($_is_owner) ? populate_acl($channel_acl,false, \PermissionDescription::fromGlobalPermission('view_storage')) : '');
+			$aclselect = (($_is_owner) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : '');
 	
 			// this is wrong but is to work around an issue with js_upload wherein it chokes if these variables
 			// don't exist. They really should be set to a parseable representation of the channel's default permissions 
@@ -1023,7 +1021,7 @@ class Photos extends \Zotlabs\Web\Controller {
 			if($can_post) {
 				$album_e = $ph[0]['album'];
 				$caption_e = $ph[0]['description'];
-				$aclselect_e = (($_is_owner) ? populate_acl($ph[0], true, \PermissionDescription::fromGlobalPermission('view_storage')) : '');
+				$aclselect_e = (($_is_owner) ? populate_acl($ph[0], true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_storage')) : '');
 				$albums = ((array_key_exists('albums', \App::$data)) ? \App::$data['albums'] : photos_albums_list(\App::$data['channel'],\App::$data['observer']));
 	
 				$_SESSION['album_return'] = bin2hex($ph[0]['album']);
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index 5cbf45daa..e01c3b49a 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -173,7 +173,7 @@ class Ping extends \Zotlabs\Web\Controller {
 					);
 					break;
 				case 'all_events':
-					$r = q("update event set `dimissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ",
+					$r = q("update event set `dismissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ",
 						intval(local_channel()),
 						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
 						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
diff --git a/Zotlabs/Module/Profile.php b/Zotlabs/Module/Profile.php
index 8bf358bc8..9e868db92 100644
--- a/Zotlabs/Module/Profile.php
+++ b/Zotlabs/Module/Profile.php
@@ -48,7 +48,7 @@ class Profile extends \Zotlabs\Web\Controller {
 			}
 		}
 	
-		profile_load($a,$which,$profile);
+		profile_load($which,$profile);
 	
 	
 	}
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php
index bb332f4ab..f459f7deb 100644
--- a/Zotlabs/Module/Profile_photo.php
+++ b/Zotlabs/Module/Profile_photo.php
@@ -23,19 +23,18 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 	
 	/* @brief Initalize the profile-photo edit view
 	 *
-	 * @param $a Current application
 	 * @return void
 	 *
 	 */
 	
-		function init() {
+	function init() {
 	
 		if(! local_channel()) {
 			return;
 		}
 	
 		$channel = \App::get_channel();
-		profile_load($a,$channel['channel_address']);
+		profile_load($channel['channel_address']);
 	
 	}
 	
@@ -46,7 +45,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 	 *
 	 */
 	
-		function post() {
+	function post() {
 	
 		if(! local_channel()) {
 			return;
@@ -54,24 +53,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 		
 		check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
 	        
-		if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) {
-	
-			// unless proven otherwise
-			$is_default_profile = 1;
-	
-			if($_REQUEST['profile']) {
-				$r = q("select id, profile_guid, is_default, gender from profile where id = %d and uid = %d limit 1",
-					intval($_REQUEST['profile']),
-					intval(local_channel())
-				);
-				if($r) {
-					$profile = $r[0];
-					if(! intval($profile['is_default']))
-						$is_default_profile = 0;
-				}
-			} 
-	
-			
+		if((array_key_exists('cropfinal',$_POST)) && (intval($_POST['cropfinal']) == 1)) {
 	
 			// phase 2 - we have finished cropping
 	
@@ -86,18 +68,33 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				$scale = substr($image_id,-1,1);
 				$image_id = substr($image_id,0,-2);
 			}
-				
+
+
+			// unless proven otherwise
+			$is_default_profile = 1;
+	
+			if($_REQUEST['profile']) {
+				$r = q("select id, profile_guid, is_default, gender from profile where id = %d and uid = %d limit 1",
+					intval($_REQUEST['profile']),
+					intval(local_channel())
+				);
+				if($r) {
+					$profile = $r[0];
+					if(! intval($profile['is_default']))
+						$is_default_profile = 0;
+				}
+			} 
+
 	
 			$srcX = $_POST['xstart'];
 			$srcY = $_POST['ystart'];
 			$srcW = $_POST['xfinal'] - $srcX;
 			$srcH = $_POST['yfinal'] - $srcY;
-	
+
 			$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale = %d LIMIT 1",
 				dbesc($image_id),
 				dbesc(local_channel()),
 				intval($scale));
-	
 			if($r) {
 	
 				$base_image = $r[0];
@@ -110,30 +107,38 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 	
 					$aid = get_account_id();
 	
-					$p = array('aid' => $aid, 'uid' => local_channel(), 'resource_id' => $base_image['resource_id'],
-						'filename' => $base_image['filename'], 'album' => t('Profile Photos'));
+					$p = [ 
+						'aid'         => $aid, 
+						'uid'         => local_channel(), 
+						'resource_id' => $base_image['resource_id'],
+						'filename'    => $base_image['filename'], 
+						'album'       => t('Profile Photos')
+					];
 	
-					$p['imgscale'] = 4;
+					$p['imgscale']    = PHOTO_RES_PROFILE_300;
 					$p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
 	
 					$r1 = $im->save($p);
 	
 					$im->scaleImage(80);
-					$p['imgscale'] = 5;
+					$p['imgscale'] = PHOTO_RES_PROFILE_80;
 	
 					$r2 = $im->save($p);
 				
 					$im->scaleImage(48);
-					$p['imgscale'] = 6;
+					$p['imgscale'] = PHOTO_RES_PROFILE_48;
 	
 					$r3 = $im->save($p);
 				
 					if($r1 === false || $r2 === false || $r3 === false) {
 						// if one failed, delete them all so we can start over.
 						notice( t('Image resize failed.') . EOL );
-						$x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale >= 4 ",
+						$x = q("delete from photo where resource_id = '%s' and uid = %d and imgscale in ( %d, %d, %d ) ",
 							dbesc($base_image['resource_id']),
-							local_channel()
+							local_channel(),
+							intval(PHOTO_RES_PROFILE_300),
+							intval(PHOTO_RES_PROFILE_80),
+							intval(PHOTO_RES_PROFILE_48)
 						);
 						return;
 					}
@@ -175,6 +180,8 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 						dbesc(datetime_convert()),
 						dbesc($channel['xchan_hash'])
 					);
+					// Similarly, tell the nav bar to bypass the cache and update the avater image.
+					$_SESSION['reload_avatar'] = true;
 	
 					info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
 	
@@ -183,10 +190,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 	
 					// Now copy profile-permissions to pictures, to prevent privacyleaks by automatically created folder 'Profile Pictures'
 	
-					profile_photo_set_profile_perms($_REQUEST['profile']);
-	
-	
-	
+					profile_photo_set_profile_perms(local_channel(),$_REQUEST['profile']);	
 				}
 				else
 					notice( t('Unable to process image') . EOL);
@@ -196,7 +200,9 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			return; // NOTREACHED
 		}
 	
-	
+		// A new photo was uploaded. Store it and save some important details
+		// in App::$data for use in the cropping function
+ 	
 	
 		$hash = photo_new_resource();
 		$smallest = 0;
@@ -220,7 +226,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			$os_storage = false;
 	
 			foreach($i as $ii) {
-				if(intval($ii['imgscale']) < 2) {
+				if(intval($ii['imgscale']) < PHOTO_RES_640) {
 					$smallest = intval($ii['imgscale']);
 					$os_storage = intval($ii['os_storage']);
 					$imagedata = $ii['content'];
@@ -238,7 +244,10 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 		}
 	
 		return $this->profile_photo_crop_ui_head($a, $ph, $hash, $smallest);
-		
+
+		// This will "fall through" to the get() method, and since
+		// App::$data['imagecrop'] is set, it will proceed to cropping 
+		// rather than present the upload form		
 	}
 	
 	
@@ -269,11 +278,19 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				notice( t('Permission denied.') . EOL );
 				return;
 			};
-			
-	//		check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
-	        
+				        
 			$resource_id = argv(2);
 	
+			// When using an existing photo, we don't have a dialogue to offer a choice of profiles,
+			// so it gets attached to the default
+
+			$p = q("select id from profile where is_default = 1 and uid = %d",
+				intval(local_channel())
+			);
+			if($p) {
+				$_REQUEST['profile'] = $p[0]['id'];
+			}
+
 	
 			$r = q("SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC",
 				intval(local_channel()),
@@ -285,11 +302,11 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			}
 			$havescale = false;
 			foreach($r as $rr) {
-				if($rr['imgscale'] == 5)
+				if($rr['imgscale'] == PHOTO_RES_PROFILE_80)
 					$havescale = true;
 			}
 	
-			// set an already loaded photo as profile photo
+			// set an already loaded and cropped photo as profile photo
 	
 			if(($r[0]['album'] == t('Profile Photos')) && ($havescale)) {
 				// unset any existing profile photos
@@ -310,7 +327,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 					dbesc($channel['xchan_hash'])
 				);
 	
-				profile_photo_set_profile_perms(); //Reset default photo permissions to public
+				profile_photo_set_profile_perms(local_channel()); // Reset default photo permissions to public
 				\Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
 				goaway(z_root() . '/profiles');
 			}
@@ -342,7 +359,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				if($i) {
 					$hash = $i[0]['resource_id'];
 					foreach($i as $ii) {
-						if(intval($ii['imgscale']) < 2) {
+						if(intval($ii['imgscale']) < PHOTO_RES_640) {
 							$smallest = intval($ii['imgscale']);
 						}
 					}
@@ -350,9 +367,14 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 	        }
 	 
 			$this->profile_photo_crop_ui_head($a, $ph, $hash, $smallest);
+
+			// falls through with App::$data['imagecrop'] set so we go straight to the cropping section
 		}
 	
-		$profiles = q("select id, profile_name as name, is_default from profile where uid = %d",
+
+		// present an upload form
+
+		$profiles = q("select id, profile_name as name, is_default from profile where uid = %d order by id asc",
 			intval(local_channel())
 		);
 	
@@ -379,6 +401,9 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			return $o;
 		}
 		else {
+
+			// present a cropping form
+
 			$filename = \App::$data['imagecrop'] . '-' . \App::$data['imagecrop_resolution'];
 			$resolution = \App::$data['imagecrop_resolution'];
 			$tpl = get_markup_template("cropbody.tpl");
@@ -416,13 +441,13 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 		if($max_length > 0)
 			$ph->scaleImage($max_length);
 	
-		$width  = $ph->getWidth();
-		$height = $ph->getHeight();
+		\App::$data['width']  = $ph->getWidth();
+		\App::$data['height'] = $ph->getHeight();
 	
-		if($width < 500 || $height < 500) {
+		if(\App::$data['width'] < 500 || \App::$data['height'] < 500) {
 			$ph->scaleImageUp(400);
-			$width  = $ph->getWidth();
-			$height = $ph->getHeight();
+			\App::$data['width']  = $ph->getWidth();
+			\App::$data['height'] = $ph->getHeight();
 		}
 	
 	
diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
index 06e5cfd7b..899c79b15 100644
--- a/Zotlabs/Module/Profiles.php
+++ b/Zotlabs/Module/Profiles.php
@@ -193,7 +193,7 @@ class Profiles extends \Zotlabs\Web\Controller {
 	
 			$chan = \App::get_channel();
 	
-			profile_load($a,$chan['channel_address'],$r[0]['id']);
+			profile_load($chan['channel_address'],$r[0]['id']);
 		}
 	}
 	
@@ -584,7 +584,7 @@ class Profiles extends \Zotlabs\Web\Controller {
 	
 			if($is_default) {
 				// reload the info for the sidebar widget - why does this not work?
-				profile_load($a,$channel['channel_address']);
+				profile_load($channel['channel_address']);
 				\Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
 			}
 		}
diff --git a/Zotlabs/Module/Profperm.php b/Zotlabs/Module/Profperm.php
index 33e9d1ece..b1da147c1 100644
--- a/Zotlabs/Module/Profperm.php
+++ b/Zotlabs/Module/Profperm.php
@@ -17,7 +17,7 @@ class Profperm extends \Zotlabs\Web\Controller {
 	
 		$profile = \App::$argv[1];
 	
-		profile_load($a,$which,$profile);
+		profile_load($which,$profile);
 	
 	}
 	
@@ -97,7 +97,7 @@ class Profperm extends \Zotlabs\Web\Controller {
 	
 				//Time to update the permissions on the profile-pictures as well
 
-				profile_photo_set_profile_perms($profile['id']);
+				profile_photo_set_profile_perms(local_channel(),$profile['id']);
 	
 				$r = q("SELECT * FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_profile = '%s'",
 					intval(local_channel()),
diff --git a/Zotlabs/Module/README.md b/Zotlabs/Module/README.md
new file mode 100644
index 000000000..3b870dd7b
--- /dev/null
+++ b/Zotlabs/Module/README.md
@@ -0,0 +1,80 @@
+Zotlabs/Module
+==============
+
+
+This directory contains controller modules for handling web requests. The
+lowercase class name indicates the head of the URL path which this module
+handles. There are other methods of attaching (routing) URL paths to
+controllers, but this is the primary method used in this project.
+
+Module controllers MUST reside in this directory and namespace to be
+autoloaded (unless other specific routing methods are employed). They
+typically use and extend the class definition in Zotlabs/Web/Controller 
+as a template. 
+
+Template:
+
+	<?php
+
+	namespace Zotlabs\Web;
+
+
+	class Controller {
+
+		function init() {}
+		function post() {}
+		function get() {}
+
+	}
+
+
+Typical Module declaration for the '/foo' URL route:
+
+
+	<?php
+	namespace Zotlabs\Module;
+
+	class Foo extends \Zotlabs\Web\Controller {
+
+		function init() {
+			// init() handler goes here
+		}
+
+		function post() {
+			// post handler goes here
+		}
+
+		function get() {
+			return 'Hello world.' . EOL;
+		}
+
+	}
+
+This model provides callbacks for public functions named init(), post(), 
+and get(). init() is always called. post() is called if $_POST variables
+are present, and get() is called if none of the prior functions terminated
+the handler. The get() method typically retuns a string which represents 
+the contents of the content region of the resulting page. Modules which emit 
+json, xml or other machine-readable formats typically emit their contents
+inside the init() function and call 'killme()' to terminate the Module. 
+
+Modules are passed the URL path as argc,argv arguments. For a path such as
+
+	https://mysite.something/foo/bar/baz
+
+The app will typically invoke the Module class 'Foo' and pass it 
+
+	$x = argc(); // $x = 3
+
+	$x = argv(0); // $x = 'foo'
+	$x = argv(1); // $x = 'bar'
+	$x = argv(2); // $x = 'baz'
+
+These are handled in a similar fashion to their counterparts in the Unix shell
+or C/C++ languages. Do not confuse the argc(),argv() functions with the
+global variables $argc,$argv which are passed to command line programs. These 
+are handled separately by command line and Zotlabs/Daemon class functions. 
+
+
+
+ 
\ No newline at end of file
diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php
index 7cd1ee501..45123b88d 100644
--- a/Zotlabs/Module/Register.php
+++ b/Zotlabs/Module/Register.php
@@ -146,7 +146,7 @@ class Register extends \Zotlabs\Web\Controller {
 			goaway(z_root());
 		}
 	
-		authenticate_success($result['account'],true,false,true);
+		authenticate_success($result['account'],null,true,false,true);
 		
 		$new_channel = false;
 		$next_page = 'new_channel';
@@ -259,7 +259,8 @@ class Register extends \Zotlabs\Web\Controller {
 			'$email'        => $email,
 			'$pass1'        => $password,
 			'$pass2'        => $password2,
-			'$submit'       => ((UNO || $auto_create || $registration_is) ? t('Register') : t('Proceed to create your first channel'))
+			'$submit'       => t('Register'),
+			'$verify_note'  => t('This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions.')
 		));
 	
 		return $o;
diff --git a/Zotlabs/Module/Removeaccount.php b/Zotlabs/Module/Removeaccount.php
index 39e06bb7f..9fac7838e 100644
--- a/Zotlabs/Module/Removeaccount.php
+++ b/Zotlabs/Module/Removeaccount.php
@@ -25,7 +25,8 @@ class Removeaccount extends \Zotlabs\Web\Controller {
 		$account = \App::get_account();
 		$account_id = get_account_id();
 	
-		if(! account_verify_password($account['account_email'],$_POST['qxz_password']))
+		$x = account_verify_password($account['account_email'],$_POST['qxz_password']);
+		if(! ($x && $x['account']))
 			return;
 	
 		if($account['account_password_changed'] != NULL_DATE) {
diff --git a/Zotlabs/Module/Removeme.php b/Zotlabs/Module/Removeme.php
index e611d8112..bc18fe0f8 100644
--- a/Zotlabs/Module/Removeme.php
+++ b/Zotlabs/Module/Removeme.php
@@ -24,7 +24,9 @@ class Removeme extends \Zotlabs\Web\Controller {
 	
 		$account = \App::get_account();
 	
-		if(! account_verify_password($account['account_email'],$_POST['qxz_password']))
+	
+		$x = account_verify_password($account['account_email'],$_POST['qxz_password']);
+		if(! ($x && $x['account']))
 			return;
 	
 		if($account['account_password_changed'] != NULL_DATE) {
diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php
index 26b0c46a6..04536e54e 100644
--- a/Zotlabs/Module/Rmagic.php
+++ b/Zotlabs/Module/Rmagic.php
@@ -2,7 +2,6 @@
 namespace Zotlabs\Module;
 
 
-
 class Rmagic extends \Zotlabs\Web\Controller {
 
 	function init() {
diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php
index 1396f2a55..9e3043d10 100644
--- a/Zotlabs/Module/Rpost.php
+++ b/Zotlabs/Module/Rpost.php
@@ -7,7 +7,6 @@ require_once('include/items.php');
 require_once('include/taxonomy.php');
 require_once('include/conversation.php');
 require_once('include/zot.php');
-require_once('include/PermissionDescription.php');
 
 /**
  * remote post
@@ -116,7 +115,7 @@ class Rpost extends \Zotlabs\Web\Controller {
 			'default_location' => $channel['channel_location'],
 			'nickname' => $channel['channel_address'],
 			'lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),
-			'acl' => populate_acl($channel_acl, true, \PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
+			'acl' => populate_acl($channel_acl, true, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_stream'), get_post_aclDialogDescription(), 'acl_dialog_post'),
 			'bang' => '',
 			'visitor' => true,
 			'profile_uid' => local_channel(),
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php
index 875004fae..b1258e049 100644
--- a/Zotlabs/Module/Settings.php
+++ b/Zotlabs/Module/Settings.php
@@ -2,8 +2,6 @@
 namespace Zotlabs\Module; /** @file */
 
 require_once('include/zot.php');
-require_once('include/PermissionDescription.php');
-
 
 
 class Settings extends \Zotlabs\Web\Controller {
@@ -30,7 +28,7 @@ class Settings extends \Zotlabs\Web\Controller {
 	}
 	
 	
-		function post() {
+	function post() {
 	
 		if(! local_channel())
 			return;
@@ -119,6 +117,60 @@ class Settings extends \Zotlabs\Web\Controller {
 			build_sync_packet();
 			return;
 		}
+
+
+		if((argc() > 1) && (argv(1) == 'tokens')) {
+			check_form_security_token_redirectOnErr('/settings/tokens', 'settings_tokens');
+			$token_errs = 0;
+			if(array_key_exists('token',$_POST)) {
+				$atoken_id = (($_POST['atoken_id']) ? intval($_POST['atoken_id']) : 0);
+				$name = trim(escape_tags($_POST['name']));
+				$token = trim($_POST['token']);
+				if((! $name) || (! $token))
+						$token_errs ++;
+				if(trim($_POST['expires']))
+					$expires = datetime_convert(date_default_timezone_get(),'UTC',$_POST['expires']);
+				else
+					$expires = NULL_DATE;
+				$max_atokens = service_class_fetch(local_channel(),'access_tokens');
+				if($max_atokens) {
+					$r = q("select count(atoken_id) as total where atoken_uid = %d",
+						intval(local_channel())
+					);
+					if($r && intval($r[0]['total']) >= $max_tokens) {
+						notice( sprintf( t('This channel is limited to %d tokens'), $max_tokens) . EOL);
+						return;
+					}
+				}
+			}
+			if($token_errs) {
+				notice( t('Name and Password are required.') . EOL);
+				return;
+			}
+			if($atoken_id) {
+				$r = q("update atoken set atoken_name = '%s', atoken_token = '%s' atoken_expires = '%s' 
+					where atoken_id = %d and atoken_uid = %d",
+					dbesc($name),
+					dbesc($token),
+					dbesc($expires),
+					intval($atoken_id),
+					intval($channel['channel_id'])
+				);
+			}
+			else {
+				$r = q("insert into atoken ( atoken_aid, atoken_uid, atoken_name, atoken_token, atoken_expires )
+					values ( %d, %d, '%s', '%s', '%s' ) ",
+					intval($channel['channel_account_id']),
+					intval($channel['channel_id']),
+					dbesc($name),
+					dbesc($token),
+					dbesc($expires)
+				);
+			}
+		
+			info( t('Token saved.') . EOL);
+			return;
+		}
 	
 	
 	
@@ -708,6 +760,53 @@ class Settings extends \Zotlabs\Web\Controller {
 			));
 			return $o;
 		}
+
+		if((argc() > 1) && (argv(1) === 'tokens')) {
+			$atoken = null;
+			if(argc() > 2) {
+				$id = argv(2);			
+
+				$atoken = q("select * from atoken where atoken_id = %d and atoken_uid = %d",
+					intval($id),
+					intval(local_channel())
+				);
+
+				if($atoken)
+					$atoken = $atoken[0];
+
+				if($atoken && argc() > 3 && argv(3) === 'drop') {
+					$r = q("delete from atoken where atoken_id = %d",
+						intval($id)
+					);
+				}
+			}
+			$t = q("select * from atoken where atoken_uid = %d",
+				intval(local_channel())
+			);			
+
+			$desc = t('Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content.');
+
+			$desc2 = t('You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:');
+
+			$tpl = get_markup_template("settings_tokens.tpl");
+			$o .= replace_macros($tpl, array(
+				'$form_security_token' => get_form_security_token("settings_tokens"),
+				'$title'	=> t('Guest Access Tokens'),
+				'$desc'     => $desc,
+				'$desc2' => $desc2,
+				'$tokens' => $t,
+				'$atoken' => $atoken,
+				'$url1' => z_root() . '/channel/' . $channel['channel_address'],
+				'$url2' => z_root() . '/photos/' . $channel['channel_address'],
+				'$name' => array('name', t('Login Name') . ' <span class="required">*</span>', (($atoken) ? $atoken['atoken_name'] : ''),''),
+				'$token'=> array('token', t('Login Password') . ' <span class="required">*</span>',(($atoken) ? $atoken['atoken_token'] : autoname(8)), ''),
+				'$expires'=> array('expires', t('Expires (yyyy-mm-dd)'), (($atoken['atoken_expires'] && $atoken['atoken_expires'] != NULL_DATE) ? datetime_convert('UTC',date_default_timezone_get(),$atoken['atoken_expires']) : ''), ''),
+				'$submit' 	=> t('Submit')
+			));
+			return $o;
+		}
+
+
 	
 	
 	
@@ -1066,7 +1165,7 @@ class Settings extends \Zotlabs\Web\Controller {
 				'$maxreq' 	=> array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')),
 				'$permissions' => t('Default Post and Publish Permissions'),
 				'$permdesc' => t("\x28click to open/close\x29"),
-				'$aclselect' => populate_acl($perm_defaults, false, \PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))),
+				'$aclselect' => populate_acl($perm_defaults, false, \Zotlabs\Lib\PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))),
 				'$suggestme' => $suggestme,
 				'$group_select' => $group_select,
 				'$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()),
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index c4878e217..802f0c216 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -493,7 +493,6 @@ class Setup extends \Zotlabs\Web\Controller {
 		$this->check_add($ck_funcs, t('OpenSSL PHP module'), true, true);
 		$this->check_add($ck_funcs, t('mysqli or postgres PHP module'), true, true);
 		$this->check_add($ck_funcs, t('mb_string PHP module'), true, true);
-		$this->check_add($ck_funcs, t('mcrypt PHP module'), true, true);
 		$this->check_add($ck_funcs, t('xml PHP module'), true, true);
 	
 		if(function_exists('apache_get_modules')){
@@ -530,10 +529,6 @@ class Setup extends \Zotlabs\Web\Controller {
 			$ck_funcs[4]['status'] = false;
 			$ck_funcs[4]['help'] = t('Error: mb_string PHP module required but not installed.');
 		}
-		if(! function_exists('mcrypt_encrypt')) {
-			$ck_funcs[5]['status'] = false;
-			$ck_funcs[5]['help'] = t('Error: mcrypt PHP module required but not installed.');
-		}
 		if(! extension_loaded('xml')) {
 			$ck_funcs[6]['status'] = false;
 			$ck_funcs[6]['help'] = t('Error: xml PHP module required for DAV but not installed.');
@@ -596,7 +591,7 @@ class Setup extends \Zotlabs\Web\Controller {
 	
 		if(! is_writable('store')) {
 			$status = false;
-			$help = t('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') . EOL;
+			$help = t('This software 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') . EOL;
 			$help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.').EOL;
 		}
 	
@@ -639,6 +634,9 @@ class Setup extends \Zotlabs\Web\Controller {
 					$help .= t('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.') . EOL;
 					$help .= t('This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement.') .EOL;
 					$help .= t('Providers are available that issue free certificates which are browser-valid.'). EOL;
+
+					$help .= t('If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications.') . EOL;
+
 	
 					$this->check_add($checks, t('SSL certificate validation'), false, true, $help);
 				}
@@ -695,6 +693,7 @@ class Setup extends \Zotlabs\Web\Controller {
 		// install the standard theme
 		set_config('system', 'allowed_themes', 'redbasic');
 	
+
 		// Set a lenient list of ciphers if using openssl. Other ssl engines
 		// (e.g. NSS used in RedHat) require different syntax, so hopefully
 		// the default curl cipher list will work for most sites. If not,
@@ -704,7 +703,9 @@ class Setup extends \Zotlabs\Web\Controller {
 		// z_fetch_url() is also used to import shared links and other content
 		// so in theory most any cipher could show up and we should do our best
 		// to make the content available rather than tell folks that there's a
-		// weird SSL error which they can't do anything about.
+		// weird SSL error which they can't do anything about. This does not affect
+		// the SSL server, but is only a client negotiation to find something workable.
+		// Hence it will not make your system susceptible to POODL or other nasties.
 	
 		$x = curl_version();
 		if(stristr($x['ssl_version'],'openssl'))
diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php
index f6b34d0c8..a15e2896d 100644
--- a/Zotlabs/Module/Siteinfo.php
+++ b/Zotlabs/Module/Siteinfo.php
@@ -27,27 +27,11 @@ class Siteinfo extends \Zotlabs\Web\Controller {
 		else {
 		        $version = $commit = '';
 		}
-		$visible_plugins = array();
-		if(is_array(\App::$plugins) && count(\App::$plugins)) {
-			$r = q("select * from addon where hidden = 0");
-			if(count($r))
-				foreach($r as $rr)
-					$visible_plugins[] = $rr['aname'];
-		}
-		$plugins_list = '';
-		if(count($visible_plugins)) {
-		        $plugins_text = t('Installed plugins/addons/apps:');
-			$sorted = $visible_plugins;
-			$s = '';
-			sort($sorted);
-			foreach($sorted as $p) {
-				if(strlen($p)) {
-					if(strlen($s)) $s .= ', ';
-					$s .= $p;
-				}
-			}
-			$plugins_list .= $s;
-		}
+
+		$plugins_list = implode(', ',visible_plugin_list());
+
+		if($plugins_list)
+	        $plugins_text = t('Installed plugins/addons/apps:');
 		else
 			$plugins_text = t('No installed plugins/addons/apps');
 	
diff --git a/Zotlabs/Module/Starred.php b/Zotlabs/Module/Starred.php
index 73a2dc808..4f1d99ec6 100644
--- a/Zotlabs/Module/Starred.php
+++ b/Zotlabs/Module/Starred.php
@@ -30,7 +30,20 @@ class Starred extends \Zotlabs\Web\Controller {
 			intval(local_channel()),
 			intval($message_id)
 		);
-	
+
+		$r = q("select * from item where id = %d",
+				intval($message_id)
+		);
+		if($r) {
+			xchan_query($r);
+			$sync_item = fetch_post_tags($r);
+			build_sync_packet(local_channel(),[ 
+				'item' => [ 
+					encode_item($sync_item[0],true)
+				]
+			]);
+		}
+
 		header('Content-type: application/json');
 		echo json_encode(array('result' => $item_starred));
 		killme();
diff --git a/Zotlabs/Module/Tagger.php b/Zotlabs/Module/Tagger.php
index 0a46cf56d..25f518d53 100644
--- a/Zotlabs/Module/Tagger.php
+++ b/Zotlabs/Module/Tagger.php
@@ -129,9 +129,14 @@ class Tagger extends \Zotlabs\Web\Controller {
 		
 		store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_COMMUNITYTAG,$term,$tagid);
 		$ret = post_activity_item($arr);
-	
-		if($ret['success'])
-			\Zotlabs\Daemon\Master::Summon(array('Notifier','tag',$ret['activity']['id']));
+
+		if($ret['success']) {
+			build_sync_packet(local_channel(),
+				[ 
+					'item' => [ encode_item($ret['activity'],true) ]
+				]
+			);
+		}
 	
 		killme();
 	
diff --git a/Zotlabs/Module/Uexport.php b/Zotlabs/Module/Uexport.php
index d48f96d76..f36d77174 100644
--- a/Zotlabs/Module/Uexport.php
+++ b/Zotlabs/Module/Uexport.php
@@ -44,7 +44,7 @@ class Uexport extends \Zotlabs\Web\Controller {
 		}
 	}
 		
-		function get() {
+	function get() {
 	
 		$y = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
 	
diff --git a/Zotlabs/Module/Viewconnections.php b/Zotlabs/Module/Viewconnections.php
index ea478f92a..4364d482a 100644
--- a/Zotlabs/Module/Viewconnections.php
+++ b/Zotlabs/Module/Viewconnections.php
@@ -10,8 +10,11 @@ class Viewconnections extends \Zotlabs\Web\Controller {
 		if(observer_prohibited()) {
 			return;
 		}
-		if(argc() > 1)
-			profile_load($a,argv(1));
+
+		if(argc() > 1) {
+			profile_load(argv(1));
+		}
+
 	}
 	
 	function get() {
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php
index bb8d454c8..cc0a01cce 100644
--- a/Zotlabs/Module/Webpages.php
+++ b/Zotlabs/Module/Webpages.php
@@ -4,7 +4,6 @@ namespace Zotlabs\Module;
 require_once('include/channel.php');
 require_once('include/conversation.php');
 require_once('include/acl_selectors.php');
-require_once('include/PermissionDescription.php');
 
 
 class Webpages extends \Zotlabs\Web\Controller {
@@ -23,12 +22,12 @@ class Webpages extends \Zotlabs\Web\Controller {
 		else
 			return;
 	
-		profile_load($a,$which);
+		profile_load($which);
 	
 	}
 	
 	
-		function get() {
+	function get() {
 	
 		if(! \App::$profile) {
 			notice( t('Requested profile is not available.') . EOL );
@@ -105,7 +104,7 @@ class Webpages extends \Zotlabs\Web\Controller {
 			'is_owner' => true,
 			'nickname' => \App::$profile['channel_address'],
 			'lockstate' => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
-			'acl' => (($is_owner) ? populate_acl($channel_acl,false, \PermissionDescription::fromGlobalPermission('view_pages')) : ''),
+			'acl' => (($is_owner) ? populate_acl($channel_acl,false, \Zotlabs\Lib\PermissionDescription::fromGlobalPermission('view_pages')) : ''),
 			'showacl' => (($is_owner) ? true : false),
 			'visitor' => true,
 			'hide_location' => true,
@@ -138,11 +137,19 @@ class Webpages extends \Zotlabs\Web\Controller {
 	
 		$sql_extra = item_permissions_sql($owner);
 	
-		$r = q("select * from item_id left join item on item_id.iid = item.id 
-			where item_id.uid = %d and service = 'WEBPAGE' and item_type = %d $sql_extra order by item.created desc",
+
+		$r = q("select * from iconfig left join item on iconfig.iid = item.id 
+			where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' and item_type = %d 
+			$sql_extra order by item.created desc",
 			intval($owner),
 			intval(ITEM_TYPE_WEBPAGE)
 		);
+
+//		$r = q("select * from item_id left join item on item_id.iid = item.id 
+//			where item_id.uid = %d and service = 'WEBPAGE' and item_type = %d $sql_extra order by item.created desc",
+//			intval($owner),
+//			intval(ITEM_TYPE_WEBPAGE)
+//		);
 	
 		$pages = null;
 	
@@ -160,13 +167,13 @@ class Webpages extends \Zotlabs\Web\Controller {
 					'created'	=> $rr['created'],
 					'edited'	=> $rr['edited'],
 					'mimetype'	=> $rr['mimetype'],
-					'pagetitle'	=> $rr['sid'],
+					'pagetitle'	=> $rr['v'],
 					'mid'		=> $rr['mid'],
 					'layout_mid'    => $rr['layout_mid']
 				);
 				$pages[$rr['iid']][] = array(
 					'url'		=> $rr['iid'],
-					'pagetitle'	=> $rr['sid'],
+					'pagetitle'	=> $rr['v'],
 					'title'		=> $rr['title'],
 					'created'	=> datetime_convert('UTC',date_default_timezone_get(),$rr['created']),
 					'edited'	=> datetime_convert('UTC',date_default_timezone_get(),$rr['edited']),
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 1e6446904..55a52ea6d 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -1,6 +1,6 @@
-<?php
+<?php /** @file */
 
-namespace Zotlabs\Module;/** @file */
+namespace Zotlabs\Module;
 
 class Wiki extends \Zotlabs\Web\Controller {
 
@@ -20,11 +20,28 @@ class Wiki extends \Zotlabs\Web\Controller {
 			notice(t('You must be logged in to see this page.') . EOL);
 			goaway('/login');
 		}
+		profile_load($nick);
+
 	}
 
 	function get() {
+
+		if(observer_prohibited(true)) {
+			return login();
+		}
+
+		if(! feature_enabled(\App::$profile_uid,'wiki')) {
+			notice( t('Not found') . EOL);
+     		return;
+ 		}
+	
+		$tab = 'wiki';
+	
+	
 		require_once('include/wiki.php');
 		require_once('include/acl_selectors.php');
+		require_once('include/conversation.php');
+
 		// TODO: Combine the interface configuration into a unified object
 		// Something like $interface = array('new_page_button' => false, 'new_wiki_button' => false, ...)
 		$wiki_owner = false;
@@ -72,8 +89,11 @@ class Wiki extends \Zotlabs\Web\Controller {
 		switch (argc()) {
 			case 2:
 				// Configure page template
-				$wikiheader = t('Wiki Sandbox');
-				$content = '"# Wiki Sandbox\n\nContent you **edit** and **preview** here *will not be saved*."';
+				$wikiheaderName = t('Wiki');
+				$wikiheaderPage = t('Sandbox');
+				require_once('library/markdown.php');	
+				$content = t('"# Wiki Sandbox\n\nContent you **edit** and **preview** here *will not be saved*."');
+				$renderedContent = Markdown(json_decode($content));
 				$hide_editor = false;
 				$showPageControls = false;
 				$showNewWikiButton = $wiki_owner;
@@ -113,13 +133,18 @@ class Wiki extends \Zotlabs\Web\Controller {
 				} else {
 					$wiki_editor = true;
 				}
-				$wikiheader = urldecode($wikiUrlName) . ': ' . urldecode($pageUrlName);	// show wiki name and page			
+				$wikiheaderName = urldecode($wikiUrlName);
+				$wikiheaderPage = urldecode($pageUrlName);
 				$p = wiki_get_page_content(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
 				if(!$p['success']) {
 					notice('Error retrieving page content' . EOL);
 					goaway('/'.argv(0).'/'.argv(1).'/'.$wikiUrlName);
 				}
-				$content = ($p['content'] !== '' ? $p['content'] : '"# New page\n"');
+				$content = ($p['content'] !== '' ? htmlspecialchars_decode($p['content'],ENT_COMPAT) : '"# New page\n"');
+				// Render the Markdown-formatted page content in HTML
+				require_once('library/markdown.php');	
+				$html = wiki_generate_toc(purify_html(Markdown(json_decode($content))));
+				$renderedContent = wiki_convert_links($html,argv(0).'/'.argv(1).'/'.$wikiUrlName);
 				$hide_editor = false;
 				$showPageControls = $wiki_editor;
 				$showNewWikiButton = $wiki_owner;
@@ -131,11 +156,25 @@ class Wiki extends \Zotlabs\Web\Controller {
 			default:	// Strip the extraneous URL components
 				goaway('/'.argv(0).'/'.argv(1).'/'.$wikiUrlName.'/'.$pageUrlName);
 		}
-		// Render the Markdown-formatted page content in HTML
-		require_once('library/markdown.php');	
 		
+		$wikiModalID = random_string(3);
+		$wikiModal = replace_macros(
+			get_markup_template('generic_modal.tpl'), array(
+				'$id' => $wikiModalID,
+				'$title' => t('Revision Comparison'),
+				'$ok' => t('Revert'),
+				'$cancel' => t('Cancel')
+			)
+		);
+				
+		$is_owner = ((local_channel()) && (local_channel() == \App::$profile['profile_uid']) ? true : false);
+		
+		$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
+
+
 		$o .= replace_macros(get_markup_template('wiki.tpl'),array(
-			'$wikiheader' => $wikiheader,
+			'$wikiheaderName' => $wikiheaderName,
+			'$wikiheaderPage' => $wikiheaderPage,
 			'$hideEditor' => $hide_editor,
 			'$showPageControls' => $showPageControls,
 			'$showNewWikiButton'=> $showNewWikiButton,
@@ -149,11 +188,25 @@ class Wiki extends \Zotlabs\Web\Controller {
 			'$acl' => $x['acl'],
 			'$bang' => $x['bang'],
 			'$content' => $content,
-			'$renderedContent' => Markdown(json_decode($content)),
+			'$renderedContent' => $renderedContent,
 			'$wikiName' => array('wikiName', t('Enter the name of your new wiki:'), '', ''),
 			'$pageName' => array('pageName', t('Enter the name of the new page:'), '', ''),
+			'$pageRename' => array('pageRename', t('Enter the new name:'), '', ''),
 			'$commitMsg' => array('commitMsg', '', '', '', '', 'placeholder="(optional) Enter a custom message when saving the page..."'),
-			'$pageHistory' => $pageHistory['history']
+			'$pageHistory' => $pageHistory['history'],
+			'$wikiModal' => $wikiModal,
+			'$wikiModalID' => $wikiModalID,
+			'$commit' => 'HEAD',
+			'$embedPhotos' => t('Embed image from photo albums'),
+			'$embedPhotosModalTitle' => t('Embed an image from your albums'),
+			'$embedPhotosModalCancel' => t('Cancel'),
+			'$embedPhotosModalOK' => t('OK'),
+			'$modalchooseimages' => t('Choose images to embed'),
+			'$modalchoosealbum' => t('Choose an album'),
+			'$modaldiffalbum' => t('Choose a different album...'),
+			'$modalerrorlist' => t('Error getting album list'),
+			'$modalerrorlink' => t('Error getting photo link'),
+			'$modalerroralbum' => t('Error getting album'),
 		));
 		head_add_js('library/ace/ace.js');	// Ace Code Editor
 		return $o;
@@ -166,8 +219,12 @@ class Wiki extends \Zotlabs\Web\Controller {
 		// Render mardown-formatted text in HTML for preview
 		if((argc() > 2) && (argv(2) === 'preview')) {
 			$content = $_POST['content'];
+			$resource_id = $_POST['resource_id']; 
 			require_once('library/markdown.php');
-			$html = purify_html(Markdown($content));
+			$html = wiki_generate_toc(purify_html(Markdown($content)));
+			$w = wiki_get_wiki($resource_id);
+			$wikiURL = argv(0).'/'.argv(1).'/'.$w['urlName'];
+			$html = wiki_convert_links($html,$wikiURL);
 			json_return_and_die(array('html' => $html, 'success' => true));
 		}
 		
@@ -185,6 +242,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 			} 
 			$wiki = array(); 
 			// Generate new wiki info from input name
+			$wiki['postVisible'] = ((intval($_POST['postVisible']) === 0) ? 0 : 1);
 			$wiki['rawName'] = $_POST['wikiName'];
 			$wiki['htmlName'] = escape_tags($_POST['wikiName']);
 			$wiki['urlName'] = urlencode($_POST['wikiName']); 
@@ -218,20 +276,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 			if (local_channel() !== intval($channel['channel_id'])) {
 				logger('Wiki delete permission denied.' . EOL);
 				json_return_and_die(array('message' => 'Wiki delete permission denied.', 'success' => false));
-			} else {				
-				/*
-				$channel = get_channel_by_nick($nick);
-				$observer_hash = get_observer_hash();
-				// Figure out who the page owner is.
-				$perms = get_all_perms(intval($channel['channel_id']), $observer_hash);
-				// TODO: Create a new permission setting for wiki analogous to webpages. Until
-				// then, use webpage permissions
-				if (!$perms['write_pages']) {
-					logger('Wiki delete permission denied.' . EOL);
-					json_return_and_die(array('success' => false));
-				}
-				*/
-			}
+			} 
 			$resource_id = $_POST['resource_id']; 
 			$deleted = wiki_delete_wiki($resource_id);
 			if ($deleted['success']) {
@@ -377,7 +422,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 			if($deleted['success']) {
 				$ob = \App::get_observer();
 				$commit = wiki_git_commit(array(
-						'commit_msg' => 'Deleted ' . $pageHtmlName, 
+						'commit_msg' => 'Deleted ' . $pageUrlName, 
 						'resource_id' => $resource_id, 
 						'observer' => $ob,
 						'files' => null
@@ -408,7 +453,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 					json_return_and_die(array('success' => false));					
 				}
 			}
-			$reverted = wiki_revert_page(array('commitHash' => $commitHash, 'observer' => \App::get_observer(), 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
+			$reverted = wiki_revert_page(array('commitHash' => $commitHash, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
 			if($reverted['success']) {
 				json_return_and_die(array('content' => $reverted['content'], 'message' => '', 'success' => true));					
 			} else {
@@ -416,6 +461,73 @@ class Wiki extends \Zotlabs\Web\Controller {
 			}
 		}
 		
+		// Compare page revisions
+		if ((argc() === 4) && (argv(2) === 'compare') && (argv(3) === 'page')) {
+			$resource_id = $_POST['resource_id']; 
+			$pageUrlName = $_POST['name'];
+			$compareCommit = $_POST['compareCommit'];
+			$currentCommit = $_POST['currentCommit'];
+			// Determine if observer has permission to revert pages
+			$nick = argv(1);
+			$channel = get_channel_by_nick($nick);			
+			if (local_channel() !== intval($channel['channel_id'])) {
+				$observer_hash = get_observer_hash();
+				$perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
+				if(!$perms['read']) {
+					logger('Wiki read permission denied.' . EOL);
+					json_return_and_die(array('success' => false));					
+				}
+			}
+			$compare = wiki_compare_page(array('currentCommit' => $currentCommit, 'compareCommit' => $compareCommit, 'resource_id' => $resource_id, 'pageUrlName' => $pageUrlName));
+			if($compare['success']) {
+				$diffHTML = '<table class="text-center" width="100%"><tr><td class="lead" width="50%">Current Revision</td><td class="lead" width="50%">Selected Revision</td></tr></table>' . $compare['diff'];
+				json_return_and_die(array('diff' => $diffHTML, 'message' => '', 'success' => true));					
+			} else {
+				json_return_and_die(array('diff' => '', 'message' => 'Error comparing page', 'success' => false));					
+			}
+		}
+		
+		// Rename a page
+		if ((argc() === 4) && (argv(2) === 'rename') && (argv(3) === 'page')) {
+			$resource_id = $_POST['resource_id']; 
+			$pageUrlName = $_POST['oldName'];
+			$pageNewName = $_POST['newName'];
+			if ($pageUrlName === 'Home') {
+				json_return_and_die(array('message' => 'Cannot rename Home','success' => false));
+			}
+			if(urlencode(escape_tags($pageNewName)) === '') {				
+				json_return_and_die(array('message' => 'Error renaming page. Invalid name.', 'success' => false));
+			}
+			// Determine if observer has permission to rename pages
+			$nick = argv(1);
+			$channel = get_channel_by_nick($nick);			
+			if (local_channel() !== intval($channel['channel_id'])) {
+				$observer_hash = get_observer_hash();
+				$perms = wiki_get_permissions($resource_id, intval($channel['channel_id']), $observer_hash);
+				if(!$perms['write']) {
+					logger('Wiki write permission denied. ' . EOL);
+					json_return_and_die(array('success' => false));					
+				}
+			}
+			$renamed = wiki_rename_page(array('resource_id' => $resource_id, 'pageUrlName' => $pageUrlName, 'pageNewName' => $pageNewName));
+			if($renamed['success']) {
+				$ob = \App::get_observer();
+				$commit = wiki_git_commit(array(
+						'commit_msg' => 'Renamed ' . urldecode($pageUrlName) . ' to ' . $renamed['page']['htmlName'], 
+						'resource_id' => $resource_id, 
+						'observer' => $ob,
+						'files' => array($pageUrlName . '.md', $renamed['page']['fileName']),
+						'all' => true
+						));
+				if($commit['success']) {
+					json_return_and_die(array('name' => $renamed['page'], 'message' => 'Wiki git repo commit made', 'success' => true));
+				} else {
+					json_return_and_die(array('message' => 'Error making git commit','success' => false));					
+				}
+			} else {
+				json_return_and_die(array('message' => 'Error renaming page', 'success' => false));					
+			}
+		}
 
 		//notice('You must be authenticated.');
 		json_return_and_die(array('message' => 'You must be authenticated.', 'success' => false));
diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php
index 1017ec6aa..820897ee9 100644
--- a/Zotlabs/Render/Comanche.php
+++ b/Zotlabs/Render/Comanche.php
@@ -179,7 +179,8 @@ class Comanche {
 		$channel_id = $this->get_channel_id();
 
 		if($channel_id) {
-			$r = q("select * from item inner join item_id on iid = item.id and item_id.uid = item.uid and item.uid = %d and service = 'BUILDBLOCK' and sid = '%s' limit 1",
+			$r = q("select * from item inner join iconfig on iconfig.iid = item.id and item.uid = %d 
+				and iconfig.cat = 'system' and iconfig.k = 'BUILDBLOCK' and iconfig.v = '%s' limit 1",
 				intval($channel_id),
 				dbesc($name)
 			);
@@ -282,12 +283,12 @@ class Comanche {
 
 
 	/**
-	 * Widgets will have to get any operational arguments from the session, the
-	 * global app environment, or config storage until we implement argument passing
+	 * Render a widget
 	 *
 	 * @param string $name
 	 * @param string $text
 	 */
+
 	function widget($name, $text) {
 		$vars = array();
 		$matches = array();
@@ -314,7 +315,7 @@ class Comanche {
 				require_once(theme_include($theme_widget));
 		}
 
-		if (function_exists($func))
+		if(function_exists($func))
 			return $func($vars);
 	}
 
diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php
index 121a9c3a1..2325a614b 100644
--- a/Zotlabs/Storage/BasicAuth.php
+++ b/Zotlabs/Storage/BasicAuth.php
@@ -3,6 +3,8 @@
 namespace Zotlabs\Storage;
 
 use Sabre\DAV;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
 
 /**
  * @brief Authentication backend class for DAV.
@@ -89,33 +91,20 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 
 		require_once('include/auth.php');
 		$record = account_verify_password($username, $password);
-		if ($record && $record['account_default_channel']) {
-			$r = q("SELECT * FROM channel WHERE channel_account_id = %d AND channel_id = %d LIMIT 1",
-				intval($record['account_id']),
-				intval($record['account_default_channel'])
-			);
-			if($r && $this->check_module_access($r[0]['channel_id'])) {
-				return $this->setAuthenticated($r[0]);
+		if($record && $record['account']) {
+			if($record['channel'])
+				$channel = $record['channel'];
+			else {
+				$r = q("SELECT * FROM channel WHERE channel_account_id = %d AND channel_id = %d LIMIT 1",
+					intval($record['account']['account_id']),
+					intval($record['account']['account_default_channel'])
+				);
+				if($r)
+					$channel = $r[0];
 			}
 		}
-		$r = q("SELECT * FROM channel WHERE channel_address = '%s' LIMIT 1",
-			dbesc($username)
-		);
-		if ($r) {
-			$x = q("SELECT account_flags, account_salt, account_password FROM account WHERE account_id = %d LIMIT 1",
-				intval($r[0]['channel_account_id'])
-			);
-			if ($x) {
-				// @fixme this foreach should not be needed?
-				foreach ($x as $record) {
-					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);
-						if($this->check_module_access($r[0]['channel_id']))
-							return $this->setAuthenticated($r[0]);
-					}
-				}
-			}
+		if($channel && $this->check_module_access($channel['channel_id'])) {
+			return $this->setAuthenticated($channel);
 		}
 
 		if($this->module_disabled)
@@ -145,6 +134,58 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 		return true;
 	}
 
+    /**
+     * When this method is called, the backend must check if authentication was
+     * successful.
+     *
+     * The returned value must be one of the following
+     *
+     * [true, "principals/username"]
+     * [false, "reason for failure"]
+     *
+     * If authentication was successful, it's expected that the authentication
+     * backend returns a so-called principal url.
+     *
+     * Examples of a principal url:
+     *
+     * principals/admin
+     * principals/user1
+     * principals/users/joe
+     * principals/uid/123457
+     *
+     * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
+     * return a string such as:
+     *
+     * principals/users/[username]
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return array
+     */
+    function check(RequestInterface $request, ResponseInterface $response) {
+
+		if(local_channel()) {
+			$this->setAuthenticated(\App::get_channel());
+			return [ true, $this->principalPrefix . $this->channel_name ];
+		}
+
+        $auth = new \Sabre\HTTP\Auth\Basic(
+            $this->realm,
+            $request,
+            $response
+        );
+
+        $userpass = $auth->getCredentials();
+        if (!$userpass) {
+            return [false, "No 'Authorization: Basic' header found. Either the client didn't send one, or the server is misconfigured"];
+        }
+        if (!$this->validateUserPass($userpass[0], $userpass[1])) {
+            return [false, "Username or password was incorrect"];
+        }
+        return [true, $this->principalPrefix . $userpass[0]];
+
+    }
+
 	protected function check_module_access($channel_id) {
 		if($channel_id && \App::$module === 'cdav') {
 			$x = get_pconfig($channel_id,'cdav','enabled');
@@ -222,4 +263,4 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic {
 		logger('owner_id ' . $this->owner_id, LOGGER_DATA);
 		logger('owner_nick ' . $this->owner_nick, LOGGER_DATA);
 	}
-}
\ No newline at end of file
+}
diff --git a/Zotlabs/Storage/Browser.php b/Zotlabs/Storage/Browser.php
index f875cbf33..713d75108 100644
--- a/Zotlabs/Storage/Browser.php
+++ b/Zotlabs/Storage/Browser.php
@@ -219,7 +219,7 @@ class Browser extends DAV\Browser\Plugin {
 
 		$output = '';
 		if ($this->enablePost) {
-			$this->server->emit('onHTMLActionsPanel', array($parent, &$output));
+			$this->server->emit('onHTMLActionsPanel', array($parent, &$output, $path));
 		}
 
 		$html .= replace_macros(get_markup_template('cloud.tpl'), array(
@@ -266,7 +266,7 @@ class Browser extends DAV\Browser\Plugin {
 	 * @param \Sabre\DAV\INode $node
 	 * @param string &$output
 	 */
-	public function htmlActionsPanel(DAV\INode $node, &$output) {
+	public function htmlActionsPanel(DAV\INode $node, &$output, $path) {
 		if (! $node instanceof DAV\ICollection)
 			return;
 
diff --git a/Zotlabs/Storage/CalDAVClient.php b/Zotlabs/Storage/CalDAVClient.php
new file mode 100644
index 000000000..c1a8db932
--- /dev/null
+++ b/Zotlabs/Storage/CalDAVClient.php
@@ -0,0 +1,738 @@
+<?php
+
+namespace Zotlabs\Storage;
+
+// The Hubzilla CalDAV client will store calendar information in the 'cal' DB table. 
+// Event information will remain in the 'event' table. In order to implement CalDAV on top of our
+// existing system, there is an event table column called vdata. This will hold the "one true record"
+// of the event in VCALENDAR format. When we receive a foreign event, we will pick out the fields
+// of this entry that are important to us and use it to populate the other event table fields. 
+// When we make an event change, it is required that we load this entry as a vobject, make the changes on the
+// vobject, and then store the result back in event.vdata. This will preserve foreign keys which we
+// know nothing about. Then we sync this back to the DAV server.
+
+// We still need a DB update to create a 'cal' table entry for our existing events and link these together. 
+// I'm currently anticipating separating tasks/to-do items from events, so each new account wil get two default calendars.  
+
+// We will eventually provide for magic-auth or cookie login of the CURL process so we won't be required to 
+// store our hubzilla password. Currently for testing we are using HTTP BASIC-AUTH and must initialise the 
+// username/password correctly to make the connection. 
+
+// Repeating events will be awkward because every instance has the same UUID. This would make it difficult to 
+// search for upcoming events if the initial instance was created (for instance) a few years ago. So the current plan is 
+// to create event instances for a prescribed time limit from now (perhaps 5-10 years for annual events). 
+// This plan may change. The repurcussions of this decision mean that an edit to a recurring event must
+// edit all existing instances of the event, and only one unique instance can be used for sync.
+// Sabre vobject provides a function to automatically expand recurring events into individual event instances.  
+
+
+
+class CalDAVClient {
+
+	private $username;
+	private $password;
+
+	private $url;
+
+	public $filepos = 0;
+	public $request_data = '';	
+
+	function __construct($user,$pass,$url) {
+		$this->username = $user;
+		$this->password = $pass;
+		$this->url = $url;
+
+	}
+
+	private function set_data($s) {
+		$this->request_data = $s;
+		$this->filepos = 0;
+	}
+
+	public function curl_read($ch,$fh,$size) {
+
+		if($this->filepos < 0) {
+			unset($fh);
+			return '';
+		}
+
+		$s = substr($this->request_data,$this->filepos,$size);
+
+		if(strlen($s) < $size)
+			$this->filepos = (-1);
+		else
+			$this->filepos = $this->filepos + $size;
+
+		return $s;
+	} 
+
+	function ctag_fetch() {
+		$headers = [ 'Depth: 0', 'Prefer: return-minimal', 'Content-Type: application/xml; charset=utf-8'];
+
+		// recommended ctag fetch by sabre
+
+		$this->set_data('<?xml version="1.0"?>
+<d:propfind xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/">
+  <d:prop>
+     <d:displayname />
+     <cs:getctag />
+	<d:sync-token />
+  </d:prop>
+</d:propfind>');
+
+		// thunderbird uses this - it's a bit more verbose on what capabilities
+		// are provided by the server
+
+		$this->set_data('<?xml version="1.0" encoding="UTF-8"?>
+<D:propfind xmlns:D="DAV:" xmlns:CS="http://calendarserver.org/ns/" xmlns:C="urn:ietf:params:xml:ns:caldav">
+<D:prop>
+    <D:resourcetype/>
+    <D:owner/>
+    <D:current-user-principal/>
+    <D:supported-report-set/>
+    <C:supported-calendar-component-set/>
+    <CS:getctag/>
+</D:prop>
+</D:propfind>');
+
+
+
+		$auth = $this->username . ':' . $this->password;
+
+		$recurse = 0;
+
+		$x = z_fetch_url($this->url,true,$recurse,
+			[   'headers' => $headers, 
+				'http_auth' => $auth, 
+				'custom' => 'PROPFIND', 
+				'upload' => true,
+				'infile' => 3, 
+				'infilesize' => strlen($this->request_data), 
+				'readfunc' => [ $this, 'curl_read' ] 
+			]);
+
+		return $x;
+
+	}
+
+
+	function detail_fetch() {
+		$headers = [ 'Depth: 1', 'Prefer: return-minimal', 'Content-Type: application/xml; charset=utf-8'];
+
+		// this query should return all objects in the given calendar, you can filter it appropriately 
+		// using filter options
+
+		$this->set_data('<?xml version="1.0"?>
+<c:calendar-query xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav" xmlns:cs="http://calendarserver.org/ns/">
+  <d:prop>
+     <d:getetag />
+     <c:calendar-data />
+  </d:prop>
+  <c:filter>
+        <c:comp-filter name="VCALENDAR" />
+    </c:filter>
+</c:calendar-query>');
+
+		$auth = $this->username . ':' . $this->password;
+
+		$recurse = 0;
+		$x = z_fetch_url($this->url,true,$recurse,
+			[   'headers' => $headers, 
+				'http_auth' => $auth, 
+				'custom' => 'REPORT', 
+				'upload' => true,
+				'infile' => 3, 
+				'infilesize' => strlen($this->request_data), 
+				'readfunc' => [ $this, 'curl_read' ] 
+			]);
+
+
+		return $x;
+
+	}
+
+
+}
+
+
+
+/*
+
+PROPFIND /calendars/johndoe/home/ HTTP/1.1
+Depth: 0
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+<d:propfind xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/">
+  <d:prop>
+     <d:displayname />
+     <cs:getctag />
+  </d:prop>
+</d:propfind>
+
+// Responses: success
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+<d:multistatus xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/">
+    <d:response>
+        <d:href>/calendars/johndoe/home/</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:displayname>Home calendar</d:displayname>
+                <cs:getctag>3145</cs:getctag>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+</d:multistatus>
+
+// Responses: fail
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+<d:multistatus xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/">
+    <d:response>
+        <d:href>/calendars/johndoe/home/</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:displayname />
+                <cs:getctag />
+            </d:prop>
+            <d:status>HTTP/1.1 403 Forbidden</d:status>
+        </d:propstat>
+    </d:response>
+</d:multistatus>
+
+
+// sample request body in DOM
+// prepare request body
+$doc  = new DOMDocument('1.0', 'utf-8');
+$doc->formatOutput = true;
+
+$query = $doc->createElement('c:calendar-query');
+$query->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:c', 'urn:ietf:params:xml:ns:caldav');
+$query->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:d', 'DAV:');
+
+$prop = $doc->createElement('d:prop');
+$prop->appendChild($doc->createElement('d:getetag'));
+$prop->appendChild($doc->createElement('c:calendar-data'));
+$query->appendChild($prop);
+$doc->appendChild($query);
+$body = $doc->saveXML();
+
+echo "Body: " . $body . "<br>";
+
+
+Now we download every single object in this calendar. To do this, we use a REPORT method.
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+<c:calendar-query xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">
+    <d:prop>
+        <d:getetag />
+        <c:calendar-data />
+    </d:prop>
+    <c:filter>
+        <c:comp-filter name="VCALENDAR" />
+    </c:filter>
+</c:calendar-query>
+
+This request will give us every object that's a VCALENDAR object, and its etag.
+
+If you're only interested in VTODO (because you're writing a todo app) you can also filter for just those:
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+<c:calendar-query xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">
+    <d:prop>
+        <d:getetag />
+        <c:calendar-data />
+    </d:prop>
+    <c:filter>
+        <c:comp-filter name="VCALENDAR">
+            <c:comp-filter name="VTODO" />
+        </c:comp-filter>
+    </c:filter>
+</c:calendar-query>
+
+Similarly it's also possible to filter to just events, or only get events within a specific time-range.
+
+This report will return a multi-status object again:
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+<d:multistatus xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/">
+    <d:response>
+        <d:href>/calendars/johndoe/home/132456762153245.ics</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:getetag>"2134-314"</d:getetag>
+                <c:calendar-data>BEGIN:VCALENDAR
+                    VERSION:2.0
+                    CALSCALE:GREGORIAN
+                    BEGIN:VTODO
+                    UID:132456762153245
+                    SUMMARY:Do the dishes
+                    DUE:20121028T115600Z
+                    END:VTODO
+                    END:VCALENDAR
+                </c:calendar-data>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+    <d:response>
+        <d:href>/calendars/johndoe/home/132456-34365.ics</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:getetag>"5467-323"</d:getetag>
+                <c:calendar-data>BEGIN:VCALENDAR
+                    VERSION:2.0
+                    CALSCALE:GREGORIAN
+                    BEGIN:VEVENT
+                    UID:132456-34365
+                    SUMMARY:Weekly meeting
+                    DTSTART:20120101T120000
+                    DURATION:PT1H
+                    RRULE:FREQ=WEEKLY
+                    END:VEVENT
+                    END:VCALENDAR
+                </c:calendar-data>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+</d:multistatus>
+
+This calendar only contained 2 objects. A todo and a weekly event.
+
+So after you retrieved and processed these, for each object you must retain:
+
+    The calendar data itself
+    The url
+    The etag
+
+In this case all urls ended with .ics. This is often the case, but you must not rely on this. In this case the UID in the calendar object was also identical to a part of the url. This too is often the case, but again not something you can rely on, so don't make any assumptions.
+
+The url and the UID have no meaningful relationship, so treat both those items as separate unique identifiers.
+Finding out if anything changed
+
+To see if anything in a calendar changed, we simply request the ctag again on the calendar. If the ctag did not change, you still have the latest copy.
+
+If it did change, you must request all the etags in the entire calendar again:
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+<c:calendar-query xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">
+    <d:prop>
+        <d:getetag />
+    </d:prop>
+    <c:filter>
+        <c:comp-filter name="VCALENDAR">
+            <c:comp-filter name="VTODO" />
+        </c:comp-filter>
+    </c:filter>
+</c:calendar-query>
+
+Note that this last request is extremely similar to a previous one, but we are only asking fo the etag, not the calendar-data.
+
+The reason for this, is that calendars can be rather huge. It will save a TON of bandwidth to only check the etag first.
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+<d:multistatus xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/">
+    <d:response>
+        <d:href>/calendars/johndoe/home/132456762153245.ics</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:getetag>"xxxx-xxx"</d:getetag>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+    <d:response>
+        <d:href>/calendars/johndoe/home/fancy-caldav-client-1234253678.ics</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:getetag>"5-12"</d:getetag>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+</d:multistatus>
+
+Judging from this last request, 3 things have changed:
+
+    The etag for the task has changed, so the contents must be different
+    There's a new url, some other client must have added an object
+    One object is missing, something must have deleted it.
+
+So based on those 3 items we know that we need to delete an object from our local list, and fetch the contents for the new item, and the updated one.
+
+To fetch the data for these, you can simply issue GET requests:
+
+GET /calendars/johndoe/home/132456762153245.ics HTTP/1.1
+
+But, because in a worst-case scenario this could result in a LOT of GET requests we can do a 'multiget'.
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+<c:calendar-multiget xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">
+    <d:prop>
+        <d:getetag />
+        <c:calendar-data />
+    </d:prop>
+    <d:href>/calendars/johndoe/home/132456762153245.ics</d:href>
+    <d:href>/calendars/johndoe/home/fancy-caldav-client-1234253678.ics</d:href>
+</c:calendar-multiget>
+
+This request will simply return a multi-status again with the calendar-data and etag.
+A small note about application design
+
+If you read this far and understood what's been said, you may have realized that it's a bit cumbersome to have a separate step for the initial sync, and subsequent updates.
+
+It would totally be possible to skip the 'initial sync', and just use calendar-query and calendar-multiget REPORTS for the initial sync as well.
+Updating a calendar object
+
+Updating a calendar object is rather simple:
+
+PUT /calendars/johndoe/home/132456762153245.ics HTTP/1.1
+Content-Type: text/calendar; charset=utf-8
+If-Match: "2134-314"
+
+BEGIN:VCALENDAR
+....
+END:VCALENDAR
+
+A response to this will be something like this:
+
+HTTP/1.1 204 No Content
+ETag: "2134-315"
+
+The update gave us back the new ETag. SabreDAV gives this ETag on updates back most of the time, but not always.
+
+There are cases where the caldav server must modify the iCalendar object right after storage. In those cases an ETag will not be returned, and you should issue a GET request immediately to get the correct object.
+
+A few notes:
+
+    You must not change the UID of the original object
+    Every object should hold only 1 event or task.
+    You cannot change an VEVENT into a VTODO.
+
+Creating a calendar object
+
+Creating a calendar object is almost identical, except that you don't have a url yet to a calendar object.
+
+Instead, it is up to you to determine the new url.
+
+PUT /calendars/johndoe/home/somerandomstring.ics HTTP/1.1
+Content-Type: text/calendar; charset=utf-8
+
+BEGIN:VCALENDAR
+....
+END:VCALENDAR
+
+A response to this will be something like this:
+
+HTTP/1.1 201 Created
+ETag: "21345-324"
+
+Similar to updating, an ETag is often returned, but there are cases where this is not true.
+Deleting a calendar object
+
+Deleting is simple enough:
+
+DELETE /calendars/johndoe/home/132456762153245.ics HTTP/1.1
+If-Match: "2134-314"
+
+Speeding up Sync with WebDAV-Sync
+
+WebDAV-Sync is a protocol extension that is defined in rfc6578. Because this extension was defined later, some servers may not support this yet.
+
+SabreDAV supports this since 2.0.
+
+WebDAV-Sync allows a client to ask just for calendars that have changed. The process on a high-level is as follows:
+
+    Client requests sync-token from server.
+    Server reports token 15.
+    Some time passes.
+    Client does a Sync REPORT on an calendar, and supplied token 15.
+    Server returns vcard urls that have changed or have been deleted and returns token 17.
+
+As you can see, after the initial sync, only items that have been created, modified or deleted will ever be sent.
+
+This has a lot of advantages. The transmitted xml bodies can generally be a lot shorter, and is also easier on both client and server in terms of memory and CPU usage, because only a limited set of items will have to be compared.
+
+It's important to note, that a client should only do Sync operations, if the server reports that it has support for it. The quickest way to do so, is to request {DAV}sync-token on the calendar you wish to sync.
+
+Technically, a server may support 'sync' on one calendar, and it may not support it on another, although this is probably rare.
+Getting the first sync-token
+
+Initially, we just request a sync token when asking for calendar information:
+
+PROPFIND /calendars/johndoe/home/ HTTP/1.1
+Depth: 0
+Content-Type: application/xml; charset=utf-8
+
+<d:propfind xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/">
+  <d:prop>
+     <d:displayname />
+     <cs:getctag />
+     <d:sync-token />
+  </d:prop>
+</d:propfind>
+
+This would return something as follows:
+
+<d:multistatus xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/">
+    <d:response>
+        <d:href>/calendars/johndoe/home/</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:displayname>My calendar</d:displayname>
+                <cs:getctag>3145</cs:getctag>
+                <d:sync-token>http://sabredav.org/ns/sync-token/3145</d:sync-token>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+</d:multistatus>
+
+As you can see, the sync-token is a url. It always should be a url. Even though a number appears in the url, you are not allowed to attach any meaning to that url. Some servers may have use an increasing number, another server may use a completely random string.
+Receiving changes
+
+After a sync token has been obtained, and the client already has the initial copy of the calendar, the client is able to request all changes since the token was issued.
+
+This is done with a REPORT request that may look like this:
+
+REPORT /calendars/johndoe/home/ HTTP/1.1
+Host: dav.example.org
+Content-Type: application/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<d:sync-collection xmlns:d="DAV:">
+  <d:sync-token>http://sabredav.org/ns/sync/3145</d:sync-token>
+  <d:sync-level>1</d:sync-level>
+  <d:prop>
+    <d:getetag/>
+  </d:prop>
+</d:sync-collection>
+
+This requests all the changes since sync-token identified by http://sabredav.org/ns/sync/3145, and for the calendar objects that have been added or modified, we're requesting the etag.
+
+The response to a query like this is another multistatus xml body. Example:
+
+HTTP/1.1 207 Multi-Status
+Content-Type: application/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<d:multistatus xmlns:d="DAV:">
+    <d:response>
+        <d:href>/calendars/johndoe/home/newevent.ics</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:getetag>"33441-34321"</d:getetag>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+    <d:response>
+        <d:href>/calendars/johndoe/home/updatedevent.ics</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:getetag>"33541-34696"</d:getetag>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+    <d:response>
+        <d:href>/calendars/johndoe/home/deletedevent.ics</d:href>
+        <d:status>HTTP/1.1 404 Not Found</d:status>
+    </d:response>
+    <d:sync-token>http://sabredav.org/ns/sync/5001</d:sync-token>
+ </d:multistatus>
+
+The last response reported two changes: newevent.ics and updatedevent.ics. There's no way to tell from the response wether those cards got created or updated, you, as a client can only infer this based on the vcards you are already aware of.
+
+The entry with name deletedevent.ics got deleted as indicated by the 404 status. Note that the status element is here a child of d:response when in all previous examples it has been a child of d:propstat.
+
+The other difference with the other multi-status examples, is that this one has a sync-token element with the latest sync-token.
+Caveats
+
+Note that a server is free to 'forget' any sync-tokens that have been previously issued. In this case it may be needed to do a full-sync again.
+
+In case the supplied sync-token is not recognized by the server, a HTTP error is emitted. SabreDAV emits a 403.
+Discovery
+
+Ideally you will want to make sure that all the calendars in an account are automatically discovered. The best user interface would be to just have to ask for three items:
+
+    Username
+    Password
+    Server
+
+And the server should be as short as possible. This is possible with most servers.
+
+If, for example a user specified 'dav.example.org' for the server, the first thing you should do is attempt to send a PROPFIND request to https://dav.example.org/. Note that you SHOULD try the https url before the http url.
+
+This PROPFIND request looks as follows:
+
+PROPFIND / HTTP/1.1
+Depth: 0
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+<d:propfind xmlns:d="DAV:">
+  <d:prop>
+     <d:current-user-principal />
+  </d:prop>
+</d:propfind>
+
+This will return a response such as the following:
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+<d:multistatus xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/">
+    <d:response>
+        <d:href>/</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:current-user-principal>
+                    <d:href>/principals/users/johndoe/</d:href>
+                </d:current-user-principal>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+</d:multistatus>
+
+A 'principal' is a user. The url that's being returned, is a url that refers to the current user. On this url you can request additional information about the user.
+
+What we need from this url, is their 'calendar home'. The calendar home is a collection that contains all of the users' calendars.
+
+To request that, issue the following request:
+
+PROPFIND /principals/users/johndoe/ HTTP/1.1
+Depth: 0
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+<d:propfind xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">
+  <d:prop>
+     <c:calendar-home-set />
+  </d:prop>
+</d:propfind>
+
+This will return a response such as the following:
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+<d:multistatus xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">
+    <d:response>
+        <d:href>/principals/users/johndoe/</d:href>
+        <d:propstat>
+            <d:prop>
+                <c:calendar-home-set>
+                    <d:href>/calendars/johndoe/</d:href>
+                </c:calendar-home-set>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+</d:multistatus>
+
+Lastly, to list all the calendars for the user, issue a PROPFIND request with Depth: 1.
+
+PROPFIND /calendars/johndoe/ HTTP/1.1
+Depth: 1
+Prefer: return-minimal
+Content-Type: application/xml; charset=utf-8
+
+<d:propfind xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/" xmlns:c="urn:ietf:params:xml:ns:caldav">
+  <d:prop>
+     <d:resourcetype />
+     <d:displayname />
+     <cs:getctag />
+     <c:supported-calendar-component-set />
+  </d:prop>
+</d:propfind>
+
+In that last request, we asked for 4 properties.
+
+The resourcetype tells us what type of object we're getting back. You must read out the resourcetype and ensure that it contains at least a calendar element in the CalDAV namespace. Other items may be returned, including non- calendar, which your application should ignore.
+
+The displayname is a human-readable string for the calendarname, the ctag was already covered in an earlier section.
+
+Lastly, supported-calendar-component-set. This gives us a list of components that the calendar accepts. This could be just VTODO, VEVENT, VJOURNAL or a combination of these three.
+
+If you are just creating a todo-list application, this means you should only list the calendars that support the VTODO component.
+
+HTTP/1.1 207 Multi-status
+Content-Type: application/xml; charset=utf-8
+
+<d:multistatus xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/" xmlns:c="urn:ietf:params:xml:ns:caldav">
+    <d:response>
+        <d:href>/calendars/johndoe/</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:resourcetype>
+                    <d:collection/>
+                </d:resourcetype>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+    <d:response>
+        <d:href>/calendars/johndoe/home/</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:resourcetype>
+                    <d:collection/>
+                    <c:calendar/>
+                </d:resourcetype>
+                <d:displayname>Home calendar</d:displayname>
+                <cs:getctag>3145</cs:getctag>
+                <c:supported-calendar-component-set>
+                    <c:comp name="VEVENT" />
+                </c:supported-calendar-component-set>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+    <d:response>
+        <d:href>/calendars/johndoe/tasks/</d:href>
+        <d:propstat>
+            <d:prop>
+                <d:resourcetype>
+                    <d:collection/>
+                    <c:calendar/>
+                </d:resourcetype>
+                <d:displayname>My TODO list</d:displayname>
+                <cs:getctag>3345</cs:getctag>
+                <c:supported-calendar-component-set>
+                    <c:comp name="VTODO" />
+                </c:supported-calendar-component-set>
+            </d:prop>
+            <d:status>HTTP/1.1 200 OK</d:status>
+        </d:propstat>
+    </d:response>
+</d:multistatus>
+*/
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php
index 0ccd9da47..15e06e28f 100644
--- a/Zotlabs/Storage/Directory.php
+++ b/Zotlabs/Storage/Directory.php
@@ -3,6 +3,7 @@
 namespace Zotlabs\Storage;
 
 use Sabre\DAV;
+use Sabre\HTTP;
 
 /**
  * @brief RedDirectory class.
@@ -91,7 +92,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			throw new DAV\Exception\Forbidden('Permission denied.');
 		}
 
-		$contents = RedCollectionData($this->red_path, $this->auth);
+		$contents = $this->CollectionData($this->red_path, $this->auth);
 		return $contents;
 	}
 
@@ -119,7 +120,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			return new Directory('/' . $modulename, $this->auth);
 		}
 
-		$x = RedFileData($this->ext_path . '/' . $name, $this->auth);
+		$x = $this->FileData($this->ext_path . '/' . $name, $this->auth);
 		if ($x) {
 			return $x;
 		}
@@ -159,7 +160,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			throw new DAV\Exception\Forbidden('Permission denied.');
 		}
 
-		list($parent_path, ) = DAV\URLUtil::splitPath($this->red_path);
+		list($parent_path, ) = HTTP\URLUtil::splitPath($this->red_path);
 		$new_path = $parent_path . '/' . $name;
 
 		$r = q("UPDATE attach SET filename = '%s' WHERE hash = '%s' AND uid = %d",
@@ -206,6 +207,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			throw new DAV\Exception\Forbidden('Permission denied.');
 		}
 
+
 		$mimetype = z_mime_content_type($name);
 
 		$c = q("SELECT * FROM channel WHERE channel_id = %d AND channel_removed = 0 LIMIT 1",
@@ -432,8 +434,8 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			return true;
 		}
 
-		$x = RedFileData($this->ext_path . '/' . $name, $this->auth, true);
-		//logger('RedFileData returns: ' . print_r($x, true), LOGGER_DATA);
+		$x = $this->FileData($this->ext_path . '/' . $name, $this->auth, true);
+		//logger('FileData returns: ' . print_r($x, true), LOGGER_DATA);
 		if ($x)
 			return true;
 
@@ -566,4 +568,280 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
 			$free
 		);
 	}
+
+
+	/**
+	 * @brief Array with all Directory and File DAV\Node items for the given path.
+ 	 *
+	 *
+	 * @param string $file path to a directory
+	 * @param \Zotlabs\Storage\BasicAuth &$auth
+	 * @returns null|array \Sabre\DAV\INode[]
+	 * @throw \Sabre\DAV\Exception\Forbidden
+	 * @throw \Sabre\DAV\Exception\NotFound
+	 */
+
+	function CollectionData($file, &$auth) {
+		$ret = array();
+
+		$x = strpos($file, '/cloud');
+		if ($x === 0) {
+			$file = substr($file, 6);
+		}
+
+		// return a list of channel if we are not inside a channel
+		if ((! $file) || ($file === '/')) {
+			return $this->ChannelList($auth);
+		}
+
+		$file = trim($file, '/');
+		$path_arr = explode('/', $file);
+
+		if (! $path_arr)
+			return null;
+
+		$channel_name = $path_arr[0];
+
+		$r = q("SELECT channel_id FROM channel WHERE channel_address = '%s' LIMIT 1",
+			dbesc($channel_name)
+		);
+
+		if (! $r)
+			return null;
+
+		$channel_id = $r[0]['channel_id'];
+		$perms = permissions_sql($channel_id);
+
+		$auth->owner_id = $channel_id;
+
+		$path = '/' . $channel_name;
+
+		$folder = '';
+		$errors = false;
+		$permission_error = false;
+
+		for ($x = 1; $x < count($path_arr); $x++) {
+			$r = q("SELECT id, hash, filename, flags, is_dir FROM attach WHERE folder = '%s' AND filename = '%s' AND uid = %d AND is_dir != 0 $perms LIMIT 1",
+				dbesc($folder),
+				dbesc($path_arr[$x]),
+				intval($channel_id)
+			);
+			if (! $r) {
+				// path wasn't found. Try without permissions to see if it was the result of permissions.
+				$errors = true;
+				$r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0 limit 1",
+					dbesc($folder),
+					basename($path_arr[$x]),
+					intval($channel_id)
+				);
+				if ($r) {
+					$permission_error = true;
+				}
+				break;
+			}
+
+			if ($r && intval($r[0]['is_dir'])) {
+				$folder = $r[0]['hash'];
+				$path = $path . '/' . $r[0]['filename'];
+			}
+		}
+
+		if ($errors) {
+			if ($permission_error) {
+				throw new DAV\Exception\Forbidden('Permission denied.');
+			} 
+			else {
+				throw new DAV\Exception\NotFound('A component of the request file path could not be found.');
+			}
+		}
+
+		// This should no longer be needed since we just returned errors for paths not found
+		if ($path !== '/' . $file) {
+			logger("Path mismatch: $path !== /$file");
+			return NULL;
+		}
+		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+			$prefix = 'DISTINCT ON (filename)';
+			$suffix = 'ORDER BY filename';
+		} 
+		else {
+			$prefix = '';
+			$suffix = 'GROUP BY filename';
+		}
+		$r = q("select $prefix id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, created, edited from attach where folder = '%s' and uid = %d $perms $suffix",
+			dbesc($folder),
+			intval($channel_id)
+		);
+
+		foreach ($r as $rr) {
+			//logger('filename: ' . $rr['filename'], LOGGER_DEBUG);
+			if (intval($rr['is_dir'])) {
+				$ret[] = new Directory($path . '/' . $rr['filename'], $auth);
+			} 
+			else {
+				$ret[] = new File($path . '/' . $rr['filename'], $rr, $auth);
+			}
+		}
+
+		return $ret;
+	}
+
+
+	/**
+	 * @brief Returns an array with viewable channels.
+	 *
+	 * Get a list of Directory objects with all the channels where the visitor
+	 * has <b>view_storage</b> perms.
+	 *
+	 *
+	 * @param BasicAuth &$auth
+	 * @return array Directory[]
+ 	 */
+
+	function ChannelList(&$auth) {
+		$ret = array();
+
+		$r = q("SELECT channel_id, channel_address FROM channel WHERE channel_removed = 0 
+			AND channel_system = 0 AND NOT (channel_pageflags & %d)>0",
+			intval(PAGE_HIDDEN)
+		);
+
+		if ($r) {
+			foreach ($r as $rr) {
+				if (perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage')) {
+					logger('found channel: /cloud/' . $rr['channel_address'], LOGGER_DATA);
+					// @todo can't we drop '/cloud'? It gets stripped off anyway in RedDirectory
+					$ret[] = new Directory('/cloud/' . $rr['channel_address'], $auth);
+				}
+			}
+		}
+		return $ret;
+	}
+
+
+	/**
+	 * @brief 
+	 *
+	 *
+	 * @param string $file
+	 *  path to file or directory
+	 * @param BasicAuth &$auth
+	 * @param boolean $test (optional) enable test mode
+	 * @return File|Directory|boolean|null
+	 * @throw \Sabre\DAV\Exception\Forbidden
+	 */
+
+	function FileData($file, &$auth, $test = false) {
+		logger($file . (($test) ? ' (test mode) ' : ''), LOGGER_DATA);
+
+		$x = strpos($file, '/cloud');
+		if ($x === 0) {
+			$file = substr($file, 6);
+		}
+		else {
+			$x = strpos($file,'/dav');
+			if($x === 0)
+				$file = substr($file,4);
+		}
+
+
+		if ((! $file) || ($file === '/')) {
+			return new Directory('/', $auth);
+		}
+
+		$file = trim($file, '/');
+
+		$path_arr = explode('/', $file);
+
+		if (! $path_arr)
+			return null;
+
+		$channel_name = $path_arr[0];
+
+		$r = q("select channel_id from channel where channel_address = '%s' limit 1",
+			dbesc($channel_name)
+		);
+
+		if (! $r)
+			return null;
+
+		$channel_id = $r[0]['channel_id'];
+
+		$path = '/' . $channel_name;
+
+		$auth->owner_id = $channel_id;
+
+		$permission_error = false;
+
+		$folder = '';
+
+		require_once('include/security.php');
+		$perms = permissions_sql($channel_id);
+
+		$errors = false;
+
+		for ($x = 1; $x < count($path_arr); $x++) {		
+			$r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0 $perms",
+				dbesc($folder),
+				dbesc($path_arr[$x]),
+				intval($channel_id)
+			);
+
+			if ($r && intval($r[0]['is_dir'])) {
+				$folder = $r[0]['hash'];
+				$path = $path . '/' . $r[0]['filename'];
+			}
+			if (! $r) {
+				$r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, os_storage, created, edited from attach 
+					where folder = '%s' and filename = '%s' and uid = %d $perms order by filename limit 1",
+					dbesc($folder),
+					dbesc(basename($file)),
+					intval($channel_id)
+				);
+			}
+			if (! $r) {
+				$errors = true;
+				$r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, os_storage, created, edited from attach 
+					where folder = '%s' and filename = '%s' and uid = %d order by filename limit 1",
+					dbesc($folder),
+					dbesc(basename($file)),
+					intval($channel_id)
+				);
+				if ($r)
+					$permission_error = true;
+			}
+		}
+
+		if ($path === '/' . $file) {
+			if ($test)
+				return true;
+			// final component was a directory.
+			return new Directory($file, $auth);
+		}
+
+		if ($errors) {
+			logger('not found ' . $file);
+			if ($test)
+				return false;
+			if ($permission_error) {
+				logger('permission error ' . $file);
+				throw new DAV\Exception\Forbidden('Permission denied.');
+			}
+			return;
+		}
+
+		if ($r) {
+			if ($test)
+				return true;
+
+			if (intval($r[0]['is_dir'])) {
+				return new Directory($path . '/' . $r[0]['filename'], $auth);
+			}
+			else {
+				return new File($path . '/' . $r[0]['filename'], $r[0], $auth);
+			}
+		}
+		return false;
+	}
+
 }
diff --git a/Zotlabs/Storage/File.php b/Zotlabs/Storage/File.php
index ecd15cc55..5a70a99f1 100644
--- a/Zotlabs/Storage/File.php
+++ b/Zotlabs/Storage/File.php
@@ -337,6 +337,10 @@ class File extends DAV\Node implements DAV\IFile {
 			}
 		}
 
+		if(get_pconfig($this->auth->owner_id,'system','os_delete_prohibit') && \App::$module == 'dav') {
+			throw new DAV\Exception\Forbidden('Permission denied.');
+		}
+ 
 		attach_delete($this->auth->owner_id, $this->data['hash']);
 
 		$ch = channelx_by_n($this->auth->owner_id);
diff --git a/Zotlabs/Web/CheckJS.php b/Zotlabs/Web/CheckJS.php
index 5f9856a8c..109790fa5 100644
--- a/Zotlabs/Web/CheckJS.php
+++ b/Zotlabs/Web/CheckJS.php
@@ -21,6 +21,9 @@ class CheckJS {
 			$page = urlencode(\App::$query_string);
 
 			if($test) {
+				self::$jsdisabled = 1;
+				if(array_key_exists('jsdisabled',$_COOKIE))
+					self::$jsdisabled = $_COOKIE['jsdisabled'];
 
     			if(! array_key_exists('jsdisabled',$_COOKIE)) {
 			        \App::$page['htmlhead'] .= "\r\n" . '<script>document.cookie="jsdisabled=0; path=/"; var jsMatch = /\&jsdisabled=0/; if (!jsMatch.exec(location.href)) { location.href = "' . z_root() . '/nojs/0?f=&redir=' . $page . '" ; }</script>' . "\r\n";
diff --git a/Zotlabs/Web/Controller.php b/Zotlabs/Web/Controller.php
index ac835e008..2d0f58891 100644
--- a/Zotlabs/Web/Controller.php
+++ b/Zotlabs/Web/Controller.php
@@ -9,4 +9,5 @@ class Controller {
 	function post() {}
 	function get() {}
 
-}
\ No newline at end of file
+}
+
diff --git a/Zotlabs/Web/SessionHandler.php b/Zotlabs/Web/SessionHandler.php
index 6e7333b4b..93b27a7e8 100644
--- a/Zotlabs/Web/SessionHandler.php
+++ b/Zotlabs/Web/SessionHandler.php
@@ -24,7 +24,8 @@ class SessionHandler implements \SessionHandlerInterface {
 				return $r[0]['sess_data'];
 			}
 			else {
-				q("INSERT INTO `session` (sid, expire) values ('%s', '%s')",
+				q("INSERT INTO `session` (sess_data, sid, expire) values ('%s', '%s', '%s')",
+					dbesc(''),
 					dbesc($id),
 					dbesc(time() + 300)
 				);
diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php
index 88ab4995b..d4f3cb9ea 100644
--- a/Zotlabs/Web/WebServer.php
+++ b/Zotlabs/Web/WebServer.php
@@ -59,7 +59,14 @@ class WebServer {
 			\App::$query_string = strip_zids(\App::$query_string);
 			if(! local_channel()) {
 				$_SESSION['my_address'] = $_GET['zid'];
-				zid_init($a);
+				zid_init();
+			}
+		}
+
+		if((x($_GET,'zat')) && (! \App::$install)) {
+			\App::$query_string = strip_zats(\App::$query_string);
+			if(! local_channel()) {
+				zat_init();
 			}
 		}
 
diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php
index 229fda8bd..e7603442f 100644
--- a/Zotlabs/Zot/Finger.php
+++ b/Zotlabs/Zot/Finger.php
@@ -28,7 +28,7 @@ class Finger {
 
 		if (strpos($webbie,'@') === false) {
 			$address = $webbie;
-			$host = App::get_hostname();
+			$host = \App::get_hostname();
 		} else {
 			$address = substr($webbie,0,strpos($webbie,'@'));
 			$host = substr($webbie,strpos($webbie,'@')+1);
@@ -127,4 +127,4 @@ class Finger {
 		return $x;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/boot.php b/boot.php
index e4007eb3a..4909c8e75 100755
--- a/boot.php
+++ b/boot.php
@@ -34,7 +34,6 @@ require_once('include/text.php');
 require_once('include/datetime.php');
 require_once('include/language.php');
 require_once('include/nav.php');
-require_once('include/cache.php');
 require_once('include/permissions.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
@@ -45,10 +44,10 @@ require_once('include/account.php');
 
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '1.8.1' );
+define ( 'STD_VERSION',             '1.10' );
 define ( 'ZOT_REVISION',            '1.1' );
 
-define ( 'DB_UPDATE_VERSION',       1176  );
+define ( 'DB_UPDATE_VERSION',       1180  );
 
 
 /**
@@ -771,6 +770,7 @@ class App {
 	public static  $groups;
 	public static  $language;
 	public static  $langsave;
+	public static  $rtl = false;
 	public static  $plugins_admin;
 	public static  $module_loaded = false;
 	public static  $query_string;
@@ -1703,7 +1703,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) {
 		'$logout'       => t('Logout'),
 		'$login'        => t('Login'),
 		'$form_id'      => $form_id,
-		'$lname'        => array('username', t('Email') , '', ''),
+		'$lname'        => array('username', t('Login/Email') , '', ''),
 		'$lpassword'    => array('password', t('Password'), '', ''),
 		'$remember_me'  => array('remember_me', t('Remember me'), '', '',array(t('No'),t('Yes'))),
 		'$hiddens'      => $hiddens,
@@ -2282,6 +2282,12 @@ function construct_page(&$a) {
 	$page    = App::$page;
 	$profile = App::$profile;
 
+	// There's some experimental support for right-to-left text in the view/php/default.php page template.
+	// In v1.9 we started providing direction preference in the per language hstrings.php file
+	// This requires somebody with fluency in a RTL language to make happen
+
+	$page['direction'] = 0; // ((App::$rtl) ? 1 : 0);
+
 	header("Content-type: text/html; charset=utf-8");
 
 	// security headers - see https://securityheaders.io
@@ -2457,9 +2463,10 @@ function check_cron_broken() {
 		return;
 	}
 
+	set_config('system','lastcroncheck',datetime_convert());
+
 	if(($d) && ($d > datetime_convert('UTC','UTC','now - 3 days'))) {
 		// Scheduled tasks have run successfully in the last 3 days.
-		set_config('system','lastcroncheck',datetime_convert());
 		return;
 	}
 
diff --git a/doc/bbcode.html b/doc/bbcode.html
index 5a51135ea..7a2c969eb 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -14,6 +14,7 @@
 <li>[img float=right]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg" style="float:right;" alt="Image/photo" /><br />
 <div style="clear:both;"></div>
 <li>[code]code[/code] <code>code</code><br />
+<li>[code=xxx]syntax highlighted code[/code] <code>supported languages php, css, mysql, sql, abap, diff, html, perl, ruby, vbscript, avrc, dtd, java, xml, cpp, python, javascript, js, json, sh</code><br />
 <li>[quote]quote[/quote] <blockquote>quote</blockquote><br />
 <li>[quote=Author]Author? Me? No, no, no...[/quote] <br /><strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote><br />
 <li> [nobb] may be used to escape bbcode.</ul><br /> 
@@ -83,7 +84,7 @@ or<br /><br />[dl terms="b"]<br />[*= First element term] First element descript
 <li>[spoiler] for hiding spoilers<br /><br /></li>
 
 <li>[rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional</li>
-<li>[qr]text to post[/qr] - create a QR code.</li>
+<li>[qr]text to post[/qr] - create a QR code (if the qrator plugin is installed).</li>
 <li>[toc] - create a table of content in a webpage. Please refer to the <a href="http://ndabas.github.io/toc/" target="_blank">original jquery toc</a> to get more explanations.
 	<ul>
 		<li>Optional param: 'data-toc'. If ommited the default is 'body'</li>
diff --git a/doc/context/de/wiki/help.html b/doc/context/de/wiki/help.html
new file mode 100644
index 000000000..e203ee221
--- /dev/null
+++ b/doc/context/de/wiki/help.html
@@ -0,0 +1,10 @@
+<dl class="dl-horizontal">
+  <dt>Allgemein</dt>
+  <dd>Jedes Wiki ist eine Sammlung aus mit Markdown formatierten Seiten.</dd>
+  <dt><a href="#" onclick='contextualHelpFocus("#wiki_list", 1); return false;' title="Click to highlight element...">Wiki Liste</a></dt>
+  <dd>Wikis die dem eigenen Kanal gehören und <i>mit der Berechtigung zum Anschauen</i>, sind in der Seitenleiste gelistet.</dd>
+  <dt><a href="#" onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Click to highlight element...">Seiten Versionen</a></dt>
+  <dd>Jede Änderung einer Seite wird gespeichert, um eine schnelle Berichtigung zu ermöglichen. Klick auf das <b>Versionsgeschichte</b> Tab um den Verlauf der Seitenbearbeitung zu sehen, einschließlich Datum und Autor. Der Zurück-Knopf lädt die ausgewählte Änderung, aber ohne die Seite automatisch zu spreichern.</dd>
+  <dt><a href="#" onclick='contextualHelpFocus("#wiki_page_list", 1); return false;' title="Click to highlight element...">Seiten</a></dt>
+  <dd>Die Seiten des Wikis werden in <b>Wiki Seiten</b> gelistet. Vor dem Speichern einer Seite über das <b>Seiten</b> Dropdown Menu, hast Du die Möglichkeit eine <a href="#" onclick='contextualHelpFocus("#id_commitMsg", 0); return false;' title="Click to highlight element...">Zusammenfassung der Änderungen</a> einzutragen. Dieser Text wird anschließend unter <a href="#" onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Click to highlight element..."><b>Seiten Versionen</b></a> in der Versionsgeschichte angezeigt.</dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/en/wiki/help.html b/doc/context/en/wiki/help.html
new file mode 100644
index 000000000..314a9d60b
--- /dev/null
+++ b/doc/context/en/wiki/help.html
@@ -0,0 +1,10 @@
+<dl class="dl-horizontal">
+  <dt>General</dt>
+  <dd>Each wiki is a collection of pages, composed as Markdown-formatted text files.</dd>
+  <dt><a href='#' onclick='contextualHelpFocus("#wiki_list", 1); return false;' title="Click to highlight element...">Wiki List</a></dt>
+  <dd>Wikis owned by the channel <i>that you have permission to view</i> are listed in the side panel.</dd>
+  <dt><a href='#' onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Click to highlight element...">Page History</a></dt>
+  <dd>Every revision of a page is saved to allow quick reversion. Click the <b>History</b> tab to view a history of page revisions, including the date and author of each. The revert button will load the selected revision but will not automatically save the page.</dd>
+  <dt><a href='#' onclick='contextualHelpFocus("#wiki_page_list", 1); return false;' title="Click to highlight element...">Pages</a></dt>
+  <dd>The list of pages in the wiki are listed in the <b>Wiki Pages</b> panel. Prior to saving page edits using the <b>Page</b> control dropdown menu, you may <a href='#' onclick='contextualHelpFocus("#id_commitMsg", 0); return false;' title="Click to highlight element...">enter a custom message</a> to be displayed in the <a href='#' onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Click to highlight element..."><b>Page History</b></a> viewer along with the revision.</dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/es-es/wiki/help.html b/doc/context/es-es/wiki/help.html
new file mode 100644
index 000000000..fdae1f095
--- /dev/null
+++ b/doc/context/es-es/wiki/help.html
@@ -0,0 +1,10 @@
+<dl class="dl-horizontal">
+  <dt>General</dt>
+  <dd>Cada wiki es una colección de páginas, compuestas como ficheros de texto formateados en Markdown.</dd>
+  <dt><a href='#' onclick='contextualHelpFocus("#wiki_list", 1); return false;' title="Pulsar para resaltar el elemento...">Lista de wikis</a></dt>
+  <dd>Las páginas wiki propiedad del canal <i>que esté autorizado a ver</i> aparecen en el panel lateral.</dd>
+  <dt><a href='#' onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Pulsar para resaltar el elemento...">Historial de la página</a></dt>
+  <dd>Cada revisión de una página se salva para permitir su rápida recuperación. Pulsar en la pestaña <b>Historial</b> para ver las revisiones de la página, incluyendo la fecha y el autor de cada una. El botón de reversión cargará la revisión seleccionada, pero no salvará automáticamente la página.</dd>
+  <dt><a href='#' onclick='contextualHelpFocus("#wiki_page_list", 1); return false;' title="Pulsar para resaltar el elemento...">Páginas</a></dt>
+  <dd>La lista de páginas en el wiki aparece en el panel <b>Páginas del wiki</b>. Antes de salvar las páginas editadas usando el control <b>Página</b> en el menú desplegable, puede <a href='#' onclick='contextualHelpFocus("#id_commitMsg", 0); return false;' title="Pulsar para resaltar el elemento...">escribir un mensaje personalizado</a> que se verá en el visor <a href='#' onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Pulsar para resaltar el elemento..."><b>Historial de la página</b></a> junto con la revisión.</dd>
+</dl>
diff --git a/doc/context/it/wiki/help.html b/doc/context/it/wiki/help.html
new file mode 100644
index 000000000..e93e18eb4
--- /dev/null
+++ b/doc/context/it/wiki/help.html
@@ -0,0 +1,10 @@
+<dl class="dl-horizontal">
+  <dt>General</dt>  
+  <dd>Ogni wiki è una raccolta di pagine, composta di file di testo formattati con Markdown.</dd>  
+  <dt><a href="#" onclick='contextualHelpFocus("#wiki_list", 1); return false;' title="Fai click per evidenziare l'elemento...">Elenco dei Wiki</a></dt>  
+  <dd>I Wiki del canale <i>che sei abilitato a vedere</i> sono elencati nel pannello laterale.</dd>  
+  <dt><a href="#" onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Fai click per evidenziare l'elemento...">Cronologia della pagina</a></dt>  
+  <dd>Le revisioni di ogni pagina vengono salvate per rendere possibile un ripristino veloce. Fai click sulla tab <b>Cronologia</b> per vedere l'elenco delle revisioni, con autore e data delle stesse. Il bottone di ripristino riporterà alla revisione selezionata, senza salvare automaticamente la pagina.</dd>  
+  <dt><a href="#" onclick='contextualHelpFocus("#wiki_page_list", 1); return false;' title="Fai click per evidenziare l'elemento...">Pagine</a></dt>  
+  <dd>L'elenco delle pagine del wiki si trova nel pannello <b>Pagine del wiki</b>. Prima di salvare le modifiche con il menu a discela <b>Pagina</b>, puoi <a href="#" onclick='contextualHelpFocus("#id_commitMsg", 0); return false;' title="Fai click per evidenziare l'elemento...">inserire un messaggio</a> che verrà visualizzato nella visualizzazione della <a href="#" onclick='contextualHelpFocus("#wiki-get-history", 0); return false;' title="Fai click per evidenziare l'elemento..."><b>storia della pagina</b></a> insieme alla revisione.</dd>
+</dl>
\ No newline at end of file
diff --git a/doc/database.bb b/doc/database.bb
index d327adbdc..02a70e2c7 100644
--- a/doc/database.bb
+++ b/doc/database.bb
@@ -1,6 +1,7 @@
 [h2]Database Tables[/h2]
 [table]
 [tr][th]Table[/th][th]Description[/th][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_abconfig]abconfig[/zrl][/td][td]arbitrary storage for connections of local channels[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_abook]abook[/zrl][/td][td]connections of local channels[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_account]account[/zrl][/td][td]service provider account[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_addon]addon[/zrl][/td][td]registered plugins[/td][/tr]
@@ -8,6 +9,7 @@
 [tr][td][zrl=[baseurl]/help/database/db_attach]attach[/zrl][/td][td]file attachments[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_auth_codes]auth_codes[/zrl][/td][td]OAuth usage[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_cache]cache[/zrl][/td][td]OEmbed cache[/td][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_cal]cal[/zrl][/td][td]CalDAV containers for events[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_channel]channel[/zrl][/td][td]local channels[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_chat]chat[/zrl][/td][td]chat room content[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_chatpresence]chatpresence[/zrl][/td][td]channel presence information for chat[/td][/tr]
@@ -16,17 +18,14 @@
 [tr][td][zrl=[baseurl]/help/database/db_config]config[/zrl][/td][td]main configuration storage[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_conv]conv[/zrl][/td][td]Diaspora private messages meta conversation structure[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_event]event[/zrl][/td][td]Events[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_fcontact]fcontact[/zrl][/td][td]friend suggestion stuff (obsolete)[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_ffinder]ffinder[/zrl][/td][td]friend suggestion stuff (obsolete)[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_fserver]fserver[/zrl][/td][td]obsolete[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_fsuggest]fsuggest[/zrl][/td][td]friend suggestion stuff (unused)[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_group_member]group_member[/zrl][/td][td]privacy groups (collections), group info[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_groups]groups[/zrl][/td][td]privacy groups (collections), member info[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_hook]hook[/zrl][/td][td]plugin hook registry[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_hubloc]hubloc[/zrl][/td][td]xchan location storage, ties a hub location to an xchan[/td][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_iconfig]iconfig[/zrl][/td][td]extensible arbitrary storage for items[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_issue]issue[/zrl][/td][td]future bug/issue database[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_item]item[/zrl][/td][td]all posts and webpages[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_item_id]item_id[/zrl][/td][td]other identifiers on other services for posts[/td][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_item_id]item_id[/zrl][/td][td](deprecated by iconfig) other identifiers on other services for posts[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_likes]likes[/zrl][/td][td]likes of 'things'[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_mail]mail[/zrl][/td][td]private messages[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_menu]menu[/zrl][/td][td]webpage menu data[/td][/tr]
@@ -48,7 +47,6 @@
 [tr][td][zrl=[baseurl]/help/database/db_sign]sign[/zrl][/td][td]Diaspora signatures.  To be phased out.[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_site]site[/zrl][/td][td]site table to find directory peers[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_source]source[/zrl][/td][td]channel sources data[/td][/tr]
-[tr][td][zrl=[baseurl]/help/database/db_spam]spam[/zrl][/td][td]unfinished[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_sys_perms]sys_perms[/zrl][/td][td]extensible permissions for OAuth[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_term]term[/zrl][/td][td]item taxonomy (categories, tags, etc.) table[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_tokens]tokens[/zrl][/td][td]OAuth usage[/td][/tr]
@@ -60,6 +58,7 @@
 [tr][td][zrl=[baseurl]/help/database/db_xconfig]xconfig[/zrl][/td][td]as pconfig but for channels with no local account[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_xign]xign[/zrl][/td][td]channels ignored by friend suggestions[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_xlink]xlink[/zrl][/td][td]"friends of friends" linkages derived from poco, also ratings storage[/td][/tr]
+[tr][td][zrl=[baseurl]/help/database/db_xperm]xperm[/zrl][/td][td]OAuth/OpenID-Connect extensible permissions permissions storage[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_xprof]xprof[/zrl][/td][td]if this hub is a directory server, contains basic public profile info of everybody in the network[/td][/tr]
 [tr][td][zrl=[baseurl]/help/database/db_xtag]xtag[/zrl][/td][td]if this hub is a directory server, contains tags or interests of everybody in the network[/td][/tr]
 [/table]
diff --git a/doc/database/db_abook.bb b/doc/database/db_abook.bb
index 364429884..a346480d7 100644
--- a/doc/database/db_abook.bb
+++ b/doc/database/db_abook.bb
@@ -15,10 +15,6 @@
 [/td][/tr]
 [tr][td]abook_closeness[/td][td]"closeness" value for optional affinity tool, 0-99[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]99[/td][td]
 [/td][/tr]
-[tr][td]abook_rating[/td][td]The channel owner's (public) rating of this connection -10 to +10, default 0 or unrated[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
-[/td][/tr]
-[tr][td]abook_rating_text[/td][td]The channel owner's (public) rating of this connection free form text[/td][td]text[/td][td]NO[/td][td]MUL[/td][td][/td][td]
-[/td][/tr]
 [tr][td]abook_created[/td][td]Datetime this record was created[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
 [/td][/tr]
 [tr][td]abook_updated[/td][td]Datetime this record was modified[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
@@ -32,16 +28,27 @@
 [tr][td]abook_profile[/td][td]profile.guid of profile to display to this connection if authenticated[/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td][/td][td]
 [/td][/tr]
 [tr][td]abook_blocked[/td][td]Bi-directional communications with this channel are blocked, regardless of other permissions. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_ignored[/td][td]Incoming communications from this channel are blocked, regardless of other permissions.  [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_hidden[/td][td]This connection will not be shown as a connection to anybody but the channel owner[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_archived[/td][td]This connection is likely non-functioning and the entry and conversations are preserved, but further polled communications will not be attempted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_pending[/td][td]A connection request was received from this channel but has not been approved by the channel owner, public communications may still be visible but no additional permissions have been granted. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_unconnected[/td][td]currently unused. Projected usage is to indicate "one-way" connections which were insitgated on this end but are still pending on the remote end. [/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_self[/td][td]is a special case where the owner is the target. Every channel has one abook entry with abook_self and with a target abook_xchan set to channel.channel_hash . When this flag is present, abook_my_perms is the default permissions granted to all new connections and several other fields are unused.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_feed[/td][td]indicates this connection is an RSS/Atom feed and may trigger special handling.[/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_incl[/td][td]connection filter allow rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_excl[/td][td]connection filter deny rules separated by LF[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]abook_instance[/td][td]comma separated list of site urls of all channel clones that this connection is connected with (used only for singleton networks which don't support cloning)[/td][td]text[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [/table]
 
 
diff --git a/doc/database/db_addon.bb b/doc/database/db_addon.bb
index afa06d56c..bccd295f5 100644
--- a/doc/database/db_addon.bb
+++ b/doc/database/db_addon.bb
@@ -3,7 +3,7 @@
 [/th][/tr]
 [tr][td]id[/td][td][/td]generated index[td]int(11)[/td][td]NO[/td][td]PRI[/td][td]NULL[/td][td]auto_increment
 [/td][/tr]
-[tr][td]name[/td][td]plugin base (file)name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]aname[/td][td]plugin base (file)name[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]version[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
@@ -11,7 +11,7 @@
 [/td][/tr]
 [tr][td]hidden[/td][td]currently unused[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]timestamp[/td][td]file timestamp to check for reloads[/td][td]bigint(20)[/td][td]NO[/td][td][/td][td]0[/td][td]
+[tr][td]tstamp[/td][td]file timestamp to check for reloads[/td][td]bigint(20)[/td][td]NO[/td][td][/td][td]0[/td][td]
 [/td][/tr]
 [tr][td]plugin_admin[/td][td]1 = has admin config, 0 = has no admin config[/td][td]tinyint(1)[/td][td]NO[/td][td][/td][td]0[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_app.bb b/doc/database/db_app.bb
index 7076bffdd..09df473ee 100644
--- a/doc/database/db_app.bb
+++ b/doc/database/db_app.bb
@@ -27,8 +27,20 @@
 [/td][/tr]
 [tr][td]app_page[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
 [/td][/tr]
-[tr][td]app_requires[/td][td]currently unused[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
+[tr][td]app_requires[/td][td]access rules[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
 [/td][/tr]
+
+[tr][td]app_created[/td][td]datetime of app creation[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+[tr][td]app_edited[/td][td]datetime of last app edit[/td][td]datetime[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+
+[tr][td]app_deleted[/td][td]1 = deleted, 0 = normal[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+[tr][td]app_system[/td][td]1 = imported system app, 0 = member created app[/td][td]int(11)[/td][td]NO[/td][td][/td][td][/td][td]
+[/td][/tr]
+
+
 [/table]
 
 Storage for personal apps
diff --git a/doc/database/db_attach.bb b/doc/database/db_attach.bb
index 7d2befb47..5098401de 100644
--- a/doc/database/db_attach.bb
+++ b/doc/database/db_attach.bb
@@ -29,9 +29,11 @@
 [/td][/tr]
 [tr][td]os_storage[/td][td]if 0, data contains content; if 1 data contains path to content (always 1 in hubzilla)[/td][td]tinyint[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
+[tr][td]os_path[/td][td]under construction, store the system path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[/td][/tr]
 [tr][td]display_path[/td][td]under construction, store the human readable path[/td][td]mediumtext[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]data[/td][td]file data or pathname to stored data if ATTACH_FLAG_OS[/td][td]longblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]content[/td][td]file data or pathname to stored data if ATTACH_FLAG_OS[/td][td]longblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]created[/td][td]creation time[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_channel.bb b/doc/database/db_channel.bb
index 6f53517d8..518ff0978 100644
--- a/doc/database/db_channel.bb
+++ b/doc/database/db_channel.bb
@@ -35,6 +35,8 @@
 [/td][/tr]
 [tr][td]channel_dirdate[/td][td]time when directory was last pinged. Must do this once a month[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
 [/td][/tr]
+[tr][td]channel_lastpost[/td][td]date of last post for this channel. May not be fully implemented[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
+[/td][/tr]
 [tr][td]channel_deleted[/td][td]time when channel was deleted[/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]0000-00-00 00:00:00[/td][td]
 [/td][/tr]
 [tr][td]channel_max_anon_mail[/td][td]unused[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]10[/td][td]
@@ -95,6 +97,8 @@
 [/td][/tr]
 [tr][td]channel_system[/td][td]if 1, this is the special system channel on this site[/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]128[/td][td]
 [/td][/tr]
+[tr][td]channel_moved[/td][td]URL of relocated channel, making this instance abandoned if set[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td][/td][td]
+[/td][/tr]
 [/table]
 
 Return to [zrl=[baseurl]/help/database]database documentation[/zrl]
diff --git a/doc/database/db_chatpresence.bb b/doc/database/db_chatpresence.bb
index 28cd6f207..0a7f666c9 100644
--- a/doc/database/db_chatpresence.bb
+++ b/doc/database/db_chatpresence.bb
@@ -11,7 +11,7 @@
 [/td][/tr]
 [tr][td]cp_status[/td][td]text status description e.g. "online"[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]cp_client[/td][td][/td]IP address of this client[td]char(128)[/td][td]NO[/td][td][/td][td][/td][td]
+[tr][td]cp_client[/td][td]IP address of this client[/td][td]char(128)[/td][td]NO[/td][td][/td][td][/td][td]
 [/td][/tr]
 [/table]
 
diff --git a/doc/database/db_clients.bb b/doc/database/db_clients.bb
index d342b529f..0c66a4fc2 100644
--- a/doc/database/db_clients.bb
+++ b/doc/database/db_clients.bb
@@ -7,7 +7,7 @@
 [/td][/tr]
 [tr][td]redirect_uri[/td][td][/td][td]varchar(200)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]name[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td]
+[tr][td]clname[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]icon[/td][td][/td][td]text[/td][td]YES[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_event.bb b/doc/database/db_event.bb
index 7c31d7fde..ad3c15789 100644
--- a/doc/database/db_event.bb
+++ b/doc/database/db_event.bb
@@ -15,9 +15,9 @@
 [/td][/tr]
 [tr][td]edited[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]start[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]dtstart[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]finish[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]dtend[/td][td][/td][td]datetime[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]summary[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
@@ -25,13 +25,13 @@
 [/td][/tr]
 [tr][td]location[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]type[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]etype[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]nofinish[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
 [tr][td]adjust[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]1[/td][td]
 [/td][/tr]
-[tr][td]ignore[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[tr][td]dismissed[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
 [tr][td]allow_cid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
@@ -41,6 +41,24 @@
 [/td][/tr]
 [tr][td]deny_gid[/td][td][/td][td]mediumtext[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
+
+[tr][td]event_status[/td][td][/td][td]charr(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_status_date[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_percent[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_repeat[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_sequence[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_priority[/td][td][/td][td]smallint[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]event_vdata[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+[tr][td]cal_id[/td][td][/td][td]int(10)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[/td][/tr]
+
 [/table]
 
 Return to [zrl=[baseurl]/help/database]database documentation[/zrl]
\ No newline at end of file
diff --git a/doc/database/db_groups.bb b/doc/database/db_groups.bb
index 078d96464..73265b90e 100644
--- a/doc/database/db_groups.bb
+++ b/doc/database/db_groups.bb
@@ -11,7 +11,7 @@
 [/td][/tr]
 [tr][td]deleted[/td][td]1 indicates the group has been deleted[/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]name[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]gname[/td][td]human readable name of group[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [/table]
 
diff --git a/doc/database/db_hook.bb b/doc/database/db_hook.bb
index 0812b1b41..233062f98 100644
--- a/doc/database/db_hook.bb
+++ b/doc/database/db_hook.bb
@@ -7,9 +7,11 @@
 [/td][/tr]
 [tr][td]file[/td][td]relative filename of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]function[/td][td]function name of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]fn[/td][td]function name of hook handler[/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]priority[/td][td]not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td]
+[tr][td]priority[/td][td]can be used to sort conflicts in hook handling by calling handlers in priority order[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td]
+[/td][/tr]
+[tr][td]hook_version[/td][td]version 0 hooks must have two arguments, the App and the hook data. version 1 hooks have 1 argument - the hook data[/td][td]int(11) unsigned[/td][td]NO[/td][td][/td][td]0[/td][td]
 [/td][/tr]
 [/table]
 
diff --git a/doc/database/db_item.bb b/doc/database/db_item.bb
index e4e594196..6383e13f8 100644
--- a/doc/database/db_item.bb
+++ b/doc/database/db_item.bb
@@ -51,7 +51,7 @@
 [/td][/tr]
 [tr][td]obj_type[/td][td]ActivityStreams object type (old style URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
 [/td][/tr]
-[tr][td]object[/td][td]JSON encoded object structure unless it is an implied object (normal post)[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]obj[/td][td]JSON encoded object structure unless it is an implied object (normal post)[/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]tgt_type[/td][td]ActivityStreams target type if applicable (URI)[/td][td]char(255)[/td][td]NO[/td][td][/td][td][/td][td]
 [/td][/tr]
diff --git a/doc/database/db_notify.bb b/doc/database/db_notify.bb
index 42f9350e5..4787266cd 100644
--- a/doc/database/db_notify.bb
+++ b/doc/database/db_notify.bb
@@ -5,7 +5,7 @@
 [/td][/tr]
 [tr][td]hash[/td][td][/td][td]char(64)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]xname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]url[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
@@ -25,7 +25,7 @@
 [/td][/tr]
 [tr][td]seen[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]type[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]ntype[/td][td][/td][td]int(11)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]verb[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_photo.bb b/doc/database/db_photo.bb
index 6a0cdf362..91840ec1e 100644
--- a/doc/database/db_photo.bb
+++ b/doc/database/db_photo.bb
@@ -23,15 +23,15 @@
 [/td][/tr]
 [tr][td]filename[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]type[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]image/jpeg[/td][td]
+[tr][td]mimetype[/td][td][/td][td]char(128)[/td][td]NO[/td][td]MUL[/td][td]image/jpeg[/td][td]
 [/td][/tr]
 [tr][td]height[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]width[/td][td][/td][td]smallint(6)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]size[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
+[tr][td]filesize[/td][td][/td][td]int(10) unsigned[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]data[/td][td][/td][td]mediumblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]content[/td][td][/td][td]mediumblob[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]scale[/td][td][/td][td]tinyint(3)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_profile.bb b/doc/database/db_profile.bb
index 83db75713..717fae585 100644
--- a/doc/database/db_profile.bb
+++ b/doc/database/db_profile.bb
@@ -15,7 +15,7 @@
 [/td][/tr]
 [tr][td]hide_friends[/td][td][/td][td]tinyint(1)[/td][td]NO[/td][td]MUL[/td][td]0[/td][td]
 [/td][/tr]
-[tr][td]name[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]fullname[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]pdesc[/td][td][/td][td]char(255)[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
@@ -41,7 +41,7 @@
 [/td][/tr]
 [tr][td]marital[/td][td][/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]with[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]partner[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]howlong[/td][td][/td][td]datetime[/td][td]NO[/td][td][/td][td]0000-00-00 00:00:00[/td][td]
 [/td][/tr]
@@ -73,7 +73,7 @@
 [/td][/tr]
 [tr][td]romance[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]work[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
+[tr][td]employment[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]education[/td][td][/td][td]text[/td][td]NO[/td][td][/td][td]NULL[/td][td]
 [/td][/tr]
diff --git a/doc/database/db_term.bb b/doc/database/db_term.bb
index e1f6415fa..bd155fe21 100644
--- a/doc/database/db_term.bb
+++ b/doc/database/db_term.bb
@@ -11,7 +11,7 @@
 [/td][/tr]
 [tr][td]otype[/td][td]type of linked thing[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
-[tr][td]type[/td][td]taxonomy type (See Tag/term types in boot.php)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
+[tr][td]ttype[/td][td]taxonomy type (See Tag/term types in boot.php)[/td][td]tinyint(3) unsigned[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
 [tr][td]term[/td][td]the actual taxonomy term[/td][td]char(255)[/td][td]NO[/td][td]MUL[/td][td]NULL[/td][td]
 [/td][/tr]
diff --git a/doc/hook/change_channel.bb b/doc/hook/change_channel.bb
new file mode 100644
index 000000000..4514b9265
--- /dev/null
+++ b/doc/hook/change_channel.bb
@@ -0,0 +1,11 @@
+[h2]change_channel[/h2]
+
+Called when entering a logged in state in a channel context (as opposed to an account context).
+The hook array provides two arguments, 'channel_id' and 'chanx'. 'chanx' is a union of the channel 
+and xchan records for the now active channel.
+
+Use this to capture what would traditionally be known as 'login events'.  In this platform, login is
+a separate authentication activity and doesn't necessarily require "connecting to an identity", which
+is what the change_channel activity represents. 
+
+
diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index bb1bffcf0..66ff1cf71 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -73,6 +73,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/bb_translate_video]bb_translate_video[/zrl]
 	Called when extracting embedded services from bbcode video elements (rarely used)
 
+[zrl=[baseurl]/help/hook/change_channel]change_channel[/zrl]
+	Called when logging in to a channel (either during login or afterward through the channel manager)
+
 [zrl=[baseurl]/help/hook/channel_remove]channel_remove[/zrl]
 	Called when removing a channel
 
diff --git a/doc/permissions.bb b/doc/permissions.bb
index ceb3fec17..cc831dd61 100644
--- a/doc/permissions.bb
+++ b/doc/permissions.bb
@@ -1,17 +1,21 @@
 [h1]Permissions[/h1]
-Permissions in the $Projectname are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white &quot;this person is my friend, so they can do everything&quot; or &quot;this person is not my friend, so they can't do anything&quot; permissions you may find elsewhere.
+Permissions in $Projectname are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white &quot;this person is my friend, so they can do everything&quot; or &quot;this person is not my friend, so they can't do anything&quot; permissions you may find elsewhere.
+
+[b]Permission Roles[/b]
+
+When you create a channel we allow you to select different 'roles' for that channel. These create an entire family of permissions and privacy settings that are appropriate for that role. Typical roles are "Social - mostly public", "Social - mostly private", "Forum - public" and many others. These bring a level of simplicity to managing permissions. Just choose a role and appropriate permissions are automatically applied. You can also choose 'Custom/Expert mode' and change any individual permission setting in any way you desire. 
 
 
-[b]Default Permissions[/b]
+[b]Default Permission Limits[/b]
 
-On your settings page, you will find a list of default permissions. These permissions are automatically applied to everybody unless you specify otherwise. The scope of these permissions varies from &quot;Only me&quot; to &quot;Everybody&quot; - though some scopes may not be available for some permissions. For example, you can't allow &quot;anybody on the internet&quot; to send you private messages, because we'd have no way to identify the sender, therefore no way to reply to them.
+There are a large number of individual permissions. These control everything from the ability to view your stream to the ability to chat with you. Every permission has a limit. The scope of these permissions varies from &quot;Only me&quot; to &quot;Everybody on the internet&quot; - though some scopes may not be available for some permissions. The limit applies to any published thing you create which has no privacy or access control. For example if you publish a photo and didn't select a specific audience with permission to view it, we apply the limit. These limits apply to everything within that permission rule, so you cannot apply a limit to one photo. The limit applies to all your photos. If all your photos are visible to everybody on the internet and you reduce the limit only to friends, [b]all[/b] of your photos will now be visible only to friends.
+
+[b]Access Control[/b]
+ 
+Access Control is the preferred method of managing privacy in [i]most[/i] cases, rather than using permission limits. This creates lists of either connections or privacy groups (or both) and uses the access list to decide if a permission is allowed. An access list is attached to everything you publish. Unlike permission limits, if you change the access control list on a single photo, it doesn't affect any of your other photos. You can use privacy groups and a "default access control list" to create and automate the management of access control lists to provide any level of privacy you desire on anything you publish. 
 
 We highly recommend that you use the "typical social network" settings when you create your first channel, as it allows others to communicate with you and help you out if you have difficulty. You will find that these settings allow you as much privacy as you desire - when you desire it; but also allow you to communicate in public if you choose to. You are free to use much more private settings once you have learned your way around.
 
-Be aware that altering the scope of who can see your "public" items is a more or less [b]permanent[/b] change. Your public items have no identified permissions attached to them - they are public. If you restrict who can see these items, there is no way of making any single item public ever again - without allowing access to every public item you ever created. You are certainly free to do this, but beware of the consequences.
-
-A more useful privacy setup is to leave "public" items visible to anybody on the internet; but force everything you create to be restricted. This can be done on your Channel Settings page by selecting the role "Social - restricted". This ensures a Default Privacy Group for all new contacts, and sets your Default Post Permissions to restrict all your posts to that group. We use the Default Post Permissions for everything you create - posts, photos, events, webpages, and everything else. However you can then edit the permissions when you create any individual thing and remove your default privacy group to make just that item visible to anybody.   
-
 
 [dl terms="l"]
 [*= The scopes of permissions are:]
@@ -22,11 +26,11 @@ A more useful privacy setup is to leave "public" items visible to anybody on the
   
   [*= Anybody in your address book ] Anybody you do not know will have this permission denied, but anybody you   accept as a contact will have this permission approved. This is the way most legacy platforms handle   permissions.
   
-  [*= Anybody On This Hub ] Anybody using the same hub as you will have permission approved. Anybody who   registered at a different hub will have this permission denied.
+  [*= Anybody On This Hub ] Anybody with a channel on the same hub/website as you will have permission approved. Anybody who is registered at a different hub will have this permission denied.
   
   [*= Anybody in this network ] Anybody in the $Projectname will have this permission approved. Even complete   strangers. However, anybody not logged in/authenticated will have this permission denied.
   
-  [*= Anybody authenticated ] This is similar to "anybody in this network" except that it can include anybody   who can authenticate by any means - and therefore may include visitors from other networks.
+  [*= Anybody authenticated ] This is similar to "anybody in this network" except that it can include anybody   who can authenticate by any means - and therefore [i]may[/i] include visitors from other networks.
   
   [*= Anybody on the internet ] Completely public. This permission will be approved for anybody at all.
 [/dl]
diff --git a/doc/service_classes.bb b/doc/service_classes.bb
index e5d4ecfad..4dead5d29 100644
--- a/doc/service_classes.bb
+++ b/doc/service_classes.bb
@@ -35,3 +35,4 @@ attach_upload_limit - maximum file upload storage (bytes)
 minimum_feedcheck_minutes - lowest setting allowed for polling rss feeds
 chatrooms - maximum chatrooms
 chatters_inroom - maximum chatters per room
+access_tokens - maximum number of Guest Access Tokens per channel
\ No newline at end of file
diff --git a/include/account.php b/include/account.php
index caf12878e..142ad1bea 100644
--- a/include/account.php
+++ b/include/account.php
@@ -499,11 +499,27 @@ function account_approve($hash) {
 		intval($register[0]['uid'])
 	);
 
+	// get a fresh copy after we've modified it.
+
+	$account = q("SELECT * FROM account WHERE account_id = %d LIMIT 1",
+		intval($register[0]['uid'])
+	);
+
+	if(! $account)
+		return $ret;
+
+
+
 
 	if(get_config('system','auto_channel_create') || UNO)
 		auto_channel_create($register[0]['uid']);
+	else {
+		$_SESSION['login_return_url'] = 'new_channel';
+		authenticate_success($account[0],null,true,true,false,true);
+	}	
 
-	info( t('Account verified. Please login.') . EOL );
+
+	// info( t('Account verified. Please login.') . EOL );
 
 	return true;
 }
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 89d054e3b..148c67a6c 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -7,8 +7,6 @@
  * @package acl_selectors 
  */
 
-require_once("include/PermissionDescription.php");
-
 function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 	$o = '';
@@ -231,7 +229,7 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
 	if(! $emptyACL_description) {
 		$showall_caption = t('Visible to your default audience');
 
-	} else if (is_a($emptyACL_description, 'PermissionDescription')) {
+	} else if (is_a($emptyACL_description, '\\Zotlabs\\Lib\\PermissionDescription')) {
 		$showall_caption = $emptyACL_description->get_permission_description();
 		$showall_origin  = (($role === 'custom') ? $emptyACL_description->get_permission_origin_description() : '');
 		$showall_icon    = $emptyACL_description->get_permission_icon();
diff --git a/include/api.php b/include/api.php
index be525f7e9..df6aba957 100644
--- a/include/api.php
+++ b/include/api.php
@@ -839,7 +839,7 @@ require_once('include/api_auth.php');
 			$_REQUEST['parent_mid'] = $parent;
 
 		if($_REQUEST['namespace'] && $parent) {
-			$x = q("select iid from item_id where service = '%s' and sid = '%s' limit 1",
+			$x = q("select iid from iconfig where cat = 'system' and k = '%s' and v = '%s' limit 1",
 				dbesc($_REQUEST['namespace']),
 				dbesc($parent)
 			);
@@ -967,20 +967,10 @@ require_once('include/api_auth.php');
 
 		$ret = array();
 		$tmp = array();
-		$str = '';
 		foreach($i as $ii) {
 			$tmp[] = encode_item($ii,true);
-			if($str)
-				$str .= ',';
-			$str .= $ii['id'];
 		}
 		$ret['item'] = $tmp;	
-		if($str) {
-			$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item.id in ( $str ) ");
-
-		    if($r)
-        		$ret['item_id'] = $r;
-		}
 					 
 		json_return_and_die($ret);
 	}
@@ -1462,7 +1452,8 @@ require_once('include/api_auth.php');
 		}
 		else {
 			if($_REQUEST['namespace'] && $_REQUEST['remote_id']) {
-				$r = q("select * from item_id where service = '%s' and sid = '%s' and uid = %d limit 1",
+				$r = q("select * from iconfig left join item on iconfig.iid = item.id 
+					where cat = 'system' and k = '%s' and v = '%s' and item.uid = %d limit 1",
 					dbesc($_REQUEST['namespace']),
 					dbesc($_REQUEST['remote_id']),
 					intval($user_info['uid'])
@@ -1472,7 +1463,7 @@ require_once('include/api_auth.php');
 				$id = $r[0]['iid'];
 			}
 			if($_REQUEST['namespace'] && $_REQUEST['comment_id']) {
-				$r = q("select * from item_id left join item on item.id = item_id.iid where service = '%s' and sid = '%s' and uid = %d and item.id != item.parent limit 1",
+				$r = q("select * from iconfig left join item on item.id = iconfig.iid where cat = 'system' and k = '%s' and v = '%s' and uid = %d and item.id != item.parent limit 1",
 					dbesc($_REQUEST['namespace']),
 					dbesc($_REQUEST['comment_id']),
 					intval($user_info['uid'])
diff --git a/include/api_auth.php b/include/api_auth.php
index dc8492b20..89882f821 100644
--- a/include/api_auth.php
+++ b/include/api_auth.php
@@ -59,21 +59,13 @@ function api_login(&$a){
 	if(isset($_SERVER['PHP_AUTH_USER'])) {
 		$channel_login = 0;
 		$record = account_verify_password($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']);
-		if(! $record) {
-	        $r = q("select * from channel left join account on account.account_id = channel.channel_account_id 
-				where channel.channel_address = '%s' limit 1",
-		       dbesc($_SERVER['PHP_AUTH_USER'])
-			);
-        	if ($r) {
-				$record = account_verify_password($r[0]['account_email'],$_SERVER['PHP_AUTH_PW']);
-				if($record)
-					$channel_login = $r[0]['channel_id'];
-			}
+		if($record && $record['channel']) {
+			$channel_login = $record['channel']['channel_id'];
 		}
 	}
 
-	if($record) {
-		authenticate_success($record);
+	if($record['account']) {
+		authenticate_success($record['account']);
 
 		if($channel_login)
 			change_channel($channel_login);
diff --git a/include/attach.php b/include/attach.php
index 78efde51f..b3ddfee88 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -423,6 +423,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	$observer = array();
 
+	$dosync = ((array_key_exists('nosync',$arr) && $arr['nosync']) ? 0 : 1);
+
 	if($observer_hash) {
 		$x = q("select * from xchan where xchan_hash = '%s' limit 1",
 			dbesc($observer_hash)
@@ -616,7 +618,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		);
 		if($r) {
 			$overwrite = get_pconfig($channel_id,'system','overwrite_dup_files');
-			if($overwrite) {
+			if(($overwrite) || ($options === 'import')) {
 				$options = 'replace';
 				$existing_id = $x[0]['id'];
 				$existing_size = intval($x[0]['filesize']);
@@ -800,7 +802,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 
 	if($is_photo) {
 
-		$args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct);
+		$args = array( 'source' => $source, 'visible' => $visible, 'resource_id' => $hash, 'album' => basename($pathname), 'os_path' => $os_basepath . $os_relpath, 'filename' => $filename, 'getimagesize' => $gis, 'directory' => $direct, 'options' => $options );
 		if($arr['contact_allow'])
 			$args['contact_allow'] = $arr['contact_allow'];
 		if($arr['group_allow'])
@@ -829,6 +831,8 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		if($arr['description'])
 			$args['description'] = $arr['description'];
 
+		$args['deliver'] = $dosync;
+
 		$p = photo_upload($channel,$observer,$args);
 		if($p['success']) {
 			$ret['body'] = $p['body'];
@@ -865,10 +869,12 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		call_hooks('photo_upload_end',$ret);
 	}
 
-	$sync = attach_export_data($channel,$hash);
+	if($dosync) {
+		$sync = attach_export_data($channel,$hash);
 
-	if($sync) 
-		build_sync_packet($channel['channel_id'],array('file' => array($sync)));
+		if($sync) 
+			build_sync_packet($channel['channel_id'],array('file' => array($sync)));
+	}
 
 	return $ret;
 }
@@ -1462,7 +1468,7 @@ function find_filename_by_hash($channel_id, $attachHash) {
 function pipe_streams($in, $out) {
 	$size = 0;
 	while (!feof($in))
-		$size += fwrite($out, fread($in, 8192));
+		$size += fwrite($out, fread($in, 16384));
 
 	return $size;
 }
@@ -1903,4 +1909,4 @@ function get_attach_binname($s) {
 		$p = substr($p,strpos($p,'/')+1);
 	}
 	return $p;
-}
\ No newline at end of file
+}
diff --git a/include/auth.php b/include/auth.php
index 01fcf0094..f3592cee3 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -16,55 +16,97 @@ require_once('include/security.php');
 /**
  * @brief Verify login credentials.
  *
- * If system <i>authlog</i> is set a log entry will be added for failed login
+ * If system.authlog is set a log entry will be added for failed login
  * attempts.
  *
- * @param string $email
- *  The email address to verify.
+ * @param string $login
+ *  The login to verify (channel address, account email or guest login token).
  * @param string $pass
  *  The provided password to verify.
  * @return array|null
  *  Returns account record on success, null on failure.
+ *  The return array is dependent on the login mechanism.
+ *    $ret['account'] will be set if either an email or channel address validation was successful (local login).
+ *    $ret['channel'] will be set if a channel address validation was successful.
+ *    $ret['xchan'] will be set if a guest access token validation was successful. 
+ *   Keys will exist for invalid return arrays but will be set to null. 
+ *   This function does not perform a login. It merely validates systems passwords and tokens.  
+ *
  */
-function account_verify_password($email, $pass) {
+
+function account_verify_password($login, $pass) {
+
+	$ret = [ 'account' => null, 'channel' => null, 'xchan' => null ];
 
 	$email_verify = get_config('system', 'verify_email');
 	$register_policy = get_config('system', 'register_policy');
 
+	if(! $login)
+		return null;
+
+	$account = null;
+	$channel = null;
+	$xchan   = null;
+
+	if(! strpos($login,'@')) {
+		$channel = channelx_by_nick($login);
+		if(! $channel) {
+			$x = q("select * from atoken where atoken_name = '%s' and atoken_token = '%s' limit 1",
+				dbesc($login),
+				dbesc($pass)
+			);
+			if($x) {
+				$ret['xchan'] = atoken_xchan($x[0]);
+				return $ret;
+			}
+		}
+	}
+	if($channel) {
+		$where = " where account_id = " . intval($channel['channel_account_id']) . " ";
+	}
+	else {
+		$where = " where account_email = '" . dbesc($login) . "' ";
+	}
+
+	$a = q("select * from account $where");
+	if(! $a) {
+		return null;
+	}
+
+	$account = $a[0];
+
 	// Currently we only verify email address if there is an open registration policy.
 	// This isn't because of any policy - it's because the workflow gets too complicated if 
 	// you have to verify the email and then go through the account approval workflow before
 	// letting them login.
 
-	if(($email_verify) && ($register_policy == REGISTER_OPEN) && ($record['account_flags'] & ACCOUNT_UNVERIFIED))
+	if(($email_verify) && ($register_policy == REGISTER_OPEN) && ($account['account_flags'] & ACCOUNT_UNVERIFIED)) {
+		logger('email verification required for ' . $login);
 		return null;
-
-	$r = q("select * from account where account_email = '%s'",
-		dbesc($email)
-	);
-	if(! ($r && count($r)))
-		return null;
-
-	foreach($r as $record) {
-		if(($record['account_flags'] == ACCOUNT_OK)
-			&& (hash('whirlpool', $record['account_salt'] . $pass) === $record['account_password'])) {
-			logger('password verified for ' . $email);
-			return $record;
-		}
 	}
-	$error = 'password failed for ' . $email;
+
+	if(($account['account_flags'] == ACCOUNT_OK) 
+		&& (hash('whirlpool',$account['account_salt'] . $pass) === $account['account_password'])) {
+		logger('password verified for ' . $login);
+		$ret['account'] = $account;
+		if($channel)
+			$ret['channel'] = $channel;
+		return $ret;
+	}
+
+	$error = 'password failed for ' . $login;
 	logger($error);
 
-	if($record['account_flags'] & ACCOUNT_UNVERIFIED)
-		logger('Account is unverified. account_flags = ' . $record['account_flags']);
-	if($record['account_flags'] & ACCOUNT_BLOCKED)
-		logger('Account is blocked. account_flags = ' . $record['account_flags']);
-	if($record['account_flags'] & ACCOUNT_EXPIRED)
-		logger('Account is expired. account_flags = ' . $record['account_flags']);
-	if($record['account_flags'] & ACCOUNT_REMOVED)
-		logger('Account is removed. account_flags = ' . $record['account_flags']);
-	if($record['account_flags'] & ACCOUNT_PENDING)
-		logger('Account is pending. account_flags = ' . $record['account_flags']);
+	if($account['account_flags'] & ACCOUNT_UNVERIFIED)
+		logger('Account is unverified. account_flags = ' . $account['account_flags']);
+	if($account['account_flags'] & ACCOUNT_BLOCKED)
+		logger('Account is blocked. account_flags = ' . $account['account_flags']);
+	if($account['account_flags'] & ACCOUNT_EXPIRED)
+		logger('Account is expired. account_flags = ' . $account['account_flags']);
+	if($account['account_flags'] & ACCOUNT_REMOVED)
+		logger('Account is removed. account_flags = ' . $account['account_flags']);
+	if($account['account_flags'] & ACCOUNT_PENDING)
+		logger('Account is pending. account_flags = ' . $account['account_flags']);
 
 	log_failed_login($error);
 
@@ -120,13 +162,21 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) &&
 				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);
+				authenticate_success($x[0], null, true, true);
 			}
 		}
-
-		$r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s' limit 1",
-			dbesc($_SESSION['visitor_id'])
-		);
+		if(array_key_exists('atoken',$_SESSION)) {
+			$y = q("select * from atoken where atoken_id = %d limit 1",
+				intval($_SESSION['atoken'])
+			);
+			if($y)
+				$r = array(atoken_xchan($y[0]));
+		}
+		else {
+			$r = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_hash = '%s' limit 1",
+				dbesc($_SESSION['visitor_id'])
+			);
+		}
 		if($r) {
 			App::set_observer($r[0]);
 		}
@@ -158,7 +208,8 @@ if((isset($_SESSION)) && (x($_SESSION, 'authenticated')) &&
 				App::$session->extend_cookie();
 				$login_refresh = true;
 			}
-			authenticate_success($r[0], false, false, false, $login_refresh);
+			$ch = (($_SESSION['uid']) ? channelx_by_n($_SESSION['uid']) : null);
+			authenticate_success($r[0], null, $ch, false, false, $login_refresh);
 		}
 		else {
 			$_SESSION['account_id'] = 0;
@@ -199,30 +250,38 @@ else {
 
 		call_hooks('authenticate', $addon_auth);
 
+		$atoken  = null;
+		$account = null;
+
 		if(($addon_auth['authenticated']) && (count($addon_auth['user_record']))) {
-			$record = $addon_auth['user_record'];
+			$account = $addon_auth['user_record'];
 		}
 		else {
-			$record = App::$account = account_verify_password($_POST['username'], $_POST['password']);
+			$verify = account_verify_password($_POST['username'], $_POST['password']);
+			if($verify) {
+				$atoken  = $verify['xchan'];
+				$channel = $verify['channel'];
+				$account = App::$account = $verify['account'];
+			}
 
 			if(App::$account) {
 				$_SESSION['account_id'] = App::$account['account_id'];
 			}
+			elseif($atoken) {
+				atoken_login($atoken);
+			}
 			else {
 				notice( t('Failed authentication') . EOL);
 			}
-
-			logger('authenticate: ' . print_r(App::$account, true), LOGGER_ALL);
 		}
 
-		if((! $record) || (! count($record))) {
+		if(! ($account || $atoken)) {
 			$error = 'authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR'];
 			logger($error); 
 			// Also log failed logins to a separate auth log to reduce overhead for server side intrusion prevention
 			$authlog = get_config('system', 'authlog');
 			if ($authlog)
 				@file_put_contents($authlog, datetime_convert() . ':' . session_id() . ' ' . $error . "\n", FILE_APPEND);
-
 			notice( t('Login failed.') . EOL );
 			goaway(z_root() . '/login');
 		}
@@ -252,7 +311,8 @@ else {
 		// if we haven't failed up this point, log them in.
 
 		$_SESSION['last_login_date'] = datetime_convert();
-		authenticate_success($record, true, true);
+		if(! $atoken)
+			authenticate_success($account,$channel,true, true);
 	}
 }
 
@@ -270,6 +330,7 @@ else {
  * @return int|bool
  *  Return channel_id from pconfig or false.
  */
+
 function match_openid($authid) {
 	// Query the uid/channel_id from pconfig for a given value.
 	$r = q("SELECT uid FROM pconfig WHERE cat = 'system' AND k = 'openid' AND v = '%s' LIMIT 1",
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index c7d0e56b1..16f67dc4a 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -302,11 +302,11 @@ function bb2diaspora_itemwallwall(&$item) {
 		}
 	}
 
-	if(($wallwall) && (is_array($item['author'])) && $item['author']['xchan_url'] && $item['author']['xchan_name'] && $item['author']['xchan_photo_m']) {
+	if(($wallwall) && (is_array($item['author'])) && $item['author']['xchan_url'] && $item['author']['xchan_name'] && $item['author']['xchan_photo_s']) {
 		logger('bb2diaspora_itemwallwall: wall to wall post',LOGGER_DEBUG);
 		// post will come across with the owner's identity. Throw a preamble onto the post to indicate the true author.
 		$item['body'] = "\n\n" 
-			. '[img]' . $item['author']['xchan_photo_m'] . '[/img]' 
+			. '[img]' . $item['author']['xchan_photo_s'] . '[/img]' 
 			. '[url=' . $item['author']['xchan_url'] . ']' . $item['author']['xchan_name'] . '[/url]' . "\n\n" 
 			. $item['body'];
 	}
diff --git a/include/bbcode.php b/include/bbcode.php
index 42741b392..7f7be4300 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -242,6 +242,13 @@ function bb_ShareAttributes($match) {
 	if ($matches[1] != "")
 		$message_id = $matches[1];
 
+	if(! $message_id) {
+		preg_match("/guid='(.*?)'/ism", $attributes, $matches);
+		if ($matches[1] != "")
+			$message_id = $matches[1];
+	}
+
+
 	$reldate = '<span class="autotime" title="' . datetime_convert('UTC', date_default_timezone_get(), $posted, 'c') . '" >' . datetime_convert('UTC', date_default_timezone_get(), $posted, 'r') . '</span>';
 
 	$headline = '<div class="shared_container"> <div class="shared_header">';
@@ -484,6 +491,24 @@ function bb_code($match) {
 		return '<code class="inline-code">' . trim($match[1]) . '</code>';
 }
 
+function bb_highlight($match) {
+	if(in_array(strtolower($match[1]),['php','css','mysql','sql','abap','diff','html','perl','ruby',
+		'vbscript','avrc','dtd','java','xml','cpp','python','javascript','js','json','sh']))
+		return text_highlight($match[2],strtolower($match[1]));
+	return $match[0];
+}
+
+function bb_fixtable_lf($match) {
+
+	// remove extraneous whitespace between table element tags since newlines will all
+	// be converted to '<br />' and turn your neatly crafted tables into a whole lot of
+	// empty space.
+ 
+	$x = preg_replace("/\]\s+\[/",'][',$match[1]);
+	return '[table]' . $x . '[/table]';
+
+}
+
 
 
 	// BBcode 2 HTML was written by WAY2WEB.net
@@ -559,6 +584,15 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 	$Text = str_replace(">", "&gt;", $Text);
 
 
+	// Check for [code] text here, before the linefeeds are messed with.
+	// The highlighter will unescape and re-escape the content.
+
+	if (strpos($Text,'[code=') !== false) {
+		$Text = preg_replace_callback("/\[code=(.*?)\](.*?)\[\/code\]/ism", 'bb_highlight', $Text);
+	}
+
+	$Text = preg_replace_callback("/\[table\](.*?)\[\/table\]/ism",'bb_fixtable_lf',$Text);
+
 	// Convert new line chars to html <br /> tags
 
 	// nlbr seems to be hopelessly messed up
diff --git a/include/cache.php b/include/cache.php
deleted file mode 100644
index 4a3f453e1..000000000
--- a/include/cache.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php /** @file */
-
-	/**
-	 *  cache api
-	 */
-	 
-	class Cache {
-		public static function get($key){
-			$r = q("SELECT v FROM cache WHERE k = '%s' limit 1",
-				dbesc($key)
-			);
-			
-			if ($r)
-				return $r[0]['v'];
-			return null;
-		}
-		
-		public static function set($key,$value) {
-
-			$r = q("SELECT * FROM cache WHERE k = '%s' limit 1",
-				dbesc($key)
-			);
-			if($r) {
-				q("UPDATE cache SET v = '%s', updated = '%s' WHERE k = '%s'",
-					dbesc($value),
-					dbesc(datetime_convert()),
-					dbesc($key));
-			}
-			else {
-				q("INSERT INTO cache ( k, v, updated) VALUES ('%s','%s','%s')",
-					dbesc($key),
-					dbesc($value),
-					dbesc(datetime_convert()));
-			}
-		}
-
-		
-		public static function clear(){
-			q("DELETE FROM cache WHERE updated < '%s'",
-				dbesc(datetime_convert('UTC','UTC',"now - 30 days")));			
-		}
-		
-	}
-	 
diff --git a/include/channel.php b/include/channel.php
index 087bd4162..8e0747f25 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -16,7 +16,7 @@ require_once('include/menu.php');
  * @param int $account_id
  *     Account_id used for this request
  *
- * @returns assoziative array with:
+ * @returns associative array with:
  *  * \e boolean \b success boolean true if creating a new channel is allowed for this account
  *  * \e string \b message (optional) if success is false, optional error text
  *  * \e int \b total_identities
@@ -496,8 +496,10 @@ function identity_basic_export($channel_id, $items = false) {
 	$r = q("select * from channel where channel_id = %d limit 1",
 		intval($channel_id)
 	);
-	if($r)
+	if($r) {
 		$ret['channel'] = $r[0];
+		$ret['relocate'] = [ 'channel_address' => $r[0]['channel_address'], 'url' => z_root()];
+	}
 
 	$r = q("select * from profile where uid = %d",
 		intval($channel_id)
@@ -514,7 +516,7 @@ function identity_basic_export($channel_id, $items = false) {
 
 		for($x = 0; $x < count($ret['abook']); $x ++) {
 			$xchans[] = $ret['abook'][$x]['abook_chan'];
-			$abconfig = load_abconfig($ret['channel']['channel_hash'],$ret['abook'][$x]['abook_xchan']);
+			$abconfig = load_abconfig($channel_id,$ret['abook'][$x]['abook_xchan']);
 			if($abconfig)
 				$ret['abook'][$x]['abconfig'] = $abconfig;
 		}		 
@@ -676,14 +678,6 @@ function identity_basic_export($channel_id, $items = false) {
 		$ret['mail'] = $m;
 	}
 
-	$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d",
-		intval($channel_id)
-	);
-
-	if($r)
-		$ret['item_id'] = $r;
-
-	//$key = get_config('system','prvkey');
 
 	/** @warning this may run into memory limits on smaller systems */
 
@@ -725,6 +719,10 @@ function identity_export_year($channel_id,$year,$month = 0) {
 
 	$ret = array();
 
+	$ch = channelx_by_n($channel_id);
+	if($ch) {
+		$ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()];
+	}
 	$mindate = datetime_convert('UTC','UTC',$year . '-' . $target_month . '-01 00:00:00');
 	if($month && $month < 12)
 		$maxdate = datetime_convert('UTC','UTC',$year . '-' . $target_month_plus . '-01 00:00:00');
@@ -746,16 +744,43 @@ function identity_export_year($channel_id,$year,$month = 0) {
 			$ret['item'][] = encode_item($rr,true);
 	}
 
-	$r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d 
-		and item.created >= '%s' and item.created < '%s' order by created ",
+	return $ret;
+}
+
+// export items within an arbitrary date range. Date/time is in UTC.
+
+function channel_export_items($channel_id,$start,$finish) {
+
+	if(! $start)
+		return array();
+	else
+		$start = datetime_convert('UTC','UTC',$start);
+
+	$finish = datetime_convert('UTC','UTC',(($finish) ? $finish : 'now'));
+	if($finish < $start)
+		return array();
+
+	$ret = array();
+
+	$ch = channelx_by_n($channel_id);
+	if($ch) {
+		$ret['relocate'] = [ 'channel_address' => $ch['channel_address'], 'url' => z_root()];
+	}
+
+	$r = q("select * from item where ( item_wall = 1 or item_type != %d ) and item_deleted = 0 and uid = %d and created >= '%s' and created < '%s'  and resource_type = '' order by created",
+		intval(ITEM_TYPE_POST),
 		intval($channel_id),
-		dbesc($mindate), 
-		dbesc($maxdate)
+		dbesc($start), 
+		dbesc($finish)
 	);
 
-	if($r)
-		$ret['item_id'] = $r;
-
+	if($r) {
+		$ret['item'] = array();
+		xchan_query($r);
+		$r = fetch_post_tags($r,true);
+		foreach($r as $rr)
+			$ret['item'][] = encode_item($rr,true);
+	}
 
 	return $ret;
 }
@@ -774,11 +799,10 @@ function identity_export_year($channel_id,$year,$month = 0) {
  *
  * The channel default theme is also selected for use, unless over-riden elsewhere.
  *
- * @param[in,out] App &$a
  * @param string $nickname
  * @param string $profile
  */
-function profile_load(&$a, $nickname, $profile = '') {
+function profile_load($nickname, $profile = '') {
 
 //	logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : ''));
 
@@ -875,7 +899,7 @@ function profile_load(&$a, $nickname, $profile = '') {
 	);
 	if($z) {
 		$p[0]['picdate'] = $z[0]['xchan_photo_date'];
-		$p[0]['reddress'] = str_replace('@','&#xff20;',$z[0]['xchan_addr']);
+		$p[0]['reddress'] = str_replace('@','&#x40;',$z[0]['xchan_addr']);
 	}
 
 	// fetch user tags if this isn't the default profile
@@ -1046,6 +1070,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 
 	$diaspora = array(
 		'podloc'     => z_root(),
+		'guid'       => $profile['channel_guid'] . str_replace('.','',App::get_hostname()),
 		'searchable' => (($block) ? 'false' : 'true'),
 		'nickname'   => $profile['channel_address'],
 		'fullname'   => $profile['channel_name'],
@@ -1243,6 +1268,7 @@ function advanced_profile(&$a) {
 
 		$things = get_things(App::$profile['profile_guid'],App::$profile['profile_uid']);
 
+
 //		logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA); 
 
 		return replace_macros($tpl, array(
@@ -1284,13 +1310,12 @@ function get_my_address() {
  * If somebody arrives at our site using a zid, add their xchan to our DB if we don't have it already.
  * And if they aren't already authenticated here, attempt reverse magic auth.
  *
- * @param App &$a
  *
  * @hooks 'zid_init'
  *      string 'zid' - their zid
  *      string 'url' - the destination url
  */
-function zid_init(&$a) {
+function zid_init() {
 	$tmp_str = get_my_address();
 	if(validate_email($tmp_str)) {
 		Zotlabs\Daemon\Master::Summon(array('Gprobe',bin2hex($tmp_str)));
@@ -1316,6 +1341,29 @@ function zid_init(&$a) {
 	}
 }
 
+/**
+ * @brief
+ *
+ * If somebody arrives at our site using a zat, authenticate them
+ *
+ */
+
+function zat_init() {
+	if(local_channel() || remote_channel())
+		return;
+
+	$r = q("select * from atoken where atoken_token = '%s' limit 1",
+		dbesc($_REQUEST['zat'])
+	);
+	if($r) {
+		$xchan = atoken_xchan($r[0]);
+		atoken_login($xchan);
+	}
+
+}
+
+
+
 /**
  * @brief Adds a zid parameter to a url.
  *
diff --git a/include/config.php b/include/config.php
index 65199283d..08810e298 100644
--- a/include/config.php
+++ b/include/config.php
@@ -98,20 +98,20 @@ function del_aconfig($account_id, $family, $key) {
 }
 
 
-function load_abconfig($chash,$xhash) {
-	Zlib\AbConfig::Load($chash,$xhash);
+function load_abconfig($chan, $xhash, $family = '') {
+	return Zlib\AbConfig::Load($chan,$xhash,$family);
 }
 
-function get_abconfig($chash,$xhash,$family,$key) {
-	return Zlib\AbConfig::Get($chash,$xhash,$family,$key);
+function get_abconfig($chan,$xhash,$family,$key) {
+	return Zlib\AbConfig::Get($chan,$xhash,$family,$key);
 }
 
-function set_abconfig($chash,$xhash,$family,$key,$value) {
-	return Zlib\AbConfig::Set($chash,$xhash,$family,$key,$value);
+function set_abconfig($chan,$xhash,$family,$key,$value) {
+	return Zlib\AbConfig::Set($chan,$xhash,$family,$key,$value);
 }
 
-function del_abconfig($chash,$xhash,$family,$key) {
-	return Zlib\AbConfig::Delete($chash,$xhash,$family,$key);
+function del_abconfig($chan,$xhash,$family,$key) {
+	return Zlib\AbConfig::Delete($chan,$xhash,$family,$key);
 }
 
 function load_iconfig(&$item) {
diff --git a/include/connections.php b/include/connections.php
index 2d10b8354..ed4526a09 100644
--- a/include/connections.php
+++ b/include/connections.php
@@ -283,18 +283,30 @@ function channel_remove($channel_id, $local = true, $unset_session=false) {
 		Zotlabs\Daemon\Master::Summon(array('Notifier','purge_all',$channel_id));
 	}
 
+
+	$r = q("select * from iconfig left join item on item.id = iconfig.iid
+		where item.uid = %d",
+		intval($channel_id)
+	);
+	if($r) {
+		foreach($r as $rr) {
+			q("delete from iconfig where iid = %d",
+				intval($rr['iid'])
+			);
+		}
+	}
+
+
 	q("DELETE FROM `groups` WHERE `uid` = %d", intval($channel_id));
 	q("DELETE FROM `group_member` WHERE `uid` = %d", intval($channel_id));
 	q("DELETE FROM `event` WHERE `uid` = %d", intval($channel_id));
 	q("DELETE FROM `item` WHERE `uid` = %d", intval($channel_id));
-	q("DELETE FROM `item_id` WHERE `uid` = %d", intval($channel_id));
 	q("DELETE FROM `mail` WHERE `channel_id` = %d", intval($channel_id));
 	q("DELETE FROM `notify` WHERE `uid` = %d", intval($channel_id));
 	q("DELETE FROM `photo` WHERE `uid` = %d", intval($channel_id));
 	q("DELETE FROM `attach` WHERE `uid` = %d", intval($channel_id));
 	q("DELETE FROM `profile` WHERE `uid` = %d", intval($channel_id));
 	q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($channel_id));
-	q("DELETE FROM `spam` WHERE `uid` = %d", intval($channel_id));
 
 	// @FIXME At this stage we need to remove the file resources located under /store/$nickname
 
diff --git a/include/conversation.php b/include/conversation.php
index 518193b08..957dbf8e9 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -403,9 +403,12 @@ function count_descendants($item) {
  * @return boolean
  */
 function visible_activity($item) {
-	$hidden_activities = array(ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE);
+	$hidden_activities = [ ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_AGREE, ACTIVITY_DISAGREE, ACTIVITY_ABSTAIN, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE ];
 
-	$post_types = array(ACTIVITY_OBJ_NOTE,ACTIVITY_OBJ_COMMENT,basename(ACTIVITY_OBJ_NOTE),basename(ACTIVITY_OBJ_COMMENT)); 
+	$post_types = [ ACTIVITY_OBJ_NOTE, ACTIVITY_OBJ_COMMENT, basename(ACTIVITY_OBJ_NOTE), basename(ACTIVITY_OBJ_COMMENT)]; 
+
+	if(intval($item['item_notshown']))
+		return false;
 
 	foreach ($hidden_activities as $act) {
 		if ((activity_match($item['verb'], $act)) && ($item['mid'] != $item['parent_mid'])) {
@@ -1143,6 +1146,8 @@ function status_editor($a, $x, $popup = false) {
 	$weblink = (($mimetype === 'text/bbcode') ? t('Insert web link') : false);
 	if(x($x, 'hide_weblink'))
 		$weblink = false;
+	
+	$embedPhotos = t('Embed image from photo albums');
 
 	$writefiles = (($mimetype === 'text/bbcode') ? perm_is_allowed($x['profile_uid'], get_observer_hash(), 'write_storage') : false);
 	if(x($x, 'hide_attach'))
@@ -1178,6 +1183,12 @@ function status_editor($a, $x, $popup = false) {
 		'$whereareu' => t('Where are you right now?'),
 		'$editor_autocomplete'=> ((x($x,'editor_autocomplete')) ? $x['editor_autocomplete'] : ''),
 		'$bbco_autocomplete'=> ((x($x,'bbco_autocomplete')) ? $x['bbco_autocomplete'] : ''),
+		'$modalchooseimages' => t('Choose images to embed'),
+		'$modalchoosealbum' => t('Choose an album'),
+		'$modaldiffalbum' => t('Choose a different album...'),
+		'$modalerrorlist' => t('Error getting album list'),
+		'$modalerrorlink' => t('Error getting photo link'),
+		'$modalerroralbum' => t('Error getting album'),
 	));
 
 	$tpl = get_markup_template('jot.tpl');
@@ -1219,6 +1230,10 @@ function status_editor($a, $x, $popup = false) {
 		'$code' => t('Code'),
 		'$attach' => t('Attach file'),
 		'$weblink' => $weblink,
+		'$embedPhotos' => $embedPhotos,
+		'$embedPhotosModalTitle' => t('Embed an image from your albums'),
+		'$embedPhotosModalCancel' => t('Cancel'),
+		'$embedPhotosModalOK' => t('OK'),
 		'$setloc' => $setloc,
 		'$voting' => t('Toggle voting'),
 		'$feature_voting' => $feature_voting,
@@ -1688,13 +1703,19 @@ function profile_tabs($a, $is_owner = false, $nickname = null){
 			'title' => t('Manage Webpages'),
 			'id'    => 'webpages-tab',
 		);
-	} else {
-		/**
-		 * @FIXME we probably need a listing of events that were created by 
-		 * this channel and are visible to the observer
-		 */
+	} 
+
+	if(feature_enabled($uid,'wiki') && (! UNO)) {
+		$tabs[] = array(
+			'label' => t('Wiki'),
+			'url'   => z_root() . '/wiki/' . $nickname,
+			'sel'   => ((argv(0) == 'wiki') ? 'active' : ''),
+			'title' => t('Wiki'),
+			'id'    => 'wiki-tab',
+		);
 	}
 
+
 	$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
 	call_hooks('profile_tabs', $arr);
 	
diff --git a/include/datetime.php b/include/datetime.php
index 600ad6ec4..76bd6b8d6 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -556,13 +556,13 @@ function update_birthdays() {
 			$ev['uid'] = $rr['abook_channel'];
 			$ev['account'] = $rr['abook_account'];
 			$ev['event_xchan'] = $rr['xchan_hash'];
-			$ev['start'] = datetime_convert('UTC', 'UTC', $rr['abook_dob']);
-			$ev['finish'] = datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day ');
+			$ev['dtstart'] = datetime_convert('UTC', 'UTC', $rr['abook_dob']);
+			$ev['dtend'] = datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day ');
 			$ev['adjust'] = intval(feature_enabled($rr['abook_channel'],'smart_birthdays'));
 			$ev['summary'] = sprintf( t('%1$s\'s birthday'), $rr['xchan_name']);
 			$ev['description'] = sprintf( t('Happy Birthday %1$s'), 
 				'[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]') ;
-			$ev['type'] = 'birthday';
+			$ev['etype'] = 'birthday';
 
 			$z = event_store_event($ev);
 			if ($z) {
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index df072ed76..f6091f6e1 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -90,7 +90,7 @@ abstract class dba_driver {
 	protected $db;
 	protected $pdo = array();
 
-	public $debug = 0;
+	public  $debug = 0;
 	public  $connected = false;
 	public  $error = false;
 
@@ -332,6 +332,9 @@ function q($sql) {
 			else
 				db_logger('dba: vsprintf error: ' . print_r(debug_backtrace(), true),LOGGER_NORMAL,LOG_CRIT);
 		}
+		if(\DBA::$dba->debug)
+			db_logger('Sql: ' . $stmt, LOGGER_DEBUG, LOG_INFO);
+
 		return \DBA::$dba->q($stmt);
 	}
 
diff --git a/include/event.php b/include/event.php
index a4118ec78..3d650cd14 100644
--- a/include/event.php
+++ b/include/event.php
@@ -183,7 +183,9 @@ function format_ical_text($s) {
 	require_once('include/bbcode.php');
 	require_once('include/html2plain.php');
 
-	return(wordwrap(str_replace(array(',',';','\\'),array('\\,','\\;','\\\\'),html2plain(bbcode($s))),72,"\r\n ",true));
+	$s = html2plain(bbcode($s));
+	$s = str_replace(["\r\n","\n"],["",""],$s);
+	return(wordwrap(str_replace(['\\',',',';'],['\\\\','\\,','\\;'],$s),72,"\r\n ",true));
 }
 
 
diff --git a/include/features.php b/include/features.php
index 6d38bcfb4..2d71aa9be 100644
--- a/include/features.php
+++ b/include/features.php
@@ -52,6 +52,7 @@ function get_features($filtered = true) {
 			array('advanced_profiles',   t('Advanced Profiles'),      t('Additional profile sections and selections'),false,get_config('feature_lock','advanced_profiles')),
 			array('profile_export',      t('Profile Import/Export'),  t('Save and load profile details across sites/channels'),false,get_config('feature_lock','profile_export')),
 			array('webpages',            t('Web Pages'),              t('Provide managed web pages on your channel'),false,get_config('feature_lock','webpages')),
+			array('wiki',            t('Wiki'),              t('Provide a wiki for your channel'),((UNO) ? false : true),get_config('feature_lock','wiki')),
 			array('hide_rating',       t('Hide Rating'),          t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'),false,get_config('feature_lock','hide_rating')),			
 			array('private_notes',       t('Private Notes'),          t('Enables a tool to store notes and reminders (note: not encrypted)'),false,get_config('feature_lock','private_notes')),
 			array('nav_channel_select',  t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')),
diff --git a/include/feedutils.php b/include/feedutils.php
index 685b2f982..01ec0687e 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -393,7 +393,7 @@ function get_atom_elements($feed, $item, &$author) {
 		$terms = array();
 		$terms[] = array(
 			'otype' => TERM_OBJ_POST,
-			'type'  => TERM_BOOKMARK,
+			'ttype' => TERM_BOOKMARK,
 			'url'   => $res['plink'],
 			'term'  => $res['title'],
 		);
@@ -403,7 +403,7 @@ function get_atom_elements($feed, $item, &$author) {
 		$terms = array();
 		$terms[] = array(
 			'otype' => TERM_OBJ_POST,
-			'type'  => TERM_BOOKMARK,
+			'ttype' => TERM_BOOKMARK,
 			'url'   => $res['plink'],
 			'term'  => $res['plink'],
 		);
diff --git a/include/group.php b/include/group.php
index a4938b848..10853ff6b 100644
--- a/include/group.php
+++ b/include/group.php
@@ -17,7 +17,7 @@ function group_add($uid,$name,$public = 0) {
 			$z = q("SELECT * FROM `groups` WHERE `id` = %d LIMIT 1",
 				intval($r)
 			);
-			if(count($z) && $z[0]['deleted']) {
+			if(($z) && $z[0]['deleted']) {
 				/*$r = q("UPDATE `groups` SET `deleted` = 0 WHERE `uid` = %d AND `gname` = '%s' LIMIT 1",
 					intval($uid),
 					dbesc($name)
@@ -129,7 +129,7 @@ function group_byname($uid,$name) {
 		intval($uid),
 		dbesc($name)
 	);
-	if(count($r))
+	if($r)
 		return $r[0]['id'];
 	return false;
 }
@@ -178,11 +178,11 @@ function group_add_member($uid,$name,$member,$gid = 0) {
 		intval($gid),
 		dbesc($member)
 	);
-	if(count($r))
+	if($r)
 		return true;	// You might question this, but 
 				// we indicate success because the group member was in fact created
 				// -- It was just created at another time
- 	if(! count($r))
+ 	if(! $r)
 		$r = q("INSERT INTO `group_member` (`uid`, `gid`, `xchan`)
 			VALUES( %d, %d, '%s' ) ",
 			intval($uid),
@@ -205,7 +205,7 @@ function group_get_members($gid) {
 			intval(local_channel()),
 			intval(local_channel())
 		);
-		if(count($r))
+		if($r)
 			$ret = $r;
 	}
 	return $ret;
@@ -218,7 +218,7 @@ function group_get_members_xchan($gid) {
 			intval($gid),
 			intval(local_channel())
 		);
-		if(count($r)) {
+		if($r) {
 			foreach($r as $rr) {
 				$ret[] = $rr['xchan'];
 			}
@@ -236,7 +236,7 @@ function mini_group_select($uid,$group = '') {
 		intval($uid)
 	);
 	$grps[] = array('name' => '', 'hash' => '0', 'selected' => '');
-	if(count($r)) {
+	if($r) {
 		foreach($r as $rr) {
 			$grps[] = array('name' => $rr['gname'], 'id' => $rr['hash'], 'selected' => (($group == $rr['hash']) ? 'true' : ''));
 		}
@@ -279,7 +279,7 @@ function group_side($every="connections",$each="group",$edit = false, $group_id
 		$member_of = groups_containing(local_channel(),$cid);
 	} 
 
-	if(count($r)) {
+	if($r) {
 		foreach($r as $rr) {
 			$selected = (($group_id == $rr['id']) ? ' group-selected' : '');
 			
@@ -356,7 +356,7 @@ function groups_containing($uid,$c) {
 	);
 
 	$ret = array();
-	if(count($r)) {
+	if($r) {
 		foreach($r as $rr)
 			$ret[] = $rr['gid'];
 	}
diff --git a/include/help.php b/include/help.php
index 5518eeb70..7f57f3334 100644
--- a/include/help.php
+++ b/include/help.php
@@ -30,7 +30,8 @@ function search_doc_files($s) {
 
 	$regexop = db_getfunc('REGEXP');
 
-	$r = q("select item_id.sid, item.* from item left join item_id on item.id = item_id.iid where service = 'docfile' and
+	$r = q("select iconfig.v, item.* from item left join iconfig on item.id = iconfig.iid 
+		where iconfig.cat = 'system' and iconfig.k = 'docfile' and
 		body $regexop '%s' and item_type = %d $pager_sql",
 		dbesc($s),
 		intval(ITEM_TYPE_DOC)
@@ -50,7 +51,7 @@ function search_doc_files($s) {
 				}
 			}
 		}
-		if(stristr($r[$x]['sid'],$s))
+		if(stristr($r[$x]['v'],$s))
 			$r[$x]['rank'] ++;
 		$r[$x]['rank'] += substr_count(strtolower($r[$x]['text']),strtolower($s));
 		// bias the results to the observer's native language
@@ -123,12 +124,15 @@ function store_doc_file($s) {
 	$item['owner_xchan'] = $item['author_xchan'] = $sys['channel_hash'];
 	$item['item_type'] = ITEM_TYPE_DOC;
 
-	$r = q("select item.* from item left join item_id on item.id = item_id.iid where service = 'docfile' and
-		sid = '%s' and item_type = %d limit 1",
+	$r = q("select item.* from item left join iconfig on item.id = iconfig.iid 
+		where iconfig.cat = 'system' and iconfig.k = 'docfile' and
+		iconfig.v = '%s' and item_type = %d limit 1",
 		dbesc($s),
 		intval(ITEM_TYPE_DOC)
 	);
 
+	\Zotlabs\Lib\IConfig::Set($item,'system','docfile',$s);
+
 	if($r) {
 		$item['id'] = $r[0]['id'];
 		$item['mid'] = $item['parent_mid'] = $r[0]['mid'];
@@ -139,10 +143,7 @@ function store_doc_file($s) {
 		$x = item_store($item);
 	}
 
-	if($x['success']) {
-		update_remote_id($sys,$x['item_id'],ITEM_TYPE_DOC,$s,'docfile',0,$item['mid']);
-	}
-
+	return $x;
 
 }
 
diff --git a/include/import.php b/include/import.php
index be456bfa9..889b50eb1 100644
--- a/include/import.php
+++ b/include/import.php
@@ -553,7 +553,7 @@ function sync_chatrooms($channel,$chatrooms) {
 
 
 
-function import_items($channel,$items,$sync = false) {
+function import_items($channel,$items,$sync = false,$relocate = null) {
 
 	if($channel && $items) {
 		$allow_code = false;
@@ -575,22 +575,23 @@ function import_items($channel,$items,$sync = false) {
 			if(! $item)
 				continue;
 
+			if($relocate && $item['mid'] === $item['parent_mid']) {
+				item_url_replace($channel,$item,$relocate['url'],z_root(),$relocate['channel_address']);
+			}
+
 			$r = q("select id, edited from item where mid = '%s' and uid = %d limit 1",
 				dbesc($item['mid']),
 				intval($channel['channel_id'])
 			);
 			if($r) {
-				if($item['edited'] > $r[0]['edited']) {
+
+				// flags may have changed and we are probably relocating the post, 
+				// so force an update even if we have the same timestamp
+
+				if($item['edited'] >= $r[0]['edited']) {
 					$item['id'] = $r[0]['id'];
 					$item['uid'] = $channel['channel_id'];
 					$item_result = item_store_update($item,$allow_code,$deliver);
-					if($sync && $item['item_wall']) {
-						// deliver singletons if we have any
-						if($item_result && $item_result['success']) {
-							Zotlabs\Daemon\Master::Summon(array('Notifier','single_activity',$item_result['item_id']));
-						}
-					}
-					continue;
 				}	
 			}
 			else {
@@ -598,10 +599,11 @@ function import_items($channel,$items,$sync = false) {
 				$item['uid'] = $channel['channel_id'];
 				$item_result = item_store($item,$allow_code,$deliver);
 			}
+
 			if($sync && $item['item_wall']) {
 				// deliver singletons if we have any
 				if($item_result && $item_result['success']) {
-					Zotlabs\Daemon\Master::Summon(array('Notifier','single_activity',$item_result['item_id']));
+					Zotlabs\Daemon\Master::Summon( [ 'Notifier','single_activity',$item_result['item_id'] ]);
 				}
 			}
 		}
@@ -609,8 +611,8 @@ function import_items($channel,$items,$sync = false) {
 }
 
 
-function sync_items($channel,$items) {
-	import_items($channel,$items,true);
+function sync_items($channel,$items,$relocate = null) {
+	import_items($channel,$items,true,$relocate);
 }
 
 
@@ -624,19 +626,14 @@ function import_item_ids($channel,$itemids) {
 			);
 			if(! $r)
 				continue;
-			$z = q("select * from item_id where service = '%s' and sid = '%s' and iid = %d and uid = %d limit 1",
+			$z = q("select * from iconfig where iconfig.cat = 'system' and iconfig.k = '%s' 
+				and iconfig.v = '%s' and iid = %d limit 1",
 				dbesc($i['service']),
 				dbesc($i['sid']),
-				intval($r[0]['id']),
-				intval($channel['channel_id'])
+				intval($r[0]['id'])
 			);
 			if(! $z) {
-				q("insert into item_id (iid,uid,sid,service) values(%d,%d,'%s','%s')",
-					intval($r[0]['id']),
-					intval($channel['channel_id']),
-					dbesc($i['sid']),
-					dbesc($i['service'])
-				);
+				\Zotlabs\Lib\IConfig::Set($r[0]['id'],'system',$i['service'],$i['sid'],true);
 			}
 		}
 	}
@@ -1007,7 +1004,7 @@ function sync_files($channel,$files) {
 						$attach_id = $x[0]['id'];
 					}
 
-					$newfname = 'store/' . $channel['channel_address'] . '/' . get_attach_binname($att['data']);
+					$newfname = 'store/' . $channel['channel_address'] . '/' . get_attach_binname($att['content']);
 
  					unset($att['id']);
 					$att['aid'] = $channel['channel_account_id'];
@@ -1205,31 +1202,9 @@ function sync_files($channel,$files) {
 				}
 			}
 			if($f['item']) {
-				sync_items($channel,$f['item']);
-				foreach($f['item'] as $i) {
-					if($i['message_id'] !== $i['message_parent'])
-						continue;
-					$r = q("select * from item where mid = '%s' and uid = %d limit 1",
-						dbesc($i['message_id']),
-						intval($channel['channel_id'])
-					);
-					if($r) {
-						$item = $r[0];
-						item_url_replace($channel,$item,$oldbase,z_root(),$original_channel);
-
-						dbesc_array($item);
-						$item_id = $item['id'];
-						unset($item['id']);
-					    $str = '';
-    					foreach($item as $k => $v) {
-				        	if($str)
-            					$str .= ",";
-        					$str .= " `" . $k . "` = '" . $v . "' ";
-    					}
-
-					    $r = dbq("update `item` set " . $str . " where id = " . $item_id );
-					}
-				}
+				sync_items($channel,$f['item'],
+					['channel_address' => $original_channel,'url' => $oldbase]
+				);
 			}
 		}
 	}
diff --git a/include/items.php b/include/items.php
index 93385c6e6..373090d41 100755
--- a/include/items.php
+++ b/include/items.php
@@ -449,11 +449,7 @@ function post_activity_item($arr) {
 		call_hooks('post_local_end', $arr);
 		Zotlabs\Daemon\Master::Summon(array('Notifier','activity',$post_id));
 		$ret['success'] = true;
-		$r = q("select * from item where id = %d limit 1",
-			intval($post_id)
-		);
-		if($r)
-			$ret['activity'] = $r[0];
+		$ret['activity'] = $post['item'];
 	}
 
 	return $ret;
@@ -677,13 +673,23 @@ function get_item_elements($x,$allow_code = false) {
 
 	$arr['item_flags'] = 0;
 
-	if(array_key_exists('flags',$x) && in_array('consensus',$x['flags']))
-		$arr['item_consensus'] = 1;
+	if(array_key_exists('flags',$x)) {
 
-	if(array_key_exists('flags',$x) && in_array('deleted',$x['flags']))
-		$arr['item_deleted'] = 1;
-	if(array_key_exists('flags',$x) && in_array('hidden',$x['flags']))
-		$arr['item_hidden'] = 1;
+		if(in_array('consensus',$x['flags']))
+			$arr['item_consensus'] = 1;
+
+		if(in_array('deleted',$x['flags']))
+			$arr['item_deleted'] = 1;
+
+		if(in_array('notshown',$x['flags']))
+			$arr['item_notshown'] = 1;
+
+		// hidden item are no longer propagated - notshown may be a suitable alternative
+
+		if(in_array('hidden',$x['flags']))
+			$arr['item_hidden'] = 1;
+
+	}
 
 	// Here's the deal - the site might be down or whatever but if there's a new person you've never
 	// seen before sending stuff to your stream, we MUST be able to look them up and import their data from their
@@ -1339,6 +1345,8 @@ function encode_item_flags($item) {
 		$ret[] = 'deleted';
 	if(intval($item['item_hidden']))
 		$ret[] = 'hidden';
+	if(intval($item['item_notshown']))
+		$ret[] = 'notshown';
 	if(intval($item['item_thread_top']))
 		$ret[] = 'thread_parent';
 	if(intval($item['item_nsfw']))
@@ -1877,6 +1885,7 @@ function item_store($arr, $allow_exec = false, $deliver = true) {
 	}
 
 
+	$ret['item'] = $arr;
 
 	call_hooks('post_remote_end',$arr);
 
@@ -2127,6 +2136,15 @@ function item_store_update($arr,$allow_exec = false, $deliver = true) {
 		return $ret;
 	}
 
+	// fetch an unescaped complete copy of the stored item
+
+	$r = q("select * from item where id = %d",
+		intval($orig_post_id)
+	);
+	if($r)
+		$arr = $r[0];
+
+
 	$r = q("delete from term where oid = %d and otype = %d",
 		intval($orig_post_id),
 		intval(TERM_OBJ_POST)
@@ -2158,6 +2176,8 @@ function item_store_update($arr,$allow_exec = false, $deliver = true) {
 		$arr['iconfig'] = $meta;
 	}
 
+	$ret['item'] = $arr;
+
 	call_hooks('post_remote_update_end',$arr);
 
 	if($deliver) {
@@ -3266,15 +3286,17 @@ function item_expire($uid,$days) {
 
 	$item_normal = item_normal();
 
-	$r = q("SELECT * FROM `item`
-		WHERE `uid` = %d
-		AND `created` < %s - INTERVAL %s
-		AND `id` = `parent`
-		$sql_extra
+	$r = q("SELECT id FROM item
+		WHERE uid = %d
+		AND created < %s - INTERVAL %s
 		AND item_retained = 0
-		$item_normal LIMIT $expire_limit ",
+		AND item_thread_top = 1
+		AND resource_type = ''
+		AND item_starred = 0
+		$sql_extra $item_normal LIMIT $expire_limit ",
 		intval($uid),
-		db_utcnow(), db_quoteinterval(intval($days).' DAY')
+		db_utcnow(), 
+		db_quoteinterval(intval($days).' DAY')
 	);
 
 	if(! $r)
@@ -3292,17 +3314,6 @@ function item_expire($uid,$days) {
 			continue;
 		}
 
-		// Only expire posts, not photos and photo comments
-
-		if($item['resource_type'] === 'photo') {
-			retain_item($item['id']);
-			continue;
-		}
-		if(intval($item['item_starred'])) {
-			retain_item($item['id']);
-			continue;
-		}
-
 		drop_item($item['id'],false);
 	}
 
@@ -3537,9 +3548,8 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) {
 		intval($item['id'])
 	);
 
-	q("delete from item_id where iid = %d and uid = %d",
-		intval($item['id']),
-		intval($item['uid'])
+	q("delete from iconfig where iid = %d",
+		intval($item['id'])
 	);
 
 	q("delete from term where oid = %d and otype = %d",
@@ -4105,6 +4115,23 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
 	return $items;
 }
 
+function webpage_to_namespace($webpage) {
+
+	if($webpage == ITEM_TYPE_WEBPAGE)
+		$page_type = 'WEBPAGE';
+	elseif($webpage == ITEM_TYPE_BLOCK)
+		$page_type = 'BUILDBLOCK';
+	elseif($webpage == ITEM_TYPE_PDL)
+		$page_type = 'PDL';
+	elseif($webpage == ITEM_TYPE_DOC)
+		$page_type = 'docfile';
+	else
+		$page_type = 'unknown';
+	return $page_type;
+
+}
+
+
 
 function update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remote_id,$mid) {
 
@@ -4127,32 +4154,19 @@ function update_remote_id($channel,$post_id,$webpage,$pagetitle,$namespace,$remo
 	}
 
 	if($page_type) {
-
 		// store page info as an alternate message_id so we can access it via
 		//    https://sitename/page/$channelname/$pagetitle
 		// if no pagetitle was given or it couldn't be transliterated into a url, use the first
 		// sixteen bytes of the mid - which makes the link portable and not quite as daunting
 		// as the entire mid. If it were the post_id the link would be less portable.
 
-		$r = q("select * from item_id where iid = %d and uid = %d and service = '%s' limit 1",
+		\Zotlabs\Lib\IConfig::Set(
 			intval($post_id),
-			intval($channel['channel_id']),
-			dbesc($page_type)
+			'system',
+			$page_type,
+			($pagetitle) ? $pagetitle : substr($mid,0,16),
+			false
 		);
-		if($r) {
-			q("update item_id set sid = '%s' where id = %d",
-				dbesc(($pagetitle) ? $pagetitle : substr($mid,0,16)),
-				intval($r[0]['id'])
-			);
-		}
-		else {
-			q("insert into item_id ( iid, uid, sid, service ) values ( %d, %d, '%s','%s' )",
-				intval($post_id),
-				intval($channel['channel_id']),
-				dbesc(($pagetitle) ? $pagetitle : substr($mid,0,16)),
-				dbesc($page_type)
-			);
-		}
 	}
 }
 
diff --git a/include/js_strings.php b/include/js_strings.php
index b1817f373..1b4668061 100644
--- a/include/js_strings.php
+++ b/include/js_strings.php
@@ -4,10 +4,10 @@ function js_strings() {
 	return replace_macros(get_markup_template('js_strings.tpl'), array(
 		'$delitem'     => t('Delete this item?'),
 		'$comment'     => t('Comment'),
-		'$showmore'    => t('[+] show all'),
-		'$showfewer'   => t('[-] show less'),
-		'$divgrowmore' => t('[+] expand'),
-		'$divgrowless' => t('[-] collapse'),
+		'$showmore'    => sprintf( t('%s show all'), '<i class=\'fa fa-chevron-down\'></i>'),
+		'$showfewer'   => sprintf( t('%s show less'), '<i class=\'fa fa-chevron-up\'></i>'),
+		'$divgrowmore' => sprintf( t('%s expand'), '<i class=\'fa fa-chevron-down\'></i>'),
+		'$divgrowless' => sprintf( t('%s collapse'),'<i class=\'fa fa-chevron-up\'></i>'),
 		'$pwshort'     => t("Password too short"),
 		'$pwnomatch'   => t("Passwords do not match"),
 		'$everybody'   => t('everybody'),
diff --git a/include/nav.php b/include/nav.php
index 70faec598..1fb0e98dc 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -104,6 +104,8 @@ EOT;
 
 		if(feature_enabled($channel['channel_id'],'webpages') && (! UNO))
 			$nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages'),'webpages_nav_btn');
+		if(feature_enabled($channel['channel_id'],'wiki') && (! UNO))
+			$nav['usermenu'][] = Array('wiki/' . $channel['channel_address'],t('Wiki'),"",t('Your wiki'),'wiki_nav_btn');
 	}
 	else {
 		if(! get_account_id())  {
@@ -126,7 +128,7 @@ EOT;
 		$nav['lock'] = array('logout','','lock', 
 			sprintf( t('%s - click to logout'), $observer['xchan_addr']));
 	}
-	else {
+	elseif(! $_SESSION['authenticated']) {
 		$nav['loginmenu'][] = Array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn');
 	}
 
@@ -143,7 +145,7 @@ EOT;
 	if((App::$module != 'home') && (! (local_channel()))) 
 		$nav['home'] = array($homelink, t('Home'), "", t('Home Page'),'home_nav_btn');
 
-	if((App::$config['system']['register_policy'] == REGISTER_OPEN) && (! local_channel()) && (! remote_channel()))
+	if((App::$config['system']['register_policy'] == REGISTER_OPEN) && (! $_SESSION['authenticated']))
 		$nav['register'] = array('register',t('Register'), "", t('Create an account'),'register_nav_btn');
 
 	if(! get_config('system','hide_help')) {
@@ -253,6 +255,19 @@ $powered_by = '';
 		'$pleasewait' => t('Please wait...')
 	));
 
+
+	if(x($_SESSION, 'reload_avatar') && $observer) {
+		// The avatar has been changed on the server but the browser doesn't know that, 
+		// force the browser to reload the image from the server instead of its cache.
+		$tpl = get_markup_template('force_image_reload.tpl');
+
+		App::$page['nav'] .= replace_macros($tpl, array(
+			'$imgUrl' => $observer['xchan_photo_m']
+		));
+		unset($_SESSION['reload_avatar']);
+	}
+
+
 	call_hooks('page_header', App::$page['nav']);
 }
 
diff --git a/include/network.php b/include/network.php
index 0dd10e29b..47863b680 100644
--- a/include/network.php
+++ b/include/network.php
@@ -21,15 +21,18 @@ function get_capath() {
  *    TRUE if asked to return binary results (file download)
  * @param int $redirects default 0
  *    internal use, recursion counter
- * @param array $opts (optional parameters) assoziative array with:
+ * @param array $opts (optional parameters) associative array with:
  *  * \b accept_content => supply Accept: header with 'accept_content' as the value
  *  * \b timeout => int seconds, default system config value or 60 seconds
  *  * \b http_auth => username:password
  *  * \b novalidate => do not validate SSL certs, default is to validate using our CA list
  *  * \b nobody => only return the header
  *  * \b filep => stream resource to write body to. header and body are not returned when using this option.
+ *  * \b custom => custom request method: e.g. 'PUT', 'DELETE'
+ *  * \b cookiejar => cookie file (write)
+ *  * \B cookiefile => cookie file (read)
  *
- * @return array an assoziative array with:
+ * @return array an associative array with:
  *  * \e int \b return_code => HTTP return code or 0 if timeout or failure
  *  * \e boolean \b success => boolean true (if HTTP 2xx result) or false
  *  * \e string \b header => HTTP headers 
@@ -59,12 +62,27 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
 		@curl_setopt($ch, CURLOPT_HEADER, $false);
 	}
 
+	if(x($opts,'upload'))
+		@curl_setopt($ch, CURLOPT_UPLOAD, $opts['upload']);
+	
+	if(x($opts,'infile'))
+		@curl_setopt($ch, CURLOPT_INFILE, $opts['infile']);
+
+	if(x($opts,'infilesize'))
+		@curl_setopt($ch, CURLOPT_INFILESIZE, $opts['infilesize']);
+
+	if(x($opts,'readfunc'))
+		@curl_setopt($ch, CURLOPT_READFUNCTION, $opts['readfunc']);
+
 	if(x($opts,'headers'))
 		@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
 
 	if(x($opts,'nobody'))
 		@curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
 
+	if(x($opts,'custom'))
+		@curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $opts['custom']);
+
 	if(x($opts,'timeout') && intval($opts['timeout'])) {
 		@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
 	}
@@ -78,6 +96,14 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
 		@curl_setopt($ch, CURLOPT_USERPWD, $opts['http_auth']);
 	}
 
+	if(x($opts,'cookiejar'))
+		@curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']);
+	if(x($opts,'cookiefile'))
+		@curl_setopt($ch, CURLOPT_COOKIEFILE, $opts['cookiefile']);
+
+	if(x($opts,'cookie'))
+		@curl_setopt($ch, CURLOPT_COOKIE, $opts['cookie']);
+
 	@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 
 		((x($opts,'novalidate') && intval($opts['novalidate'])) ? false : true));
 
@@ -165,7 +191,9 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
  *    'http_auth' => username:password
  *    'novalidate' => do not validate SSL certs, default is to validate using our CA list
  *    'filep' => stream resource to write body to. header and body are not returned when using this option.
- * @return array an assoziative array with:
+ *    'custom' => custom request method: e.g. 'PUT', 'DELETE'
+ *
+ * @return array an associative array with:
  *  * \e int \b return_code => HTTP return code or 0 if timeout or failure
  *  * \e boolean \b success => boolean true (if HTTP 2xx result) or false
  *  * \e string \b header => HTTP headers
@@ -174,6 +202,10 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) {
  */
 function z_post_url($url,$params, $redirects = 0, $opts = array()) {
 
+//	logger('url: ' . $url);
+//	logger('params: ' . print_r($params,true));
+//	logger('opts: ' . print_r($opts,true));
+
 	$ret = array('return_code' => 0, 'success' => false, 'header' => "", 'body' => "");
 
 	$ch = curl_init($url);
@@ -199,12 +231,17 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) {
 
 	if(x($opts,'headers')) {
 		@curl_setopt($ch, CURLOPT_HTTPHEADER, $opts['headers']);
-logger('headers: ' . print_r($opts['headers'],true) . 'redir: ' . $redirects);
 	}
  
 	if(x($opts,'nobody'))
 		@curl_setopt($ch, CURLOPT_NOBODY, $opts['nobody']);
 
+	if(x($opts,'custom')) {
+		@curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $opts['custom']);
+		@curl_setopt($ch, CURLOPT_POST,0);
+	}
+
+
 	if(x($opts,'timeout') && intval($opts['timeout'])) {
 		@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
 	}
@@ -218,6 +255,16 @@ logger('headers: ' . print_r($opts['headers'],true) . 'redir: ' . $redirects);
 		@curl_setopt($ch, CURLOPT_USERPWD, $opts['http_auth']);
 	}
 
+
+	if(x($opts,'cookiejar'))
+		@curl_setopt($ch, CURLOPT_COOKIEJAR, $opts['cookiejar']);
+	if(x($opts,'cookiefile'))
+		@curl_setopt($ch, CURLOPT_COOKIEFILE, $opts['cookiefile']);
+
+
+	if(x($opts,'cookie'))
+		@curl_setopt($ch, CURLOPT_COOKIE, $opts['cookie']);
+
 	@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 
 		((x($opts,'novalidate') && intval($opts['novalidate'])) ? false : true));
 
@@ -1296,8 +1343,20 @@ function discover_by_webbie($webbie) {
 					$fullname = $vcard['fn'];
 				if($vcard['photo'] && (strpos($vcard['photo'],'http') !== 0))
 					$vcard['photo'] = $diaspora_base . '/' . $vcard['photo'];			
+				if(($vcard['key']) && (! $pubkey))
+					$pubkey = $vcard['key'];
 				if(! $avatar)
 					$avatar = $vcard['photo'];
+				if($diaspora) {
+					if(($vcard['guid']) && (! $diaspora_guid))
+						$diaspora_guid = $vcard['guid'];
+					if(($vcard['url']) && (! $diaspora_base))
+						$diaspora_base = $vcard['url'];						
+
+
+
+
+				}
 
 			}
 		}
@@ -1962,14 +2021,7 @@ function get_site_info() {
 	else
 		$service_class = false;
 
-	$visible_plugins = array();
-	if(is_array(App::$plugins) && count(App::$plugins)) {
-		$r = q("select * from addon where hidden = 0");
-		if(count($r))
-			foreach($r as $rr)
-				$visible_plugins[] = $rr['aname'];
-	}
-	sort($visible_plugins);
+	$visible_plugins = visible_plugin_list();
 
 	if(@is_dir('.git') && function_exists('shell_exec'))
 		$commit = trim(@shell_exec('git log -1 --format="%h"'));
diff --git a/include/oauth.php b/include/oauth.php
index 984e0e6c6..a3c52bf27 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -170,7 +170,7 @@ class ZotOAuth1 extends OAuth1Server {
 		);
 		if($x) {
 			require_once('include/security.php');
-			authenticate_success($x[0],true,false,true,true);
+			authenticate_success($x[0],null,true,false,true,true);
 			$_SESSION['allow_api'] = true;
 		}
 	}
diff --git a/include/oembed.php b/include/oembed.php
index e968a8f65..fe068278e 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,6 +1,8 @@
 <?php /** @file */
 
 
+use Zotlabs\Lib as Zlib;
+
 function oembed_replacecb($matches){
 
 	$embedurl=$matches[1];
@@ -129,7 +131,7 @@ function oembed_fetch_url($embedurl){
 	$txt = null;
 
 	if($action !== 'block') {
-		$txt = Cache::get(App::$videowidth . $embedurl);
+		$txt = Zlib\Cache::get('[' . App::$videowidth . '] ' . $embedurl);
 
 		if(strstr($txt,'youtu') && strstr(z_root(),'https:')) {
 			$txt = str_replace('http:','https:',$txt);
@@ -198,7 +200,7 @@ function oembed_fetch_url($embedurl){
 		//save in cache
 
 		if(! get_config('system','oembed_cache_disable'))
-			Cache::set(App::$videowidth . $embedurl,$txt);
+			Zlib\Cache::set('[' . App::$videowidth . '] ' . $embedurl,$txt);
 
 	}
 
diff --git a/include/page_widgets.php b/include/page_widgets.php
index 49d1439be..3270de4a3 100644
--- a/include/page_widgets.php
+++ b/include/page_widgets.php
@@ -1,7 +1,8 @@
 <?php
 
 // A basic toolbar for observers with write_pages permissions
-function writepages_widget ($who,$which){
+
+function writepages_widget ($who,$which) {
 	return replace_macros(get_markup_template('write_pages.tpl'), array(
 		'$new' => t('New Page'),
 		'$newurl' => "webpages/$who",
@@ -13,9 +14,11 @@ function writepages_widget ($who,$which){
 
 
 // Chan is channel_id, $which is channel_address - we'll need to pass observer later too.
-function pagelist_widget ($owner,$which){
 
-	$r = q("select * from item_id left join item on item_id.iid = item.id where item_id.uid = %d and service = 'WEBPAGE' order by item.created desc",
+function pagelist_widget ($owner,$which) {
+
+	$r = q("select * from iconfig left join item on iconfig.iid = item.id where item_id.uid = %d 
+		and iconfig.cat = 'system' and iconfig.k = 'WEBPAGE' order by item.created desc",
 		intval($owner)
 	);
 
@@ -24,7 +27,7 @@ function pagelist_widget ($owner,$which){
 	if($r) {
 		$pages = array();
 		foreach($r as $rr) {
-			$pages[$rr['iid']][] = array('url' => $rr['iid'],'pagetitle' => $rr['sid'],'title' => $rr['title'],'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']));
+			$pages[$rr['iid']][] = array('url' => $rr['iid'],'pagetitle' => $rr['v'],'title' => $rr['title'],'created' => datetime_convert('UTC',date_default_timezone_get(),$rr['created']),'edited' => datetime_convert('UTC',date_default_timezone_get(),$rr['edited']));
 		}
 	}
 
diff --git a/include/photos.php b/include/photos.php
index c64d662ea..c70478146 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -41,6 +41,10 @@ function photo_upload($channel, $observer, $args) {
 	else
 		$visible = 0;
 
+	$deliver = true;
+	if(array_key_exists('deliver',$args))
+		$deliver = intval($args['deliver']);
+
 	// Set to default channel permissions. If the parent directory (album) has permissions set, 
 	// use those instead. If we have specific permissions supplied, they take precedence over
 	// all other settings. 'allow_cid' being passed from an external source takes priority over channel settings.
@@ -330,7 +334,7 @@ function photo_upload($channel, $observer, $args) {
 
 			if($item['mid'] === $item['parent_mid']) {
 
-				$item['body'] = $args['body'];
+				$item['body'] = $summary;
 				$item['obj_type'] = ACTIVITY_OBJ_PHOTO;
 				$item['obj']	= json_encode($object);
 
@@ -355,14 +359,14 @@ function photo_upload($channel, $observer, $args) {
 				if(($item['edited'] > $r[0]['edited']) || $force) {
 					$item['id'] = $r[0]['id'];
 					$item['uid'] = $channel['channel_id'];
-					item_store_update($item);
+					item_store_update($item,false,$deliver);
 					continue;
 				}	
 			}
 			else {
 				$item['aid'] = $channel['channel_account_id'];
 				$item['uid'] = $channel['channel_id'];
-				$item_result = item_store($item);
+				$item_result = item_store($item,false,$deliver);
 			}
 		}
 	}
@@ -414,10 +418,10 @@ function photo_upload($channel, $observer, $args) {
 
 
 
-		$result = item_store($arr);
+		$result = item_store($arr,false,$deliver);
 		$item_id = $result['item_id'];
 
-		if($visible) 
+		if($visible && $deliver) 
 			Zotlabs\Daemon\Master::Summon(array('Notifier', 'wall-new', $item_id));
 	}
 
@@ -703,40 +707,65 @@ function gps2Num($coordPart) {
     return floatval($parts[0]) / floatval($parts[1]);
 }
 
-function profile_photo_set_profile_perms($profileid = '') {
+function profile_photo_set_profile_perms($uid, $profileid = 0) {
 	
 		$allowcid = '';
-		if (x($profileid)) {
-	
-			$r = q("SELECT photo, profile_guid, id, is_default, uid  FROM profile WHERE profile.id = %d OR profile.profile_guid = '%s' LIMIT 1", intval($profileid), dbesc($profileid));
-	
-		} else {
-	
+		if($profileid) {
+			$r = q("SELECT photo, profile_guid, id, is_default, uid
+				FROM profile WHERE uid = %d and ( profile.id = %d OR profile.profile_guid = '%s') LIMIT 1", 
+				intval($profileid), 
+				dbesc($profileid)
+			);
+		} 
+		else {
 			logger('Resetting permissions on default-profile-photo for user'.local_channel());
-			$r = q("SELECT photo, profile_guid, id, is_default, uid  FROM profile WHERE profile.uid = %d AND is_default = 1 LIMIT 1", intval(local_channel()) ); //If no profile is given, we update the default profile
+
+			$r = q("SELECT photo, profile_guid, id, is_default, uid  FROM profile 
+				WHERE profile.uid = %d AND is_default = 1 LIMIT 1", 
+				intval($uid) 
+			); //If no profile is given, we update the default profile
 		}
+		if(! $r)
+			return;
 	
 		$profile = $r[0];
-		if(x($profile['id']) && x($profile['photo'])) { 
-		       	preg_match("@\w*(?=-\d*$)@i", $profile['photo'], $resource_id);
-		       	$resource_id = $resource_id[0];
+
+		if($profile['id'] && $profile['photo']) { 
+	      	preg_match("@\w*(?=-\d*$)@i", $profile['photo'], $resource_id);
+	       	$resource_id = $resource_id[0];
 	
-			if (intval($profile['is_default']) != 1) {
-				$r0 = q("SELECT channel_hash FROM channel WHERE channel_id = %d LIMIT 1", intval(local_channel()) );
-				$r1 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%d' ", intval($profile['id'])); //Should not be needed in future. Catches old int-profile-ids.
-				$r2 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%s'", dbesc($profile['profile_guid']));
+			if (! intval($profile['is_default'])) {
+				$r0 = q("SELECT channel_hash FROM channel WHERE channel_id = %d LIMIT 1", 
+					intval($uid) 
+				);
+				//Should not be needed in future. Catches old int-profile-ids.
+				$r1 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%d' ", 
+					intval($profile['id'])
+				);
+				$r2 = q("SELECT abook.abook_xchan FROM abook WHERE abook_profile = '%s'",
+					dbesc($profile['profile_guid'])
+				);
 				$allowcid = "<" . $r0[0]['channel_hash'] . ">";
 				foreach ($r1 as $entry) {
 					$allowcid .= "<" . $entry['abook_xchan'] . ">"; 
 				}
 				foreach ($r2 as $entry) {
-	               	                $allowcid .= "<" . $entry['abook_xchan'] . ">";
-		                      	}
+					$allowcid .= "<" . $entry['abook_xchan'] . ">";
+				}
 	
-				q("UPDATE `photo` SET allow_cid = '%s' WHERE resource_id = '%s' AND uid = %d",dbesc($allowcid),dbesc($resource_id),intval($profile['uid']));
+				q("UPDATE photo SET allow_cid = '%s' WHERE resource_id = '%s' AND uid = %d",
+					dbesc($allowcid),
+					dbesc($resource_id),
+					intval($uid)
+				);
 	
-			} else {
-				q("UPDATE `photo` SET allow_cid = '' WHERE profile = 1 AND uid = %d",intval($profile['uid'])); //Reset permissions on default profile picture to public
+			} 
+			else {
+				//Reset permissions on default profile picture to public
+				q("UPDATE photo SET allow_cid = '' WHERE photo_usage = %d AND uid = %d",
+					intval(PHOTO_PROFILE),
+					intval($uid)
+				); 
 			}
 		}
 	
diff --git a/include/plugin.php b/include/plugin.php
index be4e92f03..cb206d944 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -167,6 +167,12 @@ function reload_plugins() {
 	}
 }
 
+function visible_plugin_list() {
+	$r = q("select * from addon where hidden = 0 order by aname asc");
+	return(($r) ? ids_to_array($r,'aname') : array());
+}
+
+
 
 /**
  * @brief registers a hook.
@@ -545,15 +551,21 @@ function head_get_css() {
 }
 
 function format_css_if_exists($source) {
-	if (strpos($source[0], '/') !== false)
+	$path_prefix = script_path() . '/';
+
+	if (strpos($source[0], '/') !== false) {
+		// The source is a URL
 		$path = $source[0];
-	else
+		// If the url starts with // then it's an absolute URL
+		if($source[0][0] === '/' && $source[0][1] === '/') $path_prefix = '';
+	} else {
+		// It's a file from the theme
 		$path = theme_include($source[0]);
+	}
 
 	if($path) {
-		$path =  script_path() . '/' . $path;
 		$qstring = ((parse_url($path, PHP_URL_QUERY)) ? '&' : '?') . 'v=' . STD_VERSION;
-		return '<link rel="stylesheet" href="' . $path . $qstring . '" type="text/css" media="' . $source[1] . '">' . "\r\n";
+		return '<link rel="stylesheet" href="' . $path_prefix . $path . $qstring . '" type="text/css" media="' . $source[1] . '">' . "\r\n";
 	}
 }
 
@@ -593,26 +605,38 @@ function script_path() {
 	return $scheme . '://' . $hostname;
 }
 
-function head_add_js($src) {
-	App::$js_sources[] = $src;
+function head_add_js($src, $priority = 0) {
+	if(! is_array(App::$js_sources[$priority]))
+		App::$js_sources[$priority] = array();
+	App::$js_sources[$priority][] = $src;
 }
 
-function head_remove_js($src) {
+function head_remove_js($src, $priority = 0) {
 
-	$index = array_search($src, App::$js_sources);
+	$index = array_search($src, App::$js_sources[$priority]);
 	if($index !== false)
-		unset(App::$js_sources[$index]);
+		unset(App::$js_sources[$priority][$index]);
 }
 
+// We should probably try to register main.js with a high priority, but currently we handle it
+// separately and put it at the end of the html head block in case any other javascript is 
+// added outside the head_add_js construct.
+
 function head_get_js() {
+
 	$str = '';
-	$sources = App::$js_sources;
-	if(count($sources)) 
-		foreach($sources as $source) {
-			if($source === 'main.js')
-				continue;
-			$str .= format_js_if_exists($source);
+	if(App::$js_sources) {
+		ksort(App::$js_sources,SORT_NUMERIC);
+		foreach(App::$js_sources as $sources) {
+			if(count($sources)) { 
+				foreach($sources as $source) {
+					if($src === 'main.js')
+						continue;
+					$str .= format_js_if_exists($source);
+				}
+			}
 		}
+	}
 	return $str;
 }
 
@@ -626,14 +650,20 @@ function head_get_main_js() {
 }
 
 function format_js_if_exists($source) {
-	if(strpos($source,'/') !== false)
+	$path_prefix = script_path() . '/';
+
+	if(strpos($source,'/') !== false) {
+		// The source is a URL
 		$path = $source;
-	else
+		// If the url starts with // then it's an absolute URL
+		if($source[0] === '/' && $source[1] === '/') $path_prefix = '';
+	} else {
+		// It's a file from the theme
 		$path = theme_include($source);
+	}
 	if($path) {
-		$path =  script_path() . '/' . $path;
 		$qstring = ((parse_url($path, PHP_URL_QUERY)) ? '&' : '?') . 'v=' . STD_VERSION;
-		return '<script src="' . $path . $qstring . '" ></script>' . "\r\n" ;
+		return '<script src="' . $path_prefix . $path . $qstring . '" ></script>' . "\r\n" ;
 	}
 }
 
diff --git a/include/reddav.php b/include/reddav.php
deleted file mode 100644
index abf21b86d..000000000
--- a/include/reddav.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-/**
- * @file include/reddav.php
- * @brief some DAV related functions for Hubzilla.
- *
- * This file contains some functions which did not fit into one of the RedDAV
- * classes.
- *
- * The extended SabreDAV classes you will find in the RedDAV namespace under
- * @ref includes/RedDAV/.
- * The original SabreDAV classes you can find under @ref vendor/sabre/dav/.
- * We need to use SabreDAV 1.8.x for PHP5.3 compatibility. SabreDAV >= 2.0
- * requires PHP >= 5.4.
- *
- * @todo split up the classes into own files.
- *
- * @link http://github.com/friendica/red
- * @license http://opensource.org/licenses/mit-license.php The MIT License (MIT)
- */
-
-use Sabre\DAV;
-use Zotlabs\Storage;
-
-require_once('vendor/autoload.php');
-require_once('include/attach.php');
-
-/**
- * @brief Returns an array with viewable channels.
- *
- * Get a list of RedDirectory objects with all the channels where the visitor
- * has <b>view_storage</b> perms.
- *
- * @todo Is there any reason why this is not inside RedDirectory class?
- * @fixme function name looks like a class name, should we rename it?
- *
- * @param RedBasicAuth &$auth
- * @return array RedDirectory[]
- */
-function RedChannelList(&$auth) {
-	$ret = array();
-
-	$r = q("SELECT channel_id, channel_address FROM channel WHERE channel_removed = 0 AND channel_system = 0 AND NOT (channel_pageflags & %d)>0",
-		intval(PAGE_HIDDEN)
-	);
-
-	if ($r) {
-		foreach ($r as $rr) {
-			if (perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage')) {
-				logger('found channel: /cloud/' . $rr['channel_address'], LOGGER_DATA);
-				// @todo can't we drop '/cloud'? It gets stripped off anyway in RedDirectory
-				$ret[] = new Zotlabs\Storage\Directory('/cloud/' . $rr['channel_address'], $auth);
-			}
-		}
-	}
-	return $ret;
-}
-
-
-/**
- * @brief TODO what exactly does this function?
- *
- * Array with all RedDirectory and RedFile DAV\Node items for the given path.
- *
- * @todo Is there any reason why this is not inside RedDirectory class? Seems
- * only to be used there and we could simplify it a bit there.
- * @fixme function name looks like a class name, should we rename it?
- *
- * @param string $file path to a directory
- * @param RedBasicAuth &$auth
- * @returns null|array \Sabre\DAV\INode[]
- * @throw \Sabre\DAV\Exception\Forbidden
- * @throw \Sabre\DAV\Exception\NotFound
- */
-function RedCollectionData($file, &$auth) {
-	$ret = array();
-
-	$x = strpos($file, '/cloud');
-	if ($x === 0) {
-		$file = substr($file, 6);
-	}
-
-	// return a list of channel if we are not inside a channel
-	if ((! $file) || ($file === '/')) {
-		return RedChannelList($auth);
-	}
-
-	$file = trim($file, '/');
-	$path_arr = explode('/', $file);
-
-	if (! $path_arr)
-		return null;
-
-	$channel_name = $path_arr[0];
-
-	$r = q("SELECT channel_id FROM channel WHERE channel_address = '%s' LIMIT 1",
-		dbesc($channel_name)
-	);
-
-	if (! $r)
-		return null;
-
-	$channel_id = $r[0]['channel_id'];
-	$perms = permissions_sql($channel_id);
-
-	$auth->owner_id = $channel_id;
-
-	$path = '/' . $channel_name;
-
-	$folder = '';
-	$errors = false;
-	$permission_error = false;
-
-	for ($x = 1; $x < count($path_arr); $x++) {
-		$r = q("SELECT id, hash, filename, flags, is_dir FROM attach WHERE folder = '%s' AND filename = '%s' AND uid = %d AND is_dir != 0 $perms LIMIT 1",
-			dbesc($folder),
-			dbesc($path_arr[$x]),
-			intval($channel_id)
-		);
-		if (! $r) {
-			// path wasn't found. Try without permissions to see if it was the result of permissions.
-			$errors = true;
-			$r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0 limit 1",
-				dbesc($folder),
-				basename($path_arr[$x]),
-				intval($channel_id)
-			);
-			if ($r) {
-				$permission_error = true;
-			}
-			break;
-		}
-
-		if ($r && intval($r[0]['is_dir'])) {
-			$folder = $r[0]['hash'];
-			$path = $path . '/' . $r[0]['filename'];
-		}
-	}
-
-	if ($errors) {
-		if ($permission_error) {
-			throw new DAV\Exception\Forbidden('Permission denied.');
-		} else {
-			throw new DAV\Exception\NotFound('A component of the request file path could not be found.');
-		}
-	}
-
-	// This should no longer be needed since we just returned errors for paths not found
-	if ($path !== '/' . $file) {
-		logger("Path mismatch: $path !== /$file");
-		return NULL;
-	}
-	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
-		$prefix = 'DISTINCT ON (filename)';
-		$suffix = 'ORDER BY filename';
-	} else {
-		$prefix = '';
-		$suffix = 'GROUP BY filename';
-	}
-	$r = q("select $prefix id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, created, edited from attach where folder = '%s' and uid = %d $perms $suffix",
-		dbesc($folder),
-		intval($channel_id)
-	);
-
-	foreach ($r as $rr) {
-		//logger('filename: ' . $rr['filename'], LOGGER_DEBUG);
-		if (intval($rr['is_dir'])) {
-			$ret[] = new Zotlabs\Storage\Directory($path . '/' . $rr['filename'], $auth);
-		} else {
-			$ret[] = new Zotlabs\Storage\File($path . '/' . $rr['filename'], $rr, $auth);
-		}
-	}
-
-	return $ret;
-}
-
-
-/**
- * @brief TODO What exactly is this function for?
- *
- * @fixme function name looks like a class name, should we rename it?
- *
- * @param string $file
- *  path to file or directory
- * @param RedBasicAuth &$auth
- * @param boolean $test (optional) enable test mode
- * @return RedFile|RedDirectory|boolean|null
- * @throw \Sabre\DAV\Exception\Forbidden
- */
-function RedFileData($file, &$auth, $test = false) {
-	logger($file . (($test) ? ' (test mode) ' : ''), LOGGER_DATA);
-
-	$x = strpos($file, '/cloud');
-	if ($x === 0) {
-		$file = substr($file, 6);
-	}
-	else {
-		$x = strpos($file,'/dav');
-		if($x === 0)
-			$file = substr($file,4);
-	}
-
-
-	if ((! $file) || ($file === '/')) {
-		return new Zotlabs\Storage\Directory('/', $auth);
-	}
-
-	$file = trim($file, '/');
-
-	$path_arr = explode('/', $file);
-
-	if (! $path_arr)
-		return null;
-
-	$channel_name = $path_arr[0];
-
-	$r = q("select channel_id from channel where channel_address = '%s' limit 1",
-		dbesc($channel_name)
-	);
-
-	if (! $r)
-		return null;
-
-	$channel_id = $r[0]['channel_id'];
-
-	$path = '/' . $channel_name;
-
-	$auth->owner_id = $channel_id;
-
-	$permission_error = false;
-
-	$folder = '';
-
-	require_once('include/security.php');
-	$perms = permissions_sql($channel_id);
-
-	$errors = false;
-
-	for ($x = 1; $x < count($path_arr); $x++) {		
-		$r = q("select id, hash, filename, flags, is_dir from attach where folder = '%s' and filename = '%s' and uid = %d and is_dir != 0 $perms",
-			dbesc($folder),
-			dbesc($path_arr[$x]),
-			intval($channel_id)
-		);
-
-		if ($r && intval($r[0]['is_dir'])) {
-			$folder = $r[0]['hash'];
-			$path = $path . '/' . $r[0]['filename'];
-		}
-		if (! $r) {
-			$r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, os_storage, created, edited from attach 
-				where folder = '%s' and filename = '%s' and uid = %d $perms order by filename limit 1",
-				dbesc($folder),
-				dbesc(basename($file)),
-				intval($channel_id)
-			);
-		}
-		if (! $r) {
-			$errors = true;
-			$r = q("select id, uid, hash, filename, filetype, filesize, revision, folder, flags, is_dir, os_storage, created, edited from attach 
-				where folder = '%s' and filename = '%s' and uid = %d order by filename limit 1",
-				dbesc($folder),
-				dbesc(basename($file)),
-				intval($channel_id)
-			);
-			if ($r)
-				$permission_error = true;
-		}
-	}
-
-	if ($path === '/' . $file) {
-		if ($test)
-			return true;
-		// final component was a directory.
-		return new Zotlabs\Storage\Directory($file, $auth);
-	}
-
-	if ($errors) {
-		logger('not found ' . $file);
-		if ($test)
-			return false;
-		if ($permission_error) {
-			logger('permission error ' . $file);
-			throw new DAV\Exception\Forbidden('Permission denied.');
-		}
-		return;
-	}
-
-	if ($r) {
-		if ($test)
-			return true;
-
-		if (intval($r[0]['is_dir'])) {
-			return new Zotlabs\Storage\Directory($path . '/' . $r[0]['filename'], $auth);
-		} else {
-			return new Zotlabs\Storage\File($path . '/' . $r[0]['filename'], $r[0], $auth);
-		}
-	}
-	return false;
-}
\ No newline at end of file
diff --git a/include/security.php b/include/security.php
index 38045c8a9..2107ed819 100644
--- a/include/security.php
+++ b/include/security.php
@@ -12,7 +12,7 @@
  * @param bool $return
  * @param bool $update_lastlog
  */
-function authenticate_success($user_record, $login_initial = false, $interactive = false, $return = false, $update_lastlog = false) {
+function authenticate_success($user_record, $channel = null, $login_initial = false, $interactive = false, $return = false, $update_lastlog = false) {
 
 	$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
 
@@ -23,11 +23,15 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 		$_SESSION['account_id'] = $user_record['account_id'];
 		$_SESSION['authenticated'] = 1;
 
+		if($channel)
+			$uid_to_load = $channel['channel_id'];
 
-		$uid_to_load = (((x($_SESSION,'uid')) && (intval($_SESSION['uid']))) 
-			? intval($_SESSION['uid']) 
-			: intval(App::$account['account_default_channel'])
-		);
+		if(! $uid_to_load) {
+			$uid_to_load = (((x($_SESSION,'uid')) && (intval($_SESSION['uid']))) 
+				? intval($_SESSION['uid']) 
+				: intval(App::$account['account_default_channel'])
+			);
+		}
 
 		if($uid_to_load) {
 			change_channel($uid_to_load);
@@ -82,6 +86,41 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	/* else just return */
 }
 
+function atoken_login($atoken) {
+	if(! $atoken)
+		return false;
+	$_SESSION['authenticated'] = 1;
+	$_SESSION['visitor_id'] = $atoken['xchan_hash'];
+	$_SESSION['atoken'] = $atoken['atoken_id'];
+
+	\App::set_observer($atoken);
+	return true;
+}
+
+
+function atoken_xchan($atoken) {
+
+	$c = channelx_by_n($atoken['atoken_uid']);
+	if($c) {
+		return [
+			'atoken_id' => $atoken['atoken_id'], 
+			'xchan_hash' =>  substr($c['channel_hash'],0,16) . '.' . $atoken['atoken_name'],
+			'xchan_name' => $atoken['atoken_name'],
+			'xchan_addr' => t('guest:') . $atoken['atoken_name'] . '@' . \App::get_hostname(),
+			'xchan_network' => 'unknown',
+			'xchan_hidden' => 1,
+			'xchan_photo_mimetype' => 'image/jpeg',
+			'xchan_photo_l' => get_default_profile_photo(300),
+			'xchan_photo_m' => get_default_profile_photo(80),
+			'xchan_photo_s' => get_default_profile_photo(48)
+	
+		];
+	}
+	return null;
+}
+
+
+
 /**
  * @brief Change to another channel with current logged-in account.
  *
@@ -125,13 +164,17 @@ function change_channel($change_channel) {
 		);
 		if($x) {
 			$_SESSION['my_url'] = $x[0]['xchan_url'];
-			$_SESSION['my_address'] = $r[0]['channel_address'] . '@' . substr(z_root(), strpos(z_root(), '://') + 3);
+			$_SESSION['my_address'] = $r[0]['channel_address'] . '@' . App::get_hostname();
 
 			App::set_observer($x[0]);
 			App::set_perms(get_all_perms(local_channel(), $hash));
 		}
 		if(! is_dir('store/' . $r[0]['channel_address']))
 			@os_mkdir('store/' . $r[0]['channel_address'], STORAGE_DEFAULT_PERMISSIONS,true);
+
+		$arr = [ 'channel_id' => $change_channel, 'chanx' => $ret ];
+		call_hooks('change_channel', $arr);
+
 	}
 
 	return $ret;
diff --git a/include/spam.php b/include/spam.php
deleted file mode 100644
index 8b158b7ae..000000000
--- a/include/spam.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php /** @file */
-
-
-function string_splitter($s) {
-
-	if(! $s)
-		return array();
-
-	$s = preg_replace('/\pP+/','',$s);
-
-	$x = mb_split("\[|\]|\s",$s);
-
-	$ret = array();
-	if($x) {
-		foreach($x as $y) {
-			if(mb_strlen($y) > 2)
-				$ret[] = substr($y,0,64);
-		}
-	}
-	return $ret;
-}
-
-
-
-function get_words($uid,$list) {
-
-	stringify($list,true);
-
-	$r = q("select * from spam where term in ( " . $list . ") and uid = %d",
-		intval($uid)
-	);
-
-	return $r;
-}
-
diff --git a/include/taxonomy.php b/include/taxonomy.php
index 177215fe8..067bd3246 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -400,7 +400,7 @@ function get_things($profile_hash,$uid) {
 			if(! $things[$rr['obj_verb']])
 				$things[$rr['obj_verb']] = array();
 
-			$things[$rr['obj_verb']][] = array('term' => $rr['obj_term'],'url' => $rr['obj_url'],'img' => $rr['obj_imgurl'], 'profile' => $rr['profile_name'],'term_hash' => $rr['obj_obj'], 'likes' => $l,'like_count' => count($l),'like_label' => tt('Like','Likes',count($l),'noun'));
+			$things[$rr['obj_verb']][] = array('term' => $rr['obj_term'],'url' => $rr['obj_url'],'img' => $rr['obj_imgurl'], 'editurl' => z_root() . '/thing/' . $rr['obj_obj'], 'profile' => $rr['profile_name'],'term_hash' => $rr['obj_obj'], 'likes' => $l,'like_count' => count($l),'like_label' => tt('Like','Likes',count($l),'noun'));
 		} 
 		$sorted_things = array();
 		if($things) {
diff --git a/include/text.php b/include/text.php
index 1bc19da34..d4d151f2e 100644
--- a/include/text.php
+++ b/include/text.php
@@ -376,30 +376,6 @@ function unxmlify($s) {
 	return $ret;
 }
 
-/**
- * Convenience wrapper, reverse the operation "bin2hex"
- * This is a built-in function in php >= 5.4
- *
- * @FIXME We already have php >= 5.4 requirements, so can we remove this?
- */
-if(! function_exists('hex2bin')) {
-function hex2bin($s) {
-	if(! (is_string($s) && strlen($s)))
-		return '';
-
-	if(strlen($s) & 1) {
-		logger('hex2bin: illegal hex string: ' . $s);
-		return $s;
-	}
-
-	if(! ctype_xdigit($s)) {
-		return($s);
-	}
-
-	return(pack("H*",$s));
-}}
-
-
 // Automatic pagination.
 // To use, get the count of total items.
 // Then call App::set_pager_total($number_items);
@@ -711,7 +687,7 @@ function get_tags($s) {
 
 	// ignore anything in a code block
 
-	$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
+	$s = preg_replace('/\[code(.*?)\](.*?)\[\/code\]/sm','',$s);
 
 	// ignore anything in [style= ]
 	$s = preg_replace('/\[style=(.*?)\]/sm','',$s);
@@ -798,6 +774,10 @@ function strip_zids($s) {
 	return preg_replace('/[\?&]zid=(.*?)(&|$)/ism','$2',$s);
 }
 
+function strip_zats($s) {
+	return preg_replace('/[\?&]zat=(.*?)(&|$)/ism','$2',$s);
+}
+
 
 // quick and dirty quoted_printable encoding
 
@@ -1283,7 +1263,7 @@ function normalise_link($url) {
  * is https and the other isn't, or if one is www.something and the other
  * isn't - and also ignore case differences.
  *
- * @see normalis_link()
+ * @see normalise_link()
  *
  * @param string $a
  * @param string $b
@@ -1635,7 +1615,7 @@ function prepare_text($text, $content_type = 'text/bbcode', $cache = false) {
 
 function create_export_photo_body(&$item) {
 	if(($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO)) {
-		$j = json_decode($item['object'],true);
+		$j = json_decode($item['obj'],true);
 		if($j) {
 			$item['body'] .= "\n\n" . (($j['body']) ? $j['body'] : $j['bbcode']);
 			$item['sig'] = '';
@@ -1743,7 +1723,8 @@ function unamp($s) {
 }
 
 function layout_select($channel_id, $current = '') {
-	$r = q("select mid,sid from item left join item_id on iid = item.id where service = 'PDL' and item.uid = item_id.uid and item_id.uid = %d and item_type = %d ",
+	$r = q("select mid, v from item left join iconfig on iconfig.iid = item.id 
+		where iconfig.cat = 'system' and iconfig.k = 'PDL' and item.uid = %d and item_type = %d ",
 		intval($channel_id),
 		intval(ITEM_TYPE_PDL)
 	);
@@ -1753,7 +1734,7 @@ function layout_select($channel_id, $current = '') {
 		$options .= '<option value="" ' . $empty_selected . '>' . t('default') . '</option>';
 		foreach($r as $rr) {
 			$selected = (($rr['mid'] == $current) ? ' selected="selected" ' : '');
-			$options .= '<option value="' . $rr['mid'] . '"' . $selected . '>' . $rr['sid'] . '</option>';
+			$options .= '<option value="' . $rr['mid'] . '"' . $selected . '>' . $rr['v'] . '</option>';
 		}
 	}
 
@@ -2049,7 +2030,7 @@ function ids_to_array($arr,$idx = 'id') {
 	$t = array();
 	if($arr) {
 		foreach($arr as $x) {
-			if(! in_array($x[$idx],$t)) {
+			if(array_key_exists($idx,$x) && strlen($x[$idx]) && (! in_array($x[$idx],$t))) {
 				$t[] = $x[$idx];
 			}
 		}
@@ -2088,9 +2069,9 @@ function xchan_query(&$items,$abook = true,$effective_uid = 0) {
 		}
 
 		foreach($items as $item) {
-			if($item['owner_xchan'] && (! in_array($item['owner_xchan'],$arr)))
+			if($item['owner_xchan'] && (! in_array("'" . dbesc($item['owner_xchan']) . "'",$arr)))
 				$arr[] = "'" . dbesc($item['owner_xchan']) . "'";
-			if($item['author_xchan'] && (! in_array($item['author_xchan'],$arr)))
+			if($item['author_xchan'] && (! in_array("'" . dbesc($item['author_xchan']) . "'",$arr)))
 				$arr[] = "'" . dbesc($item['author_xchan']) . "'";
 		}
 	}
@@ -2123,9 +2104,9 @@ function xchan_mail_query(&$item) {
 	$arr = array();
 	$chans = null;
 	if($item) {
-		if($item['from_xchan'] && (! in_array($item['from_xchan'],$arr)))
+		if($item['from_xchan'] && (! in_array("'" . dbesc($item['from_xchan']) . "'",$arr)))
 			$arr[] = "'" . dbesc($item['from_xchan']) . "'";
-		if($item['to_xchan'] && (! in_array($item['to_xchan'],$arr)))
+		if($item['to_xchan'] && (! in_array("'" . dbesc($item['to_xchan']) . "'",$arr)))
 			$arr[] = "'" . dbesc($item['to_xchan']) . "'";
 	}
 
@@ -2377,7 +2358,13 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
 
 			$str_tags .= $newtag;
 		}
-		return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $basetag, 'url' => $url, 'contact' => $r[0]);	
+		return [
+			'replaced' => $replaced, 
+			'termtype' => $termtype, 
+			'term'     => $basetag, 
+			'url'      => $url, 
+			'contact'  => $r[0]
+		];	
 	}
 
 	//is it a person tag? 
@@ -2568,7 +2555,13 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag, $d
 		}
 	}
 
-	return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]);
+	return [
+		'replaced' => $replaced, 
+		'termtype' => $termtype, 
+		'term'     => $newname, 
+		'url'      => $url, 
+		'contact'  => $r[0]
+	];
 }
 
 function linkify_tags($a, &$body, $uid, $diaspora = false) {
@@ -2821,13 +2814,16 @@ function expand_acl($s) {
 // If it has a pdl we'll load it as we know the mid and pass the body through comanche_parser() which will generate the 
 // page layout from the given description
 
+// @FIXME - there is apparently a very similar function called layout_select; this one should probably take precedence
+// and the other should be checked for compatibility and removed
 
 function pdl_selector($uid, $current="") {
 	$o = '';
 
 	$sql_extra = item_permissions_sql($uid);
 
-	$r = q("select item_id.*, mid from item_id left join item on iid = item.id where item_id.uid = %d and item_id.uid = item.uid and service = 'PDL' $sql_extra order by sid asc",
+	$r = q("select iconfig.*, mid from item_id left join item on iconfig.iid = item.id 
+		where item.uid = %d and iconfig.cat = 'system' and iconfig.k = 'PDL' $sql_extra order by v asc",
 		intval($uid)
 	);
 
@@ -2841,7 +2837,7 @@ function pdl_selector($uid, $current="") {
 	$entries[] = array('title' => t('Default'), 'mid' => '');
 	foreach($entries as $selection) {
 		$selected = (($selection == $current) ? ' selected="selected" ' : '');
-		$o .= "<option value=\"{$selection['mid']}\" $selected >{$selection['sid']}</option>";
+		$o .= "<option value=\"{$selection['mid']}\" $selected >{$selection['v']}</option>";
 	}
 
 	$o .= '</select>';
@@ -2877,3 +2873,54 @@ function flatten_array_recursive($arr) {
 	}
 	return($ret);
 }			
+
+function text_highlight($s,$lang) {
+
+	if($lang === 'js')
+		$lang = 'javascript';
+
+	if($lang === 'json') {
+		$lang = 'javascript';
+		if(! strpos(trim($s),"\n"))
+			$s = jindent($s);
+	}
+
+	if(! strpos('Text_Highlighter',get_include_path())) {
+		set_include_path(get_include_path() . PATH_SEPARATOR . 'library/Text_Highlighter');
+	}
+	require_once('library/Text_Highlighter/Text/Highlighter.php');
+    require_once('library/Text_Highlighter/Text/Highlighter/Renderer/Html.php');
+    $options = array(
+        'numbers' => HL_NUMBERS_LI,
+        'tabsize' => 4,
+    );
+	$tag_added = false;
+	$s = trim(html_entity_decode($s,ENT_COMPAT));
+	$s = str_replace("    ","\t",$s);
+
+	// The highlighter library insists on an opening php tag for php code blocks. If 
+	// it isn't present, nothing is highlighted. So we're going to see if it's present.
+	// If not, we'll add it, and then quietly remove it after we get the processed output back.  
+
+	if($lang === 'php') {
+		if(strpos('<?php',$s) !== 0) {
+			$s = '<?php' . "\n" . $s;
+			$tag_added = true;			
+		}
+
+	} 
+    $renderer = new Text_Highlighter_Renderer_HTML($options);
+    $hl = Text_Highlighter::factory($lang);
+    $hl->setRenderer($renderer);
+	$o = $hl->highlight($s);
+	$o = str_replace(["    ","\n"],["&nbsp;&nbsp;&nbsp;&nbsp;",''],$o);
+
+	if($tag_added) {
+		$b = substr($o,0,strpos($o,'<li>'));
+		$e = substr($o,strpos($o,'</li>'));
+		$o = $b . $e;
+	}
+
+    return('<code>' . $o . '</code>');
+}
+
diff --git a/include/widgets.php b/include/widgets.php
index 3ca189af0..da73657f5 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -296,7 +296,7 @@ function widget_filer($arr) {
 	$selected = ((x($_REQUEST,'file')) ? $_REQUEST['file'] : '');
 
 	$terms = array();
-	$r = q("select distinct(term) from term where uid = %d and ttype = %d order by term asc",
+	$r = q("select distinct term from term where uid = %d and ttype = %d order by term asc",
 		intval(local_channel()),
 		intval(TERM_FILE)
 	);
@@ -609,6 +609,15 @@ function widget_settings_menu($arr) {
 		'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
 	);
 
+	if(! UNO) {
+		$tabs[] =	array(
+			'label' => t('Guest Access Tokens'),
+			'url' => z_root() . '/settings/tokens',
+			'selected' => ((argv(1) === 'tokens') ? 'active' : ''),
+		);
+	}
+
+
 	if($role === false || $role === 'custom') {
 		$tabs[] = array(
 			'label' => t('Connection Default Permissions'),
@@ -743,21 +752,6 @@ function widget_conversations($arr) {
 	return $o;
 }
 
-function widget_eventsmenu($arr) {
-	if (! local_channel())
-		return;
-
-	return replace_macros(get_markup_template('events_menu_side.tpl'), array(
-		'$title' => t('Events Menu'),
-		'$day' => t('Day View'),
-		'$week' => t('Week View'),
-		'$month' => t('Month View'),
-		'$export' => t('Export'),
-		'$upload' => t('Import'),
-		'$submit' => t('Submit')
-	));
-}
-
 function widget_eventstools($arr) {
 	if (! local_channel())
 		return;
@@ -994,8 +988,9 @@ function widget_item($arr) {
 	$sql_extra = item_permissions_sql($channel_id);
 
 	if($arr['title']) {
-		$r = q("select item.* from item left join item_id on item.id = item_id.iid
-			where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1",
+		$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
+			where item.uid = %d and iconfig.cat = 'system' and iconfig.v = '%s' 
+			and iconfig.k = 'WEBPAGE' and item_type = %d $sql_options $revision limit 1",
 			intval($channel_id),
 			dbesc($arr['title']),
 			intval(ITEM_TYPE_WEBPAGE)
@@ -1157,7 +1152,7 @@ function widget_cover_photo($arr) {
 	if(array_key_exists('subtitle', $arr) && isset($arr['subtitle']))
 		$subtitle = $arr['subtitle'];
 	else
-		$subtitle = $channel['xchan_addr'];
+		$subtitle = str_replace('@','&#x40;',$channel['xchan_addr']);
 
 	$c = get_cover_photo($channel_id,'html');
 
@@ -1253,8 +1248,8 @@ function widget_random_block($arr) {
 
 	$randfunc = db_getfunc('RAND');
 
-	$r = q("select item.* from item left join item_id on item.id = item_id.iid
-		where item.uid = %d and sid like '%s' and service = 'BUILDBLOCK' and 
+	$r = q("select item.* from item left join iconfig on item.id = iconfig.iid
+		where item.uid = %d and iconfig.cat = 'system' and iconfig.v like '%s' and iconfig.k = 'BUILDBLOCK' and 
 		item_type = %d $sql_options order by $randfunc limit 1",
 		intval($channel_id),
 		dbesc('%' . $contains . '%'),
@@ -1361,7 +1356,7 @@ function widget_forums($arr) {
 
 	$perms_sql = item_permissions_sql(local_channel()) . item_normal();
 
-	$r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and xchan_deleted = 0 and abook_channel = %d order by xchan_name $limit ",
+	$r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and xchan_deleted = 0 and abook_channel = %d order by xchan_name $limit ",
 		intval(PERMS_W_TAGWALL),
 		intval(PERMS_W_STREAM),
 		intval(local_channel())
@@ -1375,12 +1370,34 @@ function widget_forums($arr) {
 	// There also should be a way to update this via ajax.
 
 	for($x = 0; $x < count($r1); $x ++) {
-		$r = q("select sum(item_unseen) as unseen from item where owner_xchan = '%s' and uid = %d $perms_sql ",
+		$r = q("select sum(item_unseen) as unseen from item where owner_xchan = '%s' and uid = %d and item_unseen = 1 $perms_sql ",
 			dbesc($r1[$x]['xchan_hash']),
 			intval(local_channel())
 		);
 		if($r)
 			$r1[$x]['unseen'] = $r[0]['unseen'];
+
+/**
+ * @FIXME
+ * This SQL makes the counts correct when you get forum posts arriving from different routes/sources
+ * (like personal channels). However the network query for these posts doesn't yet include this 
+ * correction and it makes the SQL for that query pretty hairy so this is left as a future exercise. 
+ * It may make more sense in that query to look for the mention in the body rather than another join,
+ * but that makes it very inefficient.
+ * 
+		$r = q("select sum(item_unseen) as unseen from item left join term on oid = id where otype = %d and owner_xchan != '%s' and item.uid = %d and url = '%s' and ttype = %d $perms_sql ",
+			intval(TERM_OBJ_POST),
+			dbesc($r1[$x]['xchan_hash']),
+			intval(local_channel()),
+			dbesc($r1[$x]['xchan_url']),
+			intval(TERM_MENTION)
+		);
+		if($r)
+			$r1[$x]['unseen'] = ((array_key_exists('unseen',$r1[$x])) ? $r1[$x]['unseen'] + $r[0]['unseen'] : $r[0]['unseen']);
+ *
+ * end @FIXME
+ */
+		
 	}
 
 	if($r1) {
diff --git a/include/wiki.php b/include/wiki.php
index 4aa3fc1b4..424b2d9a0 100644
--- a/include/wiki.php
+++ b/include/wiki.php
@@ -51,7 +51,7 @@ function wiki_init_wiki($channel, $wiki) {
 		return null;
 	}
 	// Create GitRepo object 	
-	$git = new GitRepo($channel['channel_address'], null, false, $name, __DIR__ . '/../' . $path);	
+	$git = new GitRepo($channel['channel_address'], null, false, $wiki['urlName'], __DIR__ . '/../' . $path);	
 	if(!$git->initRepo()) {
 		logger('Error creating new git repo in ' . $git->path);
 		return null;
@@ -82,7 +82,7 @@ function wiki_create_wiki($channel, $observer_hash, $wiki, $acl) {
 	$ac = $acl->get();
 	$mid = item_message_id();
 	$arr = array();	// Initialize the array of parameters for the post
-	$item_hidden = 0; // TODO: Allow form creator to send post to ACL about new game automatically
+	$item_hidden = ((intval($wiki['postVisible']) === 0) ? 1 : 0); 
 	$wiki_url = z_root() . '/wiki/' . $channel['channel_address'] . '/' . $wiki['urlName'];
 	$arr['aid'] = $channel['channel_account_id'];
 	$arr['uid'] = $channel['channel_id'];
@@ -231,6 +231,32 @@ function wiki_create_page($name, $resource_id) {
 	
 }
 
+function wiki_rename_page($arr) {
+	$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
+	$pageNewName = ((array_key_exists('pageNewName',$arr)) ? $arr['pageNewName'] : '');
+	$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
+	$w = wiki_get_wiki($resource_id);
+	if (!$w['path']) {
+		return array('message' => 'Wiki not found.', 'success' => false);
+	}
+	$page_path_old = $w['path'].'/'.$pageUrlName.'.md';
+	if (!is_readable($page_path_old) === true) {
+		return array('message' => 'Cannot read wiki page: ' . $page_path_old, 'success' => false);
+	}
+	$page = array('rawName' => $pageNewName, 'htmlName' => escape_tags($pageNewName), 'urlName' => urlencode(escape_tags($pageNewName)), 'fileName' => urlencode(escape_tags($pageNewName)).'.md');
+	$page_path_new = $w['path'] . '/' . $page['fileName'] ;
+	if (is_file($page_path_new)) {
+		return array('message' => 'Page already exists.', 'success' => false);
+	}
+	// Rename the page file in the wiki repo
+	if(!rename($page_path_old, $page_path_new)) {
+		return array('message' => 'Error renaming page file.', 'success' => false);
+	} else {
+		return array('page' => $page, 'message' => '', 'success' => true);
+	}
+	
+}
+
 function wiki_get_page_content($arr) {
 	$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
 	$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
@@ -319,7 +345,7 @@ function wiki_revert_page($arr) {
 	$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
 	$commitHash = ((array_key_exists('commitHash',$arr)) ? $arr['commitHash'] : null);
 	if (! $commitHash) {
-		return array('content' => $content, 'message' => 'No commit has provided', 'success' => false);
+		return array('content' => $content, 'message' => 'No commit was provided', 'success' => false);
 	}
 	$w = wiki_get_wiki($resource_id);
 	if (!$w['path']) {
@@ -342,7 +368,7 @@ function wiki_revert_page($arr) {
 				}
 			}
 		} catch (\PHPGit\Exception\GitException $e) {
-			json_return_and_die(array('content' => $content, 'message' => 'GitRepo error thrown', 'success' => false));
+			return array('content' => $content, 'message' => 'GitRepo error thrown', 'success' => false);
 		}
 		return array('content' => $content, 'message' => '', 'success' => true);
 	} else {
@@ -350,11 +376,62 @@ function wiki_revert_page($arr) {
 	}
 }
 
+function wiki_compare_page($arr) {
+	$pageUrlName = ((array_key_exists('pageUrlName',$arr)) ? $arr['pageUrlName'] : '');
+	$resource_id = ((array_key_exists('resource_id',$arr)) ? $arr['resource_id'] : '');
+	$currentCommit = ((array_key_exists('currentCommit',$arr)) ? $arr['currentCommit'] : 'HEAD');
+	$compareCommit = ((array_key_exists('compareCommit',$arr)) ? $arr['compareCommit'] : null);
+	if (! $compareCommit) {
+		return array('message' => 'No compare commit was provided', 'success' => false);
+	}
+	$w = wiki_get_wiki($resource_id);
+	if (!$w['path']) {
+		return array('message' => 'Error reading wiki', 'success' => false);
+	}
+	$page_path = $w['path'].'/'.$pageUrlName.'.md';
+	if (is_readable($page_path) === true) {
+		$reponame = ((array_key_exists('title', $w['wiki'])) ? urlencode($w['wiki']['title']) : 'repo');
+		if($reponame === '') {
+			$reponame = 'repo';
+		}
+		$git = new GitRepo('', null, false, $w['wiki']['title'], $w['path']);
+		$compareContent = $currentContent = '';
+		try {
+			foreach ($git->git->tree($currentCommit) as $object) {
+				if ($object['type'] == 'blob' && $object['file'] === $pageUrlName.'.md' ) {
+						$currentContent = $git->git->cat->blob($object['hash']);						
+				}
+			}
+			foreach ($git->git->tree($compareCommit) as $object) {
+				if ($object['type'] == 'blob' && $object['file'] === $pageUrlName.'.md' ) {
+						$compareContent = $git->git->cat->blob($object['hash']);						
+				}
+			}
+			require_once('library/class.Diff.php');
+			$diff = Diff::toTable(Diff::compare($currentContent, $compareContent));
+		} catch (\PHPGit\Exception\GitException $e) {
+			return array('message' => 'GitRepo error thrown', 'success' => false);
+		}
+		return array('diff' => $diff, 'message' => '', 'success' => true);
+	} else {
+		return array('message' => 'Page file not writable', 'success' => false);
+	}
+}
+
 function wiki_git_commit($arr) {
 	$files = ((array_key_exists('files', $arr)) ? $arr['files'] : null);
+	$all = ((array_key_exists('all', $arr)) ? $arr['all'] : false);
 	$commit_msg = ((array_key_exists('commit_msg', $arr)) ? $arr['commit_msg'] : 'Repo updated');
-	$resource_id = ((array_key_exists('resource_id', $arr)) ? $arr['resource_id'] : json_return_and_die(array('message' => 'Wiki resource_id required for git commit', 'success' => false)));
-	$observer = ((array_key_exists('observer', $arr)) ? $arr['observer'] : json_return_and_die(array('message' => 'Observer required for git commit', 'success' => false)));
+	if(array_key_exists('resource_id', $arr)) {
+		$resource_id = $arr['resource_id'];
+	} else {
+		return array('message' => 'Wiki resource_id required for git commit', 'success' => false);
+	}
+	if(array_key_exists('observer', $arr)) {
+		$observer = $arr['observer'];
+	} else {
+		return array('message' => 'Observer required for git commit', 'success' => false);
+	}	
 	$w = wiki_get_wiki($resource_id);
 	if (!$w['path']) {
 		return array('message' => 'Error reading wiki', 'success' => false);
@@ -369,23 +446,23 @@ function wiki_git_commit($arr) {
 		if ($files === null) {
 			$options = array('all' => true); // git commit option to include all changes
 		} else {
-			$options = array(); // git commit options
+			$options = array('all' => $all); // git commit options\
 			foreach ($files as $file) {
 				if (!$git->git->add($file)) {	// add specified files to the git repo stage
 					if (!$git->git->reset->hard()) {
-						json_return_and_die(array('message' => 'Error adding file to git stage: ' . $file . '. Error resetting git repo.', 'success' => false));
+						return array('message' => 'Error adding file to git stage: ' . $file . '. Error resetting git repo.', 'success' => false);
 					}
-					json_return_and_die(array('message' => 'Error adding file to git stage: ' . $file, 'success' => false));
+					return array('message' => 'Error adding file to git stage: ' . $file, 'success' => false);
 				}
 			}
 		}
 		if ($git->commit($commit_msg, $options)) {
-			json_return_and_die(array('message' => 'Wiki repo commit succeeded', 'success' => true));
+			return array('message' => 'Wiki repo commit succeeded', 'success' => true);
 		} else {
-			json_return_and_die(array('message' => 'Wiki repo commit failed', 'success' => false));
+			return array('message' => 'Wiki repo commit failed', 'success' => false);
 		}
 	} catch (\PHPGit\Exception\GitException $e) {
-		json_return_and_die(array('message' => 'GitRepo error thrown', 'success' => false));
+		return array('message' => 'GitRepo error thrown', 'success' => false);
 	}
 }
 
@@ -396,4 +473,99 @@ function wiki_generate_page_filename($name) {
 	} else {
 		return $file . '.md';
 	}	
-}
\ No newline at end of file
+}
+
+function wiki_convert_links($s, $wikiURL) {
+	
+	if (strpos($s,'[[') !== false) {
+		preg_match_all("/\[\[(.*?)\]\]/", $s, $match);
+		$pages = $pageURLs = array();
+		foreach ($match[1] as $m) {
+			// TODO: Why do we need to double urlencode for this to work?
+			$pageURLs[] = urlencode(urlencode(escape_tags($m)));
+			$pages[] = $m;
+		}
+		$idx = 0;
+		while(strpos($s,'[[') !== false) {
+		$replace = '<a href="'.$wikiURL.'/'.$pageURLs[$idx].'">'.$pages[$idx].'</a>';
+			$s = preg_replace("/\[\[(.*?)\]\]/", $replace, $s, 1);
+			$idx++;
+		}
+	}
+	return $s;
+}
+
+function wiki_generate_toc($s) {
+	
+	if (strpos($s,'[toc]') !== false) {
+		//$toc_md = wiki_toc($s);	// Generate Markdown-formatted list prior to HTML render
+		$toc_md = '<ul id="wiki-toc"></ul>'; // use the available jQuery plugin http://ndabas.github.io/toc/
+		$s = preg_replace("/\[toc\]/", $toc_md, $s, -1);
+	}
+	return $s;
+}
+
+// This function is derived from 
+// http://stackoverflow.com/questions/32068537/generate-table-of-contents-from-markdown-in-php
+function wiki_toc($content) {
+  // ensure using only "\n" as line-break
+  $source = str_replace(["\r\n", "\r"], "\n", $content);
+
+  // look for markdown TOC items
+  preg_match_all(
+    '/^(?:=|-|#).*$/m',
+    $source,
+    $matches,
+    PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE
+  );
+
+  // preprocess: iterate matched lines to create an array of items
+  // where each item is an array(level, text)
+  $file_size = strlen($source);
+  foreach ($matches[0] as $item) {
+    $found_mark = substr($item[0], 0, 1);
+    if ($found_mark == '#') {
+      // text is the found item
+      $item_text = $item[0];
+      $item_level = strrpos($item_text, '#') + 1;
+      $item_text = substr($item_text, $item_level);
+    } else {
+      // text is the previous line (empty if <hr>)
+      $item_offset = $item[1];
+      $prev_line_offset = strrpos($source, "\n", -($file_size - $item_offset + 2));
+      $item_text =
+        substr($source, $prev_line_offset, $item_offset - $prev_line_offset - 1);
+      $item_text = trim($item_text);
+      $item_level = $found_mark == '=' ? 1 : 2;
+    }
+    if (!trim($item_text) OR strpos($item_text, '|') !== FALSE) {
+      // item is an horizontal separator or a table header, don't mind
+      continue;
+    }
+    $raw_toc[] = ['level' => $item_level, 'text' => trim($item_text)];
+  }
+	$o = '';
+	foreach($raw_toc as $t) {
+		$level = intval($t['level']);
+		$text = $t['text'];
+		switch ($level) {
+			case 1:
+				$li = '* ';
+				break;
+			case 2:
+				$li = '  * ';
+				break;
+			case 3:
+				$li = '    * ';
+				break;
+			case 4:
+				$li = '      * ';
+				break;
+			default:
+				$li = '* ';
+				break;
+		}
+		$o .= $li . $text . "\n";
+	}
+  return $o;
+}
diff --git a/include/zot.php b/include/zot.php
index 043139e2f..45347ef22 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -552,7 +552,7 @@ function zot_refresh($them, $channel = null, $force = false) {
 						unset($new_connection[0]['abook_account']);
 						unset($new_connection[0]['abook_channel']);
 
-						$abconfig = load_abconfig($channel['channel_hash'],$new_connection['abook_xchan']);
+						$abconfig = load_abconfig($channel['channel_id'],$new_connection['abook_xchan']);
 						if($abconfig)
 							$new_connection['abconfig'] = $abconfig;
 
@@ -3014,7 +3014,12 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 		if($x['hubloc_host'] == App::get_hostname())
 			continue;
 
-		$synchubs[] = $x;
+		$y = q("select site_dead from site where site_url = '%s' limit 1",
+			dbesc($x['hubloc_url'])
+		);
+
+		if((! $y) || ($y[0]['site_dead'] == 0))
+			$synchubs[] = $x;
 	}
 
 	if(! $synchubs)
@@ -3031,7 +3036,8 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) {
 
 	$info = (($packet) ? $packet : array());
 	$info['type'] = 'channel_sync';
-	$info['encoding'] = 'red'; // note: not zot, this packet is very red specific
+	$info['encoding'] = 'red'; // note: not zot, this packet is very platform specific
+	$info['relocate'] = ['channel_address' => $channel['channel_address'], 'url' => z_root() ];
 
 	if(array_key_exists($uid,App::$config) && array_key_exists('transient',App::$config[$uid])) {
 		$settings = App::$config[$uid]['transient'];
@@ -3169,10 +3175,13 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 			sync_events($channel,$arr['event']);
 
 		if(array_key_exists('event_item',$arr) && $arr['event_item'])
-			sync_items($channel,$arr['event_item']);
+			sync_items($channel,$arr['event_item'],((array_key_exists('relocate',$arr)) ? $arr['relocate'] : null));
 
 		if(array_key_exists('item',$arr) && $arr['item'])
-			sync_items($channel,$arr['item']);
+			sync_items($channel,$arr['item'],((array_key_exists('relocate',$arr)) ? $arr['relocate'] : null));
+
+		// deprecated, maintaining for a few months for upward compatibility
+		// this should sync webpages, but the logic is a bit subtle
 
 		if(array_key_exists('item_id',$arr) && $arr['item_id'])
 			sync_items($channel,$arr['item_id']);
@@ -3331,8 +3340,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 				if($abconfig) {
 					// @fixme does not handle sync of del_abconfig
 					foreach($abconfig as $abc) {
-						if($abc['chan'] === $channel['channel_hash'])
-							set_abconfig($abc['chan'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']);
+						set_abconfig($channel['channel_id'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']);
 					}
 				}
 			}
@@ -3529,13 +3537,6 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
 			}
 		}
 
-
-		if(array_key_exists('item',$arr) && $arr['item'])
-			sync_items($channel,$arr['item']);
-
-		if(array_key_exists('item_id',$arr) && $arr['item_id'])
-			sync_items($channel,$arr['item_id']);
-
 		$addon = array('channel' => $channel,'data' => $arr);
 		call_hooks('process_channel_sync_delivery',$addon);
 
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index a536c3f9a..5335c231e 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -1,7 +1,7 @@
 
 CREATE TABLE IF NOT EXISTS `abconfig` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `chan` char(255) NOT NULL DEFAULT '',
+  `chan` int(10) unsigned NOT NULL DEFAULT '0',
   `xchan` char(255) NOT NULL DEFAULT '',
   `cat` char(255) NOT NULL DEFAULT '',
   `k` char(255) NOT NULL DEFAULT '',
@@ -141,6 +141,23 @@ CREATE TABLE IF NOT EXISTS `app` (
   KEY `app_edited` (`app_edited`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+
+CREATE TABLE IF NOT EXISTS `atoken` (
+  `atoken_id` int(11) NOT NULL AUTO_INCREMENT,
+  `atoken_aid` int(11) NOT NULL DEFAULT 0,
+  `atoken_uid` int(11) NOT NULL DEFAULT 0,
+  `atoken_name` char(255) NOT NULL DEFAULT '',
+  `atoken_token` char(255) NOT NULL DEFAULT '',
+  `atoken_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`atoken_id`),
+  KEY `atoken_aid` (`atoken_aid`),
+  KEY `atoken_uid` (`atoken_uid`),
+  KEY `atoken_uid_2` (`atoken_uid`),
+  KEY `atoken_name` (`atoken_name`),
+  KEY `atoken_token` (`atoken_token`),
+  KEY `atoken_expires` (`atoken_expires`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
 CREATE TABLE IF NOT EXISTS `attach` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
@@ -199,6 +216,26 @@ CREATE TABLE IF NOT EXISTS `cache` (
   PRIMARY KEY (`k`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+CREATE TABLE IF NOT EXISTS `cal` (
+  `cal_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `cal_aid` int(10) unsigned NOT NULL DEFAULT '0',
+  `cal_uid` int(10) unsigned NOT NULL DEFAULT '0',
+  `cal_hash` varchar(255) NOT NULL DEFAULT '',
+  `cal_name` varchar(255) NOT NULL DEFAULT '',
+  `uri` varchar(255) NOT NULL DEFAULT '',
+  `logname` varchar(255) NOT NULL DEFAULT '',
+  `pass` varchar(255) NOT NULL DEFAULT '',
+  `ctag` varchar(255) NOT NULL DEFAULT '',
+  `synctoken` varchar(255) NOT NULL DEFAULT '',
+  `cal_types` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`cal_id`),
+  KEY `cal_aid` (`cal_aid`),
+  KEY `cal_uid` (`cal_uid`),
+  KEY `cal_hash` (`cal_hash`),
+  KEY `cal_name` (`cal_name`),
+  KEY `cal_types` (`cal_types`)
+) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
+
 CREATE TABLE IF NOT EXISTS `channel` (
   `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `channel_account_id` int(10) unsigned NOT NULL DEFAULT '0',
@@ -394,6 +431,7 @@ CREATE TABLE IF NOT EXISTS `event` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
   `uid` int(11) NOT NULL DEFAULT '0',
+  `cal_id` int(11) unsigned NOT NULL DEFAULT '0',
   `event_xchan` char(255) NOT NULL DEFAULT '',
   `event_hash` char(255) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -420,6 +458,7 @@ CREATE TABLE IF NOT EXISTS `event` (
   `event_vdata` text NOT NULL,
   PRIMARY KEY (`id`),
   KEY `uid` (`uid`),
+  KEY `cal_id` (`cal_id`),
   KEY `etype` (`etype`),
   KEY `dtstart` (`dtstart`),
   KEY `dtend` (`dtend`),
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index f0c41dc2a..8a387a8fe 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -1,6 +1,6 @@
 CREATE TABLE "abconfig" (
   "id" serial  NOT NULL,
-  "chan" text NOT NULL,
+  "chan" bigint NOT NULL DEFAULT '0',
   "xchan" text NOT NULL,
   "cat" text NOT NULL,
   "k" text NOT NULL,
@@ -137,6 +137,21 @@ create index "app_created" on app ("app_created");
 create index "app_edited" on app ("app_edited");
 create index "app_deleted" on app ("app_deleted");
 create index "app_system" on app ("app_system");
+
+CREATE TABLE "atoken" (
+  "atoken_id" serial NOT NULL,
+  "atoken_aid" bigint NOT NULL DEFAULT 0,
+  "atoken_uid" bigint NOT NULL DEFAULT 0,
+  "atoken_name" varchar(255) NOT NULL DEFAULT '',
+  "atoken_token" varchar(255) NOT NULL DEFAULT '',
+  "atoken_expires" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
+  PRIMARY KEY ("atoken_id"));
+create index atoken_aid on atoken (atoken_aid);
+create index atoken_uid on atoken (atoken_uid);
+create index atoken_name on atoken (atoken_name);
+create index atoken_token on atoken (atoken_token);
+create index atoken_expires on atoken (atoken_expires);
+
 CREATE TABLE "attach" (
   "id" serial  NOT NULL,
   "aid" bigint  NOT NULL DEFAULT '0',
@@ -193,6 +208,26 @@ CREATE TABLE "cache" (
   "updated" timestamp NOT NULL,
   PRIMARY KEY ("k")
 );
+CREATE TABLE "cal" (
+  "cal_id" serial  NOT NULL,
+  "cal_aid" bigint NOT NULL DEFAULT '0',
+  "cal_uid" bigint NOT NULL DEFAULT '0',
+  "cal_hash" text NOT NULL,
+  "cal_name" text NOT NULL,
+  "uri" text NOT NULL,
+  "logname" text NOT NULL,
+  "pass" text NOT NULL,
+  "ctag" text NOT NULL,
+  "synctoken" text NOT NULL,
+  "cal_types" text NOT NULL DEFAULT "0",
+  PRIMARY KEY ("cal_id")
+);
+create index "cal_hash_idx" on cal ("cal_hash");
+create index "cal_name_idx" on cal ("cal_name");
+create index "cal_types_idx" on cal ("cal_types");
+create index "cal_aid_idx" on cal ("cal_aid");
+create index "cal_uid_idx" on cal ("cal_uid");
+
 CREATE TABLE "channel" (
   "channel_id" serial  NOT NULL,
   "channel_account_id" bigint  NOT NULL DEFAULT '0',
@@ -380,14 +415,11 @@ create index "dreport_xchan" on dreport ("dreport_xchan");
 create index "dreport_queue" on dreport ("dreport_queue");
 create index "dreport_channel" on dreport ("dreport_channel");
 
-
-
-
-
 CREATE TABLE "event" (
   "id" serial NOT NULL,
   "aid" bigint  NOT NULL DEFAULT '0',
   "uid" bigint NOT NULL,
+  "cal_id" bigint NOT NULL DEFAULT '0',
   "event_xchan" text NOT NULL DEFAULT '',
   "event_hash" text NOT NULL DEFAULT '',
   "created" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
@@ -415,6 +447,7 @@ CREATE TABLE "event" (
   PRIMARY KEY ("id")
 );
 create index "event_uid_idx" on event ("uid");
+create index "event_cal_idx" on event ("cal_id");
 create index "event_etype_idx" on event ("etype");
 create index "event_dtstart_idx" on event ("dtstart");
 create index "event_dtend_idx" on event ("dtend");
diff --git a/install/update.php b/install/update.php
index 908f60498..f2d97430b 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1176 );
+define( 'UPDATE_VERSION' , 1180 );
 
 /**
  *
@@ -2254,3 +2254,153 @@ function update_r1175() {
 	return UPDATE_FAILED;
 
 }
+
+
+function update_r1176() {
+
+	$r = q("select * from item_id where true");
+	if($r) {
+		foreach($r as $rr) {
+			\Zotlabs\Lib\IConfig::Set($rr['iid'],'system',$rr['service'],$rr['sid'],true);
+		}
+	}
+	return UPDATE_SUCCESS;
+
+}
+
+function update_r1177() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r1 = q("alter table event add cal_id bigint NOT NULL DEFAULT '0'");
+		$r2 = q("create index \"event_cal_idx\" on event (\"cal_id\") "); 
+
+		$r3 = q("CREATE TABLE \"cal\" (
+			\"cal_id\" serial  NOT NULL,
+		 	\"cal_aid\" bigint NOT NULL DEFAULT '0',
+		 	\"cal_uid\" bigint NOT NULL DEFAULT '0',
+		 	\"cal_hash\" text NOT NULL,
+			\"cal_name\" text NOT NULL,
+			\"uri\" text NOT NULL,
+			\"logname\" text NOT NULL,
+			\"pass\" text NOT NULL,
+			\"ctag\" text NOT NULL,
+			\"synctoken\" text NOT NULL,
+			\"cal_types\" text NOT NULL,
+			PRIMARY KEY (\"cal_id\") ");
+		$r4 = q("create index \"cal_hash_idx\" on cal (\"cal_hash\") ");
+		$r5 = q("create index \"cal_name_idx\" on cal (\"cal_name\") ");
+		$r6 = q("create index \"cal_types_idx\" on cal (\"cal_types\") ");
+		$r7 = q("create index \"cal_aid_idx\" on cal (\"cal_aid\") ");
+		$r8 = q("create index \"cal_uid_idx\" on cal (\"cal_uid\") ");
+		$r = $r1 && $r2 && $r3 && $r4 && $r5 && $r6 && $r7 && $r8;
+	}
+	else {
+		$r1 = q("alter table event add cal_id int(10) unsigned NOT NULL DEFAULT '0', 
+			add index ( cal_id ) ");
+
+		$r2 = q("CREATE TABLE IF NOT EXISTS `cal` (
+			`cal_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+			`cal_aid` int(10) unsigned NOT NULL DEFAULT '0',
+			`cal_uid` int(10) unsigned NOT NULL DEFAULT '0',
+			`cal_hash` varchar(255) NOT NULL DEFAULT '',
+			`cal_name` varchar(255) NOT NULL DEFAULT '',
+			`uri` varchar(255) NOT NULL DEFAULT '',
+			`logname` varchar(255) NOT NULL DEFAULT '',
+			`pass` varchar(255) NOT NULL DEFAULT '',
+			`ctag` varchar(255) NOT NULL DEFAULT '',
+			`synctoken` varchar(255) NOT NULL DEFAULT '',
+			`cal_types` varchar(255) NOT NULL DEFAULT '',
+			PRIMARY KEY (`cal_id`),
+			KEY `cal_aid` (`cal_aid`),
+			KEY `cal_uid` (`cal_uid`),
+			KEY `cal_hash` (`cal_hash`),
+			KEY `cal_name` (`cal_name`),
+			KEY `cal_types` (`cal_types`)
+			) ENGINE=MyISAM  DEFAULT CHARSET=utf8 ");
+
+		$r = $r1 && $r2;
+	}
+
+    if($r)
+        return UPDATE_SUCCESS;
+    return UPDATE_FAILED;
+}
+
+
+function update_r1178() {
+
+	$c2 = null;
+
+	$c1 = q("SELECT channel_id, channel_hash from channel where true");
+	if($c1) {
+		$c2 = q("SELECT id, chan from abconfig where true");
+		if($c2) {
+			for($x = 0; $x < count($c2); $x ++) {
+				foreach($c1 as $c) {
+					if($c['channel_hash'] == $c2[$x]['chan']) {
+						$c2[$x]['chan'] = $c['channel_id'];
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	$r1 = q("ALTER TABLE abconfig CHANGE chan chan int(10) unsigned NOT NULL DEFAULT '0' ");
+
+	if($c2) {
+		foreach($c2 as $c) {
+			q("UPDATE abconfig SET chan = %d where id = %d",
+				intval($c['chan']),
+				intval($c['id'])
+			);
+		}
+	}
+
+	if($r1)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}
+
+function update_r1179() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+		$r1 = q("CREATE TABLE atoken (
+  atoken_id serial NOT NULL,
+  atoken_aid bigint NOT NULL DEFAULT 0,
+  atoken_uid bigint NOT NULL DEFAULT 0,
+  atoken_name varchar(255) NOT NULL DEFAULT '',
+  atoken_token varchar(255) NOT NULL DEFAULT '',
+  atoken_expires timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
+  PRIMARY KEY (atoken_id)) ");
+	$r2 = q("create index atoken_aid on atoken (atoken_aid)");
+	$r3 = q("create index atoken_uid on atoken (atoken_uid)");
+	$r4 = q("create index atoken_name on atoken (atoken_name)");
+	$r5 = q("create index atoken_token on atoken (atoken_token)");
+	$r6 = q("create index atoken_expires on atoken (atoken_expires)");
+
+	$r = $r1 && $r2 && $r3 && $r4 && $r5 && $r6;
+ 
+	}
+	else {
+		$r = q("CREATE TABLE IF NOT EXISTS `atoken` (
+  `atoken_id` int(11) NOT NULL AUTO_INCREMENT,
+  `atoken_aid` int(11) NOT NULL DEFAULT 0,
+  `atoken_uid` int(11) NOT NULL DEFAULT 0,
+  `atoken_name` char(255) NOT NULL DEFAULT '',
+  `atoken_token` char(255) NOT NULL DEFAULT '',
+  `atoken_expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  PRIMARY KEY (`atoken_id`),
+  KEY `atoken_aid` (`atoken_aid`),
+  KEY `atoken_uid` (`atoken_uid`),
+  KEY `atoken_name` (`atoken_name`),
+  KEY `atoken_token` (`atoken_token`),
+  KEY `atoken_expires` (`atoken_expires`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ");
+	}
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+	
+
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/README b/library/Text_Highlighter/README
new file mode 100644
index 000000000..88f71aed2
--- /dev/null
+++ b/library/Text_Highlighter/README
@@ -0,0 +1,455 @@
+# $Id$
+
+Introduction
+============
+
+Text_Highlighter is a class for syntax highlighting. The main idea is to
+simplify creation of subclasses implementing syntax highlighting for
+particular language. Subclasses do not implement any new functioanality, they
+just provide syntax highlighting rules. The rules sources are in XML format.
+To create a highlighter for a language, there is no need to code a new class
+manually. Simply describe the rules in XML file and use Text_Highlighter_Generator
+to create a new class.
+
+
+This document does not contain a formal description of API - it is very
+simple, and I believe providing some examples of code is sufficient.
+
+
+Highlighter XML source
+======================
+
+Basics
+------
+
+Creating a new syntax highlighter begins with describing the highlighting
+rules. There are two basic elements: block and region. A block is just a
+portion of text matching a regular expression and highlighted with a single
+color. Keyword is an example of a block. A region is defined by two regular
+expressions: one for start of region, and another for the end. The main
+difference from a block is that a region can contain blocks and regions
+(including same-named regions). An example of a region is a group of
+statements enclosed in curly brackets (this is used in many languages, for
+example PHP and C). Also, characters matching start and end of a region may be
+highlighted with their own color, and region contents with another.
+
+Blocks and regions may be declared as contained. Contained blocks and regions
+can only appear inside regions. If a region or a block is not declared as
+contained, it can appear both on top level and inside regions. Block or region
+declared as not-contained can only appear on top level.
+
+For any region, a list of blocks and regions that can appear inside this
+region can be specified.
+
+In this document, the term "color group" is used. Chunks of text assigned to
+same color group will be highlighted with same color. Note that in versions
+prior 0.5.0 color goups were refered as CSS classes, but since 0.5.0 not only
+HTML output is supported, so "color group" is more appropriate term.
+
+Elements
+--------
+
+The toplevel element is <highlight>. Attribute lang is required and denotes
+the name of the language. Its value is used as a part of generated class name,
+and must only contain letters, digits and underscores. Optional attribute
+case, when given value yes, makes the language case sensitive (default is case
+insensitive). Allowed subelements are:
+
+    * <authors>: Information about the authors of the file.
+        <author>: Information about a single author of the file. (May be used
+        multiple times, one per author.)
+                - name="...": Author's name. Required.
+                - email="...": Author's email address. Optional.
+
+    * <default>: Default color group.
+          - innerGroup="...": color group name. Required.
+    
+    * <region>: Region definition
+          - name="...": Region name. Required.
+          - innerGroup="...": Default color group of region contents. Required.
+          - delimGroup="...": color group of start and end of region. Optional,
+            defaults to value of innerGroup attribute.
+          - start="...", end="...": Regular expression matching start and end
+            of region. Required. Regular expression delimiters are optional, but
+            if you need to specify delimiter, use /. The only case when the
+            delimiters are needed, is specifying regular expression modifiers,
+            such as m or U. Examples: \/\* or /$/m.
+          - contained="yes": Marks region as contained.
+          - never-contained="yes": Marks region as not-contained.
+          - <contains>: Elements allowed inside this region.
+                - all="yes" Region can contain any other region or block
+                (except not-contained). May be used multiple times.
+                      - <but> Do not allow certain regions or blocks.
+                            - region="..." Name of region not allowed within
+                              current region.
+                            - block="..." Name of block not allowed within
+                              current region.
+                - region="..." Name of region allowed within current region.
+                - block="..." Name of block allowed within current region.
+          - <onlyin> Only allow this region within certain regions. May be
+            used multiple times.
+                - block="..." Name of parent region
+    
+    * <block>: Block definition
+          - name="...": Block name. Required.
+          - innerGroup="...": color group of block contents. Optional. If not
+            specified, color group of parent region or default color group will be
+            used. One would only want to omit this attribute if there are
+            keyword groups (see below) inherited from this block, and no special
+            highlighting should apply when the block does not match the keyword.
+          - match="..." Regular expression matching the block. Required.
+            Regular expression delimiters are optional, but if you need to
+            specify delimiter, use /. The only case when the delimiters are
+            needed, is specifying regular expression modifiers, such as m or U.
+            Examples: #|\/\/ or /$/m.
+          - contained="yes": Marks block as contained.
+          - never-contained="yes": Marks block as not-contained.
+          - <onlyin> Only allow this block within certain regions. May be used
+              multiple times.
+                - block="..." Name of parent region
+          - multiline="yes": Marks block as multi-line. By default, whole
+            blocks are assumed to reside in a single line. This make the things
+            faster. If you need to declare a multi-line block, use this
+            attribute.
+          - <partgroup>: Assigns another color group to a part of the block that
+              matched a subpattern.
+                - index="n": Subpattern index. Required.
+                - innerGroup="...": color group name. Required.
+
+              This is an example from CSS highlighter: the measure is matched as
+              a whole, but the measurement units are highlighted with different
+              color.
+
+                <block name="measure"  match="\d*\.?\d+(\%|em|ex|pc|pt|px|in|mm|cm)"
+                        innerGroup="number" contained="yes">
+                    <onlyin region="property"/>
+                    <partGroup index="1" innerGroup="string" />
+                </block>
+  
+    * <keywords>: Keyword group definition. Keyword groups are useful when you
+      want to highlight some words that match a condition for a block with a
+      different color. Keywords are defined with literal match, not regular
+      expressions. For example, you have a block named identifier matching a
+      general identifier, and want to highlight reserved words (which match
+      this block as well) with different color. You inherit a keyword group
+      "reserved" from "identifier" block.
+          - name="...": Keyword group. Required.
+          - ifdef="...", ifndef="..." : Conditional declaration. See
+            "Conditions" below.
+          - inherits="...": Inherited block name. Required.
+          - innerGroup="...": color group of keyword group. Required.
+          - case="yes|no": Overrides case-sensitivity of the language.
+            Optional, defaults to global value.
+          - <keyword>: Single keyword definition.
+                - match="..." The keyword. Note: this is not a regular
+                  expression, but literal match (possibly case insensitive).
+
+Note that for BC reasons element partClass is alias for partGroup, and
+attributes innerClass and  delimClass  are aliases of innerGroup and
+delimGroup, respectively.
+    
+
+Conditions
+----------
+
+Conditional declarations allow enabling or disabling certain highlighting
+rules at runtime. For example, Java highlighter has a very big list of
+keywords matching Java standard classes. Finding a match in this list can take
+much time. For that reason, corresponding keyword group is declared with
+"ifdef" attribute :
+
+  <keywords name="builtin" inherits="identifier" innerClass="builtin" 
+            case="yes" ifdef="java.builtins">
+	<keyword match="AbstractAction" />
+	<keyword match="AbstractBorder" />
+	<keyword match="AbstractButton" />
+    ...
+    ...
+	<keyword match="_Remote_Stub" />
+	<keyword match="_ServantActivatorStub" />
+	<keyword match="_ServantLocatorStub" />
+  </keywords>
+
+This keyword group will be only enabled when "java.builtins" is passed as an
+element of "defines" option:
+
+    $options = array(
+        'defines' => array(
+            'java.builtins',
+        ),
+        'numbers' => HL_NUMBERS_TABLE,
+    );
+    $highlighter = Text_Highlighter::factory('java', $options);
+
+"ifndef" attribute has reverse meaning.
+
+Currently, "ifdef" and "ifndef" attributes are only supported for <keywords>
+tag. 
+
+
+
+Class generation
+================
+
+Creating XML description of highlighting rules is the most complicated part of
+the process. To generate the class, you need just few lines of code:
+
+    <?php
+    require_once 'Text/Highlighter/Generator.php';
+    $generator = new Text_Highlighter_Generator('php.xml');
+    $generator->generate();
+    $generator->saveCode('PHP.php');
+    ?>
+
+
+
+Command-line class generation tool
+==================================
+
+Example from previous section looks pretty simple, but it does not handle any
+errors which may occur during parsing of XML source. The package provides a
+command-line script to make generation of classes even more simple, and takes
+care of possible errors. It is called generate (on Unix/Linux) or generate.bat
+(on Windows). This script is able to process multiple files in one run, and
+also to process XML from standard input and write generated code to standard
+output.
+
+    Usage:
+    generate options
+
+    Options:
+      -x filename, --xml=filename
+            source XML file. Multiple input files can be specified, in which
+            case each -x option must be followed by -p unless -d is specified
+            Defaults to stdin
+      -p filename, --php=filename
+            destination PHP file. Defaults to stdout. If specied multiple times,
+            each -p must follow -x
+      -d dirname, --dir=dirname
+            Default destination directory. File names will be taken from XML input
+            ("lang" attribute of <highlight> tag)
+      -h, --help
+            This help
+
+Examples
+
+    Read from php.xml, write to PHP.php
+
+        generate -x php.xml -p PHP.php
+
+    Read from php.xml, write to standard output
+
+        generate -x php.xml
+
+    Read from php.xml, write to PHP.php, read from xml.xml, write to XML.php
+
+        generate -x php.xml -p PHP.php -x xml.xml -p XML.php
+
+    Read from php.xml, write to /some/dir/PHP.php, read from xml.xml, write to
+    /some/dir/XML.php (assuming that xml.xml contains <highlight lang="xml">, and
+    php.xml contains <highlight lang="php">)
+
+        generate -x php.xml -x xml.xml -d /some/dir/
+
+
+
+Renderers
+=========
+
+Introduction
+------------
+
+Text_Highlighter supports renderes. Using renderers, you can get output in
+different formats. Two renderers are included in the package:
+
+    - HTML renderer. Generates HTML output. A style sheet should be linked to
+      the document to display colored text
+
+    - Console renderer. Can be used to output highlighted text to
+      color-capable terminals, either directly or trough less -r
+
+
+Renderers API
+-------------
+
+Renderers are subclasses of Text_Highlighter_Renderer. Renderer should
+override at least two methods - acceptToken and getOutput. Overriding other
+methods is optional, depending on the nature of renderer's output and details
+of implementation.
+
+    string reset()
+        resets renderer state. This method is called every time before a new
+        source file is highlighted.
+
+    string preprocess(string $code)
+        preprocesses code. Can be used, for example, to normalize whitespace
+        before highlighting. Returns preprocessed string.
+
+    void acceptToken(string $group, string $content)
+        the core method of the renderer. Highlighter passes chunks of text to
+        this method in $content, and color group in $group
+
+    void finalize()
+        signals the renderer that no more tokens are available.
+
+    mixed getOutput()
+        returns generated output.
+
+
+Setting renderer options
+--------------------------------
+
+Renderers accept an optional argument to their constructor  - options array.
+Elements of this array are renderer-specific.
+
+HTML renderer
+-------------
+
+HTML renderer produces HTML output with optional line numbering. The renderer
+itself does not provide information about actual colors of highlighted text.
+Instead, <span class="hl-XXX"> is used, where XXX is replaced with color group
+name (hl-var, hl-string, etc.). It is up to you to create a CSS stylesheet.
+If 'use_language' option with value evaluating to true was passed, class names
+will be formatted as "LANG-hl-XXX", where LANG is language name as defined in
+highlighter XML source ("lang" attribute of <highlight> tag) in lower case.
+
+There are 3 special CSS classes:
+
+    hl-main - this class applies to whole output or right table column,
+              depending on 'numbers' option
+    hl-gutter - applies to left column in table
+    hl-table - applies to whole table
+
+HTML renderer accepts following options (each being optional):
+    
+    * numbers - line numbering style.
+        0 - no numbering (default)
+        HL_NUMBERS_LI - use <ol></ol> for line numbering
+        HL_NUMBERS_TABLE  - create a 2-column table, with line numbers in left
+                            column and highlighted text in right column
+
+    * tabsize - tabulation size. Defaults to 4
+
+    Example:
+        
+        require_once 'Text/Highlighter/Renderer/Html.php';
+        $options = array(
+            'numbers' => HL_NUMBERS_LI,
+            'tabsize' => 8,
+        );
+        $renderer = new Text_Highlighter_Renderer_HTML($options);
+
+Console renderer
+----------------
+
+Console renderer produces output for displaying on a color-capable terminal,
+either directly or through less -r, using ANSI escape sequences. By default,
+this renderer only highlights most common color groups. Additional colors
+can be specified using 'colors' option. This renderer also accepts 'numbers'
+option - a boolean value, and 'tabsize' option.
+
+    Example :
+
+        require_once 'Text/Highlighter/Renderer/Console.php';
+        $colors = array(
+            'prepro' => "\033[35m",
+            'types' => "\033[32m",
+        );
+        $options = array(
+            'numbers' => true,
+            'tabsize' => 8,
+            'colors' => $colors,
+        );
+        $renderer = new Text_Highlighter_Renderer_Console($options);
+
+
+ANSI color escape sequences have the following format:
+
+    ESC[#;#;....;#m
+
+where ESC is character with ASCII code 27 (033 octal, 0x1B hexadecimal). # is
+one of the following:
+
+        0 for normal display
+        1 for bold on
+        4 underline (mono only)
+        5 blink on
+        7 reverse video on
+        8 nondisplayed (invisible)
+        30 black foreground
+        31 red foreground
+        32 green foreground
+        33 yellow foreground
+        34 blue foreground
+        35 magenta foreground
+        36 cyan foreground
+        37 white foreground
+        40 black background
+        41 red background
+        42 green background
+        43 yellow background
+        44 blue background
+        45 magenta background
+        46 cyan background
+        47 white background
+
+
+How to use Text_Highlighter class
+=================================
+
+Creating a highlighter object
+-----------------------------
+
+To create a highlighter for a certain language, use Text_Highlighter::factory()
+static method:
+
+    require_once 'Text/Highlighter.php';
+    $hl = Text_Highlighter::factory('php');
+
+
+Setting a renderer
+------------------
+
+Actual output is produced by a renderer.
+
+    require_once 'Text/Highlighter.php';
+    require_once 'Text/Highlighter/Renderer/Html.php';
+    $options = array(
+        'numbers' => HL_NUMBERS_LI,
+        'tabsize' => 8,
+    );
+    $renderer = new Text_Highlighter_Renderer_HTML($options);
+    $hl = Text_Highlighter::factory('php');
+    $hl->setRenderer($renderer);
+
+Note that for BC reasons, it is possible to use highlighter without setting a
+renderer. If no renderer is set, HTML renderer will be used by default. In
+this case, you should pass options as second parameter to factory method. The
+following example works exactly as previous one:
+
+    require_once 'Text/Highlighter.php';
+    $options = array(
+        'numbers' => HL_NUMBERS_LI,
+        'tabsize' => 8,
+    );
+    $hl = Text_Highlighter::factory('php', $options);
+
+
+Getting output
+--------------
+
+And finally, do the highlighting and get the output:
+
+    require_once 'Text/Highlighter.php';
+    require_once 'Text/Highlighter/Renderer/Html.php';
+    $options = array(
+        'numbers' => HL_NUMBERS_LI,
+        'tabsize' => 8,
+    );
+    $renderer = new Text_Highlighter_Renderer_HTML($options);
+    $hl = Text_Highlighter::factory('php');
+    $hl->setRenderer($renderer);
+    $html = $hl->highlight(file_get_contents('example.php'));
+
+# vim: set autoindent tabstop=4 shiftwidth=4 softtabstop=4 tw=78: */
+
diff --git a/library/Text_Highlighter/TODO b/library/Text_Highlighter/TODO
new file mode 100644
index 000000000..77a148b8a
--- /dev/null
+++ b/library/Text_Highlighter/TODO
@@ -0,0 +1,12 @@
+# $Id$
+
+Major issues to solve (but I currently have no idea how) :
+
+- speedup highlighting process
+
+- switching between highlighters depending on context, for example :
+  PHP code -> HTML -> (JavaScript|CSS)
+
+
+# vim: set autoindent tabstop=4 shiftwidth=4 softtabstop=4 tw=78: */
+
diff --git a/library/Text_Highlighter/Text/Highlighter.php b/library/Text_Highlighter/Text/Highlighter.php
new file mode 100644
index 000000000..480113c16
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter.php
@@ -0,0 +1,398 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * Highlighter base class
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Andrey Demenev <demenev@gmail.com>
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+// require_once 'PEAR.php';
+
+// {{{ BC constants
+
+// BC trick : define constants related to default
+// renderer if needed
+if (!defined('HL_NUMBERS_LI')) {
+    /**#@+
+     * Constant for use with $options['numbers']
+     * @see Text_Highlighter_Renderer_Html::_init()
+     */
+    /**
+     * use numbered list
+     */
+    define ('HL_NUMBERS_LI'    ,    1);
+    /**
+     * Use 2-column table with line numbers in left column and code in  right column.
+     * Forces $options['tag'] = HL_TAG_PRE
+     */
+    define ('HL_NUMBERS_TABLE'    , 2);
+    /**#@-*/
+}
+
+// }}}
+// {{{ constants
+/**
+ * for our purpose, it is infinity
+ */
+define ('HL_INFINITY',      1000000000);
+
+// }}}
+
+/**
+ * Text highlighter base class
+ *
+ * @author     Andrey Demenev <demenev@gmail.com>
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+// {{{ Text_Highlighter
+
+/**
+ * Text highlighter base class
+ *
+ * This class implements all functions necessary for highlighting,
+ * but it does not contain highlighting rules. Actual highlighting is
+ * done using a descendent of this class.
+ *
+ * One is not supposed to manually create descendent classes.
+ * Instead, describe highlighting  rules in XML format and
+ * use {@link Text_Highlighter_Generator} to create descendent class.
+ * Alternatively, an instance of a descendent class can be created
+ * directly.
+ *
+ * Use {@link Text_Highlighter::factory()} to create an
+ * object for particular language highlighter
+ *
+ * Usage example
+ * <code>
+ *require_once 'Text/Highlighter.php';
+ *$hlSQL = Text_Highlighter::factory('SQL',array('numbers'=>true));
+ *echo $hlSQL->highlight('SELECT * FROM table a WHERE id = 12');
+ * </code>
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @package Text_Highlighter
+ * @access public
+ */
+
+class Text_Highlighter
+{
+    // {{{ members
+    
+    /**
+     * Syntax highlighting rules.
+     * Auto-generated classes set this var
+     *
+     * @access protected
+     * @see _init
+     * @var array
+     */
+    var $_syntax;
+
+    /**
+     * Renderer object.
+     *
+     * @access private
+     * @var array
+     */
+    var $_renderer;
+
+    /**
+     * Options. Keeped for BC
+     *
+     * @access protected
+     * @var array
+     */
+    var $_options = array();
+
+    /**
+     * Conditionds
+     *
+     * @access protected
+     * @var array
+     */
+    var $_conditions = array();
+
+    /**
+     * Disabled keywords
+     *
+     * @access protected
+     * @var array
+     */
+    var $_disabled = array();
+
+    /**
+     * Language
+     *
+     * @access protected
+     * @var string
+     */
+    var $_language = '';
+
+    // }}}
+    // {{{ _checkDefines
+    
+    /**
+     * Called by subclssses' constructors to enable/disable
+     * optional highlighter rules
+     *
+     * @param array $defines  Conditional defines
+     *
+     * @access protected
+     */
+    function _checkDefines()
+    {
+        if (isset($this->_options['defines'])) {
+            $defines = $this->_options['defines'];
+        } else {
+            $defines = array();
+        }
+        foreach ($this->_conditions as $name => $actions) {
+            foreach($actions as $action) {
+                $present = in_array($name, $defines);
+                if (!$action[1]) {
+                    $present = !$present;
+                }
+                if ($present) {
+                    unset($this->_disabled[$action[0]]);
+                } else {
+                    $this->_disabled[$action[0]] = true;
+                }
+            }
+        }
+    }
+
+    // }}}
+    // {{{ factory
+    
+    /**
+     * Create a new Highlighter object for specified language
+     *
+     * @param string $lang    language, for example "SQL"
+     * @param array  $options Rendering options. This
+     * parameter is only keeped for BC reasons, use 
+     * {@link Text_Highlighter::setRenderer()} instead
+     *
+     * @return mixed a newly created Highlighter object, or 
+     * a PEAR error object on error
+     *
+     * @static
+     * @access public
+     */
+    function &factory($lang, $options = array())
+    {
+        $lang = strtoupper($lang);
+        @include_once 'Text/Highlighter/' . $lang . '.php';
+
+        $classname = 'Text_Highlighter_' . $lang;
+
+        if (!class_exists($classname)) {
+            return PEAR::raiseError('Highlighter for ' . $lang . ' not found');
+        }
+
+        $obj = new $classname($options);
+
+        return $obj;
+    }
+
+    // }}}
+    // {{{ setRenderer
+    
+    /**
+     * Set renderer object
+     *
+     * @param object $renderer  Text_Highlighter_Renderer
+     *
+     * @access public
+     */
+    function setRenderer(&$renderer)
+    {
+        $this->_renderer = $renderer;
+    }
+
+    // }}}
+
+    /**
+     * Helper function to find matching brackets
+     *
+     * @access private
+     */
+    function _matchingBrackets($str)
+    {
+        return strtr($str, '()<>[]{}', ')(><][}{');
+    }
+
+
+    
+    
+    function _getToken()
+    {
+        if (!empty($this->_tokenStack)) {
+            return array_pop($this->_tokenStack);
+        }
+        if ($this->_pos >= $this->_len) {
+            return NULL;
+        }
+
+        if ($this->_state != -1 && preg_match($this->_endpattern, $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos)) {
+            $endpos = $m[0][1];
+            $endmatch = $m[0][0];
+        } else {
+            $endpos = -1;
+        }
+        preg_match ($this->_regs[$this->_state], $this->_str, $m, PREG_OFFSET_CAPTURE, $this->_pos);
+        $n = 1;
+ 
+ 
+         foreach ($this->_counts[$this->_state] as $i=>$count) {
+            if (!isset($m[$n])) {
+                break;
+            }
+            if ($m[$n][1]>-1 && ($endpos == -1 || $m[$n][1] < $endpos)) {
+                if ($this->_states[$this->_state][$i] != -1) {
+                    $this->_tokenStack[] = array($this->_delim[$this->_state][$i], $m[$n][0]);
+                } else {
+                    $inner = $this->_inner[$this->_state][$i];
+                    if (isset($this->_parts[$this->_state][$i])) {
+                        $parts = array();
+                        $partpos = $m[$n][1];
+                        for ($j=1; $j<=$count; $j++) {
+                            if ($m[$j+$n][1] < 0) {
+                                continue;
+                            }
+                            if (isset($this->_parts[$this->_state][$i][$j])) {
+                                if ($m[$j+$n][1] > $partpos) {
+                                    array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$j+$n][1]-$partpos)));
+                                }
+                                array_unshift($parts, array($this->_parts[$this->_state][$i][$j], $m[$j+$n][0]));
+                            }
+                            $partpos = $m[$j+$n][1] + strlen($m[$j+$n][0]);
+                        }
+                        if ($partpos < $m[$n][1] + strlen($m[$n][0])) {
+                            array_unshift($parts, array($inner, substr($this->_str, $partpos, $m[$n][1] - $partpos + strlen($m[$n][0]))));
+                        }
+                        $this->_tokenStack = array_merge($this->_tokenStack, $parts);
+                    } else {
+                        foreach ($this->_keywords[$this->_state][$i] as $g => $re) {
+                            if (isset($this->_disabled[$g])) {
+                                continue;
+                            }
+                            if (preg_match($re, $m[$n][0])) {
+                                $inner = $this->_kwmap[$g];
+                                break;
+                            }
+                        }
+                        $this->_tokenStack[] = array($inner, $m[$n][0]);
+                    }
+                }
+                if ($m[$n][1] > $this->_pos) {
+                    $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $m[$n][1]-$this->_pos));
+                }
+                $this->_pos = $m[$n][1] + strlen($m[$n][0]);
+                if ($this->_states[$this->_state][$i] != -1) {
+                    $this->_stack[] = array($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern);
+                    $this->_lastinner = $this->_inner[$this->_state][$i];
+                    $this->_lastdelim = $this->_delim[$this->_state][$i];
+                    $l = $this->_state;
+                    $this->_state = $this->_states[$this->_state][$i];
+                    $this->_endpattern = $this->_end[$this->_state];
+                    if ($this->_subst[$l][$i]) {
+                        for ($k=0; $k<=$this->_counts[$l][$i]; $k++) {
+                            if (!isset($m[$i+$k])) {
+                                break;
+                            }
+                            $quoted = preg_quote($m[$n+$k][0], '/');
+                            $this->_endpattern = str_replace('%'.$k.'%', $quoted, $this->_endpattern);
+                            $this->_endpattern = str_replace('%b'.$k.'%', $this->_matchingBrackets($quoted), $this->_endpattern);
+                        }
+                    }
+                }
+                return array_pop($this->_tokenStack);
+            }
+            $n += $count + 1;
+        }
+
+        if ($endpos > -1) {
+            $this->_tokenStack[] = array($this->_lastdelim, $endmatch);
+            if ($endpos > $this->_pos) {
+                $this->_tokenStack[] = array($this->_lastinner, substr($this->_str, $this->_pos, $endpos-$this->_pos));
+            }
+            list($this->_state, $this->_lastdelim, $this->_lastinner, $this->_endpattern) = array_pop($this->_stack);
+            $this->_pos = $endpos + strlen($endmatch);
+            return array_pop($this->_tokenStack);
+        }
+        $p = $this->_pos;
+        $this->_pos = HL_INFINITY;
+        return array($this->_lastinner, substr($this->_str, $p));
+    }
+    
+    
+    
+    
+    // {{{ highlight
+
+    /**
+     * Highlights code
+     *
+     * @param  string $str      Code to highlight
+     * @access public
+     * @return string Highlighted text
+     *
+     */
+
+    function highlight($str)
+    {
+        if (!($this->_renderer)) {
+            include_once('Text/Highlighter/Renderer/Html.php');
+            $this->_renderer = new Text_Highlighter_Renderer_Html($this->_options);
+        }
+        $this->_state = -1;
+        $this->_pos = 0;
+        $this->_stack = array();
+        $this->_tokenStack = array();
+        $this->_lastinner = $this->_defClass;
+        $this->_lastdelim = $this->_defClass;
+        $this->_endpattern = '';
+        $this->_renderer->reset();
+        $this->_renderer->setCurrentLanguage($this->_language);
+        $this->_str = $this->_renderer->preprocess($str);
+        $this->_len = strlen($this->_str);
+        while ($token = $this->_getToken()) {
+            $this->_renderer->acceptToken($token[0], $token[1]);
+        }
+        $this->_renderer->finalize();
+        return $this->_renderer->getOutput();
+    }
+    
+    // }}}
+    
+}
+
+// }}}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
diff --git a/library/Text_Highlighter/Text/Highlighter/ABAP.php b/library/Text_Highlighter/Text/Highlighter/ABAP.php
new file mode 100644
index 000000000..b2f7bda94
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/ABAP.php
@@ -0,0 +1,519 @@
+<?php
+/**
+ * Auto-generated class. ABAP syntax highlighting 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : abap.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Stoyan Stefanov <ssttoo@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. ABAP syntax highlighting
+ *
+ * @author Stoyan Stefanov <ssttoo@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_ABAP extends Text_Highlighter
+{
+    var $_language = 'abap';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_ABAP($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)^\\*|")|((?i)\')|((?i)[a-z_\\-]\\w*)/',
+            0 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)^\\*|")|((?i)\')|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)[a-z_\\-]\\w*)/',
+            1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)^\\*|")|((?i)\')|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)[a-z_\\-]\\w*)/',
+            2 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)^\\*|")|((?i)\')|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)[a-z_\\-]\\w*)/',
+            3 => '//',
+            4 => '//',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+            ),
+            0 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 2,
+                9 => 0,
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 2,
+                9 => 0,
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 2,
+                9 => 0,
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => '',
+            ),
+            0 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => '',
+            ),
+            1 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => '',
+            ),
+            2 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => '',
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'identifier',
+            ),
+            0 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'number',
+                9 => 'identifier',
+            ),
+            1 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'number',
+                9 => 'identifier',
+            ),
+            2 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'number',
+                9 => 'identifier',
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)\\}/',
+            1 => '/(?i)\\)/',
+            2 => '/(?i)\\]/',
+            3 => '/(?mi)$/',
+            4 => '/(?i)\'/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => -1,
+            ),
+            0 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 
+                array (
+                    'sy' => '/^((?i)screen-name|screen-group1|screen-group2|screen-group3|screen-group4|screen-required|screen-input|screen-output|screen-intensified|screen-invisible|screen-length|screen-active|sy-index|sy-pagno|sy-tabix|sy-tfill|sy-tlopc|sy-tmaxl|sy-toccu|sy-ttabc|sy-tstis|sy-ttabi|sy-dbcnt|sy-fdpos|sy-colno|sy-linct|sy-linno|sy-linsz|sy-pagct|sy-macol|sy-marow|sy-tleng|sy-sfoff|sy-willi|sy-lilli|sy-subrc|sy-fleng|sy-cucol|sy-curow|sy-lsind|sy-listi|sy-stepl|sy-tpagi|sy-winx1|sy-winy1|sy-winx2|sy-winy2|sy-winco|sy-winro|sy-windi|sy-srows|sy-scols|sy-loopc|sy-folen|sy-fodec|sy-tzone|sy-dayst|sy-ftype|sy-appli|sy-fdayw|sy-ccurs|sy-ccurt|sy-debug|sy-ctype|sy-input|sy-langu|sy-modno|sy-batch|sy-binpt|sy-calld|sy-dynnr|sy-dyngr|sy-newpa|sy-pri40|sy-rstrt|sy-wtitl|sy-cpage|sy-dbnam|sy-mandt|sy-prefx|sy-fmkey|sy-pexpi|sy-prini|sy-primm|sy-prrel|sy-playo|sy-prbig|sy-playp|sy-prnew|sy-prlog|sy-pdest|sy-plist|sy-pauth|sy-prdsn|sy-pnwpa|sy-callr|sy-repi2|sy-rtitl|sy-prrec|sy-prtxt|sy-prabt|sy-lpass|sy-nrpag|sy-paart|sy-prcop|sy-batzs|sy-bspld|sy-brep4|sy-batzo|sy-batzd|sy-batzw|sy-batzm|sy-ctabl|sy-dbsys|sy-dcsys|sy-macdb|sy-sysid|sy-opsys|sy-pfkey|sy-saprl|sy-tcode|sy-ucomm|sy-cfwae|sy-chwae|sy-spono|sy-sponr|sy-waers|sy-cdate|sy-datum|sy-slset|sy-subty|sy-subcs|sy-group|sy-ffile|sy-uzeit|sy-dsnam|sy-repid|sy-tabid|sy-tfdsn|sy-uname|sy-lstat|sy-abcde|sy-marky|sy-sfnam|sy-tname|sy-msgli|sy-title|sy-entry|sy-lisel|sy-uline|sy-xcode|sy-cprog|sy-xprog|sy-xform|sy-ldbpg|sy-tvar0|sy-tvar1|sy-tvar2|sy-tvar3|sy-tvar4|sy-tvar5|sy-tvar6|sy-tvar7|sy-tvar8|sy-tvar9|sy-msgid|sy-msgty|sy-msgno|sy-msgv1|sy-msgv2|sy-msgv3|sy-msgv4|sy-oncom|sy-vline|sy-winsl|sy-staco|sy-staro|sy-datar|sy-host|sy-locdb|sy-locop|sy-datlo|sy-timlo|sy-zonlo|syst-index|syst-pagno|syst-tabix|syst-tfill|syst-tlopc|syst-tmaxl|syst-toccu|syst-ttabc|syst-tstis|syst-ttabi|syst-dbcnt|syst-fdpos|syst-colno|syst-linct|syst-linno|syst-linsz|syst-pagct|syst-macol|syst-marow|syst-tleng|syst-sfoff|syst-willi|syst-lilli|syst-subrc|syst-fleng|syst-cucol|syst-curow|syst-lsind|syst-listi|syst-stepl|syst-tpagi|syst-winx1|syst-winy1|syst-winx2|syst-winy2|syst-winco|syst-winro|syst-windi|syst-srows|syst-scols|syst-loopc|syst-folen|syst-fodec|syst-tzone|syst-dayst|syst-ftype|syst-appli|syst-fdayw|syst-ccurs|syst-ccurt|syst-debug|syst-ctype|syst-input|syst-langu|syst-modno|syst-batch|syst-binpt|syst-calld|syst-dynnr|syst-dyngr|syst-newpa|syst-pri40|syst-rstrt|syst-wtitl|syst-cpage|syst-dbnam|syst-mandt|syst-prefx|syst-fmkey|syst-pexpi|syst-prini|syst-primm|syst-prrel|syst-playo|syst-prbig|syst-playp|syst-prnew|syst-prlog|syst-pdest|syst-plist|syst-pauth|syst-prdsn|syst-pnwpa|syst-callr|syst-repi2|syst-rtitl|syst-prrec|syst-prtxt|syst-prabt|syst-lpass|syst-nrpag|syst-paart|syst-prcop|syst-batzs|syst-bspld|syst-brep4|syst-batzo|syst-batzd|syst-batzw|syst-batzm|syst-ctabl|syst-dbsys|syst-dcsys|syst-macdb|syst-sysid|syst-opsys|syst-pfkey|syst-saprl|syst-tcode|syst-ucomm|syst-cfwae|syst-chwae|syst-spono|syst-sponr|syst-waers|syst-cdate|syst-datum|syst-slset|syst-subty|syst-subcs|syst-group|syst-ffile|syst-uzeit|syst-dsnam|syst-repid|syst-tabid|syst-tfdsn|syst-uname|syst-lstat|syst-abcde|syst-marky|syst-sfnam|syst-tname|syst-msgli|syst-title|syst-entry|syst-lisel|syst-uline|syst-xcode|syst-cprog|syst-xprog|syst-xform|syst-ldbpg|syst-tvar0|syst-tvar1|syst-tvar2|syst-tvar3|syst-tvar4|syst-tvar5|syst-tvar6|syst-tvar7|syst-tvar8|syst-tvar9|syst-msgid|syst-msgty|syst-msgno|syst-msgv1|syst-msgv2|syst-msgv3|syst-msgv4|syst-oncom|syst-vline|syst-winsl|syst-staco|syst-staro|syst-datar|syst-host|syst-locdb|syst-locop|syst-datlo|syst-timlo|syst-zonlo)$/',
+                    'reserved' => '/^((?i)abs|acos|add|add-corresponding|adjacent|after|aliases|all|analyzer|and|any|append|as|ascending|asin|assign|assigned|assigning|at|atan|authority-check|avg|back|before|begin|binary|bit|bit-and|bit-not|bit-or|bit-xor|blank|block|break-point|buffer|by|c|call|case|catch|ceil|centered|chain|change|changing|check|checkbox|class|class-data|class-events|class-methods|class-pool|clear|client|close|cnt|code|collect|color|comment|commit|communication|compute|concatenate|condense|constants|context|contexts|continue|control|controls|convert|copy|corresponding|cos|cosh|count|country|create|currency|cursor|customer-function|data|database|dataset|delete|decimals|default|define|demand|descending|describe|dialog|distinct|div|divide|divide-corresponding|do|duplicates|dynpro|edit|editor-call|else|elseif|end|end-of-definition|end-of-page|end-of-selection|endat|endcase|endcatch|endchain|endclass|enddo|endexec|endform|endfunction|endif|endinterface|endloop|endmethod|endmodule|endon|endprovide|endselect|endwhile|entries|events|exec|exit|exit-command|exp|exponent|export|exporting|exceptions|extended|extract|fetch|field|field-groups|field-symbols|fields|floor|for|form|format|frac|frame|free|from|function|function-pool|generate|get|group|hashed|header|help-id|help-request|hide|hotspot|icon|id|if|import|importing|include|index|infotypes|initialization|inner|input|insert|intensified|interface|interface-pool|interfaces|into|inverse|join|key|language|last|leave|left|left-justified|like|line|line-count|line-selection|line-size|lines|list-processing|load|load-of-program|local|locale|log|log10|loop|m|margin|mask|matchcode|max|memory|message|message-id|messages|method|methods|min|mod|mode|modif|modify|module|move|move-corresponding|multiply|multiply-corresponding|new|new-line|new-page|next|no|no-gap|no-gaps|no-heading|no-scrolling|no-sign|no-title|no-zero|nodes|non-unique|o|object|obligatory|occurs|of|off|on|open|or|order|others|outer|output|overlay|pack|page|parameter|parameters|perform|pf-status|position|print|print-control|private|process|program|property|protected|provide|public|put|radiobutton|raise|raising|range|ranges|read|receive|refresh|reject|replace|report|requested|reserve|reset|right-justified|rollback|round|rows|rtti|run|scan|screen|search|separated|scroll|scroll-boundary|select|select-options|selection-screen|selection-table|set|shared|shift|sign|sin|single|sinh|size|skip|sort|sorted|split|sql|sqrt|stamp|standard|start-of-selection|statics|stop|string|strlen|structure|submit|subtract|subtract-corresponding|sum|supply|suppress|symbol|syntax-check|syntax-trace|system-call|system-exceptions|table|table_line|tables|tan|tanh|text|textpool|time|times|title|titlebar|to|top-of-page|transaction|transfer|translate|transporting|trunc|type|type-pool|type-pools|types|uline|under|unique|unit|unpack|up|update|user-command|using|value|value-request|values|vary|when|where|while|window|with|with-title|work|write|x|xstring|z|zone)$/',
+                    'constants' => '/^((?i)initial|null|space|col_background|col_heading|col_normal|col_total|col_key|col_positive|col_negative|col_group)$/',
+                ),
+            ),
+            0 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                    'sy' => '/^((?i)screen-name|screen-group1|screen-group2|screen-group3|screen-group4|screen-required|screen-input|screen-output|screen-intensified|screen-invisible|screen-length|screen-active|sy-index|sy-pagno|sy-tabix|sy-tfill|sy-tlopc|sy-tmaxl|sy-toccu|sy-ttabc|sy-tstis|sy-ttabi|sy-dbcnt|sy-fdpos|sy-colno|sy-linct|sy-linno|sy-linsz|sy-pagct|sy-macol|sy-marow|sy-tleng|sy-sfoff|sy-willi|sy-lilli|sy-subrc|sy-fleng|sy-cucol|sy-curow|sy-lsind|sy-listi|sy-stepl|sy-tpagi|sy-winx1|sy-winy1|sy-winx2|sy-winy2|sy-winco|sy-winro|sy-windi|sy-srows|sy-scols|sy-loopc|sy-folen|sy-fodec|sy-tzone|sy-dayst|sy-ftype|sy-appli|sy-fdayw|sy-ccurs|sy-ccurt|sy-debug|sy-ctype|sy-input|sy-langu|sy-modno|sy-batch|sy-binpt|sy-calld|sy-dynnr|sy-dyngr|sy-newpa|sy-pri40|sy-rstrt|sy-wtitl|sy-cpage|sy-dbnam|sy-mandt|sy-prefx|sy-fmkey|sy-pexpi|sy-prini|sy-primm|sy-prrel|sy-playo|sy-prbig|sy-playp|sy-prnew|sy-prlog|sy-pdest|sy-plist|sy-pauth|sy-prdsn|sy-pnwpa|sy-callr|sy-repi2|sy-rtitl|sy-prrec|sy-prtxt|sy-prabt|sy-lpass|sy-nrpag|sy-paart|sy-prcop|sy-batzs|sy-bspld|sy-brep4|sy-batzo|sy-batzd|sy-batzw|sy-batzm|sy-ctabl|sy-dbsys|sy-dcsys|sy-macdb|sy-sysid|sy-opsys|sy-pfkey|sy-saprl|sy-tcode|sy-ucomm|sy-cfwae|sy-chwae|sy-spono|sy-sponr|sy-waers|sy-cdate|sy-datum|sy-slset|sy-subty|sy-subcs|sy-group|sy-ffile|sy-uzeit|sy-dsnam|sy-repid|sy-tabid|sy-tfdsn|sy-uname|sy-lstat|sy-abcde|sy-marky|sy-sfnam|sy-tname|sy-msgli|sy-title|sy-entry|sy-lisel|sy-uline|sy-xcode|sy-cprog|sy-xprog|sy-xform|sy-ldbpg|sy-tvar0|sy-tvar1|sy-tvar2|sy-tvar3|sy-tvar4|sy-tvar5|sy-tvar6|sy-tvar7|sy-tvar8|sy-tvar9|sy-msgid|sy-msgty|sy-msgno|sy-msgv1|sy-msgv2|sy-msgv3|sy-msgv4|sy-oncom|sy-vline|sy-winsl|sy-staco|sy-staro|sy-datar|sy-host|sy-locdb|sy-locop|sy-datlo|sy-timlo|sy-zonlo|syst-index|syst-pagno|syst-tabix|syst-tfill|syst-tlopc|syst-tmaxl|syst-toccu|syst-ttabc|syst-tstis|syst-ttabi|syst-dbcnt|syst-fdpos|syst-colno|syst-linct|syst-linno|syst-linsz|syst-pagct|syst-macol|syst-marow|syst-tleng|syst-sfoff|syst-willi|syst-lilli|syst-subrc|syst-fleng|syst-cucol|syst-curow|syst-lsind|syst-listi|syst-stepl|syst-tpagi|syst-winx1|syst-winy1|syst-winx2|syst-winy2|syst-winco|syst-winro|syst-windi|syst-srows|syst-scols|syst-loopc|syst-folen|syst-fodec|syst-tzone|syst-dayst|syst-ftype|syst-appli|syst-fdayw|syst-ccurs|syst-ccurt|syst-debug|syst-ctype|syst-input|syst-langu|syst-modno|syst-batch|syst-binpt|syst-calld|syst-dynnr|syst-dyngr|syst-newpa|syst-pri40|syst-rstrt|syst-wtitl|syst-cpage|syst-dbnam|syst-mandt|syst-prefx|syst-fmkey|syst-pexpi|syst-prini|syst-primm|syst-prrel|syst-playo|syst-prbig|syst-playp|syst-prnew|syst-prlog|syst-pdest|syst-plist|syst-pauth|syst-prdsn|syst-pnwpa|syst-callr|syst-repi2|syst-rtitl|syst-prrec|syst-prtxt|syst-prabt|syst-lpass|syst-nrpag|syst-paart|syst-prcop|syst-batzs|syst-bspld|syst-brep4|syst-batzo|syst-batzd|syst-batzw|syst-batzm|syst-ctabl|syst-dbsys|syst-dcsys|syst-macdb|syst-sysid|syst-opsys|syst-pfkey|syst-saprl|syst-tcode|syst-ucomm|syst-cfwae|syst-chwae|syst-spono|syst-sponr|syst-waers|syst-cdate|syst-datum|syst-slset|syst-subty|syst-subcs|syst-group|syst-ffile|syst-uzeit|syst-dsnam|syst-repid|syst-tabid|syst-tfdsn|syst-uname|syst-lstat|syst-abcde|syst-marky|syst-sfnam|syst-tname|syst-msgli|syst-title|syst-entry|syst-lisel|syst-uline|syst-xcode|syst-cprog|syst-xprog|syst-xform|syst-ldbpg|syst-tvar0|syst-tvar1|syst-tvar2|syst-tvar3|syst-tvar4|syst-tvar5|syst-tvar6|syst-tvar7|syst-tvar8|syst-tvar9|syst-msgid|syst-msgty|syst-msgno|syst-msgv1|syst-msgv2|syst-msgv3|syst-msgv4|syst-oncom|syst-vline|syst-winsl|syst-staco|syst-staro|syst-datar|syst-host|syst-locdb|syst-locop|syst-datlo|syst-timlo|syst-zonlo)$/',
+                    'reserved' => '/^((?i)abs|acos|add|add-corresponding|adjacent|after|aliases|all|analyzer|and|any|append|as|ascending|asin|assign|assigned|assigning|at|atan|authority-check|avg|back|before|begin|binary|bit|bit-and|bit-not|bit-or|bit-xor|blank|block|break-point|buffer|by|c|call|case|catch|ceil|centered|chain|change|changing|check|checkbox|class|class-data|class-events|class-methods|class-pool|clear|client|close|cnt|code|collect|color|comment|commit|communication|compute|concatenate|condense|constants|context|contexts|continue|control|controls|convert|copy|corresponding|cos|cosh|count|country|create|currency|cursor|customer-function|data|database|dataset|delete|decimals|default|define|demand|descending|describe|dialog|distinct|div|divide|divide-corresponding|do|duplicates|dynpro|edit|editor-call|else|elseif|end|end-of-definition|end-of-page|end-of-selection|endat|endcase|endcatch|endchain|endclass|enddo|endexec|endform|endfunction|endif|endinterface|endloop|endmethod|endmodule|endon|endprovide|endselect|endwhile|entries|events|exec|exit|exit-command|exp|exponent|export|exporting|exceptions|extended|extract|fetch|field|field-groups|field-symbols|fields|floor|for|form|format|frac|frame|free|from|function|function-pool|generate|get|group|hashed|header|help-id|help-request|hide|hotspot|icon|id|if|import|importing|include|index|infotypes|initialization|inner|input|insert|intensified|interface|interface-pool|interfaces|into|inverse|join|key|language|last|leave|left|left-justified|like|line|line-count|line-selection|line-size|lines|list-processing|load|load-of-program|local|locale|log|log10|loop|m|margin|mask|matchcode|max|memory|message|message-id|messages|method|methods|min|mod|mode|modif|modify|module|move|move-corresponding|multiply|multiply-corresponding|new|new-line|new-page|next|no|no-gap|no-gaps|no-heading|no-scrolling|no-sign|no-title|no-zero|nodes|non-unique|o|object|obligatory|occurs|of|off|on|open|or|order|others|outer|output|overlay|pack|page|parameter|parameters|perform|pf-status|position|print|print-control|private|process|program|property|protected|provide|public|put|radiobutton|raise|raising|range|ranges|read|receive|refresh|reject|replace|report|requested|reserve|reset|right-justified|rollback|round|rows|rtti|run|scan|screen|search|separated|scroll|scroll-boundary|select|select-options|selection-screen|selection-table|set|shared|shift|sign|sin|single|sinh|size|skip|sort|sorted|split|sql|sqrt|stamp|standard|start-of-selection|statics|stop|string|strlen|structure|submit|subtract|subtract-corresponding|sum|supply|suppress|symbol|syntax-check|syntax-trace|system-call|system-exceptions|table|table_line|tables|tan|tanh|text|textpool|time|times|title|titlebar|to|top-of-page|transaction|transfer|translate|transporting|trunc|type|type-pool|type-pools|types|uline|under|unique|unit|unpack|up|update|user-command|using|value|value-request|values|vary|when|where|while|window|with|with-title|work|write|x|xstring|z|zone)$/',
+                    'constants' => '/^((?i)initial|null|space|col_background|col_heading|col_normal|col_total|col_key|col_positive|col_negative|col_group)$/',
+                ),
+            ),
+            1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                    'sy' => '/^((?i)screen-name|screen-group1|screen-group2|screen-group3|screen-group4|screen-required|screen-input|screen-output|screen-intensified|screen-invisible|screen-length|screen-active|sy-index|sy-pagno|sy-tabix|sy-tfill|sy-tlopc|sy-tmaxl|sy-toccu|sy-ttabc|sy-tstis|sy-ttabi|sy-dbcnt|sy-fdpos|sy-colno|sy-linct|sy-linno|sy-linsz|sy-pagct|sy-macol|sy-marow|sy-tleng|sy-sfoff|sy-willi|sy-lilli|sy-subrc|sy-fleng|sy-cucol|sy-curow|sy-lsind|sy-listi|sy-stepl|sy-tpagi|sy-winx1|sy-winy1|sy-winx2|sy-winy2|sy-winco|sy-winro|sy-windi|sy-srows|sy-scols|sy-loopc|sy-folen|sy-fodec|sy-tzone|sy-dayst|sy-ftype|sy-appli|sy-fdayw|sy-ccurs|sy-ccurt|sy-debug|sy-ctype|sy-input|sy-langu|sy-modno|sy-batch|sy-binpt|sy-calld|sy-dynnr|sy-dyngr|sy-newpa|sy-pri40|sy-rstrt|sy-wtitl|sy-cpage|sy-dbnam|sy-mandt|sy-prefx|sy-fmkey|sy-pexpi|sy-prini|sy-primm|sy-prrel|sy-playo|sy-prbig|sy-playp|sy-prnew|sy-prlog|sy-pdest|sy-plist|sy-pauth|sy-prdsn|sy-pnwpa|sy-callr|sy-repi2|sy-rtitl|sy-prrec|sy-prtxt|sy-prabt|sy-lpass|sy-nrpag|sy-paart|sy-prcop|sy-batzs|sy-bspld|sy-brep4|sy-batzo|sy-batzd|sy-batzw|sy-batzm|sy-ctabl|sy-dbsys|sy-dcsys|sy-macdb|sy-sysid|sy-opsys|sy-pfkey|sy-saprl|sy-tcode|sy-ucomm|sy-cfwae|sy-chwae|sy-spono|sy-sponr|sy-waers|sy-cdate|sy-datum|sy-slset|sy-subty|sy-subcs|sy-group|sy-ffile|sy-uzeit|sy-dsnam|sy-repid|sy-tabid|sy-tfdsn|sy-uname|sy-lstat|sy-abcde|sy-marky|sy-sfnam|sy-tname|sy-msgli|sy-title|sy-entry|sy-lisel|sy-uline|sy-xcode|sy-cprog|sy-xprog|sy-xform|sy-ldbpg|sy-tvar0|sy-tvar1|sy-tvar2|sy-tvar3|sy-tvar4|sy-tvar5|sy-tvar6|sy-tvar7|sy-tvar8|sy-tvar9|sy-msgid|sy-msgty|sy-msgno|sy-msgv1|sy-msgv2|sy-msgv3|sy-msgv4|sy-oncom|sy-vline|sy-winsl|sy-staco|sy-staro|sy-datar|sy-host|sy-locdb|sy-locop|sy-datlo|sy-timlo|sy-zonlo|syst-index|syst-pagno|syst-tabix|syst-tfill|syst-tlopc|syst-tmaxl|syst-toccu|syst-ttabc|syst-tstis|syst-ttabi|syst-dbcnt|syst-fdpos|syst-colno|syst-linct|syst-linno|syst-linsz|syst-pagct|syst-macol|syst-marow|syst-tleng|syst-sfoff|syst-willi|syst-lilli|syst-subrc|syst-fleng|syst-cucol|syst-curow|syst-lsind|syst-listi|syst-stepl|syst-tpagi|syst-winx1|syst-winy1|syst-winx2|syst-winy2|syst-winco|syst-winro|syst-windi|syst-srows|syst-scols|syst-loopc|syst-folen|syst-fodec|syst-tzone|syst-dayst|syst-ftype|syst-appli|syst-fdayw|syst-ccurs|syst-ccurt|syst-debug|syst-ctype|syst-input|syst-langu|syst-modno|syst-batch|syst-binpt|syst-calld|syst-dynnr|syst-dyngr|syst-newpa|syst-pri40|syst-rstrt|syst-wtitl|syst-cpage|syst-dbnam|syst-mandt|syst-prefx|syst-fmkey|syst-pexpi|syst-prini|syst-primm|syst-prrel|syst-playo|syst-prbig|syst-playp|syst-prnew|syst-prlog|syst-pdest|syst-plist|syst-pauth|syst-prdsn|syst-pnwpa|syst-callr|syst-repi2|syst-rtitl|syst-prrec|syst-prtxt|syst-prabt|syst-lpass|syst-nrpag|syst-paart|syst-prcop|syst-batzs|syst-bspld|syst-brep4|syst-batzo|syst-batzd|syst-batzw|syst-batzm|syst-ctabl|syst-dbsys|syst-dcsys|syst-macdb|syst-sysid|syst-opsys|syst-pfkey|syst-saprl|syst-tcode|syst-ucomm|syst-cfwae|syst-chwae|syst-spono|syst-sponr|syst-waers|syst-cdate|syst-datum|syst-slset|syst-subty|syst-subcs|syst-group|syst-ffile|syst-uzeit|syst-dsnam|syst-repid|syst-tabid|syst-tfdsn|syst-uname|syst-lstat|syst-abcde|syst-marky|syst-sfnam|syst-tname|syst-msgli|syst-title|syst-entry|syst-lisel|syst-uline|syst-xcode|syst-cprog|syst-xprog|syst-xform|syst-ldbpg|syst-tvar0|syst-tvar1|syst-tvar2|syst-tvar3|syst-tvar4|syst-tvar5|syst-tvar6|syst-tvar7|syst-tvar8|syst-tvar9|syst-msgid|syst-msgty|syst-msgno|syst-msgv1|syst-msgv2|syst-msgv3|syst-msgv4|syst-oncom|syst-vline|syst-winsl|syst-staco|syst-staro|syst-datar|syst-host|syst-locdb|syst-locop|syst-datlo|syst-timlo|syst-zonlo)$/',
+                    'reserved' => '/^((?i)abs|acos|add|add-corresponding|adjacent|after|aliases|all|analyzer|and|any|append|as|ascending|asin|assign|assigned|assigning|at|atan|authority-check|avg|back|before|begin|binary|bit|bit-and|bit-not|bit-or|bit-xor|blank|block|break-point|buffer|by|c|call|case|catch|ceil|centered|chain|change|changing|check|checkbox|class|class-data|class-events|class-methods|class-pool|clear|client|close|cnt|code|collect|color|comment|commit|communication|compute|concatenate|condense|constants|context|contexts|continue|control|controls|convert|copy|corresponding|cos|cosh|count|country|create|currency|cursor|customer-function|data|database|dataset|delete|decimals|default|define|demand|descending|describe|dialog|distinct|div|divide|divide-corresponding|do|duplicates|dynpro|edit|editor-call|else|elseif|end|end-of-definition|end-of-page|end-of-selection|endat|endcase|endcatch|endchain|endclass|enddo|endexec|endform|endfunction|endif|endinterface|endloop|endmethod|endmodule|endon|endprovide|endselect|endwhile|entries|events|exec|exit|exit-command|exp|exponent|export|exporting|exceptions|extended|extract|fetch|field|field-groups|field-symbols|fields|floor|for|form|format|frac|frame|free|from|function|function-pool|generate|get|group|hashed|header|help-id|help-request|hide|hotspot|icon|id|if|import|importing|include|index|infotypes|initialization|inner|input|insert|intensified|interface|interface-pool|interfaces|into|inverse|join|key|language|last|leave|left|left-justified|like|line|line-count|line-selection|line-size|lines|list-processing|load|load-of-program|local|locale|log|log10|loop|m|margin|mask|matchcode|max|memory|message|message-id|messages|method|methods|min|mod|mode|modif|modify|module|move|move-corresponding|multiply|multiply-corresponding|new|new-line|new-page|next|no|no-gap|no-gaps|no-heading|no-scrolling|no-sign|no-title|no-zero|nodes|non-unique|o|object|obligatory|occurs|of|off|on|open|or|order|others|outer|output|overlay|pack|page|parameter|parameters|perform|pf-status|position|print|print-control|private|process|program|property|protected|provide|public|put|radiobutton|raise|raising|range|ranges|read|receive|refresh|reject|replace|report|requested|reserve|reset|right-justified|rollback|round|rows|rtti|run|scan|screen|search|separated|scroll|scroll-boundary|select|select-options|selection-screen|selection-table|set|shared|shift|sign|sin|single|sinh|size|skip|sort|sorted|split|sql|sqrt|stamp|standard|start-of-selection|statics|stop|string|strlen|structure|submit|subtract|subtract-corresponding|sum|supply|suppress|symbol|syntax-check|syntax-trace|system-call|system-exceptions|table|table_line|tables|tan|tanh|text|textpool|time|times|title|titlebar|to|top-of-page|transaction|transfer|translate|transporting|trunc|type|type-pool|type-pools|types|uline|under|unique|unit|unpack|up|update|user-command|using|value|value-request|values|vary|when|where|while|window|with|with-title|work|write|x|xstring|z|zone)$/',
+                    'constants' => '/^((?i)initial|null|space|col_background|col_heading|col_normal|col_total|col_key|col_positive|col_negative|col_group)$/',
+                ),
+            ),
+            2 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                    'sy' => '/^((?i)screen-name|screen-group1|screen-group2|screen-group3|screen-group4|screen-required|screen-input|screen-output|screen-intensified|screen-invisible|screen-length|screen-active|sy-index|sy-pagno|sy-tabix|sy-tfill|sy-tlopc|sy-tmaxl|sy-toccu|sy-ttabc|sy-tstis|sy-ttabi|sy-dbcnt|sy-fdpos|sy-colno|sy-linct|sy-linno|sy-linsz|sy-pagct|sy-macol|sy-marow|sy-tleng|sy-sfoff|sy-willi|sy-lilli|sy-subrc|sy-fleng|sy-cucol|sy-curow|sy-lsind|sy-listi|sy-stepl|sy-tpagi|sy-winx1|sy-winy1|sy-winx2|sy-winy2|sy-winco|sy-winro|sy-windi|sy-srows|sy-scols|sy-loopc|sy-folen|sy-fodec|sy-tzone|sy-dayst|sy-ftype|sy-appli|sy-fdayw|sy-ccurs|sy-ccurt|sy-debug|sy-ctype|sy-input|sy-langu|sy-modno|sy-batch|sy-binpt|sy-calld|sy-dynnr|sy-dyngr|sy-newpa|sy-pri40|sy-rstrt|sy-wtitl|sy-cpage|sy-dbnam|sy-mandt|sy-prefx|sy-fmkey|sy-pexpi|sy-prini|sy-primm|sy-prrel|sy-playo|sy-prbig|sy-playp|sy-prnew|sy-prlog|sy-pdest|sy-plist|sy-pauth|sy-prdsn|sy-pnwpa|sy-callr|sy-repi2|sy-rtitl|sy-prrec|sy-prtxt|sy-prabt|sy-lpass|sy-nrpag|sy-paart|sy-prcop|sy-batzs|sy-bspld|sy-brep4|sy-batzo|sy-batzd|sy-batzw|sy-batzm|sy-ctabl|sy-dbsys|sy-dcsys|sy-macdb|sy-sysid|sy-opsys|sy-pfkey|sy-saprl|sy-tcode|sy-ucomm|sy-cfwae|sy-chwae|sy-spono|sy-sponr|sy-waers|sy-cdate|sy-datum|sy-slset|sy-subty|sy-subcs|sy-group|sy-ffile|sy-uzeit|sy-dsnam|sy-repid|sy-tabid|sy-tfdsn|sy-uname|sy-lstat|sy-abcde|sy-marky|sy-sfnam|sy-tname|sy-msgli|sy-title|sy-entry|sy-lisel|sy-uline|sy-xcode|sy-cprog|sy-xprog|sy-xform|sy-ldbpg|sy-tvar0|sy-tvar1|sy-tvar2|sy-tvar3|sy-tvar4|sy-tvar5|sy-tvar6|sy-tvar7|sy-tvar8|sy-tvar9|sy-msgid|sy-msgty|sy-msgno|sy-msgv1|sy-msgv2|sy-msgv3|sy-msgv4|sy-oncom|sy-vline|sy-winsl|sy-staco|sy-staro|sy-datar|sy-host|sy-locdb|sy-locop|sy-datlo|sy-timlo|sy-zonlo|syst-index|syst-pagno|syst-tabix|syst-tfill|syst-tlopc|syst-tmaxl|syst-toccu|syst-ttabc|syst-tstis|syst-ttabi|syst-dbcnt|syst-fdpos|syst-colno|syst-linct|syst-linno|syst-linsz|syst-pagct|syst-macol|syst-marow|syst-tleng|syst-sfoff|syst-willi|syst-lilli|syst-subrc|syst-fleng|syst-cucol|syst-curow|syst-lsind|syst-listi|syst-stepl|syst-tpagi|syst-winx1|syst-winy1|syst-winx2|syst-winy2|syst-winco|syst-winro|syst-windi|syst-srows|syst-scols|syst-loopc|syst-folen|syst-fodec|syst-tzone|syst-dayst|syst-ftype|syst-appli|syst-fdayw|syst-ccurs|syst-ccurt|syst-debug|syst-ctype|syst-input|syst-langu|syst-modno|syst-batch|syst-binpt|syst-calld|syst-dynnr|syst-dyngr|syst-newpa|syst-pri40|syst-rstrt|syst-wtitl|syst-cpage|syst-dbnam|syst-mandt|syst-prefx|syst-fmkey|syst-pexpi|syst-prini|syst-primm|syst-prrel|syst-playo|syst-prbig|syst-playp|syst-prnew|syst-prlog|syst-pdest|syst-plist|syst-pauth|syst-prdsn|syst-pnwpa|syst-callr|syst-repi2|syst-rtitl|syst-prrec|syst-prtxt|syst-prabt|syst-lpass|syst-nrpag|syst-paart|syst-prcop|syst-batzs|syst-bspld|syst-brep4|syst-batzo|syst-batzd|syst-batzw|syst-batzm|syst-ctabl|syst-dbsys|syst-dcsys|syst-macdb|syst-sysid|syst-opsys|syst-pfkey|syst-saprl|syst-tcode|syst-ucomm|syst-cfwae|syst-chwae|syst-spono|syst-sponr|syst-waers|syst-cdate|syst-datum|syst-slset|syst-subty|syst-subcs|syst-group|syst-ffile|syst-uzeit|syst-dsnam|syst-repid|syst-tabid|syst-tfdsn|syst-uname|syst-lstat|syst-abcde|syst-marky|syst-sfnam|syst-tname|syst-msgli|syst-title|syst-entry|syst-lisel|syst-uline|syst-xcode|syst-cprog|syst-xprog|syst-xform|syst-ldbpg|syst-tvar0|syst-tvar1|syst-tvar2|syst-tvar3|syst-tvar4|syst-tvar5|syst-tvar6|syst-tvar7|syst-tvar8|syst-tvar9|syst-msgid|syst-msgty|syst-msgno|syst-msgv1|syst-msgv2|syst-msgv3|syst-msgv4|syst-oncom|syst-vline|syst-winsl|syst-staco|syst-staro|syst-datar|syst-host|syst-locdb|syst-locop|syst-datlo|syst-timlo|syst-zonlo)$/',
+                    'reserved' => '/^((?i)abs|acos|add|add-corresponding|adjacent|after|aliases|all|analyzer|and|any|append|as|ascending|asin|assign|assigned|assigning|at|atan|authority-check|avg|back|before|begin|binary|bit|bit-and|bit-not|bit-or|bit-xor|blank|block|break-point|buffer|by|c|call|case|catch|ceil|centered|chain|change|changing|check|checkbox|class|class-data|class-events|class-methods|class-pool|clear|client|close|cnt|code|collect|color|comment|commit|communication|compute|concatenate|condense|constants|context|contexts|continue|control|controls|convert|copy|corresponding|cos|cosh|count|country|create|currency|cursor|customer-function|data|database|dataset|delete|decimals|default|define|demand|descending|describe|dialog|distinct|div|divide|divide-corresponding|do|duplicates|dynpro|edit|editor-call|else|elseif|end|end-of-definition|end-of-page|end-of-selection|endat|endcase|endcatch|endchain|endclass|enddo|endexec|endform|endfunction|endif|endinterface|endloop|endmethod|endmodule|endon|endprovide|endselect|endwhile|entries|events|exec|exit|exit-command|exp|exponent|export|exporting|exceptions|extended|extract|fetch|field|field-groups|field-symbols|fields|floor|for|form|format|frac|frame|free|from|function|function-pool|generate|get|group|hashed|header|help-id|help-request|hide|hotspot|icon|id|if|import|importing|include|index|infotypes|initialization|inner|input|insert|intensified|interface|interface-pool|interfaces|into|inverse|join|key|language|last|leave|left|left-justified|like|line|line-count|line-selection|line-size|lines|list-processing|load|load-of-program|local|locale|log|log10|loop|m|margin|mask|matchcode|max|memory|message|message-id|messages|method|methods|min|mod|mode|modif|modify|module|move|move-corresponding|multiply|multiply-corresponding|new|new-line|new-page|next|no|no-gap|no-gaps|no-heading|no-scrolling|no-sign|no-title|no-zero|nodes|non-unique|o|object|obligatory|occurs|of|off|on|open|or|order|others|outer|output|overlay|pack|page|parameter|parameters|perform|pf-status|position|print|print-control|private|process|program|property|protected|provide|public|put|radiobutton|raise|raising|range|ranges|read|receive|refresh|reject|replace|report|requested|reserve|reset|right-justified|rollback|round|rows|rtti|run|scan|screen|search|separated|scroll|scroll-boundary|select|select-options|selection-screen|selection-table|set|shared|shift|sign|sin|single|sinh|size|skip|sort|sorted|split|sql|sqrt|stamp|standard|start-of-selection|statics|stop|string|strlen|structure|submit|subtract|subtract-corresponding|sum|supply|suppress|symbol|syntax-check|syntax-trace|system-call|system-exceptions|table|table_line|tables|tan|tanh|text|textpool|time|times|title|titlebar|to|top-of-page|transaction|transfer|translate|transporting|trunc|type|type-pool|type-pools|types|uline|under|unique|unit|unpack|up|update|user-command|using|value|value-request|values|vary|when|where|while|window|with|with-title|work|write|x|xstring|z|zone)$/',
+                    'constants' => '/^((?i)initial|null|space|col_background|col_heading|col_normal|col_total|col_key|col_positive|col_negative|col_group)$/',
+                ),
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+            ),
+            1 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+            ),
+            2 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+            ),
+            0 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+            ),
+            1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+            ),
+            2 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'sy' => 'reserved',
+            'reserved' => 'reserved',
+            'constants' => 'reserved',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/AVRC.php b/library/Text_Highlighter/Text/Highlighter/AVRC.php
new file mode 100644
index 000000000..de4b82ccd
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/AVRC.php
@@ -0,0 +1,894 @@
+
+<?php
+/**
+ * Auto-generated class. AVRC syntax highlighting
+ * 
+ * 
+ * 		C/C++ highlighter specific to Atmel AVR microcontrollers
+ *      
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: avrc.xml
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. AVRC syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_AVRC extends Text_Highlighter
+{
+    var $_language = 'avrc';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_AVRC($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
+            0 => '/((?i)\\\\)/',
+            1 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
+            2 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
+            3 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
+            4 => '//',
+            5 => '/((?i)")|((?i)<)/',
+            6 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\/\\*)|((?i)\\/\\/.+)/',
+            7 => '/((?i)\\$\\w+\\s*:.+\\$)/',
+            8 => '/((?i)\\$\\w+\\s*:.+\\$)/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 2,
+                9 => 0,
+                10 => 0,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+            ),
+            0 => 
+            array (
+                0 => 0,
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 2,
+                9 => 0,
+                10 => 0,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 2,
+                9 => 0,
+                10 => 0,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 2,
+                9 => 0,
+                10 => 0,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => 0,
+                1 => 0,
+            ),
+            6 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 2,
+                8 => 0,
+                9 => 0,
+            ),
+            7 => 
+            array (
+                0 => 0,
+            ),
+            8 => 
+            array (
+                0 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'quotes',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => 'prepro',
+                10 => 'prepro',
+                11 => '',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            0 => 
+            array (
+                0 => '',
+            ),
+            1 => 
+            array (
+                0 => 'quotes',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => 'prepro',
+                10 => 'prepro',
+                11 => '',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            2 => 
+            array (
+                0 => 'quotes',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => 'prepro',
+                10 => 'prepro',
+                11 => '',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            3 => 
+            array (
+                0 => 'quotes',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => 'prepro',
+                10 => 'prepro',
+                11 => '',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => 'quotes',
+                1 => 'quotes',
+            ),
+            6 => 
+            array (
+                0 => 'quotes',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => '',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => 'mlcomment',
+                9 => 'comment',
+            ),
+            7 => 
+            array (
+                0 => '',
+            ),
+            8 => 
+            array (
+                0 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'string',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'identifier',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'number',
+                9 => 'prepro',
+                10 => 'code',
+                11 => 'number',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            0 => 
+            array (
+                0 => 'special',
+            ),
+            1 => 
+            array (
+                0 => 'string',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'identifier',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'number',
+                9 => 'prepro',
+                10 => 'code',
+                11 => 'number',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            2 => 
+            array (
+                0 => 'string',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'identifier',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'number',
+                9 => 'prepro',
+                10 => 'code',
+                11 => 'number',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            3 => 
+            array (
+                0 => 'string',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'identifier',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'number',
+                9 => 'prepro',
+                10 => 'code',
+                11 => 'number',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => 'string',
+                1 => 'string',
+            ),
+            6 => 
+            array (
+                0 => 'string',
+                1 => 'code',
+                2 => 'code',
+                3 => 'identifier',
+                4 => 'number',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'mlcomment',
+                9 => 'comment',
+            ),
+            7 => 
+            array (
+                0 => 'inlinedoc',
+            ),
+            8 => 
+            array (
+                0 => 'inlinedoc',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)"/',
+            1 => '/(?i)\\}/',
+            2 => '/(?i)\\)/',
+            3 => '/(?i)\\]/',
+            4 => '/(?i)>/',
+            5 => '/(?mi)(?<!\\\\)$/',
+            6 => '/(?mi)(?<!\\\\)$/',
+            7 => '/(?i)\\*\\//',
+            8 => '/(?mi)$/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 5,
+                10 => 6,
+                11 => -1,
+                12 => 7,
+                13 => 8,
+            ),
+            0 => 
+            array (
+                0 => -1,
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 5,
+                10 => 6,
+                11 => -1,
+                12 => 7,
+                13 => 8,
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 5,
+                10 => 6,
+                11 => -1,
+                12 => 7,
+                13 => 8,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 5,
+                10 => 6,
+                11 => -1,
+                12 => 7,
+                13 => 8,
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => 0,
+                1 => 4,
+            ),
+            6 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => 7,
+                9 => 8,
+            ),
+            7 => 
+            array (
+                0 => -1,
+            ),
+            8 => 
+            array (
+                0 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
+                    'registers' => '/^(ACSR|ADCH|ADCL|ADCSRA|ADMUX|ASSR|DDRA|DDRB|DDRC|DDRD|DDRE|DDRF|DDRG|EEARH|EEARL|EECR|EEDR|EICRA|EICRB|EIFR|EIMSK|ETIFR|ETIMSK|GICR|GIFR|ICR1H|ICR1L|ICR3H|ICR3L|MCUCR|MCUCSR|OCDR|OCR0|OCR1AH|OCR1AL|OCR1BH|OCR1BL|OCR1CH|OCR1CL|OCR2|OCR3AH|OCR3AL|OCR3BH|OCR3BL|OCR3CH|OCR3CL|OSCCAL|PINA|PINB|PINC|PIND|PINE|PINF|PING|PORTA|PORTB|PORTC|PORTD|PORTE|PORTF|PORTG|RAMPZ|SFIOR|SPCR|SPDR|SPH|SPL|SPMCR|SPMCSR|SPSR|SREG|TCCR0|TCCR1A|TCCR1B|TCCR1C|TCCR2|TCCR3A|TCCR3B|TCCR3C|TCNT0|TCNT1H|TCNT1L|TCNT2|TCNT3H|TCNT3L|TIFR|TIMSK|TWAR|TWBR|TWCR|TWDR|TWSR|UBRR0H|UBRR0L|UBRR1H|UBRR1L|UBRRH|UBRRL|UCSR0A|UCSR0B|UCSR0C|UCSR1A|UCSR1B|UCSR1C|UCSRA|UCSRB|UCSRC|UDR|UDR0|UDR1|WDTCR|XDIV|XMCRA|XMCRB)$/',
+                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
+                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => -1,
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => -1,
+            ),
+            0 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
+                    'registers' => '/^(ACSR|ADCH|ADCL|ADCSRA|ADMUX|ASSR|DDRA|DDRB|DDRC|DDRD|DDRE|DDRF|DDRG|EEARH|EEARL|EECR|EEDR|EICRA|EICRB|EIFR|EIMSK|ETIFR|ETIMSK|GICR|GIFR|ICR1H|ICR1L|ICR3H|ICR3L|MCUCR|MCUCSR|OCDR|OCR0|OCR1AH|OCR1AL|OCR1BH|OCR1BL|OCR1CH|OCR1CL|OCR2|OCR3AH|OCR3AL|OCR3BH|OCR3BL|OCR3CH|OCR3CL|OSCCAL|PINA|PINB|PINC|PIND|PINE|PINF|PING|PORTA|PORTB|PORTC|PORTD|PORTE|PORTF|PORTG|RAMPZ|SFIOR|SPCR|SPDR|SPH|SPL|SPMCR|SPMCSR|SPSR|SREG|TCCR0|TCCR1A|TCCR1B|TCCR1C|TCCR2|TCCR3A|TCCR3B|TCCR3C|TCNT0|TCNT1H|TCNT1L|TCNT2|TCNT3H|TCNT3L|TIFR|TIMSK|TWAR|TWBR|TWCR|TWDR|TWSR|UBRR0H|UBRR0L|UBRR1H|UBRR1L|UBRRH|UBRRL|UCSR0A|UCSR0B|UCSR0C|UCSR1A|UCSR1B|UCSR1C|UCSRA|UCSRB|UCSRC|UDR|UDR0|UDR1|WDTCR|XDIV|XMCRA|XMCRB)$/',
+                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
+                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => -1,
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => -1,
+            ),
+            2 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
+                    'registers' => '/^(ACSR|ADCH|ADCL|ADCSRA|ADMUX|ASSR|DDRA|DDRB|DDRC|DDRD|DDRE|DDRF|DDRG|EEARH|EEARL|EECR|EEDR|EICRA|EICRB|EIFR|EIMSK|ETIFR|ETIMSK|GICR|GIFR|ICR1H|ICR1L|ICR3H|ICR3L|MCUCR|MCUCSR|OCDR|OCR0|OCR1AH|OCR1AL|OCR1BH|OCR1BL|OCR1CH|OCR1CL|OCR2|OCR3AH|OCR3AL|OCR3BH|OCR3BL|OCR3CH|OCR3CL|OSCCAL|PINA|PINB|PINC|PIND|PINE|PINF|PING|PORTA|PORTB|PORTC|PORTD|PORTE|PORTF|PORTG|RAMPZ|SFIOR|SPCR|SPDR|SPH|SPL|SPMCR|SPMCSR|SPSR|SREG|TCCR0|TCCR1A|TCCR1B|TCCR1C|TCCR2|TCCR3A|TCCR3B|TCCR3C|TCNT0|TCNT1H|TCNT1L|TCNT2|TCNT3H|TCNT3L|TIFR|TIMSK|TWAR|TWBR|TWCR|TWDR|TWSR|UBRR0H|UBRR0L|UBRR1H|UBRR1L|UBRRH|UBRRL|UCSR0A|UCSR0B|UCSR0C|UCSR1A|UCSR1B|UCSR1C|UCSRA|UCSRB|UCSRC|UDR|UDR0|UDR1|WDTCR|XDIV|XMCRA|XMCRB)$/',
+                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
+                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => -1,
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => -1,
+            ),
+            3 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
+                    'registers' => '/^(ACSR|ADCH|ADCL|ADCSRA|ADMUX|ASSR|DDRA|DDRB|DDRC|DDRD|DDRE|DDRF|DDRG|EEARH|EEARL|EECR|EEDR|EICRA|EICRB|EIFR|EIMSK|ETIFR|ETIMSK|GICR|GIFR|ICR1H|ICR1L|ICR3H|ICR3L|MCUCR|MCUCSR|OCDR|OCR0|OCR1AH|OCR1AL|OCR1BH|OCR1BL|OCR1CH|OCR1CL|OCR2|OCR3AH|OCR3AL|OCR3BH|OCR3BL|OCR3CH|OCR3CL|OSCCAL|PINA|PINB|PINC|PIND|PINE|PINF|PING|PORTA|PORTB|PORTC|PORTD|PORTE|PORTF|PORTG|RAMPZ|SFIOR|SPCR|SPDR|SPH|SPL|SPMCR|SPMCSR|SPSR|SREG|TCCR0|TCCR1A|TCCR1B|TCCR1C|TCCR2|TCCR3A|TCCR3B|TCCR3C|TCNT0|TCNT1H|TCNT1L|TCNT2|TCNT3H|TCNT3L|TIFR|TIMSK|TWAR|TWBR|TWCR|TWDR|TWSR|UBRR0H|UBRR0L|UBRR1H|UBRR1L|UBRRH|UBRRL|UCSR0A|UCSR0B|UCSR0C|UCSR1A|UCSR1B|UCSR1C|UCSRA|UCSRB|UCSRC|UDR|UDR0|UDR1|WDTCR|XDIV|XMCRA|XMCRB)$/',
+                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
+                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => -1,
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => -1,
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => -1,
+                1 => -1,
+            ),
+            6 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => 
+                array (
+                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
+                    'registers' => '/^(ACSR|ADCH|ADCL|ADCSRA|ADMUX|ASSR|DDRA|DDRB|DDRC|DDRD|DDRE|DDRF|DDRG|EEARH|EEARL|EECR|EEDR|EICRA|EICRB|EIFR|EIMSK|ETIFR|ETIMSK|GICR|GIFR|ICR1H|ICR1L|ICR3H|ICR3L|MCUCR|MCUCSR|OCDR|OCR0|OCR1AH|OCR1AL|OCR1BH|OCR1BL|OCR1CH|OCR1CL|OCR2|OCR3AH|OCR3AL|OCR3BH|OCR3BL|OCR3CH|OCR3CL|OSCCAL|PINA|PINB|PINC|PIND|PINE|PINF|PING|PORTA|PORTB|PORTC|PORTD|PORTE|PORTF|PORTG|RAMPZ|SFIOR|SPCR|SPDR|SPH|SPL|SPMCR|SPMCSR|SPSR|SREG|TCCR0|TCCR1A|TCCR1B|TCCR1C|TCCR2|TCCR3A|TCCR3B|TCCR3C|TCNT0|TCNT1H|TCNT1L|TCNT2|TCNT3H|TCNT3L|TIFR|TIMSK|TWAR|TWBR|TWCR|TWDR|TWSR|UBRR0H|UBRR0L|UBRR1H|UBRR1L|UBRRH|UBRRL|UCSR0A|UCSR0B|UCSR0C|UCSR1A|UCSR1B|UCSR1C|UCSRA|UCSRB|UCSRC|UDR|UDR0|UDR1|WDTCR|XDIV|XMCRA|XMCRB)$/',
+                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
+                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
+                ),
+                4 => 
+                array (
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => -1,
+                9 => -1,
+            ),
+            7 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            8 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+                0 => NULL,
+            ),
+            1 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+            ),
+            2 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+            ),
+            3 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+            ),
+            6 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+            ),
+            7 => 
+            array (
+                0 => NULL,
+            ),
+            8 => 
+            array (
+                0 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+            ),
+            0 => 
+            array (
+                0 => false,
+            ),
+            1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+            ),
+            2 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => false,
+                1 => false,
+            ),
+            6 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+            ),
+            7 => 
+            array (
+                0 => false,
+            ),
+            8 => 
+            array (
+                0 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'reserved' => 'reserved',
+            'registers' => 'reserved',
+            'types' => 'types',
+            'Common Macros' => 'prepro',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/CPP.php b/library/Text_Highlighter/Text/Highlighter/CPP.php
new file mode 100644
index 000000000..eaa47c575
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/CPP.php
@@ -0,0 +1,891 @@
+
+<?php
+/**
+ * Auto-generated class. CPP syntax highlighting
+ * 
+ * 
+ * Thanks to Aaron Kalin for initial
+ * implementation of this highlighter
+ *      
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: cpp.xml
+ * @author Aaron Kalin
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. CPP syntax highlighting
+ *
+ * @author Aaron Kalin
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_CPP extends Text_Highlighter
+{
+    var $_language = 'cpp';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_CPP($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
+            0 => '/((?i)\\\\)/',
+            1 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
+            2 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
+            3 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?mi)^[ \\t]*#include)|((?mii)^[ \\t]*#[ \\t]*[a-z]+)|((?i)\\d*\\.?\\d+)|((?i)\\/\\*)|((?i)\\/\\/.+)/',
+            4 => '//',
+            5 => '/((?i)")|((?i)<)/',
+            6 => '/((?i)")|((?i)\\{)|((?i)\\()|((?i)[a-z_]\\w*)|((?i)\\b0[xX][\\da-f]+)|((?i)\\b\\d\\d*|\\b0\\b)|((?i)\\b0[0-7]+)|((?i)\\b(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\/\\*)|((?i)\\/\\/.+)/',
+            7 => '/((?i)\\$\\w+\\s*:.+\\$)/',
+            8 => '/((?i)\\$\\w+\\s*:.+\\$)/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 2,
+                9 => 0,
+                10 => 0,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+            ),
+            0 => 
+            array (
+                0 => 0,
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 2,
+                9 => 0,
+                10 => 0,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 2,
+                9 => 0,
+                10 => 0,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 2,
+                9 => 0,
+                10 => 0,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => 0,
+                1 => 0,
+            ),
+            6 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 2,
+                8 => 0,
+                9 => 0,
+            ),
+            7 => 
+            array (
+                0 => 0,
+            ),
+            8 => 
+            array (
+                0 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'quotes',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => 'prepro',
+                10 => 'prepro',
+                11 => '',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            0 => 
+            array (
+                0 => '',
+            ),
+            1 => 
+            array (
+                0 => 'quotes',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => 'prepro',
+                10 => 'prepro',
+                11 => '',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            2 => 
+            array (
+                0 => 'quotes',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => 'prepro',
+                10 => 'prepro',
+                11 => '',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            3 => 
+            array (
+                0 => 'quotes',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => 'prepro',
+                10 => 'prepro',
+                11 => '',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => 'quotes',
+                1 => 'quotes',
+            ),
+            6 => 
+            array (
+                0 => 'quotes',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => '',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => 'mlcomment',
+                9 => 'comment',
+            ),
+            7 => 
+            array (
+                0 => '',
+            ),
+            8 => 
+            array (
+                0 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'string',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'identifier',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'number',
+                9 => 'prepro',
+                10 => 'code',
+                11 => 'number',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            0 => 
+            array (
+                0 => 'special',
+            ),
+            1 => 
+            array (
+                0 => 'string',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'identifier',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'number',
+                9 => 'prepro',
+                10 => 'code',
+                11 => 'number',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            2 => 
+            array (
+                0 => 'string',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'identifier',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'number',
+                9 => 'prepro',
+                10 => 'code',
+                11 => 'number',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            3 => 
+            array (
+                0 => 'string',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'identifier',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'number',
+                9 => 'prepro',
+                10 => 'code',
+                11 => 'number',
+                12 => 'mlcomment',
+                13 => 'comment',
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => 'string',
+                1 => 'string',
+            ),
+            6 => 
+            array (
+                0 => 'string',
+                1 => 'code',
+                2 => 'code',
+                3 => 'identifier',
+                4 => 'number',
+                5 => 'number',
+                6 => 'number',
+                7 => 'number',
+                8 => 'mlcomment',
+                9 => 'comment',
+            ),
+            7 => 
+            array (
+                0 => 'inlinedoc',
+            ),
+            8 => 
+            array (
+                0 => 'inlinedoc',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)"/',
+            1 => '/(?i)\\}/',
+            2 => '/(?i)\\)/',
+            3 => '/(?i)\\]/',
+            4 => '/(?i)>/',
+            5 => '/(?mi)(?<!\\\\)$/',
+            6 => '/(?mi)(?<!\\\\)$/',
+            7 => '/(?i)\\*\\//',
+            8 => '/(?mi)$/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 5,
+                10 => 6,
+                11 => -1,
+                12 => 7,
+                13 => 8,
+            ),
+            0 => 
+            array (
+                0 => -1,
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 5,
+                10 => 6,
+                11 => -1,
+                12 => 7,
+                13 => 8,
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 5,
+                10 => 6,
+                11 => -1,
+                12 => 7,
+                13 => 8,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 5,
+                10 => 6,
+                11 => -1,
+                12 => 7,
+                13 => 8,
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => 0,
+                1 => 4,
+            ),
+            6 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => 7,
+                9 => 8,
+            ),
+            7 => 
+            array (
+                0 => -1,
+            ),
+            8 => 
+            array (
+                0 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
+                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
+                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => -1,
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => -1,
+            ),
+            0 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
+                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
+                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => -1,
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => -1,
+            ),
+            2 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
+                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
+                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => -1,
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => -1,
+            ),
+            3 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
+                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
+                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => -1,
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => -1,
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => -1,
+                1 => -1,
+            ),
+            6 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => 
+                array (
+                    'reserved' => '/^(and|and_eq|asm|bitand|bitor|break|case|catch|compl|const_cast|continue|default|delete|do|dynamic_cast|else|for|fortran|friend|goto|if|new|not|not_eq|operator|or|or_eq|private|protected|public|reinterpret_cast|return|sizeof|static_cast|switch|this|throw|try|typeid|using|while|xor|xor_eq|false|true)$/',
+                    'types' => '/^(auto|bool|char|class|const|double|enum|explicit|export|extern|float|inline|int|long|mutable|namespace|register|short|signed|static|struct|template|typedef|typename|union|unsigned|virtual|void|volatile|wchar_t)$/',
+                    'Common Macros' => '/^(NULL|TRUE|FALSE|MAX|MIN|__LINE__|__DATA__|__FILE__|__TIME__|__STDC__)$/',
+                ),
+                4 => 
+                array (
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => -1,
+                9 => -1,
+            ),
+            7 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            8 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+                0 => NULL,
+            ),
+            1 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+            ),
+            2 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+            ),
+            3 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+            ),
+            6 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+            ),
+            7 => 
+            array (
+                0 => NULL,
+            ),
+            8 => 
+            array (
+                0 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+            ),
+            0 => 
+            array (
+                0 => false,
+            ),
+            1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+            ),
+            2 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+            ),
+            4 => 
+            array (
+            ),
+            5 => 
+            array (
+                0 => false,
+                1 => false,
+            ),
+            6 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+            ),
+            7 => 
+            array (
+                0 => false,
+            ),
+            8 => 
+            array (
+                0 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'reserved' => 'reserved',
+            'types' => 'types',
+            'Common Macros' => 'prepro',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/CSS.php b/library/Text_Highlighter/Text/Highlighter/CSS.php
new file mode 100644
index 000000000..51757c88e
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/CSS.php
@@ -0,0 +1,437 @@
+<?php
+/**
+ * Auto-generated class. CSS syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: css.xml
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. CSS syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_CSS extends Text_Highlighter
+{
+    var $_language = 'css';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_CSS($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)\\/\\*)|((?i)(@[a-z\\d]+))|((?i)(((\\.|#)?[a-z]+[a-z\\d\\-]*(?![a-z\\d\\-]))|(\\*))(?!\\s*:\\s*[\\s\\{]))|((?i):[a-z][a-z\\d\\-]*)|((?i)\\[)|((?i)\\{)/',
+            0 => '//',
+            1 => '/((?i)\\d*\\.?\\d+(\\%|em|ex|pc|pt|px|in|mm|cm))|((?i)\\d*\\.?\\d+)|((?i)[a-z][a-z\\d\\-]*)|((?i)#([\\da-f]{6}|[\\da-f]{3})\\b)/',
+            2 => '/((?i)\')|((?i)")|((?i)[\\w\\-\\:]+)/',
+            3 => '/((?i)\\/\\*)|((?i)[a-z][a-z\\d\\-]*\\s*:)|((?i)(((\\.|#)?[a-z]+[a-z\\d\\-]*(?![a-z\\d\\-]))|(\\*))(?!\\s*:\\s*[\\s\\{]))|((?i)\\{)/',
+            4 => '/((?i)\\\\[\\\\(\\\\)\\\\])/',
+            5 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
+            6 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`|\\\\t|\\\\n|\\\\r)/',
+        );
+        $this->_counts = array (
+            -1 =>
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 4,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+                0 => 1,
+                1 => 0,
+                2 => 0,
+                3 => 1,
+            ),
+            2 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+            ),
+            3 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 4,
+                3 => 0,
+            ),
+            4 =>
+            array (
+                0 => 0,
+            ),
+            5 =>
+            array (
+                0 => 0,
+            ),
+            6 =>
+            array (
+                0 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 =>
+            array (
+                0 => 'comment',
+                1 => '',
+                2 => '',
+                3 => '',
+                4 => 'brackets',
+                5 => 'brackets',
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+            ),
+            2 =>
+            array (
+                0 => 'quotes',
+                1 => 'quotes',
+                2 => '',
+            ),
+            3 =>
+            array (
+                0 => 'comment',
+                1 => 'reserved',
+                2 => '',
+                3 => 'brackets',
+            ),
+            4 =>
+            array (
+                0 => '',
+            ),
+            5 =>
+            array (
+                0 => '',
+            ),
+            6 =>
+            array (
+                0 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 =>
+            array (
+                0 => 'comment',
+                1 => 'var',
+                2 => 'identifier',
+                3 => 'special',
+                4 => 'code',
+                5 => 'code',
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+                0 => 'number',
+                1 => 'number',
+                2 => 'code',
+                3 => 'var',
+            ),
+            2 =>
+            array (
+                0 => 'string',
+                1 => 'string',
+                2 => 'var',
+            ),
+            3 =>
+            array (
+                0 => 'comment',
+                1 => 'code',
+                2 => 'identifier',
+                3 => 'code',
+            ),
+            4 =>
+            array (
+                0 => 'string',
+            ),
+            5 =>
+            array (
+                0 => 'special',
+            ),
+            6 =>
+            array (
+                0 => 'special',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)\\*\\//',
+            1 => '/(?i)(?=;|\\})/',
+            2 => '/(?i)\\]/',
+            3 => '/(?i)\\}/',
+            4 => '/(?i)\\)/',
+            5 => '/(?i)\'/',
+            6 => '/(?i)"/',
+        );
+        $this->_states = array (
+            -1 =>
+            array (
+                0 => 0,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 2,
+                5 => 3,
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+            ),
+            2 =>
+            array (
+                0 => 5,
+                1 => 6,
+                2 => -1,
+            ),
+            3 =>
+            array (
+                0 => 0,
+                1 => 1,
+                2 => -1,
+                3 => 3,
+            ),
+            4 =>
+            array (
+                0 => -1,
+            ),
+            5 =>
+            array (
+                0 => -1,
+            ),
+            6 =>
+            array (
+                0 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 =>
+            array (
+                0 => -1,
+                1 =>
+                array (
+                ),
+                2 =>
+                array (
+                ),
+                3 =>
+                array (
+                ),
+                4 => -1,
+                5 => -1,
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+                0 =>
+                array (
+                ),
+                1 =>
+                array (
+                ),
+                2 =>
+                array (
+                    'propertyValue' => '/^((?i)far-left|left|center-left|center-right|center|far-right|right-side|right|behind|leftwards|rightwards|inherit|scroll|fixed|transparent|none|repeat-x|repeat-y|repeat|no-repeat|collapse|separate|auto|top|bottom|both|open-quote|close-quote|no-open-quote|no-close-quote|crosshair|default|pointer|move|e-resize|ne-resize|nw-resize|n-resize|se-resize|sw-resize|s-resize|text|wait|help|ltr|rtl|inline|block|list-item|run-in|compact|marker|table|inline-table|table-row-group|table-header-group|table-footer-group|table-row|table-column-group|table-column|table-cell|table-caption|below|level|above|higher|lower|show|hide|caption|icon|menu|message-box|small-caption|status-bar|normal|wider|narrower|ultra-condensed|extra-condensed|condensed|semi-condensed|semi-expanded|expanded|extra-expanded|ultra-expanded|italic|oblique|small-caps|bold|bolder|lighter|inside|outside|disc|circle|square|decimal|decimal-leading-zero|lower-roman|upper-roman|lower-greek|lower-alpha|lower-latin|upper-alpha|upper-latin|hebrew|armenian|georgian|cjk-ideographic|hiragana|katakana|hiragana-iroha|katakana-iroha|crop|cross|invert|visible|hidden|always|avoid|x-low|low|medium|high|x-high|mix?|repeat?|static|relative|absolute|portrait|landscape|spell-out|once|digits|continuous|code|x-slow|slow|fast|x-fast|faster|slower|justify|underline|overline|line-through|blink|capitalize|uppercase|lowercase|embed|bidi-override|baseline|sub|super|text-top|middle|text-bottom|silent|x-soft|soft|loud|x-loud|pre|nowrap|serif|sans-serif|cursive|fantasy|monospace|empty|string|strict|loose|char|true|false|dotted|dashed|solid|double|groove|ridge|inset|outset|larger|smaller|xx-small|x-small|small|large|x-large|xx-large|all|newspaper|distribute|distribute-all-lines|distribute-center-last|inter-word|inter-ideograph|inter-cluster|kashida|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|keep-all|break-all|break-word|lr-tb|tb-rl|thin|thick|inline-block|w-resize|hand|distribute-letter|distribute-space|whitespace|male|female|child)$/',
+                    'namedcolor' => '/^((?i)aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|purple|red|silver|teal|white|yellow|activeborder|activecaption|appworkspace|background|buttonface|buttonhighlight|buttonshadow|buttontext|captiontext|graytext|highlight|highlighttext|inactiveborder|inactivecaption|inactivecaptiontext|infobackground|infotext|menu|menutext|scrollbar|threeddarkshadow|threedface|threedhighlight|threedlightshadow|threedshadow|window|windowframe|windowtext)$/',
+                ),
+                3 =>
+                array (
+                ),
+            ),
+            2 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 =>
+                array (
+                ),
+            ),
+            3 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 =>
+                array (
+                ),
+                3 => -1,
+            ),
+            4 =>
+            array (
+                0 =>
+                array (
+                ),
+            ),
+            5 =>
+            array (
+                0 =>
+                array (
+                ),
+            ),
+            6 =>
+            array (
+                0 =>
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+                0 =>
+                array (
+                    1 => 'string',
+                ),
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+            2 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+            ),
+            3 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+            4 =>
+            array (
+                0 => NULL,
+            ),
+            5 =>
+            array (
+                0 => NULL,
+            ),
+            6 =>
+            array (
+                0 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+            ),
+            0 =>
+            array (
+            ),
+            1 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+            2 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            3 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+            4 =>
+            array (
+                0 => false,
+            ),
+            5 =>
+            array (
+                0 => false,
+            ),
+            6 =>
+            array (
+                0 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'propertyValue' => 'string',
+            'namedcolor' => 'var',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
+}
diff --git a/library/Text_Highlighter/Text/Highlighter/DIFF.php b/library/Text_Highlighter/Text/Highlighter/DIFF.php
new file mode 100644
index 000000000..2bb25a453
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/DIFF.php
@@ -0,0 +1,384 @@
+<?php
+/**
+ * Auto-generated class. DIFF syntax highlighting 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : diff.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. DIFF syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_DIFF extends Text_Highlighter
+{
+    var $_language = 'diff';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_DIFF($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?m)^\\\\\\sNo\\snewline.+$)|((?m)^\\-\\-\\-$)|((?m)^(diff\\s+\\-|Only\\s+|Index).*$)|((?m)^(\\-\\-\\-|\\+\\+\\+)\\s.+$)|((?m)^\\*.*$)|((?m)^\\+.*$)|((?m)^!.*$)|((?m)^\\<\\s.*$)|((?m)^\\>\\s.*$)|((?m)^\\d+(\\,\\d+)?[acd]\\d+(,\\d+)?$)|((?m)^\\-.*$)|((?m)^\\+.*$)|((?m)^@@.+@@$)|((?m)^d\\d+\\s\\d+$)|((?m)^a\\d+\\s\\d+$)|((?m)^(\\d+)(,\\d+)?(a)$)|((?m)^(\\d+)(,\\d+)?(c)$)|((?m)^(\\d+)(,\\d+)?(d)$)|((?m)^a(\\d+)(\\s\\d+)?$)|((?m)^c(\\d+)(\\s\\d+)?$)|((?m)^d(\\d+)(\\s\\d+)?$)/',
+            0 => '//',
+            1 => '//',
+            2 => '//',
+            3 => '//',
+            4 => '//',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 1,
+                3 => 1,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+                9 => 2,
+                10 => 0,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 3,
+                16 => 3,
+                17 => 3,
+                18 => 2,
+                19 => 2,
+                20 => 2,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => 'code',
+                15 => 'code',
+                16 => 'code',
+                17 => '',
+                18 => 'code',
+                19 => 'code',
+                20 => '',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'special',
+                1 => 'code',
+                2 => 'var',
+                3 => 'reserved',
+                4 => 'quotes',
+                5 => 'string',
+                6 => 'inlinedoc',
+                7 => 'quotes',
+                8 => 'string',
+                9 => 'code',
+                10 => 'quotes',
+                11 => 'string',
+                12 => 'code',
+                13 => 'code',
+                14 => 'var',
+                15 => 'string',
+                16 => 'inlinedoc',
+                17 => 'code',
+                18 => 'string',
+                19 => 'inlinedoc',
+                20 => 'code',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?m)(?=^[ad]\\d+\\s\\d+)/',
+            1 => '/(?m)^(\\.)$/',
+            2 => '/(?m)^(\\.)$/',
+            3 => '/(?m)^(\\.)$/',
+            4 => '/(?m)^(\\.)$/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => 0,
+                15 => 1,
+                16 => 2,
+                17 => -1,
+                18 => 3,
+                19 => 4,
+                20 => -1,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+                4 => 
+                array (
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => -1,
+                15 => -1,
+                16 => -1,
+                17 => 
+                array (
+                ),
+                18 => -1,
+                19 => -1,
+                20 => 
+                array (
+                ),
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+                18 => false,
+                19 => false,
+                20 => false,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+            ),
+            3 => 
+            array (
+            ),
+            4 => 
+            array (
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+        );
+        $this->_defClass = 'default';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/DTD.php b/library/Text_Highlighter/Text/Highlighter/DTD.php
new file mode 100644
index 000000000..41b0faa78
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/DTD.php
@@ -0,0 +1,426 @@
+<?php
+/**
+ * Auto-generated class. DTD syntax highlighting 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : dtd.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. DTD syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_DTD extends Text_Highlighter
+{
+    var $_language = 'dtd';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_DTD($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/(\\<!--)|(\\<\\!\\[)|((\\&|\\%)[\\w\\-\\.]+;)/',
+            0 => '//',
+            1 => '/(\\<!--)|(\\<)|(#PCDATA\\b)|((\\&|\\%)[\\w\\-\\.]+;)|((?i)[a-z][a-z\\d\\-\\,:]+)/',
+            2 => '/(\\<!--)|(\\()|(\')|(")|((?<=\\<)!(ENTITY|ATTLIST|ELEMENT|NOTATION)\\b)|(\\s(#(IMPLIED|REQUIRED|FIXED))|CDATA|ENTITY|NOTATION|NMTOKENS?|PUBLIC|SYSTEM\\b)|(#PCDATA\\b)|((\\&|\\%)[\\w\\-\\.]+;)|((?i)[a-z][a-z\\d\\-\\,:]+)/',
+            3 => '/(\\()|((\\&|\\%)[\\w\\-\\.]+;)|((?i)[a-z][a-z\\d\\-\\,:]+)/',
+            4 => '/((\\&|\\%)[\\w\\-\\.]+;)/',
+            5 => '/((\\&|\\%)[\\w\\-\\.]+;)/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 1,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 1,
+                4 => 0,
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 1,
+                5 => 2,
+                6 => 0,
+                7 => 1,
+                8 => 0,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 0,
+            ),
+            4 => 
+            array (
+                0 => 1,
+            ),
+            5 => 
+            array (
+                0 => 1,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'comment',
+                1 => 'brackets',
+                2 => '',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 'comment',
+                1 => 'brackets',
+                2 => '',
+                3 => '',
+                4 => '',
+            ),
+            2 => 
+            array (
+                0 => 'comment',
+                1 => 'brackets',
+                2 => 'quotes',
+                3 => 'quotes',
+                4 => '',
+                5 => '',
+                6 => '',
+                7 => '',
+                8 => '',
+            ),
+            3 => 
+            array (
+                0 => 'brackets',
+                1 => '',
+                2 => '',
+            ),
+            4 => 
+            array (
+                0 => '',
+            ),
+            5 => 
+            array (
+                0 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'comment',
+                1 => 'code',
+                2 => 'special',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 'comment',
+                1 => 'code',
+                2 => 'reserved',
+                3 => 'special',
+                4 => 'identifier',
+            ),
+            2 => 
+            array (
+                0 => 'comment',
+                1 => 'code',
+                2 => 'string',
+                3 => 'string',
+                4 => 'var',
+                5 => 'reserved',
+                6 => 'reserved',
+                7 => 'special',
+                8 => 'identifier',
+            ),
+            3 => 
+            array (
+                0 => 'code',
+                1 => 'special',
+                2 => 'identifier',
+            ),
+            4 => 
+            array (
+                0 => 'special',
+            ),
+            5 => 
+            array (
+                0 => 'special',
+            ),
+        );
+        $this->_end = array (
+            0 => '/--\\>/',
+            1 => '/\\]\\]\\>/',
+            2 => '/\\>/',
+            3 => '/\\)/',
+            4 => '/\'/',
+            5 => '/"/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => -1,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 2,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 3,
+                2 => 4,
+                3 => 5,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+            ),
+            3 => 
+            array (
+                0 => 3,
+                1 => -1,
+                2 => -1,
+            ),
+            4 => 
+            array (
+                0 => -1,
+            ),
+            5 => 
+            array (
+                0 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => 
+                array (
+                ),
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+                4 => 
+                array (
+                ),
+            ),
+            2 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                ),
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+            ),
+            3 => 
+            array (
+                0 => -1,
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+            ),
+            4 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            5 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+            ),
+            2 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+            ),
+            3 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+            ),
+            4 => 
+            array (
+                0 => NULL,
+            ),
+            5 => 
+            array (
+                0 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+            ),
+            2 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            4 => 
+            array (
+                0 => false,
+            ),
+            5 => 
+            array (
+                0 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/Generator.php b/library/Text_Highlighter/Text/Highlighter/Generator.php
new file mode 100644
index 000000000..39c4edccb
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/Generator.php
@@ -0,0 +1,1291 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+* Syntax highlighter class generator
+*
+* To simplify the process of creating new syntax highlighters
+* for different languages, {@link Text_Highlighter_Generator} class is
+* provided. It takes highlighting rules from XML file and generates
+* a code of a class inherited from {@link Text_Highlighter}.
+*
+* PHP versions 4 and 5
+*
+* LICENSE: This source file is subject to version 3.0 of the PHP license
+* that is available through the world-wide-web at the following URI:
+* http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+* the PHP License and are unable to obtain it through the web, please
+* send a note to license@php.net so we can mail you a copy immediately.
+*
+* @category   Text
+* @package    Text_Highlighter
+* @author     Andrey Demenev <demenev@gmail.com>
+* @copyright  2004-2006 Andrey Demenev
+* @license    http://www.php.net/license/3_0.txt  PHP License
+* @version    CVS: $Id$
+* @link       http://pear.php.net/package/Text_Highlighter
+*/
+
+/**
+* @ignore
+*/
+require_once 'PEAR.php';
+require_once 'XML/Parser.php';
+
+// {{{ error codes
+
+define ('TEXT_HIGHLIGHTER_EMPTY_RE',          1);
+define ('TEXT_HIGHLIGHTER_INVALID_RE',        2);
+define ('TEXT_HIGHLIGHTER_EMPTY_OR_MISSING',  3);
+define ('TEXT_HIGHLIGHTER_EMPTY',             4);
+define ('TEXT_HIGHLIGHTER_REGION_REGION',     5);
+define ('TEXT_HIGHLIGHTER_REGION_BLOCK',      6);
+define ('TEXT_HIGHLIGHTER_BLOCK_REGION',      7);
+define ('TEXT_HIGHLIGHTER_KEYWORD_BLOCK',     8);
+define ('TEXT_HIGHLIGHTER_KEYWORD_INHERITS',  9);
+define ('TEXT_HIGHLIGHTER_PARSE',            10);
+define ('TEXT_HIGHLIGHTER_FILE_WRITE',       11);
+define ('TEXT_HIGHLIGHTER_FILE_READ',        12);
+// }}}
+
+/**
+* Syntax highliter class generator class
+*
+* This class is used to generate PHP classes
+* from XML files with highlighting rules
+*
+* Usage example
+* <code>
+*require_once 'Text/Highlighter/Generator.php';
+*$generator = new Text_Highlighter_Generator('php.xml');
+*$generator->generate();
+*$generator->saveCode('PHP.php');
+* </code>
+*
+* A command line script <b>generate</b> is provided for
+* class generation (installs in scripts/Text/Highlighter).
+*
+* @author     Andrey Demenev <demenev@gmail.com>
+* @copyright  2004-2006 Andrey Demenev
+* @license    http://www.php.net/license/3_0.txt  PHP License
+* @version    Release: @package_version@
+* @link       http://pear.php.net/package/Text_Highlighter
+*/
+
+class Text_Highlighter_Generator extends  XML_Parser
+{
+    // {{{ properties
+    /**
+    * Whether to do case folding.
+    * We have to declare it here, because XML_Parser
+    * sets case folding in constructor
+    *
+    * @var  boolean
+    */
+    var $folding = false;
+
+    /**
+    * Holds name of file with highlighting rules
+    *
+    * @var string
+    * @access private
+    */
+    var $_syntaxFile;
+
+    /**
+    * Current element being processed
+    *
+    * @var array
+    * @access private
+    */
+    var $_element;
+
+    /**
+    * List of regions
+    *
+    * @var array
+    * @access private
+    */
+    var $_regions = array();
+
+    /**
+    * List of blocks
+    *
+    * @var array
+    * @access private
+    */
+    var $_blocks = array();
+
+    /**
+    * List of keyword groups
+    *
+    * @var array
+    * @access private
+    */
+    var $_keywords = array();
+
+    /**
+    * List of authors
+    *
+    * @var array
+    * @access private
+    */
+    var $_authors = array();
+
+    /**
+    * Name of language
+    *
+    * @var string
+    * @access public
+    */
+    var $language = '';
+
+    /**
+    * Generated code
+    *
+    * @var string
+    * @access private
+    */
+    var $_code = '';
+
+    /**
+    * Default class
+    *
+    * @var string
+    * @access private
+    */
+    var $_defClass = 'default';
+
+    /**
+    * Comment
+    *
+    * @var string
+    * @access private
+    */
+    var $_comment = '';
+
+    /**
+    * Flag for comment processing
+    *
+    * @var boolean
+    * @access private
+    */
+    var $_inComment = false;
+
+    /**
+    * Sorting order of current block/region
+    *
+    * @var integer
+    * @access private
+    */
+    var $_blockOrder = 0;
+
+    /**
+    * Generation errors
+    *
+    * @var array
+    * @access private
+    */
+    var $_errors;
+
+    // }}}
+    // {{{ constructor
+
+    /**
+    * PHP4 compatable constructor
+    *
+    * @param string $syntaxFile Name of XML file
+    * with syntax highlighting rules
+    *
+    * @access public
+    */
+
+    function Text_Highlighter_Generator($syntaxFile = '')
+    {
+        return $this->__construct($syntaxFile);
+    }
+
+    /**
+    * Constructor
+    *
+    * @param string $syntaxFile Name of XML file
+    * with syntax highlighting rules
+    *
+    * @access public
+    */
+
+    function __construct($syntaxFile = '')
+    {
+        XML_Parser::XML_Parser(null, 'func');
+        $this->_errors = array();
+        $this->_declareErrorMessages();
+        if ($syntaxFile) {
+            $this->setInputFile($syntaxFile);
+        }
+    }
+
+    // }}}
+    // {{{ _formatError
+
+    /**
+    * Format error message
+    *
+    * @param int $code error code
+    * @param string $params parameters
+    * @param string $fileName file name
+    * @param int $lineNo line number
+    * @return  array
+    * @access  public
+    */
+    function _formatError($code, $params, $fileName, $lineNo)
+    {
+        $template = $this->_templates[$code];
+        $ret = call_user_func_array('sprintf', array_merge(array($template), $params));
+        if ($fileName) {
+            $ret = '[' . $fileName . '] ' . $ret;
+        }
+        if ($lineNo) {
+            $ret .= ' (line ' . $lineNo . ')';
+        }
+        return $ret;
+    }
+
+    // }}}
+    // {{{ declareErrorMessages
+
+    /**
+    * Set up error message templates
+    *
+    * @access  private
+    */
+    function _declareErrorMessages()
+    {
+        $this->_templates = array (
+        TEXT_HIGHLIGHTER_EMPTY_RE => 'Empty regular expression',
+        TEXT_HIGHLIGHTER_INVALID_RE => 'Invalid regular expression : %s',
+        TEXT_HIGHLIGHTER_EMPTY_OR_MISSING => 'Empty or missing %s',
+        TEXT_HIGHLIGHTER_EMPTY  => 'Empty %s',
+        TEXT_HIGHLIGHTER_REGION_REGION => 'Region %s refers undefined region %s',
+        TEXT_HIGHLIGHTER_REGION_BLOCK => 'Region %s refers undefined block %s',
+        TEXT_HIGHLIGHTER_BLOCK_REGION => 'Block %s refers undefined region %s',
+        TEXT_HIGHLIGHTER_KEYWORD_BLOCK => 'Keyword group %s refers undefined block %s',
+        TEXT_HIGHLIGHTER_KEYWORD_INHERITS => 'Keyword group %s inherits undefined block %s',
+        TEXT_HIGHLIGHTER_PARSE => '%s',
+        TEXT_HIGHLIGHTER_FILE_WRITE => 'Error writing file %s',
+        TEXT_HIGHLIGHTER_FILE_READ => '%s'
+        );
+    }
+
+    // }}}
+    // {{{ setInputFile
+
+    /**
+    * Sets the input xml file to be parsed
+    *
+    * @param    string      Filename (full path)
+    * @return   boolean
+    * @access   public
+    */
+    function setInputFile($file)
+    {
+        $this->_syntaxFile = $file;
+        $ret = parent::setInputFile($file);
+        if (PEAR::isError($ret)) {
+            $this->_error(TEXT_HIGHLIGHTER_FILE_READ, $ret->message);
+            return false;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ generate
+
+    /**
+    * Generates class code
+    *
+    * @access public
+    */
+
+    function generate()
+    {
+        $this->_regions    = array();
+        $this->_blocks     = array();
+        $this->_keywords   = array();
+        $this->language    = '';
+        $this->_code       = '';
+        $this->_defClass   = 'default';
+        $this->_comment    = '';
+        $this->_inComment  = false;
+        $this->_authors    = array();
+        $this->_blockOrder = 0;
+        $this->_errors   = array();
+
+        $ret = $this->parse();
+        if (PEAR::isError($ret)) {
+            $this->_error(TEXT_HIGHLIGHTER_PARSE, $ret->message);
+            return false;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ getCode
+
+    /**
+    * Returns generated code as a string.
+    *
+    * @return string Generated code
+    * @access public
+    */
+
+    function getCode()
+    {
+        return $this->_code;
+    }
+
+    // }}}
+    // {{{ saveCode
+
+    /**
+    * Saves generated class to file. Note that {@link Text_Highlighter::factory()}
+    * assumes that filename is uppercase (SQL.php, DTD.php, etc), and file
+    * is located in Text/Highlighter
+    *
+    * @param string $filename Name of file to write the code to
+    * @return boolean true on success, false on failure
+    * @access public
+    */
+
+    function saveCode($filename)
+    {
+        $f = @fopen($filename, 'wb');
+        if (!$f) {
+            $this->_error(TEXT_HIGHLIGHTER_FILE_WRITE, array('outfile'=>$filename));
+            return false;
+        }
+        fwrite ($f, $this->_code);
+        fclose($f);
+        return true;
+    }
+
+    // }}}
+    // {{{ hasErrors
+
+    /**
+    * Reports if there were errors
+    *
+    * @return boolean
+    * @access public
+    */
+
+    function hasErrors()
+    {
+        return count($this->_errors) > 0;
+    }
+
+    // }}}
+    // {{{ getErrors
+
+    /**
+    * Returns errors
+    *
+    * @return array
+    * @access public
+    */
+
+    function getErrors()
+    {
+        return $this->_errors;
+    }
+
+    // }}}
+    // {{{ _sortBlocks
+
+    /**
+    * Sorts blocks
+    *
+    * @access private
+    */
+
+    function _sortBlocks($b1, $b2) {
+        return $b1['order'] - $b2['order'];
+    }
+
+    // }}}
+    // {{{ _sortLookFor
+    /**
+    * Sort 'look for' list
+    * @return int
+    * @param string $b1
+    * @param string $b2
+    */
+    function _sortLookFor($b1, $b2) {
+        $o1 = isset($this->_blocks[$b1]) ? $this->_blocks[$b1]['order'] : $this->_regions[$b1]['order'];
+        $o2 = isset($this->_blocks[$b2]) ? $this->_blocks[$b2]['order'] : $this->_regions[$b2]['order'];
+        return $o1 - $o2;
+    }
+
+    // }}}
+    // {{{ _makeRE
+
+    /**
+    * Adds delimiters and modifiers to regular expression if necessary
+    *
+    * @param string $text Original RE
+    * @return string Final RE
+    * @access private
+    */
+    function _makeRE($text, $case = false)
+    {
+        if (!strlen($text)) {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_RE);
+        }
+        if (!strlen($text) || $text{0} != '/') {
+            $text = '/' . $text . '/';
+        }
+        if (!$case) {
+            $text .= 'i';
+        }
+        $php_errormsg = '';
+        @preg_match($text, '');
+        if ($php_errormsg) {
+            $this->_error(TEXT_HIGHLIGHTER_INVALID_RE, $php_errormsg);
+        }
+        preg_match ('#^/(.+)/(.*)$#', $text, $m);
+        if (@$m[2]) {
+            $text = '(?' . $m[2] . ')' . $m[1];
+        } else {
+            $text = $m[1];
+        }
+        return $text;
+    }
+
+    // }}}
+    // {{{ _exportArray
+
+    /**
+    * Exports array as PHP code
+    *
+    * @param array $array
+    * @return string Code
+    * @access private
+    */
+    function _exportArray($array)
+    {
+        $array = var_export($array, true);
+        return trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+    }
+
+    // }}}
+    // {{{ _countSubpatterns
+    /**
+    * Find number of capturing suppaterns in regular expression
+    * @return int
+    * @param string $re Regular expression (without delimiters)
+    */
+    function _countSubpatterns($re)
+    {
+        preg_match_all('/' . $re . '/', '', $m);
+        return count($m)-1;
+    }
+
+    // }}}
+
+    /**#@+
+    * @access private
+    * @param resource $xp      XML parser resource
+    * @param string   $elem    XML element name
+    * @param array    $attribs XML element attributes
+    */
+
+    // {{{ xmltag_Default
+
+    /**
+    * start handler for <default> element
+    */
+    function xmltag_Default($xp, $elem, $attribs)
+    {
+        $this->_aliasAttributes($attribs);
+        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+        }
+        $this->_defClass = @$attribs['innerGroup'];
+    }
+
+    // }}}
+    // {{{ xmltag_Region
+
+    /**
+    * start handler for <region> element
+    */
+    function xmltag_Region($xp, $elem, $attribs)
+    {
+        $this->_aliasAttributes($attribs);
+        if (!isset($attribs['name']) || $attribs['name'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region name');
+        }
+        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+        }
+        $this->_element = array('name' => $attribs['name']);
+        $this->_element['line'] = xml_get_current_line_number($this->parser);
+        if (isset($attribs['case'])) {
+            $this->_element['case'] = $attribs['case'] == 'yes';
+        } else {
+            $this->_element['case'] = $this->_case;
+        }
+        $this->_element['innerGroup'] = $attribs['innerGroup'];
+        $this->_element['delimGroup'] = isset($attribs['delimGroup']) ?
+        $attribs['delimGroup'] :
+        $attribs['innerGroup'];
+        $this->_element['start'] = $this->_makeRE(@$attribs['start'], $this->_element['case']);
+        $this->_element['end'] = $this->_makeRE(@$attribs['end'], $this->_element['case']);
+        $this->_element['contained'] = @$attribs['contained'] == 'yes';
+        $this->_element['never-contained'] = @$attribs['never-contained'] == 'yes';
+        $this->_element['remember'] = @$attribs['remember'] == 'yes';
+        if (isset($attribs['startBOL']) && $attribs['startBOL'] == 'yes') {
+            $this->_element['startBOL'] = true;
+        }
+        if (isset($attribs['endBOL']) && $attribs['endBOL'] == 'yes') {
+            $this->_element['endBOL'] = true;
+        }
+        if (isset($attribs['neverAfter'])) {
+            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
+        }
+    }
+
+    // }}}
+    // {{{ xmltag_Block
+
+    /**
+    * start handler for <block> element
+    */
+    function xmltag_Block($xp, $elem, $attribs)
+    {
+        $this->_aliasAttributes($attribs);
+        if (!isset($attribs['name']) || $attribs['name'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'block name');
+        }
+        if (isset($attribs['innerGroup']) && $attribs['innerGroup'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY, 'innerGroup');
+        }
+        $this->_element = array('name' => $attribs['name']);
+        $this->_element['line'] = xml_get_current_line_number($this->parser);
+        if (isset($attribs['case'])) {
+            $this->_element['case'] = $attribs['case'] == 'yes';
+        } else {
+            $this->_element['case'] = $this->_case;
+        }
+        if (isset($attribs['innerGroup'])) {
+            $this->_element['innerGroup'] = @$attribs['innerGroup'];
+        }
+        $this->_element['match'] = $this->_makeRE($attribs['match'], $this->_element['case']);
+        $this->_element['contained'] = @$attribs['contained'] == 'yes';
+        $this->_element['multiline'] = @$attribs['multiline'] == 'yes';
+        if (isset($attribs['BOL']) && $attribs['BOL'] == 'yes') {
+            $this->_element['BOL'] = true;
+        }
+        if (isset($attribs['neverAfter'])) {
+            $this->_element['neverafter'] = $this->_makeRE($attribs['neverAfter']);
+        }
+    }
+
+    // }}}
+    // {{{ cdataHandler
+
+    /**
+    * Character data handler. Used for comment
+    */
+    function cdataHandler($xp, $cdata)
+    {
+        if ($this->_inComment) {
+            $this->_comment .= $cdata;
+        }
+    }
+
+    // }}}
+    // {{{ xmltag_Comment
+
+    /**
+    * start handler for <comment> element
+    */
+    function xmltag_Comment($xp, $elem, $attribs)
+    {
+        $this->_comment = '';
+        $this->_inComment = true;
+    }
+
+    // }}}
+    // {{{ xmltag_PartGroup
+
+    /**
+    * start handler for <partgroup> element
+    */
+    function xmltag_PartGroup($xp, $elem, $attribs)
+    {
+        $this->_aliasAttributes($attribs);
+        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+        }
+        $this->_element['partClass'][$attribs['index']] = @$attribs['innerGroup'];
+    }
+
+    // }}}
+    // {{{ xmltag_PartClass
+
+    /**
+    * start handler for <partclass> element
+    */
+    function xmltag_PartClass($xp, $elem, $attribs)
+    {
+        $this->xmltag_PartGroup($xp, $elem, $attribs);
+    }
+
+    // }}}
+    // {{{ xmltag_Keywords
+
+    /**
+    * start handler for <keywords> element
+    */
+    function xmltag_Keywords($xp, $elem, $attribs)
+    {
+        $this->_aliasAttributes($attribs);
+        if (!isset($attribs['name']) || $attribs['name'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'keyword group name');
+        }
+        if (!isset($attribs['innerGroup']) || $attribs['innerGroup'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'innerGroup');
+        }
+        if (!isset($attribs['inherits']) || $attribs['inherits'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'inherits');
+        }
+        $this->_element = array('name'=>@$attribs['name']);
+        $this->_element['line'] = xml_get_current_line_number($this->parser);
+        $this->_element['innerGroup'] = @$attribs['innerGroup'];
+        if (isset($attribs['case'])) {
+            $this->_element['case'] = $attribs['case'] == 'yes';
+        } else {
+            $this->_element['case'] = $this->_case;
+        }
+        $this->_element['inherits'] = @$attribs['inherits'];
+        if (isset($attribs['otherwise'])) {
+            $this->_element['otherwise'] = $attribs['otherwise'];
+        }
+        if (isset($attribs['ifdef'])) {
+            $this->_element['ifdef'] = $attribs['ifdef'];
+        }
+        if (isset($attribs['ifndef'])) {
+            $this->_element['ifndef'] = $attribs['ifndef'];
+        }
+    }
+
+    // }}}
+    // {{{ xmltag_Keyword
+
+    /**
+    * start handler for <keyword> element
+    */
+    function xmltag_Keyword($xp, $elem, $attribs)
+    {
+        if (!isset($attribs['match']) || $attribs['match'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'match');
+        }
+        $keyword = @$attribs['match'];
+        if (!$this->_element['case']) {
+            $keyword = strtolower($keyword);
+        }
+        $this->_element['match'][$keyword] = true;
+    }
+
+    // }}}
+    // {{{ xmltag_Contains
+
+    /**
+    * start handler for <contains> element
+    */
+    function xmltag_Contains($xp, $elem, $attribs)
+    {
+        $this->_element['contains-all'] = @$attribs['all'] == 'yes';
+        if (isset($attribs['region'])) {
+            $this->_element['contains']['region'][$attribs['region']] =
+            xml_get_current_line_number($this->parser);
+        }
+        if (isset($attribs['block'])) {
+            $this->_element['contains']['block'][$attribs['block']] =
+            xml_get_current_line_number($this->parser);
+        }
+    }
+
+    // }}}
+    // {{{ xmltag_But
+
+    /**
+    * start handler for <but> element
+    */
+    function xmltag_But($xp, $elem, $attribs)
+    {
+        if (isset($attribs['region'])) {
+            $this->_element['not-contains']['region'][$attribs['region']] = true;
+        }
+        if (isset($attribs['block'])) {
+            $this->_element['not-contains']['block'][$attribs['block']] = true;
+        }
+    }
+
+    // }}}
+    // {{{ xmltag_Onlyin
+
+    /**
+    * start handler for <onlyin> element
+    */
+    function xmltag_Onlyin($xp, $elem, $attribs)
+    {
+        if (!isset($attribs['region']) || $attribs['region'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'region');
+        }
+        $this->_element['onlyin'][$attribs['region']] = xml_get_current_line_number($this->parser);
+    }
+
+    // }}}
+    // {{{ xmltag_Author
+
+    /**
+    * start handler for <author> element
+    */
+    function xmltag_Author($xp, $elem, $attribs)
+    {
+        if (!isset($attribs['name']) || $attribs['name'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'author name');
+        }
+        $this->_authors[] = array(
+        'name'  => @$attribs['name'],
+        'email' => (string)@$attribs['email']
+        );
+    }
+
+    // }}}
+    // {{{ xmltag_Highlight
+
+    /**
+    * start handler for <highlight> element
+    */
+    function xmltag_Highlight($xp, $elem, $attribs)
+    {
+        if (!isset($attribs['lang']) || $attribs['lang'] === '') {
+            $this->_error(TEXT_HIGHLIGHTER_EMPTY_OR_MISSING, 'language name');
+        }
+        $this->_code = '';
+        $this->language = strtoupper(@$attribs['lang']);
+        $this->_case = @$attribs['case'] == 'yes';
+    }
+
+    // }}}
+
+    /**#@-*/
+
+    // {{{ _error
+
+    /**
+    * Add an error message
+    *
+    * @param integer $code Error code
+    * @param mixed   $message Error message or array with error message parameters
+    * @param integer $lineNo Source code line number
+    * @access private
+    */
+    function _error($code, $params = array(), $lineNo = 0)
+    {
+        if (!$lineNo && !empty($this->parser)) {
+            $lineNo = xml_get_current_line_number($this->parser);
+        }
+        $this->_errors[] = $this->_formatError($code, $params, $this->_syntaxFile, $lineNo);
+    }
+
+    // }}}
+    // {{{ _aliasAttributes
+
+    /**
+    * BC trick
+    *
+    * @param array $attrs attributes
+    */
+    function _aliasAttributes(&$attrs)
+    {
+        if (isset($attrs['innerClass']) && !isset($attrs['innerGroup'])) {
+            $attrs['innerGroup'] = $attrs['innerClass'];
+        }
+        if (isset($attrs['delimClass']) && !isset($attrs['delimGroup'])) {
+            $attrs['delimGroup'] = $attrs['delimClass'];
+        }
+        if (isset($attrs['partClass']) && !isset($attrs['partGroup'])) {
+            $attrs['partGroup'] = $attrs['partClass'];
+        }
+    }
+
+    // }}}
+
+    /**#@+
+    * @access private
+    * @param resource $xp      XML parser resource
+    * @param string   $elem    XML element name
+    */
+
+    // {{{ xmltag_Comment_
+
+    /**
+    * end handler for <comment> element
+    */
+    function xmltag_Comment_($xp, $elem)
+    {
+        $this->_inComment = false;
+    }
+
+    // }}}
+    // {{{ xmltag_Region_
+
+    /**
+    * end handler for <region> element
+    */
+    function xmltag_Region_($xp, $elem)
+    {
+        $this->_element['type'] = 'region';
+        $this->_element['order'] = $this->_blockOrder ++;
+        $this->_regions[$this->_element['name']] = $this->_element;
+    }
+
+    // }}}
+    // {{{ xmltag_Keywords_
+
+    /**
+    * end handler for <keywords> element
+    */
+    function xmltag_Keywords_($xp, $elem)
+    {
+        $this->_keywords[$this->_element['name']] = $this->_element;
+    }
+
+    // }}}
+    // {{{ xmltag_Block_
+
+    /**
+    * end handler for <block> element
+    */
+    function xmltag_Block_($xp, $elem)
+    {
+        $this->_element['type'] = 'block';
+        $this->_element['order'] = $this->_blockOrder ++;
+        $this->_blocks[$this->_element['name']] = $this->_element;
+    }
+
+    // }}}
+    // {{{ xmltag_Highlight_
+
+    /**
+    * end handler for <highlight> element
+    */
+    function xmltag_Highlight_($xp, $elem)
+    {
+        $conditions = array();
+        $toplevel = array();
+        foreach ($this->_blocks as $i => $current) {
+            if (!$current['contained'] && !isset($current['onlyin'])) {
+                $toplevel[] = $i;
+            }
+            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+                if (!isset($this->_regions[$region])) {
+                    $this->_error(TEXT_HIGHLIGHTER_BLOCK_REGION,
+                    array(
+                    'block' => $current['name'],
+                    'region' => $region
+                    ));
+                }
+            }
+        }
+        foreach ($this->_regions as $i=>$current) {
+            if (!$current['contained'] && !isset($current['onlyin'])) {
+                $toplevel[] = $i;
+            }
+            foreach ((array)@$current['contains']['region'] as $region => $lineNo) {
+                if (!isset($this->_regions[$region])) {
+                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
+                    array(
+                    'region1' => $current['name'],
+                    'region2' => $region
+                    ));
+                }
+            }
+            foreach ((array)@$current['contains']['block'] as $region => $lineNo) {
+                if (!isset($this->_blocks[$region])) {
+                    $this->_error(TEXT_HIGHLIGHTER_REGION_BLOCK,
+                    array(
+                    'block' => $current['name'],
+                    'region' => $region
+                    ));
+                }
+            }
+            foreach ((array)@$current['onlyin'] as $region => $lineNo) {
+                if (!isset($this->_regions[$region])) {
+                    $this->_error(TEXT_HIGHLIGHTER_REGION_REGION,
+                    array(
+                    'region1' => $current['name'],
+                    'region2' => $region
+                    ));
+                }
+            }
+            foreach ($this->_regions as $j => $region) {
+                if (isset($region['onlyin'])) {
+                    $suits = isset($region['onlyin'][$current['name']]);
+                } elseif (isset($current['not-contains']['region'][$region['name']])) {
+                    $suits = false;
+                } elseif (isset($current['contains']['region'][$region['name']])) {
+                    $suits = true;
+                } else {
+                    $suits = @$current['contains-all'] && @!$region['never-contained'];
+                }
+                if ($suits) {
+                    $this->_regions[$i]['lookfor'][] = $j;
+                }
+            }
+            foreach ($this->_blocks as $j=>$region) {
+                if (isset($region['onlyin'])) {
+                    $suits = isset($region['onlyin'][$current['name']]);
+                } elseif (isset($current['not-contains']['block'][$region['name']])) {
+                    $suits = false;
+                } elseif (isset($current['contains']['block'][$region['name']])) {
+                    $suits = true;
+                } else {
+                    $suits = @$current['contains-all'] && @!$region['never-contained'];
+                }
+                if ($suits) {
+                    $this->_regions[$i]['lookfor'][] = $j;
+                }
+            }
+        }
+        foreach ($this->_blocks as $i=>$current) {
+            unset ($this->_blocks[$i]['never-contained']);
+            unset ($this->_blocks[$i]['contained']);
+            unset ($this->_blocks[$i]['contains-all']);
+            unset ($this->_blocks[$i]['contains']);
+            unset ($this->_blocks[$i]['onlyin']);
+            unset ($this->_blocks[$i]['line']);
+        }
+
+        foreach ($this->_regions as $i=>$current) {
+            unset ($this->_regions[$i]['never-contained']);
+            unset ($this->_regions[$i]['contained']);
+            unset ($this->_regions[$i]['contains-all']);
+            unset ($this->_regions[$i]['contains']);
+            unset ($this->_regions[$i]['onlyin']);
+            unset ($this->_regions[$i]['line']);
+        }
+
+        foreach ($this->_keywords as $name => $keyword) {
+            if (isset($keyword['ifdef'])) {
+                $conditions[$keyword['ifdef']][] = array($name, true);
+            }
+            if (isset($keyword['ifndef'])) {
+                $conditions[$keyword['ifndef']][] = array($name, false);
+            }
+            unset($this->_keywords[$name]['line']);
+            if (!isset($this->_blocks[$keyword['inherits']])) {
+                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_INHERITS,
+                array(
+                'keyword' => $keyword['name'],
+                'block' => $keyword['inherits']
+                ));
+            }
+            if (isset($keyword['otherwise']) && !isset($this->_blocks[$keyword['otherwise']]) ) {
+                $this->_error(TEXT_HIGHLIGHTER_KEYWORD_BLOCK,
+                array(
+                'keyword' => $keyword['name'],
+                'block' => $keyword['inherits']
+                ));
+            }
+        }
+
+        $syntax=array(
+        'keywords'   => $this->_keywords,
+        'blocks'     => array_merge($this->_blocks, $this->_regions),
+        'toplevel'   => $toplevel,
+        );
+        uasort($syntax['blocks'], array(&$this, '_sortBlocks'));
+        foreach ($syntax['blocks'] as $name => $block) {
+            if ($block['type'] == 'block') {
+                continue;
+            }
+            if (is_array(@$syntax['blocks'][$name]['lookfor'])) {
+                usort($syntax['blocks'][$name]['lookfor'], array(&$this, '_sortLookFor'));
+            }
+        }
+        usort($syntax['toplevel'], array(&$this, '_sortLookFor'));
+        $syntax['case'] = $this->_case;
+        $this->_code = <<<CODE
+<?php
+/**
+ * Auto-generated class. {$this->language} syntax highlighting
+CODE;
+
+        if ($this->_comment) {
+            $comment = preg_replace('~^~m',' * ',$this->_comment);
+            $this->_code .= "\n * \n" . $comment;
+        }
+
+        $this->_code .= <<<CODE
+ 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: $this->_syntaxFile
+
+CODE;
+
+        foreach ($this->_authors as $author) {
+            $this->_code .= ' * @author ' . $author['name'];
+            if ($author['email']) {
+                $this->_code .= ' <' . $author['email'] . '>';
+            }
+            $this->_code .= "\n";
+        }
+
+        $this->_code .= <<<CODE
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. {$this->language} syntax highlighting
+ *
+
+CODE;
+        foreach ($this->_authors as $author) {
+            $this->_code .= ' * @author ' . $author['name'];
+            if ($author['email']) {
+                $this->_code .= ' <' . $author['email']. '>';
+            }
+            $this->_code .= "\n";
+        }
+
+
+        $this->_code .= <<<CODE
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_{$this->language} extends Text_Highlighter
+{
+    
+CODE;
+        $this->_code .= 'var $_language = \'' . strtolower($this->language) . "';\n\n";
+        $array = var_export($syntax, true);
+        $array = trim(preg_replace('~^(\s*)~m','        \1\1',$array));
+        //        \$this->_syntax = $array;
+        $this->_code .= <<<CODE
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  \$options
+     * @access public
+     */
+    function Text_Highlighter_{$this->language}(\$options=array())
+    {
+        \$this->__construct(\$options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  \$options
+     * @access public
+     */
+    function __construct(\$options=array())
+    {
+
+CODE;
+        $this->_code .= <<<CODE
+
+        \$this->_options = \$options;
+CODE;
+        $states = array();
+        $i = 0;
+        foreach ($syntax['blocks'] as $name => $block) {
+            if ($block['type'] == 'region') {
+                $states[$name] = $i++;
+            }
+        }
+        $regs = array();
+        $counts = array();
+        $delim = array();
+        $inner = array();
+        $end = array();
+        $stat = array();
+        $keywords = array();
+        $parts = array();
+        $kwmap = array();
+        $subst = array();
+        $re = array();
+        $ce = array();
+        $rd = array();
+        $in = array();
+        $st = array();
+        $kw = array();
+        $sb = array();
+        foreach ($syntax['toplevel'] as $name) {
+            $block = $syntax['blocks'][$name];
+            if ($block['type'] == 'block') {
+                $kwm = array();
+                $re[] = '(' . $block['match'] . ')';
+                $ce[] = $this->_countSubpatterns($block['match']);
+                $rd[] = '';
+                $sb[] = false;;
+                $st[] = -1;
+                foreach ($syntax['keywords'] as $kwname => $kwgroup) {
+                    if ($kwgroup['inherits'] != $name) {
+                        continue;
+                    }
+                    $gre = implode('|', array_keys($kwgroup['match']));
+                    if (!$kwgroup['case']) {
+                        $gre = '(?i)' . $gre;
+                    }
+                    $kwm[$kwname][] =  $gre;
+                    $kwmap[$kwname] = $kwgroup['innerGroup'];
+                }
+                foreach ($kwm as $g => $ma) {
+                    $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
+                }
+                $kw[] = $kwm;
+            } else {
+                $kw[] = -1;
+                $re[] = '(' . $block['start'] . ')';
+                $ce[] = $this->_countSubpatterns($block['start']);
+                $rd[] = $block['delimGroup'];
+                $st[] = $states[$name];
+                $sb[] = $block['remember'];
+            }
+            $in[] = $block['innerGroup'];
+        }
+        $re = implode('|', $re);
+        $regs[-1] = '/' . $re . '/';
+        $counts[-1] = $ce;
+        $delim[-1] = $rd;
+        $inner[-1] = $in;
+        $stat[-1] = $st;
+        $keywords[-1] = $kw;
+        $subst[-1] = $sb;
+
+        foreach ($syntax['blocks'] as $ablock) {
+            if ($ablock['type'] != 'region') {
+                continue;
+            }
+            $end[] = '/' . $ablock['end'] . '/';
+            $re = array();
+            $ce = array();
+            $rd = array();
+            $in = array();
+            $st = array();
+            $kw = array();
+            $pc = array();
+            $sb = array();
+            foreach ((array)@$ablock['lookfor'] as $name) {
+                $block = $syntax['blocks'][$name];
+                if (isset($block['partClass'])) {
+                    $pc[] = $block['partClass'];
+                } else {
+                    $pc[] = null;
+                }
+                if ($block['type'] == 'block') {
+                    $kwm = array();;
+                    $re[] = '(' . $block['match'] . ')';
+                    $ce[] = $this->_countSubpatterns($block['match']);
+                    $rd[] = '';
+                    $sb[] = false;
+                    $st[] = -1;
+                    foreach ($syntax['keywords'] as $kwname => $kwgroup) {
+                        if ($kwgroup['inherits'] != $name) {
+                            continue;
+                        }
+                        $gre = implode('|', array_keys($kwgroup['match']));
+                        if (!$kwgroup['case']) {
+                            $gre = '(?i)' . $gre;
+                        }
+                        $kwm[$kwname][] =  $gre;
+                        $kwmap[$kwname] = $kwgroup['innerGroup'];
+                    }
+                    foreach ($kwm as $g => $ma) {
+                        $kwm[$g] = '/^(' . implode(')|(', $ma) . ')$/';
+                    }
+                    $kw[] = $kwm;
+                } else {
+                    $sb[] = $block['remember'];
+                    $kw[] = -1;
+                    $re[] = '(' . $block['start'] . ')';
+                    $ce[] = $this->_countSubpatterns($block['start']);
+                    $rd[] = $block['delimGroup'];
+                    $st[] = $states[$name];
+                }
+                $in[] = $block['innerGroup'];
+            }
+            $re = implode('|', $re);
+            $regs[] = '/' . $re . '/';
+            $counts[] = $ce;
+            $delim[] = $rd;
+            $inner[] = $in;
+            $stat[] = $st;
+            $keywords[] = $kw;
+            $parts[] = $pc;
+            $subst[] = $sb;
+        }
+
+
+        $this->_code .= "\n        \$this->_regs = " . $this->_exportArray($regs);
+        $this->_code .= ";\n        \$this->_counts = " .$this->_exportArray($counts);
+        $this->_code .= ";\n        \$this->_delim = " .$this->_exportArray($delim);
+        $this->_code .= ";\n        \$this->_inner = " .$this->_exportArray($inner);
+        $this->_code .= ";\n        \$this->_end = " .$this->_exportArray($end);
+        $this->_code .= ";\n        \$this->_states = " .$this->_exportArray($stat);
+        $this->_code .= ";\n        \$this->_keywords = " .$this->_exportArray($keywords);
+        $this->_code .= ";\n        \$this->_parts = " .$this->_exportArray($parts);
+        $this->_code .= ";\n        \$this->_subst = " .$this->_exportArray($subst);
+        $this->_code .= ";\n        \$this->_conditions = " .$this->_exportArray($conditions);
+        $this->_code .= ";\n        \$this->_kwmap = " .$this->_exportArray($kwmap);
+        $this->_code .= ";\n        \$this->_defClass = '" .$this->_defClass . '\'';
+        $this->_code .= <<<CODE
+;
+        \$this->_checkDefines();
+    }
+    
+}
+CODE;
+}
+
+// }}}
+}
+
+
+/*
+* Local variables:
+* tab-width: 4
+* c-basic-offset: 4
+* c-hanging-comment-ender-p: nil
+* End:
+*/
+
+?>
diff --git a/library/Text_Highlighter/Text/Highlighter/HTML.php b/library/Text_Highlighter/Text/Highlighter/HTML.php
new file mode 100644
index 000000000..14d0a783f
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/HTML.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * Auto-generated class. HTML syntax highlighting 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : html.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. HTML syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_HTML extends Text_Highlighter
+{
+    var $_language = 'html';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_HTML($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)\\<!--)|((?i)\\<[\\?\\/]?)|((?i)(&)[\\w\\-\\.]+;)/',
+            0 => '//',
+            1 => '/((?i)(?<=[\\<\\/?])[\\w\\-\\:]+)|((?i)[\\w\\-\\:]+)|((?i)")/',
+            2 => '/((?i)(&)[\\w\\-\\.]+;)/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 1,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+            ),
+            2 => 
+            array (
+                0 => 1,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'comment',
+                1 => 'brackets',
+                2 => '',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => 'quotes',
+            ),
+            2 => 
+            array (
+                0 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'comment',
+                1 => 'code',
+                2 => 'special',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 'reserved',
+                1 => 'var',
+                2 => 'string',
+            ),
+            2 => 
+            array (
+                0 => 'special',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)--\\>/',
+            1 => '/(?i)[\\/\\?]?\\>/',
+            2 => '/(?i)"/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => -1,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => 2,
+            ),
+            2 => 
+            array (
+                0 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => 
+                array (
+                ),
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => -1,
+            ),
+            2 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+            ),
+            2 => 
+            array (
+                0 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            2 => 
+            array (
+                0 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/JAVA.php b/library/Text_Highlighter/Text/Highlighter/JAVA.php
new file mode 100644
index 000000000..46c0b8851
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/JAVA.php
@@ -0,0 +1,802 @@
+<?php
+/**
+ * Auto-generated class. JAVA syntax highlighting 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : java.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. JAVA syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_JAVA extends Text_Highlighter
+{
+    var $_language = 'java';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_JAVA($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            0 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            2 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0[xX][\\da-f]+)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            3 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
+            4 => '/((?i)\\\\[\\\\"\'`tnr\\$\\{])/',
+            5 => '/((?i)\\\\.)/',
+            6 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+                9 => 0,
+                10 => 0,
+                11 => 2,
+                12 => 5,
+            ),
+            0 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+                9 => 0,
+                10 => 0,
+                11 => 2,
+                12 => 5,
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+                9 => 0,
+                10 => 0,
+                11 => 2,
+                12 => 5,
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+                9 => 0,
+                10 => 0,
+                11 => 2,
+                12 => 5,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 3,
+                2 => 1,
+                3 => 0,
+                4 => 0,
+            ),
+            4 => 
+            array (
+                0 => 0,
+            ),
+            5 => 
+            array (
+                0 => 0,
+            ),
+            6 => 
+            array (
+                0 => 0,
+                1 => 3,
+                2 => 1,
+                3 => 0,
+                4 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'comment',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+            ),
+            0 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'comment',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+            ),
+            1 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'comment',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+            ),
+            2 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'comment',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+            ),
+            3 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+                4 => '',
+            ),
+            4 => 
+            array (
+                0 => '',
+            ),
+            5 => 
+            array (
+                0 => '',
+            ),
+            6 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+                4 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'comment',
+                7 => 'identifier',
+                8 => 'number',
+                9 => 'number',
+                10 => 'number',
+                11 => 'number',
+                12 => 'number',
+            ),
+            0 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'comment',
+                7 => 'identifier',
+                8 => 'number',
+                9 => 'number',
+                10 => 'number',
+                11 => 'number',
+                12 => 'number',
+            ),
+            1 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'comment',
+                7 => 'identifier',
+                8 => 'number',
+                9 => 'number',
+                10 => 'number',
+                11 => 'number',
+                12 => 'number',
+            ),
+            2 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'comment',
+                7 => 'identifier',
+                8 => 'number',
+                9 => 'number',
+                10 => 'number',
+                11 => 'number',
+                12 => 'number',
+            ),
+            3 => 
+            array (
+                0 => 'inlinedoc',
+                1 => 'url',
+                2 => 'url',
+                3 => 'inlinedoc',
+                4 => 'inlinedoc',
+            ),
+            4 => 
+            array (
+                0 => 'special',
+            ),
+            5 => 
+            array (
+                0 => 'special',
+            ),
+            6 => 
+            array (
+                0 => 'inlinedoc',
+                1 => 'url',
+                2 => 'url',
+                3 => 'inlinedoc',
+                4 => 'inlinedoc',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)\\}/',
+            1 => '/(?i)\\)/',
+            2 => '/(?i)\\]/',
+            3 => '/(?i)\\*\\//',
+            4 => '/(?i)"/',
+            5 => '/(?i)\'/',
+            6 => '/(?mi)$/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => 5,
+                6 => 6,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+            ),
+            0 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => 5,
+                6 => 6,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => 5,
+                6 => 6,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => 5,
+                6 => 6,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+            ),
+            3 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+            ),
+            4 => 
+            array (
+                0 => -1,
+            ),
+            5 => 
+            array (
+                0 => -1,
+            ),
+            6 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => 
+                array (
+                    'types' => '/^(boolean|byte|char|const|double|final|float|int|long|short|static|void)$/',
+                    'reserved' => '/^(import|package|abstract|break|case|catch|class|continue|default|do|else|extends|false|finally|for|goto|if|implements|instanceof|interface|native|new|null|private|protected|public|return|super|strictfp|switch|synchronized|this|throws|throw|transient|true|try|volatile|while)$/',
+                    'builtin' => '/^(AbstractAction|AbstractBorder|AbstractButton|AbstractCellEditor|AbstractCollection|AbstractColorChooserPanel|AbstractDocument|AbstractInterruptibleChannel|AbstractLayoutCache|AbstractList|AbstractListModel|AbstractMap|AbstractMethodError|AbstractPreferences|AbstractSelectableChannel|AbstractSelectionKey|AbstractSelector|AbstractSequentialList|AbstractSet|AbstractSpinnerModel|AbstractTableModel|AbstractUndoableEdit|AbstractWriter|AccessControlContext|AccessControlException|AccessController|AccessException|Accessible|AccessibleAction|AccessibleBundle|AccessibleComponent|AccessibleContext|AccessibleEditableText|AccessibleExtendedComponent|AccessibleExtendedTable|AccessibleHyperlink|AccessibleHypertext|AccessibleIcon|AccessibleKeyBinding|AccessibleObject|AccessibleRelation|AccessibleRelationSet|AccessibleResourceBundle|AccessibleRole|AccessibleSelection|AccessibleState|AccessibleStateSet|AccessibleTable|AccessibleTableModelChange|AccessibleText|AccessibleValue|AccountExpiredException|Acl|AclEntry|AclNotFoundException|Action|ActionEvent|ActionListener|ActionMap|ActionMapUIResource|Activatable|ActivateFailedException|ActivationDesc|ActivationException|ActivationGroup|ActivationGroup_Stub|ActivationGroupDesc|ActivationGroupID|ActivationID|ActivationInstantiator|ActivationMonitor|ActivationSystem|Activator|ActiveEvent|AdapterActivator|AdapterActivatorOperations|AdapterAlreadyExists|AdapterAlreadyExistsHelper|AdapterInactive|AdapterInactiveHelper|AdapterNonExistent|AdapterNonExistentHelper|AddressHelper|Adjustable|AdjustmentEvent|AdjustmentListener|Adler32|AffineTransform|AffineTransformOp|AlgorithmParameterGenerator|AlgorithmParameterGeneratorSpi|AlgorithmParameters|AlgorithmParameterSpec|AlgorithmParametersSpi|AllPermission|AlphaComposite|AlreadyBound|AlreadyBoundException|AlreadyBoundHelper|AlreadyBoundHolder|AlreadyConnectedException|AncestorEvent|AncestorListener|Annotation|Any|AnyHolder|AnySeqHelper|AnySeqHolder|AppConfigurationEntry|Applet|AppletContext|AppletInitializer|AppletStub|ApplicationException|Arc2D|Area|AreaAveragingScaleFilter|ARG_IN|ARG_INOUT|ARG_OUT|ArithmeticException|Array|ArrayIndexOutOfBoundsException|ArrayList|Arrays|ArrayStoreException|AssertionError|AsyncBoxView|AsynchronousCloseException|Attr|Attribute|AttributedCharacterIterator|AttributedString|AttributeException|AttributeInUseException|AttributeList|AttributeListImpl|AttributeModificationException|Attributes|AttributeSet|AttributeSetUtilities|AttributesImpl|AudioClip|AudioFileFormat|AudioFileReader|AudioFileWriter|AudioFormat|AudioInputStream|AudioPermission|AudioSystem|AuthenticationException|AuthenticationNotSupportedException|Authenticator|AuthPermission|Autoscroll|AWTError|AWTEvent|AWTEventListener|AWTEventListenerProxy|AWTEventMulticaster|AWTException|AWTKeyStroke|AWTPermission|BackingStoreException|BAD_CONTEXT|BAD_INV_ORDER|BAD_OPERATION|BAD_PARAM|BAD_POLICY|BAD_POLICY_TYPE|BAD_POLICY_VALUE|BAD_TYPECODE|BadKind|BadLocationException|BadPaddingException|BandCombineOp|BandedSampleModel|BasicArrowButton|BasicAttribute|BasicAttributes|BasicBorders|BasicButtonListener|BasicButtonUI|BasicCheckBoxMenuItemUI|BasicCheckBoxUI|BasicColorChooserUI|BasicComboBoxEditor|BasicComboBoxRenderer|BasicComboBoxUI|BasicComboPopup|BasicDesktopIconUI|BasicDesktopPaneUI|BasicDirectoryModel|BasicEditorPaneUI|BasicFileChooserUI|BasicFormattedTextFieldUI|BasicGraphicsUtils|BasicHTML|BasicIconFactory|BasicInternalFrameTitlePane|BasicInternalFrameUI|BasicLabelUI|BasicListUI|BasicLookAndFeel|BasicMenuBarUI|BasicMenuItemUI|BasicMenuUI|BasicOptionPaneUI|BasicPanelUI|BasicPasswordFieldUI|BasicPermission|BasicPopupMenuSeparatorUI|BasicPopupMenuUI|BasicProgressBarUI|BasicRadioButtonMenuItemUI|BasicRadioButtonUI|BasicRootPaneUI|BasicScrollBarUI|BasicScrollPaneUI|BasicSeparatorUI|BasicSliderUI|BasicSpinnerUI|BasicSplitPaneDivider|BasicSplitPaneUI|BasicStroke|BasicTabbedPaneUI|BasicTableHeaderUI|BasicTableUI|BasicTextAreaUI|BasicTextFieldUI|BasicTextPaneUI|BasicTextUI|BasicToggleButtonUI|BasicToolBarSeparatorUI|BasicToolBarUI|BasicToolTipUI|BasicTreeUI|BasicViewportUI|BatchUpdateException|BeanContext|BeanContextChild|BeanContextChildComponentProxy|BeanContextChildSupport|BeanContextContainerProxy|BeanContextEvent|BeanContextMembershipEvent|BeanContextMembershipListener|BeanContextProxy|BeanContextServiceAvailableEvent|BeanContextServiceProvider|BeanContextServiceProviderBeanInfo|BeanContextServiceRevokedEvent|BeanContextServiceRevokedListener|BeanContextServices|BeanContextServicesListener|BeanContextServicesSupport|BeanContextSupport|BeanDescriptor|BeanInfo|Beans|BevelBorder|Bidi|BigDecimal|BigInteger|BinaryRefAddr|BindException|Binding|BindingHelper|BindingHolder|BindingIterator|BindingIteratorHelper|BindingIteratorHolder|BindingIteratorOperations|BindingIteratorPOA|BindingListHelper|BindingListHolder|BindingType|BindingTypeHelper|BindingTypeHolder|BitSet|Blob|BlockView|Book|Boolean|BooleanControl|BooleanHolder|BooleanSeqHelper|BooleanSeqHolder|Border|BorderFactory|BorderLayout|BorderUIResource|BoundedRangeModel|Bounds|Box|BoxedValueHelper|BoxLayout|BoxView|BreakIterator|Buffer|BufferCapabilities|BufferedImage|BufferedImageFilter|BufferedImageOp|BufferedInputStream|BufferedOutputStream|BufferedReader|BufferedWriter|BufferOverflowException|BufferStrategy|BufferUnderflowException|Button|ButtonGroup|ButtonModel|ButtonUI|Byte|ByteArrayInputStream|ByteArrayOutputStream|ByteBuffer|ByteChannel|ByteHolder|ByteLookupTable|ByteOrder|Calendar|CallableStatement|Callback|CallbackHandler|CancelablePrintJob|CancelledKeyException|CannotProceed|CannotProceedException|CannotProceedHelper|CannotProceedHolder|CannotRedoException|CannotUndoException|Canvas|CardLayout|Caret|CaretEvent|CaretListener|CDATASection|CellEditor|CellEditorListener|CellRendererPane|Certificate|CertificateEncodingException|CertificateException|CertificateExpiredException|CertificateFactory|CertificateFactorySpi|CertificateNotYetValidException|CertificateParsingException|CertPath|CertPathBuilder|CertPathBuilderException|CertPathBuilderResult|CertPathBuilderSpi|CertPathParameters|CertPathValidator|CertPathValidatorException|CertPathValidatorResult|CertPathValidatorSpi|CertSelector|CertStore|CertStoreException|CertStoreParameters|CertStoreSpi|ChangedCharSetException|ChangeEvent|ChangeListener|Channel|ChannelBinding|Channels|Character|CharacterCodingException|CharacterData|CharacterIterator|CharArrayReader|CharArrayWriter|CharBuffer|CharConversionException|CharHolder|CharSeqHelper|CharSeqHolder|CharSequence|Charset|CharsetDecoder|CharsetEncoder|CharsetProvider|Checkbox|CheckboxGroup|CheckboxMenuItem|CheckedInputStream|CheckedOutputStream|Checksum|Choice|ChoiceCallback|ChoiceFormat|Chromaticity|Cipher|CipherInputStream|CipherOutputStream|CipherSpi|Class|ClassCastException|ClassCircularityError|ClassDesc|ClassFormatError|ClassLoader|ClassNotFoundException|ClientRequestInfo|ClientRequestInfoOperations|ClientRequestInterceptor|ClientRequestInterceptorOperations|Clip|Clipboard|ClipboardOwner|Clob|Cloneable|CloneNotSupportedException|ClosedByInterruptException|ClosedChannelException|ClosedSelectorException|CMMException|Codec|CodecFactory|CodecFactoryHelper|CodecFactoryOperations|CodecOperations|CoderMalfunctionError|CoderResult|CodeSets|CodeSource|CodingErrorAction|CollationElementIterator|CollationKey|Collator|Collection|CollectionCertStoreParameters|Collections|Color|ColorChooserComponentFactory|ColorChooserUI|ColorConvertOp|ColorModel|ColorSelectionModel|ColorSpace|ColorSupported|ColorUIResource|ComboBoxEditor|ComboBoxModel|ComboBoxUI|ComboPopup|COMM_FAILURE|Comment|CommunicationException|Comparable|Comparator|Compiler|CompletionStatus|CompletionStatusHelper|Component|ComponentAdapter|ComponentColorModel|ComponentEvent|ComponentIdHelper|ComponentInputMap|ComponentInputMapUIResource|ComponentListener|ComponentOrientation|ComponentSampleModel|ComponentUI|ComponentView|Composite|CompositeContext|CompositeName|CompositeView|CompoundBorder|CompoundControl|CompoundEdit|CompoundName|Compression|ConcurrentModificationException|Configuration|ConfigurationException|ConfirmationCallback|ConnectException|ConnectIOException|Connection|ConnectionEvent|ConnectionEventListener|ConnectionPendingException|ConnectionPoolDataSource|ConsoleHandler|Constructor|Container|ContainerAdapter|ContainerEvent|ContainerListener|ContainerOrderFocusTraversalPolicy|ContentHandler|ContentHandlerFactory|ContentModel|Context|ContextList|ContextNotEmptyException|ContextualRenderedImageFactory|Control|ControlFactory|ControllerEventListener|ConvolveOp|CookieHolder|Copies|CopiesSupported|CRC32|CredentialExpiredException|CRL|CRLException|CRLSelector|CropImageFilter|CSS|CTX_RESTRICT_SCOPE|CubicCurve2D|Currency|Current|CurrentHelper|CurrentHolder|CurrentOperations|Cursor|Customizer|CustomMarshal|CustomValue|DATA_CONVERSION|DatabaseMetaData|DataBuffer|DataBufferByte|DataBufferDouble|DataBufferFloat|DataBufferInt|DataBufferShort|DataBufferUShort|DataFlavor|DataFormatException|DatagramChannel|DatagramPacket|DatagramSocket|DatagramSocketImpl|DatagramSocketImplFactory|DataInput|DataInputStream|DataLine|DataOutput|DataOutputStream|DataSource|DataTruncation|Date|DateFormat|DateFormatSymbols|DateFormatter|DateTimeAtCompleted|DateTimeAtCreation|DateTimeAtProcessing|DateTimeSyntax|DebugGraphics|DecimalFormat|DecimalFormatSymbols|DeclHandler|DefaultBoundedRangeModel|DefaultButtonModel|DefaultCaret|DefaultCellEditor|DefaultColorSelectionModel|DefaultComboBoxModel|DefaultDesktopManager|DefaultEditorKit|DefaultFocusManager|DefaultFocusTraversalPolicy|DefaultFormatter|DefaultFormatterFactory|DefaultHandler|DefaultHighlighter|DefaultKeyboardFocusManager|DefaultListCellRenderer|DefaultListModel|DefaultListSelectionModel|DefaultMenuLayout|DefaultMetalTheme|DefaultMutableTreeNode|DefaultPersistenceDelegate|DefaultSingleSelectionModel|DefaultStyledDocument|DefaultTableCellRenderer|DefaultTableColumnModel|DefaultTableModel|DefaultTextUI|DefaultTreeCellEditor|DefaultTreeCellRenderer|DefaultTreeModel|DefaultTreeSelectionModel|DefinitionKind|DefinitionKindHelper|Deflater|DeflaterOutputStream|Delegate|DelegationPermission|DESedeKeySpec|DesignMode|DESKeySpec|DesktopIconUI|DesktopManager|DesktopPaneUI|Destination|Destroyable|DestroyFailedException|DGC|DHGenParameterSpec|DHKey|DHParameterSpec|DHPrivateKey|DHPrivateKeySpec|DHPublicKey|DHPublicKeySpec|Dialog|Dictionary|DigestException|DigestInputStream|DigestOutputStream|Dimension|Dimension2D|DimensionUIResource|DirContext|DirectColorModel|DirectoryManager|DirObjectFactory|DirStateFactory|DisplayMode|DnDConstants|Doc|DocAttribute|DocAttributeSet|DocFlavor|DocPrintJob|Document|DocumentBuilder|DocumentBuilderFactory|DocumentEvent|DocumentFilter|DocumentFragment|DocumentHandler|DocumentListener|DocumentName|DocumentParser|DocumentType|DomainCombiner|DomainManager|DomainManagerOperations|DOMException|DOMImplementation|DOMLocator|DOMResult|DOMSource|Double|DoubleBuffer|DoubleHolder|DoubleSeqHelper|DoubleSeqHolder|DragGestureEvent|DragGestureListener|DragGestureRecognizer|DragSource|DragSourceAdapter|DragSourceContext|DragSourceDragEvent|DragSourceDropEvent|DragSourceEvent|DragSourceListener|DragSourceMotionListener|Driver|DriverManager|DriverPropertyInfo|DropTarget|DropTargetAdapter|DropTargetContext|DropTargetDragEvent|DropTargetDropEvent|DropTargetEvent|DropTargetListener|DSAKey|DSAKeyPairGenerator|DSAParameterSpec|DSAParams|DSAPrivateKey|DSAPrivateKeySpec|DSAPublicKey|DSAPublicKeySpec|DTD|DTDConstants|DTDHandler|DuplicateName|DuplicateNameHelper|DynamicImplementation|DynAny|DynAnyFactory|DynAnyFactoryHelper|DynAnyFactoryOperations|DynAnyHelper|DynAnyOperations|DynAnySeqHelper|DynArray|DynArrayHelper|DynArrayOperations|DynEnum|DynEnumHelper|DynEnumOperations|DynFixed|DynFixedHelper|DynFixedOperations|DynSequence|DynSequenceHelper|DynSequenceOperations|DynStruct|DynStructHelper|DynStructOperations|DynUnion|DynUnionHelper|DynUnionOperations|DynValue|DynValueBox|DynValueBoxOperations|DynValueCommon|DynValueCommonOperations|DynValueHelper|DynValueOperations|EditorKit|Element|ElementIterator|Ellipse2D|EmptyBorder|EmptyStackException|EncodedKeySpec|Encoder|Encoding|ENCODING_CDR_ENCAPS|EncryptedPrivateKeyInfo|Entity|EntityReference|EntityResolver|EnumControl|Enumeration|EnumSyntax|Environment|EOFException|Error|ErrorHandler|ErrorListener|ErrorManager|EtchedBorder|Event|EventContext|EventDirContext|EventHandler|EventListener|EventListenerList|EventListenerProxy|EventObject|EventQueue|EventSetDescriptor|Exception|ExceptionInInitializerError|ExceptionList|ExceptionListener|ExemptionMechanism|ExemptionMechanismException|ExemptionMechanismSpi|ExpandVetoException|ExportException|Expression|ExtendedRequest|ExtendedResponse|Externalizable|FactoryConfigurationError|FailedLoginException|FeatureDescriptor|Fidelity|Field|FieldNameHelper|FieldPosition|FieldView|File|FileCacheImageInputStream|FileCacheImageOutputStream|FileChannel|FileChooserUI|FileDescriptor|FileDialog|FileFilter|FileHandler|FileImageInputStream|FileImageOutputStream|FileInputStream|FileLock|FileLockInterruptionException|FilenameFilter|FileNameMap|FileNotFoundException|FileOutputStream|FilePermission|FileReader|FileSystemView|FileView|FileWriter|Filter|FilteredImageSource|FilterInputStream|FilterOutputStream|FilterReader|FilterWriter|Finishings|FixedHeightLayoutCache|FixedHolder|FlatteningPathIterator|FlavorException|FlavorMap|FlavorTable|Float|FloatBuffer|FloatControl|FloatHolder|FloatSeqHelper|FloatSeqHolder|FlowLayout|FlowView|FocusAdapter|FocusEvent|FocusListener|FocusManager|FocusTraversalPolicy|Font|FontFormatException|FontMetrics|FontRenderContext|FontUIResource|Format|FormatConversionProvider|FormatMismatch|FormatMismatchHelper|Formatter|FormView|ForwardRequest|ForwardRequestHelper|Frame|FREE_MEM|GapContent|GatheringByteChannel|GeneralPath|GeneralSecurityException|GlyphJustificationInfo|GlyphMetrics|GlyphVector|GlyphView|GradientPaint|GraphicAttribute|Graphics|Graphics2D|GraphicsConfigTemplate|GraphicsConfiguration|GraphicsDevice|GraphicsEnvironment|GrayFilter|GregorianCalendar|GridBagConstraints|GridBagLayout|GridLayout|Group|GSSContext|GSSCredential|GSSException|GSSManager|GSSName|Guard|GuardedObject|GZIPInputStream|GZIPOutputStream|Handler|HandlerBase|HandshakeCompletedEvent|HandshakeCompletedListener|HasControls|HashAttributeSet|HashDocAttributeSet|HashMap|HashPrintJobAttributeSet|HashPrintRequestAttributeSet|HashPrintServiceAttributeSet|HashSet|Hashtable|HeadlessException|HierarchyBoundsAdapter|HierarchyBoundsListener|HierarchyEvent|HierarchyListener|Highlighter|HostnameVerifier|HTML|HTMLDocument|HTMLEditorKit|HTMLFrameHyperlinkEvent|HTMLWriter|HttpsURLConnection|HttpURLConnection|HyperlinkEvent|HyperlinkListener|ICC_ColorSpace|ICC_Profile|ICC_ProfileGray|ICC_ProfileRGB|Icon|IconUIResource|IconView|ID_ASSIGNMENT_POLICY_ID|ID_UNIQUENESS_POLICY_ID|IdAssignmentPolicy|IdAssignmentPolicyOperations|IdAssignmentPolicyValue|IdentifierHelper|Identity|IdentityHashMap|IdentityScope|IDLEntity|IDLType|IDLTypeHelper|IDLTypeOperations|IdUniquenessPolicy|IdUniquenessPolicyOperations|IdUniquenessPolicyValue|IIOByteBuffer|IIOException|IIOImage|IIOInvalidTreeException|IIOMetadata|IIOMetadataController|IIOMetadataFormat|IIOMetadataFormatImpl|IIOMetadataNode|IIOParam|IIOParamController|IIOReadProgressListener|IIOReadUpdateListener|IIOReadWarningListener|IIORegistry|IIOServiceProvider|IIOWriteProgressListener|IIOWriteWarningListener|IllegalAccessError|IllegalAccessException|IllegalArgumentException|IllegalBlockingModeException|IllegalBlockSizeException|IllegalCharsetNameException|IllegalComponentStateException|IllegalMonitorStateException|IllegalPathStateException|IllegalSelectorException|IllegalStateException|IllegalThreadStateException|Image|ImageCapabilities|ImageConsumer|ImageFilter|ImageGraphicAttribute|ImageIcon|ImageInputStream|ImageInputStreamImpl|ImageInputStreamSpi|ImageIO|ImageObserver|ImageOutputStream|ImageOutputStreamImpl|ImageOutputStreamSpi|ImageProducer|ImageReader|ImageReaderSpi|ImageReaderWriterSpi|ImageReadParam|ImageTranscoder|ImageTranscoderSpi|ImageTypeSpecifier|ImageView|ImageWriteParam|ImageWriter|ImageWriterSpi|ImagingOpException|IMP_LIMIT|IMPLICIT_ACTIVATION_POLICY_ID|ImplicitActivationPolicy|ImplicitActivationPolicyOperations|ImplicitActivationPolicyValue|IncompatibleClassChangeError|InconsistentTypeCode|InconsistentTypeCodeHelper|IndexColorModel|IndexedPropertyDescriptor|IndexOutOfBoundsException|IndirectionException|Inet4Address|Inet6Address|InetAddress|InetSocketAddress|Inflater|InflaterInputStream|InheritableThreadLocal|InitialContext|InitialContextFactory|InitialContextFactoryBuilder|InitialDirContext|INITIALIZE|InitialLdapContext|InlineView|InputContext|InputEvent|InputMap|InputMapUIResource|InputMethod|InputMethodContext|InputMethodDescriptor|InputMethodEvent|InputMethodHighlight|InputMethodListener|InputMethodRequests|InputSource|InputStream|InputStreamReader|InputSubset|InputVerifier|Insets|InsetsUIResource|InstantiationError|InstantiationException|Instrument|InsufficientResourcesException|IntBuffer|Integer|IntegerSyntax|Interceptor|InterceptorOperations|INTERNAL|InternalError|InternalFrameAdapter|InternalFrameEvent|InternalFrameFocusTraversalPolicy|InternalFrameListener|InternalFrameUI|InternationalFormatter|InterruptedException|InterruptedIOException|InterruptedNamingException|InterruptibleChannel|INTF_REPOS|IntHolder|IntrospectionException|Introspector|INV_FLAG|INV_IDENT|INV_OBJREF|INV_POLICY|Invalid|INVALID_TRANSACTION|InvalidAddress|InvalidAddressHelper|InvalidAddressHolder|InvalidAlgorithmParameterException|InvalidAttributeIdentifierException|InvalidAttributesException|InvalidAttributeValueException|InvalidClassException|InvalidDnDOperationException|InvalidKeyException|InvalidKeySpecException|InvalidMarkException|InvalidMidiDataException|InvalidName|InvalidNameException|InvalidNameHelper|InvalidNameHolder|InvalidObjectException|InvalidParameterException|InvalidParameterSpecException|InvalidPolicy|InvalidPolicyHelper|InvalidPreferencesFormatException|InvalidSearchControlsException|InvalidSearchFilterException|InvalidSeq|InvalidSlot|InvalidSlotHelper|InvalidTransactionException|InvalidTypeForEncoding|InvalidTypeForEncodingHelper|InvalidValue|InvalidValueHelper|InvocationEvent|InvocationHandler|InvocationTargetException|InvokeHandler|IOException|IOR|IORHelper|IORHolder|IORInfo|IORInfoOperations|IORInterceptor|IORInterceptorOperations|IRObject|IRObjectOperations|IstringHelper|ItemEvent|ItemListener|ItemSelectable|Iterator|IvParameterSpec|JApplet|JarEntry|JarException|JarFile|JarInputStream|JarOutputStream|JarURLConnection|JButton|JCheckBox|JCheckBoxMenuItem|JColorChooser|JComboBox|JComponent|JDesktopPane|JDialog|JEditorPane|JFileChooser|JFormattedTextField|JFrame|JInternalFrame|JLabel|JLayeredPane|JList|JMenu|JMenuBar|JMenuItem|JobAttributes|JobHoldUntil|JobImpressions|JobImpressionsCompleted|JobImpressionsSupported|JobKOctets|JobKOctetsProcessed|JobKOctetsSupported|JobMediaSheets|JobMediaSheetsCompleted|JobMediaSheetsSupported|JobMessageFromOperator|JobName|JobOriginatingUserName|JobPriority|JobPrioritySupported|JobSheets|JobState|JobStateReason|JobStateReasons|JOptionPane|JPanel|JPasswordField|JPEGHuffmanTable|JPEGImageReadParam|JPEGImageWriteParam|JPEGQTable|JPopupMenu|JProgressBar|JRadioButton|JRadioButtonMenuItem|JRootPane|JScrollBar|JScrollPane|JSeparator|JSlider|JSpinner|JSplitPane|JTabbedPane|JTable|JTableHeader|JTextArea|JTextComponent|JTextField|JTextPane|JToggleButton|JToolBar|JToolTip|JTree|JViewport|JWindow|KerberosKey|KerberosPrincipal|KerberosTicket|Kernel|Key|KeyAdapter|KeyAgreement|KeyAgreementSpi|KeyboardFocusManager|KeyEvent|KeyEventDispatcher|KeyEventPostProcessor|KeyException|KeyFactory|KeyFactorySpi|KeyGenerator|KeyGeneratorSpi|KeyListener|KeyManagementException|KeyManager|KeyManagerFactory|KeyManagerFactorySpi|Keymap|KeyPair|KeyPairGenerator|KeyPairGeneratorSpi|KeySpec|KeyStore|KeyStoreException|KeyStoreSpi|KeyStroke|Label|LabelUI|LabelView|LanguageCallback|LastOwnerException|LayeredHighlighter|LayoutFocusTraversalPolicy|LayoutManager|LayoutManager2|LayoutQueue|LDAPCertStoreParameters|LdapContext|LdapReferralException|Lease|Level|LexicalHandler|LIFESPAN_POLICY_ID|LifespanPolicy|LifespanPolicyOperations|LifespanPolicyValue|LimitExceededException|Line|Line2D|LineBorder|LineBreakMeasurer|LineEvent|LineListener|LineMetrics|LineNumberInputStream|LineNumberReader|LineUnavailableException|LinkageError|LinkedHashMap|LinkedHashSet|LinkedList|LinkException|LinkLoopException|LinkRef|List|ListCellRenderer|ListDataEvent|ListDataListener|ListIterator|ListModel|ListResourceBundle|ListSelectionEvent|ListSelectionListener|ListSelectionModel|ListUI|ListView|LoaderHandler|Locale|LocalObject|LocateRegistry|LOCATION_FORWARD|Locator|LocatorImpl|Logger|LoggingPermission|LoginContext|LoginException|LoginModule|LogManager|LogRecord|LogStream|Long|LongBuffer|LongHolder|LongLongSeqHelper|LongLongSeqHolder|LongSeqHelper|LongSeqHolder|LookAndFeel|LookupOp|LookupTable|Mac|MacSpi|MalformedInputException|MalformedLinkException|MalformedURLException|ManagerFactoryParameters|Manifest|Map|MappedByteBuffer|MARSHAL|MarshalException|MarshalledObject|MaskFormatter|Matcher|Math|MatteBorder|Media|MediaName|MediaPrintableArea|MediaSize|MediaSizeName|MediaTracker|MediaTray|Member|MemoryCacheImageInputStream|MemoryCacheImageOutputStream|MemoryHandler|MemoryImageSource|Menu|MenuBar|MenuBarUI|MenuComponent|MenuContainer|MenuDragMouseEvent|MenuDragMouseListener|MenuElement|MenuEvent|MenuItem|MenuItemUI|MenuKeyEvent|MenuKeyListener|MenuListener|MenuSelectionManager|MenuShortcut|MessageDigest|MessageDigestSpi|MessageFormat|MessageProp|MetaEventListener|MetalBorders|MetalButtonUI|MetalCheckBoxIcon|MetalCheckBoxUI|MetalComboBoxButton|MetalComboBoxEditor|MetalComboBoxIcon|MetalComboBoxUI|MetalDesktopIconUI|MetalFileChooserUI|MetalIconFactory|MetalInternalFrameTitlePane|MetalInternalFrameUI|MetalLabelUI|MetalLookAndFeel|MetalPopupMenuSeparatorUI|MetalProgressBarUI|MetalRadioButtonUI|MetalRootPaneUI|MetalScrollBarUI|MetalScrollButton|MetalScrollPaneUI|MetalSeparatorUI|MetalSliderUI|MetalSplitPaneUI|MetalTabbedPaneUI|MetalTextFieldUI|MetalTheme|MetalToggleButtonUI|MetalToolBarUI|MetalToolTipUI|MetalTreeUI|MetaMessage|Method|MethodDescriptor|MidiChannel|MidiDevice|MidiDeviceProvider|MidiEvent|MidiFileFormat|MidiFileReader|MidiFileWriter|MidiMessage|MidiSystem|MidiUnavailableException|MimeTypeParseException|MinimalHTMLWriter|MissingResourceException|Mixer|MixerProvider|ModificationItem|Modifier|MouseAdapter|MouseDragGestureRecognizer|MouseEvent|MouseInputAdapter|MouseInputListener|MouseListener|MouseMotionAdapter|MouseMotionListener|MouseWheelEvent|MouseWheelListener|MultiButtonUI|MulticastSocket|MultiColorChooserUI|MultiComboBoxUI|MultiDesktopIconUI|MultiDesktopPaneUI|MultiDoc|MultiDocPrintJob|MultiDocPrintService|MultiFileChooserUI|MultiInternalFrameUI|MultiLabelUI|MultiListUI|MultiLookAndFeel|MultiMenuBarUI|MultiMenuItemUI|MultiOptionPaneUI|MultiPanelUI|MultiPixelPackedSampleModel|MultipleComponentProfileHelper|MultipleComponentProfileHolder|MultipleDocumentHandling|MultipleMaster|MultiPopupMenuUI|MultiProgressBarUI|MultiRootPaneUI|MultiScrollBarUI|MultiScrollPaneUI|MultiSeparatorUI|MultiSliderUI|MultiSpinnerUI|MultiSplitPaneUI|MultiTabbedPaneUI|MultiTableHeaderUI|MultiTableUI|MultiTextUI|MultiToolBarUI|MultiToolTipUI|MultiTreeUI|MultiViewportUI|MutableAttributeSet|MutableComboBoxModel|MutableTreeNode|Name|NameAlreadyBoundException|NameCallback|NameClassPair|NameComponent|NameComponentHelper|NameComponentHolder|NamedNodeMap|NamedValue|NameDynAnyPair|NameDynAnyPairHelper|NameDynAnyPairSeqHelper|NameHelper|NameHolder|NameNotFoundException|NameParser|NamespaceChangeListener|NamespaceSupport|NameValuePair|NameValuePairHelper|NameValuePairSeqHelper|Naming|NamingContext|NamingContextExt|NamingContextExtHelper|NamingContextExtHolder|NamingContextExtOperations|NamingContextExtPOA|NamingContextHelper|NamingContextHolder|NamingContextOperations|NamingContextPOA|NamingEnumeration|NamingEvent|NamingException|NamingExceptionEvent|NamingListener|NamingManager|NamingSecurityException|NavigationFilter|NegativeArraySizeException|NetPermission|NetworkInterface|NO_IMPLEMENT|NO_MEMORY|NO_PERMISSION|NO_RESOURCES|NO_RESPONSE|NoClassDefFoundError|NoConnectionPendingException|NoContext|NoContextHelper|Node|NodeChangeEvent|NodeChangeListener|NodeList|NoInitialContextException|NoninvertibleTransformException|NonReadableChannelException|NonWritableChannelException|NoPermissionException|NoRouteToHostException|NoServant|NoServantHelper|NoSuchAlgorithmException|NoSuchAttributeException|NoSuchElementException|NoSuchFieldError|NoSuchFieldException|NoSuchMethodError|NoSuchMethodException|NoSuchObjectException|NoSuchPaddingException|NoSuchProviderException|NotActiveException|Notation|NotBoundException|NotContextException|NotEmpty|NotEmptyHelper|NotEmptyHolder|NotFound|NotFoundHelper|NotFoundHolder|NotFoundReason|NotFoundReasonHelper|NotFoundReasonHolder|NotOwnerException|NotSerializableException|NotYetBoundException|NotYetConnectedException|NullCipher|NullPointerException|Number|NumberFormat|NumberFormatException|NumberFormatter|NumberOfDocuments|NumberOfInterveningJobs|NumberUp|NumberUpSupported|NumericShaper|NVList|OBJ_ADAPTER|Object|OBJECT_NOT_EXIST|ObjectAlreadyActive|ObjectAlreadyActiveHelper|ObjectChangeListener|ObjectFactory|ObjectFactoryBuilder|ObjectHelper|ObjectHolder|ObjectIdHelper|ObjectImpl|ObjectInput|ObjectInputStream|ObjectInputValidation|ObjectNotActive|ObjectNotActiveHelper|ObjectOutput|ObjectOutputStream|ObjectStreamClass|ObjectStreamConstants|ObjectStreamException|ObjectStreamField|ObjectView|ObjID|Observable|Observer|OctetSeqHelper|OctetSeqHolder|Oid|OMGVMCID|OpenType|Operation|OperationNotSupportedException|Option|OptionalDataException|OptionPaneUI|ORB|ORBInitializer|ORBInitializerOperations|ORBInitInfo|ORBInitInfoOperations|OrientationRequested|OutOfMemoryError|OutputDeviceAssigned|OutputKeys|OutputStream|OutputStreamWriter|OverlappingFileLockException|OverlayLayout|Owner|Package|PackedColorModel|Pageable|PageAttributes|PageFormat|PageRanges|PagesPerMinute|PagesPerMinuteColor|Paint|PaintContext|PaintEvent|Panel|PanelUI|Paper|ParagraphView|Parameter|ParameterBlock|ParameterDescriptor|ParameterMetaData|ParameterMode|ParameterModeHelper|ParameterModeHolder|ParseException|ParsePosition|Parser|ParserAdapter|ParserConfigurationException|ParserDelegator|ParserFactory|PartialResultException|PasswordAuthentication|PasswordCallback|PasswordView|Patch|PathIterator|Pattern|PatternSyntaxException|PBEKey|PBEKeySpec|PBEParameterSpec|PDLOverrideSupported|Permission|PermissionCollection|Permissions|PERSIST_STORE|PersistenceDelegate|PhantomReference|Pipe|PipedInputStream|PipedOutputStream|PipedReader|PipedWriter|PixelGrabber|PixelInterleavedSampleModel|PKCS8EncodedKeySpec|PKIXBuilderParameters|PKIXCertPathBuilderResult|PKIXCertPathChecker|PKIXCertPathValidatorResult|PKIXParameters|PlainDocument|PlainView|POA|POAHelper|POAManager|POAManagerOperations|POAOperations|Point|Point2D|Policy|PolicyError|PolicyErrorCodeHelper|PolicyErrorHelper|PolicyErrorHolder|PolicyFactory|PolicyFactoryOperations|PolicyHelper|PolicyHolder|PolicyListHelper|PolicyListHolder|PolicyNode|PolicyOperations|PolicyQualifierInfo|PolicyTypeHelper|Polygon|PooledConnection|Popup|PopupFactory|PopupMenu|PopupMenuEvent|PopupMenuListener|PopupMenuUI|Port|PortableRemoteObject|PortableRemoteObjectDelegate|PortUnreachableException|Position|PreferenceChangeEvent|PreferenceChangeListener|Preferences|PreferencesFactory|PreparedStatement|PresentationDirection|Principal|PrincipalHolder|Printable|PrinterAbortException|PrinterException|PrinterGraphics|PrinterInfo|PrinterIOException|PrinterIsAcceptingJobs|PrinterJob|PrinterLocation|PrinterMakeAndModel|PrinterMessageFromOperator|PrinterMoreInfo|PrinterMoreInfoManufacturer|PrinterName|PrinterResolution|PrinterState|PrinterStateReason|PrinterStateReasons|PrinterURI|PrintEvent|PrintException|PrintGraphics|PrintJob|PrintJobAdapter|PrintJobAttribute|PrintJobAttributeEvent|PrintJobAttributeListener|PrintJobAttributeSet|PrintJobEvent|PrintJobListener|PrintQuality|PrintRequestAttribute|PrintRequestAttributeSet|PrintService|PrintServiceAttribute|PrintServiceAttributeEvent|PrintServiceAttributeListener|PrintServiceAttributeSet|PrintServiceLookup|PrintStream|PrintWriter|PRIVATE_MEMBER|PrivateCredentialPermission|PrivateKey|PrivilegedAction|PrivilegedActionException|PrivilegedExceptionAction|Process|ProcessingInstruction|ProfileDataException|ProfileIdHelper|ProgressBarUI|ProgressMonitor|ProgressMonitorInputStream|Properties|PropertyChangeEvent|PropertyChangeListener|PropertyChangeListenerProxy|PropertyChangeSupport|PropertyDescriptor|PropertyEditor|PropertyEditorManager|PropertyEditorSupport|PropertyPermission|PropertyResourceBundle|PropertyVetoException|ProtectionDomain|ProtocolException|Provider|ProviderException|Proxy|PSSParameterSpec|PUBLIC_MEMBER|PublicKey|PushbackInputStream|PushbackReader|QuadCurve2D|QueuedJobCount|Random|RandomAccess|RandomAccessFile|Raster|RasterFormatException|RasterOp|RC2ParameterSpec|RC5ParameterSpec|ReadableByteChannel|Reader|ReadOnlyBufferException|Receiver|Rectangle|Rectangle2D|RectangularShape|Ref|RefAddr|Reference|Referenceable|ReferenceQueue|ReferenceUriSchemesSupported|ReferralException|ReflectPermission|Refreshable|RefreshFailedException|RegisterableService|Registry|RegistryHandler|RemarshalException|Remote|RemoteCall|RemoteException|RemoteObject|RemoteRef|RemoteServer|RemoteStub|RenderableImage|RenderableImageOp|RenderableImageProducer|RenderContext|RenderedImage|RenderedImageFactory|Renderer|RenderingHints|RepaintManager|ReplicateScaleFilter|RepositoryIdHelper|Request|REQUEST_PROCESSING_POLICY_ID|RequestInfo|RequestInfoOperations|RequestingUserName|RequestProcessingPolicy|RequestProcessingPolicyOperations|RequestProcessingPolicyValue|RescaleOp|ResolutionSyntax|Resolver|ResolveResult|ResourceBundle|ResponseHandler|Result|ResultSet|ResultSetMetaData|ReverbType|RGBImageFilter|RMIClassLoader|RMIClassLoaderSpi|RMIClientSocketFactory|RMIFailureHandler|RMISecurityException|RMISecurityManager|RMIServerSocketFactory|RMISocketFactory|Robot|RootPaneContainer|RootPaneUI|RoundRectangle2D|RowMapper|RowSet|RowSetEvent|RowSetInternal|RowSetListener|RowSetMetaData|RowSetReader|RowSetWriter|RSAKey|RSAKeyGenParameterSpec|RSAMultiPrimePrivateCrtKey|RSAMultiPrimePrivateCrtKeySpec|RSAOtherPrimeInfo|RSAPrivateCrtKey|RSAPrivateCrtKeySpec|RSAPrivateKey|RSAPrivateKeySpec|RSAPublicKey|RSAPublicKeySpec|RTFEditorKit|RuleBasedCollator|Runnable|Runtime|RunTime|RuntimeException|RunTimeOperations|RuntimePermission|SampleModel|Savepoint|SAXException|SAXNotRecognizedException|SAXNotSupportedException|SAXParseException|SAXParser|SAXParserFactory|SAXResult|SAXSource|SAXTransformerFactory|ScatteringByteChannel|SchemaViolationException|Scrollable|Scrollbar|ScrollBarUI|ScrollPane|ScrollPaneAdjustable|ScrollPaneConstants|ScrollPaneLayout|ScrollPaneUI|SealedObject|SearchControls|SearchResult|SecretKey|SecretKeyFactory|SecretKeyFactorySpi|SecretKeySpec|SecureClassLoader|SecureRandom|SecureRandomSpi|Security|SecurityException|SecurityManager|SecurityPermission|Segment|SelectableChannel|SelectionKey|Selector|SelectorProvider|SeparatorUI|Sequence|SequenceInputStream|Sequencer|Serializable|SerializablePermission|Servant|SERVANT_RETENTION_POLICY_ID|ServantActivator|ServantActivatorHelper|ServantActivatorOperations|ServantActivatorPOA|ServantAlreadyActive|ServantAlreadyActiveHelper|ServantLocator|ServantLocatorHelper|ServantLocatorOperations|ServantLocatorPOA|ServantManager|ServantManagerOperations|ServantNotActive|ServantNotActiveHelper|ServantObject|ServantRetentionPolicy|ServantRetentionPolicyOperations|ServantRetentionPolicyValue|ServerCloneException|ServerError|ServerException|ServerNotActiveException|ServerRef|ServerRequest|ServerRequestInfo|ServerRequestInfoOperations|ServerRequestInterceptor|ServerRequestInterceptorOperations|ServerRuntimeException|ServerSocket|ServerSocketChannel|ServerSocketFactory|ServiceContext|ServiceContextHelper|ServiceContextHolder|ServiceContextListHelper|ServiceContextListHolder|ServiceDetail|ServiceDetailHelper|ServiceIdHelper|ServiceInformation|ServiceInformationHelper|ServiceInformationHolder|ServicePermission|ServiceRegistry|ServiceUI|ServiceUIFactory|ServiceUnavailableException|Set|SetOfIntegerSyntax|SetOverrideType|SetOverrideTypeHelper|Severity|Shape|ShapeGraphicAttribute|SheetCollate|Short|ShortBuffer|ShortBufferException|ShortHolder|ShortLookupTable|ShortMessage|ShortSeqHelper|ShortSeqHolder|Sides|Signature|SignatureException|SignatureSpi|SignedObject|Signer|SimpleAttributeSet|SimpleBeanInfo|SimpleDateFormat|SimpleDoc|SimpleFormatter|SimpleTimeZone|SinglePixelPackedSampleModel|SingleSelectionModel|Size2DSyntax|SizeLimitExceededException|SizeRequirements|SizeSequence|Skeleton|SkeletonMismatchException|SkeletonNotFoundException|SliderUI|Socket|SocketAddress|SocketChannel|SocketException|SocketFactory|SocketHandler|SocketImpl|SocketImplFactory|SocketOptions|SocketPermission|SocketSecurityException|SocketTimeoutException|SoftBevelBorder|SoftReference|SortedMap|SortedSet|SortingFocusTraversalPolicy|Soundbank|SoundbankReader|SoundbankResource|Source|SourceDataLine|SourceLocator|SpinnerDateModel|SpinnerListModel|SpinnerModel|SpinnerNumberModel|SpinnerUI|SplitPaneUI|Spring|SpringLayout|SQLData|SQLException|SQLInput|SQLOutput|SQLPermission|SQLWarning|SSLContext|SSLContextSpi|SSLException|SSLHandshakeException|SSLKeyException|SSLPeerUnverifiedException|SSLPermission|SSLProtocolException|SSLServerSocket|SSLServerSocketFactory|SSLSession|SSLSessionBindingEvent|SSLSessionBindingListener|SSLSessionContext|SSLSocket|SSLSocketFactory|Stack|StackOverflowError|StackTraceElement|StartTlsRequest|StartTlsResponse|State|StateEdit|StateEditable|StateFactory|Statement|Streamable|StreamableValue|StreamCorruptedException|StreamHandler|StreamPrintService|StreamPrintServiceFactory|StreamResult|StreamSource|StreamTokenizer|StrictMath|String|StringBuffer|StringBufferInputStream|StringCharacterIterator|StringContent|StringHolder|StringIndexOutOfBoundsException|StringNameHelper|StringReader|StringRefAddr|StringSelection|StringSeqHelper|StringSeqHolder|StringTokenizer|StringValueHelper|StringWriter|Stroke|Struct|StructMember|StructMemberHelper|Stub|StubDelegate|StubNotFoundException|Style|StyleConstants|StyleContext|StyledDocument|StyledEditorKit|StyleSheet|Subject|SubjectDomainCombiner|SUCCESSFUL|SupportedValuesAttribute|SwingConstants|SwingPropertyChangeSupport|SwingUtilities|SYNC_WITH_TRANSPORT|SyncFailedException|SyncScopeHelper|Synthesizer|SysexMessage|System|SYSTEM_EXCEPTION|SystemColor|SystemException|SystemFlavorMap|TabableView|TabbedPaneUI|TabExpander|TableCellEditor|TableCellRenderer|TableColumn|TableColumnModel|TableColumnModelEvent|TableColumnModelListener|TableHeaderUI|TableModel|TableModelEvent|TableModelListener|TableUI|TableView|TabSet|TabStop|TAG_ALTERNATE_IIOP_ADDRESS|TAG_CODE_SETS|TAG_INTERNET_IOP|TAG_JAVA_CODEBASE|TAG_MULTIPLE_COMPONENTS|TAG_ORB_TYPE|TAG_POLICIES|TagElement|TaggedComponent|TaggedComponentHelper|TaggedComponentHolder|TaggedProfile|TaggedProfileHelper|TaggedProfileHolder|TargetDataLine|TCKind|Templates|TemplatesHandler|Text|TextAction|TextArea|TextAttribute|TextComponent|TextEvent|TextField|TextHitInfo|TextInputCallback|TextLayout|TextListener|TextMeasurer|TextOutputCallback|TextSyntax|TextUI|TexturePaint|Thread|THREAD_POLICY_ID|ThreadDeath|ThreadGroup|ThreadLocal|ThreadPolicy|ThreadPolicyOperations|ThreadPolicyValue|Throwable|Tie|TileObserver|Time|TimeLimitExceededException|Timer|TimerTask|Timestamp|TimeZone|TitledBorder|ToolBarUI|Toolkit|ToolTipManager|ToolTipUI|TooManyListenersException|Track|TRANSACTION_REQUIRED|TRANSACTION_ROLLEDBACK|TransactionRequiredException|TransactionRolledbackException|TransactionService|Transferable|TransferHandler|TransformAttribute|Transformer|TransformerConfigurationException|TransformerException|TransformerFactory|TransformerFactoryConfigurationError|TransformerHandler|TRANSIENT|Transmitter|Transparency|TRANSPORT_RETRY|TreeCellEditor|TreeCellRenderer|TreeExpansionEvent|TreeExpansionListener|TreeMap|TreeModel|TreeModelEvent|TreeModelListener|TreeNode|TreePath|TreeSelectionEvent|TreeSelectionListener|TreeSelectionModel|TreeSet|TreeUI|TreeWillExpandListener|TrustAnchor|TrustManager|TrustManagerFactory|TrustManagerFactorySpi|TypeCode|TypeCodeHolder|TypeMismatch|TypeMismatchHelper|Types|UID|UIDefaults|UIManager|UIResource|ULongLongSeqHelper|ULongLongSeqHolder|ULongSeqHelper|ULongSeqHolder|UndeclaredThrowableException|UndoableEdit|UndoableEditEvent|UndoableEditListener|UndoableEditSupport|UndoManager|UnexpectedException|UnicastRemoteObject|UnionMember|UnionMemberHelper|UNKNOWN|UnknownEncoding|UnknownEncodingHelper|UnknownError|UnknownException|UnknownGroupException|UnknownHostException|UnknownObjectException|UnknownServiceException|UnknownUserException|UnknownUserExceptionHelper|UnknownUserExceptionHolder|UnmappableCharacterException|UnmarshalException|UnmodifiableSetException|UnrecoverableKeyException|Unreferenced|UnresolvedAddressException|UnresolvedPermission|UnsatisfiedLinkError|UnsolicitedNotification|UnsolicitedNotificationEvent|UnsolicitedNotificationListener|UNSUPPORTED_POLICY|UNSUPPORTED_POLICY_VALUE|UnsupportedAddressTypeException|UnsupportedAudioFileException|UnsupportedCallbackException|UnsupportedCharsetException|UnsupportedClassVersionError|UnsupportedEncodingException|UnsupportedFlavorException|UnsupportedLookAndFeelException|UnsupportedOperationException|URI|URIException|URIResolver|URISyntax|URISyntaxException|URL|URLClassLoader|URLConnection|URLDecoder|URLEncoder|URLStreamHandler|URLStreamHandlerFactory|URLStringHelper|USER_EXCEPTION|UserException|UShortSeqHelper|UShortSeqHolder|UTFDataFormatException|Util|UtilDelegate|Utilities|ValueBase|ValueBaseHelper|ValueBaseHolder|ValueFactory|ValueHandler|ValueMember|ValueMemberHelper|VariableHeightLayoutCache|Vector|VerifyError|VersionSpecHelper|VetoableChangeListener|VetoableChangeListenerProxy|VetoableChangeSupport|View|ViewFactory|ViewportLayout|ViewportUI|VirtualMachineError|Visibility|VisibilityHelper|VM_ABSTRACT|VM_CUSTOM|VM_NONE|VM_TRUNCATABLE|VMID|VoiceStatus|Void|VolatileImage|WCharSeqHelper|WCharSeqHolder|WeakHashMap|WeakReference|Window|WindowAdapter|WindowConstants|WindowEvent|WindowFocusListener|WindowListener|WindowStateListener|WrappedPlainView|WritableByteChannel|WritableRaster|WritableRenderedImage|WriteAbortedException|Writer|WrongAdapter|WrongAdapterHelper|WrongPolicy|WrongPolicyHelper|WrongTransaction|WrongTransactionHelper|WrongTransactionHolder|WStringSeqHelper|WStringSeqHolder|WStringValueHelper|X500Principal|X500PrivateCredential|X509Certificate|X509CertSelector|X509CRL|X509CRLEntry|X509CRLSelector|X509EncodedKeySpec|X509Extension|X509KeyManager|X509TrustManager|XAConnection|XADataSource|XAException|XAResource|Xid|XMLDecoder|XMLEncoder|XMLFilter|XMLFilterImpl|XMLFormatter|XMLReader|XMLReaderAdapter|XMLReaderFactory|ZipEntry|ZipException|ZipFile|ZipInputStream|ZipOutputStream|ZoneView|_BindingIteratorImplBase|_BindingIteratorStub|_DynAnyFactoryStub|_DynAnyStub|_DynArrayStub|_DynEnumStub|_DynFixedStub|_DynSequenceStub|_DynStructStub|_DynUnionStub|_DynValueStub|_IDLTypeStub|_NamingContextExtStub|_NamingContextImplBase|_NamingContextStub|_PolicyStub|_Remote_Stub|_ServantActivatorStub|_ServantLocatorStub)$/',
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+            ),
+            0 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => 
+                array (
+                    'types' => '/^(boolean|byte|char|const|double|final|float|int|long|short|static|void)$/',
+                    'reserved' => '/^(import|package|abstract|break|case|catch|class|continue|default|do|else|extends|false|finally|for|goto|if|implements|instanceof|interface|native|new|null|private|protected|public|return|super|strictfp|switch|synchronized|this|throws|throw|transient|true|try|volatile|while)$/',
+                    'builtin' => '/^(AbstractAction|AbstractBorder|AbstractButton|AbstractCellEditor|AbstractCollection|AbstractColorChooserPanel|AbstractDocument|AbstractInterruptibleChannel|AbstractLayoutCache|AbstractList|AbstractListModel|AbstractMap|AbstractMethodError|AbstractPreferences|AbstractSelectableChannel|AbstractSelectionKey|AbstractSelector|AbstractSequentialList|AbstractSet|AbstractSpinnerModel|AbstractTableModel|AbstractUndoableEdit|AbstractWriter|AccessControlContext|AccessControlException|AccessController|AccessException|Accessible|AccessibleAction|AccessibleBundle|AccessibleComponent|AccessibleContext|AccessibleEditableText|AccessibleExtendedComponent|AccessibleExtendedTable|AccessibleHyperlink|AccessibleHypertext|AccessibleIcon|AccessibleKeyBinding|AccessibleObject|AccessibleRelation|AccessibleRelationSet|AccessibleResourceBundle|AccessibleRole|AccessibleSelection|AccessibleState|AccessibleStateSet|AccessibleTable|AccessibleTableModelChange|AccessibleText|AccessibleValue|AccountExpiredException|Acl|AclEntry|AclNotFoundException|Action|ActionEvent|ActionListener|ActionMap|ActionMapUIResource|Activatable|ActivateFailedException|ActivationDesc|ActivationException|ActivationGroup|ActivationGroup_Stub|ActivationGroupDesc|ActivationGroupID|ActivationID|ActivationInstantiator|ActivationMonitor|ActivationSystem|Activator|ActiveEvent|AdapterActivator|AdapterActivatorOperations|AdapterAlreadyExists|AdapterAlreadyExistsHelper|AdapterInactive|AdapterInactiveHelper|AdapterNonExistent|AdapterNonExistentHelper|AddressHelper|Adjustable|AdjustmentEvent|AdjustmentListener|Adler32|AffineTransform|AffineTransformOp|AlgorithmParameterGenerator|AlgorithmParameterGeneratorSpi|AlgorithmParameters|AlgorithmParameterSpec|AlgorithmParametersSpi|AllPermission|AlphaComposite|AlreadyBound|AlreadyBoundException|AlreadyBoundHelper|AlreadyBoundHolder|AlreadyConnectedException|AncestorEvent|AncestorListener|Annotation|Any|AnyHolder|AnySeqHelper|AnySeqHolder|AppConfigurationEntry|Applet|AppletContext|AppletInitializer|AppletStub|ApplicationException|Arc2D|Area|AreaAveragingScaleFilter|ARG_IN|ARG_INOUT|ARG_OUT|ArithmeticException|Array|ArrayIndexOutOfBoundsException|ArrayList|Arrays|ArrayStoreException|AssertionError|AsyncBoxView|AsynchronousCloseException|Attr|Attribute|AttributedCharacterIterator|AttributedString|AttributeException|AttributeInUseException|AttributeList|AttributeListImpl|AttributeModificationException|Attributes|AttributeSet|AttributeSetUtilities|AttributesImpl|AudioClip|AudioFileFormat|AudioFileReader|AudioFileWriter|AudioFormat|AudioInputStream|AudioPermission|AudioSystem|AuthenticationException|AuthenticationNotSupportedException|Authenticator|AuthPermission|Autoscroll|AWTError|AWTEvent|AWTEventListener|AWTEventListenerProxy|AWTEventMulticaster|AWTException|AWTKeyStroke|AWTPermission|BackingStoreException|BAD_CONTEXT|BAD_INV_ORDER|BAD_OPERATION|BAD_PARAM|BAD_POLICY|BAD_POLICY_TYPE|BAD_POLICY_VALUE|BAD_TYPECODE|BadKind|BadLocationException|BadPaddingException|BandCombineOp|BandedSampleModel|BasicArrowButton|BasicAttribute|BasicAttributes|BasicBorders|BasicButtonListener|BasicButtonUI|BasicCheckBoxMenuItemUI|BasicCheckBoxUI|BasicColorChooserUI|BasicComboBoxEditor|BasicComboBoxRenderer|BasicComboBoxUI|BasicComboPopup|BasicDesktopIconUI|BasicDesktopPaneUI|BasicDirectoryModel|BasicEditorPaneUI|BasicFileChooserUI|BasicFormattedTextFieldUI|BasicGraphicsUtils|BasicHTML|BasicIconFactory|BasicInternalFrameTitlePane|BasicInternalFrameUI|BasicLabelUI|BasicListUI|BasicLookAndFeel|BasicMenuBarUI|BasicMenuItemUI|BasicMenuUI|BasicOptionPaneUI|BasicPanelUI|BasicPasswordFieldUI|BasicPermission|BasicPopupMenuSeparatorUI|BasicPopupMenuUI|BasicProgressBarUI|BasicRadioButtonMenuItemUI|BasicRadioButtonUI|BasicRootPaneUI|BasicScrollBarUI|BasicScrollPaneUI|BasicSeparatorUI|BasicSliderUI|BasicSpinnerUI|BasicSplitPaneDivider|BasicSplitPaneUI|BasicStroke|BasicTabbedPaneUI|BasicTableHeaderUI|BasicTableUI|BasicTextAreaUI|BasicTextFieldUI|BasicTextPaneUI|BasicTextUI|BasicToggleButtonUI|BasicToolBarSeparatorUI|BasicToolBarUI|BasicToolTipUI|BasicTreeUI|BasicViewportUI|BatchUpdateException|BeanContext|BeanContextChild|BeanContextChildComponentProxy|BeanContextChildSupport|BeanContextContainerProxy|BeanContextEvent|BeanContextMembershipEvent|BeanContextMembershipListener|BeanContextProxy|BeanContextServiceAvailableEvent|BeanContextServiceProvider|BeanContextServiceProviderBeanInfo|BeanContextServiceRevokedEvent|BeanContextServiceRevokedListener|BeanContextServices|BeanContextServicesListener|BeanContextServicesSupport|BeanContextSupport|BeanDescriptor|BeanInfo|Beans|BevelBorder|Bidi|BigDecimal|BigInteger|BinaryRefAddr|BindException|Binding|BindingHelper|BindingHolder|BindingIterator|BindingIteratorHelper|BindingIteratorHolder|BindingIteratorOperations|BindingIteratorPOA|BindingListHelper|BindingListHolder|BindingType|BindingTypeHelper|BindingTypeHolder|BitSet|Blob|BlockView|Book|Boolean|BooleanControl|BooleanHolder|BooleanSeqHelper|BooleanSeqHolder|Border|BorderFactory|BorderLayout|BorderUIResource|BoundedRangeModel|Bounds|Box|BoxedValueHelper|BoxLayout|BoxView|BreakIterator|Buffer|BufferCapabilities|BufferedImage|BufferedImageFilter|BufferedImageOp|BufferedInputStream|BufferedOutputStream|BufferedReader|BufferedWriter|BufferOverflowException|BufferStrategy|BufferUnderflowException|Button|ButtonGroup|ButtonModel|ButtonUI|Byte|ByteArrayInputStream|ByteArrayOutputStream|ByteBuffer|ByteChannel|ByteHolder|ByteLookupTable|ByteOrder|Calendar|CallableStatement|Callback|CallbackHandler|CancelablePrintJob|CancelledKeyException|CannotProceed|CannotProceedException|CannotProceedHelper|CannotProceedHolder|CannotRedoException|CannotUndoException|Canvas|CardLayout|Caret|CaretEvent|CaretListener|CDATASection|CellEditor|CellEditorListener|CellRendererPane|Certificate|CertificateEncodingException|CertificateException|CertificateExpiredException|CertificateFactory|CertificateFactorySpi|CertificateNotYetValidException|CertificateParsingException|CertPath|CertPathBuilder|CertPathBuilderException|CertPathBuilderResult|CertPathBuilderSpi|CertPathParameters|CertPathValidator|CertPathValidatorException|CertPathValidatorResult|CertPathValidatorSpi|CertSelector|CertStore|CertStoreException|CertStoreParameters|CertStoreSpi|ChangedCharSetException|ChangeEvent|ChangeListener|Channel|ChannelBinding|Channels|Character|CharacterCodingException|CharacterData|CharacterIterator|CharArrayReader|CharArrayWriter|CharBuffer|CharConversionException|CharHolder|CharSeqHelper|CharSeqHolder|CharSequence|Charset|CharsetDecoder|CharsetEncoder|CharsetProvider|Checkbox|CheckboxGroup|CheckboxMenuItem|CheckedInputStream|CheckedOutputStream|Checksum|Choice|ChoiceCallback|ChoiceFormat|Chromaticity|Cipher|CipherInputStream|CipherOutputStream|CipherSpi|Class|ClassCastException|ClassCircularityError|ClassDesc|ClassFormatError|ClassLoader|ClassNotFoundException|ClientRequestInfo|ClientRequestInfoOperations|ClientRequestInterceptor|ClientRequestInterceptorOperations|Clip|Clipboard|ClipboardOwner|Clob|Cloneable|CloneNotSupportedException|ClosedByInterruptException|ClosedChannelException|ClosedSelectorException|CMMException|Codec|CodecFactory|CodecFactoryHelper|CodecFactoryOperations|CodecOperations|CoderMalfunctionError|CoderResult|CodeSets|CodeSource|CodingErrorAction|CollationElementIterator|CollationKey|Collator|Collection|CollectionCertStoreParameters|Collections|Color|ColorChooserComponentFactory|ColorChooserUI|ColorConvertOp|ColorModel|ColorSelectionModel|ColorSpace|ColorSupported|ColorUIResource|ComboBoxEditor|ComboBoxModel|ComboBoxUI|ComboPopup|COMM_FAILURE|Comment|CommunicationException|Comparable|Comparator|Compiler|CompletionStatus|CompletionStatusHelper|Component|ComponentAdapter|ComponentColorModel|ComponentEvent|ComponentIdHelper|ComponentInputMap|ComponentInputMapUIResource|ComponentListener|ComponentOrientation|ComponentSampleModel|ComponentUI|ComponentView|Composite|CompositeContext|CompositeName|CompositeView|CompoundBorder|CompoundControl|CompoundEdit|CompoundName|Compression|ConcurrentModificationException|Configuration|ConfigurationException|ConfirmationCallback|ConnectException|ConnectIOException|Connection|ConnectionEvent|ConnectionEventListener|ConnectionPendingException|ConnectionPoolDataSource|ConsoleHandler|Constructor|Container|ContainerAdapter|ContainerEvent|ContainerListener|ContainerOrderFocusTraversalPolicy|ContentHandler|ContentHandlerFactory|ContentModel|Context|ContextList|ContextNotEmptyException|ContextualRenderedImageFactory|Control|ControlFactory|ControllerEventListener|ConvolveOp|CookieHolder|Copies|CopiesSupported|CRC32|CredentialExpiredException|CRL|CRLException|CRLSelector|CropImageFilter|CSS|CTX_RESTRICT_SCOPE|CubicCurve2D|Currency|Current|CurrentHelper|CurrentHolder|CurrentOperations|Cursor|Customizer|CustomMarshal|CustomValue|DATA_CONVERSION|DatabaseMetaData|DataBuffer|DataBufferByte|DataBufferDouble|DataBufferFloat|DataBufferInt|DataBufferShort|DataBufferUShort|DataFlavor|DataFormatException|DatagramChannel|DatagramPacket|DatagramSocket|DatagramSocketImpl|DatagramSocketImplFactory|DataInput|DataInputStream|DataLine|DataOutput|DataOutputStream|DataSource|DataTruncation|Date|DateFormat|DateFormatSymbols|DateFormatter|DateTimeAtCompleted|DateTimeAtCreation|DateTimeAtProcessing|DateTimeSyntax|DebugGraphics|DecimalFormat|DecimalFormatSymbols|DeclHandler|DefaultBoundedRangeModel|DefaultButtonModel|DefaultCaret|DefaultCellEditor|DefaultColorSelectionModel|DefaultComboBoxModel|DefaultDesktopManager|DefaultEditorKit|DefaultFocusManager|DefaultFocusTraversalPolicy|DefaultFormatter|DefaultFormatterFactory|DefaultHandler|DefaultHighlighter|DefaultKeyboardFocusManager|DefaultListCellRenderer|DefaultListModel|DefaultListSelectionModel|DefaultMenuLayout|DefaultMetalTheme|DefaultMutableTreeNode|DefaultPersistenceDelegate|DefaultSingleSelectionModel|DefaultStyledDocument|DefaultTableCellRenderer|DefaultTableColumnModel|DefaultTableModel|DefaultTextUI|DefaultTreeCellEditor|DefaultTreeCellRenderer|DefaultTreeModel|DefaultTreeSelectionModel|DefinitionKind|DefinitionKindHelper|Deflater|DeflaterOutputStream|Delegate|DelegationPermission|DESedeKeySpec|DesignMode|DESKeySpec|DesktopIconUI|DesktopManager|DesktopPaneUI|Destination|Destroyable|DestroyFailedException|DGC|DHGenParameterSpec|DHKey|DHParameterSpec|DHPrivateKey|DHPrivateKeySpec|DHPublicKey|DHPublicKeySpec|Dialog|Dictionary|DigestException|DigestInputStream|DigestOutputStream|Dimension|Dimension2D|DimensionUIResource|DirContext|DirectColorModel|DirectoryManager|DirObjectFactory|DirStateFactory|DisplayMode|DnDConstants|Doc|DocAttribute|DocAttributeSet|DocFlavor|DocPrintJob|Document|DocumentBuilder|DocumentBuilderFactory|DocumentEvent|DocumentFilter|DocumentFragment|DocumentHandler|DocumentListener|DocumentName|DocumentParser|DocumentType|DomainCombiner|DomainManager|DomainManagerOperations|DOMException|DOMImplementation|DOMLocator|DOMResult|DOMSource|Double|DoubleBuffer|DoubleHolder|DoubleSeqHelper|DoubleSeqHolder|DragGestureEvent|DragGestureListener|DragGestureRecognizer|DragSource|DragSourceAdapter|DragSourceContext|DragSourceDragEvent|DragSourceDropEvent|DragSourceEvent|DragSourceListener|DragSourceMotionListener|Driver|DriverManager|DriverPropertyInfo|DropTarget|DropTargetAdapter|DropTargetContext|DropTargetDragEvent|DropTargetDropEvent|DropTargetEvent|DropTargetListener|DSAKey|DSAKeyPairGenerator|DSAParameterSpec|DSAParams|DSAPrivateKey|DSAPrivateKeySpec|DSAPublicKey|DSAPublicKeySpec|DTD|DTDConstants|DTDHandler|DuplicateName|DuplicateNameHelper|DynamicImplementation|DynAny|DynAnyFactory|DynAnyFactoryHelper|DynAnyFactoryOperations|DynAnyHelper|DynAnyOperations|DynAnySeqHelper|DynArray|DynArrayHelper|DynArrayOperations|DynEnum|DynEnumHelper|DynEnumOperations|DynFixed|DynFixedHelper|DynFixedOperations|DynSequence|DynSequenceHelper|DynSequenceOperations|DynStruct|DynStructHelper|DynStructOperations|DynUnion|DynUnionHelper|DynUnionOperations|DynValue|DynValueBox|DynValueBoxOperations|DynValueCommon|DynValueCommonOperations|DynValueHelper|DynValueOperations|EditorKit|Element|ElementIterator|Ellipse2D|EmptyBorder|EmptyStackException|EncodedKeySpec|Encoder|Encoding|ENCODING_CDR_ENCAPS|EncryptedPrivateKeyInfo|Entity|EntityReference|EntityResolver|EnumControl|Enumeration|EnumSyntax|Environment|EOFException|Error|ErrorHandler|ErrorListener|ErrorManager|EtchedBorder|Event|EventContext|EventDirContext|EventHandler|EventListener|EventListenerList|EventListenerProxy|EventObject|EventQueue|EventSetDescriptor|Exception|ExceptionInInitializerError|ExceptionList|ExceptionListener|ExemptionMechanism|ExemptionMechanismException|ExemptionMechanismSpi|ExpandVetoException|ExportException|Expression|ExtendedRequest|ExtendedResponse|Externalizable|FactoryConfigurationError|FailedLoginException|FeatureDescriptor|Fidelity|Field|FieldNameHelper|FieldPosition|FieldView|File|FileCacheImageInputStream|FileCacheImageOutputStream|FileChannel|FileChooserUI|FileDescriptor|FileDialog|FileFilter|FileHandler|FileImageInputStream|FileImageOutputStream|FileInputStream|FileLock|FileLockInterruptionException|FilenameFilter|FileNameMap|FileNotFoundException|FileOutputStream|FilePermission|FileReader|FileSystemView|FileView|FileWriter|Filter|FilteredImageSource|FilterInputStream|FilterOutputStream|FilterReader|FilterWriter|Finishings|FixedHeightLayoutCache|FixedHolder|FlatteningPathIterator|FlavorException|FlavorMap|FlavorTable|Float|FloatBuffer|FloatControl|FloatHolder|FloatSeqHelper|FloatSeqHolder|FlowLayout|FlowView|FocusAdapter|FocusEvent|FocusListener|FocusManager|FocusTraversalPolicy|Font|FontFormatException|FontMetrics|FontRenderContext|FontUIResource|Format|FormatConversionProvider|FormatMismatch|FormatMismatchHelper|Formatter|FormView|ForwardRequest|ForwardRequestHelper|Frame|FREE_MEM|GapContent|GatheringByteChannel|GeneralPath|GeneralSecurityException|GlyphJustificationInfo|GlyphMetrics|GlyphVector|GlyphView|GradientPaint|GraphicAttribute|Graphics|Graphics2D|GraphicsConfigTemplate|GraphicsConfiguration|GraphicsDevice|GraphicsEnvironment|GrayFilter|GregorianCalendar|GridBagConstraints|GridBagLayout|GridLayout|Group|GSSContext|GSSCredential|GSSException|GSSManager|GSSName|Guard|GuardedObject|GZIPInputStream|GZIPOutputStream|Handler|HandlerBase|HandshakeCompletedEvent|HandshakeCompletedListener|HasControls|HashAttributeSet|HashDocAttributeSet|HashMap|HashPrintJobAttributeSet|HashPrintRequestAttributeSet|HashPrintServiceAttributeSet|HashSet|Hashtable|HeadlessException|HierarchyBoundsAdapter|HierarchyBoundsListener|HierarchyEvent|HierarchyListener|Highlighter|HostnameVerifier|HTML|HTMLDocument|HTMLEditorKit|HTMLFrameHyperlinkEvent|HTMLWriter|HttpsURLConnection|HttpURLConnection|HyperlinkEvent|HyperlinkListener|ICC_ColorSpace|ICC_Profile|ICC_ProfileGray|ICC_ProfileRGB|Icon|IconUIResource|IconView|ID_ASSIGNMENT_POLICY_ID|ID_UNIQUENESS_POLICY_ID|IdAssignmentPolicy|IdAssignmentPolicyOperations|IdAssignmentPolicyValue|IdentifierHelper|Identity|IdentityHashMap|IdentityScope|IDLEntity|IDLType|IDLTypeHelper|IDLTypeOperations|IdUniquenessPolicy|IdUniquenessPolicyOperations|IdUniquenessPolicyValue|IIOByteBuffer|IIOException|IIOImage|IIOInvalidTreeException|IIOMetadata|IIOMetadataController|IIOMetadataFormat|IIOMetadataFormatImpl|IIOMetadataNode|IIOParam|IIOParamController|IIOReadProgressListener|IIOReadUpdateListener|IIOReadWarningListener|IIORegistry|IIOServiceProvider|IIOWriteProgressListener|IIOWriteWarningListener|IllegalAccessError|IllegalAccessException|IllegalArgumentException|IllegalBlockingModeException|IllegalBlockSizeException|IllegalCharsetNameException|IllegalComponentStateException|IllegalMonitorStateException|IllegalPathStateException|IllegalSelectorException|IllegalStateException|IllegalThreadStateException|Image|ImageCapabilities|ImageConsumer|ImageFilter|ImageGraphicAttribute|ImageIcon|ImageInputStream|ImageInputStreamImpl|ImageInputStreamSpi|ImageIO|ImageObserver|ImageOutputStream|ImageOutputStreamImpl|ImageOutputStreamSpi|ImageProducer|ImageReader|ImageReaderSpi|ImageReaderWriterSpi|ImageReadParam|ImageTranscoder|ImageTranscoderSpi|ImageTypeSpecifier|ImageView|ImageWriteParam|ImageWriter|ImageWriterSpi|ImagingOpException|IMP_LIMIT|IMPLICIT_ACTIVATION_POLICY_ID|ImplicitActivationPolicy|ImplicitActivationPolicyOperations|ImplicitActivationPolicyValue|IncompatibleClassChangeError|InconsistentTypeCode|InconsistentTypeCodeHelper|IndexColorModel|IndexedPropertyDescriptor|IndexOutOfBoundsException|IndirectionException|Inet4Address|Inet6Address|InetAddress|InetSocketAddress|Inflater|InflaterInputStream|InheritableThreadLocal|InitialContext|InitialContextFactory|InitialContextFactoryBuilder|InitialDirContext|INITIALIZE|InitialLdapContext|InlineView|InputContext|InputEvent|InputMap|InputMapUIResource|InputMethod|InputMethodContext|InputMethodDescriptor|InputMethodEvent|InputMethodHighlight|InputMethodListener|InputMethodRequests|InputSource|InputStream|InputStreamReader|InputSubset|InputVerifier|Insets|InsetsUIResource|InstantiationError|InstantiationException|Instrument|InsufficientResourcesException|IntBuffer|Integer|IntegerSyntax|Interceptor|InterceptorOperations|INTERNAL|InternalError|InternalFrameAdapter|InternalFrameEvent|InternalFrameFocusTraversalPolicy|InternalFrameListener|InternalFrameUI|InternationalFormatter|InterruptedException|InterruptedIOException|InterruptedNamingException|InterruptibleChannel|INTF_REPOS|IntHolder|IntrospectionException|Introspector|INV_FLAG|INV_IDENT|INV_OBJREF|INV_POLICY|Invalid|INVALID_TRANSACTION|InvalidAddress|InvalidAddressHelper|InvalidAddressHolder|InvalidAlgorithmParameterException|InvalidAttributeIdentifierException|InvalidAttributesException|InvalidAttributeValueException|InvalidClassException|InvalidDnDOperationException|InvalidKeyException|InvalidKeySpecException|InvalidMarkException|InvalidMidiDataException|InvalidName|InvalidNameException|InvalidNameHelper|InvalidNameHolder|InvalidObjectException|InvalidParameterException|InvalidParameterSpecException|InvalidPolicy|InvalidPolicyHelper|InvalidPreferencesFormatException|InvalidSearchControlsException|InvalidSearchFilterException|InvalidSeq|InvalidSlot|InvalidSlotHelper|InvalidTransactionException|InvalidTypeForEncoding|InvalidTypeForEncodingHelper|InvalidValue|InvalidValueHelper|InvocationEvent|InvocationHandler|InvocationTargetException|InvokeHandler|IOException|IOR|IORHelper|IORHolder|IORInfo|IORInfoOperations|IORInterceptor|IORInterceptorOperations|IRObject|IRObjectOperations|IstringHelper|ItemEvent|ItemListener|ItemSelectable|Iterator|IvParameterSpec|JApplet|JarEntry|JarException|JarFile|JarInputStream|JarOutputStream|JarURLConnection|JButton|JCheckBox|JCheckBoxMenuItem|JColorChooser|JComboBox|JComponent|JDesktopPane|JDialog|JEditorPane|JFileChooser|JFormattedTextField|JFrame|JInternalFrame|JLabel|JLayeredPane|JList|JMenu|JMenuBar|JMenuItem|JobAttributes|JobHoldUntil|JobImpressions|JobImpressionsCompleted|JobImpressionsSupported|JobKOctets|JobKOctetsProcessed|JobKOctetsSupported|JobMediaSheets|JobMediaSheetsCompleted|JobMediaSheetsSupported|JobMessageFromOperator|JobName|JobOriginatingUserName|JobPriority|JobPrioritySupported|JobSheets|JobState|JobStateReason|JobStateReasons|JOptionPane|JPanel|JPasswordField|JPEGHuffmanTable|JPEGImageReadParam|JPEGImageWriteParam|JPEGQTable|JPopupMenu|JProgressBar|JRadioButton|JRadioButtonMenuItem|JRootPane|JScrollBar|JScrollPane|JSeparator|JSlider|JSpinner|JSplitPane|JTabbedPane|JTable|JTableHeader|JTextArea|JTextComponent|JTextField|JTextPane|JToggleButton|JToolBar|JToolTip|JTree|JViewport|JWindow|KerberosKey|KerberosPrincipal|KerberosTicket|Kernel|Key|KeyAdapter|KeyAgreement|KeyAgreementSpi|KeyboardFocusManager|KeyEvent|KeyEventDispatcher|KeyEventPostProcessor|KeyException|KeyFactory|KeyFactorySpi|KeyGenerator|KeyGeneratorSpi|KeyListener|KeyManagementException|KeyManager|KeyManagerFactory|KeyManagerFactorySpi|Keymap|KeyPair|KeyPairGenerator|KeyPairGeneratorSpi|KeySpec|KeyStore|KeyStoreException|KeyStoreSpi|KeyStroke|Label|LabelUI|LabelView|LanguageCallback|LastOwnerException|LayeredHighlighter|LayoutFocusTraversalPolicy|LayoutManager|LayoutManager2|LayoutQueue|LDAPCertStoreParameters|LdapContext|LdapReferralException|Lease|Level|LexicalHandler|LIFESPAN_POLICY_ID|LifespanPolicy|LifespanPolicyOperations|LifespanPolicyValue|LimitExceededException|Line|Line2D|LineBorder|LineBreakMeasurer|LineEvent|LineListener|LineMetrics|LineNumberInputStream|LineNumberReader|LineUnavailableException|LinkageError|LinkedHashMap|LinkedHashSet|LinkedList|LinkException|LinkLoopException|LinkRef|List|ListCellRenderer|ListDataEvent|ListDataListener|ListIterator|ListModel|ListResourceBundle|ListSelectionEvent|ListSelectionListener|ListSelectionModel|ListUI|ListView|LoaderHandler|Locale|LocalObject|LocateRegistry|LOCATION_FORWARD|Locator|LocatorImpl|Logger|LoggingPermission|LoginContext|LoginException|LoginModule|LogManager|LogRecord|LogStream|Long|LongBuffer|LongHolder|LongLongSeqHelper|LongLongSeqHolder|LongSeqHelper|LongSeqHolder|LookAndFeel|LookupOp|LookupTable|Mac|MacSpi|MalformedInputException|MalformedLinkException|MalformedURLException|ManagerFactoryParameters|Manifest|Map|MappedByteBuffer|MARSHAL|MarshalException|MarshalledObject|MaskFormatter|Matcher|Math|MatteBorder|Media|MediaName|MediaPrintableArea|MediaSize|MediaSizeName|MediaTracker|MediaTray|Member|MemoryCacheImageInputStream|MemoryCacheImageOutputStream|MemoryHandler|MemoryImageSource|Menu|MenuBar|MenuBarUI|MenuComponent|MenuContainer|MenuDragMouseEvent|MenuDragMouseListener|MenuElement|MenuEvent|MenuItem|MenuItemUI|MenuKeyEvent|MenuKeyListener|MenuListener|MenuSelectionManager|MenuShortcut|MessageDigest|MessageDigestSpi|MessageFormat|MessageProp|MetaEventListener|MetalBorders|MetalButtonUI|MetalCheckBoxIcon|MetalCheckBoxUI|MetalComboBoxButton|MetalComboBoxEditor|MetalComboBoxIcon|MetalComboBoxUI|MetalDesktopIconUI|MetalFileChooserUI|MetalIconFactory|MetalInternalFrameTitlePane|MetalInternalFrameUI|MetalLabelUI|MetalLookAndFeel|MetalPopupMenuSeparatorUI|MetalProgressBarUI|MetalRadioButtonUI|MetalRootPaneUI|MetalScrollBarUI|MetalScrollButton|MetalScrollPaneUI|MetalSeparatorUI|MetalSliderUI|MetalSplitPaneUI|MetalTabbedPaneUI|MetalTextFieldUI|MetalTheme|MetalToggleButtonUI|MetalToolBarUI|MetalToolTipUI|MetalTreeUI|MetaMessage|Method|MethodDescriptor|MidiChannel|MidiDevice|MidiDeviceProvider|MidiEvent|MidiFileFormat|MidiFileReader|MidiFileWriter|MidiMessage|MidiSystem|MidiUnavailableException|MimeTypeParseException|MinimalHTMLWriter|MissingResourceException|Mixer|MixerProvider|ModificationItem|Modifier|MouseAdapter|MouseDragGestureRecognizer|MouseEvent|MouseInputAdapter|MouseInputListener|MouseListener|MouseMotionAdapter|MouseMotionListener|MouseWheelEvent|MouseWheelListener|MultiButtonUI|MulticastSocket|MultiColorChooserUI|MultiComboBoxUI|MultiDesktopIconUI|MultiDesktopPaneUI|MultiDoc|MultiDocPrintJob|MultiDocPrintService|MultiFileChooserUI|MultiInternalFrameUI|MultiLabelUI|MultiListUI|MultiLookAndFeel|MultiMenuBarUI|MultiMenuItemUI|MultiOptionPaneUI|MultiPanelUI|MultiPixelPackedSampleModel|MultipleComponentProfileHelper|MultipleComponentProfileHolder|MultipleDocumentHandling|MultipleMaster|MultiPopupMenuUI|MultiProgressBarUI|MultiRootPaneUI|MultiScrollBarUI|MultiScrollPaneUI|MultiSeparatorUI|MultiSliderUI|MultiSpinnerUI|MultiSplitPaneUI|MultiTabbedPaneUI|MultiTableHeaderUI|MultiTableUI|MultiTextUI|MultiToolBarUI|MultiToolTipUI|MultiTreeUI|MultiViewportUI|MutableAttributeSet|MutableComboBoxModel|MutableTreeNode|Name|NameAlreadyBoundException|NameCallback|NameClassPair|NameComponent|NameComponentHelper|NameComponentHolder|NamedNodeMap|NamedValue|NameDynAnyPair|NameDynAnyPairHelper|NameDynAnyPairSeqHelper|NameHelper|NameHolder|NameNotFoundException|NameParser|NamespaceChangeListener|NamespaceSupport|NameValuePair|NameValuePairHelper|NameValuePairSeqHelper|Naming|NamingContext|NamingContextExt|NamingContextExtHelper|NamingContextExtHolder|NamingContextExtOperations|NamingContextExtPOA|NamingContextHelper|NamingContextHolder|NamingContextOperations|NamingContextPOA|NamingEnumeration|NamingEvent|NamingException|NamingExceptionEvent|NamingListener|NamingManager|NamingSecurityException|NavigationFilter|NegativeArraySizeException|NetPermission|NetworkInterface|NO_IMPLEMENT|NO_MEMORY|NO_PERMISSION|NO_RESOURCES|NO_RESPONSE|NoClassDefFoundError|NoConnectionPendingException|NoContext|NoContextHelper|Node|NodeChangeEvent|NodeChangeListener|NodeList|NoInitialContextException|NoninvertibleTransformException|NonReadableChannelException|NonWritableChannelException|NoPermissionException|NoRouteToHostException|NoServant|NoServantHelper|NoSuchAlgorithmException|NoSuchAttributeException|NoSuchElementException|NoSuchFieldError|NoSuchFieldException|NoSuchMethodError|NoSuchMethodException|NoSuchObjectException|NoSuchPaddingException|NoSuchProviderException|NotActiveException|Notation|NotBoundException|NotContextException|NotEmpty|NotEmptyHelper|NotEmptyHolder|NotFound|NotFoundHelper|NotFoundHolder|NotFoundReason|NotFoundReasonHelper|NotFoundReasonHolder|NotOwnerException|NotSerializableException|NotYetBoundException|NotYetConnectedException|NullCipher|NullPointerException|Number|NumberFormat|NumberFormatException|NumberFormatter|NumberOfDocuments|NumberOfInterveningJobs|NumberUp|NumberUpSupported|NumericShaper|NVList|OBJ_ADAPTER|Object|OBJECT_NOT_EXIST|ObjectAlreadyActive|ObjectAlreadyActiveHelper|ObjectChangeListener|ObjectFactory|ObjectFactoryBuilder|ObjectHelper|ObjectHolder|ObjectIdHelper|ObjectImpl|ObjectInput|ObjectInputStream|ObjectInputValidation|ObjectNotActive|ObjectNotActiveHelper|ObjectOutput|ObjectOutputStream|ObjectStreamClass|ObjectStreamConstants|ObjectStreamException|ObjectStreamField|ObjectView|ObjID|Observable|Observer|OctetSeqHelper|OctetSeqHolder|Oid|OMGVMCID|OpenType|Operation|OperationNotSupportedException|Option|OptionalDataException|OptionPaneUI|ORB|ORBInitializer|ORBInitializerOperations|ORBInitInfo|ORBInitInfoOperations|OrientationRequested|OutOfMemoryError|OutputDeviceAssigned|OutputKeys|OutputStream|OutputStreamWriter|OverlappingFileLockException|OverlayLayout|Owner|Package|PackedColorModel|Pageable|PageAttributes|PageFormat|PageRanges|PagesPerMinute|PagesPerMinuteColor|Paint|PaintContext|PaintEvent|Panel|PanelUI|Paper|ParagraphView|Parameter|ParameterBlock|ParameterDescriptor|ParameterMetaData|ParameterMode|ParameterModeHelper|ParameterModeHolder|ParseException|ParsePosition|Parser|ParserAdapter|ParserConfigurationException|ParserDelegator|ParserFactory|PartialResultException|PasswordAuthentication|PasswordCallback|PasswordView|Patch|PathIterator|Pattern|PatternSyntaxException|PBEKey|PBEKeySpec|PBEParameterSpec|PDLOverrideSupported|Permission|PermissionCollection|Permissions|PERSIST_STORE|PersistenceDelegate|PhantomReference|Pipe|PipedInputStream|PipedOutputStream|PipedReader|PipedWriter|PixelGrabber|PixelInterleavedSampleModel|PKCS8EncodedKeySpec|PKIXBuilderParameters|PKIXCertPathBuilderResult|PKIXCertPathChecker|PKIXCertPathValidatorResult|PKIXParameters|PlainDocument|PlainView|POA|POAHelper|POAManager|POAManagerOperations|POAOperations|Point|Point2D|Policy|PolicyError|PolicyErrorCodeHelper|PolicyErrorHelper|PolicyErrorHolder|PolicyFactory|PolicyFactoryOperations|PolicyHelper|PolicyHolder|PolicyListHelper|PolicyListHolder|PolicyNode|PolicyOperations|PolicyQualifierInfo|PolicyTypeHelper|Polygon|PooledConnection|Popup|PopupFactory|PopupMenu|PopupMenuEvent|PopupMenuListener|PopupMenuUI|Port|PortableRemoteObject|PortableRemoteObjectDelegate|PortUnreachableException|Position|PreferenceChangeEvent|PreferenceChangeListener|Preferences|PreferencesFactory|PreparedStatement|PresentationDirection|Principal|PrincipalHolder|Printable|PrinterAbortException|PrinterException|PrinterGraphics|PrinterInfo|PrinterIOException|PrinterIsAcceptingJobs|PrinterJob|PrinterLocation|PrinterMakeAndModel|PrinterMessageFromOperator|PrinterMoreInfo|PrinterMoreInfoManufacturer|PrinterName|PrinterResolution|PrinterState|PrinterStateReason|PrinterStateReasons|PrinterURI|PrintEvent|PrintException|PrintGraphics|PrintJob|PrintJobAdapter|PrintJobAttribute|PrintJobAttributeEvent|PrintJobAttributeListener|PrintJobAttributeSet|PrintJobEvent|PrintJobListener|PrintQuality|PrintRequestAttribute|PrintRequestAttributeSet|PrintService|PrintServiceAttribute|PrintServiceAttributeEvent|PrintServiceAttributeListener|PrintServiceAttributeSet|PrintServiceLookup|PrintStream|PrintWriter|PRIVATE_MEMBER|PrivateCredentialPermission|PrivateKey|PrivilegedAction|PrivilegedActionException|PrivilegedExceptionAction|Process|ProcessingInstruction|ProfileDataException|ProfileIdHelper|ProgressBarUI|ProgressMonitor|ProgressMonitorInputStream|Properties|PropertyChangeEvent|PropertyChangeListener|PropertyChangeListenerProxy|PropertyChangeSupport|PropertyDescriptor|PropertyEditor|PropertyEditorManager|PropertyEditorSupport|PropertyPermission|PropertyResourceBundle|PropertyVetoException|ProtectionDomain|ProtocolException|Provider|ProviderException|Proxy|PSSParameterSpec|PUBLIC_MEMBER|PublicKey|PushbackInputStream|PushbackReader|QuadCurve2D|QueuedJobCount|Random|RandomAccess|RandomAccessFile|Raster|RasterFormatException|RasterOp|RC2ParameterSpec|RC5ParameterSpec|ReadableByteChannel|Reader|ReadOnlyBufferException|Receiver|Rectangle|Rectangle2D|RectangularShape|Ref|RefAddr|Reference|Referenceable|ReferenceQueue|ReferenceUriSchemesSupported|ReferralException|ReflectPermission|Refreshable|RefreshFailedException|RegisterableService|Registry|RegistryHandler|RemarshalException|Remote|RemoteCall|RemoteException|RemoteObject|RemoteRef|RemoteServer|RemoteStub|RenderableImage|RenderableImageOp|RenderableImageProducer|RenderContext|RenderedImage|RenderedImageFactory|Renderer|RenderingHints|RepaintManager|ReplicateScaleFilter|RepositoryIdHelper|Request|REQUEST_PROCESSING_POLICY_ID|RequestInfo|RequestInfoOperations|RequestingUserName|RequestProcessingPolicy|RequestProcessingPolicyOperations|RequestProcessingPolicyValue|RescaleOp|ResolutionSyntax|Resolver|ResolveResult|ResourceBundle|ResponseHandler|Result|ResultSet|ResultSetMetaData|ReverbType|RGBImageFilter|RMIClassLoader|RMIClassLoaderSpi|RMIClientSocketFactory|RMIFailureHandler|RMISecurityException|RMISecurityManager|RMIServerSocketFactory|RMISocketFactory|Robot|RootPaneContainer|RootPaneUI|RoundRectangle2D|RowMapper|RowSet|RowSetEvent|RowSetInternal|RowSetListener|RowSetMetaData|RowSetReader|RowSetWriter|RSAKey|RSAKeyGenParameterSpec|RSAMultiPrimePrivateCrtKey|RSAMultiPrimePrivateCrtKeySpec|RSAOtherPrimeInfo|RSAPrivateCrtKey|RSAPrivateCrtKeySpec|RSAPrivateKey|RSAPrivateKeySpec|RSAPublicKey|RSAPublicKeySpec|RTFEditorKit|RuleBasedCollator|Runnable|Runtime|RunTime|RuntimeException|RunTimeOperations|RuntimePermission|SampleModel|Savepoint|SAXException|SAXNotRecognizedException|SAXNotSupportedException|SAXParseException|SAXParser|SAXParserFactory|SAXResult|SAXSource|SAXTransformerFactory|ScatteringByteChannel|SchemaViolationException|Scrollable|Scrollbar|ScrollBarUI|ScrollPane|ScrollPaneAdjustable|ScrollPaneConstants|ScrollPaneLayout|ScrollPaneUI|SealedObject|SearchControls|SearchResult|SecretKey|SecretKeyFactory|SecretKeyFactorySpi|SecretKeySpec|SecureClassLoader|SecureRandom|SecureRandomSpi|Security|SecurityException|SecurityManager|SecurityPermission|Segment|SelectableChannel|SelectionKey|Selector|SelectorProvider|SeparatorUI|Sequence|SequenceInputStream|Sequencer|Serializable|SerializablePermission|Servant|SERVANT_RETENTION_POLICY_ID|ServantActivator|ServantActivatorHelper|ServantActivatorOperations|ServantActivatorPOA|ServantAlreadyActive|ServantAlreadyActiveHelper|ServantLocator|ServantLocatorHelper|ServantLocatorOperations|ServantLocatorPOA|ServantManager|ServantManagerOperations|ServantNotActive|ServantNotActiveHelper|ServantObject|ServantRetentionPolicy|ServantRetentionPolicyOperations|ServantRetentionPolicyValue|ServerCloneException|ServerError|ServerException|ServerNotActiveException|ServerRef|ServerRequest|ServerRequestInfo|ServerRequestInfoOperations|ServerRequestInterceptor|ServerRequestInterceptorOperations|ServerRuntimeException|ServerSocket|ServerSocketChannel|ServerSocketFactory|ServiceContext|ServiceContextHelper|ServiceContextHolder|ServiceContextListHelper|ServiceContextListHolder|ServiceDetail|ServiceDetailHelper|ServiceIdHelper|ServiceInformation|ServiceInformationHelper|ServiceInformationHolder|ServicePermission|ServiceRegistry|ServiceUI|ServiceUIFactory|ServiceUnavailableException|Set|SetOfIntegerSyntax|SetOverrideType|SetOverrideTypeHelper|Severity|Shape|ShapeGraphicAttribute|SheetCollate|Short|ShortBuffer|ShortBufferException|ShortHolder|ShortLookupTable|ShortMessage|ShortSeqHelper|ShortSeqHolder|Sides|Signature|SignatureException|SignatureSpi|SignedObject|Signer|SimpleAttributeSet|SimpleBeanInfo|SimpleDateFormat|SimpleDoc|SimpleFormatter|SimpleTimeZone|SinglePixelPackedSampleModel|SingleSelectionModel|Size2DSyntax|SizeLimitExceededException|SizeRequirements|SizeSequence|Skeleton|SkeletonMismatchException|SkeletonNotFoundException|SliderUI|Socket|SocketAddress|SocketChannel|SocketException|SocketFactory|SocketHandler|SocketImpl|SocketImplFactory|SocketOptions|SocketPermission|SocketSecurityException|SocketTimeoutException|SoftBevelBorder|SoftReference|SortedMap|SortedSet|SortingFocusTraversalPolicy|Soundbank|SoundbankReader|SoundbankResource|Source|SourceDataLine|SourceLocator|SpinnerDateModel|SpinnerListModel|SpinnerModel|SpinnerNumberModel|SpinnerUI|SplitPaneUI|Spring|SpringLayout|SQLData|SQLException|SQLInput|SQLOutput|SQLPermission|SQLWarning|SSLContext|SSLContextSpi|SSLException|SSLHandshakeException|SSLKeyException|SSLPeerUnverifiedException|SSLPermission|SSLProtocolException|SSLServerSocket|SSLServerSocketFactory|SSLSession|SSLSessionBindingEvent|SSLSessionBindingListener|SSLSessionContext|SSLSocket|SSLSocketFactory|Stack|StackOverflowError|StackTraceElement|StartTlsRequest|StartTlsResponse|State|StateEdit|StateEditable|StateFactory|Statement|Streamable|StreamableValue|StreamCorruptedException|StreamHandler|StreamPrintService|StreamPrintServiceFactory|StreamResult|StreamSource|StreamTokenizer|StrictMath|String|StringBuffer|StringBufferInputStream|StringCharacterIterator|StringContent|StringHolder|StringIndexOutOfBoundsException|StringNameHelper|StringReader|StringRefAddr|StringSelection|StringSeqHelper|StringSeqHolder|StringTokenizer|StringValueHelper|StringWriter|Stroke|Struct|StructMember|StructMemberHelper|Stub|StubDelegate|StubNotFoundException|Style|StyleConstants|StyleContext|StyledDocument|StyledEditorKit|StyleSheet|Subject|SubjectDomainCombiner|SUCCESSFUL|SupportedValuesAttribute|SwingConstants|SwingPropertyChangeSupport|SwingUtilities|SYNC_WITH_TRANSPORT|SyncFailedException|SyncScopeHelper|Synthesizer|SysexMessage|System|SYSTEM_EXCEPTION|SystemColor|SystemException|SystemFlavorMap|TabableView|TabbedPaneUI|TabExpander|TableCellEditor|TableCellRenderer|TableColumn|TableColumnModel|TableColumnModelEvent|TableColumnModelListener|TableHeaderUI|TableModel|TableModelEvent|TableModelListener|TableUI|TableView|TabSet|TabStop|TAG_ALTERNATE_IIOP_ADDRESS|TAG_CODE_SETS|TAG_INTERNET_IOP|TAG_JAVA_CODEBASE|TAG_MULTIPLE_COMPONENTS|TAG_ORB_TYPE|TAG_POLICIES|TagElement|TaggedComponent|TaggedComponentHelper|TaggedComponentHolder|TaggedProfile|TaggedProfileHelper|TaggedProfileHolder|TargetDataLine|TCKind|Templates|TemplatesHandler|Text|TextAction|TextArea|TextAttribute|TextComponent|TextEvent|TextField|TextHitInfo|TextInputCallback|TextLayout|TextListener|TextMeasurer|TextOutputCallback|TextSyntax|TextUI|TexturePaint|Thread|THREAD_POLICY_ID|ThreadDeath|ThreadGroup|ThreadLocal|ThreadPolicy|ThreadPolicyOperations|ThreadPolicyValue|Throwable|Tie|TileObserver|Time|TimeLimitExceededException|Timer|TimerTask|Timestamp|TimeZone|TitledBorder|ToolBarUI|Toolkit|ToolTipManager|ToolTipUI|TooManyListenersException|Track|TRANSACTION_REQUIRED|TRANSACTION_ROLLEDBACK|TransactionRequiredException|TransactionRolledbackException|TransactionService|Transferable|TransferHandler|TransformAttribute|Transformer|TransformerConfigurationException|TransformerException|TransformerFactory|TransformerFactoryConfigurationError|TransformerHandler|TRANSIENT|Transmitter|Transparency|TRANSPORT_RETRY|TreeCellEditor|TreeCellRenderer|TreeExpansionEvent|TreeExpansionListener|TreeMap|TreeModel|TreeModelEvent|TreeModelListener|TreeNode|TreePath|TreeSelectionEvent|TreeSelectionListener|TreeSelectionModel|TreeSet|TreeUI|TreeWillExpandListener|TrustAnchor|TrustManager|TrustManagerFactory|TrustManagerFactorySpi|TypeCode|TypeCodeHolder|TypeMismatch|TypeMismatchHelper|Types|UID|UIDefaults|UIManager|UIResource|ULongLongSeqHelper|ULongLongSeqHolder|ULongSeqHelper|ULongSeqHolder|UndeclaredThrowableException|UndoableEdit|UndoableEditEvent|UndoableEditListener|UndoableEditSupport|UndoManager|UnexpectedException|UnicastRemoteObject|UnionMember|UnionMemberHelper|UNKNOWN|UnknownEncoding|UnknownEncodingHelper|UnknownError|UnknownException|UnknownGroupException|UnknownHostException|UnknownObjectException|UnknownServiceException|UnknownUserException|UnknownUserExceptionHelper|UnknownUserExceptionHolder|UnmappableCharacterException|UnmarshalException|UnmodifiableSetException|UnrecoverableKeyException|Unreferenced|UnresolvedAddressException|UnresolvedPermission|UnsatisfiedLinkError|UnsolicitedNotification|UnsolicitedNotificationEvent|UnsolicitedNotificationListener|UNSUPPORTED_POLICY|UNSUPPORTED_POLICY_VALUE|UnsupportedAddressTypeException|UnsupportedAudioFileException|UnsupportedCallbackException|UnsupportedCharsetException|UnsupportedClassVersionError|UnsupportedEncodingException|UnsupportedFlavorException|UnsupportedLookAndFeelException|UnsupportedOperationException|URI|URIException|URIResolver|URISyntax|URISyntaxException|URL|URLClassLoader|URLConnection|URLDecoder|URLEncoder|URLStreamHandler|URLStreamHandlerFactory|URLStringHelper|USER_EXCEPTION|UserException|UShortSeqHelper|UShortSeqHolder|UTFDataFormatException|Util|UtilDelegate|Utilities|ValueBase|ValueBaseHelper|ValueBaseHolder|ValueFactory|ValueHandler|ValueMember|ValueMemberHelper|VariableHeightLayoutCache|Vector|VerifyError|VersionSpecHelper|VetoableChangeListener|VetoableChangeListenerProxy|VetoableChangeSupport|View|ViewFactory|ViewportLayout|ViewportUI|VirtualMachineError|Visibility|VisibilityHelper|VM_ABSTRACT|VM_CUSTOM|VM_NONE|VM_TRUNCATABLE|VMID|VoiceStatus|Void|VolatileImage|WCharSeqHelper|WCharSeqHolder|WeakHashMap|WeakReference|Window|WindowAdapter|WindowConstants|WindowEvent|WindowFocusListener|WindowListener|WindowStateListener|WrappedPlainView|WritableByteChannel|WritableRaster|WritableRenderedImage|WriteAbortedException|Writer|WrongAdapter|WrongAdapterHelper|WrongPolicy|WrongPolicyHelper|WrongTransaction|WrongTransactionHelper|WrongTransactionHolder|WStringSeqHelper|WStringSeqHolder|WStringValueHelper|X500Principal|X500PrivateCredential|X509Certificate|X509CertSelector|X509CRL|X509CRLEntry|X509CRLSelector|X509EncodedKeySpec|X509Extension|X509KeyManager|X509TrustManager|XAConnection|XADataSource|XAException|XAResource|Xid|XMLDecoder|XMLEncoder|XMLFilter|XMLFilterImpl|XMLFormatter|XMLReader|XMLReaderAdapter|XMLReaderFactory|ZipEntry|ZipException|ZipFile|ZipInputStream|ZipOutputStream|ZoneView|_BindingIteratorImplBase|_BindingIteratorStub|_DynAnyFactoryStub|_DynAnyStub|_DynArrayStub|_DynEnumStub|_DynFixedStub|_DynSequenceStub|_DynStructStub|_DynUnionStub|_DynValueStub|_IDLTypeStub|_NamingContextExtStub|_NamingContextImplBase|_NamingContextStub|_PolicyStub|_Remote_Stub|_ServantActivatorStub|_ServantLocatorStub)$/',
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+            ),
+            1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => 
+                array (
+                    'types' => '/^(boolean|byte|char|const|double|final|float|int|long|short|static|void)$/',
+                    'reserved' => '/^(import|package|abstract|break|case|catch|class|continue|default|do|else|extends|false|finally|for|goto|if|implements|instanceof|interface|native|new|null|private|protected|public|return|super|strictfp|switch|synchronized|this|throws|throw|transient|true|try|volatile|while)$/',
+                    'builtin' => '/^(AbstractAction|AbstractBorder|AbstractButton|AbstractCellEditor|AbstractCollection|AbstractColorChooserPanel|AbstractDocument|AbstractInterruptibleChannel|AbstractLayoutCache|AbstractList|AbstractListModel|AbstractMap|AbstractMethodError|AbstractPreferences|AbstractSelectableChannel|AbstractSelectionKey|AbstractSelector|AbstractSequentialList|AbstractSet|AbstractSpinnerModel|AbstractTableModel|AbstractUndoableEdit|AbstractWriter|AccessControlContext|AccessControlException|AccessController|AccessException|Accessible|AccessibleAction|AccessibleBundle|AccessibleComponent|AccessibleContext|AccessibleEditableText|AccessibleExtendedComponent|AccessibleExtendedTable|AccessibleHyperlink|AccessibleHypertext|AccessibleIcon|AccessibleKeyBinding|AccessibleObject|AccessibleRelation|AccessibleRelationSet|AccessibleResourceBundle|AccessibleRole|AccessibleSelection|AccessibleState|AccessibleStateSet|AccessibleTable|AccessibleTableModelChange|AccessibleText|AccessibleValue|AccountExpiredException|Acl|AclEntry|AclNotFoundException|Action|ActionEvent|ActionListener|ActionMap|ActionMapUIResource|Activatable|ActivateFailedException|ActivationDesc|ActivationException|ActivationGroup|ActivationGroup_Stub|ActivationGroupDesc|ActivationGroupID|ActivationID|ActivationInstantiator|ActivationMonitor|ActivationSystem|Activator|ActiveEvent|AdapterActivator|AdapterActivatorOperations|AdapterAlreadyExists|AdapterAlreadyExistsHelper|AdapterInactive|AdapterInactiveHelper|AdapterNonExistent|AdapterNonExistentHelper|AddressHelper|Adjustable|AdjustmentEvent|AdjustmentListener|Adler32|AffineTransform|AffineTransformOp|AlgorithmParameterGenerator|AlgorithmParameterGeneratorSpi|AlgorithmParameters|AlgorithmParameterSpec|AlgorithmParametersSpi|AllPermission|AlphaComposite|AlreadyBound|AlreadyBoundException|AlreadyBoundHelper|AlreadyBoundHolder|AlreadyConnectedException|AncestorEvent|AncestorListener|Annotation|Any|AnyHolder|AnySeqHelper|AnySeqHolder|AppConfigurationEntry|Applet|AppletContext|AppletInitializer|AppletStub|ApplicationException|Arc2D|Area|AreaAveragingScaleFilter|ARG_IN|ARG_INOUT|ARG_OUT|ArithmeticException|Array|ArrayIndexOutOfBoundsException|ArrayList|Arrays|ArrayStoreException|AssertionError|AsyncBoxView|AsynchronousCloseException|Attr|Attribute|AttributedCharacterIterator|AttributedString|AttributeException|AttributeInUseException|AttributeList|AttributeListImpl|AttributeModificationException|Attributes|AttributeSet|AttributeSetUtilities|AttributesImpl|AudioClip|AudioFileFormat|AudioFileReader|AudioFileWriter|AudioFormat|AudioInputStream|AudioPermission|AudioSystem|AuthenticationException|AuthenticationNotSupportedException|Authenticator|AuthPermission|Autoscroll|AWTError|AWTEvent|AWTEventListener|AWTEventListenerProxy|AWTEventMulticaster|AWTException|AWTKeyStroke|AWTPermission|BackingStoreException|BAD_CONTEXT|BAD_INV_ORDER|BAD_OPERATION|BAD_PARAM|BAD_POLICY|BAD_POLICY_TYPE|BAD_POLICY_VALUE|BAD_TYPECODE|BadKind|BadLocationException|BadPaddingException|BandCombineOp|BandedSampleModel|BasicArrowButton|BasicAttribute|BasicAttributes|BasicBorders|BasicButtonListener|BasicButtonUI|BasicCheckBoxMenuItemUI|BasicCheckBoxUI|BasicColorChooserUI|BasicComboBoxEditor|BasicComboBoxRenderer|BasicComboBoxUI|BasicComboPopup|BasicDesktopIconUI|BasicDesktopPaneUI|BasicDirectoryModel|BasicEditorPaneUI|BasicFileChooserUI|BasicFormattedTextFieldUI|BasicGraphicsUtils|BasicHTML|BasicIconFactory|BasicInternalFrameTitlePane|BasicInternalFrameUI|BasicLabelUI|BasicListUI|BasicLookAndFeel|BasicMenuBarUI|BasicMenuItemUI|BasicMenuUI|BasicOptionPaneUI|BasicPanelUI|BasicPasswordFieldUI|BasicPermission|BasicPopupMenuSeparatorUI|BasicPopupMenuUI|BasicProgressBarUI|BasicRadioButtonMenuItemUI|BasicRadioButtonUI|BasicRootPaneUI|BasicScrollBarUI|BasicScrollPaneUI|BasicSeparatorUI|BasicSliderUI|BasicSpinnerUI|BasicSplitPaneDivider|BasicSplitPaneUI|BasicStroke|BasicTabbedPaneUI|BasicTableHeaderUI|BasicTableUI|BasicTextAreaUI|BasicTextFieldUI|BasicTextPaneUI|BasicTextUI|BasicToggleButtonUI|BasicToolBarSeparatorUI|BasicToolBarUI|BasicToolTipUI|BasicTreeUI|BasicViewportUI|BatchUpdateException|BeanContext|BeanContextChild|BeanContextChildComponentProxy|BeanContextChildSupport|BeanContextContainerProxy|BeanContextEvent|BeanContextMembershipEvent|BeanContextMembershipListener|BeanContextProxy|BeanContextServiceAvailableEvent|BeanContextServiceProvider|BeanContextServiceProviderBeanInfo|BeanContextServiceRevokedEvent|BeanContextServiceRevokedListener|BeanContextServices|BeanContextServicesListener|BeanContextServicesSupport|BeanContextSupport|BeanDescriptor|BeanInfo|Beans|BevelBorder|Bidi|BigDecimal|BigInteger|BinaryRefAddr|BindException|Binding|BindingHelper|BindingHolder|BindingIterator|BindingIteratorHelper|BindingIteratorHolder|BindingIteratorOperations|BindingIteratorPOA|BindingListHelper|BindingListHolder|BindingType|BindingTypeHelper|BindingTypeHolder|BitSet|Blob|BlockView|Book|Boolean|BooleanControl|BooleanHolder|BooleanSeqHelper|BooleanSeqHolder|Border|BorderFactory|BorderLayout|BorderUIResource|BoundedRangeModel|Bounds|Box|BoxedValueHelper|BoxLayout|BoxView|BreakIterator|Buffer|BufferCapabilities|BufferedImage|BufferedImageFilter|BufferedImageOp|BufferedInputStream|BufferedOutputStream|BufferedReader|BufferedWriter|BufferOverflowException|BufferStrategy|BufferUnderflowException|Button|ButtonGroup|ButtonModel|ButtonUI|Byte|ByteArrayInputStream|ByteArrayOutputStream|ByteBuffer|ByteChannel|ByteHolder|ByteLookupTable|ByteOrder|Calendar|CallableStatement|Callback|CallbackHandler|CancelablePrintJob|CancelledKeyException|CannotProceed|CannotProceedException|CannotProceedHelper|CannotProceedHolder|CannotRedoException|CannotUndoException|Canvas|CardLayout|Caret|CaretEvent|CaretListener|CDATASection|CellEditor|CellEditorListener|CellRendererPane|Certificate|CertificateEncodingException|CertificateException|CertificateExpiredException|CertificateFactory|CertificateFactorySpi|CertificateNotYetValidException|CertificateParsingException|CertPath|CertPathBuilder|CertPathBuilderException|CertPathBuilderResult|CertPathBuilderSpi|CertPathParameters|CertPathValidator|CertPathValidatorException|CertPathValidatorResult|CertPathValidatorSpi|CertSelector|CertStore|CertStoreException|CertStoreParameters|CertStoreSpi|ChangedCharSetException|ChangeEvent|ChangeListener|Channel|ChannelBinding|Channels|Character|CharacterCodingException|CharacterData|CharacterIterator|CharArrayReader|CharArrayWriter|CharBuffer|CharConversionException|CharHolder|CharSeqHelper|CharSeqHolder|CharSequence|Charset|CharsetDecoder|CharsetEncoder|CharsetProvider|Checkbox|CheckboxGroup|CheckboxMenuItem|CheckedInputStream|CheckedOutputStream|Checksum|Choice|ChoiceCallback|ChoiceFormat|Chromaticity|Cipher|CipherInputStream|CipherOutputStream|CipherSpi|Class|ClassCastException|ClassCircularityError|ClassDesc|ClassFormatError|ClassLoader|ClassNotFoundException|ClientRequestInfo|ClientRequestInfoOperations|ClientRequestInterceptor|ClientRequestInterceptorOperations|Clip|Clipboard|ClipboardOwner|Clob|Cloneable|CloneNotSupportedException|ClosedByInterruptException|ClosedChannelException|ClosedSelectorException|CMMException|Codec|CodecFactory|CodecFactoryHelper|CodecFactoryOperations|CodecOperations|CoderMalfunctionError|CoderResult|CodeSets|CodeSource|CodingErrorAction|CollationElementIterator|CollationKey|Collator|Collection|CollectionCertStoreParameters|Collections|Color|ColorChooserComponentFactory|ColorChooserUI|ColorConvertOp|ColorModel|ColorSelectionModel|ColorSpace|ColorSupported|ColorUIResource|ComboBoxEditor|ComboBoxModel|ComboBoxUI|ComboPopup|COMM_FAILURE|Comment|CommunicationException|Comparable|Comparator|Compiler|CompletionStatus|CompletionStatusHelper|Component|ComponentAdapter|ComponentColorModel|ComponentEvent|ComponentIdHelper|ComponentInputMap|ComponentInputMapUIResource|ComponentListener|ComponentOrientation|ComponentSampleModel|ComponentUI|ComponentView|Composite|CompositeContext|CompositeName|CompositeView|CompoundBorder|CompoundControl|CompoundEdit|CompoundName|Compression|ConcurrentModificationException|Configuration|ConfigurationException|ConfirmationCallback|ConnectException|ConnectIOException|Connection|ConnectionEvent|ConnectionEventListener|ConnectionPendingException|ConnectionPoolDataSource|ConsoleHandler|Constructor|Container|ContainerAdapter|ContainerEvent|ContainerListener|ContainerOrderFocusTraversalPolicy|ContentHandler|ContentHandlerFactory|ContentModel|Context|ContextList|ContextNotEmptyException|ContextualRenderedImageFactory|Control|ControlFactory|ControllerEventListener|ConvolveOp|CookieHolder|Copies|CopiesSupported|CRC32|CredentialExpiredException|CRL|CRLException|CRLSelector|CropImageFilter|CSS|CTX_RESTRICT_SCOPE|CubicCurve2D|Currency|Current|CurrentHelper|CurrentHolder|CurrentOperations|Cursor|Customizer|CustomMarshal|CustomValue|DATA_CONVERSION|DatabaseMetaData|DataBuffer|DataBufferByte|DataBufferDouble|DataBufferFloat|DataBufferInt|DataBufferShort|DataBufferUShort|DataFlavor|DataFormatException|DatagramChannel|DatagramPacket|DatagramSocket|DatagramSocketImpl|DatagramSocketImplFactory|DataInput|DataInputStream|DataLine|DataOutput|DataOutputStream|DataSource|DataTruncation|Date|DateFormat|DateFormatSymbols|DateFormatter|DateTimeAtCompleted|DateTimeAtCreation|DateTimeAtProcessing|DateTimeSyntax|DebugGraphics|DecimalFormat|DecimalFormatSymbols|DeclHandler|DefaultBoundedRangeModel|DefaultButtonModel|DefaultCaret|DefaultCellEditor|DefaultColorSelectionModel|DefaultComboBoxModel|DefaultDesktopManager|DefaultEditorKit|DefaultFocusManager|DefaultFocusTraversalPolicy|DefaultFormatter|DefaultFormatterFactory|DefaultHandler|DefaultHighlighter|DefaultKeyboardFocusManager|DefaultListCellRenderer|DefaultListModel|DefaultListSelectionModel|DefaultMenuLayout|DefaultMetalTheme|DefaultMutableTreeNode|DefaultPersistenceDelegate|DefaultSingleSelectionModel|DefaultStyledDocument|DefaultTableCellRenderer|DefaultTableColumnModel|DefaultTableModel|DefaultTextUI|DefaultTreeCellEditor|DefaultTreeCellRenderer|DefaultTreeModel|DefaultTreeSelectionModel|DefinitionKind|DefinitionKindHelper|Deflater|DeflaterOutputStream|Delegate|DelegationPermission|DESedeKeySpec|DesignMode|DESKeySpec|DesktopIconUI|DesktopManager|DesktopPaneUI|Destination|Destroyable|DestroyFailedException|DGC|DHGenParameterSpec|DHKey|DHParameterSpec|DHPrivateKey|DHPrivateKeySpec|DHPublicKey|DHPublicKeySpec|Dialog|Dictionary|DigestException|DigestInputStream|DigestOutputStream|Dimension|Dimension2D|DimensionUIResource|DirContext|DirectColorModel|DirectoryManager|DirObjectFactory|DirStateFactory|DisplayMode|DnDConstants|Doc|DocAttribute|DocAttributeSet|DocFlavor|DocPrintJob|Document|DocumentBuilder|DocumentBuilderFactory|DocumentEvent|DocumentFilter|DocumentFragment|DocumentHandler|DocumentListener|DocumentName|DocumentParser|DocumentType|DomainCombiner|DomainManager|DomainManagerOperations|DOMException|DOMImplementation|DOMLocator|DOMResult|DOMSource|Double|DoubleBuffer|DoubleHolder|DoubleSeqHelper|DoubleSeqHolder|DragGestureEvent|DragGestureListener|DragGestureRecognizer|DragSource|DragSourceAdapter|DragSourceContext|DragSourceDragEvent|DragSourceDropEvent|DragSourceEvent|DragSourceListener|DragSourceMotionListener|Driver|DriverManager|DriverPropertyInfo|DropTarget|DropTargetAdapter|DropTargetContext|DropTargetDragEvent|DropTargetDropEvent|DropTargetEvent|DropTargetListener|DSAKey|DSAKeyPairGenerator|DSAParameterSpec|DSAParams|DSAPrivateKey|DSAPrivateKeySpec|DSAPublicKey|DSAPublicKeySpec|DTD|DTDConstants|DTDHandler|DuplicateName|DuplicateNameHelper|DynamicImplementation|DynAny|DynAnyFactory|DynAnyFactoryHelper|DynAnyFactoryOperations|DynAnyHelper|DynAnyOperations|DynAnySeqHelper|DynArray|DynArrayHelper|DynArrayOperations|DynEnum|DynEnumHelper|DynEnumOperations|DynFixed|DynFixedHelper|DynFixedOperations|DynSequence|DynSequenceHelper|DynSequenceOperations|DynStruct|DynStructHelper|DynStructOperations|DynUnion|DynUnionHelper|DynUnionOperations|DynValue|DynValueBox|DynValueBoxOperations|DynValueCommon|DynValueCommonOperations|DynValueHelper|DynValueOperations|EditorKit|Element|ElementIterator|Ellipse2D|EmptyBorder|EmptyStackException|EncodedKeySpec|Encoder|Encoding|ENCODING_CDR_ENCAPS|EncryptedPrivateKeyInfo|Entity|EntityReference|EntityResolver|EnumControl|Enumeration|EnumSyntax|Environment|EOFException|Error|ErrorHandler|ErrorListener|ErrorManager|EtchedBorder|Event|EventContext|EventDirContext|EventHandler|EventListener|EventListenerList|EventListenerProxy|EventObject|EventQueue|EventSetDescriptor|Exception|ExceptionInInitializerError|ExceptionList|ExceptionListener|ExemptionMechanism|ExemptionMechanismException|ExemptionMechanismSpi|ExpandVetoException|ExportException|Expression|ExtendedRequest|ExtendedResponse|Externalizable|FactoryConfigurationError|FailedLoginException|FeatureDescriptor|Fidelity|Field|FieldNameHelper|FieldPosition|FieldView|File|FileCacheImageInputStream|FileCacheImageOutputStream|FileChannel|FileChooserUI|FileDescriptor|FileDialog|FileFilter|FileHandler|FileImageInputStream|FileImageOutputStream|FileInputStream|FileLock|FileLockInterruptionException|FilenameFilter|FileNameMap|FileNotFoundException|FileOutputStream|FilePermission|FileReader|FileSystemView|FileView|FileWriter|Filter|FilteredImageSource|FilterInputStream|FilterOutputStream|FilterReader|FilterWriter|Finishings|FixedHeightLayoutCache|FixedHolder|FlatteningPathIterator|FlavorException|FlavorMap|FlavorTable|Float|FloatBuffer|FloatControl|FloatHolder|FloatSeqHelper|FloatSeqHolder|FlowLayout|FlowView|FocusAdapter|FocusEvent|FocusListener|FocusManager|FocusTraversalPolicy|Font|FontFormatException|FontMetrics|FontRenderContext|FontUIResource|Format|FormatConversionProvider|FormatMismatch|FormatMismatchHelper|Formatter|FormView|ForwardRequest|ForwardRequestHelper|Frame|FREE_MEM|GapContent|GatheringByteChannel|GeneralPath|GeneralSecurityException|GlyphJustificationInfo|GlyphMetrics|GlyphVector|GlyphView|GradientPaint|GraphicAttribute|Graphics|Graphics2D|GraphicsConfigTemplate|GraphicsConfiguration|GraphicsDevice|GraphicsEnvironment|GrayFilter|GregorianCalendar|GridBagConstraints|GridBagLayout|GridLayout|Group|GSSContext|GSSCredential|GSSException|GSSManager|GSSName|Guard|GuardedObject|GZIPInputStream|GZIPOutputStream|Handler|HandlerBase|HandshakeCompletedEvent|HandshakeCompletedListener|HasControls|HashAttributeSet|HashDocAttributeSet|HashMap|HashPrintJobAttributeSet|HashPrintRequestAttributeSet|HashPrintServiceAttributeSet|HashSet|Hashtable|HeadlessException|HierarchyBoundsAdapter|HierarchyBoundsListener|HierarchyEvent|HierarchyListener|Highlighter|HostnameVerifier|HTML|HTMLDocument|HTMLEditorKit|HTMLFrameHyperlinkEvent|HTMLWriter|HttpsURLConnection|HttpURLConnection|HyperlinkEvent|HyperlinkListener|ICC_ColorSpace|ICC_Profile|ICC_ProfileGray|ICC_ProfileRGB|Icon|IconUIResource|IconView|ID_ASSIGNMENT_POLICY_ID|ID_UNIQUENESS_POLICY_ID|IdAssignmentPolicy|IdAssignmentPolicyOperations|IdAssignmentPolicyValue|IdentifierHelper|Identity|IdentityHashMap|IdentityScope|IDLEntity|IDLType|IDLTypeHelper|IDLTypeOperations|IdUniquenessPolicy|IdUniquenessPolicyOperations|IdUniquenessPolicyValue|IIOByteBuffer|IIOException|IIOImage|IIOInvalidTreeException|IIOMetadata|IIOMetadataController|IIOMetadataFormat|IIOMetadataFormatImpl|IIOMetadataNode|IIOParam|IIOParamController|IIOReadProgressListener|IIOReadUpdateListener|IIOReadWarningListener|IIORegistry|IIOServiceProvider|IIOWriteProgressListener|IIOWriteWarningListener|IllegalAccessError|IllegalAccessException|IllegalArgumentException|IllegalBlockingModeException|IllegalBlockSizeException|IllegalCharsetNameException|IllegalComponentStateException|IllegalMonitorStateException|IllegalPathStateException|IllegalSelectorException|IllegalStateException|IllegalThreadStateException|Image|ImageCapabilities|ImageConsumer|ImageFilter|ImageGraphicAttribute|ImageIcon|ImageInputStream|ImageInputStreamImpl|ImageInputStreamSpi|ImageIO|ImageObserver|ImageOutputStream|ImageOutputStreamImpl|ImageOutputStreamSpi|ImageProducer|ImageReader|ImageReaderSpi|ImageReaderWriterSpi|ImageReadParam|ImageTranscoder|ImageTranscoderSpi|ImageTypeSpecifier|ImageView|ImageWriteParam|ImageWriter|ImageWriterSpi|ImagingOpException|IMP_LIMIT|IMPLICIT_ACTIVATION_POLICY_ID|ImplicitActivationPolicy|ImplicitActivationPolicyOperations|ImplicitActivationPolicyValue|IncompatibleClassChangeError|InconsistentTypeCode|InconsistentTypeCodeHelper|IndexColorModel|IndexedPropertyDescriptor|IndexOutOfBoundsException|IndirectionException|Inet4Address|Inet6Address|InetAddress|InetSocketAddress|Inflater|InflaterInputStream|InheritableThreadLocal|InitialContext|InitialContextFactory|InitialContextFactoryBuilder|InitialDirContext|INITIALIZE|InitialLdapContext|InlineView|InputContext|InputEvent|InputMap|InputMapUIResource|InputMethod|InputMethodContext|InputMethodDescriptor|InputMethodEvent|InputMethodHighlight|InputMethodListener|InputMethodRequests|InputSource|InputStream|InputStreamReader|InputSubset|InputVerifier|Insets|InsetsUIResource|InstantiationError|InstantiationException|Instrument|InsufficientResourcesException|IntBuffer|Integer|IntegerSyntax|Interceptor|InterceptorOperations|INTERNAL|InternalError|InternalFrameAdapter|InternalFrameEvent|InternalFrameFocusTraversalPolicy|InternalFrameListener|InternalFrameUI|InternationalFormatter|InterruptedException|InterruptedIOException|InterruptedNamingException|InterruptibleChannel|INTF_REPOS|IntHolder|IntrospectionException|Introspector|INV_FLAG|INV_IDENT|INV_OBJREF|INV_POLICY|Invalid|INVALID_TRANSACTION|InvalidAddress|InvalidAddressHelper|InvalidAddressHolder|InvalidAlgorithmParameterException|InvalidAttributeIdentifierException|InvalidAttributesException|InvalidAttributeValueException|InvalidClassException|InvalidDnDOperationException|InvalidKeyException|InvalidKeySpecException|InvalidMarkException|InvalidMidiDataException|InvalidName|InvalidNameException|InvalidNameHelper|InvalidNameHolder|InvalidObjectException|InvalidParameterException|InvalidParameterSpecException|InvalidPolicy|InvalidPolicyHelper|InvalidPreferencesFormatException|InvalidSearchControlsException|InvalidSearchFilterException|InvalidSeq|InvalidSlot|InvalidSlotHelper|InvalidTransactionException|InvalidTypeForEncoding|InvalidTypeForEncodingHelper|InvalidValue|InvalidValueHelper|InvocationEvent|InvocationHandler|InvocationTargetException|InvokeHandler|IOException|IOR|IORHelper|IORHolder|IORInfo|IORInfoOperations|IORInterceptor|IORInterceptorOperations|IRObject|IRObjectOperations|IstringHelper|ItemEvent|ItemListener|ItemSelectable|Iterator|IvParameterSpec|JApplet|JarEntry|JarException|JarFile|JarInputStream|JarOutputStream|JarURLConnection|JButton|JCheckBox|JCheckBoxMenuItem|JColorChooser|JComboBox|JComponent|JDesktopPane|JDialog|JEditorPane|JFileChooser|JFormattedTextField|JFrame|JInternalFrame|JLabel|JLayeredPane|JList|JMenu|JMenuBar|JMenuItem|JobAttributes|JobHoldUntil|JobImpressions|JobImpressionsCompleted|JobImpressionsSupported|JobKOctets|JobKOctetsProcessed|JobKOctetsSupported|JobMediaSheets|JobMediaSheetsCompleted|JobMediaSheetsSupported|JobMessageFromOperator|JobName|JobOriginatingUserName|JobPriority|JobPrioritySupported|JobSheets|JobState|JobStateReason|JobStateReasons|JOptionPane|JPanel|JPasswordField|JPEGHuffmanTable|JPEGImageReadParam|JPEGImageWriteParam|JPEGQTable|JPopupMenu|JProgressBar|JRadioButton|JRadioButtonMenuItem|JRootPane|JScrollBar|JScrollPane|JSeparator|JSlider|JSpinner|JSplitPane|JTabbedPane|JTable|JTableHeader|JTextArea|JTextComponent|JTextField|JTextPane|JToggleButton|JToolBar|JToolTip|JTree|JViewport|JWindow|KerberosKey|KerberosPrincipal|KerberosTicket|Kernel|Key|KeyAdapter|KeyAgreement|KeyAgreementSpi|KeyboardFocusManager|KeyEvent|KeyEventDispatcher|KeyEventPostProcessor|KeyException|KeyFactory|KeyFactorySpi|KeyGenerator|KeyGeneratorSpi|KeyListener|KeyManagementException|KeyManager|KeyManagerFactory|KeyManagerFactorySpi|Keymap|KeyPair|KeyPairGenerator|KeyPairGeneratorSpi|KeySpec|KeyStore|KeyStoreException|KeyStoreSpi|KeyStroke|Label|LabelUI|LabelView|LanguageCallback|LastOwnerException|LayeredHighlighter|LayoutFocusTraversalPolicy|LayoutManager|LayoutManager2|LayoutQueue|LDAPCertStoreParameters|LdapContext|LdapReferralException|Lease|Level|LexicalHandler|LIFESPAN_POLICY_ID|LifespanPolicy|LifespanPolicyOperations|LifespanPolicyValue|LimitExceededException|Line|Line2D|LineBorder|LineBreakMeasurer|LineEvent|LineListener|LineMetrics|LineNumberInputStream|LineNumberReader|LineUnavailableException|LinkageError|LinkedHashMap|LinkedHashSet|LinkedList|LinkException|LinkLoopException|LinkRef|List|ListCellRenderer|ListDataEvent|ListDataListener|ListIterator|ListModel|ListResourceBundle|ListSelectionEvent|ListSelectionListener|ListSelectionModel|ListUI|ListView|LoaderHandler|Locale|LocalObject|LocateRegistry|LOCATION_FORWARD|Locator|LocatorImpl|Logger|LoggingPermission|LoginContext|LoginException|LoginModule|LogManager|LogRecord|LogStream|Long|LongBuffer|LongHolder|LongLongSeqHelper|LongLongSeqHolder|LongSeqHelper|LongSeqHolder|LookAndFeel|LookupOp|LookupTable|Mac|MacSpi|MalformedInputException|MalformedLinkException|MalformedURLException|ManagerFactoryParameters|Manifest|Map|MappedByteBuffer|MARSHAL|MarshalException|MarshalledObject|MaskFormatter|Matcher|Math|MatteBorder|Media|MediaName|MediaPrintableArea|MediaSize|MediaSizeName|MediaTracker|MediaTray|Member|MemoryCacheImageInputStream|MemoryCacheImageOutputStream|MemoryHandler|MemoryImageSource|Menu|MenuBar|MenuBarUI|MenuComponent|MenuContainer|MenuDragMouseEvent|MenuDragMouseListener|MenuElement|MenuEvent|MenuItem|MenuItemUI|MenuKeyEvent|MenuKeyListener|MenuListener|MenuSelectionManager|MenuShortcut|MessageDigest|MessageDigestSpi|MessageFormat|MessageProp|MetaEventListener|MetalBorders|MetalButtonUI|MetalCheckBoxIcon|MetalCheckBoxUI|MetalComboBoxButton|MetalComboBoxEditor|MetalComboBoxIcon|MetalComboBoxUI|MetalDesktopIconUI|MetalFileChooserUI|MetalIconFactory|MetalInternalFrameTitlePane|MetalInternalFrameUI|MetalLabelUI|MetalLookAndFeel|MetalPopupMenuSeparatorUI|MetalProgressBarUI|MetalRadioButtonUI|MetalRootPaneUI|MetalScrollBarUI|MetalScrollButton|MetalScrollPaneUI|MetalSeparatorUI|MetalSliderUI|MetalSplitPaneUI|MetalTabbedPaneUI|MetalTextFieldUI|MetalTheme|MetalToggleButtonUI|MetalToolBarUI|MetalToolTipUI|MetalTreeUI|MetaMessage|Method|MethodDescriptor|MidiChannel|MidiDevice|MidiDeviceProvider|MidiEvent|MidiFileFormat|MidiFileReader|MidiFileWriter|MidiMessage|MidiSystem|MidiUnavailableException|MimeTypeParseException|MinimalHTMLWriter|MissingResourceException|Mixer|MixerProvider|ModificationItem|Modifier|MouseAdapter|MouseDragGestureRecognizer|MouseEvent|MouseInputAdapter|MouseInputListener|MouseListener|MouseMotionAdapter|MouseMotionListener|MouseWheelEvent|MouseWheelListener|MultiButtonUI|MulticastSocket|MultiColorChooserUI|MultiComboBoxUI|MultiDesktopIconUI|MultiDesktopPaneUI|MultiDoc|MultiDocPrintJob|MultiDocPrintService|MultiFileChooserUI|MultiInternalFrameUI|MultiLabelUI|MultiListUI|MultiLookAndFeel|MultiMenuBarUI|MultiMenuItemUI|MultiOptionPaneUI|MultiPanelUI|MultiPixelPackedSampleModel|MultipleComponentProfileHelper|MultipleComponentProfileHolder|MultipleDocumentHandling|MultipleMaster|MultiPopupMenuUI|MultiProgressBarUI|MultiRootPaneUI|MultiScrollBarUI|MultiScrollPaneUI|MultiSeparatorUI|MultiSliderUI|MultiSpinnerUI|MultiSplitPaneUI|MultiTabbedPaneUI|MultiTableHeaderUI|MultiTableUI|MultiTextUI|MultiToolBarUI|MultiToolTipUI|MultiTreeUI|MultiViewportUI|MutableAttributeSet|MutableComboBoxModel|MutableTreeNode|Name|NameAlreadyBoundException|NameCallback|NameClassPair|NameComponent|NameComponentHelper|NameComponentHolder|NamedNodeMap|NamedValue|NameDynAnyPair|NameDynAnyPairHelper|NameDynAnyPairSeqHelper|NameHelper|NameHolder|NameNotFoundException|NameParser|NamespaceChangeListener|NamespaceSupport|NameValuePair|NameValuePairHelper|NameValuePairSeqHelper|Naming|NamingContext|NamingContextExt|NamingContextExtHelper|NamingContextExtHolder|NamingContextExtOperations|NamingContextExtPOA|NamingContextHelper|NamingContextHolder|NamingContextOperations|NamingContextPOA|NamingEnumeration|NamingEvent|NamingException|NamingExceptionEvent|NamingListener|NamingManager|NamingSecurityException|NavigationFilter|NegativeArraySizeException|NetPermission|NetworkInterface|NO_IMPLEMENT|NO_MEMORY|NO_PERMISSION|NO_RESOURCES|NO_RESPONSE|NoClassDefFoundError|NoConnectionPendingException|NoContext|NoContextHelper|Node|NodeChangeEvent|NodeChangeListener|NodeList|NoInitialContextException|NoninvertibleTransformException|NonReadableChannelException|NonWritableChannelException|NoPermissionException|NoRouteToHostException|NoServant|NoServantHelper|NoSuchAlgorithmException|NoSuchAttributeException|NoSuchElementException|NoSuchFieldError|NoSuchFieldException|NoSuchMethodError|NoSuchMethodException|NoSuchObjectException|NoSuchPaddingException|NoSuchProviderException|NotActiveException|Notation|NotBoundException|NotContextException|NotEmpty|NotEmptyHelper|NotEmptyHolder|NotFound|NotFoundHelper|NotFoundHolder|NotFoundReason|NotFoundReasonHelper|NotFoundReasonHolder|NotOwnerException|NotSerializableException|NotYetBoundException|NotYetConnectedException|NullCipher|NullPointerException|Number|NumberFormat|NumberFormatException|NumberFormatter|NumberOfDocuments|NumberOfInterveningJobs|NumberUp|NumberUpSupported|NumericShaper|NVList|OBJ_ADAPTER|Object|OBJECT_NOT_EXIST|ObjectAlreadyActive|ObjectAlreadyActiveHelper|ObjectChangeListener|ObjectFactory|ObjectFactoryBuilder|ObjectHelper|ObjectHolder|ObjectIdHelper|ObjectImpl|ObjectInput|ObjectInputStream|ObjectInputValidation|ObjectNotActive|ObjectNotActiveHelper|ObjectOutput|ObjectOutputStream|ObjectStreamClass|ObjectStreamConstants|ObjectStreamException|ObjectStreamField|ObjectView|ObjID|Observable|Observer|OctetSeqHelper|OctetSeqHolder|Oid|OMGVMCID|OpenType|Operation|OperationNotSupportedException|Option|OptionalDataException|OptionPaneUI|ORB|ORBInitializer|ORBInitializerOperations|ORBInitInfo|ORBInitInfoOperations|OrientationRequested|OutOfMemoryError|OutputDeviceAssigned|OutputKeys|OutputStream|OutputStreamWriter|OverlappingFileLockException|OverlayLayout|Owner|Package|PackedColorModel|Pageable|PageAttributes|PageFormat|PageRanges|PagesPerMinute|PagesPerMinuteColor|Paint|PaintContext|PaintEvent|Panel|PanelUI|Paper|ParagraphView|Parameter|ParameterBlock|ParameterDescriptor|ParameterMetaData|ParameterMode|ParameterModeHelper|ParameterModeHolder|ParseException|ParsePosition|Parser|ParserAdapter|ParserConfigurationException|ParserDelegator|ParserFactory|PartialResultException|PasswordAuthentication|PasswordCallback|PasswordView|Patch|PathIterator|Pattern|PatternSyntaxException|PBEKey|PBEKeySpec|PBEParameterSpec|PDLOverrideSupported|Permission|PermissionCollection|Permissions|PERSIST_STORE|PersistenceDelegate|PhantomReference|Pipe|PipedInputStream|PipedOutputStream|PipedReader|PipedWriter|PixelGrabber|PixelInterleavedSampleModel|PKCS8EncodedKeySpec|PKIXBuilderParameters|PKIXCertPathBuilderResult|PKIXCertPathChecker|PKIXCertPathValidatorResult|PKIXParameters|PlainDocument|PlainView|POA|POAHelper|POAManager|POAManagerOperations|POAOperations|Point|Point2D|Policy|PolicyError|PolicyErrorCodeHelper|PolicyErrorHelper|PolicyErrorHolder|PolicyFactory|PolicyFactoryOperations|PolicyHelper|PolicyHolder|PolicyListHelper|PolicyListHolder|PolicyNode|PolicyOperations|PolicyQualifierInfo|PolicyTypeHelper|Polygon|PooledConnection|Popup|PopupFactory|PopupMenu|PopupMenuEvent|PopupMenuListener|PopupMenuUI|Port|PortableRemoteObject|PortableRemoteObjectDelegate|PortUnreachableException|Position|PreferenceChangeEvent|PreferenceChangeListener|Preferences|PreferencesFactory|PreparedStatement|PresentationDirection|Principal|PrincipalHolder|Printable|PrinterAbortException|PrinterException|PrinterGraphics|PrinterInfo|PrinterIOException|PrinterIsAcceptingJobs|PrinterJob|PrinterLocation|PrinterMakeAndModel|PrinterMessageFromOperator|PrinterMoreInfo|PrinterMoreInfoManufacturer|PrinterName|PrinterResolution|PrinterState|PrinterStateReason|PrinterStateReasons|PrinterURI|PrintEvent|PrintException|PrintGraphics|PrintJob|PrintJobAdapter|PrintJobAttribute|PrintJobAttributeEvent|PrintJobAttributeListener|PrintJobAttributeSet|PrintJobEvent|PrintJobListener|PrintQuality|PrintRequestAttribute|PrintRequestAttributeSet|PrintService|PrintServiceAttribute|PrintServiceAttributeEvent|PrintServiceAttributeListener|PrintServiceAttributeSet|PrintServiceLookup|PrintStream|PrintWriter|PRIVATE_MEMBER|PrivateCredentialPermission|PrivateKey|PrivilegedAction|PrivilegedActionException|PrivilegedExceptionAction|Process|ProcessingInstruction|ProfileDataException|ProfileIdHelper|ProgressBarUI|ProgressMonitor|ProgressMonitorInputStream|Properties|PropertyChangeEvent|PropertyChangeListener|PropertyChangeListenerProxy|PropertyChangeSupport|PropertyDescriptor|PropertyEditor|PropertyEditorManager|PropertyEditorSupport|PropertyPermission|PropertyResourceBundle|PropertyVetoException|ProtectionDomain|ProtocolException|Provider|ProviderException|Proxy|PSSParameterSpec|PUBLIC_MEMBER|PublicKey|PushbackInputStream|PushbackReader|QuadCurve2D|QueuedJobCount|Random|RandomAccess|RandomAccessFile|Raster|RasterFormatException|RasterOp|RC2ParameterSpec|RC5ParameterSpec|ReadableByteChannel|Reader|ReadOnlyBufferException|Receiver|Rectangle|Rectangle2D|RectangularShape|Ref|RefAddr|Reference|Referenceable|ReferenceQueue|ReferenceUriSchemesSupported|ReferralException|ReflectPermission|Refreshable|RefreshFailedException|RegisterableService|Registry|RegistryHandler|RemarshalException|Remote|RemoteCall|RemoteException|RemoteObject|RemoteRef|RemoteServer|RemoteStub|RenderableImage|RenderableImageOp|RenderableImageProducer|RenderContext|RenderedImage|RenderedImageFactory|Renderer|RenderingHints|RepaintManager|ReplicateScaleFilter|RepositoryIdHelper|Request|REQUEST_PROCESSING_POLICY_ID|RequestInfo|RequestInfoOperations|RequestingUserName|RequestProcessingPolicy|RequestProcessingPolicyOperations|RequestProcessingPolicyValue|RescaleOp|ResolutionSyntax|Resolver|ResolveResult|ResourceBundle|ResponseHandler|Result|ResultSet|ResultSetMetaData|ReverbType|RGBImageFilter|RMIClassLoader|RMIClassLoaderSpi|RMIClientSocketFactory|RMIFailureHandler|RMISecurityException|RMISecurityManager|RMIServerSocketFactory|RMISocketFactory|Robot|RootPaneContainer|RootPaneUI|RoundRectangle2D|RowMapper|RowSet|RowSetEvent|RowSetInternal|RowSetListener|RowSetMetaData|RowSetReader|RowSetWriter|RSAKey|RSAKeyGenParameterSpec|RSAMultiPrimePrivateCrtKey|RSAMultiPrimePrivateCrtKeySpec|RSAOtherPrimeInfo|RSAPrivateCrtKey|RSAPrivateCrtKeySpec|RSAPrivateKey|RSAPrivateKeySpec|RSAPublicKey|RSAPublicKeySpec|RTFEditorKit|RuleBasedCollator|Runnable|Runtime|RunTime|RuntimeException|RunTimeOperations|RuntimePermission|SampleModel|Savepoint|SAXException|SAXNotRecognizedException|SAXNotSupportedException|SAXParseException|SAXParser|SAXParserFactory|SAXResult|SAXSource|SAXTransformerFactory|ScatteringByteChannel|SchemaViolationException|Scrollable|Scrollbar|ScrollBarUI|ScrollPane|ScrollPaneAdjustable|ScrollPaneConstants|ScrollPaneLayout|ScrollPaneUI|SealedObject|SearchControls|SearchResult|SecretKey|SecretKeyFactory|SecretKeyFactorySpi|SecretKeySpec|SecureClassLoader|SecureRandom|SecureRandomSpi|Security|SecurityException|SecurityManager|SecurityPermission|Segment|SelectableChannel|SelectionKey|Selector|SelectorProvider|SeparatorUI|Sequence|SequenceInputStream|Sequencer|Serializable|SerializablePermission|Servant|SERVANT_RETENTION_POLICY_ID|ServantActivator|ServantActivatorHelper|ServantActivatorOperations|ServantActivatorPOA|ServantAlreadyActive|ServantAlreadyActiveHelper|ServantLocator|ServantLocatorHelper|ServantLocatorOperations|ServantLocatorPOA|ServantManager|ServantManagerOperations|ServantNotActive|ServantNotActiveHelper|ServantObject|ServantRetentionPolicy|ServantRetentionPolicyOperations|ServantRetentionPolicyValue|ServerCloneException|ServerError|ServerException|ServerNotActiveException|ServerRef|ServerRequest|ServerRequestInfo|ServerRequestInfoOperations|ServerRequestInterceptor|ServerRequestInterceptorOperations|ServerRuntimeException|ServerSocket|ServerSocketChannel|ServerSocketFactory|ServiceContext|ServiceContextHelper|ServiceContextHolder|ServiceContextListHelper|ServiceContextListHolder|ServiceDetail|ServiceDetailHelper|ServiceIdHelper|ServiceInformation|ServiceInformationHelper|ServiceInformationHolder|ServicePermission|ServiceRegistry|ServiceUI|ServiceUIFactory|ServiceUnavailableException|Set|SetOfIntegerSyntax|SetOverrideType|SetOverrideTypeHelper|Severity|Shape|ShapeGraphicAttribute|SheetCollate|Short|ShortBuffer|ShortBufferException|ShortHolder|ShortLookupTable|ShortMessage|ShortSeqHelper|ShortSeqHolder|Sides|Signature|SignatureException|SignatureSpi|SignedObject|Signer|SimpleAttributeSet|SimpleBeanInfo|SimpleDateFormat|SimpleDoc|SimpleFormatter|SimpleTimeZone|SinglePixelPackedSampleModel|SingleSelectionModel|Size2DSyntax|SizeLimitExceededException|SizeRequirements|SizeSequence|Skeleton|SkeletonMismatchException|SkeletonNotFoundException|SliderUI|Socket|SocketAddress|SocketChannel|SocketException|SocketFactory|SocketHandler|SocketImpl|SocketImplFactory|SocketOptions|SocketPermission|SocketSecurityException|SocketTimeoutException|SoftBevelBorder|SoftReference|SortedMap|SortedSet|SortingFocusTraversalPolicy|Soundbank|SoundbankReader|SoundbankResource|Source|SourceDataLine|SourceLocator|SpinnerDateModel|SpinnerListModel|SpinnerModel|SpinnerNumberModel|SpinnerUI|SplitPaneUI|Spring|SpringLayout|SQLData|SQLException|SQLInput|SQLOutput|SQLPermission|SQLWarning|SSLContext|SSLContextSpi|SSLException|SSLHandshakeException|SSLKeyException|SSLPeerUnverifiedException|SSLPermission|SSLProtocolException|SSLServerSocket|SSLServerSocketFactory|SSLSession|SSLSessionBindingEvent|SSLSessionBindingListener|SSLSessionContext|SSLSocket|SSLSocketFactory|Stack|StackOverflowError|StackTraceElement|StartTlsRequest|StartTlsResponse|State|StateEdit|StateEditable|StateFactory|Statement|Streamable|StreamableValue|StreamCorruptedException|StreamHandler|StreamPrintService|StreamPrintServiceFactory|StreamResult|StreamSource|StreamTokenizer|StrictMath|String|StringBuffer|StringBufferInputStream|StringCharacterIterator|StringContent|StringHolder|StringIndexOutOfBoundsException|StringNameHelper|StringReader|StringRefAddr|StringSelection|StringSeqHelper|StringSeqHolder|StringTokenizer|StringValueHelper|StringWriter|Stroke|Struct|StructMember|StructMemberHelper|Stub|StubDelegate|StubNotFoundException|Style|StyleConstants|StyleContext|StyledDocument|StyledEditorKit|StyleSheet|Subject|SubjectDomainCombiner|SUCCESSFUL|SupportedValuesAttribute|SwingConstants|SwingPropertyChangeSupport|SwingUtilities|SYNC_WITH_TRANSPORT|SyncFailedException|SyncScopeHelper|Synthesizer|SysexMessage|System|SYSTEM_EXCEPTION|SystemColor|SystemException|SystemFlavorMap|TabableView|TabbedPaneUI|TabExpander|TableCellEditor|TableCellRenderer|TableColumn|TableColumnModel|TableColumnModelEvent|TableColumnModelListener|TableHeaderUI|TableModel|TableModelEvent|TableModelListener|TableUI|TableView|TabSet|TabStop|TAG_ALTERNATE_IIOP_ADDRESS|TAG_CODE_SETS|TAG_INTERNET_IOP|TAG_JAVA_CODEBASE|TAG_MULTIPLE_COMPONENTS|TAG_ORB_TYPE|TAG_POLICIES|TagElement|TaggedComponent|TaggedComponentHelper|TaggedComponentHolder|TaggedProfile|TaggedProfileHelper|TaggedProfileHolder|TargetDataLine|TCKind|Templates|TemplatesHandler|Text|TextAction|TextArea|TextAttribute|TextComponent|TextEvent|TextField|TextHitInfo|TextInputCallback|TextLayout|TextListener|TextMeasurer|TextOutputCallback|TextSyntax|TextUI|TexturePaint|Thread|THREAD_POLICY_ID|ThreadDeath|ThreadGroup|ThreadLocal|ThreadPolicy|ThreadPolicyOperations|ThreadPolicyValue|Throwable|Tie|TileObserver|Time|TimeLimitExceededException|Timer|TimerTask|Timestamp|TimeZone|TitledBorder|ToolBarUI|Toolkit|ToolTipManager|ToolTipUI|TooManyListenersException|Track|TRANSACTION_REQUIRED|TRANSACTION_ROLLEDBACK|TransactionRequiredException|TransactionRolledbackException|TransactionService|Transferable|TransferHandler|TransformAttribute|Transformer|TransformerConfigurationException|TransformerException|TransformerFactory|TransformerFactoryConfigurationError|TransformerHandler|TRANSIENT|Transmitter|Transparency|TRANSPORT_RETRY|TreeCellEditor|TreeCellRenderer|TreeExpansionEvent|TreeExpansionListener|TreeMap|TreeModel|TreeModelEvent|TreeModelListener|TreeNode|TreePath|TreeSelectionEvent|TreeSelectionListener|TreeSelectionModel|TreeSet|TreeUI|TreeWillExpandListener|TrustAnchor|TrustManager|TrustManagerFactory|TrustManagerFactorySpi|TypeCode|TypeCodeHolder|TypeMismatch|TypeMismatchHelper|Types|UID|UIDefaults|UIManager|UIResource|ULongLongSeqHelper|ULongLongSeqHolder|ULongSeqHelper|ULongSeqHolder|UndeclaredThrowableException|UndoableEdit|UndoableEditEvent|UndoableEditListener|UndoableEditSupport|UndoManager|UnexpectedException|UnicastRemoteObject|UnionMember|UnionMemberHelper|UNKNOWN|UnknownEncoding|UnknownEncodingHelper|UnknownError|UnknownException|UnknownGroupException|UnknownHostException|UnknownObjectException|UnknownServiceException|UnknownUserException|UnknownUserExceptionHelper|UnknownUserExceptionHolder|UnmappableCharacterException|UnmarshalException|UnmodifiableSetException|UnrecoverableKeyException|Unreferenced|UnresolvedAddressException|UnresolvedPermission|UnsatisfiedLinkError|UnsolicitedNotification|UnsolicitedNotificationEvent|UnsolicitedNotificationListener|UNSUPPORTED_POLICY|UNSUPPORTED_POLICY_VALUE|UnsupportedAddressTypeException|UnsupportedAudioFileException|UnsupportedCallbackException|UnsupportedCharsetException|UnsupportedClassVersionError|UnsupportedEncodingException|UnsupportedFlavorException|UnsupportedLookAndFeelException|UnsupportedOperationException|URI|URIException|URIResolver|URISyntax|URISyntaxException|URL|URLClassLoader|URLConnection|URLDecoder|URLEncoder|URLStreamHandler|URLStreamHandlerFactory|URLStringHelper|USER_EXCEPTION|UserException|UShortSeqHelper|UShortSeqHolder|UTFDataFormatException|Util|UtilDelegate|Utilities|ValueBase|ValueBaseHelper|ValueBaseHolder|ValueFactory|ValueHandler|ValueMember|ValueMemberHelper|VariableHeightLayoutCache|Vector|VerifyError|VersionSpecHelper|VetoableChangeListener|VetoableChangeListenerProxy|VetoableChangeSupport|View|ViewFactory|ViewportLayout|ViewportUI|VirtualMachineError|Visibility|VisibilityHelper|VM_ABSTRACT|VM_CUSTOM|VM_NONE|VM_TRUNCATABLE|VMID|VoiceStatus|Void|VolatileImage|WCharSeqHelper|WCharSeqHolder|WeakHashMap|WeakReference|Window|WindowAdapter|WindowConstants|WindowEvent|WindowFocusListener|WindowListener|WindowStateListener|WrappedPlainView|WritableByteChannel|WritableRaster|WritableRenderedImage|WriteAbortedException|Writer|WrongAdapter|WrongAdapterHelper|WrongPolicy|WrongPolicyHelper|WrongTransaction|WrongTransactionHelper|WrongTransactionHolder|WStringSeqHelper|WStringSeqHolder|WStringValueHelper|X500Principal|X500PrivateCredential|X509Certificate|X509CertSelector|X509CRL|X509CRLEntry|X509CRLSelector|X509EncodedKeySpec|X509Extension|X509KeyManager|X509TrustManager|XAConnection|XADataSource|XAException|XAResource|Xid|XMLDecoder|XMLEncoder|XMLFilter|XMLFilterImpl|XMLFormatter|XMLReader|XMLReaderAdapter|XMLReaderFactory|ZipEntry|ZipException|ZipFile|ZipInputStream|ZipOutputStream|ZoneView|_BindingIteratorImplBase|_BindingIteratorStub|_DynAnyFactoryStub|_DynAnyStub|_DynArrayStub|_DynEnumStub|_DynFixedStub|_DynSequenceStub|_DynStructStub|_DynUnionStub|_DynValueStub|_IDLTypeStub|_NamingContextExtStub|_NamingContextImplBase|_NamingContextStub|_PolicyStub|_Remote_Stub|_ServantActivatorStub|_ServantLocatorStub)$/',
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+            ),
+            2 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => 
+                array (
+                    'types' => '/^(boolean|byte|char|const|double|final|float|int|long|short|static|void)$/',
+                    'reserved' => '/^(import|package|abstract|break|case|catch|class|continue|default|do|else|extends|false|finally|for|goto|if|implements|instanceof|interface|native|new|null|private|protected|public|return|super|strictfp|switch|synchronized|this|throws|throw|transient|true|try|volatile|while)$/',
+                    'builtin' => '/^(AbstractAction|AbstractBorder|AbstractButton|AbstractCellEditor|AbstractCollection|AbstractColorChooserPanel|AbstractDocument|AbstractInterruptibleChannel|AbstractLayoutCache|AbstractList|AbstractListModel|AbstractMap|AbstractMethodError|AbstractPreferences|AbstractSelectableChannel|AbstractSelectionKey|AbstractSelector|AbstractSequentialList|AbstractSet|AbstractSpinnerModel|AbstractTableModel|AbstractUndoableEdit|AbstractWriter|AccessControlContext|AccessControlException|AccessController|AccessException|Accessible|AccessibleAction|AccessibleBundle|AccessibleComponent|AccessibleContext|AccessibleEditableText|AccessibleExtendedComponent|AccessibleExtendedTable|AccessibleHyperlink|AccessibleHypertext|AccessibleIcon|AccessibleKeyBinding|AccessibleObject|AccessibleRelation|AccessibleRelationSet|AccessibleResourceBundle|AccessibleRole|AccessibleSelection|AccessibleState|AccessibleStateSet|AccessibleTable|AccessibleTableModelChange|AccessibleText|AccessibleValue|AccountExpiredException|Acl|AclEntry|AclNotFoundException|Action|ActionEvent|ActionListener|ActionMap|ActionMapUIResource|Activatable|ActivateFailedException|ActivationDesc|ActivationException|ActivationGroup|ActivationGroup_Stub|ActivationGroupDesc|ActivationGroupID|ActivationID|ActivationInstantiator|ActivationMonitor|ActivationSystem|Activator|ActiveEvent|AdapterActivator|AdapterActivatorOperations|AdapterAlreadyExists|AdapterAlreadyExistsHelper|AdapterInactive|AdapterInactiveHelper|AdapterNonExistent|AdapterNonExistentHelper|AddressHelper|Adjustable|AdjustmentEvent|AdjustmentListener|Adler32|AffineTransform|AffineTransformOp|AlgorithmParameterGenerator|AlgorithmParameterGeneratorSpi|AlgorithmParameters|AlgorithmParameterSpec|AlgorithmParametersSpi|AllPermission|AlphaComposite|AlreadyBound|AlreadyBoundException|AlreadyBoundHelper|AlreadyBoundHolder|AlreadyConnectedException|AncestorEvent|AncestorListener|Annotation|Any|AnyHolder|AnySeqHelper|AnySeqHolder|AppConfigurationEntry|Applet|AppletContext|AppletInitializer|AppletStub|ApplicationException|Arc2D|Area|AreaAveragingScaleFilter|ARG_IN|ARG_INOUT|ARG_OUT|ArithmeticException|Array|ArrayIndexOutOfBoundsException|ArrayList|Arrays|ArrayStoreException|AssertionError|AsyncBoxView|AsynchronousCloseException|Attr|Attribute|AttributedCharacterIterator|AttributedString|AttributeException|AttributeInUseException|AttributeList|AttributeListImpl|AttributeModificationException|Attributes|AttributeSet|AttributeSetUtilities|AttributesImpl|AudioClip|AudioFileFormat|AudioFileReader|AudioFileWriter|AudioFormat|AudioInputStream|AudioPermission|AudioSystem|AuthenticationException|AuthenticationNotSupportedException|Authenticator|AuthPermission|Autoscroll|AWTError|AWTEvent|AWTEventListener|AWTEventListenerProxy|AWTEventMulticaster|AWTException|AWTKeyStroke|AWTPermission|BackingStoreException|BAD_CONTEXT|BAD_INV_ORDER|BAD_OPERATION|BAD_PARAM|BAD_POLICY|BAD_POLICY_TYPE|BAD_POLICY_VALUE|BAD_TYPECODE|BadKind|BadLocationException|BadPaddingException|BandCombineOp|BandedSampleModel|BasicArrowButton|BasicAttribute|BasicAttributes|BasicBorders|BasicButtonListener|BasicButtonUI|BasicCheckBoxMenuItemUI|BasicCheckBoxUI|BasicColorChooserUI|BasicComboBoxEditor|BasicComboBoxRenderer|BasicComboBoxUI|BasicComboPopup|BasicDesktopIconUI|BasicDesktopPaneUI|BasicDirectoryModel|BasicEditorPaneUI|BasicFileChooserUI|BasicFormattedTextFieldUI|BasicGraphicsUtils|BasicHTML|BasicIconFactory|BasicInternalFrameTitlePane|BasicInternalFrameUI|BasicLabelUI|BasicListUI|BasicLookAndFeel|BasicMenuBarUI|BasicMenuItemUI|BasicMenuUI|BasicOptionPaneUI|BasicPanelUI|BasicPasswordFieldUI|BasicPermission|BasicPopupMenuSeparatorUI|BasicPopupMenuUI|BasicProgressBarUI|BasicRadioButtonMenuItemUI|BasicRadioButtonUI|BasicRootPaneUI|BasicScrollBarUI|BasicScrollPaneUI|BasicSeparatorUI|BasicSliderUI|BasicSpinnerUI|BasicSplitPaneDivider|BasicSplitPaneUI|BasicStroke|BasicTabbedPaneUI|BasicTableHeaderUI|BasicTableUI|BasicTextAreaUI|BasicTextFieldUI|BasicTextPaneUI|BasicTextUI|BasicToggleButtonUI|BasicToolBarSeparatorUI|BasicToolBarUI|BasicToolTipUI|BasicTreeUI|BasicViewportUI|BatchUpdateException|BeanContext|BeanContextChild|BeanContextChildComponentProxy|BeanContextChildSupport|BeanContextContainerProxy|BeanContextEvent|BeanContextMembershipEvent|BeanContextMembershipListener|BeanContextProxy|BeanContextServiceAvailableEvent|BeanContextServiceProvider|BeanContextServiceProviderBeanInfo|BeanContextServiceRevokedEvent|BeanContextServiceRevokedListener|BeanContextServices|BeanContextServicesListener|BeanContextServicesSupport|BeanContextSupport|BeanDescriptor|BeanInfo|Beans|BevelBorder|Bidi|BigDecimal|BigInteger|BinaryRefAddr|BindException|Binding|BindingHelper|BindingHolder|BindingIterator|BindingIteratorHelper|BindingIteratorHolder|BindingIteratorOperations|BindingIteratorPOA|BindingListHelper|BindingListHolder|BindingType|BindingTypeHelper|BindingTypeHolder|BitSet|Blob|BlockView|Book|Boolean|BooleanControl|BooleanHolder|BooleanSeqHelper|BooleanSeqHolder|Border|BorderFactory|BorderLayout|BorderUIResource|BoundedRangeModel|Bounds|Box|BoxedValueHelper|BoxLayout|BoxView|BreakIterator|Buffer|BufferCapabilities|BufferedImage|BufferedImageFilter|BufferedImageOp|BufferedInputStream|BufferedOutputStream|BufferedReader|BufferedWriter|BufferOverflowException|BufferStrategy|BufferUnderflowException|Button|ButtonGroup|ButtonModel|ButtonUI|Byte|ByteArrayInputStream|ByteArrayOutputStream|ByteBuffer|ByteChannel|ByteHolder|ByteLookupTable|ByteOrder|Calendar|CallableStatement|Callback|CallbackHandler|CancelablePrintJob|CancelledKeyException|CannotProceed|CannotProceedException|CannotProceedHelper|CannotProceedHolder|CannotRedoException|CannotUndoException|Canvas|CardLayout|Caret|CaretEvent|CaretListener|CDATASection|CellEditor|CellEditorListener|CellRendererPane|Certificate|CertificateEncodingException|CertificateException|CertificateExpiredException|CertificateFactory|CertificateFactorySpi|CertificateNotYetValidException|CertificateParsingException|CertPath|CertPathBuilder|CertPathBuilderException|CertPathBuilderResult|CertPathBuilderSpi|CertPathParameters|CertPathValidator|CertPathValidatorException|CertPathValidatorResult|CertPathValidatorSpi|CertSelector|CertStore|CertStoreException|CertStoreParameters|CertStoreSpi|ChangedCharSetException|ChangeEvent|ChangeListener|Channel|ChannelBinding|Channels|Character|CharacterCodingException|CharacterData|CharacterIterator|CharArrayReader|CharArrayWriter|CharBuffer|CharConversionException|CharHolder|CharSeqHelper|CharSeqHolder|CharSequence|Charset|CharsetDecoder|CharsetEncoder|CharsetProvider|Checkbox|CheckboxGroup|CheckboxMenuItem|CheckedInputStream|CheckedOutputStream|Checksum|Choice|ChoiceCallback|ChoiceFormat|Chromaticity|Cipher|CipherInputStream|CipherOutputStream|CipherSpi|Class|ClassCastException|ClassCircularityError|ClassDesc|ClassFormatError|ClassLoader|ClassNotFoundException|ClientRequestInfo|ClientRequestInfoOperations|ClientRequestInterceptor|ClientRequestInterceptorOperations|Clip|Clipboard|ClipboardOwner|Clob|Cloneable|CloneNotSupportedException|ClosedByInterruptException|ClosedChannelException|ClosedSelectorException|CMMException|Codec|CodecFactory|CodecFactoryHelper|CodecFactoryOperations|CodecOperations|CoderMalfunctionError|CoderResult|CodeSets|CodeSource|CodingErrorAction|CollationElementIterator|CollationKey|Collator|Collection|CollectionCertStoreParameters|Collections|Color|ColorChooserComponentFactory|ColorChooserUI|ColorConvertOp|ColorModel|ColorSelectionModel|ColorSpace|ColorSupported|ColorUIResource|ComboBoxEditor|ComboBoxModel|ComboBoxUI|ComboPopup|COMM_FAILURE|Comment|CommunicationException|Comparable|Comparator|Compiler|CompletionStatus|CompletionStatusHelper|Component|ComponentAdapter|ComponentColorModel|ComponentEvent|ComponentIdHelper|ComponentInputMap|ComponentInputMapUIResource|ComponentListener|ComponentOrientation|ComponentSampleModel|ComponentUI|ComponentView|Composite|CompositeContext|CompositeName|CompositeView|CompoundBorder|CompoundControl|CompoundEdit|CompoundName|Compression|ConcurrentModificationException|Configuration|ConfigurationException|ConfirmationCallback|ConnectException|ConnectIOException|Connection|ConnectionEvent|ConnectionEventListener|ConnectionPendingException|ConnectionPoolDataSource|ConsoleHandler|Constructor|Container|ContainerAdapter|ContainerEvent|ContainerListener|ContainerOrderFocusTraversalPolicy|ContentHandler|ContentHandlerFactory|ContentModel|Context|ContextList|ContextNotEmptyException|ContextualRenderedImageFactory|Control|ControlFactory|ControllerEventListener|ConvolveOp|CookieHolder|Copies|CopiesSupported|CRC32|CredentialExpiredException|CRL|CRLException|CRLSelector|CropImageFilter|CSS|CTX_RESTRICT_SCOPE|CubicCurve2D|Currency|Current|CurrentHelper|CurrentHolder|CurrentOperations|Cursor|Customizer|CustomMarshal|CustomValue|DATA_CONVERSION|DatabaseMetaData|DataBuffer|DataBufferByte|DataBufferDouble|DataBufferFloat|DataBufferInt|DataBufferShort|DataBufferUShort|DataFlavor|DataFormatException|DatagramChannel|DatagramPacket|DatagramSocket|DatagramSocketImpl|DatagramSocketImplFactory|DataInput|DataInputStream|DataLine|DataOutput|DataOutputStream|DataSource|DataTruncation|Date|DateFormat|DateFormatSymbols|DateFormatter|DateTimeAtCompleted|DateTimeAtCreation|DateTimeAtProcessing|DateTimeSyntax|DebugGraphics|DecimalFormat|DecimalFormatSymbols|DeclHandler|DefaultBoundedRangeModel|DefaultButtonModel|DefaultCaret|DefaultCellEditor|DefaultColorSelectionModel|DefaultComboBoxModel|DefaultDesktopManager|DefaultEditorKit|DefaultFocusManager|DefaultFocusTraversalPolicy|DefaultFormatter|DefaultFormatterFactory|DefaultHandler|DefaultHighlighter|DefaultKeyboardFocusManager|DefaultListCellRenderer|DefaultListModel|DefaultListSelectionModel|DefaultMenuLayout|DefaultMetalTheme|DefaultMutableTreeNode|DefaultPersistenceDelegate|DefaultSingleSelectionModel|DefaultStyledDocument|DefaultTableCellRenderer|DefaultTableColumnModel|DefaultTableModel|DefaultTextUI|DefaultTreeCellEditor|DefaultTreeCellRenderer|DefaultTreeModel|DefaultTreeSelectionModel|DefinitionKind|DefinitionKindHelper|Deflater|DeflaterOutputStream|Delegate|DelegationPermission|DESedeKeySpec|DesignMode|DESKeySpec|DesktopIconUI|DesktopManager|DesktopPaneUI|Destination|Destroyable|DestroyFailedException|DGC|DHGenParameterSpec|DHKey|DHParameterSpec|DHPrivateKey|DHPrivateKeySpec|DHPublicKey|DHPublicKeySpec|Dialog|Dictionary|DigestException|DigestInputStream|DigestOutputStream|Dimension|Dimension2D|DimensionUIResource|DirContext|DirectColorModel|DirectoryManager|DirObjectFactory|DirStateFactory|DisplayMode|DnDConstants|Doc|DocAttribute|DocAttributeSet|DocFlavor|DocPrintJob|Document|DocumentBuilder|DocumentBuilderFactory|DocumentEvent|DocumentFilter|DocumentFragment|DocumentHandler|DocumentListener|DocumentName|DocumentParser|DocumentType|DomainCombiner|DomainManager|DomainManagerOperations|DOMException|DOMImplementation|DOMLocator|DOMResult|DOMSource|Double|DoubleBuffer|DoubleHolder|DoubleSeqHelper|DoubleSeqHolder|DragGestureEvent|DragGestureListener|DragGestureRecognizer|DragSource|DragSourceAdapter|DragSourceContext|DragSourceDragEvent|DragSourceDropEvent|DragSourceEvent|DragSourceListener|DragSourceMotionListener|Driver|DriverManager|DriverPropertyInfo|DropTarget|DropTargetAdapter|DropTargetContext|DropTargetDragEvent|DropTargetDropEvent|DropTargetEvent|DropTargetListener|DSAKey|DSAKeyPairGenerator|DSAParameterSpec|DSAParams|DSAPrivateKey|DSAPrivateKeySpec|DSAPublicKey|DSAPublicKeySpec|DTD|DTDConstants|DTDHandler|DuplicateName|DuplicateNameHelper|DynamicImplementation|DynAny|DynAnyFactory|DynAnyFactoryHelper|DynAnyFactoryOperations|DynAnyHelper|DynAnyOperations|DynAnySeqHelper|DynArray|DynArrayHelper|DynArrayOperations|DynEnum|DynEnumHelper|DynEnumOperations|DynFixed|DynFixedHelper|DynFixedOperations|DynSequence|DynSequenceHelper|DynSequenceOperations|DynStruct|DynStructHelper|DynStructOperations|DynUnion|DynUnionHelper|DynUnionOperations|DynValue|DynValueBox|DynValueBoxOperations|DynValueCommon|DynValueCommonOperations|DynValueHelper|DynValueOperations|EditorKit|Element|ElementIterator|Ellipse2D|EmptyBorder|EmptyStackException|EncodedKeySpec|Encoder|Encoding|ENCODING_CDR_ENCAPS|EncryptedPrivateKeyInfo|Entity|EntityReference|EntityResolver|EnumControl|Enumeration|EnumSyntax|Environment|EOFException|Error|ErrorHandler|ErrorListener|ErrorManager|EtchedBorder|Event|EventContext|EventDirContext|EventHandler|EventListener|EventListenerList|EventListenerProxy|EventObject|EventQueue|EventSetDescriptor|Exception|ExceptionInInitializerError|ExceptionList|ExceptionListener|ExemptionMechanism|ExemptionMechanismException|ExemptionMechanismSpi|ExpandVetoException|ExportException|Expression|ExtendedRequest|ExtendedResponse|Externalizable|FactoryConfigurationError|FailedLoginException|FeatureDescriptor|Fidelity|Field|FieldNameHelper|FieldPosition|FieldView|File|FileCacheImageInputStream|FileCacheImageOutputStream|FileChannel|FileChooserUI|FileDescriptor|FileDialog|FileFilter|FileHandler|FileImageInputStream|FileImageOutputStream|FileInputStream|FileLock|FileLockInterruptionException|FilenameFilter|FileNameMap|FileNotFoundException|FileOutputStream|FilePermission|FileReader|FileSystemView|FileView|FileWriter|Filter|FilteredImageSource|FilterInputStream|FilterOutputStream|FilterReader|FilterWriter|Finishings|FixedHeightLayoutCache|FixedHolder|FlatteningPathIterator|FlavorException|FlavorMap|FlavorTable|Float|FloatBuffer|FloatControl|FloatHolder|FloatSeqHelper|FloatSeqHolder|FlowLayout|FlowView|FocusAdapter|FocusEvent|FocusListener|FocusManager|FocusTraversalPolicy|Font|FontFormatException|FontMetrics|FontRenderContext|FontUIResource|Format|FormatConversionProvider|FormatMismatch|FormatMismatchHelper|Formatter|FormView|ForwardRequest|ForwardRequestHelper|Frame|FREE_MEM|GapContent|GatheringByteChannel|GeneralPath|GeneralSecurityException|GlyphJustificationInfo|GlyphMetrics|GlyphVector|GlyphView|GradientPaint|GraphicAttribute|Graphics|Graphics2D|GraphicsConfigTemplate|GraphicsConfiguration|GraphicsDevice|GraphicsEnvironment|GrayFilter|GregorianCalendar|GridBagConstraints|GridBagLayout|GridLayout|Group|GSSContext|GSSCredential|GSSException|GSSManager|GSSName|Guard|GuardedObject|GZIPInputStream|GZIPOutputStream|Handler|HandlerBase|HandshakeCompletedEvent|HandshakeCompletedListener|HasControls|HashAttributeSet|HashDocAttributeSet|HashMap|HashPrintJobAttributeSet|HashPrintRequestAttributeSet|HashPrintServiceAttributeSet|HashSet|Hashtable|HeadlessException|HierarchyBoundsAdapter|HierarchyBoundsListener|HierarchyEvent|HierarchyListener|Highlighter|HostnameVerifier|HTML|HTMLDocument|HTMLEditorKit|HTMLFrameHyperlinkEvent|HTMLWriter|HttpsURLConnection|HttpURLConnection|HyperlinkEvent|HyperlinkListener|ICC_ColorSpace|ICC_Profile|ICC_ProfileGray|ICC_ProfileRGB|Icon|IconUIResource|IconView|ID_ASSIGNMENT_POLICY_ID|ID_UNIQUENESS_POLICY_ID|IdAssignmentPolicy|IdAssignmentPolicyOperations|IdAssignmentPolicyValue|IdentifierHelper|Identity|IdentityHashMap|IdentityScope|IDLEntity|IDLType|IDLTypeHelper|IDLTypeOperations|IdUniquenessPolicy|IdUniquenessPolicyOperations|IdUniquenessPolicyValue|IIOByteBuffer|IIOException|IIOImage|IIOInvalidTreeException|IIOMetadata|IIOMetadataController|IIOMetadataFormat|IIOMetadataFormatImpl|IIOMetadataNode|IIOParam|IIOParamController|IIOReadProgressListener|IIOReadUpdateListener|IIOReadWarningListener|IIORegistry|IIOServiceProvider|IIOWriteProgressListener|IIOWriteWarningListener|IllegalAccessError|IllegalAccessException|IllegalArgumentException|IllegalBlockingModeException|IllegalBlockSizeException|IllegalCharsetNameException|IllegalComponentStateException|IllegalMonitorStateException|IllegalPathStateException|IllegalSelectorException|IllegalStateException|IllegalThreadStateException|Image|ImageCapabilities|ImageConsumer|ImageFilter|ImageGraphicAttribute|ImageIcon|ImageInputStream|ImageInputStreamImpl|ImageInputStreamSpi|ImageIO|ImageObserver|ImageOutputStream|ImageOutputStreamImpl|ImageOutputStreamSpi|ImageProducer|ImageReader|ImageReaderSpi|ImageReaderWriterSpi|ImageReadParam|ImageTranscoder|ImageTranscoderSpi|ImageTypeSpecifier|ImageView|ImageWriteParam|ImageWriter|ImageWriterSpi|ImagingOpException|IMP_LIMIT|IMPLICIT_ACTIVATION_POLICY_ID|ImplicitActivationPolicy|ImplicitActivationPolicyOperations|ImplicitActivationPolicyValue|IncompatibleClassChangeError|InconsistentTypeCode|InconsistentTypeCodeHelper|IndexColorModel|IndexedPropertyDescriptor|IndexOutOfBoundsException|IndirectionException|Inet4Address|Inet6Address|InetAddress|InetSocketAddress|Inflater|InflaterInputStream|InheritableThreadLocal|InitialContext|InitialContextFactory|InitialContextFactoryBuilder|InitialDirContext|INITIALIZE|InitialLdapContext|InlineView|InputContext|InputEvent|InputMap|InputMapUIResource|InputMethod|InputMethodContext|InputMethodDescriptor|InputMethodEvent|InputMethodHighlight|InputMethodListener|InputMethodRequests|InputSource|InputStream|InputStreamReader|InputSubset|InputVerifier|Insets|InsetsUIResource|InstantiationError|InstantiationException|Instrument|InsufficientResourcesException|IntBuffer|Integer|IntegerSyntax|Interceptor|InterceptorOperations|INTERNAL|InternalError|InternalFrameAdapter|InternalFrameEvent|InternalFrameFocusTraversalPolicy|InternalFrameListener|InternalFrameUI|InternationalFormatter|InterruptedException|InterruptedIOException|InterruptedNamingException|InterruptibleChannel|INTF_REPOS|IntHolder|IntrospectionException|Introspector|INV_FLAG|INV_IDENT|INV_OBJREF|INV_POLICY|Invalid|INVALID_TRANSACTION|InvalidAddress|InvalidAddressHelper|InvalidAddressHolder|InvalidAlgorithmParameterException|InvalidAttributeIdentifierException|InvalidAttributesException|InvalidAttributeValueException|InvalidClassException|InvalidDnDOperationException|InvalidKeyException|InvalidKeySpecException|InvalidMarkException|InvalidMidiDataException|InvalidName|InvalidNameException|InvalidNameHelper|InvalidNameHolder|InvalidObjectException|InvalidParameterException|InvalidParameterSpecException|InvalidPolicy|InvalidPolicyHelper|InvalidPreferencesFormatException|InvalidSearchControlsException|InvalidSearchFilterException|InvalidSeq|InvalidSlot|InvalidSlotHelper|InvalidTransactionException|InvalidTypeForEncoding|InvalidTypeForEncodingHelper|InvalidValue|InvalidValueHelper|InvocationEvent|InvocationHandler|InvocationTargetException|InvokeHandler|IOException|IOR|IORHelper|IORHolder|IORInfo|IORInfoOperations|IORInterceptor|IORInterceptorOperations|IRObject|IRObjectOperations|IstringHelper|ItemEvent|ItemListener|ItemSelectable|Iterator|IvParameterSpec|JApplet|JarEntry|JarException|JarFile|JarInputStream|JarOutputStream|JarURLConnection|JButton|JCheckBox|JCheckBoxMenuItem|JColorChooser|JComboBox|JComponent|JDesktopPane|JDialog|JEditorPane|JFileChooser|JFormattedTextField|JFrame|JInternalFrame|JLabel|JLayeredPane|JList|JMenu|JMenuBar|JMenuItem|JobAttributes|JobHoldUntil|JobImpressions|JobImpressionsCompleted|JobImpressionsSupported|JobKOctets|JobKOctetsProcessed|JobKOctetsSupported|JobMediaSheets|JobMediaSheetsCompleted|JobMediaSheetsSupported|JobMessageFromOperator|JobName|JobOriginatingUserName|JobPriority|JobPrioritySupported|JobSheets|JobState|JobStateReason|JobStateReasons|JOptionPane|JPanel|JPasswordField|JPEGHuffmanTable|JPEGImageReadParam|JPEGImageWriteParam|JPEGQTable|JPopupMenu|JProgressBar|JRadioButton|JRadioButtonMenuItem|JRootPane|JScrollBar|JScrollPane|JSeparator|JSlider|JSpinner|JSplitPane|JTabbedPane|JTable|JTableHeader|JTextArea|JTextComponent|JTextField|JTextPane|JToggleButton|JToolBar|JToolTip|JTree|JViewport|JWindow|KerberosKey|KerberosPrincipal|KerberosTicket|Kernel|Key|KeyAdapter|KeyAgreement|KeyAgreementSpi|KeyboardFocusManager|KeyEvent|KeyEventDispatcher|KeyEventPostProcessor|KeyException|KeyFactory|KeyFactorySpi|KeyGenerator|KeyGeneratorSpi|KeyListener|KeyManagementException|KeyManager|KeyManagerFactory|KeyManagerFactorySpi|Keymap|KeyPair|KeyPairGenerator|KeyPairGeneratorSpi|KeySpec|KeyStore|KeyStoreException|KeyStoreSpi|KeyStroke|Label|LabelUI|LabelView|LanguageCallback|LastOwnerException|LayeredHighlighter|LayoutFocusTraversalPolicy|LayoutManager|LayoutManager2|LayoutQueue|LDAPCertStoreParameters|LdapContext|LdapReferralException|Lease|Level|LexicalHandler|LIFESPAN_POLICY_ID|LifespanPolicy|LifespanPolicyOperations|LifespanPolicyValue|LimitExceededException|Line|Line2D|LineBorder|LineBreakMeasurer|LineEvent|LineListener|LineMetrics|LineNumberInputStream|LineNumberReader|LineUnavailableException|LinkageError|LinkedHashMap|LinkedHashSet|LinkedList|LinkException|LinkLoopException|LinkRef|List|ListCellRenderer|ListDataEvent|ListDataListener|ListIterator|ListModel|ListResourceBundle|ListSelectionEvent|ListSelectionListener|ListSelectionModel|ListUI|ListView|LoaderHandler|Locale|LocalObject|LocateRegistry|LOCATION_FORWARD|Locator|LocatorImpl|Logger|LoggingPermission|LoginContext|LoginException|LoginModule|LogManager|LogRecord|LogStream|Long|LongBuffer|LongHolder|LongLongSeqHelper|LongLongSeqHolder|LongSeqHelper|LongSeqHolder|LookAndFeel|LookupOp|LookupTable|Mac|MacSpi|MalformedInputException|MalformedLinkException|MalformedURLException|ManagerFactoryParameters|Manifest|Map|MappedByteBuffer|MARSHAL|MarshalException|MarshalledObject|MaskFormatter|Matcher|Math|MatteBorder|Media|MediaName|MediaPrintableArea|MediaSize|MediaSizeName|MediaTracker|MediaTray|Member|MemoryCacheImageInputStream|MemoryCacheImageOutputStream|MemoryHandler|MemoryImageSource|Menu|MenuBar|MenuBarUI|MenuComponent|MenuContainer|MenuDragMouseEvent|MenuDragMouseListener|MenuElement|MenuEvent|MenuItem|MenuItemUI|MenuKeyEvent|MenuKeyListener|MenuListener|MenuSelectionManager|MenuShortcut|MessageDigest|MessageDigestSpi|MessageFormat|MessageProp|MetaEventListener|MetalBorders|MetalButtonUI|MetalCheckBoxIcon|MetalCheckBoxUI|MetalComboBoxButton|MetalComboBoxEditor|MetalComboBoxIcon|MetalComboBoxUI|MetalDesktopIconUI|MetalFileChooserUI|MetalIconFactory|MetalInternalFrameTitlePane|MetalInternalFrameUI|MetalLabelUI|MetalLookAndFeel|MetalPopupMenuSeparatorUI|MetalProgressBarUI|MetalRadioButtonUI|MetalRootPaneUI|MetalScrollBarUI|MetalScrollButton|MetalScrollPaneUI|MetalSeparatorUI|MetalSliderUI|MetalSplitPaneUI|MetalTabbedPaneUI|MetalTextFieldUI|MetalTheme|MetalToggleButtonUI|MetalToolBarUI|MetalToolTipUI|MetalTreeUI|MetaMessage|Method|MethodDescriptor|MidiChannel|MidiDevice|MidiDeviceProvider|MidiEvent|MidiFileFormat|MidiFileReader|MidiFileWriter|MidiMessage|MidiSystem|MidiUnavailableException|MimeTypeParseException|MinimalHTMLWriter|MissingResourceException|Mixer|MixerProvider|ModificationItem|Modifier|MouseAdapter|MouseDragGestureRecognizer|MouseEvent|MouseInputAdapter|MouseInputListener|MouseListener|MouseMotionAdapter|MouseMotionListener|MouseWheelEvent|MouseWheelListener|MultiButtonUI|MulticastSocket|MultiColorChooserUI|MultiComboBoxUI|MultiDesktopIconUI|MultiDesktopPaneUI|MultiDoc|MultiDocPrintJob|MultiDocPrintService|MultiFileChooserUI|MultiInternalFrameUI|MultiLabelUI|MultiListUI|MultiLookAndFeel|MultiMenuBarUI|MultiMenuItemUI|MultiOptionPaneUI|MultiPanelUI|MultiPixelPackedSampleModel|MultipleComponentProfileHelper|MultipleComponentProfileHolder|MultipleDocumentHandling|MultipleMaster|MultiPopupMenuUI|MultiProgressBarUI|MultiRootPaneUI|MultiScrollBarUI|MultiScrollPaneUI|MultiSeparatorUI|MultiSliderUI|MultiSpinnerUI|MultiSplitPaneUI|MultiTabbedPaneUI|MultiTableHeaderUI|MultiTableUI|MultiTextUI|MultiToolBarUI|MultiToolTipUI|MultiTreeUI|MultiViewportUI|MutableAttributeSet|MutableComboBoxModel|MutableTreeNode|Name|NameAlreadyBoundException|NameCallback|NameClassPair|NameComponent|NameComponentHelper|NameComponentHolder|NamedNodeMap|NamedValue|NameDynAnyPair|NameDynAnyPairHelper|NameDynAnyPairSeqHelper|NameHelper|NameHolder|NameNotFoundException|NameParser|NamespaceChangeListener|NamespaceSupport|NameValuePair|NameValuePairHelper|NameValuePairSeqHelper|Naming|NamingContext|NamingContextExt|NamingContextExtHelper|NamingContextExtHolder|NamingContextExtOperations|NamingContextExtPOA|NamingContextHelper|NamingContextHolder|NamingContextOperations|NamingContextPOA|NamingEnumeration|NamingEvent|NamingException|NamingExceptionEvent|NamingListener|NamingManager|NamingSecurityException|NavigationFilter|NegativeArraySizeException|NetPermission|NetworkInterface|NO_IMPLEMENT|NO_MEMORY|NO_PERMISSION|NO_RESOURCES|NO_RESPONSE|NoClassDefFoundError|NoConnectionPendingException|NoContext|NoContextHelper|Node|NodeChangeEvent|NodeChangeListener|NodeList|NoInitialContextException|NoninvertibleTransformException|NonReadableChannelException|NonWritableChannelException|NoPermissionException|NoRouteToHostException|NoServant|NoServantHelper|NoSuchAlgorithmException|NoSuchAttributeException|NoSuchElementException|NoSuchFieldError|NoSuchFieldException|NoSuchMethodError|NoSuchMethodException|NoSuchObjectException|NoSuchPaddingException|NoSuchProviderException|NotActiveException|Notation|NotBoundException|NotContextException|NotEmpty|NotEmptyHelper|NotEmptyHolder|NotFound|NotFoundHelper|NotFoundHolder|NotFoundReason|NotFoundReasonHelper|NotFoundReasonHolder|NotOwnerException|NotSerializableException|NotYetBoundException|NotYetConnectedException|NullCipher|NullPointerException|Number|NumberFormat|NumberFormatException|NumberFormatter|NumberOfDocuments|NumberOfInterveningJobs|NumberUp|NumberUpSupported|NumericShaper|NVList|OBJ_ADAPTER|Object|OBJECT_NOT_EXIST|ObjectAlreadyActive|ObjectAlreadyActiveHelper|ObjectChangeListener|ObjectFactory|ObjectFactoryBuilder|ObjectHelper|ObjectHolder|ObjectIdHelper|ObjectImpl|ObjectInput|ObjectInputStream|ObjectInputValidation|ObjectNotActive|ObjectNotActiveHelper|ObjectOutput|ObjectOutputStream|ObjectStreamClass|ObjectStreamConstants|ObjectStreamException|ObjectStreamField|ObjectView|ObjID|Observable|Observer|OctetSeqHelper|OctetSeqHolder|Oid|OMGVMCID|OpenType|Operation|OperationNotSupportedException|Option|OptionalDataException|OptionPaneUI|ORB|ORBInitializer|ORBInitializerOperations|ORBInitInfo|ORBInitInfoOperations|OrientationRequested|OutOfMemoryError|OutputDeviceAssigned|OutputKeys|OutputStream|OutputStreamWriter|OverlappingFileLockException|OverlayLayout|Owner|Package|PackedColorModel|Pageable|PageAttributes|PageFormat|PageRanges|PagesPerMinute|PagesPerMinuteColor|Paint|PaintContext|PaintEvent|Panel|PanelUI|Paper|ParagraphView|Parameter|ParameterBlock|ParameterDescriptor|ParameterMetaData|ParameterMode|ParameterModeHelper|ParameterModeHolder|ParseException|ParsePosition|Parser|ParserAdapter|ParserConfigurationException|ParserDelegator|ParserFactory|PartialResultException|PasswordAuthentication|PasswordCallback|PasswordView|Patch|PathIterator|Pattern|PatternSyntaxException|PBEKey|PBEKeySpec|PBEParameterSpec|PDLOverrideSupported|Permission|PermissionCollection|Permissions|PERSIST_STORE|PersistenceDelegate|PhantomReference|Pipe|PipedInputStream|PipedOutputStream|PipedReader|PipedWriter|PixelGrabber|PixelInterleavedSampleModel|PKCS8EncodedKeySpec|PKIXBuilderParameters|PKIXCertPathBuilderResult|PKIXCertPathChecker|PKIXCertPathValidatorResult|PKIXParameters|PlainDocument|PlainView|POA|POAHelper|POAManager|POAManagerOperations|POAOperations|Point|Point2D|Policy|PolicyError|PolicyErrorCodeHelper|PolicyErrorHelper|PolicyErrorHolder|PolicyFactory|PolicyFactoryOperations|PolicyHelper|PolicyHolder|PolicyListHelper|PolicyListHolder|PolicyNode|PolicyOperations|PolicyQualifierInfo|PolicyTypeHelper|Polygon|PooledConnection|Popup|PopupFactory|PopupMenu|PopupMenuEvent|PopupMenuListener|PopupMenuUI|Port|PortableRemoteObject|PortableRemoteObjectDelegate|PortUnreachableException|Position|PreferenceChangeEvent|PreferenceChangeListener|Preferences|PreferencesFactory|PreparedStatement|PresentationDirection|Principal|PrincipalHolder|Printable|PrinterAbortException|PrinterException|PrinterGraphics|PrinterInfo|PrinterIOException|PrinterIsAcceptingJobs|PrinterJob|PrinterLocation|PrinterMakeAndModel|PrinterMessageFromOperator|PrinterMoreInfo|PrinterMoreInfoManufacturer|PrinterName|PrinterResolution|PrinterState|PrinterStateReason|PrinterStateReasons|PrinterURI|PrintEvent|PrintException|PrintGraphics|PrintJob|PrintJobAdapter|PrintJobAttribute|PrintJobAttributeEvent|PrintJobAttributeListener|PrintJobAttributeSet|PrintJobEvent|PrintJobListener|PrintQuality|PrintRequestAttribute|PrintRequestAttributeSet|PrintService|PrintServiceAttribute|PrintServiceAttributeEvent|PrintServiceAttributeListener|PrintServiceAttributeSet|PrintServiceLookup|PrintStream|PrintWriter|PRIVATE_MEMBER|PrivateCredentialPermission|PrivateKey|PrivilegedAction|PrivilegedActionException|PrivilegedExceptionAction|Process|ProcessingInstruction|ProfileDataException|ProfileIdHelper|ProgressBarUI|ProgressMonitor|ProgressMonitorInputStream|Properties|PropertyChangeEvent|PropertyChangeListener|PropertyChangeListenerProxy|PropertyChangeSupport|PropertyDescriptor|PropertyEditor|PropertyEditorManager|PropertyEditorSupport|PropertyPermission|PropertyResourceBundle|PropertyVetoException|ProtectionDomain|ProtocolException|Provider|ProviderException|Proxy|PSSParameterSpec|PUBLIC_MEMBER|PublicKey|PushbackInputStream|PushbackReader|QuadCurve2D|QueuedJobCount|Random|RandomAccess|RandomAccessFile|Raster|RasterFormatException|RasterOp|RC2ParameterSpec|RC5ParameterSpec|ReadableByteChannel|Reader|ReadOnlyBufferException|Receiver|Rectangle|Rectangle2D|RectangularShape|Ref|RefAddr|Reference|Referenceable|ReferenceQueue|ReferenceUriSchemesSupported|ReferralException|ReflectPermission|Refreshable|RefreshFailedException|RegisterableService|Registry|RegistryHandler|RemarshalException|Remote|RemoteCall|RemoteException|RemoteObject|RemoteRef|RemoteServer|RemoteStub|RenderableImage|RenderableImageOp|RenderableImageProducer|RenderContext|RenderedImage|RenderedImageFactory|Renderer|RenderingHints|RepaintManager|ReplicateScaleFilter|RepositoryIdHelper|Request|REQUEST_PROCESSING_POLICY_ID|RequestInfo|RequestInfoOperations|RequestingUserName|RequestProcessingPolicy|RequestProcessingPolicyOperations|RequestProcessingPolicyValue|RescaleOp|ResolutionSyntax|Resolver|ResolveResult|ResourceBundle|ResponseHandler|Result|ResultSet|ResultSetMetaData|ReverbType|RGBImageFilter|RMIClassLoader|RMIClassLoaderSpi|RMIClientSocketFactory|RMIFailureHandler|RMISecurityException|RMISecurityManager|RMIServerSocketFactory|RMISocketFactory|Robot|RootPaneContainer|RootPaneUI|RoundRectangle2D|RowMapper|RowSet|RowSetEvent|RowSetInternal|RowSetListener|RowSetMetaData|RowSetReader|RowSetWriter|RSAKey|RSAKeyGenParameterSpec|RSAMultiPrimePrivateCrtKey|RSAMultiPrimePrivateCrtKeySpec|RSAOtherPrimeInfo|RSAPrivateCrtKey|RSAPrivateCrtKeySpec|RSAPrivateKey|RSAPrivateKeySpec|RSAPublicKey|RSAPublicKeySpec|RTFEditorKit|RuleBasedCollator|Runnable|Runtime|RunTime|RuntimeException|RunTimeOperations|RuntimePermission|SampleModel|Savepoint|SAXException|SAXNotRecognizedException|SAXNotSupportedException|SAXParseException|SAXParser|SAXParserFactory|SAXResult|SAXSource|SAXTransformerFactory|ScatteringByteChannel|SchemaViolationException|Scrollable|Scrollbar|ScrollBarUI|ScrollPane|ScrollPaneAdjustable|ScrollPaneConstants|ScrollPaneLayout|ScrollPaneUI|SealedObject|SearchControls|SearchResult|SecretKey|SecretKeyFactory|SecretKeyFactorySpi|SecretKeySpec|SecureClassLoader|SecureRandom|SecureRandomSpi|Security|SecurityException|SecurityManager|SecurityPermission|Segment|SelectableChannel|SelectionKey|Selector|SelectorProvider|SeparatorUI|Sequence|SequenceInputStream|Sequencer|Serializable|SerializablePermission|Servant|SERVANT_RETENTION_POLICY_ID|ServantActivator|ServantActivatorHelper|ServantActivatorOperations|ServantActivatorPOA|ServantAlreadyActive|ServantAlreadyActiveHelper|ServantLocator|ServantLocatorHelper|ServantLocatorOperations|ServantLocatorPOA|ServantManager|ServantManagerOperations|ServantNotActive|ServantNotActiveHelper|ServantObject|ServantRetentionPolicy|ServantRetentionPolicyOperations|ServantRetentionPolicyValue|ServerCloneException|ServerError|ServerException|ServerNotActiveException|ServerRef|ServerRequest|ServerRequestInfo|ServerRequestInfoOperations|ServerRequestInterceptor|ServerRequestInterceptorOperations|ServerRuntimeException|ServerSocket|ServerSocketChannel|ServerSocketFactory|ServiceContext|ServiceContextHelper|ServiceContextHolder|ServiceContextListHelper|ServiceContextListHolder|ServiceDetail|ServiceDetailHelper|ServiceIdHelper|ServiceInformation|ServiceInformationHelper|ServiceInformationHolder|ServicePermission|ServiceRegistry|ServiceUI|ServiceUIFactory|ServiceUnavailableException|Set|SetOfIntegerSyntax|SetOverrideType|SetOverrideTypeHelper|Severity|Shape|ShapeGraphicAttribute|SheetCollate|Short|ShortBuffer|ShortBufferException|ShortHolder|ShortLookupTable|ShortMessage|ShortSeqHelper|ShortSeqHolder|Sides|Signature|SignatureException|SignatureSpi|SignedObject|Signer|SimpleAttributeSet|SimpleBeanInfo|SimpleDateFormat|SimpleDoc|SimpleFormatter|SimpleTimeZone|SinglePixelPackedSampleModel|SingleSelectionModel|Size2DSyntax|SizeLimitExceededException|SizeRequirements|SizeSequence|Skeleton|SkeletonMismatchException|SkeletonNotFoundException|SliderUI|Socket|SocketAddress|SocketChannel|SocketException|SocketFactory|SocketHandler|SocketImpl|SocketImplFactory|SocketOptions|SocketPermission|SocketSecurityException|SocketTimeoutException|SoftBevelBorder|SoftReference|SortedMap|SortedSet|SortingFocusTraversalPolicy|Soundbank|SoundbankReader|SoundbankResource|Source|SourceDataLine|SourceLocator|SpinnerDateModel|SpinnerListModel|SpinnerModel|SpinnerNumberModel|SpinnerUI|SplitPaneUI|Spring|SpringLayout|SQLData|SQLException|SQLInput|SQLOutput|SQLPermission|SQLWarning|SSLContext|SSLContextSpi|SSLException|SSLHandshakeException|SSLKeyException|SSLPeerUnverifiedException|SSLPermission|SSLProtocolException|SSLServerSocket|SSLServerSocketFactory|SSLSession|SSLSessionBindingEvent|SSLSessionBindingListener|SSLSessionContext|SSLSocket|SSLSocketFactory|Stack|StackOverflowError|StackTraceElement|StartTlsRequest|StartTlsResponse|State|StateEdit|StateEditable|StateFactory|Statement|Streamable|StreamableValue|StreamCorruptedException|StreamHandler|StreamPrintService|StreamPrintServiceFactory|StreamResult|StreamSource|StreamTokenizer|StrictMath|String|StringBuffer|StringBufferInputStream|StringCharacterIterator|StringContent|StringHolder|StringIndexOutOfBoundsException|StringNameHelper|StringReader|StringRefAddr|StringSelection|StringSeqHelper|StringSeqHolder|StringTokenizer|StringValueHelper|StringWriter|Stroke|Struct|StructMember|StructMemberHelper|Stub|StubDelegate|StubNotFoundException|Style|StyleConstants|StyleContext|StyledDocument|StyledEditorKit|StyleSheet|Subject|SubjectDomainCombiner|SUCCESSFUL|SupportedValuesAttribute|SwingConstants|SwingPropertyChangeSupport|SwingUtilities|SYNC_WITH_TRANSPORT|SyncFailedException|SyncScopeHelper|Synthesizer|SysexMessage|System|SYSTEM_EXCEPTION|SystemColor|SystemException|SystemFlavorMap|TabableView|TabbedPaneUI|TabExpander|TableCellEditor|TableCellRenderer|TableColumn|TableColumnModel|TableColumnModelEvent|TableColumnModelListener|TableHeaderUI|TableModel|TableModelEvent|TableModelListener|TableUI|TableView|TabSet|TabStop|TAG_ALTERNATE_IIOP_ADDRESS|TAG_CODE_SETS|TAG_INTERNET_IOP|TAG_JAVA_CODEBASE|TAG_MULTIPLE_COMPONENTS|TAG_ORB_TYPE|TAG_POLICIES|TagElement|TaggedComponent|TaggedComponentHelper|TaggedComponentHolder|TaggedProfile|TaggedProfileHelper|TaggedProfileHolder|TargetDataLine|TCKind|Templates|TemplatesHandler|Text|TextAction|TextArea|TextAttribute|TextComponent|TextEvent|TextField|TextHitInfo|TextInputCallback|TextLayout|TextListener|TextMeasurer|TextOutputCallback|TextSyntax|TextUI|TexturePaint|Thread|THREAD_POLICY_ID|ThreadDeath|ThreadGroup|ThreadLocal|ThreadPolicy|ThreadPolicyOperations|ThreadPolicyValue|Throwable|Tie|TileObserver|Time|TimeLimitExceededException|Timer|TimerTask|Timestamp|TimeZone|TitledBorder|ToolBarUI|Toolkit|ToolTipManager|ToolTipUI|TooManyListenersException|Track|TRANSACTION_REQUIRED|TRANSACTION_ROLLEDBACK|TransactionRequiredException|TransactionRolledbackException|TransactionService|Transferable|TransferHandler|TransformAttribute|Transformer|TransformerConfigurationException|TransformerException|TransformerFactory|TransformerFactoryConfigurationError|TransformerHandler|TRANSIENT|Transmitter|Transparency|TRANSPORT_RETRY|TreeCellEditor|TreeCellRenderer|TreeExpansionEvent|TreeExpansionListener|TreeMap|TreeModel|TreeModelEvent|TreeModelListener|TreeNode|TreePath|TreeSelectionEvent|TreeSelectionListener|TreeSelectionModel|TreeSet|TreeUI|TreeWillExpandListener|TrustAnchor|TrustManager|TrustManagerFactory|TrustManagerFactorySpi|TypeCode|TypeCodeHolder|TypeMismatch|TypeMismatchHelper|Types|UID|UIDefaults|UIManager|UIResource|ULongLongSeqHelper|ULongLongSeqHolder|ULongSeqHelper|ULongSeqHolder|UndeclaredThrowableException|UndoableEdit|UndoableEditEvent|UndoableEditListener|UndoableEditSupport|UndoManager|UnexpectedException|UnicastRemoteObject|UnionMember|UnionMemberHelper|UNKNOWN|UnknownEncoding|UnknownEncodingHelper|UnknownError|UnknownException|UnknownGroupException|UnknownHostException|UnknownObjectException|UnknownServiceException|UnknownUserException|UnknownUserExceptionHelper|UnknownUserExceptionHolder|UnmappableCharacterException|UnmarshalException|UnmodifiableSetException|UnrecoverableKeyException|Unreferenced|UnresolvedAddressException|UnresolvedPermission|UnsatisfiedLinkError|UnsolicitedNotification|UnsolicitedNotificationEvent|UnsolicitedNotificationListener|UNSUPPORTED_POLICY|UNSUPPORTED_POLICY_VALUE|UnsupportedAddressTypeException|UnsupportedAudioFileException|UnsupportedCallbackException|UnsupportedCharsetException|UnsupportedClassVersionError|UnsupportedEncodingException|UnsupportedFlavorException|UnsupportedLookAndFeelException|UnsupportedOperationException|URI|URIException|URIResolver|URISyntax|URISyntaxException|URL|URLClassLoader|URLConnection|URLDecoder|URLEncoder|URLStreamHandler|URLStreamHandlerFactory|URLStringHelper|USER_EXCEPTION|UserException|UShortSeqHelper|UShortSeqHolder|UTFDataFormatException|Util|UtilDelegate|Utilities|ValueBase|ValueBaseHelper|ValueBaseHolder|ValueFactory|ValueHandler|ValueMember|ValueMemberHelper|VariableHeightLayoutCache|Vector|VerifyError|VersionSpecHelper|VetoableChangeListener|VetoableChangeListenerProxy|VetoableChangeSupport|View|ViewFactory|ViewportLayout|ViewportUI|VirtualMachineError|Visibility|VisibilityHelper|VM_ABSTRACT|VM_CUSTOM|VM_NONE|VM_TRUNCATABLE|VMID|VoiceStatus|Void|VolatileImage|WCharSeqHelper|WCharSeqHolder|WeakHashMap|WeakReference|Window|WindowAdapter|WindowConstants|WindowEvent|WindowFocusListener|WindowListener|WindowStateListener|WrappedPlainView|WritableByteChannel|WritableRaster|WritableRenderedImage|WriteAbortedException|Writer|WrongAdapter|WrongAdapterHelper|WrongPolicy|WrongPolicyHelper|WrongTransaction|WrongTransactionHelper|WrongTransactionHolder|WStringSeqHelper|WStringSeqHolder|WStringValueHelper|X500Principal|X500PrivateCredential|X509Certificate|X509CertSelector|X509CRL|X509CRLEntry|X509CRLSelector|X509EncodedKeySpec|X509Extension|X509KeyManager|X509TrustManager|XAConnection|XADataSource|XAException|XAResource|Xid|XMLDecoder|XMLEncoder|XMLFilter|XMLFilterImpl|XMLFormatter|XMLReader|XMLReaderAdapter|XMLReaderFactory|ZipEntry|ZipException|ZipFile|ZipInputStream|ZipOutputStream|ZoneView|_BindingIteratorImplBase|_BindingIteratorStub|_DynAnyFactoryStub|_DynAnyStub|_DynArrayStub|_DynEnumStub|_DynFixedStub|_DynSequenceStub|_DynStructStub|_DynUnionStub|_DynValueStub|_IDLTypeStub|_NamingContextExtStub|_NamingContextImplBase|_NamingContextStub|_PolicyStub|_Remote_Stub|_ServantActivatorStub|_ServantLocatorStub)$/',
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+            ),
+            3 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+                4 => 
+                array (
+                ),
+            ),
+            4 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            5 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            6 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+                4 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+            ),
+            1 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+            ),
+            2 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+            ),
+            3 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+            ),
+            4 => 
+            array (
+                0 => NULL,
+            ),
+            5 => 
+            array (
+                0 => NULL,
+            ),
+            6 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+            ),
+            0 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+            ),
+            1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+            ),
+            2 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+            ),
+            4 => 
+            array (
+                0 => false,
+            ),
+            5 => 
+            array (
+                0 => false,
+            ),
+            6 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+            ),
+        );
+        $this->_conditions = array (
+            'java.builtins' => 
+            array (
+                0 => 
+                array (
+                    0 => 'builtin',
+                    1 => true,
+                ),
+            ),
+        );
+        $this->_kwmap = array (
+            'types' => 'types',
+            'reserved' => 'reserved',
+            'builtin' => 'builtin',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/JAVASCRIPT.php b/library/Text_Highlighter/Text/Highlighter/JAVASCRIPT.php
new file mode 100644
index 000000000..51eae8f62
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/JAVASCRIPT.php
@@ -0,0 +1,631 @@
+<?php
+/**
+ * Auto-generated class. JAVASCRIPT syntax highlighting
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: javascript.xml
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. JAVASCRIPT syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_JAVASCRIPT extends Text_Highlighter
+{
+    var $_language = 'javascript';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_JAVASCRIPT($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0x\\d*|\\d*\\.?\\d+)/',
+            0 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0x\\d*|\\d*\\.?\\d+)/',
+            1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0x\\d*|\\d*\\.?\\d+)/',
+            2 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)\')|((?i)\\/\\/)|((?i)[a-z_]\\w*)|((?i)0x\\d*|\\d*\\.?\\d+)/',
+            3 => '/((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\b(note|fixme):)|((?i)\\$\\w+:.+\\$)/',
+            4 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`|\\\\t|\\\\n|\\\\r)/',
+            5 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
+            6 => '/((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\b(note|fixme):)|((?i)\\$\\w+:.+\\$)/',
+        );
+        $this->_counts = array (
+            -1 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+            ),
+            0 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+            ),
+            1 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+            ),
+            2 =>
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+            ),
+            3 =>
+            array (
+                0 => 3,
+                1 => 1,
+                2 => 1,
+                3 => 0,
+            ),
+            4 =>
+            array (
+                0 => 0,
+            ),
+            5 =>
+            array (
+                0 => 0,
+            ),
+            6 =>
+            array (
+                0 => 3,
+                1 => 1,
+                2 => 1,
+                3 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 =>
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'comment',
+                7 => '',
+                8 => '',
+            ),
+            0 =>
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'comment',
+                7 => '',
+                8 => '',
+            ),
+            1 =>
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'comment',
+                7 => '',
+                8 => '',
+            ),
+            2 =>
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'comment',
+                7 => '',
+                8 => '',
+            ),
+            3 =>
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+            ),
+            4 =>
+            array (
+                0 => '',
+            ),
+            5 =>
+            array (
+                0 => '',
+            ),
+            6 =>
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 =>
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'comment',
+                7 => 'identifier',
+                8 => 'number',
+            ),
+            0 =>
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'comment',
+                7 => 'identifier',
+                8 => 'number',
+            ),
+            1 =>
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'comment',
+                7 => 'identifier',
+                8 => 'number',
+            ),
+            2 =>
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'comment',
+                7 => 'identifier',
+                8 => 'number',
+            ),
+            3 =>
+            array (
+                0 => 'url',
+                1 => 'url',
+                2 => 'inlinedoc',
+                3 => 'inlinedoc',
+            ),
+            4 =>
+            array (
+                0 => 'special',
+            ),
+            5 =>
+            array (
+                0 => 'special',
+            ),
+            6 =>
+            array (
+                0 => 'url',
+                1 => 'url',
+                2 => 'inlinedoc',
+                3 => 'inlinedoc',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)\\}/',
+            1 => '/(?i)\\)/',
+            2 => '/(?i)\\]/',
+            3 => '/(?i)\\*\\//',
+            4 => '/(?i)"/',
+            5 => '/(?i)\'/',
+            6 => '/(?mi)$/',
+        );
+        $this->_states = array (
+            -1 =>
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => 5,
+                6 => 6,
+                7 => -1,
+                8 => -1,
+            ),
+            0 =>
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => 5,
+                6 => 6,
+                7 => -1,
+                8 => -1,
+            ),
+            1 =>
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => 5,
+                6 => 6,
+                7 => -1,
+                8 => -1,
+            ),
+            2 =>
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => 5,
+                6 => 6,
+                7 => -1,
+                8 => -1,
+            ),
+            3 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+            ),
+            4 =>
+            array (
+                0 => -1,
+            ),
+            5 =>
+            array (
+                0 => -1,
+            ),
+            6 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 =>
+                array (
+                    'builtin' => '/^(String|Array|RegExp|Function|Math|Number|Date|Image|window|document|navigator|onAbort|onBlur|onChange|onClick|onDblClick|onDragDrop|onError|onFocus|onKeyDown|onKeyPress|onKeyUp|onLoad|onMouseDown|onMouseOver|onMouseOut|onMouseMove|onMouseUp|onMove|onReset|onResize|onSelect|onSubmit|onUnload)$/',
+                    'reserved' => '/^(break|continue|do|while|export|for|in|if|else|import|return|label|switch|case|var|with|delete|new|this|typeof|void|abstract|boolean|byte|catch|char|class|const|debugger|default|double|enum|extends|false|final|finally|float|function|implements|goto|instanceof|int|interface|long|native|null|package|private|protected|public|short|static|super|synchronized|throw|throws|transient|true|try|volatile)$/',
+                ),
+                8 =>
+                array (
+                ),
+            ),
+            0 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 =>
+                array (
+                    'builtin' => '/^(String|Array|RegExp|Function|Math|Number|Date|Image|window|document|navigator|onAbort|onBlur|onChange|onClick|onDblClick|onDragDrop|onError|onFocus|onKeyDown|onKeyPress|onKeyUp|onLoad|onMouseDown|onMouseOver|onMouseOut|onMouseMove|onMouseUp|onMove|onReset|onResize|onSelect|onSubmit|onUnload)$/',
+                    'reserved' => '/^(break|continue|do|while|export|for|in|if|else|import|return|label|switch|case|var|with|delete|new|this|typeof|void|abstract|boolean|byte|catch|char|class|const|debugger|default|double|enum|extends|false|final|finally|float|function|implements|goto|instanceof|int|interface|long|native|null|package|private|protected|public|short|static|super|synchronized|throw|throws|transient|true|try|volatile)$/',
+                ),
+                8 =>
+                array (
+                ),
+            ),
+            1 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 =>
+                array (
+                    'builtin' => '/^(String|Array|RegExp|Function|Math|Number|Date|Image|window|document|navigator|onAbort|onBlur|onChange|onClick|onDblClick|onDragDrop|onError|onFocus|onKeyDown|onKeyPress|onKeyUp|onLoad|onMouseDown|onMouseOver|onMouseOut|onMouseMove|onMouseUp|onMove|onReset|onResize|onSelect|onSubmit|onUnload)$/',
+                    'reserved' => '/^(break|continue|do|while|export|for|in|if|else|import|return|label|switch|case|var|with|delete|new|this|typeof|void|abstract|boolean|byte|catch|char|class|const|debugger|default|double|enum|extends|false|final|finally|float|function|implements|goto|instanceof|int|interface|long|native|null|package|private|protected|public|short|static|super|synchronized|throw|throws|transient|true|try|volatile)$/',
+                ),
+                8 =>
+                array (
+                ),
+            ),
+            2 =>
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 =>
+                array (
+                    'builtin' => '/^(String|Array|RegExp|Function|Math|Number|Date|Image|window|document|navigator|onAbort|onBlur|onChange|onClick|onDblClick|onDragDrop|onError|onFocus|onKeyDown|onKeyPress|onKeyUp|onLoad|onMouseDown|onMouseOver|onMouseOut|onMouseMove|onMouseUp|onMove|onReset|onResize|onSelect|onSubmit|onUnload)$/',
+                    'reserved' => '/^(break|continue|do|while|export|for|in|if|else|import|return|label|switch|case|var|with|delete|new|this|typeof|void|abstract|boolean|byte|catch|char|class|const|debugger|default|double|enum|extends|false|final|finally|float|function|implements|goto|instanceof|int|interface|long|native|null|package|private|protected|public|short|static|super|synchronized|throw|throws|transient|true|try|volatile)$/',
+                ),
+                8 =>
+                array (
+                ),
+            ),
+            3 =>
+            array (
+                0 =>
+                array (
+                ),
+                1 =>
+                array (
+                ),
+                2 =>
+                array (
+                ),
+                3 =>
+                array (
+                ),
+            ),
+            4 =>
+            array (
+                0 =>
+                array (
+                ),
+            ),
+            5 =>
+            array (
+                0 =>
+                array (
+                ),
+            ),
+            6 =>
+            array (
+                0 =>
+                array (
+                ),
+                1 =>
+                array (
+                ),
+                2 =>
+                array (
+                ),
+                3 =>
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+            ),
+            1 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+            ),
+            2 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+            ),
+            3 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+            4 =>
+            array (
+                0 => NULL,
+            ),
+            5 =>
+            array (
+                0 => NULL,
+            ),
+            6 =>
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+            ),
+            0 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+            ),
+            1 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+            ),
+            2 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+            ),
+            3 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+            4 =>
+            array (
+                0 => false,
+            ),
+            5 =>
+            array (
+                0 => false,
+            ),
+            6 =>
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'builtin' => 'builtin',
+            'reserved' => 'reserved',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+
+}
diff --git a/library/Text_Highlighter/Text/Highlighter/MYSQL.php b/library/Text_Highlighter/Text/Highlighter/MYSQL.php
new file mode 100644
index 000000000..bdd74cc8b
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/MYSQL.php
@@ -0,0 +1,434 @@
+<?php
+/**
+ * Auto-generated class. MYSQL syntax highlighting 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : mysql.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. MYSQL syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_MYSQL extends Text_Highlighter
+{
+    var $_language = 'mysql';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_MYSQL($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)`)|((?i)\\/\\*)|((?i)(#|--\\s).*)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)")|((?i)\\()|((?i)\')|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)/',
+            0 => '//',
+            1 => '//',
+            2 => '/((?i)\\\\.)/',
+            3 => '/((?i)`)|((?i)\\/\\*)|((?i)(#|--\\s).*)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)")|((?i)\\()|((?i)\')|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)/',
+            4 => '/((?i)\\\\.)/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 1,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 5,
+                9 => 2,
+                10 => 0,
+                11 => 0,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 0,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 1,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 5,
+                9 => 2,
+                10 => 0,
+                11 => 0,
+            ),
+            4 => 
+            array (
+                0 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'quotes',
+                1 => 'comment',
+                2 => '',
+                3 => '',
+                4 => '',
+                5 => 'quotes',
+                6 => 'brackets',
+                7 => 'quotes',
+                8 => '',
+                9 => '',
+                10 => '',
+                11 => '',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => '',
+            ),
+            3 => 
+            array (
+                0 => 'quotes',
+                1 => 'comment',
+                2 => '',
+                3 => '',
+                4 => '',
+                5 => 'quotes',
+                6 => 'brackets',
+                7 => 'quotes',
+                8 => '',
+                9 => '',
+                10 => '',
+                11 => '',
+            ),
+            4 => 
+            array (
+                0 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'identifier',
+                1 => 'comment',
+                2 => 'comment',
+                3 => 'identifier',
+                4 => 'identifier',
+                5 => 'string',
+                6 => 'code',
+                7 => 'string',
+                8 => 'number',
+                9 => 'number',
+                10 => 'number',
+                11 => 'number',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 'special',
+            ),
+            3 => 
+            array (
+                0 => 'identifier',
+                1 => 'comment',
+                2 => 'comment',
+                3 => 'identifier',
+                4 => 'identifier',
+                5 => 'string',
+                6 => 'code',
+                7 => 'string',
+                8 => 'number',
+                9 => 'number',
+                10 => 'number',
+                11 => 'number',
+            ),
+            4 => 
+            array (
+                0 => 'special',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)`/',
+            1 => '/(?i)\\*\\//',
+            2 => '/(?i)"/',
+            3 => '/(?i)\\)/',
+            4 => '/(?i)\'/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 2,
+                6 => 3,
+                7 => 4,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => -1,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 2,
+                6 => 3,
+                7 => 4,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+            ),
+            4 => 
+            array (
+                0 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                    'function' => '/^((?i)abs|acos|adddate|ascii|asin|atan|atan2|avg|benchmark|bin|ceiling|char|coalesce|concat|conv|cos|cot|count|curdate|curtime|database|dayname|dayofmonth|dayofweek|dayofyear|decode|degrees|elt|encode|encrypt|exp|extract|field|floor|format|greatest|hex|hour|if|ifnull|insert|instr|interval|isnull|lcase|least|left|length|locate|log|log10|lower|lpad|ltrim|max|md5|mid|min|minute|mod|month|monthname|now|nullif|oct|ord|password|pi|position|pow|power|prepare|quarter|radians|rand|repeat|replace|reverse|right|round|rpad|rtrim|second|sign|sin|soundex|space|sqrt|std|stddev|strcmp|subdate|substring|sum|sysdate|tan|trim|truncate|ucase|upper|user|version|week|weekday|year)$/',
+                ),
+                4 => 
+                array (
+                    'reserved' => '/^((?i)action|add|aggregate|all|alter|after|and|as|asc|avg|avg_row_length|auto_increment|between|bigint|bit|binary|blob|bool|both|by|cascade|case|char|character|change|check|checksum|column|columns|comment|constraint|create|cross|current_date|current_time|current_timestamp|data|database|databases|date|datetime|day|day_hour|day_minute|day_second|dayofmonth|dayofweek|dayofyear|dec|decimal|default|delayed|delay_key_write|delete|desc|describe|distinct|distinctrow|double|drop|end|else|escape|escaped|enclosed|enum|explain|exists|fields|file|first|float|float4|float8|flush|foreign|from|for|full|function|global|grant|grants|group|having|heap|high_priority|hour|hour_minute|hour_second|hosts|identified|ignore|in|index|infile|inner|insert|insert_id|int|integer|interval|int1|int2|int3|int4|int8|into|if|is|isam|join|key|keys|kill|last_insert_id|leading|left|length|like|lines|limit|load|local|lock|logs|long|longblob|longtext|low_priority|max|max_rows|match|mediumblob|mediumtext|mediumint|middleint|min_rows|minute|minute_second|modify|month|monthname|myisam|natural|numeric|no|not|null|on|optimize|option|optionally|or|order|outer|outfile|pack_keys|partial|password|precision|primary|procedure|process|processlist|privileges|read|real|references|reload|regexp|rename|replace|restrict|returns|revoke|rlike|row|rows|second|select|set|show|shutdown|smallint|soname|sql_big_tables|sql_big_selects|sql_low_priority_updates|sql_log_off|sql_log_update|sql_select_limit|sql_small_result|sql_big_result|sql_warnings|straight_join|starting|status|string|table|tables|temporary|terminated|text|then|time|timestamp|tinyblob|tinytext|tinyint|trailing|to|type|use|using|unique|unlock|unsigned|update|usage|values|varchar|variables|varying|varbinary|with|write|when|where|year|year_month|zerofill)$/',
+                ),
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            3 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                    'function' => '/^((?i)abs|acos|adddate|ascii|asin|atan|atan2|avg|benchmark|bin|ceiling|char|coalesce|concat|conv|cos|cot|count|curdate|curtime|database|dayname|dayofmonth|dayofweek|dayofyear|decode|degrees|elt|encode|encrypt|exp|extract|field|floor|format|greatest|hex|hour|if|ifnull|insert|instr|interval|isnull|lcase|least|left|length|locate|log|log10|lower|lpad|ltrim|max|md5|mid|min|minute|mod|month|monthname|now|nullif|oct|ord|password|pi|position|pow|power|prepare|quarter|radians|rand|repeat|replace|reverse|right|round|rpad|rtrim|second|sign|sin|soundex|space|sqrt|std|stddev|strcmp|subdate|substring|sum|sysdate|tan|trim|truncate|ucase|upper|user|version|week|weekday|year)$/',
+                ),
+                4 => 
+                array (
+                    'reserved' => '/^((?i)action|add|aggregate|all|alter|after|and|as|asc|avg|avg_row_length|auto_increment|between|bigint|bit|binary|blob|bool|both|by|cascade|case|char|character|change|check|checksum|column|columns|comment|constraint|create|cross|current_date|current_time|current_timestamp|data|database|databases|date|datetime|day|day_hour|day_minute|day_second|dayofmonth|dayofweek|dayofyear|dec|decimal|default|delayed|delay_key_write|delete|desc|describe|distinct|distinctrow|double|drop|end|else|escape|escaped|enclosed|enum|explain|exists|fields|file|first|float|float4|float8|flush|foreign|from|for|full|function|global|grant|grants|group|having|heap|high_priority|hour|hour_minute|hour_second|hosts|identified|ignore|in|index|infile|inner|insert|insert_id|int|integer|interval|int1|int2|int3|int4|int8|into|if|is|isam|join|key|keys|kill|last_insert_id|leading|left|length|like|lines|limit|load|local|lock|logs|long|longblob|longtext|low_priority|max|max_rows|match|mediumblob|mediumtext|mediumint|middleint|min_rows|minute|minute_second|modify|month|monthname|myisam|natural|numeric|no|not|null|on|optimize|option|optionally|or|order|outer|outfile|pack_keys|partial|password|precision|primary|procedure|process|processlist|privileges|read|real|references|reload|regexp|rename|replace|restrict|returns|revoke|rlike|row|rows|second|select|set|show|shutdown|smallint|soname|sql_big_tables|sql_big_selects|sql_low_priority_updates|sql_log_off|sql_log_update|sql_select_limit|sql_small_result|sql_big_result|sql_warnings|straight_join|starting|status|string|table|tables|temporary|terminated|text|then|time|timestamp|tinyblob|tinytext|tinyint|trailing|to|type|use|using|unique|unlock|unsigned|update|usage|values|varchar|variables|varying|varbinary|with|write|when|where|year|year_month|zerofill)$/',
+                ),
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+            ),
+            4 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => NULL,
+            ),
+            3 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+            ),
+            4 => 
+            array (
+                0 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+            ),
+            4 => 
+            array (
+                0 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'function' => 'reserved',
+            'reserved' => 'reserved',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/PERL.php b/library/Text_Highlighter/Text/Highlighter/PERL.php
new file mode 100644
index 000000000..277a5ba45
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/PERL.php
@@ -0,0 +1,1352 @@
+<?php
+/**
+ * Auto-generated class. PERL syntax highlighting
+ * 
+ * This highlighter is EXPERIMENTAL, so that it may work incorrectly. 
+ * Most rules were created by Mariusz Jakubowski, and extended by me.
+ * My  knowledge  of  Perl  is  poor,  and  Perl  syntax  seems  too
+ * complicated to me. 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : perl.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Mariusz 'kg' Jakubowski <kg@alternatywa.info>
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. PERL syntax highlighting
+ *
+ * @author Mariusz 'kg' Jakubowski <kg@alternatywa.info>
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_PERL extends Text_Highlighter
+{
+    var $_language = 'perl';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_PERL($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?m)^(#!)(.*))|((?m)^=\\w+)|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|([& ](\\w{2,}::)+\\w{2,})|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(&|\\w+)\'[\\w_\']+\\b)|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
+            0 => '//',
+            1 => '/((?m)^(#!)(.*))|((?m)^=\\w+)|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|([& ](\\w{2,}::)+\\w{2,})|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(&|\\w+)\'[\\w_\']+\\b)|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
+            2 => '/((?m)^(#!)(.*))|((?m)^=\\w+)|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|([& ](\\w{2,}::)+\\w{2,})|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|((?i)([a-z1-9_]+)(\\s*=>))|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(&|\\w+)\'[\\w_\']+\\b)|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
+            3 => '/((?m)^(#!)(.*))|((?m)^=\\w+)|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|([& ](\\w{2,}::)+\\w{2,})|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(&|\\w+)\'[\\w_\']+\\b)|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
+            4 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\[\\\\"\'`tnr\\$\\{@])/',
+            5 => '/(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
+            6 => '/(\\\\\\/)/',
+            7 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
+            8 => '/(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
+            9 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\[\\\\"\'`tnr\\$\\{@])/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 2,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 2,
+                6 => 1,
+                7 => 9,
+                8 => 9,
+                9 => 0,
+                10 => 8,
+                11 => 5,
+                12 => 0,
+                13 => 0,
+                14 => 3,
+                15 => 1,
+                16 => 1,
+                17 => 3,
+                18 => 0,
+                19 => 0,
+                20 => 0,
+                21 => 0,
+                22 => 0,
+                23 => 0,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 2,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 2,
+                6 => 1,
+                7 => 9,
+                8 => 9,
+                9 => 0,
+                10 => 8,
+                11 => 5,
+                12 => 0,
+                13 => 0,
+                14 => 3,
+                15 => 1,
+                16 => 1,
+                17 => 3,
+                18 => 0,
+                19 => 0,
+                20 => 0,
+                21 => 0,
+                22 => 0,
+                23 => 0,
+            ),
+            2 => 
+            array (
+                0 => 2,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 2,
+                6 => 1,
+                7 => 9,
+                8 => 9,
+                9 => 0,
+                10 => 8,
+                11 => 5,
+                12 => 0,
+                13 => 2,
+                14 => 0,
+                15 => 3,
+                16 => 1,
+                17 => 1,
+                18 => 3,
+                19 => 0,
+                20 => 0,
+                21 => 0,
+                22 => 0,
+                23 => 0,
+                24 => 0,
+            ),
+            3 => 
+            array (
+                0 => 2,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 2,
+                6 => 1,
+                7 => 9,
+                8 => 9,
+                9 => 0,
+                10 => 8,
+                11 => 5,
+                12 => 0,
+                13 => 0,
+                14 => 3,
+                15 => 1,
+                16 => 1,
+                17 => 3,
+                18 => 0,
+                19 => 0,
+                20 => 0,
+                21 => 0,
+                22 => 0,
+                23 => 0,
+            ),
+            4 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 0,
+                3 => 0,
+            ),
+            5 => 
+            array (
+                0 => 0,
+            ),
+            6 => 
+            array (
+                0 => 0,
+            ),
+            7 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 0,
+                3 => 0,
+            ),
+            8 => 
+            array (
+                0 => 0,
+            ),
+            9 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 0,
+                3 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => '',
+                1 => 'comment',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => 'brackets',
+                5 => '',
+                6 => '',
+                7 => 'quotes',
+                8 => 'quotes',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => 'quotes',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+                17 => '',
+                18 => '',
+                19 => 'quotes',
+                20 => 'quotes',
+                21 => 'quotes',
+                22 => '',
+                23 => '',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => '',
+                1 => 'comment',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => 'brackets',
+                5 => '',
+                6 => '',
+                7 => 'quotes',
+                8 => 'quotes',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => 'quotes',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+                17 => '',
+                18 => '',
+                19 => 'quotes',
+                20 => 'quotes',
+                21 => 'quotes',
+                22 => '',
+                23 => '',
+            ),
+            2 => 
+            array (
+                0 => '',
+                1 => 'comment',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => 'brackets',
+                5 => '',
+                6 => '',
+                7 => 'quotes',
+                8 => 'quotes',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => 'quotes',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+                17 => '',
+                18 => '',
+                19 => '',
+                20 => 'quotes',
+                21 => 'quotes',
+                22 => 'quotes',
+                23 => '',
+                24 => '',
+            ),
+            3 => 
+            array (
+                0 => '',
+                1 => 'comment',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => 'brackets',
+                5 => '',
+                6 => '',
+                7 => 'quotes',
+                8 => 'quotes',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => 'quotes',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+                17 => '',
+                18 => '',
+                19 => 'quotes',
+                20 => 'quotes',
+                21 => 'quotes',
+                22 => '',
+                23 => '',
+            ),
+            4 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+            ),
+            5 => 
+            array (
+                0 => '',
+            ),
+            6 => 
+            array (
+                0 => '',
+            ),
+            7 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+            ),
+            8 => 
+            array (
+                0 => '',
+            ),
+            9 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'special',
+                1 => 'comment',
+                2 => 'code',
+                3 => 'code',
+                4 => 'code',
+                5 => 'special',
+                6 => 'special',
+                7 => 'string',
+                8 => 'string',
+                9 => 'comment',
+                10 => 'string',
+                11 => 'string',
+                12 => 'string',
+                13 => 'var',
+                14 => 'var',
+                15 => 'var',
+                16 => 'var',
+                17 => 'var',
+                18 => 'var',
+                19 => 'string',
+                20 => 'string',
+                21 => 'string',
+                22 => 'identifier',
+                23 => 'number',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 'special',
+                1 => 'comment',
+                2 => 'code',
+                3 => 'code',
+                4 => 'code',
+                5 => 'special',
+                6 => 'special',
+                7 => 'string',
+                8 => 'string',
+                9 => 'comment',
+                10 => 'string',
+                11 => 'string',
+                12 => 'string',
+                13 => 'var',
+                14 => 'var',
+                15 => 'var',
+                16 => 'var',
+                17 => 'var',
+                18 => 'var',
+                19 => 'string',
+                20 => 'string',
+                21 => 'string',
+                22 => 'identifier',
+                23 => 'number',
+            ),
+            2 => 
+            array (
+                0 => 'special',
+                1 => 'comment',
+                2 => 'code',
+                3 => 'code',
+                4 => 'code',
+                5 => 'special',
+                6 => 'special',
+                7 => 'string',
+                8 => 'string',
+                9 => 'comment',
+                10 => 'string',
+                11 => 'string',
+                12 => 'string',
+                13 => 'string',
+                14 => 'var',
+                15 => 'var',
+                16 => 'var',
+                17 => 'var',
+                18 => 'var',
+                19 => 'var',
+                20 => 'string',
+                21 => 'string',
+                22 => 'string',
+                23 => 'identifier',
+                24 => 'number',
+            ),
+            3 => 
+            array (
+                0 => 'special',
+                1 => 'comment',
+                2 => 'code',
+                3 => 'code',
+                4 => 'code',
+                5 => 'special',
+                6 => 'special',
+                7 => 'string',
+                8 => 'string',
+                9 => 'comment',
+                10 => 'string',
+                11 => 'string',
+                12 => 'string',
+                13 => 'var',
+                14 => 'var',
+                15 => 'var',
+                16 => 'var',
+                17 => 'var',
+                18 => 'var',
+                19 => 'string',
+                20 => 'string',
+                21 => 'string',
+                22 => 'identifier',
+                23 => 'number',
+            ),
+            4 => 
+            array (
+                0 => 'var',
+                1 => 'var',
+                2 => 'var',
+                3 => 'special',
+            ),
+            5 => 
+            array (
+                0 => 'special',
+            ),
+            6 => 
+            array (
+                0 => 'string',
+            ),
+            7 => 
+            array (
+                0 => 'var',
+                1 => 'var',
+                2 => 'var',
+                3 => 'special',
+            ),
+            8 => 
+            array (
+                0 => 'special',
+            ),
+            9 => 
+            array (
+                0 => 'var',
+                1 => 'var',
+                2 => 'var',
+                3 => 'special',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?m)^=cut[^\\n]*/',
+            1 => '/\\}/',
+            2 => '/\\)/',
+            3 => '/\\]/',
+            4 => '/%b2%/',
+            5 => '/%b2%/',
+            6 => '/\\/[cgimosx]*/',
+            7 => '/`/',
+            8 => '/\'/',
+            9 => '/"/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => 0,
+                2 => 1,
+                3 => 2,
+                4 => 3,
+                5 => -1,
+                6 => -1,
+                7 => 4,
+                8 => 5,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => 6,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+                17 => -1,
+                18 => -1,
+                19 => 7,
+                20 => 8,
+                21 => 9,
+                22 => -1,
+                23 => -1,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => -1,
+                1 => 0,
+                2 => 1,
+                3 => 2,
+                4 => 3,
+                5 => -1,
+                6 => -1,
+                7 => 4,
+                8 => 5,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => 6,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+                17 => -1,
+                18 => -1,
+                19 => 7,
+                20 => 8,
+                21 => 9,
+                22 => -1,
+                23 => -1,
+            ),
+            2 => 
+            array (
+                0 => -1,
+                1 => 0,
+                2 => 1,
+                3 => 2,
+                4 => 3,
+                5 => -1,
+                6 => -1,
+                7 => 4,
+                8 => 5,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => 6,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+                17 => -1,
+                18 => -1,
+                19 => -1,
+                20 => 7,
+                21 => 8,
+                22 => 9,
+                23 => -1,
+                24 => -1,
+            ),
+            3 => 
+            array (
+                0 => -1,
+                1 => 0,
+                2 => 1,
+                3 => 2,
+                4 => 3,
+                5 => -1,
+                6 => -1,
+                7 => 4,
+                8 => 5,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => 6,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+                17 => -1,
+                18 => -1,
+                19 => 7,
+                20 => 8,
+                21 => 9,
+                22 => -1,
+                23 => -1,
+            ),
+            4 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+            ),
+            5 => 
+            array (
+                0 => -1,
+            ),
+            6 => 
+            array (
+                0 => -1,
+            ),
+            7 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+            ),
+            8 => 
+            array (
+                0 => -1,
+            ),
+            9 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => -1,
+                8 => -1,
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => 
+                array (
+                ),
+                17 => 
+                array (
+                ),
+                18 => 
+                array (
+                ),
+                19 => -1,
+                20 => -1,
+                21 => -1,
+                22 => 
+                array (
+                    'reserved' => '/^(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chown|chr|chroot|close|closedir|connect|continue|cos|crypt|dbmclose|dbmopen|defined|delete|die|do|dump|each|endgrent|endhostent|endnetent|endprotoent|endpwent|endservent|eof|eval|exec|exists|exit|exp|fcntl|fileno|flock|fork|format|formline|getc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|goto|grep|hex|import|index|int|ioctl|join|keys|kill|last|lc|lcfirst|length|link|listen|local|localtime|lock|log|lstat|map|mkdir|msgctl|msgget|msgrcv|msgsnd|my|next|no|oct|open|opendir|ord|our|pack|package|pipe|pop|pos|print|printf|prototype|push|quotemeta|rand|read|readdir|readline|readlink|readpipe|recv|redo|ref|rename|require|reset|return|reverse|rewinddir|rindex|rmdir|scalar|seek|seekdir|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setservent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|study|sub|substr|symlink|syscall|sysopen|sysread|sysseek|system|syswrite|tell|telldir|tie|tied|time|times|truncate|uc|ucfirst|umask|undef|unlink|unpack|unshift|untie|use|utime|values|vec|wait|waitpid|wantarray|warn|write|y)$/',
+                    'missingreserved' => '/^(new)$/',
+                    'flowcontrol' => '/^(if|else|elsif|while|unless|for|foreach|until|do|continue|not|or|and|eq|ne|gt|lt)$/',
+                ),
+                23 => 
+                array (
+                ),
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => -1,
+                8 => -1,
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => 
+                array (
+                ),
+                17 => 
+                array (
+                ),
+                18 => 
+                array (
+                ),
+                19 => -1,
+                20 => -1,
+                21 => -1,
+                22 => 
+                array (
+                    'reserved' => '/^(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chown|chr|chroot|close|closedir|connect|continue|cos|crypt|dbmclose|dbmopen|defined|delete|die|do|dump|each|endgrent|endhostent|endnetent|endprotoent|endpwent|endservent|eof|eval|exec|exists|exit|exp|fcntl|fileno|flock|fork|format|formline|getc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|goto|grep|hex|import|index|int|ioctl|join|keys|kill|last|lc|lcfirst|length|link|listen|local|localtime|lock|log|lstat|map|mkdir|msgctl|msgget|msgrcv|msgsnd|my|next|no|oct|open|opendir|ord|our|pack|package|pipe|pop|pos|print|printf|prototype|push|quotemeta|rand|read|readdir|readline|readlink|readpipe|recv|redo|ref|rename|require|reset|return|reverse|rewinddir|rindex|rmdir|scalar|seek|seekdir|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setservent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|study|sub|substr|symlink|syscall|sysopen|sysread|sysseek|system|syswrite|tell|telldir|tie|tied|time|times|truncate|uc|ucfirst|umask|undef|unlink|unpack|unshift|untie|use|utime|values|vec|wait|waitpid|wantarray|warn|write|y)$/',
+                    'missingreserved' => '/^(new)$/',
+                    'flowcontrol' => '/^(if|else|elsif|while|unless|for|foreach|until|do|continue|not|or|and|eq|ne|gt|lt)$/',
+                ),
+                23 => 
+                array (
+                ),
+            ),
+            2 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => -1,
+                8 => -1,
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => 
+                array (
+                ),
+                17 => 
+                array (
+                ),
+                18 => 
+                array (
+                ),
+                19 => 
+                array (
+                ),
+                20 => -1,
+                21 => -1,
+                22 => -1,
+                23 => 
+                array (
+                    'reserved' => '/^(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chown|chr|chroot|close|closedir|connect|continue|cos|crypt|dbmclose|dbmopen|defined|delete|die|do|dump|each|endgrent|endhostent|endnetent|endprotoent|endpwent|endservent|eof|eval|exec|exists|exit|exp|fcntl|fileno|flock|fork|format|formline|getc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|goto|grep|hex|import|index|int|ioctl|join|keys|kill|last|lc|lcfirst|length|link|listen|local|localtime|lock|log|lstat|map|mkdir|msgctl|msgget|msgrcv|msgsnd|my|next|no|oct|open|opendir|ord|our|pack|package|pipe|pop|pos|print|printf|prototype|push|quotemeta|rand|read|readdir|readline|readlink|readpipe|recv|redo|ref|rename|require|reset|return|reverse|rewinddir|rindex|rmdir|scalar|seek|seekdir|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setservent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|study|sub|substr|symlink|syscall|sysopen|sysread|sysseek|system|syswrite|tell|telldir|tie|tied|time|times|truncate|uc|ucfirst|umask|undef|unlink|unpack|unshift|untie|use|utime|values|vec|wait|waitpid|wantarray|warn|write|y)$/',
+                    'missingreserved' => '/^(new)$/',
+                    'flowcontrol' => '/^(if|else|elsif|while|unless|for|foreach|until|do|continue|not|or|and|eq|ne|gt|lt)$/',
+                ),
+                24 => 
+                array (
+                ),
+            ),
+            3 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => -1,
+                8 => -1,
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => -1,
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => 
+                array (
+                ),
+                17 => 
+                array (
+                ),
+                18 => 
+                array (
+                ),
+                19 => -1,
+                20 => -1,
+                21 => -1,
+                22 => 
+                array (
+                    'reserved' => '/^(abs|accept|alarm|atan2|bind|binmode|bless|caller|chdir|chmod|chomp|chop|chown|chr|chroot|close|closedir|connect|continue|cos|crypt|dbmclose|dbmopen|defined|delete|die|do|dump|each|endgrent|endhostent|endnetent|endprotoent|endpwent|endservent|eof|eval|exec|exists|exit|exp|fcntl|fileno|flock|fork|format|formline|getc|getgrent|getgrgid|getgrnam|gethostbyaddr|gethostbyname|gethostent|getlogin|getnetbyaddr|getnetbyname|getnetent|getpeername|getpgrp|getppid|getpriority|getprotobyname|getprotobynumber|getprotoent|getpwent|getpwnam|getpwuid|getservbyname|getservbyport|getservent|getsockname|getsockopt|glob|gmtime|goto|grep|hex|import|index|int|ioctl|join|keys|kill|last|lc|lcfirst|length|link|listen|local|localtime|lock|log|lstat|map|mkdir|msgctl|msgget|msgrcv|msgsnd|my|next|no|oct|open|opendir|ord|our|pack|package|pipe|pop|pos|print|printf|prototype|push|quotemeta|rand|read|readdir|readline|readlink|readpipe|recv|redo|ref|rename|require|reset|return|reverse|rewinddir|rindex|rmdir|scalar|seek|seekdir|select|semctl|semget|semop|send|setgrent|sethostent|setnetent|setpgrp|setpriority|setprotoent|setpwent|setservent|setsockopt|shift|shmctl|shmget|shmread|shmwrite|shutdown|sin|sleep|socket|socketpair|sort|splice|split|sprintf|sqrt|srand|stat|study|sub|substr|symlink|syscall|sysopen|sysread|sysseek|system|syswrite|tell|telldir|tie|tied|time|times|truncate|uc|ucfirst|umask|undef|unlink|unpack|unshift|untie|use|utime|values|vec|wait|waitpid|wantarray|warn|write|y)$/',
+                    'missingreserved' => '/^(new)$/',
+                    'flowcontrol' => '/^(if|else|elsif|while|unless|for|foreach|until|do|continue|not|or|and|eq|ne|gt|lt)$/',
+                ),
+                23 => 
+                array (
+                ),
+            ),
+            4 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+            ),
+            5 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            6 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            7 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+            ),
+            8 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            9 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 
+                array (
+                    1 => 'special',
+                    2 => 'string',
+                ),
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => 
+                array (
+                    1 => 'reserved',
+                    2 => 'special',
+                ),
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                    6 => 'string',
+                    8 => 'quotes',
+                ),
+                11 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                ),
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+                17 => 
+                array (
+                    1 => 'brackets',
+                    2 => 'var',
+                    3 => 'brackets',
+                ),
+                18 => NULL,
+                19 => NULL,
+                20 => NULL,
+                21 => NULL,
+                22 => NULL,
+                23 => NULL,
+            ),
+            2 => 
+            array (
+                0 => 
+                array (
+                    1 => 'special',
+                    2 => 'string',
+                ),
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => 
+                array (
+                    1 => 'reserved',
+                    2 => 'special',
+                ),
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                    6 => 'string',
+                    8 => 'quotes',
+                ),
+                11 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                ),
+                12 => NULL,
+                13 => 
+                array (
+                    1 => 'string',
+                    2 => 'code',
+                ),
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+                17 => NULL,
+                18 => 
+                array (
+                    1 => 'brackets',
+                    2 => 'var',
+                    3 => 'brackets',
+                ),
+                19 => NULL,
+                20 => NULL,
+                21 => NULL,
+                22 => NULL,
+                23 => NULL,
+                24 => NULL,
+            ),
+            3 => 
+            array (
+                0 => 
+                array (
+                    1 => 'special',
+                    2 => 'string',
+                ),
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => 
+                array (
+                    1 => 'reserved',
+                    2 => 'special',
+                ),
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                    6 => 'string',
+                    8 => 'quotes',
+                ),
+                11 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                ),
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+                17 => 
+                array (
+                    1 => 'brackets',
+                    2 => 'var',
+                    3 => 'brackets',
+                ),
+                18 => NULL,
+                19 => NULL,
+                20 => NULL,
+                21 => NULL,
+                22 => NULL,
+                23 => NULL,
+            ),
+            4 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+            5 => 
+            array (
+                0 => NULL,
+            ),
+            6 => 
+            array (
+                0 => NULL,
+            ),
+            7 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+            8 => 
+            array (
+                0 => NULL,
+            ),
+            9 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => true,
+                8 => true,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+                18 => false,
+                19 => false,
+                20 => false,
+                21 => false,
+                22 => false,
+                23 => false,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => true,
+                8 => true,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+                18 => false,
+                19 => false,
+                20 => false,
+                21 => false,
+                22 => false,
+                23 => false,
+            ),
+            2 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => true,
+                8 => true,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+                18 => false,
+                19 => false,
+                20 => false,
+                21 => false,
+                22 => false,
+                23 => false,
+                24 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => true,
+                8 => true,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+                18 => false,
+                19 => false,
+                20 => false,
+                21 => false,
+                22 => false,
+                23 => false,
+            ),
+            4 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+            5 => 
+            array (
+                0 => false,
+            ),
+            6 => 
+            array (
+                0 => false,
+            ),
+            7 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+            8 => 
+            array (
+                0 => false,
+            ),
+            9 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'reserved' => 'reserved',
+            'missingreserved' => 'reserved',
+            'flowcontrol' => 'reserved',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/PHP.php b/library/Text_Highlighter/Text/Highlighter/PHP.php
new file mode 100644
index 000000000..1ee2e6b90
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/PHP.php
@@ -0,0 +1,1107 @@
+<?php
+/**
+ * Auto-generated class. PHP syntax highlighting 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : php.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. PHP syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_PHP extends Text_Highlighter
+{
+    var $_language = 'php';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_PHP($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)\\<\\?(php|=)?)/',
+            0 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            1 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)\\?\\>)|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            2 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            3 => '/((?i)\\{)|((?i)\\()|((?i)\\[)|((?i)\\/\\*)|((?i)")|((?i)`)|((?mi)\\<\\<\\<[\\x20\\x09]*(\\w+)$)|((?i)\')|((?i)(#|\\/\\/))|((?i)[a-z_]\\w*)|((?i)\\((array|int|integer|string|bool|boolean|object|float|double)\\))|((?i)0[xX][\\da-f]+)|((?i)\\$[a-z_]\\w*)|((?i)\\d\\d*|\\b0\\b)|((?i)0[0-7]+)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))/',
+            4 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
+            5 => '/((?i)\\\\[\\\\"\'`tnr\\$\\{])|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
+            6 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
+            7 => '/((?i)\\\\[\\\\"\'`tnr\\$\\{])|((?i)\\{\\$[a-z_].*\\})|((?i)\\$[a-z_]\\w*)/',
+            8 => '/((?i)\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
+            9 => '/((?i)\\s@\\w+\\s)|((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\bnote:)|((?i)\\$\\w+\\s*:.*\\$)/',
+            10 => '//',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 1,
+            ),
+            0 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 1,
+                7 => 0,
+                8 => 1,
+                9 => 0,
+                10 => 1,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 2,
+                16 => 5,
+            ),
+            1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 1,
+                7 => 0,
+                8 => 1,
+                9 => 0,
+                10 => 1,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 0,
+                16 => 2,
+                17 => 5,
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 1,
+                7 => 0,
+                8 => 1,
+                9 => 0,
+                10 => 1,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 2,
+                16 => 5,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 1,
+                7 => 0,
+                8 => 1,
+                9 => 0,
+                10 => 1,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 2,
+                16 => 5,
+            ),
+            4 => 
+            array (
+                0 => 0,
+                1 => 3,
+                2 => 1,
+                3 => 0,
+                4 => 0,
+            ),
+            5 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+            ),
+            6 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+            ),
+            7 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+            ),
+            8 => 
+            array (
+                0 => 0,
+            ),
+            9 => 
+            array (
+                0 => 0,
+                1 => 3,
+                2 => 1,
+                3 => 0,
+                4 => 0,
+            ),
+            10 => 
+            array (
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'inlinetags',
+            ),
+            0 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => 'quotes',
+                8 => 'comment',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+            ),
+            1 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => 'quotes',
+                8 => 'comment',
+                9 => '',
+                10 => '',
+                11 => 'inlinetags',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+                17 => '',
+            ),
+            2 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => 'quotes',
+                8 => 'comment',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+            ),
+            3 => 
+            array (
+                0 => 'brackets',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'comment',
+                4 => 'quotes',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => 'quotes',
+                8 => 'comment',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+            ),
+            4 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+                4 => '',
+            ),
+            5 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+            ),
+            6 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+            ),
+            7 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+            ),
+            8 => 
+            array (
+                0 => '',
+            ),
+            9 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+                4 => '',
+            ),
+            10 => 
+            array (
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'code',
+            ),
+            0 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'string',
+                7 => 'string',
+                8 => 'comment',
+                9 => 'identifier',
+                10 => 'reserved',
+                11 => 'number',
+                12 => 'var',
+                13 => 'number',
+                14 => 'number',
+                15 => 'number',
+                16 => 'number',
+            ),
+            1 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'string',
+                7 => 'string',
+                8 => 'comment',
+                9 => 'identifier',
+                10 => 'reserved',
+                11 => 'default',
+                12 => 'number',
+                13 => 'var',
+                14 => 'number',
+                15 => 'number',
+                16 => 'number',
+                17 => 'number',
+            ),
+            2 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'string',
+                7 => 'string',
+                8 => 'comment',
+                9 => 'identifier',
+                10 => 'reserved',
+                11 => 'number',
+                12 => 'var',
+                13 => 'number',
+                14 => 'number',
+                15 => 'number',
+                16 => 'number',
+            ),
+            3 => 
+            array (
+                0 => 'code',
+                1 => 'code',
+                2 => 'code',
+                3 => 'comment',
+                4 => 'string',
+                5 => 'string',
+                6 => 'string',
+                7 => 'string',
+                8 => 'comment',
+                9 => 'identifier',
+                10 => 'reserved',
+                11 => 'number',
+                12 => 'var',
+                13 => 'number',
+                14 => 'number',
+                15 => 'number',
+                16 => 'number',
+            ),
+            4 => 
+            array (
+                0 => 'inlinedoc',
+                1 => 'url',
+                2 => 'url',
+                3 => 'inlinedoc',
+                4 => 'inlinedoc',
+            ),
+            5 => 
+            array (
+                0 => 'special',
+                1 => 'var',
+                2 => 'var',
+            ),
+            6 => 
+            array (
+                0 => 'special',
+                1 => 'var',
+                2 => 'var',
+            ),
+            7 => 
+            array (
+                0 => 'special',
+                1 => 'var',
+                2 => 'var',
+            ),
+            8 => 
+            array (
+                0 => 'special',
+            ),
+            9 => 
+            array (
+                0 => 'inlinedoc',
+                1 => 'url',
+                2 => 'url',
+                3 => 'inlinedoc',
+                4 => 'inlinedoc',
+            ),
+            10 => 
+            array (
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)\\?\\>/',
+            1 => '/(?i)\\}/',
+            2 => '/(?i)\\)/',
+            3 => '/(?i)\\]/',
+            4 => '/(?i)\\*\\//',
+            5 => '/(?i)"/',
+            6 => '/(?i)`/',
+            7 => '/(?mi)^%1%;?$/',
+            8 => '/(?i)\'/',
+            9 => '/(?mi)$|(?=\\?\\>)/',
+            10 => '/(?i)\\<\\?(php|=)?/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+            ),
+            0 => 
+            array (
+                0 => 1,
+                1 => 2,
+                2 => 3,
+                3 => 4,
+                4 => 5,
+                5 => 6,
+                6 => 7,
+                7 => 8,
+                8 => 9,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+            ),
+            1 => 
+            array (
+                0 => 1,
+                1 => 2,
+                2 => 3,
+                3 => 4,
+                4 => 5,
+                5 => 6,
+                6 => 7,
+                7 => 8,
+                8 => 9,
+                9 => -1,
+                10 => -1,
+                11 => 10,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+                17 => -1,
+            ),
+            2 => 
+            array (
+                0 => 1,
+                1 => 2,
+                2 => 3,
+                3 => 4,
+                4 => 5,
+                5 => 6,
+                6 => 7,
+                7 => 8,
+                8 => 9,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+            ),
+            3 => 
+            array (
+                0 => 1,
+                1 => 2,
+                2 => 3,
+                3 => 4,
+                4 => 5,
+                5 => 6,
+                6 => 7,
+                7 => 8,
+                8 => 9,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+            ),
+            4 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+            ),
+            5 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+            ),
+            6 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+            ),
+            7 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+            ),
+            8 => 
+            array (
+                0 => -1,
+            ),
+            9 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+            ),
+            10 => 
+            array (
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+            ),
+            0 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 
+                array (
+                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
+                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => 
+                array (
+                ),
+            ),
+            1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 
+                array (
+                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
+                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
+                ),
+                10 => 
+                array (
+                ),
+                11 => -1,
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => 
+                array (
+                ),
+                17 => 
+                array (
+                ),
+            ),
+            2 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 
+                array (
+                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
+                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => 
+                array (
+                ),
+            ),
+            3 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => 
+                array (
+                    'constants' => '/^(DIRECTORY_SEPARATOR|PATH_SEPARATOR)$/',
+                    'reserved' => '/^((?i)echo|foreach|else|if|elseif|for|as|while|break|continue|class|const|declare|switch|case|endfor|endswitch|endforeach|endif|array|default|do|enddeclare|eval|exit|die|extends|function|global|include|include_once|require|require_once|isset|empty|list|new|static|unset|var|return|try|catch|final|throw|public|private|protected|abstract|interface|implements|define|__file__|__line__|__class__|__method__|__function__|null|true|false|and|or|xor)$/',
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => 
+                array (
+                ),
+            ),
+            4 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+                4 => 
+                array (
+                ),
+            ),
+            5 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+            ),
+            6 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+            ),
+            7 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+            ),
+            8 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            9 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+                4 => 
+                array (
+                ),
+            ),
+            10 => 
+            array (
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+            ),
+            1 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+                17 => NULL,
+            ),
+            2 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+            ),
+            3 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+            ),
+            4 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+            ),
+            5 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+            ),
+            6 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+            ),
+            7 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+            ),
+            8 => 
+            array (
+                0 => NULL,
+            ),
+            9 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+            ),
+            10 => 
+            array (
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+            ),
+            0 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+            ),
+            1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+            ),
+            2 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+            ),
+            4 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+            ),
+            5 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            6 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            7 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            8 => 
+            array (
+                0 => false,
+            ),
+            9 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+            ),
+            10 => 
+            array (
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'constants' => 'reserved',
+            'reserved' => 'reserved',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/PYTHON.php b/library/Text_Highlighter/Text/Highlighter/PYTHON.php
new file mode 100644
index 000000000..ed4f59dde
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/PYTHON.php
@@ -0,0 +1,647 @@
+<?php
+/**
+ * Auto-generated class. PYTHON syntax highlighting 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : python.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. PYTHON syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_PYTHON extends Text_Highlighter
+{
+    var $_language = 'python';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_PYTHON($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)\'\'\')|((?i)""")|((?i)")|((?i)\')|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)((\\d*\\.\\d+)|(\\d+\\.\\d*)|(\\d+))j)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)|((?i)0[0-7]+l?)|((?i)#.+)/',
+            0 => '/((?i)\\\\.)/',
+            1 => '/((?i)\\\\.)/',
+            2 => '/((?i)\\\\.)/',
+            3 => '/((?i)\\\\.)/',
+            4 => '/((?i)\'\'\')|((?i)""")|((?i)")|((?i)\')|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)((\\d*\\.\\d+)|(\\d+\\.\\d*)|(\\d+))j)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)|((?i)0[0-7]+l?)|((?i)#.+)/',
+            5 => '/((?i)\'\'\')|((?i)""")|((?i)")|((?i)\')|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*(?=\\s*\\())|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)((\\d*\\.\\d+)|(\\d+\\.\\d*)|(\\d+))j)|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)|((?i)0[0-7]+l?)|((?i)#.+)/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 5,
+                9 => 4,
+                10 => 2,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+            ),
+            0 => 
+            array (
+                0 => 0,
+            ),
+            1 => 
+            array (
+                0 => 0,
+            ),
+            2 => 
+            array (
+                0 => 0,
+            ),
+            3 => 
+            array (
+                0 => 0,
+            ),
+            4 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 5,
+                9 => 4,
+                10 => 2,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+            ),
+            5 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 0,
+                8 => 5,
+                9 => 4,
+                10 => 2,
+                11 => 0,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'quotes',
+                1 => 'quotes',
+                2 => 'quotes',
+                3 => 'quotes',
+                4 => 'brackets',
+                5 => 'brackets',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+            ),
+            0 => 
+            array (
+                0 => '',
+            ),
+            1 => 
+            array (
+                0 => '',
+            ),
+            2 => 
+            array (
+                0 => '',
+            ),
+            3 => 
+            array (
+                0 => '',
+            ),
+            4 => 
+            array (
+                0 => 'quotes',
+                1 => 'quotes',
+                2 => 'quotes',
+                3 => 'quotes',
+                4 => 'brackets',
+                5 => 'brackets',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+            ),
+            5 => 
+            array (
+                0 => 'quotes',
+                1 => 'quotes',
+                2 => 'quotes',
+                3 => 'quotes',
+                4 => 'brackets',
+                5 => 'brackets',
+                6 => '',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'string',
+                1 => 'string',
+                2 => 'string',
+                3 => 'string',
+                4 => 'code',
+                5 => 'code',
+                6 => 'identifier',
+                7 => 'identifier',
+                8 => 'number',
+                9 => 'number',
+                10 => 'number',
+                11 => 'number',
+                12 => 'number',
+                13 => 'number',
+                14 => 'comment',
+            ),
+            0 => 
+            array (
+                0 => 'special',
+            ),
+            1 => 
+            array (
+                0 => 'special',
+            ),
+            2 => 
+            array (
+                0 => 'special',
+            ),
+            3 => 
+            array (
+                0 => 'special',
+            ),
+            4 => 
+            array (
+                0 => 'string',
+                1 => 'string',
+                2 => 'string',
+                3 => 'string',
+                4 => 'code',
+                5 => 'code',
+                6 => 'identifier',
+                7 => 'identifier',
+                8 => 'number',
+                9 => 'number',
+                10 => 'number',
+                11 => 'number',
+                12 => 'number',
+                13 => 'number',
+                14 => 'comment',
+            ),
+            5 => 
+            array (
+                0 => 'string',
+                1 => 'string',
+                2 => 'string',
+                3 => 'string',
+                4 => 'code',
+                5 => 'code',
+                6 => 'identifier',
+                7 => 'identifier',
+                8 => 'number',
+                9 => 'number',
+                10 => 'number',
+                11 => 'number',
+                12 => 'number',
+                13 => 'number',
+                14 => 'comment',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)\'\'\'/',
+            1 => '/(?i)"""/',
+            2 => '/(?i)"/',
+            3 => '/(?i)\'/',
+            4 => '/(?i)\\)/',
+            5 => '/(?i)\\]/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => 5,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+            ),
+            0 => 
+            array (
+                0 => -1,
+            ),
+            1 => 
+            array (
+                0 => -1,
+            ),
+            2 => 
+            array (
+                0 => -1,
+            ),
+            3 => 
+            array (
+                0 => -1,
+            ),
+            4 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => 5,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+            ),
+            5 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => 5,
+                6 => -1,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => 
+                array (
+                    'builtin' => '/^(__import__|abs|apply|basestring|bool|buffer|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|min|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|round|setattr|slice|staticmethod|sum|super|str|tuple|type|unichr|unicode|vars|xrange|zip)$/',
+                ),
+                7 => 
+                array (
+                    'reserved' => '/^(and|del|for|is|raise|assert|elif|from|lambda|return|break|else|global|not|try|class|except|if|or|while|continue|exec|import|pass|yield|def|finally|in|print|False|True|None|NotImplemented|Ellipsis|Exception|SystemExit|StopIteration|StandardError|KeyboardInterrupt|ImportError|EnvironmentError|IOError|OSError|WindowsError|EOFError|RuntimeError|NotImplementedError|NameError|UnboundLocalError|AttributeError|SyntaxError|IndentationError|TabError|TypeError|AssertionError|LookupError|IndexError|KeyError|ArithmeticError|OverflowError|ZeroDivisionError|FloatingPointError|ValueError|UnicodeError|UnicodeEncodeError|UnicodeDecodeError|UnicodeTranslateError|ReferenceError|SystemError|MemoryError|Warning|UserWarning|DeprecationWarning|PendingDeprecationWarning|SyntaxWarning|OverflowWarning|RuntimeWarning|FutureWarning)$/',
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+            ),
+            0 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            1 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            2 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            3 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            4 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => 
+                array (
+                    'builtin' => '/^(__import__|abs|apply|basestring|bool|buffer|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|min|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|round|setattr|slice|staticmethod|sum|super|str|tuple|type|unichr|unicode|vars|xrange|zip)$/',
+                ),
+                7 => 
+                array (
+                    'reserved' => '/^(and|del|for|is|raise|assert|elif|from|lambda|return|break|else|global|not|try|class|except|if|or|while|continue|exec|import|pass|yield|def|finally|in|print|False|True|None|NotImplemented|Ellipsis|Exception|SystemExit|StopIteration|StandardError|KeyboardInterrupt|ImportError|EnvironmentError|IOError|OSError|WindowsError|EOFError|RuntimeError|NotImplementedError|NameError|UnboundLocalError|AttributeError|SyntaxError|IndentationError|TabError|TypeError|AssertionError|LookupError|IndexError|KeyError|ArithmeticError|OverflowError|ZeroDivisionError|FloatingPointError|ValueError|UnicodeError|UnicodeEncodeError|UnicodeDecodeError|UnicodeTranslateError|ReferenceError|SystemError|MemoryError|Warning|UserWarning|DeprecationWarning|PendingDeprecationWarning|SyntaxWarning|OverflowWarning|RuntimeWarning|FutureWarning)$/',
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+            ),
+            5 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+                6 => 
+                array (
+                    'builtin' => '/^(__import__|abs|apply|basestring|bool|buffer|callable|chr|classmethod|cmp|coerce|compile|complex|delattr|dict|dir|divmod|enumerate|eval|execfile|file|filter|float|getattr|globals|hasattr|hash|help|hex|id|input|int|intern|isinstance|issubclass|iter|len|list|locals|long|map|max|min|object|oct|open|ord|pow|property|range|raw_input|reduce|reload|repr|round|setattr|slice|staticmethod|sum|super|str|tuple|type|unichr|unicode|vars|xrange|zip)$/',
+                ),
+                7 => 
+                array (
+                    'reserved' => '/^(and|del|for|is|raise|assert|elif|from|lambda|return|break|else|global|not|try|class|except|if|or|while|continue|exec|import|pass|yield|def|finally|in|print|False|True|None|NotImplemented|Ellipsis|Exception|SystemExit|StopIteration|StandardError|KeyboardInterrupt|ImportError|EnvironmentError|IOError|OSError|WindowsError|EOFError|RuntimeError|NotImplementedError|NameError|UnboundLocalError|AttributeError|SyntaxError|IndentationError|TabError|TypeError|AssertionError|LookupError|IndexError|KeyError|ArithmeticError|OverflowError|ZeroDivisionError|FloatingPointError|ValueError|UnicodeError|UnicodeEncodeError|UnicodeDecodeError|UnicodeTranslateError|ReferenceError|SystemError|MemoryError|Warning|UserWarning|DeprecationWarning|PendingDeprecationWarning|SyntaxWarning|OverflowWarning|RuntimeWarning|FutureWarning)$/',
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+                0 => NULL,
+            ),
+            1 => 
+            array (
+                0 => NULL,
+            ),
+            2 => 
+            array (
+                0 => NULL,
+            ),
+            3 => 
+            array (
+                0 => NULL,
+            ),
+            4 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+            ),
+            5 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+            ),
+            0 => 
+            array (
+                0 => false,
+            ),
+            1 => 
+            array (
+                0 => false,
+            ),
+            2 => 
+            array (
+                0 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+            ),
+            4 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+            ),
+            5 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'builtin' => 'builtin',
+            'reserved' => 'reserved',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/RUBY.php b/library/Text_Highlighter/Text/Highlighter/RUBY.php
new file mode 100644
index 000000000..ce20e9f2e
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/RUBY.php
@@ -0,0 +1,825 @@
+<?php
+/**
+ * Auto-generated class. RUBY syntax highlighting
+ * 
+ * 
+ * FIXME:  While this construction : s.split /z/i 
+ * is valid, regular expression is not recognized as such
+ * (/ folowing an identifier or number is not recognized as
+ * start of RE), making highlighting improper
+ * 
+ * %q(a (nested) string) does not get highlighted correctly
+ *    
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : ruby.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. RUBY syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_RUBY extends Text_Highlighter
+{
+    var $_language = 'ruby';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_RUBY($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?mi)^__END__$)|((?i)")|((?i)%[Qx]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\')|((?i)%[wq]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\\$(\\W|\\w+))|((?ii)@@?[_a-z][\\d_a-z]*)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)0[xX][\\da-f]+l?)|((?i)\\d+l?|\\b0l?\\b)|((?i)0[0-7]+l?)|((?mi)^=begin$)|((?i)#)|((?i)\\s*\\/)/',
+            0 => '//',
+            1 => '/((?i)\\\\.)/',
+            2 => '/((?i)\\\\.)/',
+            3 => '/((?i)\\\\.)/',
+            4 => '/((?i)\\\\.)/',
+            5 => '/((?mi)^__END__$)|((?i)")|((?i)%[Qx]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\')|((?i)%[wq]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\\$(\\W|\\w+))|((?ii)@@?[_a-z][\\d_a-z]*)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)0[xX][\\da-f]+l?)|((?i)\\d+l?|\\b0l?\\b)|((?i)0[0-7]+l?)|((?mi)^=begin$)|((?i)#)|((?i)\\s*\\/)/',
+            6 => '/((?mi)^__END__$)|((?i)")|((?i)%[Qx]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\')|((?i)%[wq]([!"#\\$%&\'+\\-*.\\/:;=?@^`|~{<\\[(]))|((?i)\\$(\\W|\\w+))|((?ii)@@?[_a-z][\\d_a-z]*)|((?i)\\()|((?i)\\[)|((?i)[a-z_]\\w*)|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)0[xX][\\da-f]+l?)|((?i)\\d+l?|\\b0l?\\b)|((?i)0[0-7]+l?)|((?mi)^=begin$)|((?i)#)|((?i)\\s*\\/)/',
+            7 => '/((?i)\\$\\w+\\s*:.+\\$)/',
+            8 => '/((?i)\\$\\w+\\s*:.+\\$)/',
+            9 => '/((?i)\\\\.)/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 1,
+                3 => 0,
+                4 => 1,
+                5 => 1,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+                9 => 0,
+                10 => 5,
+                11 => 2,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 0,
+                16 => 0,
+                17 => 0,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 0,
+            ),
+            2 => 
+            array (
+                0 => 0,
+            ),
+            3 => 
+            array (
+                0 => 0,
+            ),
+            4 => 
+            array (
+                0 => 0,
+            ),
+            5 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 1,
+                3 => 0,
+                4 => 1,
+                5 => 1,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+                9 => 0,
+                10 => 5,
+                11 => 2,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 0,
+                16 => 0,
+                17 => 0,
+            ),
+            6 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 1,
+                3 => 0,
+                4 => 1,
+                5 => 1,
+                6 => 0,
+                7 => 0,
+                8 => 0,
+                9 => 0,
+                10 => 5,
+                11 => 2,
+                12 => 0,
+                13 => 0,
+                14 => 0,
+                15 => 0,
+                16 => 0,
+                17 => 0,
+            ),
+            7 => 
+            array (
+                0 => 0,
+            ),
+            8 => 
+            array (
+                0 => 0,
+            ),
+            9 => 
+            array (
+                0 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'reserved',
+                1 => 'quotes',
+                2 => 'quotes',
+                3 => 'quotes',
+                4 => 'quotes',
+                5 => '',
+                6 => '',
+                7 => 'brackets',
+                8 => 'brackets',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => 'comment',
+                16 => 'comment',
+                17 => 'quotes',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => '',
+            ),
+            2 => 
+            array (
+                0 => '',
+            ),
+            3 => 
+            array (
+                0 => '',
+            ),
+            4 => 
+            array (
+                0 => '',
+            ),
+            5 => 
+            array (
+                0 => 'reserved',
+                1 => 'quotes',
+                2 => 'quotes',
+                3 => 'quotes',
+                4 => 'quotes',
+                5 => '',
+                6 => '',
+                7 => 'brackets',
+                8 => 'brackets',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => 'comment',
+                16 => 'comment',
+                17 => 'quotes',
+            ),
+            6 => 
+            array (
+                0 => 'reserved',
+                1 => 'quotes',
+                2 => 'quotes',
+                3 => 'quotes',
+                4 => 'quotes',
+                5 => '',
+                6 => '',
+                7 => 'brackets',
+                8 => 'brackets',
+                9 => '',
+                10 => '',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => 'comment',
+                16 => 'comment',
+                17 => 'quotes',
+            ),
+            7 => 
+            array (
+                0 => '',
+            ),
+            8 => 
+            array (
+                0 => '',
+            ),
+            9 => 
+            array (
+                0 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'comment',
+                1 => 'string',
+                2 => 'string',
+                3 => 'string',
+                4 => 'string',
+                5 => 'var',
+                6 => 'var',
+                7 => 'code',
+                8 => 'code',
+                9 => 'identifier',
+                10 => 'number',
+                11 => 'number',
+                12 => 'number',
+                13 => 'number',
+                14 => 'number',
+                15 => 'comment',
+                16 => 'comment',
+                17 => 'string',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 'special',
+            ),
+            2 => 
+            array (
+                0 => 'special',
+            ),
+            3 => 
+            array (
+                0 => 'special',
+            ),
+            4 => 
+            array (
+                0 => 'special',
+            ),
+            5 => 
+            array (
+                0 => 'comment',
+                1 => 'string',
+                2 => 'string',
+                3 => 'string',
+                4 => 'string',
+                5 => 'var',
+                6 => 'var',
+                7 => 'code',
+                8 => 'code',
+                9 => 'identifier',
+                10 => 'number',
+                11 => 'number',
+                12 => 'number',
+                13 => 'number',
+                14 => 'number',
+                15 => 'comment',
+                16 => 'comment',
+                17 => 'string',
+            ),
+            6 => 
+            array (
+                0 => 'comment',
+                1 => 'string',
+                2 => 'string',
+                3 => 'string',
+                4 => 'string',
+                5 => 'var',
+                6 => 'var',
+                7 => 'code',
+                8 => 'code',
+                9 => 'identifier',
+                10 => 'number',
+                11 => 'number',
+                12 => 'number',
+                13 => 'number',
+                14 => 'number',
+                15 => 'comment',
+                16 => 'comment',
+                17 => 'string',
+            ),
+            7 => 
+            array (
+                0 => 'inlinedoc',
+            ),
+            8 => 
+            array (
+                0 => 'inlinedoc',
+            ),
+            9 => 
+            array (
+                0 => 'special',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)$/',
+            1 => '/(?i)"/',
+            2 => '/(?i)%b1%/',
+            3 => '/(?i)\'/',
+            4 => '/(?i)%b1%/',
+            5 => '/(?i)\\)/',
+            6 => '/(?i)\\]/',
+            7 => '/(?mi)^=end$/',
+            8 => '/(?mi)$/',
+            9 => '/(?i)\\/[iomx]*/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => -1,
+                6 => -1,
+                7 => 5,
+                8 => 6,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => 7,
+                16 => 8,
+                17 => 9,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => -1,
+            ),
+            2 => 
+            array (
+                0 => -1,
+            ),
+            3 => 
+            array (
+                0 => -1,
+            ),
+            4 => 
+            array (
+                0 => -1,
+            ),
+            5 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => -1,
+                6 => -1,
+                7 => 5,
+                8 => 6,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => 7,
+                16 => 8,
+                17 => 9,
+            ),
+            6 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => 3,
+                4 => 4,
+                5 => -1,
+                6 => -1,
+                7 => 5,
+                8 => 6,
+                9 => -1,
+                10 => -1,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => 7,
+                16 => 8,
+                17 => 9,
+            ),
+            7 => 
+            array (
+                0 => -1,
+            ),
+            8 => 
+            array (
+                0 => -1,
+            ),
+            9 => 
+            array (
+                0 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => -1,
+                8 => -1,
+                9 => 
+                array (
+                    'reserved' => '/^(__FILE__|require|and|def|end|in|or|self|unless|__LINE__|begin|defined?|ensure|module|redo|super|until|BEGIN|break|do|false|next|rescue|then|when|END|case|else|for|nil|retry|true|while|alias|module_function|private|public|protected|attr_reader|attr_writer|attr_accessor|class|elsif|if|not|return|undef|yield)$/',
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => -1,
+                16 => -1,
+                17 => -1,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            2 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            3 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            4 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            5 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => -1,
+                8 => -1,
+                9 => 
+                array (
+                    'reserved' => '/^(__FILE__|require|and|def|end|in|or|self|unless|__LINE__|begin|defined?|ensure|module|redo|super|until|BEGIN|break|do|false|next|rescue|then|when|END|case|else|for|nil|retry|true|while|alias|module_function|private|public|protected|attr_reader|attr_writer|attr_accessor|class|elsif|if|not|return|undef|yield)$/',
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => -1,
+                16 => -1,
+                17 => -1,
+            ),
+            6 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => -1,
+                5 => 
+                array (
+                ),
+                6 => 
+                array (
+                ),
+                7 => -1,
+                8 => -1,
+                9 => 
+                array (
+                    'reserved' => '/^(__FILE__|require|and|def|end|in|or|self|unless|__LINE__|begin|defined?|ensure|module|redo|super|until|BEGIN|break|do|false|next|rescue|then|when|END|case|else|for|nil|retry|true|while|alias|module_function|private|public|protected|attr_reader|attr_writer|attr_accessor|class|elsif|if|not|return|undef|yield)$/',
+                ),
+                10 => 
+                array (
+                ),
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => -1,
+                16 => -1,
+                17 => -1,
+            ),
+            7 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            8 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            9 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => NULL,
+            ),
+            2 => 
+            array (
+                0 => NULL,
+            ),
+            3 => 
+            array (
+                0 => NULL,
+            ),
+            4 => 
+            array (
+                0 => NULL,
+            ),
+            5 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+                17 => NULL,
+            ),
+            6 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => NULL,
+                16 => NULL,
+                17 => NULL,
+            ),
+            7 => 
+            array (
+                0 => NULL,
+            ),
+            8 => 
+            array (
+                0 => NULL,
+            ),
+            9 => 
+            array (
+                0 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => true,
+                3 => false,
+                4 => true,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+                0 => false,
+            ),
+            2 => 
+            array (
+                0 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+            ),
+            4 => 
+            array (
+                0 => false,
+            ),
+            5 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => true,
+                3 => false,
+                4 => true,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+            ),
+            6 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => true,
+                3 => false,
+                4 => true,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+            ),
+            7 => 
+            array (
+                0 => false,
+            ),
+            8 => 
+            array (
+                0 => false,
+            ),
+            9 => 
+            array (
+                0 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'reserved' => 'reserved',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer.php b/library/Text_Highlighter/Text/Highlighter/Renderer.php
new file mode 100644
index 000000000..cb8993ff8
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/Renderer.php
@@ -0,0 +1,164 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * Abstract base class for Highlighter renderers
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Andrey Demenev <demenev@gmail.com>
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * Abstract base class for Highlighter renderers
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @abstract
+ */
+
+class Text_Highlighter_Renderer
+{
+    /**
+     * Renderer options
+     *
+     * @var array
+     * @access protected
+     */
+    var $_options = array();
+
+    /**
+     * Current language
+     *
+     * @var string
+     * @access protected
+     */
+    var $_language = '';
+
+    /**
+     * Constructor
+     *
+     * @access public
+     *
+     * @param  array $options  Rendering options. Renderer-specific.
+     */
+    function __construct($options = array())
+    {
+        $this->_options = $options;
+    }
+
+    /**
+     * PHP4 compatable constructor
+     *
+     * @access public
+     *
+     * @param  array $options  Rendering options. Renderer-specific.
+     */
+    function Text_Highlighter_Renderer($options = array())
+    {
+        $this->__construct($options);
+    }
+
+    /**
+     * Resets renderer state
+     *
+     * @access public
+     *
+     * @param  array $options  Rendering options. Renderer-specific.
+     */
+    function reset()
+    {
+        return;
+    }
+
+    /**
+     * Preprocesses code
+     *
+     * @access public
+     *
+     * @param  string $str Code to preprocess
+     * @return string Preprocessed code
+     */
+    function preprocess($str)
+    {
+        return $str;
+    }
+
+    /**
+     * Accepts next token
+     *
+     * @abstract
+     * @access public
+     *
+     * @param  string $class   Token class
+     * @param  string $content Token content
+     */
+    function acceptToken($class, $content)
+    {
+        return;
+    }
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @access public
+     *
+     */
+    function finalize()
+    {
+        return;
+    }
+
+    /**
+     * Get generated output
+     *
+     * @abstract
+     * @return mixed Renderer-specific
+     * @access public
+     *
+     */
+    function getOutput()
+    {
+        return;
+    }
+
+    /**
+     * Set current language
+     *
+     * @abstract
+     * @return void
+     * @access public
+     *
+     */
+    function setCurrentLanguage($lang)
+    {
+        $this->_language = $lang;
+    }
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/Array.php b/library/Text_Highlighter/Text/Highlighter/Renderer/Array.php
new file mode 100644
index 000000000..fd238a4d1
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/Renderer/Array.php
@@ -0,0 +1,200 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * Array renderer.
+ *
+ * Produces an array that contains class names and content pairs.
+ * The array can be enumerated or associative. Associative means
+ * <code>class =&gt; content</code> pairs.
+ * Based on the HTML renderer by Andrey Demenev.
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter/Renderer.php';
+
+/**
+ * Array renderer, based on Andrey Demenev's HTML renderer.
+ *
+ * In addition to the options supported by the HTML renderer,
+ * the following options were also introduced:
+ * <ul><li>htmlspecialchars - whether or not htmlspecialchars() will
+ *                            be called on the content, default TRUE</li>
+ *     <li>enumerated - type of array produced, default FALSE,
+ *                            meaning associative array</li>
+ * </ul>
+ *
+ *
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.5.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_Array extends Text_Highlighter_Renderer
+{
+
+    /**#@+
+     * @access private
+     */
+
+    /**
+     * Tab size
+     *
+     * @var integer
+     */
+    var $_tabsize = 4;
+
+    /**
+     * Should htmlentities() will be called
+     *
+     * @var boolean
+     */
+    var $_htmlspecialchars = true;
+
+    /**
+     * Enumerated or associative array
+     *
+     * @var integer
+     */
+    var $_enumerated = false;
+
+    /**
+     * Array containing highlighting rules
+     *
+     * @var array
+     */
+    var $_output = array();
+
+    /**#@-*/
+
+    /**
+     * Preprocesses code
+     *
+     * @access public
+     *
+     * @param  string $str Code to preprocess
+     * @return string Preprocessed code
+     */
+    function preprocess($str)
+    {
+        // normalize whitespace and tabs
+        $str = str_replace("\r\n","\n", $str);
+        $str = str_replace("\r","\n", $str);
+        // some browsers refuse to display empty lines
+        $str = preg_replace('~^$~m'," ", $str);
+        $str = str_replace("\t",str_repeat(' ', $this->_tabsize), $str);
+        return rtrim($str);
+    }
+
+
+    /**
+     * Resets renderer state
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     *
+     * @access protected
+     */
+    function reset()
+    {
+        $this->_output = array();
+        $this->_lastClass = 'default';
+        if (isset($this->_options['tabsize'])) {
+            $this->_tabsize = $this->_options['tabsize'];
+        }
+        if (isset($this->_options['htmlspecialchars'])) {
+            $this->_htmlspecialchars = $this->_options['htmlspecialchars'];
+        }
+        if (isset($this->_options['enumerated'])) {
+            $this->_enumerated = $this->_options['enumerated'];
+        }
+    }
+
+
+
+    /**
+     * Accepts next token
+     *
+     * @abstract
+     * @access public
+     * @param  string $class   Token class
+     * @param  string $content Token content
+     */
+    function acceptToken($class, $content)
+    {
+
+
+        $theClass = $this->_getFullClassName($class);
+        if ($this->_htmlspecialchars) {
+            $content = htmlspecialchars($content);
+        }
+        if ($this->_enumerated) {
+            $this->_output[] = array($class, $content);
+        } else {
+            $this->_output[][$class] = $content;
+        }
+        $this->_lastClass = $class;
+
+    }
+
+
+    /**
+     * Given a CSS class name, returns the class name
+     * with language name prepended, if necessary
+     *
+     * @access private
+     *
+     * @param  string $class   Token class
+     */
+    function _getFullClassName($class)
+    {
+        if (!empty($this->_options['use_language'])) {
+            $theClass = $this->_language . '-' . $class;
+        } else {
+            $theClass = $class;
+        }
+        return $theClass;
+    }
+
+    /**
+     * Get generated output
+     *
+     * @abstract
+     * @return array Highlighted code as an array
+     * @access public
+     */
+    function getOutput()
+    {
+        return $this->_output;
+    }
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/BB.php b/library/Text_Highlighter/Text/Highlighter/Renderer/BB.php
new file mode 100644
index 000000000..abd77cfd8
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/Renderer/BB.php
@@ -0,0 +1,238 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * BB code renderer.
+ *
+ * This BB renderer produces BB code, ready to be pasted in bulletin boards and
+ * other applications that accept BB code. Based on the HTML renderer by Andrey Demenev.
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @copyright  2005 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter/Renderer.php';
+
+/**
+ * BB code renderer, based on Andrey Demenev's HTML renderer.
+ *
+ * Elements of $options argument of constructor (each being optional):
+ *
+ * - 'numbers' - Line numbering TRUE or FALSE
+ * - 'tabsize' - Tab size, default is 4
+ * - 'bb_tags' - An array containing three BB tags, see below
+ * - 'tag_brackets' - An array that conains opening and closing tags, [ and ]
+ * - 'colors' - An array with all the colors to be used for highlighting
+ *
+ * The default BB tags are:
+ * - 'color' => 'color'
+ * - 'list'  => 'list'
+ * - 'list_item' => '*'
+ *
+ * The default colors for the highlighter are:
+ * - 'default'    => 'Black',
+ * - 'code'       => 'Gray',
+ * - 'brackets'   => 'Olive',
+ * - 'comment'    => 'Orange',
+ * - 'mlcomment'  => 'Orange',
+ * - 'quotes'     => 'Darkred',
+ * - 'string'     => 'Red',
+ * - 'identifier' => 'Blue',
+ * - 'builtin'    => 'Teal',
+ * - 'reserved'   => 'Green',
+ * - 'inlinedoc'  => 'Blue',
+ * - 'var'        => 'Darkblue',
+ * - 'url'        => 'Blue',
+ * - 'special'    => 'Navy',
+ * - 'number'     => 'Maroon',
+ * - 'inlinetags' => 'Blue',
+ *
+ *
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  20045 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.5.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_BB extends Text_Highlighter_Renderer_Array
+{
+
+    /**#@+
+     * @access private
+     */
+
+    /**
+     * Line numbering - will use the specified BB tag for listings
+     *
+     * @var boolean
+     */
+    var $_numbers = false;
+
+    /**
+     * BB tags to be used
+     *
+     * @var array
+     */
+    var $_bb_tags = array (
+        'color'     => 'color',
+        'list'      => 'list',
+        'list_item' => '*',
+        'code'      => 'code',
+    );
+
+    /**
+     * BB brackets - [ and ]
+     *
+     * @var array
+     */
+    var $_tag_brackets = array ('start' => '[', 'end' => ']');
+
+    /**
+     * Colors map
+     *
+     * @var boolean
+     */
+    var $_colors = array(
+        'default'    => 'Black',
+        'code'       => 'Gray',
+        'brackets'   => 'Olive',
+        'comment'    => 'Orange',
+        'mlcomment'  => 'Orange',
+        'quotes'     => 'Darkred',
+        'string'     => 'Red',
+        'identifier' => 'Blue',
+        'builtin'    => 'Teal',
+        'reserved'   => 'Green',
+        'inlinedoc'  => 'Blue',
+        'var'        => 'Darkblue',
+        'url'        => 'Blue',
+        'special'    => 'Navy',
+        'number'     => 'Maroon',
+        'inlinetags' => 'Blue',
+    );
+
+    /**#@-*/
+
+    /**
+     * Resets renderer state
+     *
+     * @access protected
+     *
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     */
+    function reset()
+    {
+        parent::reset();
+        if (isset($this->_options['numbers'])) {
+            $this->_numbers = $this->_options['numbers'];
+        }
+        if (isset($this->_options['bb_tags'])) {
+            $this->_bb_tags = array_merge($this->_bb_tags, $this->_options['bb_tags']);
+        }
+        if (isset($this->_options['tag_brackets'])) {
+            $this->_tag_brackets = array_merge($this->_tag_brackets, $this->_options['tag_brackets']);
+        }
+        if (isset($this->_options['colors'])) {
+            $this->_colors = array_merge($this->_colors, $this->_options['colors']);
+        }
+    }
+
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @abstract
+     * @access public
+     *
+     */
+    function finalize()
+    {
+
+        // get parent's output
+        parent::finalize();
+        $output = parent::getOutput();
+
+        $bb_output = '';
+
+        $color_start = $this->_tag_brackets['start'] . $this->_bb_tags['color'] . '=%s'  . $this->_tag_brackets['end'];
+        $color_end   = $this->_tag_brackets['start'] . '/' . $this->_bb_tags['color'] . $this->_tag_brackets['end'];
+
+        // loop through each class=>content pair
+        foreach ($output AS $token) {
+
+            if ($this->_enumerated) {
+                $class = $token[0];
+                $content = $token[1];
+            } else {
+                $key = key($token);
+                $class = $key;
+                $content = $token[$key];
+            }
+
+            $iswhitespace = ctype_space($content);
+            if (!$iswhitespace && !empty($this->_colors[$class])) {
+                $bb_output .= sprintf($color_start, $this->_colors[$class]);
+                $bb_output .= $content;
+                $bb_output .= $color_end;
+            } else {
+                $bb_output .= $content;
+            }
+        }
+
+        if ($this->_numbers) {
+
+            $item_tag = $this->_tag_brackets['start'] .
+                        $this->_bb_tags['list_item'] .
+                        $this->_tag_brackets['end'];
+            $this->_output = $item_tag . str_replace("\n", "\n". $item_tag .' ', $bb_output);
+            $this->_output = $this->_tag_brackets['start'] .
+                             $this->_bb_tags['list'] .
+                             $this->_tag_brackets['end'] .
+                             $this->_output .
+                             $this->_tag_brackets['start'] .
+                             '/'.
+                             $this->_bb_tags['list'] .
+                             $this->_tag_brackets['end']
+                             ;
+        } else {
+            $this->_output = $this->_tag_brackets['start'] .
+                             $this->_bb_tags['code'] .
+                             $this->_tag_brackets['end'] .
+                             $bb_output .
+                             $this->_tag_brackets['start'] .
+                             '/' .
+                             $this->_bb_tags['code'] .
+                             $this->_tag_brackets['end'];
+        }
+    }
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/Console.php b/library/Text_Highlighter/Text/Highlighter/Renderer/Console.php
new file mode 100644
index 000000000..d7b1fba88
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/Renderer/Console.php
@@ -0,0 +1,208 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * Console renderer
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Andrey Demenev <demenev@gmail.com>
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter/Renderer.php';
+
+define ('HL_CONSOLE_DEFCOLOR', "\033[0m");
+
+/**
+ * Console renderer
+ *
+ * Suitable for displaying text on color-capable terminals, directly
+ * or trough less -r
+ *
+ * Elements of $options argument of constructor (each being optional):
+ *
+ * - 'numbers' - whether to add line numbers
+ * - 'tabsize' - Tab size
+ * - 'colors'  - additional colors
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_Console extends Text_Highlighter_Renderer
+{
+
+    /**#@+
+     * @access private
+     */
+
+    /**
+     * class of last outputted text chunk
+     *
+     * @var string
+     */
+    var $_lastClass;
+
+    /**
+     * Line numbering
+     *
+     * @var boolean
+     */
+    var $_numbers = false;
+
+    /**
+     * Tab size
+     *
+     * @var integer
+     */
+    var $_tabsize = 4;
+
+    /**
+     * Highlighted code
+     *
+     * @var string
+     */
+    var $_output = '';
+
+    /**#@-*/
+
+    var $_colors = array();
+
+    var $_defColors = array(
+        'default' => "\033[0m",
+        'inlinetags' => "\033[31m",
+        'brackets' => "\033[36m",
+        'quotes' => "\033[34m",
+        'inlinedoc' => "\033[34m",
+        'var' => "\033[1m",
+        'types' => "\033[32m",
+        'number' => "\033[32m",
+        'string' => "\033[31m",
+        'reserved' => "\033[35m",
+        'comment' => "\033[33m",
+        'mlcomment' => "\033[33m",
+    );
+
+    function preprocess($str)
+    {
+        // normalize whitespace and tabs
+        $str = str_replace("\r\n","\n", $str);
+        $str = str_replace("\t",str_repeat(' ', $this->_tabsize), $str);
+        return rtrim($str);
+    }
+
+
+    /**
+     * Resets renderer state
+     *
+     * @access protected
+     *
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     */
+    function reset()
+    {
+        $this->_lastClass = '';
+        if (isset($this->_options['numbers'])) {
+            $this->_numbers = (bool)$this->_options['numbers'];
+        } else {
+            $this->_numbers = false;
+        }
+        if (isset($this->_options['tabsize'])) {
+            $this->_tabsize = $this->_options['tabsize'];
+        } else {
+            $this->_tabsize = 4;
+        }
+        if (isset($this->_options['colors'])) {
+            $this->_colors = array_merge($this->_defColors, $this->_options['colors']);
+        } else {
+            $this->_colors = $this->_defColors;
+        }
+        $this->_output = '';
+    }
+
+
+
+    /**
+     * Accepts next token
+     *
+     * @access public
+     *
+     * @param  string $class   Token class
+     * @param  string $content Token content
+     */
+    function acceptToken($class, $content)
+    {
+        if (isset($this->_colors[$class])) {
+            $color = $this->_colors[$class];
+        } else {
+            $color = $this->_colors['default'];
+        }
+        if ($this->_lastClass != $class) {
+            $this->_output .= $color;
+        }
+        $content = str_replace("\n", $this->_colors['default'] . "\n" . $color, $content);
+        $content .= $this->_colors['default'];
+        $this->_output .= $content;
+    }
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @access public
+     *
+     */
+    function finalize()
+    {
+        if ($this->_numbers) {
+            $nlines = substr_count($this->_output, "\n") + 1;
+            $len = strlen($nlines);
+            $i = 1;
+            $this->_output = preg_replace('~^~em', '" " . str_pad($i++, $len, " ", STR_PAD_LEFT) . ": "', $this->_output);
+        }
+        $this->_output .= HL_CONSOLE_DEFCOLOR . "\n";
+    }
+
+    /**
+     * Get generated output
+     *
+     * @return string Highlighted code
+     * @access public
+     *
+     */
+    function getOutput()
+    {
+        return $this->_output;
+    }
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/Html.php b/library/Text_Highlighter/Text/Highlighter/Renderer/Html.php
new file mode 100644
index 000000000..5d6e56ae1
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/Renderer/Html.php
@@ -0,0 +1,465 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * HTML renderer
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Andrey Demenev <demenev@gmail.com>
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter/Renderer.php';
+require_once 'Text/Highlighter/Renderer/Array.php';
+
+// BC trick : only define constants if Text/Highlighter.php
+// is not yet included
+if (!defined('HL_NUMBERS_LI')) {
+    /**#@+
+     * Constant for use with $options['numbers']
+     */
+    /**
+     * use numbered list, deprecated, use HL_NUMBERS_OL instaed
+     * @deprecated
+     */
+    define ('HL_NUMBERS_LI'    ,    1);
+    /**
+     * Use 2-column table with line numbers in left column and code in  right column.
+     */
+    define ('HL_NUMBERS_TABLE'    , 2);
+    /**#@-*/
+}
+
+
+/**#@+
+ * Constant for use with $options['numbers']
+ */
+/**
+ * Use numbered list
+ */
+define ('HL_NUMBERS_OL',    1);
+/**
+ * Use non-numbered list
+ */
+define ('HL_NUMBERS_UL',    3);
+/**#@-*/
+
+
+/**
+ * HTML renderer
+ *
+ * Elements of $options argument of constructor (each being optional):
+ *
+ * - 'numbers' - Line numbering style 0 or {@link HL_NUMBERS_TABLE}
+ *               or {@link HL_NUMBERS_UL} or {@link HL_NUMBERS_OL}
+ * - 'numbers_start' - starting number for numbered lines
+ * - 'tabsize' - Tab size
+ * - 'style_map' - Mapping of keywords to formatting rules using inline styles
+ * - 'class_map' - Mapping of keywords to formatting rules using class names
+ * - 'doclinks' - array that has keys "url", "target" and "elements", used for
+ *                generating links to online documentation
+ * - 'use_language' - class names will be prefixed with language, like "php-reserved" or "css-code"
+ *
+ * Example of setting documentation links:
+ * $options['doclinks'] = array(
+ *   'url' => 'http://php.net/%s',
+ *   'target' => '_blank',
+ *   'elements' => array('reserved', 'identifier')
+ * );
+ *
+ * Example of setting class names map:
+ * $options['class_map'] = array(
+ *       'main'       => 'my-main',
+ *       'table'      => 'my-table',
+ *       'gutter'     => 'my-gutter',
+ *       'brackets'   => 'my-brackets',
+ *       'builtin'    => 'my-builtin',
+ *       'code'       => 'my-code',
+ *       'comment'    => 'my-comment',
+ *       'default'    => 'my-default',
+ *       'identifier' => 'my-identifier',
+ *       'inlinedoc'  => 'my-inlinedoc',
+ *       'inlinetags' => 'my-inlinetags',
+ *       'mlcomment'  => 'my-mlcomment',
+ *       'number'     => 'my-number',
+ *       'quotes'     => 'my-quotes',
+ *       'reserved'   => 'my-reserved',
+ *       'special'    => 'my-special',
+ *       'string'     => 'my-string',
+ *       'url'        => 'my-url',
+ *       'var'        => 'my-var',
+ * );
+ *
+ * Example of setting styles mapping:
+ * $options['style_map'] = array(
+ *       'main'       => 'color: black',
+ *       'table'      => 'border: 1px solid black',
+ *       'gutter'     => 'background-color: yellow',
+ *       'brackets'   => 'color: blue',
+ *       'builtin'    => 'color: red',
+ *       'code'       => 'color: green',
+ *       'comment'    => 'color: orange',
+ *       // ....
+ * );
+ *
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_Html extends Text_Highlighter_Renderer_Array
+{
+
+    /**#@+
+     * @access private
+     */
+
+    /**
+     * Line numbering style
+     *
+     * @var integer
+     */
+    var $_numbers = 0;
+
+    /**
+     * For numberered lines - where to start
+     *
+     * @var integer
+     */
+    var $_numbers_start = 0;
+
+    /**
+     * Tab size
+     *
+     * @var integer
+     */
+    var $_tabsize = 4;
+
+    /**
+     * Highlighted code
+     *
+     * @var string
+     */
+    var $_output = '';
+
+    /**
+     * Mapping of keywords to formatting rules using inline styles
+     *
+     * @var array
+     */
+    var $_style_map = array();
+
+    /**
+     * Mapping of keywords to formatting rules using class names
+     *
+     * @var array
+     */
+    var $_class_map = array(
+        'main'       => 'hl-main',
+        'table'      => 'hl-table',
+        'gutter'     => 'hl-gutter',
+        'brackets'   => 'hl-brackets',
+        'builtin'    => 'hl-builtin',
+        'code'       => 'hl-code',
+        'comment'    => 'hl-comment',
+        'default'    => 'hl-default',
+        'identifier' => 'hl-identifier',
+        'inlinedoc'  => 'hl-inlinedoc',
+        'inlinetags' => 'hl-inlinetags',
+        'mlcomment'  => 'hl-mlcomment',
+        'number'     => 'hl-number',
+        'prepro'     => 'hl-prepro',
+        'quotes'     => 'hl-quotes',
+        'reserved'   => 'hl-reserved',
+        'special'    => 'hl-special',
+        'string'     => 'hl-string',
+        'types'      => 'hl-types',
+        'url'        => 'hl-url',
+        'var'        => 'hl-var',
+    );
+
+    /**
+     * Setup for links to online documentation
+     *
+     * This is an array with keys:
+     * - url, ex. http://php.net/%s
+     * - target, ex. _blank, default - no target
+     * - elements, default is <code>array('reserved', 'identifier')</code>
+     *
+     * @var array
+     */
+    var $_doclinks = array();
+
+    /**#@-*/
+
+
+    /**
+     * Resets renderer state
+     *
+     * @access protected
+     *
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     */
+    function reset()
+    {
+        $this->_output = '';
+        if (isset($this->_options['numbers'])) {
+            $this->_numbers = (int)$this->_options['numbers'];
+            if ($this->_numbers != HL_NUMBERS_LI
+             && $this->_numbers != HL_NUMBERS_UL
+             && $this->_numbers != HL_NUMBERS_OL
+             && $this->_numbers != HL_NUMBERS_TABLE
+             ) {
+                $this->_numbers = 0;
+            }
+        }
+        if (isset($this->_options['tabsize'])) {
+            $this->_tabsize = $this->_options['tabsize'];
+        }
+        if (isset($this->_options['numbers_start'])) {
+            $this->_numbers_start = intval($this->_options['numbers_start']);
+        }
+        if (isset($this->_options['doclinks']) &&
+            is_array($this->_options['doclinks']) &&
+            !empty($this->_options['doclinks']['url'])
+        ) {
+
+            $this->_doclinks = $this->_options['doclinks']; // keys: url, target, elements array
+
+            if (empty($this->_options['doclinks']['elements'])) {
+                $this->_doclinks['elements'] = array('reserved', 'identifier');
+            }
+        }
+        if (isset($this->_options['style_map'])) {
+            $this->_style_map = $this->_options['style_map'];
+        }
+        if (isset($this->_options['class_map'])) {
+            $this->_class_map = array_merge($this->_class_map, $this->_options['class_map']);
+        }
+        $this->_htmlspecialchars = true;
+
+    }
+
+
+    /**
+     * Given a CSS class name, returns the class name
+     * with language name prepended, if necessary
+     *
+     * @access private
+     *
+     * @param  string $class   Token class
+     */
+    function _getFullClassName($class)
+    {
+        if (!empty($this->_options['use_language'])) {
+            $the_class = $this->_language . '-' . $class;
+        } else {
+            $the_class = $class;
+        }
+        return $the_class;
+    }
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @access public
+     */
+    function finalize()
+    {
+
+        // get parent's output
+        parent::finalize();
+        $output = parent::getOutput();
+
+        $html_output = '';
+
+        $numbers_li = false;
+
+        if (
+            $this->_numbers == HL_NUMBERS_LI ||
+            $this->_numbers == HL_NUMBERS_UL ||
+            $this->_numbers == HL_NUMBERS_OL
+           )
+        {
+            $numbers_li = true;
+        }
+
+        // loop through each class=>content pair
+        foreach ($output AS $token) {
+
+            if ($this->_enumerated) {
+                $key = false;
+                $the_class = $token[0];
+                $content = $token[1];
+            } else {
+                $key = key($token);
+                $the_class = $key;
+                $content = $token[$key];
+            }
+
+            $span = $this->_getStyling($the_class);
+            $decorated_output = $this->_decorate($content, $key);
+
+
+            if ($numbers_li == true) {
+                // end span tags before end of li, and re-open on next line
+                $lastSpanTag = str_replace("%s</span>", "", $span);
+                $span = sprintf($span, $decorated_output);
+                $span = str_replace("\n", "</span></li>\n<li>$lastSpanTag&nbsp;", $span);
+                $html_output .= $span;
+            } else {
+                $html_output .= sprintf($span, $decorated_output);
+            }
+
+
+        }
+
+        // format lists
+        if (!empty($this->_numbers) && $numbers_li == true) {
+
+
+            // additional whitespace for browsers that do not display
+            // empty list items correctly
+            $this->_output = '<li>&nbsp;' . $html_output . '</li>';
+
+            $start = '';
+            if ($this->_numbers == HL_NUMBERS_OL && intval($this->_numbers_start) > 0)  {
+                $start = ' start="' . $this->_numbers_start . '"';
+            }
+
+            $list_tag = 'ol';
+            if ($this->_numbers == HL_NUMBERS_UL)  {
+                $list_tag = 'ul';
+            }
+
+
+            $this->_output = '<' . $list_tag . $start
+                             . ' ' . $this->_getStyling('main', false) . '>'
+                             . $this->_output . '</'. $list_tag .'>';
+
+        // render a table
+        } else if ($this->_numbers == HL_NUMBERS_TABLE) {
+
+
+            $start_number = 0;
+            if (intval($this->_numbers_start)) {
+                $start_number = $this->_numbers_start - 1;
+            }
+
+            $numbers = '';
+
+            $nlines = substr_count($html_output,"\n")+1;
+            for ($i=1; $i <= $nlines; $i++) {
+                $numbers .= ($start_number + $i) . "\n";
+            }
+            $this->_output = '<table ' . $this->_getStyling('table', false) . ' width="100%"><tr>' .
+                             '<td '. $this->_getStyling('gutter', false) .' align="right" valign="top">' .
+                             '<pre>' . $numbers . '</pre></td><td '. $this->_getStyling('main', false) .
+                             ' valign="top"><pre>' .
+                             $html_output . '</pre></td></tr></table>';
+        }
+        if (!$this->_numbers) {
+            $this->_output = '<pre>' . $html_output . '</pre>';
+        }
+        $this->_output = '<div ' . $this->_getStyling('main', false) . '>' . $this->_output . '</div>';
+    }
+
+
+    /**
+     * Provides additional formatting to a keyword
+     *
+     * @param string $content Keyword
+     * @return string Keyword with additional formatting
+     * @access public
+     *
+     */
+    function _decorate($content, $key = false)
+    {
+        // links to online documentation
+        if (!empty($this->_doclinks) &&
+            !empty($this->_doclinks['url']) &&
+            in_array($key, $this->_doclinks['elements'])
+        ) {
+
+            $link = '<a href="'. sprintf($this->_doclinks['url'], $content) . '"';
+            if (!empty($this->_doclinks['target'])) {
+                $link.= ' target="' . $this->_doclinks['target'] . '"';
+            }
+            $link .= '>';
+            $link.= $content;
+            $link.= '</a>';
+
+            $content = $link;
+
+        }
+
+        return $content;
+    }
+
+    /**
+     * Returns <code>class</code> and/or <code>style</code> attribute,
+     * optionally enclosed in a <code>span</code> tag
+     *
+     * @param string $class Class name
+     * @paran boolean $span_tag Whether or not to return styling attributes in a <code>&gt;span&lt;</code> tag
+     * @return string <code>span</code> tag or just a <code>class</code> and/or <code>style</code> attributes
+     * @access private
+     */
+    function _getStyling($class, $span_tag = true)
+    {
+        $attrib = '';
+        if (!empty($this->_style_map) &&
+            !empty($this->_style_map[$class])
+        ) {
+            $attrib = 'style="'. $this->_style_map[$class] .'"';
+        }
+        if (!empty($this->_class_map) &&
+            !empty($this->_class_map[$class])
+        ) {
+            if ($attrib) {
+                $attrib .= ' ';
+            }
+            $attrib .= 'class="'. $this->_getFullClassName($this->_class_map[$class]) .'"';
+        }
+
+        if ($span_tag) {
+            $span = '<span ' . $attrib . '>%s</span>';
+            return $span;
+        } else {
+            return $attrib;
+        }
+
+    }
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/HtmlTags.php b/library/Text_Highlighter/Text/Highlighter/Renderer/HtmlTags.php
new file mode 100644
index 000000000..68e01d3e0
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/Renderer/HtmlTags.php
@@ -0,0 +1,187 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * HTML renderer that uses only basic html tags
+ *
+ * PHP versions 4 and 5. Based on the "normal" HTML renderer by Andrey Demenev.
+ * It's designed to work with user agents that support only a limited number of
+ * HTML tags. Like the iPod which supports only b, i, u and a.
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @copyright  2005 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter/Renderer.php';
+require_once 'Text/Highlighter/Renderer/Array.php';
+
+/**
+ * HTML basic tags renderer, based on Andrey Demenev's HTML renderer.
+ *
+ * Elements of $options argument of constructor (each being optional):
+ *
+ * - 'numbers' - Line numbering TRUE or FALSE. Default is FALSE.
+ * - 'tabsize' - Tab size, default is 4.
+ * - 'tags'    - Array, containing the tags to be used for highlighting
+ *
+ * Here's the listing of the default tags:
+ * - 'default'    => '',
+ * - 'code'       => '',
+ * - 'brackets'   => 'b',
+ * - 'comment'    => 'i',
+ * - 'mlcomment'  => 'i',
+ * - 'quotes'     => '',
+ * - 'string'     => 'i',
+ * - 'identifier' => 'b',
+ * - 'builtin'    => 'b',
+ * - 'reserved'   => 'u',
+ * - 'inlinedoc'  => 'i',
+ * - 'var'        => 'b',
+ * - 'url'        => 'i',
+ * - 'special'    => '',
+ * - 'number'     => '',
+ * - 'inlinetags' => ''
+ *
+ * @author Stoyan Stefanov <ssttoo@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2005 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.5.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_HtmlTags extends Text_Highlighter_Renderer_Array
+{
+
+    /**#@+
+     * @access private
+     */
+
+    /**
+     * Line numbering - will use 'ol' tag
+     *
+     * @var boolean
+     */
+    var $_numbers = false;
+
+    /**
+     * HTML tags map
+     *
+     * @var array
+     */
+    var $_hilite_tags = array(
+        'default'    => '',
+        'code'       => '',
+        'brackets'   => 'b',
+        'comment'    => 'i',
+        'mlcomment'  => 'i',
+        'quotes'     => '',
+        'string'     => 'i',
+        'identifier' => 'b',
+        'builtin'    => 'b',
+        'reserved'   => 'u',
+        'inlinedoc'  => 'i',
+        'var'        => 'b',
+        'url'        => 'i',
+        'special'    => '',
+        'number'     => '',
+        'inlinetags' => '',
+    );
+
+    /**#@-*/
+
+    /**
+     * Resets renderer state
+     *
+     * @access protected
+     *
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     */
+    function reset()
+    {
+        parent::reset();
+        if (isset($this->_options['numbers'])) {
+            $this->_numbers = $this->_options['numbers'];
+        }
+        if (isset($this->_options['tags'])) {
+            $this->_hilite_tags = array_merge($this->_tags, $this->_options['tags']);
+        }
+    }
+
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @abstract
+     * @access public
+     *
+     */
+    function finalize()
+    {
+
+        // get parent's output
+        parent::finalize();
+        $output = parent::getOutput();
+
+        $html_output = '';
+
+        // loop through each class=>content pair
+        foreach ($output AS $token) {
+
+            if ($this->_enumerated) {
+                $class = $token[0];
+                $content = $token[1];
+            } else {
+                $key = key($token);
+                $class = $key;
+                $content = $token[$key];
+            }
+
+            $iswhitespace = ctype_space($content);
+            if (!$iswhitespace && !empty($this->_hilite_tags[$class])) {
+                $html_output .= '<'. $this->_hilite_tags[$class] . '>' . $content . '</'. $this->_hilite_tags[$class] . '>';
+            } else {
+                $html_output .= $content;
+            }
+        }
+
+
+        if ($this->_numbers) {
+            /* additional whitespace for browsers that do not display
+            empty list items correctly */
+            $html_output = '<li>&nbsp;' . str_replace("\n", "</li>\n<li>&nbsp;", $html_output) . '</li>';
+            $this->_output = '<ol>' . str_replace(' ', '&nbsp;', $html_output) . '</ol>';
+        } else {
+            $this->_output = '<pre>' . $html_output . '</pre>';
+        }
+    }
+
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/JSON.php b/library/Text_Highlighter/Text/Highlighter/Renderer/JSON.php
new file mode 100644
index 000000000..d4c926161
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/Renderer/JSON.php
@@ -0,0 +1,86 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * JSON renderer.
+ *
+ * Based on the HTML renderer by Andrey Demenev.
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter/Renderer.php';
+require_once 'Text/Highlighter/Renderer/Array.php';
+
+/**
+ * JSON renderer, based on Andrey Demenev's HTML renderer.
+ *
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.5.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_JSON extends Text_Highlighter_Renderer_Array
+{
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @abstract
+     * @access public
+     */
+    function finalize()
+    {
+
+        parent::finalize();
+        $output = parent::getOutput();
+
+        $json_array = array();
+
+        foreach ($output AS $token) {
+
+            if ($this->_enumerated) {
+                $json_array[] = '["' . $token[0] . '","' . $token[1] . '"]';
+            } else {
+                $key = key($token);
+                $json_array[] = '{"class": "' . $key . '","content":"' . $token[$key] . '"}';
+            }
+
+        }
+
+        $this->_output  = '['. implode(',', $json_array) .']';
+        $this->_output = str_replace("\n", '\n', $this->_output);
+
+    }
+
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/Renderer/XML.php b/library/Text_Highlighter/Text/Highlighter/Renderer/XML.php
new file mode 100644
index 000000000..7b6fb2106
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/Renderer/XML.php
@@ -0,0 +1,104 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * XML renderer.
+ *
+ * Based on the HTML renderer by Andrey Demenev.
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter/Renderer.php';
+require_once 'Text/Highlighter/Renderer/Array.php';
+require_once 'XML/Serializer.php';
+
+/**
+ * XML renderer, based on Andrey Demenev's HTML renderer.
+ *
+ * @author     Stoyan Stefanov <ssttoo@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2006 Stoyan Stefanov
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.5.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+class Text_Highlighter_Renderer_XML extends Text_Highlighter_Renderer_Array
+{
+
+
+    /**
+     * Options for XML_Serializer
+     *
+     * @access private
+     * @var array
+     */
+    var $_serializer_options = array();
+
+
+    /**
+     * Resets renderer state
+     *
+     * Descendents of Text_Highlighter call this method from the constructor,
+     * passing $options they get as parameter.
+     *
+     * @access protected
+     */
+    function reset()
+    {
+        parent::reset();
+        if (isset($this->_options['xml_serializer'])) {
+            $this->_serializer_options = $this->_options['xml_serializer'];
+        }
+    }
+
+
+    /**
+     * Signals that no more tokens are available
+     *
+     * @abstract
+     * @access public
+     */
+    function finalize()
+    {
+
+        // call parent's finalize(), then serialize array into XML
+        parent::finalize();
+        $output = parent::getOutput();
+
+        $serializer = new XML_Serializer($this->_serializer_options);
+        $result = $serializer->serialize($output);
+        if ($result === true) {
+            $this->_output = $serializer->getSerializedData();
+        }
+    }
+
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
diff --git a/library/Text_Highlighter/Text/Highlighter/SH.php b/library/Text_Highlighter/Text/Highlighter/SH.php
new file mode 100644
index 000000000..ff779868f
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/SH.php
@@ -0,0 +1,1225 @@
+<?php
+/**
+ * Auto-generated class. SH syntax highlighting
+ * 
+ * This highlighter is EXPERIMENTAL. It may work incorrectly.
+ *       It is a crude hack of the perl syntax, which itself wasn't so good.
+ *       But this seems to work OK.
+ *    
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : sh.xml,v 1.2 2007/06/14 00:15:50 ssttoo Exp 
+ * @author Noah Spurrier <noah@noah.org>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. SH syntax highlighting
+ *
+ * @author Noah Spurrier <noah@noah.org>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_SH extends Text_Highlighter
+{
+    var $_language = 'sh';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_SH($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?m)^(#!)(.*))|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
+            0 => '/((?m)^(#!)(.*))|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
+            1 => '/((?m)^(#!)(.*))|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|((?i)([a-z1-9_]+)(\\s*=>))|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
+            2 => '/((?m)^(#!)(.*))|(\\{)|(\\()|(\\[)|((use)\\s+([\\w:]*))|((?Us)\\b(q[wq]\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|((?Us)\\b(q\\s*((\\{)|(\\()|(\\[)|(\\<)|([\\W\\S])))(?=(.*)((?(3)\\})(?(4)\\))(?(5)\\])(?(6)\\>)(?(7)\\7))))|(#.*)|((?x)(s|tr) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2)((\\\\.|[^\\\\])*?)(\\2[ecgimosx]*))|((?x)(m) ([|#~`!@$%^&*-+=\\\\;:\'",.\\/?])  ((\\\\.|[^\\\\])*?) (\\2[ecgimosx]*))|( \\/)|(\\$#?[1-9\'`@!])|((?i)(\\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)(\\{)([a-z1-9]+)(\\}))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(`)|(\')|(")|((?i)[a-z_]\\w*)|(\\d*\\.?\\d+)/',
+            3 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\[\\\\"\'`tnr\\$\\{@])/',
+            4 => '/(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
+            5 => '/(\\\\\\/)/',
+            6 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
+            7 => '/(\\\\\\\\|\\\\"|\\\\\'|\\\\`)/',
+            8 => '/(\\$#?[1-9\'`@!])|((?i)\\$([a-z1-9_]+|\\^(?-i)[A-Z]?(?i)))|((?i)[\\$@%]#?\\{[a-z1-9]+\\})|(\\\\[\\\\"\'`tnr\\$\\{@])/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 2,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 2,
+                5 => 9,
+                6 => 9,
+                7 => 0,
+                8 => 8,
+                9 => 5,
+                10 => 0,
+                11 => 0,
+                12 => 3,
+                13 => 1,
+                14 => 3,
+                15 => 0,
+                16 => 0,
+                17 => 0,
+                18 => 0,
+                19 => 0,
+                20 => 0,
+            ),
+            0 => 
+            array (
+                0 => 2,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 2,
+                5 => 9,
+                6 => 9,
+                7 => 0,
+                8 => 8,
+                9 => 5,
+                10 => 0,
+                11 => 0,
+                12 => 3,
+                13 => 1,
+                14 => 3,
+                15 => 0,
+                16 => 0,
+                17 => 0,
+                18 => 0,
+                19 => 0,
+                20 => 0,
+            ),
+            1 => 
+            array (
+                0 => 2,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 2,
+                5 => 9,
+                6 => 9,
+                7 => 0,
+                8 => 8,
+                9 => 5,
+                10 => 0,
+                11 => 2,
+                12 => 0,
+                13 => 3,
+                14 => 1,
+                15 => 3,
+                16 => 0,
+                17 => 0,
+                18 => 0,
+                19 => 0,
+                20 => 0,
+                21 => 0,
+            ),
+            2 => 
+            array (
+                0 => 2,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 2,
+                5 => 9,
+                6 => 9,
+                7 => 0,
+                8 => 8,
+                9 => 5,
+                10 => 0,
+                11 => 0,
+                12 => 3,
+                13 => 1,
+                14 => 3,
+                15 => 0,
+                16 => 0,
+                17 => 0,
+                18 => 0,
+                19 => 0,
+                20 => 0,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 0,
+                3 => 0,
+            ),
+            4 => 
+            array (
+                0 => 0,
+            ),
+            5 => 
+            array (
+                0 => 0,
+            ),
+            6 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 0,
+                3 => 0,
+            ),
+            7 => 
+            array (
+                0 => 0,
+            ),
+            8 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 0,
+                3 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => '',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => 'quotes',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => 'quotes',
+                17 => 'quotes',
+                18 => 'quotes',
+                19 => '',
+                20 => '',
+            ),
+            0 => 
+            array (
+                0 => '',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => 'quotes',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => 'quotes',
+                17 => 'quotes',
+                18 => 'quotes',
+                19 => '',
+                20 => '',
+            ),
+            1 => 
+            array (
+                0 => '',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => 'quotes',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => '',
+                17 => 'quotes',
+                18 => 'quotes',
+                19 => 'quotes',
+                20 => '',
+                21 => '',
+            ),
+            2 => 
+            array (
+                0 => '',
+                1 => 'brackets',
+                2 => 'brackets',
+                3 => 'brackets',
+                4 => '',
+                5 => 'quotes',
+                6 => 'quotes',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => 'quotes',
+                11 => '',
+                12 => '',
+                13 => '',
+                14 => '',
+                15 => '',
+                16 => 'quotes',
+                17 => 'quotes',
+                18 => 'quotes',
+                19 => '',
+                20 => '',
+            ),
+            3 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+            ),
+            4 => 
+            array (
+                0 => '',
+            ),
+            5 => 
+            array (
+                0 => '',
+            ),
+            6 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+            ),
+            7 => 
+            array (
+                0 => '',
+            ),
+            8 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'special',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'special',
+                5 => 'string',
+                6 => 'string',
+                7 => 'comment',
+                8 => 'string',
+                9 => 'string',
+                10 => 'string',
+                11 => 'var',
+                12 => 'var',
+                13 => 'var',
+                14 => 'var',
+                15 => 'var',
+                16 => 'string',
+                17 => 'string',
+                18 => 'string',
+                19 => 'identifier',
+                20 => 'number',
+            ),
+            0 => 
+            array (
+                0 => 'special',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'special',
+                5 => 'string',
+                6 => 'string',
+                7 => 'comment',
+                8 => 'string',
+                9 => 'string',
+                10 => 'string',
+                11 => 'var',
+                12 => 'var',
+                13 => 'var',
+                14 => 'var',
+                15 => 'var',
+                16 => 'string',
+                17 => 'string',
+                18 => 'string',
+                19 => 'identifier',
+                20 => 'number',
+            ),
+            1 => 
+            array (
+                0 => 'special',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'special',
+                5 => 'string',
+                6 => 'string',
+                7 => 'comment',
+                8 => 'string',
+                9 => 'string',
+                10 => 'string',
+                11 => 'string',
+                12 => 'var',
+                13 => 'var',
+                14 => 'var',
+                15 => 'var',
+                16 => 'var',
+                17 => 'string',
+                18 => 'string',
+                19 => 'string',
+                20 => 'identifier',
+                21 => 'number',
+            ),
+            2 => 
+            array (
+                0 => 'special',
+                1 => 'code',
+                2 => 'code',
+                3 => 'code',
+                4 => 'special',
+                5 => 'string',
+                6 => 'string',
+                7 => 'comment',
+                8 => 'string',
+                9 => 'string',
+                10 => 'string',
+                11 => 'var',
+                12 => 'var',
+                13 => 'var',
+                14 => 'var',
+                15 => 'var',
+                16 => 'string',
+                17 => 'string',
+                18 => 'string',
+                19 => 'identifier',
+                20 => 'number',
+            ),
+            3 => 
+            array (
+                0 => 'var',
+                1 => 'var',
+                2 => 'var',
+                3 => 'special',
+            ),
+            4 => 
+            array (
+                0 => 'special',
+            ),
+            5 => 
+            array (
+                0 => 'string',
+            ),
+            6 => 
+            array (
+                0 => 'var',
+                1 => 'var',
+                2 => 'var',
+                3 => 'special',
+            ),
+            7 => 
+            array (
+                0 => 'special',
+            ),
+            8 => 
+            array (
+                0 => 'var',
+                1 => 'var',
+                2 => 'var',
+                3 => 'special',
+            ),
+        );
+        $this->_end = array (
+            0 => '/\\}/',
+            1 => '/\\)/',
+            2 => '/\\]/',
+            3 => '/%b2%/',
+            4 => '/%b2%/',
+            5 => '/\\/[cgimosx]*/',
+            6 => '/`/',
+            7 => '/\'/',
+            8 => '/"/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => 0,
+                2 => 1,
+                3 => 2,
+                4 => -1,
+                5 => 3,
+                6 => 4,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => 5,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => 6,
+                17 => 7,
+                18 => 8,
+                19 => -1,
+                20 => -1,
+            ),
+            0 => 
+            array (
+                0 => -1,
+                1 => 0,
+                2 => 1,
+                3 => 2,
+                4 => -1,
+                5 => 3,
+                6 => 4,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => 5,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => 6,
+                17 => 7,
+                18 => 8,
+                19 => -1,
+                20 => -1,
+            ),
+            1 => 
+            array (
+                0 => -1,
+                1 => 0,
+                2 => 1,
+                3 => 2,
+                4 => -1,
+                5 => 3,
+                6 => 4,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => 5,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => -1,
+                17 => 6,
+                18 => 7,
+                19 => 8,
+                20 => -1,
+                21 => -1,
+            ),
+            2 => 
+            array (
+                0 => -1,
+                1 => 0,
+                2 => 1,
+                3 => 2,
+                4 => -1,
+                5 => 3,
+                6 => 4,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => 5,
+                11 => -1,
+                12 => -1,
+                13 => -1,
+                14 => -1,
+                15 => -1,
+                16 => 6,
+                17 => 7,
+                18 => 8,
+                19 => -1,
+                20 => -1,
+            ),
+            3 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+            ),
+            4 => 
+            array (
+                0 => -1,
+            ),
+            5 => 
+            array (
+                0 => -1,
+            ),
+            6 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+            ),
+            7 => 
+            array (
+                0 => -1,
+            ),
+            8 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                ),
+                5 => -1,
+                6 => -1,
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => -1,
+                17 => -1,
+                18 => -1,
+                19 => 
+                array (
+                    'reserved' => '/^(cd|cp|rm|echo|printf|exit|cut|join|comm|fmt|grep|egrep|fgrep|sed|awk|yes|false|true|test|expr|tee|basename|dirname|pathchk|pwd|stty|tty|env|printenv|id|logname|whoami|groups|users|who|date|uname|hostname|chroot|nice|nohup|sleep|factor|seq|getopt|getopts|options|shift)$/',
+                    'flowcontrol' => '/^(if|fi|then|else|elif|case|esac|while|done|for|in|function|until|do|select|time|read|set)$/',
+                ),
+                20 => 
+                array (
+                ),
+            ),
+            0 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                ),
+                5 => -1,
+                6 => -1,
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => -1,
+                17 => -1,
+                18 => -1,
+                19 => 
+                array (
+                    'reserved' => '/^(cd|cp|rm|echo|printf|exit|cut|join|comm|fmt|grep|egrep|fgrep|sed|awk|yes|false|true|test|expr|tee|basename|dirname|pathchk|pwd|stty|tty|env|printenv|id|logname|whoami|groups|users|who|date|uname|hostname|chroot|nice|nohup|sleep|factor|seq|getopt|getopts|options|shift)$/',
+                    'flowcontrol' => '/^(if|fi|then|else|elif|case|esac|while|done|for|in|function|until|do|select|time|read|set)$/',
+                ),
+                20 => 
+                array (
+                ),
+            ),
+            1 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                ),
+                5 => -1,
+                6 => -1,
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => 
+                array (
+                ),
+                17 => -1,
+                18 => -1,
+                19 => -1,
+                20 => 
+                array (
+                    'reserved' => '/^(cd|cp|rm|echo|printf|exit|cut|join|comm|fmt|grep|egrep|fgrep|sed|awk|yes|false|true|test|expr|tee|basename|dirname|pathchk|pwd|stty|tty|env|printenv|id|logname|whoami|groups|users|who|date|uname|hostname|chroot|nice|nohup|sleep|factor|seq|getopt|getopts|options|shift)$/',
+                    'flowcontrol' => '/^(if|fi|then|else|elif|case|esac|while|done|for|in|function|until|do|select|time|read|set)$/',
+                ),
+                21 => 
+                array (
+                ),
+            ),
+            2 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => -1,
+                2 => -1,
+                3 => -1,
+                4 => 
+                array (
+                ),
+                5 => -1,
+                6 => -1,
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => -1,
+                11 => 
+                array (
+                ),
+                12 => 
+                array (
+                ),
+                13 => 
+                array (
+                ),
+                14 => 
+                array (
+                ),
+                15 => 
+                array (
+                ),
+                16 => -1,
+                17 => -1,
+                18 => -1,
+                19 => 
+                array (
+                    'reserved' => '/^(cd|cp|rm|echo|printf|exit|cut|join|comm|fmt|grep|egrep|fgrep|sed|awk|yes|false|true|test|expr|tee|basename|dirname|pathchk|pwd|stty|tty|env|printenv|id|logname|whoami|groups|users|who|date|uname|hostname|chroot|nice|nohup|sleep|factor|seq|getopt|getopts|options|shift)$/',
+                    'flowcontrol' => '/^(if|fi|then|else|elif|case|esac|while|done|for|in|function|until|do|select|time|read|set)$/',
+                ),
+                20 => 
+                array (
+                ),
+            ),
+            3 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+            ),
+            4 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            5 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            6 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+            ),
+            7 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            8 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+                0 => 
+                array (
+                    1 => 'special',
+                    2 => 'string',
+                ),
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => 
+                array (
+                    1 => 'reserved',
+                    2 => 'special',
+                ),
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                    6 => 'string',
+                    8 => 'quotes',
+                ),
+                9 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                ),
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => 
+                array (
+                    1 => 'brackets',
+                    2 => 'var',
+                    3 => 'brackets',
+                ),
+                15 => NULL,
+                16 => NULL,
+                17 => NULL,
+                18 => NULL,
+                19 => NULL,
+                20 => NULL,
+            ),
+            1 => 
+            array (
+                0 => 
+                array (
+                    1 => 'special',
+                    2 => 'string',
+                ),
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => 
+                array (
+                    1 => 'reserved',
+                    2 => 'special',
+                ),
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                    6 => 'string',
+                    8 => 'quotes',
+                ),
+                9 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                ),
+                10 => NULL,
+                11 => 
+                array (
+                    1 => 'string',
+                    2 => 'code',
+                ),
+                12 => NULL,
+                13 => NULL,
+                14 => NULL,
+                15 => 
+                array (
+                    1 => 'brackets',
+                    2 => 'var',
+                    3 => 'brackets',
+                ),
+                16 => NULL,
+                17 => NULL,
+                18 => NULL,
+                19 => NULL,
+                20 => NULL,
+                21 => NULL,
+            ),
+            2 => 
+            array (
+                0 => 
+                array (
+                    1 => 'special',
+                    2 => 'string',
+                ),
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => 
+                array (
+                    1 => 'reserved',
+                    2 => 'special',
+                ),
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                    6 => 'string',
+                    8 => 'quotes',
+                ),
+                9 => 
+                array (
+                    1 => 'quotes',
+                    2 => 'quotes',
+                    3 => 'string',
+                    5 => 'quotes',
+                ),
+                10 => NULL,
+                11 => NULL,
+                12 => NULL,
+                13 => NULL,
+                14 => 
+                array (
+                    1 => 'brackets',
+                    2 => 'var',
+                    3 => 'brackets',
+                ),
+                15 => NULL,
+                16 => NULL,
+                17 => NULL,
+                18 => NULL,
+                19 => NULL,
+                20 => NULL,
+            ),
+            3 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+            4 => 
+            array (
+                0 => NULL,
+            ),
+            5 => 
+            array (
+                0 => NULL,
+            ),
+            6 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+            7 => 
+            array (
+                0 => NULL,
+            ),
+            8 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => true,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+                18 => false,
+                19 => false,
+                20 => false,
+            ),
+            0 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => true,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+                18 => false,
+                19 => false,
+                20 => false,
+            ),
+            1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => true,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+                18 => false,
+                19 => false,
+                20 => false,
+                21 => false,
+            ),
+            2 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => true,
+                6 => true,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+                11 => false,
+                12 => false,
+                13 => false,
+                14 => false,
+                15 => false,
+                16 => false,
+                17 => false,
+                18 => false,
+                19 => false,
+                20 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+            4 => 
+            array (
+                0 => false,
+            ),
+            5 => 
+            array (
+                0 => false,
+            ),
+            6 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+            7 => 
+            array (
+                0 => false,
+            ),
+            8 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'reserved' => 'reserved',
+            'flowcontrol' => 'reserved',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/SQL.php b/library/Text_Highlighter/Text/Highlighter/SQL.php
new file mode 100644
index 000000000..824864033
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/SQL.php
@@ -0,0 +1,419 @@
+<?php
+/**
+ * Auto-generated class. SQL syntax highlighting
+ * 
+ * Based on SQL-99 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : sql.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. SQL syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_SQL extends Text_Highlighter
+{
+    var $_language = 'sql';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_SQL($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)`)|((?i)\\/\\*)|((?i)(#|--\\s).*)|((?i)[a-z_]\\w*)|((?i)")|((?i)\\()|((?i)\')|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)/',
+            0 => '//',
+            1 => '//',
+            2 => '/((?i)\\\\.)/',
+            3 => '/((?i)`)|((?i)\\/\\*)|((?i)(#|--\\s).*)|((?i)[a-z_]\\w*)|((?i)")|((?i)\\()|((?i)\')|((?i)((\\d+|((\\d*\\.\\d+)|(\\d+\\.\\d*)))[eE][+-]?\\d+))|((?i)(\\d*\\.\\d+)|(\\d+\\.\\d*))|((?i)\\d+l?|\\b0l?\\b)|((?i)0[xX][\\da-f]+l?)/',
+            4 => '/((?i)\\\\.)/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 1,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 5,
+                8 => 2,
+                9 => 0,
+                10 => 0,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 0,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 1,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+                6 => 0,
+                7 => 5,
+                8 => 2,
+                9 => 0,
+                10 => 0,
+            ),
+            4 => 
+            array (
+                0 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'quotes',
+                1 => 'comment',
+                2 => '',
+                3 => '',
+                4 => 'quotes',
+                5 => 'brackets',
+                6 => 'quotes',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => '',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => '',
+            ),
+            3 => 
+            array (
+                0 => 'quotes',
+                1 => 'comment',
+                2 => '',
+                3 => '',
+                4 => 'quotes',
+                5 => 'brackets',
+                6 => 'quotes',
+                7 => '',
+                8 => '',
+                9 => '',
+                10 => '',
+            ),
+            4 => 
+            array (
+                0 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'identifier',
+                1 => 'comment',
+                2 => 'comment',
+                3 => 'identifier',
+                4 => 'string',
+                5 => 'code',
+                6 => 'string',
+                7 => 'number',
+                8 => 'number',
+                9 => 'number',
+                10 => 'number',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 'special',
+            ),
+            3 => 
+            array (
+                0 => 'identifier',
+                1 => 'comment',
+                2 => 'comment',
+                3 => 'identifier',
+                4 => 'string',
+                5 => 'code',
+                6 => 'string',
+                7 => 'number',
+                8 => 'number',
+                9 => 'number',
+                10 => 'number',
+            ),
+            4 => 
+            array (
+                0 => 'special',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)`/',
+            1 => '/(?i)\\*\\//',
+            2 => '/(?i)"/',
+            3 => '/(?i)\\)/',
+            4 => '/(?i)\'/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => -1,
+                3 => -1,
+                4 => 2,
+                5 => 3,
+                6 => 4,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => -1,
+            ),
+            3 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => -1,
+                3 => -1,
+                4 => 2,
+                5 => 3,
+                6 => 4,
+                7 => -1,
+                8 => -1,
+                9 => -1,
+                10 => -1,
+            ),
+            4 => 
+            array (
+                0 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                    'reserved' => '/^((?i)absolute|action|add|admin|after|aggregate|alias|all|allocate|alter|and|any|are|array|as|asc|assertion|at|authorization|before|begin|binary|bit|blob|boolean|both|breadth|by|call|cascade|cascaded|case|cast|catalog|char|character|check|class|clob|close|collate|collation|column|commit|completion|connect|connection|constraint|constraints|constructor|continue|corresponding|create|cross|cube|current|current_date|current_path|current_role|current_time|current_timestamp|current_user|cursor|cycle|data|date|day|deallocate|dec|decimal|declare|default|deferrable|deferred|delete|depth|deref|desc|describe|descriptor|destroy|destructor|deterministic|diagnostics|dictionary|disconnect|distinct|domain|double|drop|dynamic|each|else|end|end-exec|equals|escape|every|except|exception|exec|execute|external|false|fetch|first|float|for|foreign|found|free|from|full|function|general|get|global|go|goto|grant|group|grouping|having|host|hour|identity|ignore|immediate|in|indicator|initialize|initially|inner|inout|input|insert|int|integer|intersect|interval|into|is|isolation|iterate|join|key|language|large|last|lateral|leading|left|less|level|like|limit|local|localtime|localtimestamp|locator|map|match|minute|modifies|modify|module|month|names|national|natural|nchar|nclob|new|next|no|none|not|null|numeric|object|of|off|old|on|only|open|operation|option|or|order|ordinality|out|outer|output|pad|parameter|parameters|partial|path|postfix|precision|prefix|preorder|prepare|preserve|primary|prior|privileges|procedure|public|read|reads|real|recursive|ref|references|referencing|relative|restrict|result|return|returns|revoke|right|role|rollback|rollup|routine|row|rows|savepoint|schema|scope|scroll|search|second|section|select|sequence|session|session_user|set|sets|size|smallint|some|space|specific|specifictype|sql|sqlexception|sqlstate|sqlwarning|start|state|statement|static|structure|system_user|table|temporary|terminate|than|then|time|timestamp|timezone_hour|timezone_minute|to|trailing|transaction|translation|treat|trigger|true|under|union|unique|unknown|unnest|update|usage|user|using|value|values|varchar|variable|varying|view|when|whenever|where|with|without|work|write|year|zone)$/',
+                    'keyword' => '/^((?i)abs|ada|asensitive|assignment|asymmetric|atomic|avg|between|bitvar|bit_length|c|called|cardinality|catalog_name|chain|character_length|character_set_catalog|character_set_name|character_set_schema|char_length|checked|class_origin|coalesce|cobol|collation_catalog|collation_name|collation_schema|column_name|command_function|command_function_code|committed|condition_number|connection_name|constraint_catalog|constraint_name|constraint_schema|contains|convert|count|cursor_name|datetime_interval_code|datetime_interval_precision|defined|definer|dispatch|dynamic_function|dynamic_function_code|existing|exists|extract|final|fortran|g|generated|granted|hierarchy|hold|implementation|infix|insensitive|instance|instantiable|invoker|k|key_member|key_type|length|lower|m|max|message_length|message_octet_length|message_text|method|min|mod|more|mumps|name|nullable|nullif|number|octet_length|options|overlaps|overlay|overriding|parameter_mode|parameter_name|parameter_ordinal_position|parameter_specific_catalog|parameter_specific_name|parameter_specific_schema|pascal|pli|position|repeatable|returned_length|returned_octet_length|returned_sqlstate|routine_catalog|routine_name|routine_schema|row_count|scale|schema_name|security|self|sensitive|serializable|server_name|similar|simple|source|specific_name|style|subclass_origin|sublist|substring|sum|symmetric|system|table_name|transactions_committed|transactions_rolled_back|transaction_active|transform|transforms|translate|trigger_catalog|trigger_name|trigger_schema|trim|type|uncommitted|unnamed|upper|user_defined_type_catalog|user_defined_type_name|user_defined_type_schema)$/',
+                ),
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+            3 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                    'reserved' => '/^((?i)absolute|action|add|admin|after|aggregate|alias|all|allocate|alter|and|any|are|array|as|asc|assertion|at|authorization|before|begin|binary|bit|blob|boolean|both|breadth|by|call|cascade|cascaded|case|cast|catalog|char|character|check|class|clob|close|collate|collation|column|commit|completion|connect|connection|constraint|constraints|constructor|continue|corresponding|create|cross|cube|current|current_date|current_path|current_role|current_time|current_timestamp|current_user|cursor|cycle|data|date|day|deallocate|dec|decimal|declare|default|deferrable|deferred|delete|depth|deref|desc|describe|descriptor|destroy|destructor|deterministic|diagnostics|dictionary|disconnect|distinct|domain|double|drop|dynamic|each|else|end|end-exec|equals|escape|every|except|exception|exec|execute|external|false|fetch|first|float|for|foreign|found|free|from|full|function|general|get|global|go|goto|grant|group|grouping|having|host|hour|identity|ignore|immediate|in|indicator|initialize|initially|inner|inout|input|insert|int|integer|intersect|interval|into|is|isolation|iterate|join|key|language|large|last|lateral|leading|left|less|level|like|limit|local|localtime|localtimestamp|locator|map|match|minute|modifies|modify|module|month|names|national|natural|nchar|nclob|new|next|no|none|not|null|numeric|object|of|off|old|on|only|open|operation|option|or|order|ordinality|out|outer|output|pad|parameter|parameters|partial|path|postfix|precision|prefix|preorder|prepare|preserve|primary|prior|privileges|procedure|public|read|reads|real|recursive|ref|references|referencing|relative|restrict|result|return|returns|revoke|right|role|rollback|rollup|routine|row|rows|savepoint|schema|scope|scroll|search|second|section|select|sequence|session|session_user|set|sets|size|smallint|some|space|specific|specifictype|sql|sqlexception|sqlstate|sqlwarning|start|state|statement|static|structure|system_user|table|temporary|terminate|than|then|time|timestamp|timezone_hour|timezone_minute|to|trailing|transaction|translation|treat|trigger|true|under|union|unique|unknown|unnest|update|usage|user|using|value|values|varchar|variable|varying|view|when|whenever|where|with|without|work|write|year|zone)$/',
+                    'keyword' => '/^((?i)abs|ada|asensitive|assignment|asymmetric|atomic|avg|between|bitvar|bit_length|c|called|cardinality|catalog_name|chain|character_length|character_set_catalog|character_set_name|character_set_schema|char_length|checked|class_origin|coalesce|cobol|collation_catalog|collation_name|collation_schema|column_name|command_function|command_function_code|committed|condition_number|connection_name|constraint_catalog|constraint_name|constraint_schema|contains|convert|count|cursor_name|datetime_interval_code|datetime_interval_precision|defined|definer|dispatch|dynamic_function|dynamic_function_code|existing|exists|extract|final|fortran|g|generated|granted|hierarchy|hold|implementation|infix|insensitive|instance|instantiable|invoker|k|key_member|key_type|length|lower|m|max|message_length|message_octet_length|message_text|method|min|mod|more|mumps|name|nullable|nullif|number|octet_length|options|overlaps|overlay|overriding|parameter_mode|parameter_name|parameter_ordinal_position|parameter_specific_catalog|parameter_specific_name|parameter_specific_schema|pascal|pli|position|repeatable|returned_length|returned_octet_length|returned_sqlstate|routine_catalog|routine_name|routine_schema|row_count|scale|schema_name|security|self|sensitive|serializable|server_name|similar|simple|source|specific_name|style|subclass_origin|sublist|substring|sum|symmetric|system|table_name|transactions_committed|transactions_rolled_back|transaction_active|transform|transforms|translate|trigger_catalog|trigger_name|trigger_schema|trim|type|uncommitted|unnamed|upper|user_defined_type_catalog|user_defined_type_name|user_defined_type_schema)$/',
+                ),
+                4 => -1,
+                5 => -1,
+                6 => -1,
+                7 => 
+                array (
+                ),
+                8 => 
+                array (
+                ),
+                9 => 
+                array (
+                ),
+                10 => 
+                array (
+                ),
+            ),
+            4 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => NULL,
+            ),
+            3 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+                6 => NULL,
+                7 => NULL,
+                8 => NULL,
+                9 => NULL,
+                10 => NULL,
+            ),
+            4 => 
+            array (
+                0 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+                6 => false,
+                7 => false,
+                8 => false,
+                9 => false,
+                10 => false,
+            ),
+            4 => 
+            array (
+                0 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'reserved' => 'reserved',
+            'keyword' => 'var',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/Text/Highlighter/VBSCRIPT.php b/library/Text_Highlighter/Text/Highlighter/VBSCRIPT.php
new file mode 100644
index 000000000..31a7c7c9e
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/VBSCRIPT.php
@@ -0,0 +1,318 @@
+<?php
+/**
+ * Auto-generated class. VBSCRIPT syntax highlighting 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: vbscript.xml
+ * @author Daniel Fruzynski <daniel-AT-poradnik-webmastera.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. VBSCRIPT syntax highlighting
+ *
+ * @author Daniel Fruzynski <daniel-AT-poradnik-webmastera.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: 0.7.0
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_VBSCRIPT extends Text_Highlighter
+{
+    var $_language = 'vbscript';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_VBSCRIPT($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)\\()|((?i)")|((?i)\'|[Rr][Ee][Mm]\\b)|((?i)\\d*\\.?\\d+)|((?i)&H[0-9a-fA-F]+)|((?i)[a-z_]\\w*)/',
+            0 => '/((?i)\\()|((?i)")|((?i)\'|[Rr][Ee][Mm]\\b)|((?i)\\d*\\.?\\d+)|((?i)&H[0-9a-fA-F]+)|((?i)[a-z_]\\w*)/',
+            1 => '//',
+            2 => '/((?i)((https?|ftp):\\/\\/[\\w\\?\\.\\-\\&=\\/%+]+)|(^|[\\s,!?])www\\.\\w+\\.\\w+[\\w\\?\\.\\&=\\/%+]*)|((?i)\\w+[\\.\\w\\-]+@(\\w+[\\.\\w\\-])+)|((?i)\\b(note|fixme):)|((?i)\\$\\w+:.+\\$)/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+            ),
+            0 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 0,
+                4 => 0,
+                5 => 0,
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 3,
+                1 => 1,
+                2 => 1,
+                3 => 0,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'brackets',
+                1 => 'quotes',
+                2 => 'comment',
+                3 => '',
+                4 => '',
+                5 => '',
+            ),
+            0 => 
+            array (
+                0 => 'brackets',
+                1 => 'quotes',
+                2 => 'comment',
+                3 => '',
+                4 => '',
+                5 => '',
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => '',
+                3 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'code',
+                1 => 'string',
+                2 => 'comment',
+                3 => 'number',
+                4 => 'number',
+                5 => 'identifier',
+            ),
+            0 => 
+            array (
+                0 => 'code',
+                1 => 'string',
+                2 => 'comment',
+                3 => 'number',
+                4 => 'number',
+                5 => 'identifier',
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 'url',
+                1 => 'url',
+                2 => 'inlinedoc',
+                3 => 'inlinedoc',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)\\)/',
+            1 => '/(?i)"/',
+            2 => '/(?mi)$/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+            ),
+            0 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => -1,
+                4 => -1,
+                5 => -1,
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => 
+                array (
+                ),
+                4 => 
+                array (
+                ),
+                5 => 
+                array (
+                    'constants' => '/^((?i)vbblack|vbred|vbgreen|vbyellow|vbblue|vbmagenta|vbcyan|vbwhite|vbbinarycompare|vbtextcompare|vbsunday|vbmonday|vbtuesday|vbwednesday|vbthursday|vbfriday|vbsaturday|vbusesystemdayofweek|vbfirstjan1|vbfirstfourdays|vbfirstfullweek|vbgeneraldate|vblongdate|vbshortdate|vblongtime|vbshorttime|vbobjecterror|vbokonly|vbokcancel|vbabortretryignore|vbyesnocancel|vbyesno|vbretrycancel|vbcritical|vbquestion|vbexclamation|vbinformation|vbdefaultbutton1|vbdefaultbutton2|vbdefaultbutton3|vbdefaultbutton4|vbapplicationmodal|vbsystemmodal|vbok|vbcancel|vbabort|vbretry|vbignore|vbyes|vbno|vbcr|vbcrlf|vbformfeed|vblf|vbnewline|vbnullchar|vbnullstring|vbtab|vbverticaltab|vbusedefault|vbtrue|vbfalse|vbempty|vbnull|vbinteger|vblong|vbsingle|vbdouble|vbcurrency|vbdate|vbstring|vbobject|vberror|vbboolean|vbvariant|vbdataobject|vbdecimal|vbbyte|vbarray)$/',
+                    'functions' => '/^((?i)abs|array|asc|atn|cbool|cbyte|ccur|cdate|cdbl|chr|cint|clng|cos|createobject|csng|cstr|date|dateadd|datediff|datepart|dateserial|datevalue|day|escape|eval|exp|filter|formatcurrency|formatdatetime|formatnumber|formatpercent|getlocale|getobject|getref|hex|hour|inputbox|instr|instrrev|int|fix|isarray|isdate|isempty|isnull|isnumeric|isobject|join|lbound|lcase|left|len|loadpicture|log|ltrim|rtrim|trim|mid|minute|month|monthname|msgbox|now|oct|replace|rgb|right|rnd|round|scriptengine|scriptenginebuildversion|scriptenginemajorversion|scriptengineminorversion|second|setlocale|sgn|sin|space|split|sqr|strcomp|string|strreverse|tan|time|timer|timeserial|timevalue|typename|ubound|ucase|unescape|vartype|weekday|weekdayname|year)$/',
+                    'builtin' => '/^((?i)debug|err|match|regexp)$/',
+                    'reserved' => '/^((?i)empty|false|nothing|null|true|and|eqv|imp|is|mod|not|or|xor|call|class|end|const|public|private|dim|do|while|until|exit|loop|erase|execute|executeglobal|for|each|in|to|step|next|function|default|if|then|else|elseif|on|error|resume|goto|option|explicit|property|get|let|set|randomize|redim|preserve|select|case|stop|sub|wend|with)$/',
+                ),
+            ),
+            0 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => 
+                array (
+                ),
+                4 => 
+                array (
+                ),
+                5 => 
+                array (
+                    'constants' => '/^((?i)vbblack|vbred|vbgreen|vbyellow|vbblue|vbmagenta|vbcyan|vbwhite|vbbinarycompare|vbtextcompare|vbsunday|vbmonday|vbtuesday|vbwednesday|vbthursday|vbfriday|vbsaturday|vbusesystemdayofweek|vbfirstjan1|vbfirstfourdays|vbfirstfullweek|vbgeneraldate|vblongdate|vbshortdate|vblongtime|vbshorttime|vbobjecterror|vbokonly|vbokcancel|vbabortretryignore|vbyesnocancel|vbyesno|vbretrycancel|vbcritical|vbquestion|vbexclamation|vbinformation|vbdefaultbutton1|vbdefaultbutton2|vbdefaultbutton3|vbdefaultbutton4|vbapplicationmodal|vbsystemmodal|vbok|vbcancel|vbabort|vbretry|vbignore|vbyes|vbno|vbcr|vbcrlf|vbformfeed|vblf|vbnewline|vbnullchar|vbnullstring|vbtab|vbverticaltab|vbusedefault|vbtrue|vbfalse|vbempty|vbnull|vbinteger|vblong|vbsingle|vbdouble|vbcurrency|vbdate|vbstring|vbobject|vberror|vbboolean|vbvariant|vbdataobject|vbdecimal|vbbyte|vbarray)$/',
+                    'functions' => '/^((?i)abs|array|asc|atn|cbool|cbyte|ccur|cdate|cdbl|chr|cint|clng|cos|createobject|csng|cstr|date|dateadd|datediff|datepart|dateserial|datevalue|day|escape|eval|exp|filter|formatcurrency|formatdatetime|formatnumber|formatpercent|getlocale|getobject|getref|hex|hour|inputbox|instr|instrrev|int|fix|isarray|isdate|isempty|isnull|isnumeric|isobject|join|lbound|lcase|left|len|loadpicture|log|ltrim|rtrim|trim|mid|minute|month|monthname|msgbox|now|oct|replace|rgb|right|rnd|round|scriptengine|scriptenginebuildversion|scriptenginemajorversion|scriptengineminorversion|second|setlocale|sgn|sin|space|split|sqr|strcomp|string|strreverse|tan|time|timer|timeserial|timevalue|typename|ubound|ucase|unescape|vartype|weekday|weekdayname|year)$/',
+                    'builtin' => '/^((?i)debug|err|match|regexp)$/',
+                    'reserved' => '/^((?i)empty|false|nothing|null|true|and|eqv|imp|is|mod|not|or|xor|call|class|end|const|public|private|dim|do|while|until|exit|loop|erase|execute|executeglobal|for|each|in|to|step|next|function|default|if|then|else|elseif|on|error|resume|goto|option|explicit|property|get|let|set|randomize|redim|preserve|select|case|stop|sub|wend|with)$/',
+                ),
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => 
+                array (
+                ),
+                3 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+                4 => NULL,
+                5 => NULL,
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+                3 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+            ),
+            0 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+                4 => false,
+                5 => false,
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+            'constants' => 'builtin',
+            'functions' => 'builtin',
+            'builtin' => 'builtin',
+            'reserved' => 'reserved',
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
diff --git a/library/Text_Highlighter/Text/Highlighter/XML.php b/library/Text_Highlighter/Text/Highlighter/XML.php
new file mode 100644
index 000000000..2d85db5fd
--- /dev/null
+++ b/library/Text_Highlighter/Text/Highlighter/XML.php
@@ -0,0 +1,263 @@
+<?php
+/**
+ * Auto-generated class. XML syntax highlighting 
+ *
+ * PHP version 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @link       http://pear.php.net/package/Text_Highlighter
+ * @category   Text
+ * @package    Text_Highlighter
+ * @version    generated from: : xml.xml,v 1.1 2007/06/03 02:35:28 ssttoo Exp 
+ * @author Andrey Demenev <demenev@gmail.com>
+ *
+ */
+
+/**
+ * @ignore
+ */
+
+require_once 'Text/Highlighter.php';
+
+/**
+ * Auto-generated class. XML syntax highlighting
+ *
+ * @author Andrey Demenev <demenev@gmail.com>
+ * @category   Text
+ * @package    Text_Highlighter
+ * @copyright  2004-2006 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    Release: @package_version@
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+class  Text_Highlighter_XML extends Text_Highlighter
+{
+    var $_language = 'xml';
+
+    /**
+     * PHP4 Compatible Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function Text_Highlighter_XML($options=array())
+    {
+        $this->__construct($options);
+    }
+
+
+    /**
+     *  Constructor
+     *
+     * @param array  $options
+     * @access public
+     */
+    function __construct($options=array())
+    {
+
+        $this->_options = $options;
+        $this->_regs = array (
+            -1 => '/((?i)\\<\\!\\[CDATA\\[)|((?i)\\<!--)|((?i)\\<[\\?\\/]?)|((?i)(&|%)[\\w\\-\\.]+;)/',
+            0 => '//',
+            1 => '//',
+            2 => '/((?i)(?<=[\\<\\/?])[\\w\\-\\:]+)|((?i)[\\w\\-\\:]+)|((?i)")/',
+            3 => '/((?i)(&|%)[\\w\\-\\.]+;)/',
+        );
+        $this->_counts = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+                3 => 1,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 0,
+                1 => 0,
+                2 => 0,
+            ),
+            3 => 
+            array (
+                0 => 1,
+            ),
+        );
+        $this->_delim = array (
+            -1 => 
+            array (
+                0 => 'comment',
+                1 => 'comment',
+                2 => 'brackets',
+                3 => '',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => '',
+                1 => '',
+                2 => 'quotes',
+            ),
+            3 => 
+            array (
+                0 => '',
+            ),
+        );
+        $this->_inner = array (
+            -1 => 
+            array (
+                0 => 'comment',
+                1 => 'comment',
+                2 => 'code',
+                3 => 'special',
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 'reserved',
+                1 => 'var',
+                2 => 'string',
+            ),
+            3 => 
+            array (
+                0 => 'special',
+            ),
+        );
+        $this->_end = array (
+            0 => '/(?i)\\]\\]\\>/',
+            1 => '/(?i)--\\>/',
+            2 => '/(?i)[\\/\\?]?\\>/',
+            3 => '/(?i)"/',
+        );
+        $this->_states = array (
+            -1 => 
+            array (
+                0 => 0,
+                1 => 1,
+                2 => 2,
+                3 => -1,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => 3,
+            ),
+            3 => 
+            array (
+                0 => -1,
+            ),
+        );
+        $this->_keywords = array (
+            -1 => 
+            array (
+                0 => -1,
+                1 => -1,
+                2 => -1,
+                3 => 
+                array (
+                ),
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => 
+                array (
+                ),
+                1 => 
+                array (
+                ),
+                2 => -1,
+            ),
+            3 => 
+            array (
+                0 => 
+                array (
+                ),
+            ),
+        );
+        $this->_parts = array (
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => NULL,
+                1 => NULL,
+                2 => NULL,
+            ),
+            3 => 
+            array (
+                0 => NULL,
+            ),
+        );
+        $this->_subst = array (
+            -1 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+                3 => false,
+            ),
+            0 => 
+            array (
+            ),
+            1 => 
+            array (
+            ),
+            2 => 
+            array (
+                0 => false,
+                1 => false,
+                2 => false,
+            ),
+            3 => 
+            array (
+                0 => false,
+            ),
+        );
+        $this->_conditions = array (
+        );
+        $this->_kwmap = array (
+        );
+        $this->_defClass = 'code';
+        $this->_checkDefines();
+    }
+    
+}
\ No newline at end of file
diff --git a/library/Text_Highlighter/abap.xml b/library/Text_Highlighter/abap.xml
new file mode 100644
index 000000000..06d26e507
--- /dev/null
+++ b/library/Text_Highlighter/abap.xml
@@ -0,0 +1,802 @@
+<?xml version="1.0"?>
+<!-- $Id: abap.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="abap" case = "no">
+
+  <authors>
+    <author name="Stoyan Stefanov" email ="ssttoo@gmail.com"/>
+  </authors>
+
+
+  <default innerClass="code" />
+
+
+  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
+    <contains all="yes"/>
+  </region>
+
+  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
+    <contains all="yes"/>
+  </region>
+
+  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
+    <contains all="yes"/>
+  </region>
+  
+  <region name="comment" start="^\*|&quot;" end="/$/m" innerClass="comment">
+    <contains all="no"/>
+  </region>
+  
+  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'" />
+
+  <block name="identifier" match="[a-zA-Z_]\w*" innerClass="identifier" contained="yes"/>
+
+  <block name="hexinteger" match="0[xX][\da-f]+" innerClass="number" contained="yes"/>
+
+  <block name="integer" match="\d\d*|\b0\b" innerClass="number" contained="yes"/>
+
+  <block name="octinteger" match="0[0-7]+" innerClass="number" contained="yes"/>
+
+  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number" contained="yes"/>
+
+  
+  <block name="identifier" match="[a-z_\-]\w*" innerClass="identifier" case="no"/>
+
+  <keywords name="sy" inherits="identifier" innerClass="reserved">
+    <keyword match="SCREEN-NAME"/>
+    <keyword match="SCREEN-GROUP1"/>
+    <keyword match="SCREEN-GROUP2"/>
+    <keyword match="SCREEN-GROUP3"/>
+    <keyword match="SCREEN-GROUP4"/>
+    <keyword match="SCREEN-REQUIRED"/>
+    <keyword match="SCREEN-INPUT"/>
+    <keyword match="SCREEN-OUTPUT"/>
+    <keyword match="SCREEN-INTENSIFIED"/>
+    <keyword match="SCREEN-INVISIBLE"/>
+    <keyword match="SCREEN-LENGTH"/>
+    <keyword match="SCREEN-ACTIVE"/>
+    <keyword match="SY-INDEX"/>
+    <keyword match="SY-PAGNO"/>
+    <keyword match="SY-TABIX"/>
+    <keyword match="SY-TFILL"/>
+    <keyword match="SY-TLOPC"/>
+    <keyword match="SY-TMAXL"/>
+    <keyword match="SY-TOCCU"/>
+    <keyword match="SY-TTABC"/>
+    <keyword match="SY-TSTIS"/>
+    <keyword match="SY-TTABI"/>
+    <keyword match="SY-DBCNT"/>
+    <keyword match="SY-FDPOS"/>
+    <keyword match="SY-COLNO"/>
+    <keyword match="SY-LINCT"/>
+    <keyword match="SY-LINNO"/>
+    <keyword match="SY-LINSZ"/>
+    <keyword match="SY-PAGCT"/>
+    <keyword match="SY-MACOL"/>
+    <keyword match="SY-MAROW"/>
+    <keyword match="SY-TLENG"/>
+    <keyword match="SY-SFOFF"/>
+    <keyword match="SY-WILLI"/>
+    <keyword match="SY-LILLI"/>
+    <keyword match="SY-SUBRC"/>
+    <keyword match="SY-FLENG"/>
+    <keyword match="SY-CUCOL"/>
+    <keyword match="SY-CUROW"/>
+    <keyword match="SY-LSIND"/>
+    <keyword match="SY-LISTI"/>
+    <keyword match="SY-STEPL"/>
+    <keyword match="SY-TPAGI"/>
+    <keyword match="SY-WINX1"/>
+    <keyword match="SY-WINY1"/>
+    <keyword match="SY-WINX2"/>
+    <keyword match="SY-WINY2"/>
+    <keyword match="SY-WINCO"/>
+    <keyword match="SY-WINRO"/>
+    <keyword match="SY-WINDI"/>
+    <keyword match="SY-SROWS"/>
+    <keyword match="SY-SCOLS"/>
+    <keyword match="SY-LOOPC"/>
+    <keyword match="SY-FOLEN"/>
+    <keyword match="SY-FODEC"/>
+    <keyword match="SY-TZONE"/>
+    <keyword match="SY-DAYST"/>
+    <keyword match="SY-FTYPE"/>
+    <keyword match="SY-APPLI"/>
+    <keyword match="SY-FDAYW"/>
+    <keyword match="SY-CCURS"/>
+    <keyword match="SY-CCURT"/>
+    <keyword match="SY-DEBUG"/>
+    <keyword match="SY-CTYPE"/>
+    <keyword match="SY-INPUT"/>
+    <keyword match="SY-LANGU"/>
+    <keyword match="SY-MODNO"/>
+    <keyword match="SY-BATCH"/>
+    <keyword match="SY-BINPT"/>
+    <keyword match="SY-CALLD"/>
+    <keyword match="SY-DYNNR"/>
+    <keyword match="SY-DYNGR"/>
+    <keyword match="SY-NEWPA"/>
+    <keyword match="SY-PRI40"/>
+    <keyword match="SY-RSTRT"/>
+    <keyword match="SY-WTITL"/>
+    <keyword match="SY-CPAGE"/>
+    <keyword match="SY-DBNAM"/>
+    <keyword match="SY-MANDT"/>
+    <keyword match="SY-PREFX"/>
+    <keyword match="SY-FMKEY"/>
+    <keyword match="SY-PEXPI"/>
+    <keyword match="SY-PRINI"/>
+    <keyword match="SY-PRIMM"/>
+    <keyword match="SY-PRREL"/>
+    <keyword match="SY-PLAYO"/>
+    <keyword match="SY-PRBIG"/>
+    <keyword match="SY-PLAYP"/>
+    <keyword match="SY-PRNEW"/>
+    <keyword match="SY-PRLOG"/>
+    <keyword match="SY-PDEST"/>
+    <keyword match="SY-PLIST"/>
+    <keyword match="SY-PAUTH"/>
+    <keyword match="SY-PRDSN"/>
+    <keyword match="SY-PNWPA"/>
+    <keyword match="SY-CALLR"/>
+    <keyword match="SY-REPI2"/>
+    <keyword match="SY-RTITL"/>
+    <keyword match="SY-PRREC"/>
+    <keyword match="SY-PRTXT"/>
+    <keyword match="SY-PRABT"/>
+    <keyword match="SY-LPASS"/>
+    <keyword match="SY-NRPAG"/>
+    <keyword match="SY-PAART"/>
+    <keyword match="SY-PRCOP"/>
+    <keyword match="SY-BATZS"/>
+    <keyword match="SY-BSPLD"/>
+    <keyword match="SY-BREP4"/>
+    <keyword match="SY-BATZO"/>
+    <keyword match="SY-BATZD"/>
+    <keyword match="SY-BATZW"/>
+    <keyword match="SY-BATZM"/>
+    <keyword match="SY-CTABL"/>
+    <keyword match="SY-DBSYS"/>
+    <keyword match="SY-DCSYS"/>
+    <keyword match="SY-MACDB"/>
+    <keyword match="SY-SYSID"/>
+    <keyword match="SY-OPSYS"/>
+    <keyword match="SY-PFKEY"/>
+    <keyword match="SY-SAPRL"/>
+    <keyword match="SY-TCODE"/>
+    <keyword match="SY-UCOMM"/>
+    <keyword match="SY-CFWAE"/>
+    <keyword match="SY-CHWAE"/>
+    <keyword match="SY-SPONO"/>
+    <keyword match="SY-SPONR"/>
+    <keyword match="SY-WAERS"/>
+    <keyword match="SY-CDATE"/>
+    <keyword match="SY-DATUM"/>
+    <keyword match="SY-SLSET"/>
+    <keyword match="SY-SUBTY"/>
+    <keyword match="SY-SUBCS"/>
+    <keyword match="SY-GROUP"/>
+    <keyword match="SY-FFILE"/>
+    <keyword match="SY-UZEIT"/>
+    <keyword match="SY-DSNAM"/>
+    <keyword match="SY-REPID"/>
+    <keyword match="SY-TABID"/>
+    <keyword match="SY-TFDSN"/>
+    <keyword match="SY-UNAME"/>
+    <keyword match="SY-LSTAT"/>
+    <keyword match="SY-ABCDE"/>
+    <keyword match="SY-MARKY"/>
+    <keyword match="SY-SFNAM"/>
+    <keyword match="SY-TNAME"/>
+    <keyword match="SY-MSGLI"/>
+    <keyword match="SY-TITLE"/>
+    <keyword match="SY-ENTRY"/>
+    <keyword match="SY-LISEL"/>
+    <keyword match="SY-ULINE"/>
+    <keyword match="SY-XCODE"/>
+    <keyword match="SY-CPROG"/>
+    <keyword match="SY-XPROG"/>
+    <keyword match="SY-XFORM"/>
+    <keyword match="SY-LDBPG"/>
+    <keyword match="SY-TVAR0"/>
+    <keyword match="SY-TVAR1"/>
+    <keyword match="SY-TVAR2"/>
+    <keyword match="SY-TVAR3"/>
+    <keyword match="SY-TVAR4"/>
+    <keyword match="SY-TVAR5"/>
+    <keyword match="SY-TVAR6"/>
+    <keyword match="SY-TVAR7"/>
+    <keyword match="SY-TVAR8"/>
+    <keyword match="SY-TVAR9"/>
+    <keyword match="SY-MSGID"/>
+    <keyword match="SY-MSGTY"/>
+    <keyword match="SY-MSGNO"/>
+    <keyword match="SY-MSGV1"/>
+    <keyword match="SY-MSGV2"/>
+    <keyword match="SY-MSGV3"/>
+    <keyword match="SY-MSGV4"/>
+    <keyword match="SY-ONCOM"/>
+    <keyword match="SY-VLINE"/>
+    <keyword match="SY-WINSL"/>
+    <keyword match="SY-STACO"/>
+    <keyword match="SY-STARO"/>
+    <keyword match="SY-DATAR"/>
+    <keyword match="SY-HOST"/>
+    <keyword match="SY-LOCDB"/>
+    <keyword match="SY-LOCOP"/>
+    <keyword match="SY-DATLO"/>
+    <keyword match="SY-TIMLO"/>
+    <keyword match="SY-ZONLO"/>
+    <keyword match="SYST-INDEX"/>
+    <keyword match="SYST-PAGNO"/>
+    <keyword match="SYST-TABIX"/>
+    <keyword match="SYST-TFILL"/>
+    <keyword match="SYST-TLOPC"/>
+    <keyword match="SYST-TMAXL"/>
+    <keyword match="SYST-TOCCU"/>
+    <keyword match="SYST-TTABC"/>
+    <keyword match="SYST-TSTIS"/>
+    <keyword match="SYST-TTABI"/>
+    <keyword match="SYST-DBCNT"/>
+    <keyword match="SYST-FDPOS"/>
+    <keyword match="SYST-COLNO"/>
+    <keyword match="SYST-LINCT"/>
+    <keyword match="SYST-LINNO"/>
+    <keyword match="SYST-LINSZ"/>
+    <keyword match="SYST-PAGCT"/>
+    <keyword match="SYST-MACOL"/>
+    <keyword match="SYST-MAROW"/>
+    <keyword match="SYST-TLENG"/>
+    <keyword match="SYST-SFOFF"/>
+    <keyword match="SYST-WILLI"/>
+    <keyword match="SYST-LILLI"/>
+    <keyword match="SYST-SUBRC"/>
+    <keyword match="SYST-FLENG"/>
+    <keyword match="SYST-CUCOL"/>
+    <keyword match="SYST-CUROW"/>
+    <keyword match="SYST-LSIND"/>
+    <keyword match="SYST-LISTI"/>
+    <keyword match="SYST-STEPL"/>
+    <keyword match="SYST-TPAGI"/>
+    <keyword match="SYST-WINX1"/>
+    <keyword match="SYST-WINY1"/>
+    <keyword match="SYST-WINX2"/>
+    <keyword match="SYST-WINY2"/>
+    <keyword match="SYST-WINCO"/>
+    <keyword match="SYST-WINRO"/>
+    <keyword match="SYST-WINDI"/>
+    <keyword match="SYST-SROWS"/>
+    <keyword match="SYST-SCOLS"/>
+    <keyword match="SYST-LOOPC"/>
+    <keyword match="SYST-FOLEN"/>
+    <keyword match="SYST-FODEC"/>
+    <keyword match="SYST-TZONE"/>
+    <keyword match="SYST-DAYST"/>
+    <keyword match="SYST-FTYPE"/>
+    <keyword match="SYST-APPLI"/>
+    <keyword match="SYST-FDAYW"/>
+    <keyword match="SYST-CCURS"/>
+    <keyword match="SYST-CCURT"/>
+    <keyword match="SYST-DEBUG"/>
+    <keyword match="SYST-CTYPE"/>
+    <keyword match="SYST-INPUT"/>
+    <keyword match="SYST-LANGU"/>
+    <keyword match="SYST-MODNO"/>
+    <keyword match="SYST-BATCH"/>
+    <keyword match="SYST-BINPT"/>
+    <keyword match="SYST-CALLD"/>
+    <keyword match="SYST-DYNNR"/>
+    <keyword match="SYST-DYNGR"/>
+    <keyword match="SYST-NEWPA"/>
+    <keyword match="SYST-PRI40"/>
+    <keyword match="SYST-RSTRT"/>
+    <keyword match="SYST-WTITL"/>
+    <keyword match="SYST-CPAGE"/>
+    <keyword match="SYST-DBNAM"/>
+    <keyword match="SYST-MANDT"/>
+    <keyword match="SYST-PREFX"/>
+    <keyword match="SYST-FMKEY"/>
+    <keyword match="SYST-PEXPI"/>
+    <keyword match="SYST-PRINI"/>
+    <keyword match="SYST-PRIMM"/>
+    <keyword match="SYST-PRREL"/>
+    <keyword match="SYST-PLAYO"/>
+    <keyword match="SYST-PRBIG"/>
+    <keyword match="SYST-PLAYP"/>
+    <keyword match="SYST-PRNEW"/>
+    <keyword match="SYST-PRLOG"/>
+    <keyword match="SYST-PDEST"/>
+    <keyword match="SYST-PLIST"/>
+    <keyword match="SYST-PAUTH"/>
+    <keyword match="SYST-PRDSN"/>
+    <keyword match="SYST-PNWPA"/>
+    <keyword match="SYST-CALLR"/>
+    <keyword match="SYST-REPI2"/>
+    <keyword match="SYST-RTITL"/>
+    <keyword match="SYST-PRREC"/>
+    <keyword match="SYST-PRTXT"/>
+    <keyword match="SYST-PRABT"/>
+    <keyword match="SYST-LPASS"/>
+    <keyword match="SYST-NRPAG"/>
+    <keyword match="SYST-PAART"/>
+    <keyword match="SYST-PRCOP"/>
+    <keyword match="SYST-BATZS"/>
+    <keyword match="SYST-BSPLD"/>
+    <keyword match="SYST-BREP4"/>
+    <keyword match="SYST-BATZO"/>
+    <keyword match="SYST-BATZD"/>
+    <keyword match="SYST-BATZW"/>
+    <keyword match="SYST-BATZM"/>
+    <keyword match="SYST-CTABL"/>
+    <keyword match="SYST-DBSYS"/>
+    <keyword match="SYST-DCSYS"/>
+    <keyword match="SYST-MACDB"/>
+    <keyword match="SYST-SYSID"/>
+    <keyword match="SYST-OPSYS"/>
+    <keyword match="SYST-PFKEY"/>
+    <keyword match="SYST-SAPRL"/>
+    <keyword match="SYST-TCODE"/>
+    <keyword match="SYST-UCOMM"/>
+    <keyword match="SYST-CFWAE"/>
+    <keyword match="SYST-CHWAE"/>
+    <keyword match="SYST-SPONO"/>
+    <keyword match="SYST-SPONR"/>
+    <keyword match="SYST-WAERS"/>
+    <keyword match="SYST-CDATE"/>
+    <keyword match="SYST-DATUM"/>
+    <keyword match="SYST-SLSET"/>
+    <keyword match="SYST-SUBTY"/>
+    <keyword match="SYST-SUBCS"/>
+    <keyword match="SYST-GROUP"/>
+    <keyword match="SYST-FFILE"/>
+    <keyword match="SYST-UZEIT"/>
+    <keyword match="SYST-DSNAM"/>
+    <keyword match="SYST-REPID"/>
+    <keyword match="SYST-TABID"/>
+    <keyword match="SYST-TFDSN"/>
+    <keyword match="SYST-UNAME"/>
+    <keyword match="SYST-LSTAT"/>
+    <keyword match="SYST-ABCDE"/>
+    <keyword match="SYST-MARKY"/>
+    <keyword match="SYST-SFNAM"/>
+    <keyword match="SYST-TNAME"/>
+    <keyword match="SYST-MSGLI"/>
+    <keyword match="SYST-TITLE"/>
+    <keyword match="SYST-ENTRY"/>
+    <keyword match="SYST-LISEL"/>
+    <keyword match="SYST-ULINE"/>
+    <keyword match="SYST-XCODE"/>
+    <keyword match="SYST-CPROG"/>
+    <keyword match="SYST-XPROG"/>
+    <keyword match="SYST-XFORM"/>
+    <keyword match="SYST-LDBPG"/>
+    <keyword match="SYST-TVAR0"/>
+    <keyword match="SYST-TVAR1"/>
+    <keyword match="SYST-TVAR2"/>
+    <keyword match="SYST-TVAR3"/>
+    <keyword match="SYST-TVAR4"/>
+    <keyword match="SYST-TVAR5"/>
+    <keyword match="SYST-TVAR6"/>
+    <keyword match="SYST-TVAR7"/>
+    <keyword match="SYST-TVAR8"/>
+    <keyword match="SYST-TVAR9"/>
+    <keyword match="SYST-MSGID"/>
+    <keyword match="SYST-MSGTY"/>
+    <keyword match="SYST-MSGNO"/>
+    <keyword match="SYST-MSGV1"/>
+    <keyword match="SYST-MSGV2"/>
+    <keyword match="SYST-MSGV3"/>
+    <keyword match="SYST-MSGV4"/>
+    <keyword match="SYST-ONCOM"/>
+    <keyword match="SYST-VLINE"/>
+    <keyword match="SYST-WINSL"/>
+    <keyword match="SYST-STACO"/>
+    <keyword match="SYST-STARO"/>
+    <keyword match="SYST-DATAR"/>
+    <keyword match="SYST-HOST"/>
+    <keyword match="SYST-LOCDB"/>
+    <keyword match="SYST-LOCOP"/>
+    <keyword match="SYST-DATLO"/>
+    <keyword match="SYST-TIMLO"/>
+    <keyword match="SYST-ZONLO"/>
+  </keywords> 
+
+
+  <keywords name="reserved" inherits="identifier" innerClass="reserved">
+    <keyword match="ABS"/>
+    <keyword match="ACOS"/>
+    <keyword match="ADD"/>
+    <keyword match="ADD-CORRESPONDING"/>
+    <keyword match="ADJACENT"/>
+    <keyword match="AFTER"/>
+    <keyword match="ALIASES"/>
+    <keyword match="ALL"/>
+    <keyword match="ANALYZER"/>
+    <keyword match="AND"/>
+    <keyword match="ANY"/>
+    <keyword match="APPEND"/>
+    <keyword match="AS"/>
+    <keyword match="ASCENDING"/>
+    <keyword match="ASIN"/>
+    <keyword match="ASSIGN"/>
+    <keyword match="ASSIGNED"/>
+    <keyword match="ASSIGNING"/>
+    <keyword match="AT"/>
+    <keyword match="ATAN"/>
+    <keyword match="AUTHORITY-CHECK"/>
+    <keyword match="AVG"/>
+    <keyword match="BACK"/>
+    <keyword match="BEFORE"/>
+    <keyword match="BEGIN"/>
+    <keyword match="BINARY"/>
+    <keyword match="BIT"/>
+    <keyword match="BIT-AND"/>
+    <keyword match="BIT-NOT"/>
+    <keyword match="BIT-OR"/>
+    <keyword match="BIT-XOR"/>
+    <keyword match="BLANK"/>
+    <keyword match="BLOCK"/>
+    <keyword match="BREAK-POINT"/>
+    <keyword match="BUFFER"/>
+    <keyword match="BY"/>
+    <keyword match="C"/>
+    <keyword match="CALL"/>
+    <keyword match="CASE"/>
+    <keyword match="CATCH"/>
+    <keyword match="CEIL"/>
+    <keyword match="CENTERED"/>
+    <keyword match="CHAIN"/>
+    <keyword match="CHANGE"/>
+    <keyword match="CHANGING"/>
+    <keyword match="CHECK"/>
+    <keyword match="CHECKBOX"/>
+    <keyword match="CLASS"/>
+    <keyword match="CLASS-DATA"/>
+    <keyword match="CLASS-EVENTS"/>
+    <keyword match="CLASS-METHODS"/>
+    <keyword match="CLASS-POOL"/>
+    <keyword match="CLEAR"/>
+    <keyword match="CLIENT"/>
+    <keyword match="CLOSE"/>
+    <keyword match="CNT"/>
+    <keyword match="CODE"/>
+    <keyword match="COLLECT"/>
+    <keyword match="COLOR"/>
+    <keyword match="COMMENT"/>
+    <keyword match="COMMIT"/>
+    <keyword match="COMMUNICATION"/>
+    <keyword match="COMPUTE"/>
+    <keyword match="CONCATENATE"/>
+    <keyword match="CONDENSE"/>
+    <keyword match="CONSTANTS"/>
+    <keyword match="CONTEXT"/>
+    <keyword match="CONTEXTS"/>
+    <keyword match="CONTINUE"/>
+    <keyword match="CONTROL"/>
+    <keyword match="CONTROLS"/>
+    <keyword match="CONVERT"/>
+    <keyword match="COPY"/>
+    <keyword match="CORRESPONDING"/>
+    <keyword match="COS"/>
+    <keyword match="COSH"/>
+    <keyword match="COUNT"/>
+    <keyword match="COUNTRY"/>
+    <keyword match="CREATE"/>
+    <keyword match="CURRENCY"/>
+    <keyword match="CURSOR"/>
+    <keyword match="CUSTOMER-FUNCTION"/>
+    <keyword match="DATA"/>
+    <keyword match="DATABASE"/>
+    <keyword match="DATASET"/>
+    <keyword match="DELETE"/>
+    <keyword match="DECIMALS"/>
+    <keyword match="DEFAULT"/>
+    <keyword match="DEFINE"/>
+    <keyword match="DELETE"/>
+    <keyword match="DEMAND"/>
+    <keyword match="DESCENDING"/>
+    <keyword match="DESCRIBE"/>
+    <keyword match="DIALOG"/>
+    <keyword match="DISTINCT"/>
+    <keyword match="DIV"/>
+    <keyword match="DIVIDE"/>
+    <keyword match="DIVIDE-CORRESPONDING"/>
+    <keyword match="DO"/>
+    <keyword match="DUPLICATES"/>
+    <keyword match="DYNPRO"/>
+    <keyword match="EDIT"/>
+    <keyword match="EDITOR-CALL"/>
+    <keyword match="ELSE"/>
+    <keyword match="ELSEIF"/>
+    <keyword match="END"/>
+    <keyword match="END-OF-DEFINITION"/>
+    <keyword match="END-OF-PAGE"/>
+    <keyword match="END-OF-SELECTION"/>
+    <keyword match="ENDAT"/>
+    <keyword match="ENDCASE"/>
+    <keyword match="ENDCATCH"/>
+    <keyword match="ENDCHAIN"/>
+    <keyword match="ENDCLASS"/>
+    <keyword match="ENDDO"/>
+    <keyword match="ENDEXEC"/>
+    <keyword match="ENDFORM"/>
+    <keyword match="ENDFUNCTION"/>
+    <keyword match="ENDIF"/>
+    <keyword match="ENDINTERFACE"/>
+    <keyword match="ENDLOOP"/>
+    <keyword match="ENDMETHOD"/>
+    <keyword match="ENDMODULE"/>
+    <keyword match="ENDON"/>
+    <keyword match="ENDPROVIDE"/>
+    <keyword match="ENDSELECT"/>
+    <keyword match="ENDWHILE"/>
+    <keyword match="ENTRIES"/>
+    <keyword match="EVENTS"/>
+    <keyword match="EXEC"/>
+    <keyword match="EXIT"/>
+    <keyword match="EXIT-COMMAND"/>
+    <keyword match="EXP"/>
+    <keyword match="EXPONENT"/>
+    <keyword match="EXPORT"/>
+    <keyword match="EXPORTING"/>
+    <keyword match="EXCEPTIONS"/>
+    <keyword match="EXTENDED"/>
+    <keyword match="EXTRACT"/>
+    <keyword match="FETCH"/>
+    <keyword match="FIELD"/>
+    <keyword match="FIELD-GROUPS"/>
+    <keyword match="FIELD-SYMBOLS"/>
+    <keyword match="FIELDS"/>
+    <keyword match="FLOOR"/>
+    <keyword match="FOR"/>
+    <keyword match="FORM"/>
+    <keyword match="FORMAT"/>
+    <keyword match="FRAC"/>
+    <keyword match="FRAME"/>
+    <keyword match="FREE"/>
+    <keyword match="FROM"/>
+    <keyword match="FUNCTION"/>
+    <keyword match="FUNCTION-POOL"/>
+    <keyword match="GENERATE"/>
+    <keyword match="GET"/>
+    <keyword match="GROUP"/>
+    <keyword match="HASHED"/>
+    <keyword match="HEADER"/>
+    <keyword match="HELP-ID"/>
+    <keyword match="HELP-REQUEST"/>
+    <keyword match="HIDE"/>
+    <keyword match="HOTSPOT"/>
+    <keyword match="ICON"/>
+    <keyword match="ID"/>
+    <keyword match="IF"/>
+    <keyword match="IMPORT"/>
+    <keyword match="IMPORTING"/>
+    <keyword match="INCLUDE"/>
+    <keyword match="INDEX"/>
+    <keyword match="INFOTYPES"/>
+    <keyword match="INITIALIZATION"/>
+    <keyword match="INNER"/>
+    <keyword match="INPUT"/>
+    <keyword match="INSERT"/>
+    <keyword match="INTENSIFIED"/>
+    <keyword match="INTERFACE"/>
+    <keyword match="INTERFACE-POOL"/>
+    <keyword match="INTERFACES"/>
+    <keyword match="INTO"/>
+    <keyword match="INVERSE"/>
+    <keyword match="JOIN"/>
+    <keyword match="KEY"/>
+    <keyword match="LANGUAGE"/>
+    <keyword match="LAST"/>
+    <keyword match="LEAVE"/>
+    <keyword match="LEFT"/>
+    <keyword match="LEFT-JUSTIFIED"/>
+    <keyword match="LIKE"/>
+    <keyword match="LINE"/>
+    <keyword match="LINE-COUNT"/>
+    <keyword match="LINE-SELECTION"/>
+    <keyword match="LINE-SIZE"/>
+    <keyword match="LINES"/>
+    <keyword match="LIST-PROCESSING"/>
+    <keyword match="LOAD"/>
+    <keyword match="LOAD-OF-PROGRAM"/>
+    <keyword match="LOCAL"/>
+    <keyword match="LOCALE"/>
+    <keyword match="LOG"/>
+    <keyword match="LOG10"/>
+    <keyword match="LOOP"/>
+    <keyword match="M"/>
+    <keyword match="MARGIN"/>
+    <keyword match="MASK"/>
+    <keyword match="MATCHCODE"/>
+    <keyword match="MAX"/>
+    <keyword match="MEMORY"/>
+    <keyword match="MESSAGE"/>
+    <keyword match="MESSAGE-ID"/>
+    <keyword match="MESSAGES"/>
+    <keyword match="METHOD"/>
+    <keyword match="METHODS"/>
+    <keyword match="MIN"/>
+    <keyword match="MOD"/>
+    <keyword match="MODE"/>
+    <keyword match="MODIF"/>
+    <keyword match="MODIFY"/>
+    <keyword match="MODULE"/>
+    <keyword match="MOVE"/>
+    <keyword match="MOVE-CORRESPONDING"/>
+    <keyword match="MULTIPLY"/>
+    <keyword match="MULTIPLY-CORRESPONDING"/>
+    <keyword match="NEW"/>
+    <keyword match="NEW-LINE"/>
+    <keyword match="NEW-PAGE"/>
+    <keyword match="NEXT"/>
+    <keyword match="NO"/>
+    <keyword match="NO-GAP"/>
+    <keyword match="NO-GAPS"/>
+    <keyword match="NO-HEADING"/>
+    <keyword match="NO-SCROLLING"/>
+    <keyword match="NO-SIGN"/>
+    <keyword match="NO-TITLE"/>
+    <keyword match="NO-ZERO"/>
+    <keyword match="NODES"/>
+    <keyword match="NON-UNIQUE"/>
+    <keyword match="O"/>
+    <keyword match="OBJECT"/>
+    <keyword match="OBLIGATORY"/>
+    <keyword match="OCCURS"/>
+    <keyword match="OF"/>
+    <keyword match="OFF"/>
+    <keyword match="ON"/>
+    <keyword match="OPEN"/>
+    <keyword match="OR"/>
+    <keyword match="ORDER"/>
+    <keyword match="OTHERS"/>
+    <keyword match="OUTER"/>
+    <keyword match="OUTPUT"/>
+    <keyword match="OVERLAY"/>
+    <keyword match="PACK"/>
+    <keyword match="PAGE"/>
+    <keyword match="PARAMETER"/>
+    <keyword match="PARAMETERS"/>
+    <keyword match="PERFORM"/>
+    <keyword match="PF-STATUS"/>
+    <keyword match="POSITION"/>
+    <keyword match="PRINT"/>
+    <keyword match="PRINT-CONTROL"/>
+    <keyword match="PRIVATE"/>
+    <keyword match="PROCESS"/>
+    <keyword match="PROGRAM"/>
+    <keyword match="PROPERTY"/>
+    <keyword match="PROTECTED"/>
+    <keyword match="PROVIDE"/>
+    <keyword match="PUBLIC"/>
+    <keyword match="PUT"/>
+    <keyword match="RADIOBUTTON"/>
+    <keyword match="RAISE"/>
+    <keyword match="RAISING"/>
+    <keyword match="RANGE"/>
+    <keyword match="RANGES"/>
+    <keyword match="READ"/>
+    <keyword match="RECEIVE"/>
+    <keyword match="REFRESH"/>
+    <keyword match="REJECT"/>
+    <keyword match="REPLACE"/>
+    <keyword match="REPORT"/>
+    <keyword match="REQUESTED"/>
+    <keyword match="RESERVE"/>
+    <keyword match="RESET"/>
+    <keyword match="RIGHT-JUSTIFIED"/>
+    <keyword match="ROLLBACK"/>
+    <keyword match="ROUND"/>
+    <keyword match="ROWS"/>
+    <keyword match="RTTI"/>
+    <keyword match="RUN"/>
+    <keyword match="SCAN"/>
+    <keyword match="SCREEN"/>
+    <keyword match="SEARCH"/>
+    <keyword match="SEPARATED"/>
+    <keyword match="SCROLL"/>
+    <keyword match="SCROLL-BOUNDARY"/>
+    <keyword match="SEARCH"/>
+    <keyword match="SELECT"/>
+    <keyword match="SELECT-OPTIONS"/>
+    <keyword match="SELECTION-SCREEN"/>
+    <keyword match="SELECTION-TABLE"/>
+    <keyword match="SET"/>
+    <keyword match="SHARED"/>
+    <keyword match="SHIFT"/>
+    <keyword match="SIGN"/>
+    <keyword match="SIN"/>
+    <keyword match="SINGLE"/>
+    <keyword match="SINH"/>
+    <keyword match="SIZE"/>
+    <keyword match="SKIP"/>
+    <keyword match="SORT"/>
+    <keyword match="SORTED"/>
+    <keyword match="SPLIT"/>
+    <keyword match="SQL"/>
+    <keyword match="SQRT"/>
+    <keyword match="STAMP"/>
+    <keyword match="STANDARD"/>
+    <keyword match="START-OF-SELECTION"/>
+    <keyword match="STATICS"/>
+    <keyword match="STOP"/>
+    <keyword match="STRING"/>
+    <keyword match="STRLEN"/>
+    <keyword match="STRUCTURE"/>
+    <keyword match="SUBMIT"/>
+    <keyword match="SUBTRACT"/>
+    <keyword match="SUBTRACT-CORRESPONDING"/>
+    <keyword match="SUM"/>
+    <keyword match="SUPPLY"/>
+    <keyword match="SUPPRESS"/>
+    <keyword match="SYMBOL"/>
+    <keyword match="SYNTAX-CHECK"/>
+    <keyword match="SYNTAX-TRACE"/>
+    <keyword match="SYSTEM-CALL"/>
+    <keyword match="SYSTEM-EXCEPTIONS"/>
+    <keyword match="TABLE"/>
+    <keyword match="TABLE_LINE"/>
+    <keyword match="TABLES"/>
+    <keyword match="TAN"/>
+    <keyword match="TANH"/>
+    <keyword match="TEXT"/>
+    <keyword match="TEXTPOOL"/>
+    <keyword match="TIME"/>
+    <keyword match="TIMES"/>
+    <keyword match="TITLE"/>
+    <keyword match="TITLEBAR"/>
+    <keyword match="TO"/>
+    <keyword match="TOP-OF-PAGE"/>
+    <keyword match="TRANSACTION"/>
+    <keyword match="TRANSFER"/>
+    <keyword match="TRANSLATE"/>
+    <keyword match="TRANSPORTING"/>
+    <keyword match="TRUNC"/>
+    <keyword match="TYPE"/>
+    <keyword match="TYPE-POOL"/>
+    <keyword match="TYPE-POOLS"/>
+    <keyword match="TYPES"/>
+    <keyword match="ULINE"/>
+    <keyword match="UNDER"/>
+    <keyword match="UNIQUE"/>
+    <keyword match="UNIT"/>
+    <keyword match="UNPACK"/>
+    <keyword match="UP"/>
+    <keyword match="UPDATE"/>
+    <keyword match="USER-COMMAND"/>
+    <keyword match="USING"/>
+    <keyword match="VALUE"/>
+    <keyword match="VALUE-REQUEST"/>
+    <keyword match="VALUES"/>
+    <keyword match="VARY"/>
+    <keyword match="WHEN"/>
+    <keyword match="WHERE"/>
+    <keyword match="WHILE"/>
+    <keyword match="WINDOW"/>
+    <keyword match="WITH"/>
+    <keyword match="WITH-TITLE"/>
+    <keyword match="WORK"/>
+    <keyword match="WRITE"/>
+    <keyword match="X"/>
+    <keyword match="XSTRING"/>
+    <keyword match="Z"/>
+    <keyword match="ZONE"/>
+  </keywords> 
+  
+  
+  <keywords name="constants" inherits="identifier" innerClass="reserved">
+    <keyword match="INITIAL"/>
+    <keyword match="NULL"/>
+    <keyword match="SPACE"/>
+    <keyword match="COL_BACKGROUND"/>
+    <keyword match="COL_HEADING"/>
+    <keyword match="COL_NORMAL"/>
+    <keyword match="COL_TOTAL"/>
+    <keyword match="COL_KEY"/>
+    <keyword match="COL_POSITIVE"/>
+    <keyword match="COL_NEGATIVE"/>
+    <keyword match="COL_GROUP"/>
+  </keywords>
+  
+</highlight>
diff --git a/library/Text_Highlighter/avrc.xml b/library/Text_Highlighter/avrc.xml
new file mode 100644
index 000000000..dec571e13
--- /dev/null
+++ b/library/Text_Highlighter/avrc.xml
@@ -0,0 +1,316 @@
+<?xml version="1.0"?>
+<!-- $Id: avrc.xml,v 1.1 2008-07-31 23:05:38 ssttoo Exp $ -->
+
+<highlight lang="AVRC" case="no">
+
+	<authors>
+        <author name="Andrey Demenev" email="demenev@gmail.com"/>
+	</authors>
+
+	<comment>
+		C/C++ highlighter specific to Atmel AVR microcontrollers
+    </comment>
+
+	<default innerClass="code" />
+
+	<block name="escaped" match="\\" innerClass="special" contained="yes">
+		<onlyin region="strdouble"/>
+	</block>
+
+    <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;"/>
+
+	<region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
+		<contains all="yes"/>
+	</region>
+
+	<region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
+		<contains all="yes"/>
+	</region>
+
+	<region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
+		<contains all="yes"/>
+	</region>
+
+	<block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
+
+  <block name="hexinteger" match="\b0[xX][\da-f]+" innerClass="number"/>
+  <block name="integer" match="\b\d\d*|\b0\b" innerClass="number"/>
+  <block name="octinteger" match="\b0[0-7]+" innerClass="number"/>
+  <block name="float" match="\b(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
+
+
+  <region name="strincl" delimClass="quotes" innerClass="string" start="&lt;" end="&gt;">
+      <onlyin region="include" />
+  </region>
+
+  <!-- <block name="preprocessor" match="^#[azAZ_]\w*" innerClass="prepro"/> -->
+    <region name="include" innerClass="prepro" start="/^[ \t]*#include/m" end="/(?&lt;!\\)$/m">
+		<contains region="strdouble"/>
+		<contains region="strincl"/>
+	</region>
+
+    <region name="preprocessor" delimClass="prepro"  innerClass="code" start="/^[ \t]*#[ \t]*[a-z]+/mi" end="/(?&lt;!\\)$/m">
+        <contains region="comment"/>
+        <contains region="mlcomment"/>
+		<contains region="strdouble"/>
+        <contains region="brackets"/>
+        <contains region="block"/>
+        <contains block="identifier"/>
+        <contains block="integer"/>
+        <contains block="hexinteger"/>
+        <contains block="octinteger"/>
+        <contains block="float"/>
+
+	</region>
+
+	<block name="number" match="\d*\.?\d+" innerClass="number"/>
+
+
+	<region name="mlcomment" innerClass="mlcomment" start="\/\*" end="\*\/" >
+		<contains block="cvstag"/>
+	</region>
+
+	<block name="cvstag" match="\$\w+\s*:.+\$" innerClass="inlinedoc">
+
+		<onlyin region="mlcomment"/>
+		<onlyin region="comment"/>
+	</block>
+
+	<region name="comment" start="\/\/.+" end="/$/m" innerClass="comment" delimClass="comment">
+		<contains block="cvstag"/>
+    </region>
+
+    <keywords name="reserved" inherits="identifier" innerClass="reserved" case="yes">
+		<keyword match="and" />
+		<keyword match="and_eq" />
+		<keyword match="asm" />
+
+		<keyword match="bitand" />
+		<keyword match="bitor" />
+		<keyword match="break" />
+		<keyword match="case" />
+		<keyword match="catch" />
+		<keyword match="compl" />
+
+		<keyword match="const_cast" />
+		<keyword match="continue" />
+		<keyword match="default" />
+		<keyword match="delete" />
+		<keyword match="do" />
+		<keyword match="dynamic_cast" />
+
+		<keyword match="else" />
+		<keyword match="for" />
+		<keyword match="fortran" />
+		<keyword match="friend" />
+		<keyword match="goto" />
+		<keyword match="if" />
+
+		<keyword match="new" />
+		<keyword match="not" />
+		<keyword match="not_eq" />
+		<keyword match="operator" />
+		<keyword match="or" />
+		<keyword match="or_eq" />
+
+		<keyword match="private" />
+		<keyword match="protected" />
+		<keyword match="public" />
+		<keyword match="reinterpret_cast" />
+		<keyword match="return" />
+		<keyword match="sizeof" />
+
+		<keyword match="static_cast" />
+		<keyword match="switch" />
+		<keyword match="this" />
+		<keyword match="throw" />
+		<keyword match="try" />
+		<keyword match="typeid" />
+
+		<keyword match="using" />
+		<keyword match="while" />
+		<keyword match="xor" />
+		<keyword match="xor_eq" />
+
+        <keyword match="false" />
+		<keyword match="true" />
+	</keywords>
+
+	<keywords name="registers" inherits="identifier" innerClass="reserved" case="yes">
+		<keyword match="ACSR" />
+		<keyword match="ADCH" />
+		<keyword match="ADCL" />
+		<keyword match="ADCSRA" />
+		<keyword match="ADMUX" />
+		<keyword match="ASSR" />
+		<keyword match="DDRA" />
+		<keyword match="DDRB" />
+		<keyword match="DDRC" />
+		<keyword match="DDRD" />
+		<keyword match="DDRE" />
+		<keyword match="DDRF" />
+		<keyword match="DDRG" />
+		<keyword match="EEARH" />
+		<keyword match="EEARL" />
+		<keyword match="EECR" />
+		<keyword match="EEDR" />
+		<keyword match="EICRA" />
+		<keyword match="EICRB" />
+		<keyword match="EIFR" />
+		<keyword match="EIMSK" />
+		<keyword match="ETIFR" />
+		<keyword match="ETIMSK" />
+		<keyword match="GICR" />
+		<keyword match="GIFR" />
+		<keyword match="ICR1H" />
+		<keyword match="ICR1L" />
+		<keyword match="ICR3H" />
+		<keyword match="ICR3L" />
+		<keyword match="MCUCR" />
+		<keyword match="MCUCSR" />
+		<keyword match="OCDR" />
+		<keyword match="OCR0" />
+		<keyword match="OCR1AH" />
+		<keyword match="OCR1AL" />
+		<keyword match="OCR1BH" />
+		<keyword match="OCR1BL" />
+		<keyword match="OCR1CH" />
+		<keyword match="OCR1CL" />
+		<keyword match="OCR2" />
+		<keyword match="OCR3AH" />
+		<keyword match="OCR3AL" />
+		<keyword match="OCR3BH" />
+		<keyword match="OCR3BL" />
+		<keyword match="OCR3CH" />
+		<keyword match="OCR3CL" />
+		<keyword match="OSCCAL" />
+		<keyword match="PINA" />
+		<keyword match="PINB" />
+		<keyword match="PINC" />
+		<keyword match="PIND" />
+		<keyword match="PINE" />
+		<keyword match="PINF" />
+		<keyword match="PING" />
+		<keyword match="PORTA" />
+		<keyword match="PORTB" />
+		<keyword match="PORTC" />
+		<keyword match="PORTD" />
+		<keyword match="PORTE" />
+		<keyword match="PORTF" />
+		<keyword match="PORTG" />
+		<keyword match="RAMPZ" />
+		<keyword match="SFIOR" />
+		<keyword match="SPCR" />
+		<keyword match="SPDR" />
+		<keyword match="SPH" />
+		<keyword match="SPL" />
+		<keyword match="SPMCR" />
+		<keyword match="SPMCSR" />
+		<keyword match="SPSR" />
+		<keyword match="SREG" />
+		<keyword match="TCCR0" />
+		<keyword match="TCCR1A" />
+		<keyword match="TCCR1B" />
+		<keyword match="TCCR1C" />
+		<keyword match="TCCR2" />
+		<keyword match="TCCR3A" />
+		<keyword match="TCCR3B" />
+		<keyword match="TCCR3C" />
+		<keyword match="TCNT0" />
+		<keyword match="TCNT1H" />
+		<keyword match="TCNT1L" />
+		<keyword match="TCNT2" />
+		<keyword match="TCNT3H" />
+		<keyword match="TCNT3L" />
+		<keyword match="TIFR" />
+		<keyword match="TIMSK" />
+		<keyword match="TWAR" />
+		<keyword match="TWBR" />
+		<keyword match="TWCR" />
+		<keyword match="TWDR" />
+		<keyword match="TWSR" />
+		<keyword match="UBRR0H" />
+		<keyword match="UBRR0L" />
+		<keyword match="UBRR1H" />
+		<keyword match="UBRR1L" />
+		<keyword match="UBRRH" />
+		<keyword match="UBRRL" />
+		<keyword match="UCSR0A" />
+		<keyword match="UCSR0B" />
+		<keyword match="UCSR0C" />
+		<keyword match="UCSR1A" />
+		<keyword match="UCSR1B" />
+		<keyword match="UCSR1C" />
+		<keyword match="UCSRA" />
+		<keyword match="UCSRB" />
+		<keyword match="UCSRC" />
+		<keyword match="UDR" />
+		<keyword match="UDR0" />
+		<keyword match="UDR1" />
+		<keyword match="WDTCR" />
+		<keyword match="XDIV" />
+		<keyword match="XMCRA" />
+		<keyword match="XMCRB" />
+	</keywords>
+
+	<keywords name="types" inherits="identifier" innerClass="types" case="yes">
+
+		<keyword match="auto" />
+		<keyword match="bool" />
+		<keyword match="char" />
+		<keyword match="class" />
+		<keyword match="const" />
+		<keyword match="double" />
+
+		<keyword match="enum" />
+		<keyword match="explicit" />
+		<keyword match="export" />
+		<keyword match="extern" />
+		<keyword match="float" />
+		<keyword match="inline" />
+
+		<keyword match="int" />
+		<keyword match="long" />
+		<keyword match="mutable" />
+		<keyword match="namespace" />
+		<keyword match="register" />
+		<keyword match="short" />
+
+		<keyword match="signed" />
+		<keyword match="static" />
+		<keyword match="struct" />
+		<keyword match="template" />
+		<keyword match="typedef" />
+		<keyword match="typename" />
+
+		<keyword match="union" />
+		<keyword match="unsigned" />
+		<keyword match="virtual" />
+		<keyword match="void" />
+		<keyword match="volatile" />
+		<keyword match="wchar_t" />
+
+	</keywords>
+
+	<keywords name="Common Macros" inherits="identifier" innerClass="prepro" case="yes">
+		<keyword match="NULL" />
+		<keyword match="TRUE" />
+		<keyword match="FALSE" />
+		<keyword match="MAX" />
+
+		<keyword match="MIN" />
+		<keyword match="__LINE__" />
+		<keyword match="__DATA__" />
+		<keyword match="__FILE__" />
+		<keyword match="__TIME__" />
+		<keyword match="__STDC__" />
+
+	</keywords>
+
+
+	<!--
+	<keywords name="reserved" inherits="identifier" innerClass="reserved" case="yes">
+	-->
+
+</highlight>
+
diff --git a/library/Text_Highlighter/cpp.xml b/library/Text_Highlighter/cpp.xml
new file mode 100644
index 000000000..2cbaa930f
--- /dev/null
+++ b/library/Text_Highlighter/cpp.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0"?>
+<!-- $Id: cpp.xml,v 1.2 2008-07-31 23:06:30 ssttoo Exp $ -->
+
+<highlight lang="CPP" case="no">
+
+	<authors>
+		<author name="Aaron Kalin"/>
+        <author name="Andrey Demenev" email="demenev@gmail.com"/>
+	</authors>
+
+    <comment>
+Thanks to Aaron Kalin for initial
+implementation of this highlighter
+    </comment>
+
+	<default innerClass="code" />
+
+	<block name="escaped" match="\\" innerClass="special" contained="yes">
+		<onlyin region="strdouble"/>
+	</block>
+
+    <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;"/>
+
+	<region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
+		<contains all="yes"/>
+	</region>
+
+	<region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
+		<contains all="yes"/>
+	</region>
+
+	<region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
+		<contains all="yes"/>
+	</region>
+
+	<block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
+
+  <block name="hexinteger" match="\b0[xX][\da-f]+" innerClass="number"/>
+  <block name="integer" match="\b\d\d*|\b0\b" innerClass="number"/>
+  <block name="octinteger" match="\b0[0-7]+" innerClass="number"/>
+  <block name="float" match="\b(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
+
+
+  <region name="strincl" delimClass="quotes" innerClass="string" start="&lt;" end="&gt;">
+      <onlyin region="include" />
+  </region>
+
+  <!-- <block name="preprocessor" match="^#[azAZ_]\w*" innerClass="prepro"/> -->
+    <region name="include" innerClass="prepro" start="/^[ \t]*#include/m" end="/(?&lt;!\\)$/m">
+		<contains region="strdouble"/>
+		<contains region="strincl"/>
+	</region>
+
+    <region name="preprocessor" delimClass="prepro"  innerClass="code" start="/^[ \t]*#[ \t]*[a-z]+/mi" end="/(?&lt;!\\)$/m">
+        <contains region="comment"/>
+        <contains region="mlcomment"/>
+		<contains region="strdouble"/>
+        <contains region="brackets"/>
+        <contains region="block"/>
+        <contains block="identifier"/>
+        <contains block="integer"/>
+        <contains block="hexinteger"/>
+        <contains block="octinteger"/>
+        <contains block="float"/>
+
+	</region>
+
+	<block name="number" match="\d*\.?\d+" innerClass="number"/>
+
+
+	<region name="mlcomment" innerClass="mlcomment" start="\/\*" end="\*\/" >
+		<contains block="cvstag"/>
+	</region>
+
+	<block name="cvstag" match="\$\w+\s*:.+\$" innerClass="inlinedoc">
+
+		<onlyin region="mlcomment"/>
+		<onlyin region="comment"/>
+	</block>
+
+	<region name="comment" start="\/\/.+" end="/$/m" innerClass="comment" delimClass="comment">
+		<contains block="cvstag"/>
+    </region>
+
+    <keywords name="reserved" inherits="identifier" innerClass="reserved" case="yes">
+		<keyword match="and" />
+		<keyword match="and_eq" />
+		<keyword match="asm" />
+
+		<keyword match="bitand" />
+		<keyword match="bitor" />
+		<keyword match="break" />
+		<keyword match="case" />
+		<keyword match="catch" />
+		<keyword match="compl" />
+
+		<keyword match="const_cast" />
+		<keyword match="continue" />
+		<keyword match="default" />
+		<keyword match="delete" />
+		<keyword match="do" />
+		<keyword match="dynamic_cast" />
+
+		<keyword match="else" />
+		<keyword match="for" />
+		<keyword match="fortran" />
+		<keyword match="friend" />
+		<keyword match="goto" />
+		<keyword match="if" />
+
+		<keyword match="new" />
+		<keyword match="not" />
+		<keyword match="not_eq" />
+		<keyword match="operator" />
+		<keyword match="or" />
+		<keyword match="or_eq" />
+
+		<keyword match="private" />
+		<keyword match="protected" />
+		<keyword match="public" />
+		<keyword match="reinterpret_cast" />
+		<keyword match="return" />
+		<keyword match="sizeof" />
+
+		<keyword match="static_cast" />
+		<keyword match="switch" />
+		<keyword match="this" />
+		<keyword match="throw" />
+		<keyword match="try" />
+		<keyword match="typeid" />
+
+		<keyword match="using" />
+		<keyword match="while" />
+		<keyword match="xor" />
+		<keyword match="xor_eq" />
+
+        <keyword match="false" />
+		<keyword match="true" />
+	</keywords>
+
+	<keywords name="types" inherits="identifier" innerClass="types" case="yes">
+
+		<keyword match="auto" />
+		<keyword match="bool" />
+		<keyword match="char" />
+		<keyword match="class" />
+		<keyword match="const" />
+		<keyword match="double" />
+
+		<keyword match="enum" />
+		<keyword match="explicit" />
+		<keyword match="export" />
+		<keyword match="extern" />
+		<keyword match="float" />
+		<keyword match="inline" />
+
+		<keyword match="int" />
+		<keyword match="long" />
+		<keyword match="mutable" />
+		<keyword match="namespace" />
+		<keyword match="register" />
+		<keyword match="short" />
+
+		<keyword match="signed" />
+		<keyword match="static" />
+		<keyword match="struct" />
+		<keyword match="template" />
+		<keyword match="typedef" />
+		<keyword match="typename" />
+
+		<keyword match="union" />
+		<keyword match="unsigned" />
+		<keyword match="virtual" />
+		<keyword match="void" />
+		<keyword match="volatile" />
+		<keyword match="wchar_t" />
+
+	</keywords>
+
+	<keywords name="Common Macros" inherits="identifier" innerClass="prepro" case="yes">
+		<keyword match="NULL" />
+		<keyword match="TRUE" />
+		<keyword match="FALSE" />
+		<keyword match="MAX" />
+
+		<keyword match="MIN" />
+		<keyword match="__LINE__" />
+		<keyword match="__DATA__" />
+		<keyword match="__FILE__" />
+		<keyword match="__TIME__" />
+		<keyword match="__STDC__" />
+
+	</keywords>
+
+
+	<!--
+	<keywords name="reserved" inherits="identifier" innerClass="reserved" case="yes">
+	-->
+
+</highlight>
+
diff --git a/library/Text_Highlighter/css.xml b/library/Text_Highlighter/css.xml
new file mode 100644
index 000000000..2473bcfb7
--- /dev/null
+++ b/library/Text_Highlighter/css.xml
@@ -0,0 +1,368 @@
+<?xml version="1.0"?>
+<!-- $Id: css.xml,v 1.2 2008-01-01 23:45:07 ssttoo Exp $ -->
+
+<highlight lang="css" case="no">
+
+  <authors>
+    <author name="Andrey Demenev" email="demenev@gmail.com"/>
+  </authors>
+
+
+  <default innerClass="code" />
+
+
+  <region name="mlcomment" innerClass="comment" start="\/\*" end="\*\/" >
+
+  </region>
+
+
+  <block name="atrule" match="(@[a-z\d]+)"
+         innerClass="var" never-contained="yes"/>
+
+  <region name="property" start="[a-z][a-z\d\-]*\s*:" end="(?=;|\})"
+         innerClass="code" delimClass="reserved" contained="yes"/>
+
+  <block name="selector" match="(((\.|#)?[a-z]+[a-z\d\-]*(?![a-z\d\-]))|(\*))(?!\s*:\s*[\s\{])"
+         innerClass="identifier" >
+  </block>
+
+  <block name="pseudo" match=":[a-z][a-z\d\-]*"
+         innerClass="special" />
+
+  <block name="bescaped" match="\\[\\(\\)\\]"
+         innerClass="string" contained="yes"/>
+
+
+  <region name="paramselector" start="\[" end="\]" innerClass="code"
+          delimClass="brackets" >
+    <contains block="paramname" />
+    <not-contains block="identifier" />
+    <contains region="strdouble" />
+    <contains region="strsingle" />
+  </region>
+
+  <region name="block" start="\{" end="\}" innerClass="code"
+          delimClass="brackets" >
+    <contains region="block" />
+    <contains region="property" />
+    <contains block="selector" />
+    <contains region="mlcomment" />
+  </region>
+
+  <region name="brackets" start="\(" end="\)" innerClass="string"
+          delimClass="brackets" contained="yes">
+    <contains block="bescaped"/>
+  </region>
+
+  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'" contained="yes"/>
+
+  <block name="escaped" match="\\\\|\\&quot;|\\'|\\`" innerClass="special" contained="yes">
+    <onlyin region="strsingle"/>
+  </block>
+
+  <block name="descaped" match="\\\\|\\&quot;|\\'|\\`|\\t|\\n|\\r" innerClass="special" contained="yes">
+    <onlyin region="strdouble"/>
+  </block>
+
+  <region name="strdouble" delimClass="quotes" innerClass="string"
+          start="&quot;" end="&quot;" contained="yes" />
+
+  <block name="measure" match="\d*\.?\d+(\%|em|ex|pc|pt|px|in|mm|cm)"
+         innerClass="number" contained="yes">
+    <onlyin region="property"/>
+    <partClass index="1" innerClass="string" />
+  </block>
+
+  <block name="number" match="\d*\.?\d+" innerClass="number" contained="yes" >
+    <onlyin region="property"/>
+  </block>
+
+  <block name="identifier" match="[a-z][a-z\d\-]*"
+         innerClass="code" contained="yes">
+    <onlyin region="property"/>
+  </block>
+
+  <block name="hexcolor" match="#([\da-f]{6}|[\da-f]{3})\b" innerClass="var" contained="yes">
+    <onlyin region="property"/>
+  </block>
+
+  <block name="paramname" match="[\w\-\:]+" innerClass="var" contained="yes">
+    <onlyin region="paramselector"/>
+  </block>
+
+  <keywords name="propertyValue" inherits="identifier" innerClass="string" case = "no">
+        <word name="left-side"/>
+        <keyword match="far-left"/>
+        <keyword match="left"/>
+        <keyword match="center-left"/>
+        <keyword match="center-right"/>
+        <keyword match="center"/>
+        <keyword match="far-right"/>
+        <keyword match="right-side"/>
+        <keyword match="right"/>
+        <keyword match="behind"/>
+        <keyword match="leftwards"/>
+        <keyword match="rightwards"/>
+        <keyword match="inherit"/>
+        <keyword match="scroll"/>
+        <keyword match="fixed"/>
+        <keyword match="transparent"/>
+        <keyword match="none"/>
+        <keyword match="repeat-x"/>
+        <keyword match="repeat-y"/>
+        <keyword match="repeat"/>
+        <keyword match="no-repeat"/>
+        <keyword match="collapse"/>
+        <keyword match="separate"/>
+        <keyword match="auto"/>
+        <keyword match="top"/>
+        <keyword match="bottom"/>
+        <keyword match="both"/>
+        <keyword match="open-quote"/>
+        <keyword match="close-quote"/>
+        <keyword match="no-open-quote"/>
+        <keyword match="no-close-quote"/>
+        <keyword match="crosshair"/>
+        <keyword match="default"/>
+        <keyword match="pointer"/>
+        <keyword match="move"/>
+        <keyword match="e-resize"/>
+        <keyword match="ne-resize"/>
+        <keyword match="nw-resize"/>
+        <keyword match="n-resize"/>
+        <keyword match="se-resize"/>
+        <keyword match="sw-resize"/>
+        <keyword match="s-resize"/>
+        <keyword match="text"/>
+        <keyword match="wait"/>
+        <keyword match="help"/>
+        <keyword match="ltr"/>
+        <keyword match="rtl"/>
+        <keyword match="inline"/>
+        <keyword match="block"/>
+        <keyword match="list-item"/>
+        <keyword match="run-in"/>
+        <keyword match="compact"/>
+        <keyword match="marker"/>
+        <keyword match="table"/>
+        <keyword match="inline-table"/>
+        <keyword match="table-row-group"/>
+        <keyword match="table-header-group"/>
+        <keyword match="table-footer-group"/>
+        <keyword match="table-row"/>
+        <keyword match="table-column-group"/>
+        <keyword match="table-column"/>
+        <keyword match="table-cell"/>
+        <keyword match="table-caption"/>
+        <keyword match="below"/>
+        <keyword match="level"/>
+        <keyword match="above"/>
+        <keyword match="higher"/>
+        <keyword match="lower"/>
+        <keyword match="show"/>
+        <keyword match="hide"/>
+        <keyword match="caption"/>
+        <keyword match="icon"/>
+        <keyword match="menu"/>
+        <keyword match="message-box"/>
+        <keyword match="small-caption"/>
+        <keyword match="status-bar"/>
+        <keyword match="normal"/>
+        <keyword match="wider"/>
+        <keyword match="narrower"/>
+        <keyword match="ultra-condensed"/>
+        <keyword match="extra-condensed"/>
+        <keyword match="condensed"/>
+        <keyword match="semi-condensed"/>
+        <keyword match="semi-expanded"/>
+        <keyword match="expanded"/>
+        <keyword match="extra-expanded"/>
+        <keyword match="ultra-expanded"/>
+        <keyword match="italic"/>
+        <keyword match="oblique"/>
+        <keyword match="small-caps"/>
+        <keyword match="bold"/>
+        <keyword match="bolder"/>
+        <keyword match="lighter"/>
+        <keyword match="inside"/>
+        <keyword match="outside"/>
+        <keyword match="disc"/>
+        <keyword match="circle"/>
+        <keyword match="square"/>
+        <keyword match="decimal"/>
+        <keyword match="decimal-leading-zero"/>
+        <keyword match="lower-roman"/>
+        <keyword match="upper-roman"/>
+        <keyword match="lower-greek"/>
+        <keyword match="lower-alpha"/>
+        <keyword match="lower-latin"/>
+        <keyword match="upper-alpha"/>
+        <keyword match="upper-latin"/>
+        <keyword match="hebrew"/>
+        <keyword match="armenian"/>
+        <keyword match="georgian"/>
+        <keyword match="cjk-ideographic"/>
+        <keyword match="hiragana"/>
+        <keyword match="katakana"/>
+        <keyword match="hiragana-iroha"/>
+        <keyword match="katakana-iroha"/>
+        <keyword match="crop"/>
+        <keyword match="cross"/>
+        <keyword match="invert"/>
+        <keyword match="visible"/>
+        <keyword match="hidden"/>
+        <keyword match="always"/>
+        <keyword match="avoid"/>
+        <keyword match="x-low"/>
+        <keyword match="low"/>
+        <keyword match="medium"/>
+        <keyword match="high"/>
+        <keyword match="x-high"/>
+        <keyword match="mix?"/>
+        <keyword match="repeat?"/>
+        <keyword match="static"/>
+        <keyword match="relative"/>
+        <keyword match="absolute"/>
+        <keyword match="portrait"/>
+        <keyword match="landscape"/>
+        <keyword match="spell-out"/>
+        <keyword match="once"/>
+        <keyword match="digits"/>
+        <keyword match="continuous"/>
+        <keyword match="code"/>
+        <keyword match="x-slow"/>
+        <keyword match="slow"/>
+        <keyword match="fast"/>
+        <keyword match="x-fast"/>
+        <keyword match="faster"/>
+        <keyword match="slower"/>
+        <keyword match="justify"/>
+        <keyword match="underline"/>
+        <keyword match="overline"/>
+        <keyword match="line-through"/>
+        <keyword match="blink"/>
+        <keyword match="capitalize"/>
+        <keyword match="uppercase"/>
+        <keyword match="lowercase"/>
+        <keyword match="embed"/>
+        <keyword match="bidi-override"/>
+        <keyword match="baseline"/>
+        <keyword match="sub"/>
+        <keyword match="super"/>
+        <keyword match="text-top"/>
+        <keyword match="middle"/>
+        <keyword match="text-bottom"/>
+        <keyword match="silent"/>
+        <keyword match="x-soft"/>
+        <keyword match="soft"/>
+        <keyword match="loud"/>
+        <keyword match="x-loud"/>
+        <keyword match="pre"/>
+        <keyword match="nowrap"/>
+        <keyword match="serif"/>
+        <keyword match="sans-serif"/>
+        <keyword match="cursive"/>
+        <keyword match="fantasy"/>
+        <keyword match="monospace"/>
+        <keyword match="empty"/>
+        <keyword match="string"/>
+        <keyword match="strict"/>
+        <keyword match="loose"/>
+        <keyword match="char"/>
+        <keyword match="true"/>
+        <keyword match="false"/>
+        <keyword match="dotted"/>
+        <keyword match="dashed"/>
+        <keyword match="solid"/>
+        <keyword match="double"/>
+        <keyword match="groove"/>
+        <keyword match="ridge"/>
+        <keyword match="inset"/>
+        <keyword match="outset"/>
+        <keyword match="larger"/>
+        <keyword match="smaller"/>
+        <keyword match="xx-small"/>
+        <keyword match="x-small"/>
+        <keyword match="small"/>
+        <keyword match="large"/>
+        <keyword match="x-large"/>
+        <keyword match="xx-large"/>
+        <keyword match="all"/>
+        <keyword match="newspaper"/>
+        <keyword match="distribute"/>
+        <keyword match="distribute-all-lines"/>
+        <keyword match="distribute-center-last"/>
+        <keyword match="inter-word"/>
+        <keyword match="inter-ideograph"/>
+        <keyword match="inter-cluster"/>
+        <keyword match="kashida"/>
+        <keyword match="ideograph-alpha"/>
+        <keyword match="ideograph-numeric"/>
+        <keyword match="ideograph-parenthesis"/>
+        <keyword match="ideograph-space"/>
+        <keyword match="keep-all"/>
+        <keyword match="break-all"/>
+        <keyword match="break-word"/>
+        <keyword match="lr-tb"/>
+        <keyword match="tb-rl"/>
+        <keyword match="thin"/>
+        <keyword match="thick"/>
+        <keyword match="inline-block"/>
+        <keyword match="w-resize"/>
+        <keyword match="hand"/>
+        <keyword match="distribute-letter"/>
+        <keyword match="distribute-space"/>
+        <keyword match="whitespace"/>
+        <keyword match="male"/>
+        <keyword match="female"/>
+        <keyword match="child"/>
+  </keywords>
+
+
+  <keywords name="namedcolor" inherits="identifier" innerClass="var" case = "no">
+    <keyword match="aqua"/>
+    <keyword match="black"/>
+    <keyword match="blue"/>
+    <keyword match="fuchsia"/>
+    <keyword match="gray"/>
+    <keyword match="green"/>
+    <keyword match="lime"/>
+    <keyword match="maroon"/>
+    <keyword match="navy"/>
+    <keyword match="olive"/>
+    <keyword match="purple"/>
+    <keyword match="red"/>
+    <keyword match="silver"/>
+    <keyword match="teal"/>
+    <keyword match="white"/>
+    <keyword match="yellow"/>
+    <keyword match="ActiveBorder"/>
+    <keyword match="ActiveCaption"/>
+    <keyword match="AppWorkspace"/>
+    <keyword match="Background"/>
+    <keyword match="ButtonFace"/>
+    <keyword match="ButtonHighlight"/>
+    <keyword match="ButtonShadow"/>
+    <keyword match="ButtonText"/>
+    <keyword match="CaptionText"/>
+    <keyword match="GrayText"/>
+    <keyword match="Highlight"/>
+    <keyword match="HighlightText"/>
+    <keyword match="InactiveBorder"/>
+    <keyword match="InactiveCaption"/>
+    <keyword match="InactiveCaptionText"/>
+    <keyword match="InfoBackground"/>
+    <keyword match="InfoText"/>
+    <keyword match="Menu"/>
+    <keyword match="MenuText"/>
+    <keyword match="Scrollbar"/>
+    <keyword match="ThreeDDarkShadow"/>
+    <keyword match="ThreeDFace"/>
+    <keyword match="ThreeDHighlight"/>
+    <keyword match="ThreeDLightShadow"/>
+    <keyword match="ThreeDShadow"/>
+    <keyword match="Window"/>
+    <keyword match="WindowFrame"/>
+    <keyword match="WindowText"/>
+  </keywords>
+</highlight>
diff --git a/library/Text_Highlighter/diff.xml b/library/Text_Highlighter/diff.xml
new file mode 100644
index 000000000..d088f9257
--- /dev/null
+++ b/library/Text_Highlighter/diff.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!-- $Id: diff.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="diff" case="yes">
+
+  <authors>
+    <author name="Andrey Demenev" email="demenev@gmail.com"/>
+  </authors>
+
+
+  <default innerClass="default" />
+
+         <block name="noNewLine" match="/^\\\sNo\snewline.+$/m" innerClass="special"/>
+
+         <block name="diffSeparator" match="/^\-\-\-$/m" innerClass="code"/>
+
+         <block name="diffCmdLine" match="/^(diff\s+\-|Only\s+|Index).*$/m" innerClass="var"/>
+         <block name="diffFiles" match="/^(\-\-\-|\+\+\+)\s.+$/m" innerClass="reserved"/>
+
+         <block name="contextOrg" match="/^\*.*$/m" innerClass="quotes"/>
+         <block name="contextNew" match="/^\+.*$/m" innerClass="string"/>
+         <block name="contextChg" match="/^!.*$/m" innerClass="inlinedoc"/>
+
+         <block name="defOrg" match="/^\&lt;\s.*$/m" innerClass="quotes"/>
+         <block name="defNew" match="/^\&gt;\s.*$/m" innerClass="string"/>
+         <block name="defChg" match="/^\d+(\,\d+)?[acd]\d+(,\d+)?$/m" innerClass="code"/>
+
+         <block name="uniOrg" match="/^\-.*$/m" innerClass="quotes"/>
+         <block name="uniNew" match="/^\+.*$/m" innerClass="string"/>
+         <block name="uniChg" match="/^@@.+@@$/m" innerClass="code"/>
+
+         <block name="normOrg" match="/^d\d+\s\d+$/m" innerClass="code"/>
+         <region name="normNew" start="/^a\d+\s\d+$/m" end="/(?=^[ad]\d+\s\d+)/m" innerClass="var" delimClass="code"/>
+
+         <region name="edNew" start="/^(\d+)(,\d+)?(a)$/m" end="/^(\.)$/m" innerClass="string" delimClass="code"/>
+         <region name="edChg" start="/^(\d+)(,\d+)?(c)$/m" end="/^(\.)$/m" innerClass="inlinedoc" delimClass="code"/>
+         <block name="edDel" match="/^(\d+)(,\d+)?(d)$/m" innerClass="code"/>
+
+         <region name="fedNew" start="/^a(\d+)(\s\d+)?$/m" end="/^(\.)$/m" innerClass="string" delimClass="code"/>
+         <region name="fedChg" start="/^c(\d+)(\s\d+)?$/m" end="/^(\.)$/m" innerClass="inlinedoc" delimClass="code"/>
+         <block name="fedDel" match="/^d(\d+)(\s\d+)?$/m" 
+                innerClass="code"/>
+
+
+</highlight>
diff --git a/library/Text_Highlighter/dtd.xml b/library/Text_Highlighter/dtd.xml
new file mode 100644
index 000000000..18fa07db7
--- /dev/null
+++ b/library/Text_Highlighter/dtd.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!-- $Id: dtd.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="dtd" case="yes">
+
+  <authors>
+    <author name="Andrey Demenev" email="demenev@gmail.com"/>
+  </authors>
+
+
+  <default innerClass="code" />
+
+  <region name="comment" delimClass="comment" innerClass="comment"
+          start="\&lt;!--" end="--\&gt;">
+  </region>
+
+  <region name="redecl" start="\&lt;\!\[" end="\]\]\&gt;" delimClass="brackets" 
+          innerClass="code" never-contained="yes">
+    <contains all="yes" />
+  </region>
+
+  <region name="tag" start="\&lt;" end="\&gt;" delimClass="brackets" 
+          innerClass="code" >
+    <contains all="yes" />
+    <onlyin region="redecl"/>
+  </region>
+
+  <region name="brackets" start="\(" end="\)" delimClass="brackets" 
+          innerClass="code" contained="yes">
+    <onlyin region="tag"/>
+    <onlyin region="brackets"/>
+    <contains block="entity" />
+    <contains block="identifier" />
+  </region>
+
+  <region name="strsingle" start="'" end="'" delimClass="quotes" 
+          innerClass="string" contained="yes">
+    <onlyin region="tag"/>
+    <contains block="entity" />
+  </region>
+
+  <region name="strdouble" start="&quot;" end="&quot;" delimClass="quotes" 
+          innerClass="string" contained="yes">
+    <onlyin region="tag"/>
+    <contains block="entity" />
+  </region>
+
+  <block name="tagname" match="(?&lt;=\&lt;)!(ENTITY|ATTLIST|ELEMENT|NOTATION)\b" 
+         innerClass="var" contained="yes">
+    <onlyin region="tag"/>
+  </block>
+
+  <block name="reserved" match="\s(#(IMPLIED|REQUIRED|FIXED))|CDATA|ENTITY|NOTATION|NMTOKENS?|PUBLIC|SYSTEM\b" 
+         innerClass="reserved" contained="yes">
+    <onlyin region="tag"/>
+  </block>
+
+  <block name="pcdata" match="#PCDATA\b" 
+         innerClass="reserved" contained="yes" />
+
+  <block name="entity" match="(\&amp;|\%)[\w\-\.]+;" innerClass="special" />
+
+  <block name="identifier" match="[a-z][a-z\d\-\,:]+" 
+         innerClass="identifier" contained="yes" case="no"/>
+
+</highlight>
diff --git a/library/Text_Highlighter/generate b/library/Text_Highlighter/generate
new file mode 100644
index 000000000..4e22e82fd
--- /dev/null
+++ b/library/Text_Highlighter/generate
@@ -0,0 +1,171 @@
+#!@php_bin@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+/**
+ * Console highlighter class generator
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: This source file is subject to version 3.0 of the PHP license
+ * that is available through the world-wide-web at the following URI:
+ * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+ * the PHP License and are unable to obtain it through the web, please
+ * send a note to license@php.net so we can mail you a copy immediately.
+ *
+ * @category   Text
+ * @package    Text_Highlighter
+ * @author     Andrey Demenev <demenev@gmail.com>
+ * @copyright  2004 Andrey Demenev
+ * @license    http://www.php.net/license/3_0.txt  PHP License
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/Text_Highlighter
+ */
+
+require_once 'Text/Highlighter/Generator.php';
+require_once 'Console/Getopt.php';
+
+$options = Console_Getopt::getopt($argv, 'x:p:d:h', array('xml=', 'php=','dir=', 'help'));
+
+if (PEAR::isError($options)) {
+    $message = str_replace('Console_Getopt: ','',$options->message);
+    usage($message);
+}
+
+$source = array();
+$dest   = array();
+$dir    = '';
+
+$expectp = false;
+$expectx = false;
+$unexpectedx = false;
+$unexpectedp = false;
+$si = $di = 0;
+
+foreach ($options[0] as $option) {
+    switch ($option[0]) {
+        case 'x':
+        case '--xml':
+            $source[$si] = $option[1];
+            if ($si) {
+                $di++;
+            }
+            $si++;
+            if ($expectp) {
+                $unexpectedx = true;
+            }
+            $expectp = true;
+            $expectx = false;
+            break;
+
+        case 'p':
+        case '--php':
+            if ($expectx) {
+                $unexpectedp = true;
+            }
+            $dest[$di] = $option[1];
+            $expectp = false;
+            $expectx = true;
+            break;
+
+        case 'd':
+        case '--dir':
+            $dir = $option[1];
+            break;
+
+        case 'h':
+        case '--help':
+            usage();
+            break;
+    }
+}
+
+
+if ($unexpectedx && !$dir) {
+    usage('Unexpected -x or --xml', STDERR);
+}
+
+if ($unexpectedp) {
+    usage('Unexpected -p or --php', STDERR);
+}
+
+$nsource = count($source);
+$ndest = count($dest);
+
+if (!$nsource && !$ndest) {
+    $source[]='php://stdin';
+    if (!$dir) {
+        $dest[]='php://stdout';
+    } else {
+      $dest[] = null;
+    }
+} elseif ($expectp && !$dir && $nsource > 1) {
+    usage('-x or --xml without following -p or --php', STDERR);
+} elseif ($nsource == 1 && !$ndest && !$dir) {
+    $dest[]='php://stdout';
+}
+
+if ($dir && substr($dir,-1)!='/' && substr($dir,-1)!=='\\' ) {
+    $dir .= DIRECTORY_SEPARATOR;
+}
+
+
+foreach ($source as $i => $xmlfile)
+{
+    $gen = new Text_Highlighter_Generator;
+    $gen->setInputFile($xmlfile);
+    if ($gen->hasErrors()) {
+        break;
+    }
+    $gen->generate();
+    if ($gen->hasErrors()) {
+        break;
+    }
+    if (isset($dest[$i])) {
+        $phpfile = $dest[$i];
+    } else {
+        $phpfile = $dir . $gen->language . '.php';
+    }
+    $gen->saveCode($phpfile);
+    if ($gen->hasErrors()) {
+        break;
+    }
+}
+if ($gen->hasErrors()) {
+    $errors = $gen->getErrors();
+    foreach ($errors as $error) {
+        fwrite (STDERR, $error . "\n");
+    }
+    exit(1);
+}
+
+function usage($message='', $file=STDOUT)
+{
+    $code = 0;
+    if ($message) {
+        $message .= "\n\n";
+        $code = 1;
+    }
+    $message .= <<<MSG
+Generates a highlighter class from XML source
+Usage:
+generate options
+
+Options:
+  -x filename, --xml=filename
+        source XML file. Multiple input files can be specified, in which
+        case each -x option must be followed by -p unless -d is specified
+        Defaults to stdin
+  -p filename, --php=filename
+        destination PHP file. Defaults to stdout. If specied multiple times,
+        each -p must follow -x
+  -d dirname, --dir=dirname
+        Default destination directory. File names will be taken from XML input
+        ("lang" attribute of <highlight> tag)
+  -h, --help
+        This help
+MSG;
+    fwrite ($file, $message);
+    exit($code);
+}
+?>
+
diff --git a/library/Text_Highlighter/generate.bat b/library/Text_Highlighter/generate.bat
new file mode 100644
index 000000000..3960486c1
--- /dev/null
+++ b/library/Text_Highlighter/generate.bat
@@ -0,0 +1,188 @@
+@echo off
+rem vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4:
+
+rem Console highlighter class generator
+
+rem PHP versions 4 and 5
+
+rem LICENSE: This source file is subject to version 3.0 of the PHP license
+rem that is available through the world-wide-web at the following URI:
+rem http://www.php.net/license/3_0.txt.  If you did not receive a copy of
+rem the PHP License and are unable to obtain it through the web, please
+rem send a note to license@php.net so we can mail you a copy immediately.
+
+rem @category   Text
+rem @package    Text_Highlighter
+rem @author     Andrey Demenev <demenev@gmail.com>
+rem @copyright  2004 Andrey Demenev
+rem @license    http://www.php.net/license/3_0.txt  PHP License
+rem @version    CVS: $Id: generate.bat,v 1.1 2007-06-03 02:35:28 ssttoo Exp $
+rem @link       http://pear.php.net/package/Text_Highlighter
+
+set "MHL_PARAMS="
+:doshift
+set "MHL_PARAMS=%MHL_PARAMS% %1"
+shift 
+if -%1- == -- GOTO noshift
+GOTO doshift
+:noshift
+@php_bin@ -q -d output_buffering=1 -d include_path="@php_dir@" @bin_dir@/Text/Highlighter/generate.bat %MHL_PARAMS%
+
+GOTO finish
+<?php
+ob_end_clean();
+
+if (!defined('STDOUT')) {
+    define('STDOUT', fopen('php://stdout', 'wb'));
+    define('STDERR', fopen('php://stderr', 'wb'));
+}
+require_once 'Text/Highlighter/Generator.php';
+require_once 'Console/Getopt.php';
+
+$options = Console_Getopt::getopt($argv, 'x:p:d:h', array('xml=', 'php=','dir=', 'help'));
+
+if (PEAR::isError($options)) {
+    $message = str_replace('Console_Getopt: ','',$options->message);
+    usage($message);
+}
+
+$source = array();
+$dest   = array();
+$dir    = '';
+
+$expectp = false;
+$expectx = false;
+$unexpectedx = false;
+$unexpectedp = false;
+$si = $di = 0;
+
+foreach ($options[0] as $option) {
+    switch ($option[0]) {
+        case 'x':
+        case '--xml':
+            $source[$si] = $option[1];
+            if ($si) {
+                $di++;
+            }
+            $si++;
+            if ($expectp) {
+                $unexpectedx = true;
+            }
+            $expectp = true;
+            $expectx = false;
+            break;
+
+        case 'p':
+        case '--php':
+            if ($expectx) {
+                $unexpectedp = true;
+            }
+            $dest[$di] = $option[1];
+            $expectp = false;
+            $expectx = true;
+            break;
+
+        case 'd':
+        case '--dir':
+            $dir = $option[1];
+            break;
+
+        case 'h':
+        case '--help':
+            usage();
+            break;
+    }
+}
+
+
+if ($unexpectedx && !$dir) {
+    usage('Unexpected -x or --xml', STDERR);
+}
+
+if ($unexpectedp) {
+    usage('Unexpected -p or --php', STDERR);
+}
+
+$nsource = count($source);
+$ndest = count($dest);
+
+if (!$nsource && !$ndest) {
+    $source[]='php://stdin';
+    if (!$dir) {
+        $dest[]='php://stdout';
+    } else {
+      $dest[] = null;
+    }
+} elseif ($expectp && !$dir && $nsource > 1) {
+    usage('-x or --xml without following -p or --php', STDERR);
+} elseif ($nsource == 1 && !$ndest && !$dir) {
+    $dest[]='php://stdout';
+}
+
+if ($dir && substr($dir,-1)!='/' && substr($dir,-1)!=='\\' ) {
+    $dir .= DIRECTORY_SEPARATOR;
+}
+
+
+foreach ($source as $i => $xmlfile)
+{
+    $gen = new Text_Highlighter_Generator;
+    $gen->setInputFile($xmlfile);
+    if ($gen->hasErrors()) {
+        break;
+    }
+    $gen->generate();
+    if ($gen->hasErrors()) {
+        break;
+    }
+    if (isset($dest[$i])) {
+        $phpfile = $dest[$i];
+    } else {
+        $phpfile = $dir . $gen->language . '.php';
+    }
+    $gen->saveCode($phpfile);
+    if ($gen->hasErrors()) {
+        break;
+    }
+}
+if ($gen->hasErrors()) {
+    $errors = $gen->getErrors();
+    foreach ($errors as $error) {
+        fwrite (STDERR, $error . "\n");
+    }
+    exit(1);
+}
+
+exit(0);
+
+function usage($message='', $file=STDOUT)
+{
+    $code = 0;
+    if ($message) {
+        $message .= "\n\n";
+        $code = 1;
+    }
+    $message .= <<<MSG
+Generates a highlighter class from XML source
+Usage:
+generate options
+
+Options:
+  -x filename, --xml=filename
+        source XML file. Multiple input files can be specified, in which
+        case each -x option must be followed by -p unless -d is specified
+        Defaults to stdin
+  -p filename, --php=filename
+        destination PHP file. Defaults to stdout. If specied multiple times,
+        each -p must follow -x
+  -d dirname, --dir=dirname
+        Default destination directory. File names will be taken from XML input
+        ("lang" attribute of <highlight> tag)
+  -h, --help
+        This help
+MSG;
+    fwrite ($file, $message);
+    exit($code);
+}
+?>
+:finish
diff --git a/library/Text_Highlighter/html.xml b/library/Text_Highlighter/html.xml
new file mode 100644
index 000000000..58d51fc5b
--- /dev/null
+++ b/library/Text_Highlighter/html.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!-- $Id: html.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="html" case="no">
+
+  <authors>
+    <author name="Andrey Demenev" email="demenev@gmail.com"/>
+  </authors>
+
+
+  <default innerClass="code" />
+
+  <region name="comment" delimClass="comment" innerClass="comment"
+          start="\&lt;!--" end="--\&gt;">
+  </region>
+
+  <region name="tag" delimClass="brackets" innerClass="code" start="\&lt;[\?\/]?" end="[\/\?]?\&gt;">
+    <contains block="tagname"/>
+    <contains region="param"/>
+    <contains block="paramname"/>
+  </region>
+
+  <block name="tagname" match="(?&lt;=[\&lt;\/?])[\w\-\:]+" innerClass="reserved" contained="yes"/>
+
+  <block name="paramname" match="[\w\-\:]+" innerClass="var" contained="yes"/>
+
+  <block name="entity" match="(&amp;)[\w\-\.]+;" innerClass="special" />
+
+  <region name="param" start="&quot;" end="&quot;" delimClass="quotes" innerClass="string" contained="yes">
+    <contains block="entity"/>
+  </region>
+
+</highlight>
diff --git a/library/Text_Highlighter/java.xml b/library/Text_Highlighter/java.xml
new file mode 100644
index 000000000..12052b5db
--- /dev/null
+++ b/library/Text_Highlighter/java.xml
@@ -0,0 +1,2824 @@
+<?xml version="1.0"?>
+<!-- $Id: java.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="java">
+
+  <authors>
+    <author name="Andrey Demenev" email ="demenev@gmail.com"/>
+  </authors>
+
+  <default innerClass="code" />
+
+  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
+    <contains all="yes"/>
+  </region>
+
+  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)" >
+    <contains all="yes"/>
+  </region>
+
+  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
+    <contains all="yes"/>
+  </region>
+
+
+  <region name="mlcomment" innerClass="comment" start="\/\*" end="\*\/">
+    <contains block="javadoc"/>
+    <contains block="cvstag"/>
+  </region>
+
+  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;" />
+
+  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'"/>
+
+  <block name="escaped" match="\\." innerClass="special" contained="yes">
+    <onlyin region="strsingle"/>
+  </block>
+
+  <block name="descaped" match="\\[\\&quot;'`tnr\$\{]" innerClass="special" contained="yes">
+    <onlyin region="strdouble"/>
+  </block>
+
+
+  <region name="comment" start="\/\/" end="/$/m" innerClass="comment">
+    <contains block="cvstag"/>
+  </region>
+
+  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" />
+
+  <block name="hexinteger" match="0[xX][\da-f]+" innerClass="number" />
+  <block name="integer" match="\d\d*|\b0\b" innerClass="number" />
+  <block name="octinteger" match="0[0-7]+" innerClass="number" />
+  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number" />
+  <block name="exponent" 
+         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
+         innerClass="number" />
+
+  <block name="javadoc" match="\s@\w+\s" innerClass="inlinedoc" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+
+  <block name="url" match="((https?|ftp):\/\/[\w\?\.\-\&amp;=\/%+]+)|(^|[\s,!?])www\.\w+\.\w+[\w\?\.\&amp;=\/%+]*" innerClass="url" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+  
+  <block name="email" match="\w+[\.\w\-]+@(\w+[\.\w\-])+" innerClass="url" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+  
+  <block name="note" match="\bnote:" innerClass="inlinedoc" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+  
+
+  <block name="cvstag" match="\$\w+\s*:.*\$" innerClass="inlinedoc" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+
+  <keywords name="types" inherits="identifier" innerClass="types" case = "yes">
+	<keyword match="boolean" />
+	<keyword match="byte" />
+	<keyword match="char" />
+	<keyword match="const" />
+	<keyword match="double" />
+	<keyword match="final" />
+	<keyword match="float" />
+	<keyword match="int" />
+	<keyword match="long" />
+	<keyword match="short" />
+	<keyword match="static" />
+	<keyword match="void" />
+  </keywords> 
+
+  <keywords name="reserved" inherits="identifier" innerClass="reserved" case="yes">
+    <keyword match="import"/>
+	<keyword match="package"/>
+	<keyword match="abstract" />
+	<keyword match="break" />
+	<keyword match="case" />
+	<keyword match="catch" />
+	<keyword match="class" />
+	<keyword match="continue" />
+	<keyword match="default" />
+	<keyword match="do" />
+	<keyword match="else" />
+	<keyword match="extends" />
+	<keyword match="false" />
+	<keyword match="finally" />
+	<keyword match="for" />
+	<keyword match="goto" />
+	<keyword match="if" />
+	<keyword match="implements" />
+	<keyword match="instanceof" />
+	<keyword match="interface" />
+	<keyword match="native" />
+	<keyword match="new" />
+	<keyword match="null" />
+	<keyword match="private" />
+	<keyword match="protected" />
+	<keyword match="public" />
+	<keyword match="return" />
+	<keyword match="super" />
+	<keyword match="strictfp" />
+	<keyword match="switch" />
+	<keyword match="synchronized" />
+	<keyword match="this" />
+	<keyword match="throws" />
+	<keyword match="throw" />
+	<keyword match="transient" />
+	<keyword match="true" />
+	<keyword match="try" />
+	<keyword match="volatile" />
+	<keyword match="while" />
+  </keywords> 
+
+  <keywords name="builtin" inherits="identifier" innerClass="builtin" case = "yes" ifdef="java.builtins">
+	<keyword match="AbstractAction" />
+	<keyword match="AbstractBorder" />
+	<keyword match="AbstractButton" />
+	<keyword match="AbstractCellEditor" />
+	<keyword match="AbstractCollection" />
+	<keyword match="AbstractColorChooserPanel" />
+	<keyword match="AbstractDocument" />
+	<keyword match="AbstractInterruptibleChannel" />
+	<keyword match="AbstractLayoutCache" />
+	<keyword match="AbstractList" />
+	<keyword match="AbstractListModel" />
+	<keyword match="AbstractMap" />
+	<keyword match="AbstractMethodError" />
+	<keyword match="AbstractPreferences" />
+	<keyword match="AbstractSelectableChannel" />
+	<keyword match="AbstractSelectionKey" />
+	<keyword match="AbstractSelector" />
+	<keyword match="AbstractSequentialList" />
+	<keyword match="AbstractSet" />
+	<keyword match="AbstractSpinnerModel" />
+	<keyword match="AbstractTableModel" />
+	<keyword match="AbstractUndoableEdit" />
+	<keyword match="AbstractWriter" />
+	<keyword match="AccessControlContext" />
+	<keyword match="AccessControlException" />
+	<keyword match="AccessController" />
+	<keyword match="AccessException" />
+	<keyword match="Accessible" />
+	<keyword match="AccessibleAction" />
+	<keyword match="AccessibleBundle" />
+	<keyword match="AccessibleComponent" />
+	<keyword match="AccessibleContext" />
+	<keyword match="AccessibleEditableText" />
+	<keyword match="AccessibleExtendedComponent" />
+	<keyword match="AccessibleExtendedTable" />
+	<keyword match="AccessibleHyperlink" />
+	<keyword match="AccessibleHypertext" />
+	<keyword match="AccessibleIcon" />
+	<keyword match="AccessibleKeyBinding" />
+	<keyword match="AccessibleObject" />
+	<keyword match="AccessibleRelation" />
+	<keyword match="AccessibleRelationSet" />
+	<keyword match="AccessibleResourceBundle" />
+	<keyword match="AccessibleRole" />
+	<keyword match="AccessibleSelection" />
+	<keyword match="AccessibleState" />
+	<keyword match="AccessibleStateSet" />
+	<keyword match="AccessibleTable" />
+	<keyword match="AccessibleTableModelChange" />
+	<keyword match="AccessibleText" />
+	<keyword match="AccessibleValue" />
+	<keyword match="AccountExpiredException" />
+	<keyword match="Acl" />
+	<keyword match="AclEntry" />
+	<keyword match="AclNotFoundException" />
+	<keyword match="Action" />
+	<keyword match="ActionEvent" />
+	<keyword match="ActionListener" />
+	<keyword match="ActionMap" />
+	<keyword match="ActionMapUIResource" />
+	<keyword match="Activatable" />
+	<keyword match="ActivateFailedException" />
+	<keyword match="ActivationDesc" />
+	<keyword match="ActivationException" />
+	<keyword match="ActivationGroup" />
+	<keyword match="ActivationGroup_Stub" />
+	<keyword match="ActivationGroupDesc" />
+	<keyword match="ActivationGroupID" />
+	<keyword match="ActivationID" />
+	<keyword match="ActivationInstantiator" />
+	<keyword match="ActivationMonitor" />
+	<keyword match="ActivationSystem" />
+	<keyword match="Activator" />
+	<keyword match="ActiveEvent" />
+	<keyword match="AdapterActivator" />
+	<keyword match="AdapterActivatorOperations" />
+	<keyword match="AdapterAlreadyExists" />
+	<keyword match="AdapterAlreadyExistsHelper" />
+	<keyword match="AdapterInactive" />
+	<keyword match="AdapterInactiveHelper" />
+	<keyword match="AdapterNonExistent" />
+	<keyword match="AdapterNonExistentHelper" />
+	<keyword match="AddressHelper" />
+	<keyword match="Adjustable" />
+	<keyword match="AdjustmentEvent" />
+	<keyword match="AdjustmentListener" />
+	<keyword match="Adler32" />
+	<keyword match="AffineTransform" />
+	<keyword match="AffineTransformOp" />
+	<keyword match="AlgorithmParameterGenerator" />
+	<keyword match="AlgorithmParameterGeneratorSpi" />
+	<keyword match="AlgorithmParameters" />
+	<keyword match="AlgorithmParameterSpec" />
+	<keyword match="AlgorithmParametersSpi" />
+	<keyword match="AllPermission" />
+	<keyword match="AlphaComposite" />
+	<keyword match="AlreadyBound" />
+	<keyword match="AlreadyBoundException" />
+	<keyword match="AlreadyBoundHelper" />
+	<keyword match="AlreadyBoundHolder" />
+	<keyword match="AlreadyConnectedException" />
+	<keyword match="AncestorEvent" />
+	<keyword match="AncestorListener" />
+	<keyword match="Annotation" />
+	<keyword match="Any" />
+	<keyword match="AnyHolder" />
+	<keyword match="AnySeqHelper" />
+	<keyword match="AnySeqHelper" />
+	<keyword match="AnySeqHolder" />
+	<keyword match="AppConfigurationEntry" />
+	<keyword match="Applet" />
+	<keyword match="AppletContext" />
+	<keyword match="AppletInitializer" />
+	<keyword match="AppletStub" />
+	<keyword match="ApplicationException" />
+	<keyword match="Arc2D" />
+	<keyword match="Area" />
+	<keyword match="AreaAveragingScaleFilter" />
+	<keyword match="ARG_IN" />
+	<keyword match="ARG_INOUT" />
+	<keyword match="ARG_OUT" />
+	<keyword match="ArithmeticException" />
+	<keyword match="Array" />
+	<keyword match="Array" />
+	<keyword match="ArrayIndexOutOfBoundsException" />
+	<keyword match="ArrayList" />
+	<keyword match="Arrays" />
+	<keyword match="ArrayStoreException" />
+	<keyword match="AssertionError" />
+	<keyword match="AsyncBoxView" />
+	<keyword match="AsynchronousCloseException" />
+	<keyword match="Attr" />
+	<keyword match="Attribute" />
+	<keyword match="Attribute" />
+	<keyword match="AttributedCharacterIterator" />
+	<keyword match="AttributedString" />
+	<keyword match="AttributeException" />
+	<keyword match="AttributeInUseException" />
+	<keyword match="AttributeList" />
+	<keyword match="AttributeList" />
+	<keyword match="AttributeListImpl" />
+	<keyword match="AttributeModificationException" />
+	<keyword match="Attributes" />
+	<keyword match="Attributes" />
+	<keyword match="Attributes" />
+	<keyword match="AttributeSet" />
+	<keyword match="AttributeSet" />
+	<keyword match="AttributeSetUtilities" />
+	<keyword match="AttributesImpl" />
+	<keyword match="AudioClip" />
+	<keyword match="AudioFileFormat" />
+	<keyword match="AudioFileReader" />
+	<keyword match="AudioFileWriter" />
+	<keyword match="AudioFormat" />
+	<keyword match="AudioInputStream" />
+	<keyword match="AudioPermission" />
+	<keyword match="AudioSystem" />
+	<keyword match="AuthenticationException" />
+	<keyword match="AuthenticationNotSupportedException" />
+	<keyword match="Authenticator" />
+	<keyword match="AuthPermission" />
+	<keyword match="Autoscroll" />
+	<keyword match="AWTError" />
+	<keyword match="AWTEvent" />
+	<keyword match="AWTEventListener" />
+	<keyword match="AWTEventListenerProxy" />
+	<keyword match="AWTEventMulticaster" />
+	<keyword match="AWTException" />
+	<keyword match="AWTKeyStroke" />
+	<keyword match="AWTPermission" />
+	<keyword match="BackingStoreException" />
+	<keyword match="BAD_CONTEXT" />
+	<keyword match="BAD_INV_ORDER" />
+	<keyword match="BAD_OPERATION" />
+	<keyword match="BAD_PARAM" />
+	<keyword match="BAD_POLICY" />
+	<keyword match="BAD_POLICY_TYPE" />
+	<keyword match="BAD_POLICY_VALUE" />
+	<keyword match="BAD_TYPECODE" />
+	<keyword match="BadKind" />
+	<keyword match="BadLocationException" />
+	<keyword match="BadPaddingException" />
+	<keyword match="BandCombineOp" />
+	<keyword match="BandedSampleModel" />
+	<keyword match="BasicArrowButton" />
+	<keyword match="BasicAttribute" />
+	<keyword match="BasicAttributes" />
+	<keyword match="BasicBorders" />
+	<keyword match="BasicButtonListener" />
+	<keyword match="BasicButtonUI" />
+	<keyword match="BasicCheckBoxMenuItemUI" />
+	<keyword match="BasicCheckBoxUI" />
+	<keyword match="BasicColorChooserUI" />
+	<keyword match="BasicComboBoxEditor" />
+	<keyword match="BasicComboBoxRenderer" />
+	<keyword match="BasicComboBoxUI" />
+	<keyword match="BasicComboPopup" />
+	<keyword match="BasicDesktopIconUI" />
+	<keyword match="BasicDesktopPaneUI" />
+	<keyword match="BasicDirectoryModel" />
+	<keyword match="BasicEditorPaneUI" />
+	<keyword match="BasicFileChooserUI" />
+	<keyword match="BasicFormattedTextFieldUI" />
+	<keyword match="BasicGraphicsUtils" />
+	<keyword match="BasicHTML" />
+	<keyword match="BasicIconFactory" />
+	<keyword match="BasicInternalFrameTitlePane" />
+	<keyword match="BasicInternalFrameUI" />
+	<keyword match="BasicLabelUI" />
+	<keyword match="BasicListUI" />
+	<keyword match="BasicLookAndFeel" />
+	<keyword match="BasicMenuBarUI" />
+	<keyword match="BasicMenuItemUI" />
+	<keyword match="BasicMenuUI" />
+	<keyword match="BasicOptionPaneUI" />
+	<keyword match="BasicPanelUI" />
+	<keyword match="BasicPasswordFieldUI" />
+	<keyword match="BasicPermission" />
+	<keyword match="BasicPopupMenuSeparatorUI" />
+	<keyword match="BasicPopupMenuUI" />
+	<keyword match="BasicProgressBarUI" />
+	<keyword match="BasicRadioButtonMenuItemUI" />
+	<keyword match="BasicRadioButtonUI" />
+	<keyword match="BasicRootPaneUI" />
+	<keyword match="BasicScrollBarUI" />
+	<keyword match="BasicScrollPaneUI" />
+	<keyword match="BasicSeparatorUI" />
+	<keyword match="BasicSliderUI" />
+	<keyword match="BasicSpinnerUI" />
+	<keyword match="BasicSplitPaneDivider" />
+	<keyword match="BasicSplitPaneUI" />
+	<keyword match="BasicStroke" />
+	<keyword match="BasicTabbedPaneUI" />
+	<keyword match="BasicTableHeaderUI" />
+	<keyword match="BasicTableUI" />
+	<keyword match="BasicTextAreaUI" />
+	<keyword match="BasicTextFieldUI" />
+	<keyword match="BasicTextPaneUI" />
+	<keyword match="BasicTextUI" />
+	<keyword match="BasicToggleButtonUI" />
+	<keyword match="BasicToolBarSeparatorUI" />
+	<keyword match="BasicToolBarUI" />
+	<keyword match="BasicToolTipUI" />
+	<keyword match="BasicTreeUI" />
+	<keyword match="BasicViewportUI" />
+	<keyword match="BatchUpdateException" />
+	<keyword match="BeanContext" />
+	<keyword match="BeanContextChild" />
+	<keyword match="BeanContextChildComponentProxy" />
+	<keyword match="BeanContextChildSupport" />
+	<keyword match="BeanContextContainerProxy" />
+	<keyword match="BeanContextEvent" />
+	<keyword match="BeanContextMembershipEvent" />
+	<keyword match="BeanContextMembershipListener" />
+	<keyword match="BeanContextProxy" />
+	<keyword match="BeanContextServiceAvailableEvent" />
+	<keyword match="BeanContextServiceProvider" />
+	<keyword match="BeanContextServiceProviderBeanInfo" />
+	<keyword match="BeanContextServiceRevokedEvent" />
+	<keyword match="BeanContextServiceRevokedListener" />
+	<keyword match="BeanContextServices" />
+	<keyword match="BeanContextServicesListener" />
+	<keyword match="BeanContextServicesSupport" />
+	<keyword match="BeanContextSupport" />
+	<keyword match="BeanDescriptor" />
+	<keyword match="BeanInfo" />
+	<keyword match="Beans" />
+	<keyword match="BevelBorder" />
+	<keyword match="Bidi" />
+	<keyword match="BigDecimal" />
+	<keyword match="BigInteger" />
+	<keyword match="BinaryRefAddr" />
+	<keyword match="BindException" />
+	<keyword match="Binding" />
+	<keyword match="Binding" />
+	<keyword match="BindingHelper" />
+	<keyword match="BindingHolder" />
+	<keyword match="BindingIterator" />
+	<keyword match="BindingIteratorHelper" />
+	<keyword match="BindingIteratorHolder" />
+	<keyword match="BindingIteratorOperations" />
+	<keyword match="BindingIteratorPOA" />
+	<keyword match="BindingListHelper" />
+	<keyword match="BindingListHolder" />
+	<keyword match="BindingType" />
+	<keyword match="BindingTypeHelper" />
+	<keyword match="BindingTypeHolder" />
+	<keyword match="BitSet" />
+	<keyword match="Blob" />
+	<keyword match="BlockView" />
+	<keyword match="Book" />
+	<keyword match="Boolean" />
+	<keyword match="BooleanControl" />
+	<keyword match="BooleanHolder" />
+	<keyword match="BooleanSeqHelper" />
+	<keyword match="BooleanSeqHolder" />
+	<keyword match="Border" />
+	<keyword match="BorderFactory" />
+	<keyword match="BorderLayout" />
+	<keyword match="BorderUIResource" />
+	<keyword match="BoundedRangeModel" />
+	<keyword match="Bounds" />
+	<keyword match="Bounds" />
+	<keyword match="Box" />
+	<keyword match="BoxedValueHelper" />
+	<keyword match="BoxLayout" />
+	<keyword match="BoxView" />
+	<keyword match="BreakIterator" />
+	<keyword match="Buffer" />
+	<keyword match="BufferCapabilities" />
+	<keyword match="BufferedImage" />
+	<keyword match="BufferedImageFilter" />
+	<keyword match="BufferedImageOp" />
+	<keyword match="BufferedInputStream" />
+	<keyword match="BufferedOutputStream" />
+	<keyword match="BufferedReader" />
+	<keyword match="BufferedWriter" />
+	<keyword match="BufferOverflowException" />
+	<keyword match="BufferStrategy" />
+	<keyword match="BufferUnderflowException" />
+	<keyword match="Button" />
+	<keyword match="ButtonGroup" />
+	<keyword match="ButtonModel" />
+	<keyword match="ButtonUI" />
+	<keyword match="Byte" />
+	<keyword match="ByteArrayInputStream" />
+	<keyword match="ByteArrayOutputStream" />
+	<keyword match="ByteBuffer" />
+	<keyword match="ByteChannel" />
+	<keyword match="ByteHolder" />
+	<keyword match="ByteLookupTable" />
+	<keyword match="ByteOrder" />
+	<keyword match="Calendar" />
+	<keyword match="CallableStatement" />
+	<keyword match="Callback" />
+	<keyword match="CallbackHandler" />
+	<keyword match="CancelablePrintJob" />
+	<keyword match="CancelledKeyException" />
+	<keyword match="CannotProceed" />
+	<keyword match="CannotProceedException" />
+	<keyword match="CannotProceedHelper" />
+	<keyword match="CannotProceedHolder" />
+	<keyword match="CannotRedoException" />
+	<keyword match="CannotUndoException" />
+	<keyword match="Canvas" />
+	<keyword match="CardLayout" />
+	<keyword match="Caret" />
+	<keyword match="CaretEvent" />
+	<keyword match="CaretListener" />
+	<keyword match="CDATASection" />
+	<keyword match="CellEditor" />
+	<keyword match="CellEditorListener" />
+	<keyword match="CellRendererPane" />
+	<keyword match="Certificate" />
+	<keyword match="Certificate" />
+	<keyword match="Certificate" />
+	
+	<keyword match="CertificateEncodingException" />
+	<keyword match="CertificateEncodingException" />
+	<keyword match="CertificateException" />
+	<keyword match="CertificateException" />
+	<keyword match="CertificateExpiredException" />
+	<keyword match="CertificateExpiredException" />
+	<keyword match="CertificateFactory" />
+	<keyword match="CertificateFactorySpi" />
+	<keyword match="CertificateNotYetValidException" />
+	<keyword match="CertificateNotYetValidException" />
+	<keyword match="CertificateParsingException" />
+	<keyword match="CertificateParsingException" />
+	<keyword match="CertPath" />
+	
+	<keyword match="CertPathBuilder" />
+	<keyword match="CertPathBuilderException" />
+	<keyword match="CertPathBuilderResult" />
+	<keyword match="CertPathBuilderSpi" />
+	<keyword match="CertPathParameters" />
+	<keyword match="CertPathValidator" />
+	<keyword match="CertPathValidatorException" />
+	<keyword match="CertPathValidatorResult" />
+	<keyword match="CertPathValidatorSpi" />
+	<keyword match="CertSelector" />
+	<keyword match="CertStore" />
+	<keyword match="CertStoreException" />
+	<keyword match="CertStoreParameters" />
+	<keyword match="CertStoreSpi" />
+	<keyword match="ChangedCharSetException" />
+	<keyword match="ChangeEvent" />
+	<keyword match="ChangeListener" />
+	<keyword match="Channel" />
+	<keyword match="ChannelBinding" />
+	<keyword match="Channels" />
+	<keyword match="Character" />
+	
+	
+	<keyword match="CharacterCodingException" />
+	<keyword match="CharacterData" />
+	<keyword match="CharacterIterator" />
+	<keyword match="CharArrayReader" />
+	<keyword match="CharArrayWriter" />
+	<keyword match="CharBuffer" />
+	<keyword match="CharConversionException" />
+	<keyword match="CharHolder" />
+	<keyword match="CharSeqHelper" />
+	<keyword match="CharSeqHolder" />
+	<keyword match="CharSequence" />
+	<keyword match="Charset" />
+	<keyword match="CharsetDecoder" />
+	<keyword match="CharsetEncoder" />
+	<keyword match="CharsetProvider" />
+	<keyword match="Checkbox" />
+	<keyword match="CheckboxGroup" />
+	<keyword match="CheckboxMenuItem" />
+	<keyword match="CheckedInputStream" />
+	<keyword match="CheckedOutputStream" />
+	<keyword match="Checksum" />
+	<keyword match="Choice" />
+	<keyword match="ChoiceCallback" />
+	<keyword match="ChoiceFormat" />
+	<keyword match="Chromaticity" />
+	<keyword match="Cipher" />
+	<keyword match="CipherInputStream" />
+	<keyword match="CipherOutputStream" />
+	<keyword match="CipherSpi" />
+	<keyword match="Class" />
+	<keyword match="ClassCastException" />
+	<keyword match="ClassCircularityError" />
+	<keyword match="ClassDesc" />
+	<keyword match="ClassFormatError" />
+	<keyword match="ClassLoader" />
+	<keyword match="ClassNotFoundException" />
+	<keyword match="ClientRequestInfo" />
+	<keyword match="ClientRequestInfoOperations" />
+	<keyword match="ClientRequestInterceptor" />
+	<keyword match="ClientRequestInterceptorOperations" />
+	<keyword match="Clip" />
+	<keyword match="Clipboard" />
+	<keyword match="ClipboardOwner" />
+	<keyword match="Clob" />
+	<keyword match="Cloneable" />
+	<keyword match="CloneNotSupportedException" />
+	<keyword match="ClosedByInterruptException" />
+	<keyword match="ClosedChannelException" />
+	<keyword match="ClosedSelectorException" />
+	<keyword match="CMMException" />
+	<keyword match="Codec" />
+	<keyword match="CodecFactory" />
+	<keyword match="CodecFactoryHelper" />
+	<keyword match="CodecFactoryOperations" />
+	<keyword match="CodecOperations" />
+	<keyword match="CoderMalfunctionError" />
+	<keyword match="CoderResult" />
+	<keyword match="CodeSets" />
+	<keyword match="CodeSource" />
+	<keyword match="CodingErrorAction" />
+	<keyword match="CollationElementIterator" />
+	<keyword match="CollationKey" />
+	<keyword match="Collator" />
+	<keyword match="Collection" />
+	<keyword match="CollectionCertStoreParameters" />
+	<keyword match="Collections" />
+	<keyword match="Color" />
+	<keyword match="ColorChooserComponentFactory" />
+	<keyword match="ColorChooserUI" />
+	<keyword match="ColorConvertOp" />
+	<keyword match="ColorModel" />
+	<keyword match="ColorSelectionModel" />
+	<keyword match="ColorSpace" />
+	<keyword match="ColorSupported" />
+	<keyword match="ColorUIResource" />
+	<keyword match="ComboBoxEditor" />
+	<keyword match="ComboBoxModel" />
+	<keyword match="ComboBoxUI" />
+	<keyword match="ComboPopup" />
+	<keyword match="COMM_FAILURE" />
+	<keyword match="Comment" />
+	<keyword match="CommunicationException" />
+	<keyword match="Comparable" />
+	<keyword match="Comparator" />
+	<keyword match="Compiler" />
+	<keyword match="CompletionStatus" />
+	<keyword match="CompletionStatusHelper" />
+	<keyword match="Component" />
+	<keyword match="ComponentAdapter" />
+	<keyword match="ComponentColorModel" />
+	<keyword match="ComponentEvent" />
+	<keyword match="ComponentIdHelper" />
+	<keyword match="ComponentInputMap" />
+	<keyword match="ComponentInputMapUIResource" />
+	<keyword match="ComponentListener" />
+	<keyword match="ComponentOrientation" />
+	<keyword match="ComponentSampleModel" />
+	<keyword match="ComponentUI" />
+	<keyword match="ComponentView" />
+	<keyword match="Composite" />
+	<keyword match="CompositeContext" />
+	<keyword match="CompositeName" />
+	<keyword match="CompositeView" />
+	<keyword match="CompoundBorder" />
+	<keyword match="CompoundControl" />
+	
+	<keyword match="CompoundEdit" />
+	<keyword match="CompoundName" />
+	<keyword match="Compression" />
+	<keyword match="ConcurrentModificationException" />
+	<keyword match="Configuration" />
+	<keyword match="ConfigurationException" />
+	<keyword match="ConfirmationCallback" />
+	<keyword match="ConnectException" />
+	<keyword match="ConnectException" />
+	<keyword match="ConnectIOException" />
+	<keyword match="Connection" />
+	<keyword match="ConnectionEvent" />
+	<keyword match="ConnectionEventListener" />
+	<keyword match="ConnectionPendingException" />
+	<keyword match="ConnectionPoolDataSource" />
+	<keyword match="ConsoleHandler" />
+	<keyword match="Constructor" />
+	<keyword match="Container" />
+	<keyword match="ContainerAdapter" />
+	<keyword match="ContainerEvent" />
+	<keyword match="ContainerListener" />
+	<keyword match="ContainerOrderFocusTraversalPolicy" />
+	<keyword match="ContentHandler" />
+	<keyword match="ContentHandler" />
+	<keyword match="ContentHandlerFactory" />
+	<keyword match="ContentModel" />
+	<keyword match="Context" />
+	<keyword match="Context" />
+	<keyword match="ContextList" />
+	<keyword match="ContextNotEmptyException" />
+	<keyword match="ContextualRenderedImageFactory" />
+	<keyword match="Control" />
+	<keyword match="Control" />
+	
+	<keyword match="ControlFactory" />
+	<keyword match="ControllerEventListener" />
+	<keyword match="ConvolveOp" />
+	<keyword match="CookieHolder" />
+	<keyword match="Copies" />
+	<keyword match="CopiesSupported" />
+	<keyword match="CRC32" />
+	<keyword match="CredentialExpiredException" />
+	<keyword match="CRL" />
+	<keyword match="CRLException" />
+	<keyword match="CRLSelector" />
+	<keyword match="CropImageFilter" />
+	<keyword match="CSS" />
+	
+	<keyword match="CTX_RESTRICT_SCOPE" />
+	<keyword match="CubicCurve2D" />
+	
+	
+	<keyword match="Currency" />
+	<keyword match="Current" />
+	<keyword match="Current" />
+	<keyword match="Current" />
+	<keyword match="CurrentHelper" />
+	<keyword match="CurrentHelper" />
+	<keyword match="CurrentHelper" />
+	<keyword match="CurrentHolder" />
+	<keyword match="CurrentOperations" />
+	<keyword match="CurrentOperations" />
+	<keyword match="CurrentOperations" />
+	<keyword match="Cursor" />
+	<keyword match="Customizer" />
+	<keyword match="CustomMarshal" />
+	<keyword match="CustomValue" />
+	<keyword match="DATA_CONVERSION" />
+	<keyword match="DatabaseMetaData" />
+	<keyword match="DataBuffer" />
+	<keyword match="DataBufferByte" />
+	<keyword match="DataBufferDouble" />
+	<keyword match="DataBufferFloat" />
+	<keyword match="DataBufferInt" />
+	<keyword match="DataBufferShort" />
+	<keyword match="DataBufferUShort" />
+	<keyword match="DataFlavor" />
+	<keyword match="DataFormatException" />
+	<keyword match="DatagramChannel" />
+	<keyword match="DatagramPacket" />
+	<keyword match="DatagramSocket" />
+	<keyword match="DatagramSocketImpl" />
+	<keyword match="DatagramSocketImplFactory" />
+	<keyword match="DataInput" />
+	<keyword match="DataInputStream" />
+	<keyword match="DataInputStream" />
+	<keyword match="DataLine" />
+	
+	<keyword match="DataOutput" />
+	<keyword match="DataOutputStream" />
+	<keyword match="DataOutputStream" />
+	<keyword match="DataSource" />
+	<keyword match="DataTruncation" />
+	<keyword match="Date" />
+	<keyword match="Date" />
+	<keyword match="DateFormat" />
+	
+	<keyword match="DateFormatSymbols" />
+	<keyword match="DateFormatter" />
+	<keyword match="DateTimeAtCompleted" />
+	<keyword match="DateTimeAtCreation" />
+	<keyword match="DateTimeAtProcessing" />
+	<keyword match="DateTimeSyntax" />
+	<keyword match="DebugGraphics" />
+	<keyword match="DecimalFormat" />
+	<keyword match="DecimalFormatSymbols" />
+	<keyword match="DeclHandler" />
+	<keyword match="DefaultBoundedRangeModel" />
+	<keyword match="DefaultButtonModel" />
+	<keyword match="DefaultCaret" />
+	<keyword match="DefaultCellEditor" />
+	<keyword match="DefaultColorSelectionModel" />
+	<keyword match="DefaultComboBoxModel" />
+	<keyword match="DefaultDesktopManager" />
+	<keyword match="DefaultEditorKit" />
+	
+	
+	
+	
+	
+	
+	
+	
+	<keyword match="DefaultFocusManager" />
+	<keyword match="DefaultFocusTraversalPolicy" />
+	<keyword match="DefaultFormatter" />
+	<keyword match="DefaultFormatterFactory" />
+	<keyword match="DefaultHandler" />
+	<keyword match="DefaultHighlighter" />
+	
+	<keyword match="DefaultKeyboardFocusManager" />
+	<keyword match="DefaultListCellRenderer" />
+	
+	<keyword match="DefaultListModel" />
+	<keyword match="DefaultListSelectionModel" />
+	<keyword match="DefaultMenuLayout" />
+	<keyword match="DefaultMetalTheme" />
+	<keyword match="DefaultMutableTreeNode" />
+	<keyword match="DefaultPersistenceDelegate" />
+	<keyword match="DefaultSingleSelectionModel" />
+	<keyword match="DefaultStyledDocument" />
+	
+	
+	<keyword match="DefaultTableCellRenderer" />
+	
+	<keyword match="DefaultTableColumnModel" />
+	<keyword match="DefaultTableModel" />
+	<keyword match="DefaultTextUI" />
+	<keyword match="DefaultTreeCellEditor" />
+	<keyword match="DefaultTreeCellRenderer" />
+	<keyword match="DefaultTreeModel" />
+	<keyword match="DefaultTreeSelectionModel" />
+	<keyword match="DefinitionKind" />
+	<keyword match="DefinitionKindHelper" />
+	<keyword match="Deflater" />
+	<keyword match="DeflaterOutputStream" />
+	<keyword match="Delegate" />
+	<keyword match="Delegate" />
+	<keyword match="Delegate" />
+	<keyword match="DelegationPermission" />
+	<keyword match="DESedeKeySpec" />
+	<keyword match="DesignMode" />
+	<keyword match="DESKeySpec" />
+	<keyword match="DesktopIconUI" />
+	<keyword match="DesktopManager" />
+	<keyword match="DesktopPaneUI" />
+	<keyword match="Destination" />
+	<keyword match="Destroyable" />
+	<keyword match="DestroyFailedException" />
+	<keyword match="DGC" />
+	<keyword match="DHGenParameterSpec" />
+	<keyword match="DHKey" />
+	<keyword match="DHParameterSpec" />
+	<keyword match="DHPrivateKey" />
+	<keyword match="DHPrivateKeySpec" />
+	<keyword match="DHPublicKey" />
+	<keyword match="DHPublicKeySpec" />
+	<keyword match="Dialog" />
+	<keyword match="Dictionary" />
+	<keyword match="DigestException" />
+	<keyword match="DigestInputStream" />
+	<keyword match="DigestOutputStream" />
+	<keyword match="Dimension" />
+	<keyword match="Dimension2D" />
+	<keyword match="DimensionUIResource" />
+	<keyword match="DirContext" />
+	<keyword match="DirectColorModel" />
+	<keyword match="DirectoryManager" />
+	<keyword match="DirObjectFactory" />
+	<keyword match="DirStateFactory" />
+	
+	<keyword match="DisplayMode" />
+	<keyword match="DnDConstants" />
+	<keyword match="Doc" />
+	<keyword match="DocAttribute" />
+	<keyword match="DocAttributeSet" />
+	<keyword match="DocFlavor" />
+	
+	
+	
+	
+	
+	
+	
+	<keyword match="DocPrintJob" />
+	<keyword match="Document" />
+	<keyword match="Document" />
+	<keyword match="DocumentBuilder" />
+	<keyword match="DocumentBuilderFactory" />
+	<keyword match="DocumentEvent" />
+	
+	
+	<keyword match="DocumentFilter" />
+	
+	<keyword match="DocumentFragment" />
+	<keyword match="DocumentHandler" />
+	<keyword match="DocumentListener" />
+	<keyword match="DocumentName" />
+	<keyword match="DocumentParser" />
+	<keyword match="DocumentType" />
+	<keyword match="DomainCombiner" />
+	<keyword match="DomainManager" />
+	<keyword match="DomainManagerOperations" />
+	<keyword match="DOMException" />
+	<keyword match="DOMImplementation" />
+	<keyword match="DOMLocator" />
+	<keyword match="DOMResult" />
+	<keyword match="DOMSource" />
+	<keyword match="Double" />
+	<keyword match="DoubleBuffer" />
+	<keyword match="DoubleHolder" />
+	<keyword match="DoubleSeqHelper" />
+	<keyword match="DoubleSeqHolder" />
+	<keyword match="DragGestureEvent" />
+	<keyword match="DragGestureListener" />
+	<keyword match="DragGestureRecognizer" />
+	<keyword match="DragSource" />
+	<keyword match="DragSourceAdapter" />
+	<keyword match="DragSourceContext" />
+	<keyword match="DragSourceDragEvent" />
+	<keyword match="DragSourceDropEvent" />
+	<keyword match="DragSourceEvent" />
+	<keyword match="DragSourceListener" />
+	<keyword match="DragSourceMotionListener" />
+	<keyword match="Driver" />
+	<keyword match="DriverManager" />
+	<keyword match="DriverPropertyInfo" />
+	<keyword match="DropTarget" />
+	
+	<keyword match="DropTargetAdapter" />
+	<keyword match="DropTargetContext" />
+	<keyword match="DropTargetDragEvent" />
+	<keyword match="DropTargetDropEvent" />
+	<keyword match="DropTargetEvent" />
+	<keyword match="DropTargetListener" />
+	<keyword match="DSAKey" />
+	<keyword match="DSAKeyPairGenerator" />
+	<keyword match="DSAParameterSpec" />
+	<keyword match="DSAParams" />
+	<keyword match="DSAPrivateKey" />
+	<keyword match="DSAPrivateKeySpec" />
+	<keyword match="DSAPublicKey" />
+	<keyword match="DSAPublicKeySpec" />
+	<keyword match="DTD" />
+	<keyword match="DTDConstants" />
+	<keyword match="DTDHandler" />
+	<keyword match="DuplicateName" />
+	<keyword match="DuplicateNameHelper" />
+	<keyword match="DynamicImplementation" />
+	<keyword match="DynamicImplementation" />
+	<keyword match="DynAny" />
+	<keyword match="DynAny" />
+	<keyword match="DynAnyFactory" />
+	<keyword match="DynAnyFactoryHelper" />
+	<keyword match="DynAnyFactoryOperations" />
+	<keyword match="DynAnyHelper" />
+	<keyword match="DynAnyOperations" />
+	<keyword match="DynAnySeqHelper" />
+	<keyword match="DynArray" />
+	<keyword match="DynArray" />
+	<keyword match="DynArrayHelper" />
+	<keyword match="DynArrayOperations" />
+	<keyword match="DynEnum" />
+	<keyword match="DynEnum" />
+	<keyword match="DynEnumHelper" />
+	<keyword match="DynEnumOperations" />
+	<keyword match="DynFixed" />
+	<keyword match="DynFixed" />
+	<keyword match="DynFixedHelper" />
+	<keyword match="DynFixedOperations" />
+	<keyword match="DynSequence" />
+	<keyword match="DynSequence" />
+	<keyword match="DynSequenceHelper" />
+	<keyword match="DynSequenceOperations" />
+	<keyword match="DynStruct" />
+	<keyword match="DynStruct" />
+	<keyword match="DynStructHelper" />
+	<keyword match="DynStructOperations" />
+	<keyword match="DynUnion" />
+	<keyword match="DynUnion" />
+	<keyword match="DynUnionHelper" />
+	<keyword match="DynUnionOperations" />
+	<keyword match="DynValue" />
+	<keyword match="DynValue" />
+	<keyword match="DynValueBox" />
+	<keyword match="DynValueBoxOperations" />
+	<keyword match="DynValueCommon" />
+	<keyword match="DynValueCommonOperations" />
+	<keyword match="DynValueHelper" />
+	<keyword match="DynValueOperations" />
+	<keyword match="EditorKit" />
+	<keyword match="Element" />
+	<keyword match="Element" />
+	<keyword match="Element" />
+	<keyword match="ElementIterator" />
+	<keyword match="Ellipse2D" />
+	
+	
+	<keyword match="EmptyBorder" />
+	<keyword match="EmptyStackException" />
+	<keyword match="EncodedKeySpec" />
+	<keyword match="Encoder" />
+	<keyword match="Encoding" />
+	<keyword match="ENCODING_CDR_ENCAPS" />
+	<keyword match="EncryptedPrivateKeyInfo" />
+	<keyword match="Entity" />
+	<keyword match="Entity" />
+	<keyword match="EntityReference" />
+	<keyword match="EntityResolver" />
+	<keyword match="EnumControl" />
+	
+	<keyword match="Enumeration" />
+	<keyword match="EnumSyntax" />
+	<keyword match="Environment" />
+	<keyword match="EOFException" />
+	<keyword match="Error" />
+	<keyword match="ErrorHandler" />
+	<keyword match="ErrorListener" />
+	<keyword match="ErrorManager" />
+	<keyword match="EtchedBorder" />
+	<keyword match="Event" />
+	<keyword match="EventContext" />
+	<keyword match="EventDirContext" />
+	<keyword match="EventHandler" />
+	<keyword match="EventListener" />
+	<keyword match="EventListenerList" />
+	<keyword match="EventListenerProxy" />
+	<keyword match="EventObject" />
+	<keyword match="EventQueue" />
+	<keyword match="EventSetDescriptor" />
+	<keyword match="Exception" />
+	<keyword match="ExceptionInInitializerError" />
+	<keyword match="ExceptionList" />
+	<keyword match="ExceptionListener" />
+	<keyword match="ExemptionMechanism" />
+	<keyword match="ExemptionMechanismException" />
+	<keyword match="ExemptionMechanismSpi" />
+	<keyword match="ExpandVetoException" />
+	<keyword match="ExportException" />
+	<keyword match="Expression" />
+	<keyword match="ExtendedRequest" />
+	<keyword match="ExtendedResponse" />
+	<keyword match="Externalizable" />
+	<keyword match="FactoryConfigurationError" />
+	<keyword match="FailedLoginException" />
+	<keyword match="FeatureDescriptor" />
+	<keyword match="Fidelity" />
+	<keyword match="Field" />
+	<keyword match="FieldNameHelper" />
+	<keyword match="FieldNameHelper" />
+	<keyword match="FieldPosition" />
+	<keyword match="FieldView" />
+	<keyword match="File" />
+	<keyword match="FileCacheImageInputStream" />
+	<keyword match="FileCacheImageOutputStream" />
+	<keyword match="FileChannel" />
+	
+	<keyword match="FileChooserUI" />
+	<keyword match="FileDescriptor" />
+	<keyword match="FileDialog" />
+	<keyword match="FileFilter" />
+	<keyword match="FileFilter" />
+	<keyword match="FileHandler" />
+	<keyword match="FileImageInputStream" />
+	<keyword match="FileImageOutputStream" />
+	<keyword match="FileInputStream" />
+	<keyword match="FileLock" />
+	<keyword match="FileLockInterruptionException" />
+	<keyword match="FilenameFilter" />
+	<keyword match="FileNameMap" />
+	<keyword match="FileNotFoundException" />
+	<keyword match="FileOutputStream" />
+	<keyword match="FilePermission" />
+	<keyword match="FileReader" />
+	<keyword match="FileSystemView" />
+	<keyword match="FileView" />
+	<keyword match="FileWriter" />
+	<keyword match="Filter" />
+	<keyword match="FilteredImageSource" />
+	<keyword match="FilterInputStream" />
+	<keyword match="FilterOutputStream" />
+	<keyword match="FilterReader" />
+	<keyword match="FilterWriter" />
+	<keyword match="Finishings" />
+	<keyword match="FixedHeightLayoutCache" />
+	<keyword match="FixedHolder" />
+	<keyword match="FlatteningPathIterator" />
+	<keyword match="FlavorException" />
+	<keyword match="FlavorMap" />
+	<keyword match="FlavorTable" />
+	<keyword match="Float" />
+	<keyword match="FloatBuffer" />
+	<keyword match="FloatControl" />
+	
+	<keyword match="FloatHolder" />
+	<keyword match="FloatSeqHelper" />
+	<keyword match="FloatSeqHolder" />
+	<keyword match="FlowLayout" />
+	<keyword match="FlowView" />
+	
+	<keyword match="FocusAdapter" />
+	<keyword match="FocusEvent" />
+	<keyword match="FocusListener" />
+	<keyword match="FocusManager" />
+	<keyword match="FocusTraversalPolicy" />
+	<keyword match="Font" />
+	<keyword match="FontFormatException" />
+	<keyword match="FontMetrics" />
+	<keyword match="FontRenderContext" />
+	<keyword match="FontUIResource" />
+	<keyword match="Format" />
+	
+	<keyword match="FormatConversionProvider" />
+	<keyword match="FormatMismatch" />
+	<keyword match="FormatMismatchHelper" />
+	<keyword match="Formatter" />
+	<keyword match="FormView" />
+	<keyword match="ForwardRequest" />
+	<keyword match="ForwardRequest" />
+	<keyword match="ForwardRequestHelper" />
+	<keyword match="ForwardRequestHelper" />
+	<keyword match="Frame" />
+	<keyword match="FREE_MEM" />
+	<keyword match="GapContent" />
+	<keyword match="GatheringByteChannel" />
+	<keyword match="GeneralPath" />
+	<keyword match="GeneralSecurityException" />
+	<keyword match="GlyphJustificationInfo" />
+	<keyword match="GlyphMetrics" />
+	<keyword match="GlyphVector" />
+	<keyword match="GlyphView" />
+	
+	<keyword match="GradientPaint" />
+	<keyword match="GraphicAttribute" />
+	<keyword match="Graphics" />
+	<keyword match="Graphics2D" />
+	<keyword match="GraphicsConfigTemplate" />
+	<keyword match="GraphicsConfiguration" />
+	<keyword match="GraphicsDevice" />
+	<keyword match="GraphicsEnvironment" />
+	<keyword match="GrayFilter" />
+	<keyword match="GregorianCalendar" />
+	<keyword match="GridBagConstraints" />
+	<keyword match="GridBagLayout" />
+	<keyword match="GridLayout" />
+	<keyword match="Group" />
+	<keyword match="GSSContext" />
+	<keyword match="GSSCredential" />
+	<keyword match="GSSException" />
+	<keyword match="GSSManager" />
+	<keyword match="GSSName" />
+	<keyword match="Guard" />
+	<keyword match="GuardedObject" />
+	<keyword match="GZIPInputStream" />
+	<keyword match="GZIPOutputStream" />
+	<keyword match="Handler" />
+	<keyword match="HandlerBase" />
+	<keyword match="HandshakeCompletedEvent" />
+	<keyword match="HandshakeCompletedListener" />
+	<keyword match="HasControls" />
+	<keyword match="HashAttributeSet" />
+	<keyword match="HashDocAttributeSet" />
+	<keyword match="HashMap" />
+	<keyword match="HashPrintJobAttributeSet" />
+	<keyword match="HashPrintRequestAttributeSet" />
+	<keyword match="HashPrintServiceAttributeSet" />
+	<keyword match="HashSet" />
+	<keyword match="Hashtable" />
+	<keyword match="HeadlessException" />
+	<keyword match="HierarchyBoundsAdapter" />
+	<keyword match="HierarchyBoundsListener" />
+	<keyword match="HierarchyEvent" />
+	<keyword match="HierarchyListener" />
+	<keyword match="Highlighter" />
+	
+	
+	<keyword match="HostnameVerifier" />
+	<keyword match="HTML" />
+	
+	
+	
+	<keyword match="HTMLDocument" />
+	
+	<keyword match="HTMLEditorKit" />
+	
+	
+	
+	
+	
+	
+	<keyword match="HTMLFrameHyperlinkEvent" />
+	<keyword match="HTMLWriter" />
+	<keyword match="HttpsURLConnection" />
+	<keyword match="HttpURLConnection" />
+	<keyword match="HyperlinkEvent" />
+	
+	<keyword match="HyperlinkListener" />
+	<keyword match="ICC_ColorSpace" />
+	<keyword match="ICC_Profile" />
+	<keyword match="ICC_ProfileGray" />
+	<keyword match="ICC_ProfileRGB" />
+	<keyword match="Icon" />
+	<keyword match="IconUIResource" />
+	<keyword match="IconView" />
+	<keyword match="ID_ASSIGNMENT_POLICY_ID" />
+	<keyword match="ID_UNIQUENESS_POLICY_ID" />
+	<keyword match="IdAssignmentPolicy" />
+	<keyword match="IdAssignmentPolicyOperations" />
+	<keyword match="IdAssignmentPolicyValue" />
+	<keyword match="IdentifierHelper" />
+	<keyword match="Identity" />
+	<keyword match="IdentityHashMap" />
+	<keyword match="IdentityScope" />
+	<keyword match="IDLEntity" />
+	<keyword match="IDLType" />
+	<keyword match="IDLTypeHelper" />
+	<keyword match="IDLTypeOperations" />
+	<keyword match="IdUniquenessPolicy" />
+	<keyword match="IdUniquenessPolicyOperations" />
+	<keyword match="IdUniquenessPolicyValue" />
+	<keyword match="IIOByteBuffer" />
+	<keyword match="IIOException" />
+	<keyword match="IIOImage" />
+	<keyword match="IIOInvalidTreeException" />
+	<keyword match="IIOMetadata" />
+	<keyword match="IIOMetadataController" />
+	<keyword match="IIOMetadataFormat" />
+	<keyword match="IIOMetadataFormatImpl" />
+	<keyword match="IIOMetadataNode" />
+	<keyword match="IIOParam" />
+	<keyword match="IIOParamController" />
+	<keyword match="IIOReadProgressListener" />
+	<keyword match="IIOReadUpdateListener" />
+	<keyword match="IIOReadWarningListener" />
+	<keyword match="IIORegistry" />
+	<keyword match="IIOServiceProvider" />
+	<keyword match="IIOWriteProgressListener" />
+	<keyword match="IIOWriteWarningListener" />
+	<keyword match="IllegalAccessError" />
+	<keyword match="IllegalAccessException" />
+	<keyword match="IllegalArgumentException" />
+	<keyword match="IllegalBlockingModeException" />
+	<keyword match="IllegalBlockSizeException" />
+	<keyword match="IllegalCharsetNameException" />
+	<keyword match="IllegalComponentStateException" />
+	<keyword match="IllegalMonitorStateException" />
+	<keyword match="IllegalPathStateException" />
+	<keyword match="IllegalSelectorException" />
+	<keyword match="IllegalStateException" />
+	<keyword match="IllegalThreadStateException" />
+	<keyword match="Image" />
+	<keyword match="ImageCapabilities" />
+	<keyword match="ImageConsumer" />
+	<keyword match="ImageFilter" />
+	<keyword match="ImageGraphicAttribute" />
+	<keyword match="ImageIcon" />
+	<keyword match="ImageInputStream" />
+	<keyword match="ImageInputStreamImpl" />
+	<keyword match="ImageInputStreamSpi" />
+	<keyword match="ImageIO" />
+	<keyword match="ImageObserver" />
+	<keyword match="ImageOutputStream" />
+	<keyword match="ImageOutputStreamImpl" />
+	<keyword match="ImageOutputStreamSpi" />
+	<keyword match="ImageProducer" />
+	<keyword match="ImageReader" />
+	<keyword match="ImageReaderSpi" />
+	<keyword match="ImageReaderWriterSpi" />
+	<keyword match="ImageReadParam" />
+	<keyword match="ImageTranscoder" />
+	<keyword match="ImageTranscoderSpi" />
+	<keyword match="ImageTypeSpecifier" />
+	<keyword match="ImageView" />
+	<keyword match="ImageWriteParam" />
+	<keyword match="ImageWriter" />
+	<keyword match="ImageWriterSpi" />
+	<keyword match="ImagingOpException" />
+	<keyword match="IMP_LIMIT" />
+	<keyword match="IMPLICIT_ACTIVATION_POLICY_ID" />
+	<keyword match="ImplicitActivationPolicy" />
+	<keyword match="ImplicitActivationPolicyOperations" />
+	<keyword match="ImplicitActivationPolicyValue" />
+	<keyword match="IncompatibleClassChangeError" />
+	<keyword match="InconsistentTypeCode" />
+	<keyword match="InconsistentTypeCode" />
+	<keyword match="InconsistentTypeCodeHelper" />
+	<keyword match="IndexColorModel" />
+	<keyword match="IndexedPropertyDescriptor" />
+	<keyword match="IndexOutOfBoundsException" />
+	<keyword match="IndirectionException" />
+	<keyword match="Inet4Address" />
+	<keyword match="Inet6Address" />
+	<keyword match="InetAddress" />
+	<keyword match="InetSocketAddress" />
+	<keyword match="Inflater" />
+	<keyword match="InflaterInputStream" />
+	<keyword match="InheritableThreadLocal" />
+	<keyword match="InitialContext" />
+	<keyword match="InitialContextFactory" />
+	<keyword match="InitialContextFactoryBuilder" />
+	<keyword match="InitialDirContext" />
+	<keyword match="INITIALIZE" />
+	<keyword match="InitialLdapContext" />
+	<keyword match="InlineView" />
+	<keyword match="InputContext" />
+	<keyword match="InputEvent" />
+	<keyword match="InputMap" />
+	<keyword match="InputMapUIResource" />
+	<keyword match="InputMethod" />
+	<keyword match="InputMethodContext" />
+	<keyword match="InputMethodDescriptor" />
+	<keyword match="InputMethodEvent" />
+	<keyword match="InputMethodHighlight" />
+	<keyword match="InputMethodListener" />
+	<keyword match="InputMethodRequests" />
+	<keyword match="InputSource" />
+	<keyword match="InputStream" />
+	<keyword match="InputStream" />
+	<keyword match="InputStream" />
+	<keyword match="InputStreamReader" />
+	<keyword match="InputSubset" />
+	<keyword match="InputVerifier" />
+	<keyword match="Insets" />
+	<keyword match="InsetsUIResource" />
+	<keyword match="InstantiationError" />
+	<keyword match="InstantiationException" />
+	<keyword match="Instrument" />
+	<keyword match="InsufficientResourcesException" />
+	<keyword match="IntBuffer" />
+	<keyword match="Integer" />
+	<keyword match="IntegerSyntax" />
+	<keyword match="Interceptor" />
+	<keyword match="InterceptorOperations" />
+	<keyword match="INTERNAL" />
+	<keyword match="InternalError" />
+	<keyword match="InternalFrameAdapter" />
+	<keyword match="InternalFrameEvent" />
+	<keyword match="InternalFrameFocusTraversalPolicy" />
+	<keyword match="InternalFrameListener" />
+	<keyword match="InternalFrameUI" />
+	<keyword match="InternationalFormatter" />
+	<keyword match="InterruptedException" />
+	<keyword match="InterruptedIOException" />
+	<keyword match="InterruptedNamingException" />
+	<keyword match="InterruptibleChannel" />
+	<keyword match="INTF_REPOS" />
+	<keyword match="IntHolder" />
+	<keyword match="IntrospectionException" />
+	<keyword match="Introspector" />
+	<keyword match="INV_FLAG" />
+	<keyword match="INV_IDENT" />
+	<keyword match="INV_OBJREF" />
+	<keyword match="INV_POLICY" />
+	<keyword match="Invalid" />
+	<keyword match="INVALID_TRANSACTION" />
+	<keyword match="InvalidAddress" />
+	<keyword match="InvalidAddressHelper" />
+	<keyword match="InvalidAddressHolder" />
+	<keyword match="InvalidAlgorithmParameterException" />
+	<keyword match="InvalidAttributeIdentifierException" />
+	<keyword match="InvalidAttributesException" />
+	<keyword match="InvalidAttributeValueException" />
+	<keyword match="InvalidClassException" />
+	<keyword match="InvalidDnDOperationException" />
+	<keyword match="InvalidKeyException" />
+	<keyword match="InvalidKeySpecException" />
+	<keyword match="InvalidMarkException" />
+	<keyword match="InvalidMidiDataException" />
+	<keyword match="InvalidName" />
+	<keyword match="InvalidName" />
+	<keyword match="InvalidName" />
+	<keyword match="InvalidNameException" />
+	<keyword match="InvalidNameHelper" />
+	<keyword match="InvalidNameHelper" />
+	<keyword match="InvalidNameHolder" />
+	<keyword match="InvalidObjectException" />
+	<keyword match="InvalidParameterException" />
+	<keyword match="InvalidParameterSpecException" />
+	<keyword match="InvalidPolicy" />
+	<keyword match="InvalidPolicyHelper" />
+	<keyword match="InvalidPreferencesFormatException" />
+	<keyword match="InvalidSearchControlsException" />
+	<keyword match="InvalidSearchFilterException" />
+	<keyword match="InvalidSeq" />
+	<keyword match="InvalidSlot" />
+	<keyword match="InvalidSlotHelper" />
+	<keyword match="InvalidTransactionException" />
+	<keyword match="InvalidTypeForEncoding" />
+	<keyword match="InvalidTypeForEncodingHelper" />
+	<keyword match="InvalidValue" />
+	<keyword match="InvalidValue" />
+	<keyword match="InvalidValueHelper" />
+	<keyword match="InvocationEvent" />
+	<keyword match="InvocationHandler" />
+	<keyword match="InvocationTargetException" />
+	<keyword match="InvokeHandler" />
+	<keyword match="IOException" />
+	<keyword match="IOR" />
+	<keyword match="IORHelper" />
+	<keyword match="IORHolder" />
+	<keyword match="IORInfo" />
+	<keyword match="IORInfoOperations" />
+	<keyword match="IORInterceptor" />
+	<keyword match="IORInterceptorOperations" />
+	<keyword match="IRObject" />
+	<keyword match="IRObjectOperations" />
+	<keyword match="IstringHelper" />
+	<keyword match="ItemEvent" />
+	<keyword match="ItemListener" />
+	<keyword match="ItemSelectable" />
+	<keyword match="Iterator" />
+	<keyword match="IvParameterSpec" />
+	<keyword match="JApplet" />
+	<keyword match="JarEntry" />
+	<keyword match="JarException" />
+	<keyword match="JarFile" />
+	<keyword match="JarInputStream" />
+	<keyword match="JarOutputStream" />
+	<keyword match="JarURLConnection" />
+	<keyword match="JButton" />
+	<keyword match="JCheckBox" />
+	<keyword match="JCheckBoxMenuItem" />
+	<keyword match="JColorChooser" />
+	<keyword match="JComboBox" />
+	
+	<keyword match="JComponent" />
+	<keyword match="JDesktopPane" />
+	<keyword match="JDialog" />
+	<keyword match="JEditorPane" />
+	<keyword match="JFileChooser" />
+	<keyword match="JFormattedTextField" />
+	
+	
+	<keyword match="JFrame" />
+	<keyword match="JInternalFrame" />
+	
+	<keyword match="JLabel" />
+	<keyword match="JLayeredPane" />
+	<keyword match="JList" />
+	<keyword match="JMenu" />
+	<keyword match="JMenuBar" />
+	<keyword match="JMenuItem" />
+	<keyword match="JobAttributes" />
+	
+	
+	
+	
+	
+	<keyword match="JobHoldUntil" />
+	<keyword match="JobImpressions" />
+	<keyword match="JobImpressionsCompleted" />
+	<keyword match="JobImpressionsSupported" />
+	<keyword match="JobKOctets" />
+	<keyword match="JobKOctetsProcessed" />
+	<keyword match="JobKOctetsSupported" />
+	<keyword match="JobMediaSheets" />
+	<keyword match="JobMediaSheetsCompleted" />
+	<keyword match="JobMediaSheetsSupported" />
+	<keyword match="JobMessageFromOperator" />
+	<keyword match="JobName" />
+	<keyword match="JobOriginatingUserName" />
+	<keyword match="JobPriority" />
+	<keyword match="JobPrioritySupported" />
+	<keyword match="JobSheets" />
+	<keyword match="JobState" />
+	<keyword match="JobStateReason" />
+	<keyword match="JobStateReasons" />
+	<keyword match="JOptionPane" />
+	<keyword match="JPanel" />
+	<keyword match="JPasswordField" />
+	<keyword match="JPEGHuffmanTable" />
+	<keyword match="JPEGImageReadParam" />
+	<keyword match="JPEGImageWriteParam" />
+	<keyword match="JPEGQTable" />
+	<keyword match="JPopupMenu" />
+	
+	<keyword match="JProgressBar" />
+	<keyword match="JRadioButton" />
+	<keyword match="JRadioButtonMenuItem" />
+	<keyword match="JRootPane" />
+	<keyword match="JScrollBar" />
+	<keyword match="JScrollPane" />
+	<keyword match="JSeparator" />
+	<keyword match="JSlider" />
+	<keyword match="JSpinner" />
+	
+	
+	
+	
+	<keyword match="JSplitPane" />
+	<keyword match="JTabbedPane" />
+	<keyword match="JTable" />
+	<keyword match="JTableHeader" />
+	<keyword match="JTextArea" />
+	<keyword match="JTextComponent" />
+	
+	<keyword match="JTextField" />
+	<keyword match="JTextPane" />
+	<keyword match="JToggleButton" />
+	
+	<keyword match="JToolBar" />
+	
+	<keyword match="JToolTip" />
+	<keyword match="JTree" />
+	
+	
+	<keyword match="JViewport" />
+	<keyword match="JWindow" />
+	<keyword match="KerberosKey" />
+	<keyword match="KerberosPrincipal" />
+	<keyword match="KerberosTicket" />
+	<keyword match="Kernel" />
+	<keyword match="Key" />
+	<keyword match="KeyAdapter" />
+	<keyword match="KeyAgreement" />
+	<keyword match="KeyAgreementSpi" />
+	<keyword match="KeyboardFocusManager" />
+	<keyword match="KeyEvent" />
+	<keyword match="KeyEventDispatcher" />
+	<keyword match="KeyEventPostProcessor" />
+	<keyword match="KeyException" />
+	<keyword match="KeyFactory" />
+	<keyword match="KeyFactorySpi" />
+	<keyword match="KeyGenerator" />
+	<keyword match="KeyGeneratorSpi" />
+	<keyword match="KeyListener" />
+	<keyword match="KeyManagementException" />
+	<keyword match="KeyManager" />
+	<keyword match="KeyManagerFactory" />
+	<keyword match="KeyManagerFactorySpi" />
+	<keyword match="Keymap" />
+	<keyword match="KeyPair" />
+	<keyword match="KeyPairGenerator" />
+	<keyword match="KeyPairGeneratorSpi" />
+	<keyword match="KeySpec" />
+	<keyword match="KeyStore" />
+	<keyword match="KeyStoreException" />
+	<keyword match="KeyStoreSpi" />
+	<keyword match="KeyStroke" />
+	<keyword match="Label" />
+	<keyword match="LabelUI" />
+	<keyword match="LabelView" />
+	<keyword match="LanguageCallback" />
+	<keyword match="LastOwnerException" />
+	<keyword match="LayeredHighlighter" />
+	
+	<keyword match="LayoutFocusTraversalPolicy" />
+	<keyword match="LayoutManager" />
+	<keyword match="LayoutManager2" />
+	<keyword match="LayoutQueue" />
+	<keyword match="LDAPCertStoreParameters" />
+	<keyword match="LdapContext" />
+	<keyword match="LdapReferralException" />
+	<keyword match="Lease" />
+	<keyword match="Level" />
+	<keyword match="LexicalHandler" />
+	<keyword match="LIFESPAN_POLICY_ID" />
+	<keyword match="LifespanPolicy" />
+	<keyword match="LifespanPolicyOperations" />
+	<keyword match="LifespanPolicyValue" />
+	<keyword match="LimitExceededException" />
+	<keyword match="Line" />
+	
+	<keyword match="Line2D" />
+	
+	
+	<keyword match="LineBorder" />
+	<keyword match="LineBreakMeasurer" />
+	<keyword match="LineEvent" />
+	
+	<keyword match="LineListener" />
+	<keyword match="LineMetrics" />
+	<keyword match="LineNumberInputStream" />
+	<keyword match="LineNumberReader" />
+	<keyword match="LineUnavailableException" />
+	<keyword match="LinkageError" />
+	<keyword match="LinkedHashMap" />
+	<keyword match="LinkedHashSet" />
+	<keyword match="LinkedList" />
+	<keyword match="LinkException" />
+	<keyword match="LinkLoopException" />
+	<keyword match="LinkRef" />
+	<keyword match="List" />
+	<keyword match="List" />
+	<keyword match="ListCellRenderer" />
+	<keyword match="ListDataEvent" />
+	<keyword match="ListDataListener" />
+	<keyword match="ListIterator" />
+	<keyword match="ListModel" />
+	<keyword match="ListResourceBundle" />
+	<keyword match="ListSelectionEvent" />
+	<keyword match="ListSelectionListener" />
+	<keyword match="ListSelectionModel" />
+	<keyword match="ListUI" />
+	<keyword match="ListView" />
+	<keyword match="LoaderHandler" />
+	<keyword match="Locale" />
+	<keyword match="LocalObject" />
+	<keyword match="LocateRegistry" />
+	<keyword match="LOCATION_FORWARD" />
+	<keyword match="Locator" />
+	<keyword match="LocatorImpl" />
+	<keyword match="Logger" />
+	<keyword match="LoggingPermission" />
+	<keyword match="LoginContext" />
+	<keyword match="LoginException" />
+	<keyword match="LoginModule" />
+	<keyword match="LogManager" />
+	<keyword match="LogRecord" />
+	<keyword match="LogStream" />
+	<keyword match="Long" />
+	<keyword match="LongBuffer" />
+	<keyword match="LongHolder" />
+	<keyword match="LongLongSeqHelper" />
+	<keyword match="LongLongSeqHolder" />
+	<keyword match="LongSeqHelper" />
+	<keyword match="LongSeqHolder" />
+	<keyword match="LookAndFeel" />
+	<keyword match="LookupOp" />
+	<keyword match="LookupTable" />
+	<keyword match="Mac" />
+	<keyword match="MacSpi" />
+	<keyword match="MalformedInputException" />
+	<keyword match="MalformedLinkException" />
+	<keyword match="MalformedURLException" />
+	<keyword match="ManagerFactoryParameters" />
+	<keyword match="Manifest" />
+	<keyword match="Map" />
+	
+	<keyword match="MappedByteBuffer" />
+	<keyword match="MARSHAL" />
+	<keyword match="MarshalException" />
+	<keyword match="MarshalledObject" />
+	<keyword match="MaskFormatter" />
+	<keyword match="Matcher" />
+	<keyword match="Math" />
+	<keyword match="MatteBorder" />
+	<keyword match="Media" />
+	<keyword match="MediaName" />
+	<keyword match="MediaPrintableArea" />
+	<keyword match="MediaSize" />
+	
+	
+	
+	
+	
+	<keyword match="MediaSizeName" />
+	<keyword match="MediaTracker" />
+	<keyword match="MediaTray" />
+	<keyword match="Member" />
+	<keyword match="MemoryCacheImageInputStream" />
+	<keyword match="MemoryCacheImageOutputStream" />
+	<keyword match="MemoryHandler" />
+	<keyword match="MemoryImageSource" />
+	<keyword match="Menu" />
+	<keyword match="MenuBar" />
+	<keyword match="MenuBarUI" />
+	<keyword match="MenuComponent" />
+	<keyword match="MenuContainer" />
+	<keyword match="MenuDragMouseEvent" />
+	<keyword match="MenuDragMouseListener" />
+	<keyword match="MenuElement" />
+	<keyword match="MenuEvent" />
+	<keyword match="MenuItem" />
+	<keyword match="MenuItemUI" />
+	<keyword match="MenuKeyEvent" />
+	<keyword match="MenuKeyListener" />
+	<keyword match="MenuListener" />
+	<keyword match="MenuSelectionManager" />
+	<keyword match="MenuShortcut" />
+	<keyword match="MessageDigest" />
+	<keyword match="MessageDigestSpi" />
+	<keyword match="MessageFormat" />
+	
+	<keyword match="MessageProp" />
+	<keyword match="MetaEventListener" />
+	<keyword match="MetalBorders" />
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	<keyword match="MetalButtonUI" />
+	<keyword match="MetalCheckBoxIcon" />
+	<keyword match="MetalCheckBoxUI" />
+	<keyword match="MetalComboBoxButton" />
+	<keyword match="MetalComboBoxEditor" />
+	
+	<keyword match="MetalComboBoxIcon" />
+	<keyword match="MetalComboBoxUI" />
+	<keyword match="MetalDesktopIconUI" />
+	<keyword match="MetalFileChooserUI" />
+	<keyword match="MetalIconFactory" />
+	
+	
+	
+	
+	
+	
+	<keyword match="MetalInternalFrameTitlePane" />
+	<keyword match="MetalInternalFrameUI" />
+	<keyword match="MetalLabelUI" />
+	<keyword match="MetalLookAndFeel" />
+	<keyword match="MetalPopupMenuSeparatorUI" />
+	<keyword match="MetalProgressBarUI" />
+	<keyword match="MetalRadioButtonUI" />
+	<keyword match="MetalRootPaneUI" />
+	<keyword match="MetalScrollBarUI" />
+	<keyword match="MetalScrollButton" />
+	<keyword match="MetalScrollPaneUI" />
+	<keyword match="MetalSeparatorUI" />
+	<keyword match="MetalSliderUI" />
+	<keyword match="MetalSplitPaneUI" />
+	<keyword match="MetalTabbedPaneUI" />
+	<keyword match="MetalTextFieldUI" />
+	<keyword match="MetalTheme" />
+	<keyword match="MetalToggleButtonUI" />
+	<keyword match="MetalToolBarUI" />
+	<keyword match="MetalToolTipUI" />
+	<keyword match="MetalTreeUI" />
+	<keyword match="MetaMessage" />
+	<keyword match="Method" />
+	<keyword match="MethodDescriptor" />
+	<keyword match="MidiChannel" />
+	<keyword match="MidiDevice" />
+	
+	<keyword match="MidiDeviceProvider" />
+	<keyword match="MidiEvent" />
+	<keyword match="MidiFileFormat" />
+	<keyword match="MidiFileReader" />
+	<keyword match="MidiFileWriter" />
+	<keyword match="MidiMessage" />
+	<keyword match="MidiSystem" />
+	<keyword match="MidiUnavailableException" />
+	<keyword match="MimeTypeParseException" />
+	<keyword match="MinimalHTMLWriter" />
+	<keyword match="MissingResourceException" />
+	<keyword match="Mixer" />
+	
+	<keyword match="MixerProvider" />
+	<keyword match="ModificationItem" />
+	<keyword match="Modifier" />
+	<keyword match="MouseAdapter" />
+	<keyword match="MouseDragGestureRecognizer" />
+	<keyword match="MouseEvent" />
+	<keyword match="MouseInputAdapter" />
+	<keyword match="MouseInputListener" />
+	<keyword match="MouseListener" />
+	<keyword match="MouseMotionAdapter" />
+	<keyword match="MouseMotionListener" />
+	<keyword match="MouseWheelEvent" />
+	<keyword match="MouseWheelListener" />
+	<keyword match="MultiButtonUI" />
+	<keyword match="MulticastSocket" />
+	<keyword match="MultiColorChooserUI" />
+	<keyword match="MultiComboBoxUI" />
+	<keyword match="MultiDesktopIconUI" />
+	<keyword match="MultiDesktopPaneUI" />
+	<keyword match="MultiDoc" />
+	<keyword match="MultiDocPrintJob" />
+	<keyword match="MultiDocPrintService" />
+	<keyword match="MultiFileChooserUI" />
+	<keyword match="MultiInternalFrameUI" />
+	<keyword match="MultiLabelUI" />
+	<keyword match="MultiListUI" />
+	<keyword match="MultiLookAndFeel" />
+	<keyword match="MultiMenuBarUI" />
+	<keyword match="MultiMenuItemUI" />
+	<keyword match="MultiOptionPaneUI" />
+	<keyword match="MultiPanelUI" />
+	<keyword match="MultiPixelPackedSampleModel" />
+	<keyword match="MultipleComponentProfileHelper" />
+	<keyword match="MultipleComponentProfileHolder" />
+	<keyword match="MultipleDocumentHandling" />
+	<keyword match="MultipleMaster" />
+	<keyword match="MultiPopupMenuUI" />
+	<keyword match="MultiProgressBarUI" />
+	<keyword match="MultiRootPaneUI" />
+	<keyword match="MultiScrollBarUI" />
+	<keyword match="MultiScrollPaneUI" />
+	<keyword match="MultiSeparatorUI" />
+	<keyword match="MultiSliderUI" />
+	<keyword match="MultiSpinnerUI" />
+	<keyword match="MultiSplitPaneUI" />
+	<keyword match="MultiTabbedPaneUI" />
+	<keyword match="MultiTableHeaderUI" />
+	<keyword match="MultiTableUI" />
+	<keyword match="MultiTextUI" />
+	<keyword match="MultiToolBarUI" />
+	<keyword match="MultiToolTipUI" />
+	<keyword match="MultiTreeUI" />
+	<keyword match="MultiViewportUI" />
+	<keyword match="MutableAttributeSet" />
+	<keyword match="MutableComboBoxModel" />
+	<keyword match="MutableTreeNode" />
+	<keyword match="Name" />
+	<keyword match="NameAlreadyBoundException" />
+	<keyword match="NameCallback" />
+	<keyword match="NameClassPair" />
+	<keyword match="NameComponent" />
+	<keyword match="NameComponentHelper" />
+	<keyword match="NameComponentHolder" />
+	<keyword match="NamedNodeMap" />
+	<keyword match="NamedValue" />
+	<keyword match="NameDynAnyPair" />
+	<keyword match="NameDynAnyPairHelper" />
+	<keyword match="NameDynAnyPairSeqHelper" />
+	<keyword match="NameHelper" />
+	<keyword match="NameHolder" />
+	<keyword match="NameNotFoundException" />
+	<keyword match="NameParser" />
+	<keyword match="NamespaceChangeListener" />
+	<keyword match="NamespaceSupport" />
+	<keyword match="NameValuePair" />
+	<keyword match="NameValuePair" />
+	<keyword match="NameValuePairHelper" />
+	<keyword match="NameValuePairHelper" />
+	<keyword match="NameValuePairSeqHelper" />
+	<keyword match="Naming" />
+	<keyword match="NamingContext" />
+	<keyword match="NamingContextExt" />
+	<keyword match="NamingContextExtHelper" />
+	<keyword match="NamingContextExtHolder" />
+	<keyword match="NamingContextExtOperations" />
+	<keyword match="NamingContextExtPOA" />
+	<keyword match="NamingContextHelper" />
+	<keyword match="NamingContextHolder" />
+	<keyword match="NamingContextOperations" />
+	<keyword match="NamingContextPOA" />
+	<keyword match="NamingEnumeration" />
+	<keyword match="NamingEvent" />
+	<keyword match="NamingException" />
+	<keyword match="NamingExceptionEvent" />
+	<keyword match="NamingListener" />
+	<keyword match="NamingManager" />
+	<keyword match="NamingSecurityException" />
+	<keyword match="NavigationFilter" />
+	
+	<keyword match="NegativeArraySizeException" />
+	<keyword match="NetPermission" />
+	<keyword match="NetworkInterface" />
+	<keyword match="NO_IMPLEMENT" />
+	<keyword match="NO_MEMORY" />
+	<keyword match="NO_PERMISSION" />
+	<keyword match="NO_RESOURCES" />
+	<keyword match="NO_RESPONSE" />
+	<keyword match="NoClassDefFoundError" />
+	<keyword match="NoConnectionPendingException" />
+	<keyword match="NoContext" />
+	<keyword match="NoContextHelper" />
+	<keyword match="Node" />
+	<keyword match="NodeChangeEvent" />
+	<keyword match="NodeChangeListener" />
+	<keyword match="NodeList" />
+	<keyword match="NoInitialContextException" />
+	<keyword match="NoninvertibleTransformException" />
+	<keyword match="NonReadableChannelException" />
+	<keyword match="NonWritableChannelException" />
+	<keyword match="NoPermissionException" />
+	<keyword match="NoRouteToHostException" />
+	<keyword match="NoServant" />
+	<keyword match="NoServantHelper" />
+	<keyword match="NoSuchAlgorithmException" />
+	<keyword match="NoSuchAttributeException" />
+	<keyword match="NoSuchElementException" />
+	<keyword match="NoSuchFieldError" />
+	<keyword match="NoSuchFieldException" />
+	<keyword match="NoSuchMethodError" />
+	<keyword match="NoSuchMethodException" />
+	<keyword match="NoSuchObjectException" />
+	<keyword match="NoSuchPaddingException" />
+	<keyword match="NoSuchProviderException" />
+	<keyword match="NotActiveException" />
+	<keyword match="Notation" />
+	<keyword match="NotBoundException" />
+	<keyword match="NotContextException" />
+	<keyword match="NotEmpty" />
+	<keyword match="NotEmptyHelper" />
+	<keyword match="NotEmptyHolder" />
+	<keyword match="NotFound" />
+	<keyword match="NotFoundHelper" />
+	<keyword match="NotFoundHolder" />
+	<keyword match="NotFoundReason" />
+	<keyword match="NotFoundReasonHelper" />
+	<keyword match="NotFoundReasonHolder" />
+	<keyword match="NotOwnerException" />
+	<keyword match="NotSerializableException" />
+	<keyword match="NotYetBoundException" />
+	<keyword match="NotYetConnectedException" />
+	<keyword match="NullCipher" />
+	<keyword match="NullPointerException" />
+	<keyword match="Number" />
+	<keyword match="NumberFormat" />
+	
+	<keyword match="NumberFormatException" />
+	<keyword match="NumberFormatter" />
+	<keyword match="NumberOfDocuments" />
+	<keyword match="NumberOfInterveningJobs" />
+	<keyword match="NumberUp" />
+	<keyword match="NumberUpSupported" />
+	<keyword match="NumericShaper" />
+	<keyword match="NVList" />
+	<keyword match="OBJ_ADAPTER" />
+	<keyword match="Object" />
+	<keyword match="OBJECT_NOT_EXIST" />
+	<keyword match="ObjectAlreadyActive" />
+	<keyword match="ObjectAlreadyActiveHelper" />
+	<keyword match="ObjectChangeListener" />
+	<keyword match="ObjectFactory" />
+	<keyword match="ObjectFactoryBuilder" />
+	<keyword match="ObjectHelper" />
+	<keyword match="ObjectHolder" />
+	<keyword match="ObjectIdHelper" />
+	<keyword match="ObjectImpl" />
+	<keyword match="ObjectImpl" />
+	<keyword match="ObjectInput" />
+	<keyword match="ObjectInputStream" />
+	
+	<keyword match="ObjectInputValidation" />
+	<keyword match="ObjectNotActive" />
+	<keyword match="ObjectNotActiveHelper" />
+	<keyword match="ObjectOutput" />
+	<keyword match="ObjectOutputStream" />
+	
+	<keyword match="ObjectStreamClass" />
+	<keyword match="ObjectStreamConstants" />
+	<keyword match="ObjectStreamException" />
+	<keyword match="ObjectStreamField" />
+	<keyword match="ObjectView" />
+	<keyword match="ObjID" />
+	<keyword match="Observable" />
+	<keyword match="Observer" />
+	<keyword match="OctetSeqHelper" />
+	<keyword match="OctetSeqHolder" />
+	<keyword match="Oid" />
+	<keyword match="OMGVMCID" />
+	<keyword match="OpenType" />
+	<keyword match="Operation" />
+	<keyword match="OperationNotSupportedException" />
+	<keyword match="Option" />
+	<keyword match="OptionalDataException" />
+	<keyword match="OptionPaneUI" />
+	<keyword match="ORB" />
+	<keyword match="ORB" />
+	<keyword match="ORBInitializer" />
+	<keyword match="ORBInitializerOperations" />
+	<keyword match="ORBInitInfo" />
+	<keyword match="ORBInitInfoOperations" />
+	<keyword match="OrientationRequested" />
+	<keyword match="OutOfMemoryError" />
+	<keyword match="OutputDeviceAssigned" />
+	<keyword match="OutputKeys" />
+	<keyword match="OutputStream" />
+	<keyword match="OutputStream" />
+	<keyword match="OutputStream" />
+	<keyword match="OutputStreamWriter" />
+	<keyword match="OverlappingFileLockException" />
+	<keyword match="OverlayLayout" />
+	<keyword match="Owner" />
+	<keyword match="Package" />
+	<keyword match="PackedColorModel" />
+	<keyword match="Pageable" />
+	<keyword match="PageAttributes" />
+	
+	
+	
+	
+	
+	<keyword match="PageFormat" />
+	<keyword match="PageRanges" />
+	<keyword match="PagesPerMinute" />
+	<keyword match="PagesPerMinuteColor" />
+	<keyword match="Paint" />
+	<keyword match="PaintContext" />
+	<keyword match="PaintEvent" />
+	<keyword match="Panel" />
+	<keyword match="PanelUI" />
+	<keyword match="Paper" />
+	<keyword match="ParagraphView" />
+	<keyword match="ParagraphView" />
+	<keyword match="Parameter" />
+	<keyword match="ParameterBlock" />
+	<keyword match="ParameterDescriptor" />
+	<keyword match="ParameterMetaData" />
+	<keyword match="ParameterMode" />
+	<keyword match="ParameterModeHelper" />
+	<keyword match="ParameterModeHolder" />
+	<keyword match="ParseException" />
+	<keyword match="ParsePosition" />
+	<keyword match="Parser" />
+	<keyword match="Parser" />
+	<keyword match="ParserAdapter" />
+	<keyword match="ParserConfigurationException" />
+	<keyword match="ParserDelegator" />
+	<keyword match="ParserFactory" />
+	<keyword match="PartialResultException" />
+	<keyword match="PasswordAuthentication" />
+	<keyword match="PasswordCallback" />
+	<keyword match="PasswordView" />
+	<keyword match="Patch" />
+	<keyword match="PathIterator" />
+	<keyword match="Pattern" />
+	<keyword match="PatternSyntaxException" />
+	<keyword match="PBEKey" />
+	<keyword match="PBEKeySpec" />
+	<keyword match="PBEParameterSpec" />
+	<keyword match="PDLOverrideSupported" />
+	<keyword match="Permission" />
+	<keyword match="Permission" />
+	<keyword match="PermissionCollection" />
+	<keyword match="Permissions" />
+	<keyword match="PERSIST_STORE" />
+	<keyword match="PersistenceDelegate" />
+	<keyword match="PhantomReference" />
+	<keyword match="Pipe" />
+	
+	
+	<keyword match="PipedInputStream" />
+	<keyword match="PipedOutputStream" />
+	<keyword match="PipedReader" />
+	<keyword match="PipedWriter" />
+	<keyword match="PixelGrabber" />
+	<keyword match="PixelInterleavedSampleModel" />
+	<keyword match="PKCS8EncodedKeySpec" />
+	<keyword match="PKIXBuilderParameters" />
+	<keyword match="PKIXCertPathBuilderResult" />
+	<keyword match="PKIXCertPathChecker" />
+	<keyword match="PKIXCertPathValidatorResult" />
+	<keyword match="PKIXParameters" />
+	<keyword match="PlainDocument" />
+	<keyword match="PlainView" />
+	<keyword match="POA" />
+	<keyword match="POAHelper" />
+	<keyword match="POAManager" />
+	<keyword match="POAManagerOperations" />
+	<keyword match="POAOperations" />
+	<keyword match="Point" />
+	<keyword match="Point2D" />
+	
+	
+	<keyword match="Policy" />
+	<keyword match="Policy" />
+	<keyword match="Policy" />
+	<keyword match="PolicyError" />
+	<keyword match="PolicyErrorCodeHelper" />
+	<keyword match="PolicyErrorHelper" />
+	<keyword match="PolicyErrorHolder" />
+	<keyword match="PolicyFactory" />
+	<keyword match="PolicyFactoryOperations" />
+	<keyword match="PolicyHelper" />
+	<keyword match="PolicyHolder" />
+	<keyword match="PolicyListHelper" />
+	<keyword match="PolicyListHolder" />
+	<keyword match="PolicyNode" />
+	<keyword match="PolicyOperations" />
+	<keyword match="PolicyQualifierInfo" />
+	<keyword match="PolicyTypeHelper" />
+	<keyword match="Polygon" />
+	<keyword match="PooledConnection" />
+	<keyword match="Popup" />
+	<keyword match="PopupFactory" />
+	<keyword match="PopupMenu" />
+	<keyword match="PopupMenuEvent" />
+	<keyword match="PopupMenuListener" />
+	<keyword match="PopupMenuUI" />
+	<keyword match="Port" />
+	
+	<keyword match="PortableRemoteObject" />
+	<keyword match="PortableRemoteObjectDelegate" />
+	<keyword match="PortUnreachableException" />
+	<keyword match="Position" />
+	
+	<keyword match="PreferenceChangeEvent" />
+	<keyword match="PreferenceChangeListener" />
+	<keyword match="Preferences" />
+	<keyword match="PreferencesFactory" />
+	<keyword match="PreparedStatement" />
+	<keyword match="PresentationDirection" />
+	<keyword match="Principal" />
+	<keyword match="Principal" />
+	<keyword match="PrincipalHolder" />
+	<keyword match="Printable" />
+	<keyword match="PrinterAbortException" />
+	<keyword match="PrinterException" />
+	<keyword match="PrinterGraphics" />
+	<keyword match="PrinterInfo" />
+	<keyword match="PrinterIOException" />
+	<keyword match="PrinterIsAcceptingJobs" />
+	<keyword match="PrinterJob" />
+	<keyword match="PrinterLocation" />
+	<keyword match="PrinterMakeAndModel" />
+	<keyword match="PrinterMessageFromOperator" />
+	<keyword match="PrinterMoreInfo" />
+	<keyword match="PrinterMoreInfoManufacturer" />
+	<keyword match="PrinterName" />
+	<keyword match="PrinterResolution" />
+	<keyword match="PrinterState" />
+	<keyword match="PrinterStateReason" />
+	<keyword match="PrinterStateReasons" />
+	<keyword match="PrinterURI" />
+	<keyword match="PrintEvent" />
+	<keyword match="PrintException" />
+	<keyword match="PrintGraphics" />
+	<keyword match="PrintJob" />
+	<keyword match="PrintJobAdapter" />
+	<keyword match="PrintJobAttribute" />
+	<keyword match="PrintJobAttributeEvent" />
+	<keyword match="PrintJobAttributeListener" />
+	<keyword match="PrintJobAttributeSet" />
+	<keyword match="PrintJobEvent" />
+	<keyword match="PrintJobListener" />
+	<keyword match="PrintQuality" />
+	<keyword match="PrintRequestAttribute" />
+	<keyword match="PrintRequestAttributeSet" />
+	<keyword match="PrintService" />
+	<keyword match="PrintServiceAttribute" />
+	<keyword match="PrintServiceAttributeEvent" />
+	<keyword match="PrintServiceAttributeListener" />
+	<keyword match="PrintServiceAttributeSet" />
+	<keyword match="PrintServiceLookup" />
+	<keyword match="PrintStream" />
+	<keyword match="PrintWriter" />
+	<keyword match="PRIVATE_MEMBER" />
+	<keyword match="PrivateCredentialPermission" />
+	<keyword match="PrivateKey" />
+	<keyword match="PrivilegedAction" />
+	<keyword match="PrivilegedActionException" />
+	<keyword match="PrivilegedExceptionAction" />
+	<keyword match="Process" />
+	<keyword match="ProcessingInstruction" />
+	<keyword match="ProfileDataException" />
+	<keyword match="ProfileIdHelper" />
+	<keyword match="ProgressBarUI" />
+	<keyword match="ProgressMonitor" />
+	<keyword match="ProgressMonitorInputStream" />
+	<keyword match="Properties" />
+	<keyword match="PropertyChangeEvent" />
+	<keyword match="PropertyChangeListener" />
+	<keyword match="PropertyChangeListenerProxy" />
+	<keyword match="PropertyChangeSupport" />
+	<keyword match="PropertyDescriptor" />
+	<keyword match="PropertyEditor" />
+	<keyword match="PropertyEditorManager" />
+	<keyword match="PropertyEditorSupport" />
+	<keyword match="PropertyPermission" />
+	<keyword match="PropertyResourceBundle" />
+	<keyword match="PropertyVetoException" />
+	<keyword match="ProtectionDomain" />
+	<keyword match="ProtocolException" />
+	<keyword match="Provider" />
+	<keyword match="ProviderException" />
+	<keyword match="Proxy" />
+	<keyword match="PSSParameterSpec" />
+	<keyword match="PUBLIC_MEMBER" />
+	<keyword match="PublicKey" />
+	<keyword match="PushbackInputStream" />
+	<keyword match="PushbackReader" />
+	<keyword match="QuadCurve2D" />
+	
+	
+	<keyword match="QueuedJobCount" />
+	<keyword match="Random" />
+	<keyword match="RandomAccess" />
+	<keyword match="RandomAccessFile" />
+	<keyword match="Raster" />
+	<keyword match="RasterFormatException" />
+	<keyword match="RasterOp" />
+	<keyword match="RC2ParameterSpec" />
+	<keyword match="RC5ParameterSpec" />
+	<keyword match="ReadableByteChannel" />
+	<keyword match="Reader" />
+	<keyword match="ReadOnlyBufferException" />
+	<keyword match="Receiver" />
+	<keyword match="Rectangle" />
+	<keyword match="Rectangle2D" />
+	
+	
+	<keyword match="RectangularShape" />
+	<keyword match="Ref" />
+	<keyword match="RefAddr" />
+	<keyword match="Reference" />
+	<keyword match="Reference" />
+	<keyword match="Referenceable" />
+	<keyword match="ReferenceQueue" />
+	<keyword match="ReferenceUriSchemesSupported" />
+	<keyword match="ReferralException" />
+	<keyword match="ReflectPermission" />
+	<keyword match="Refreshable" />
+	<keyword match="RefreshFailedException" />
+	<keyword match="RegisterableService" />
+	<keyword match="Registry" />
+	<keyword match="RegistryHandler" />
+	<keyword match="RemarshalException" />
+	<keyword match="Remote" />
+	<keyword match="RemoteCall" />
+	<keyword match="RemoteException" />
+	<keyword match="RemoteObject" />
+	<keyword match="RemoteRef" />
+	<keyword match="RemoteServer" />
+	<keyword match="RemoteStub" />
+	<keyword match="RenderableImage" />
+	<keyword match="RenderableImageOp" />
+	<keyword match="RenderableImageProducer" />
+	<keyword match="RenderContext" />
+	<keyword match="RenderedImage" />
+	<keyword match="RenderedImageFactory" />
+	<keyword match="Renderer" />
+	<keyword match="RenderingHints" />
+	
+	<keyword match="RepaintManager" />
+	<keyword match="ReplicateScaleFilter" />
+	<keyword match="RepositoryIdHelper" />
+	<keyword match="Request" />
+	<keyword match="REQUEST_PROCESSING_POLICY_ID" />
+	<keyword match="RequestInfo" />
+	<keyword match="RequestInfoOperations" />
+	<keyword match="RequestingUserName" />
+	<keyword match="RequestProcessingPolicy" />
+	<keyword match="RequestProcessingPolicyOperations" />
+	<keyword match="RequestProcessingPolicyValue" />
+	<keyword match="RescaleOp" />
+	<keyword match="ResolutionSyntax" />
+	<keyword match="Resolver" />
+	<keyword match="ResolveResult" />
+	<keyword match="ResourceBundle" />
+	<keyword match="ResponseHandler" />
+	<keyword match="Result" />
+	<keyword match="ResultSet" />
+	<keyword match="ResultSetMetaData" />
+	<keyword match="ReverbType" />
+	<keyword match="RGBImageFilter" />
+	<keyword match="RMIClassLoader" />
+	<keyword match="RMIClassLoaderSpi" />
+	<keyword match="RMIClientSocketFactory" />
+	<keyword match="RMIFailureHandler" />
+	<keyword match="RMISecurityException" />
+	<keyword match="RMISecurityManager" />
+	<keyword match="RMIServerSocketFactory" />
+	<keyword match="RMISocketFactory" />
+	<keyword match="Robot" />
+	<keyword match="RootPaneContainer" />
+	<keyword match="RootPaneUI" />
+	<keyword match="RoundRectangle2D" />
+	
+	
+	<keyword match="RowMapper" />
+	<keyword match="RowSet" />
+	<keyword match="RowSetEvent" />
+	<keyword match="RowSetInternal" />
+	<keyword match="RowSetListener" />
+	<keyword match="RowSetMetaData" />
+	<keyword match="RowSetReader" />
+	<keyword match="RowSetWriter" />
+	<keyword match="RSAKey" />
+	<keyword match="RSAKeyGenParameterSpec" />
+	<keyword match="RSAMultiPrimePrivateCrtKey" />
+	<keyword match="RSAMultiPrimePrivateCrtKeySpec" />
+	<keyword match="RSAOtherPrimeInfo" />
+	<keyword match="RSAPrivateCrtKey" />
+	<keyword match="RSAPrivateCrtKeySpec" />
+	<keyword match="RSAPrivateKey" />
+	<keyword match="RSAPrivateKeySpec" />
+	<keyword match="RSAPublicKey" />
+	<keyword match="RSAPublicKeySpec" />
+	<keyword match="RTFEditorKit" />
+	<keyword match="RuleBasedCollator" />
+	<keyword match="Runnable" />
+	<keyword match="Runtime" />
+	<keyword match="RunTime" />
+	<keyword match="RuntimeException" />
+	<keyword match="RunTimeOperations" />
+	<keyword match="RuntimePermission" />
+	<keyword match="SampleModel" />
+	<keyword match="Savepoint" />
+	<keyword match="SAXException" />
+	<keyword match="SAXNotRecognizedException" />
+	<keyword match="SAXNotSupportedException" />
+	<keyword match="SAXParseException" />
+	<keyword match="SAXParser" />
+	<keyword match="SAXParserFactory" />
+	<keyword match="SAXResult" />
+	<keyword match="SAXSource" />
+	<keyword match="SAXTransformerFactory" />
+	<keyword match="ScatteringByteChannel" />
+	<keyword match="SchemaViolationException" />
+	<keyword match="Scrollable" />
+	<keyword match="Scrollbar" />
+	<keyword match="ScrollBarUI" />
+	<keyword match="ScrollPane" />
+	<keyword match="ScrollPaneAdjustable" />
+	<keyword match="ScrollPaneConstants" />
+	<keyword match="ScrollPaneLayout" />
+	
+	<keyword match="ScrollPaneUI" />
+	<keyword match="SealedObject" />
+	<keyword match="SearchControls" />
+	<keyword match="SearchResult" />
+	<keyword match="SecretKey" />
+	<keyword match="SecretKeyFactory" />
+	<keyword match="SecretKeyFactorySpi" />
+	<keyword match="SecretKeySpec" />
+	<keyword match="SecureClassLoader" />
+	<keyword match="SecureRandom" />
+	<keyword match="SecureRandomSpi" />
+	<keyword match="Security" />
+	<keyword match="SecurityException" />
+	<keyword match="SecurityManager" />
+	<keyword match="SecurityPermission" />
+	<keyword match="Segment" />
+	<keyword match="SelectableChannel" />
+	<keyword match="SelectionKey" />
+	<keyword match="Selector" />
+	<keyword match="SelectorProvider" />
+	<keyword match="SeparatorUI" />
+	<keyword match="Sequence" />
+	<keyword match="SequenceInputStream" />
+	<keyword match="Sequencer" />
+	
+	<keyword match="Serializable" />
+	<keyword match="SerializablePermission" />
+	<keyword match="Servant" />
+	<keyword match="SERVANT_RETENTION_POLICY_ID" />
+	<keyword match="ServantActivator" />
+	<keyword match="ServantActivatorHelper" />
+	<keyword match="ServantActivatorOperations" />
+	<keyword match="ServantActivatorPOA" />
+	<keyword match="ServantAlreadyActive" />
+	<keyword match="ServantAlreadyActiveHelper" />
+	<keyword match="ServantLocator" />
+	<keyword match="ServantLocatorHelper" />
+	<keyword match="ServantLocatorOperations" />
+	<keyword match="ServantLocatorPOA" />
+	<keyword match="ServantManager" />
+	<keyword match="ServantManagerOperations" />
+	<keyword match="ServantNotActive" />
+	<keyword match="ServantNotActiveHelper" />
+	<keyword match="ServantObject" />
+	<keyword match="ServantRetentionPolicy" />
+	<keyword match="ServantRetentionPolicyOperations" />
+	<keyword match="ServantRetentionPolicyValue" />
+	<keyword match="ServerCloneException" />
+	<keyword match="ServerError" />
+	<keyword match="ServerException" />
+	<keyword match="ServerNotActiveException" />
+	<keyword match="ServerRef" />
+	<keyword match="ServerRequest" />
+	<keyword match="ServerRequestInfo" />
+	<keyword match="ServerRequestInfoOperations" />
+	<keyword match="ServerRequestInterceptor" />
+	<keyword match="ServerRequestInterceptorOperations" />
+	<keyword match="ServerRuntimeException" />
+	<keyword match="ServerSocket" />
+	<keyword match="ServerSocketChannel" />
+	<keyword match="ServerSocketFactory" />
+	<keyword match="ServiceContext" />
+	<keyword match="ServiceContextHelper" />
+	<keyword match="ServiceContextHolder" />
+	<keyword match="ServiceContextListHelper" />
+	<keyword match="ServiceContextListHolder" />
+	<keyword match="ServiceDetail" />
+	<keyword match="ServiceDetailHelper" />
+	<keyword match="ServiceIdHelper" />
+	<keyword match="ServiceInformation" />
+	<keyword match="ServiceInformationHelper" />
+	<keyword match="ServiceInformationHolder" />
+	<keyword match="ServicePermission" />
+	<keyword match="ServiceRegistry" />
+	
+	<keyword match="ServiceUI" />
+	<keyword match="ServiceUIFactory" />
+	<keyword match="ServiceUnavailableException" />
+	<keyword match="Set" />
+	<keyword match="SetOfIntegerSyntax" />
+	<keyword match="SetOverrideType" />
+	<keyword match="SetOverrideTypeHelper" />
+	<keyword match="Severity" />
+	<keyword match="Shape" />
+	<keyword match="ShapeGraphicAttribute" />
+	<keyword match="SheetCollate" />
+	<keyword match="Short" />
+	<keyword match="ShortBuffer" />
+	<keyword match="ShortBufferException" />
+	<keyword match="ShortHolder" />
+	<keyword match="ShortLookupTable" />
+	<keyword match="ShortMessage" />
+	<keyword match="ShortSeqHelper" />
+	<keyword match="ShortSeqHolder" />
+	<keyword match="Sides" />
+	<keyword match="Signature" />
+	<keyword match="SignatureException" />
+	<keyword match="SignatureSpi" />
+	<keyword match="SignedObject" />
+	<keyword match="Signer" />
+	<keyword match="SimpleAttributeSet" />
+	<keyword match="SimpleBeanInfo" />
+	<keyword match="SimpleDateFormat" />
+	<keyword match="SimpleDoc" />
+	<keyword match="SimpleFormatter" />
+	<keyword match="SimpleTimeZone" />
+	<keyword match="SinglePixelPackedSampleModel" />
+	<keyword match="SingleSelectionModel" />
+	<keyword match="Size2DSyntax" />
+	<keyword match="SizeLimitExceededException" />
+	<keyword match="SizeRequirements" />
+	<keyword match="SizeSequence" />
+	<keyword match="Skeleton" />
+	<keyword match="SkeletonMismatchException" />
+	<keyword match="SkeletonNotFoundException" />
+	<keyword match="SliderUI" />
+	<keyword match="Socket" />
+	<keyword match="SocketAddress" />
+	<keyword match="SocketChannel" />
+	<keyword match="SocketException" />
+	<keyword match="SocketFactory" />
+	<keyword match="SocketHandler" />
+	<keyword match="SocketImpl" />
+	<keyword match="SocketImplFactory" />
+	<keyword match="SocketOptions" />
+	<keyword match="SocketPermission" />
+	<keyword match="SocketSecurityException" />
+	<keyword match="SocketTimeoutException" />
+	<keyword match="SoftBevelBorder" />
+	<keyword match="SoftReference" />
+	<keyword match="SortedMap" />
+	<keyword match="SortedSet" />
+	<keyword match="SortingFocusTraversalPolicy" />
+	<keyword match="Soundbank" />
+	<keyword match="SoundbankReader" />
+	<keyword match="SoundbankResource" />
+	<keyword match="Source" />
+	<keyword match="SourceDataLine" />
+	<keyword match="SourceLocator" />
+	<keyword match="SpinnerDateModel" />
+	<keyword match="SpinnerListModel" />
+	<keyword match="SpinnerModel" />
+	<keyword match="SpinnerNumberModel" />
+	<keyword match="SpinnerUI" />
+	<keyword match="SplitPaneUI" />
+	<keyword match="Spring" />
+	<keyword match="SpringLayout" />
+	
+	<keyword match="SQLData" />
+	<keyword match="SQLException" />
+	<keyword match="SQLInput" />
+	<keyword match="SQLOutput" />
+	<keyword match="SQLPermission" />
+	<keyword match="SQLWarning" />
+	<keyword match="SSLContext" />
+	<keyword match="SSLContextSpi" />
+	<keyword match="SSLException" />
+	<keyword match="SSLHandshakeException" />
+	<keyword match="SSLKeyException" />
+	<keyword match="SSLPeerUnverifiedException" />
+	<keyword match="SSLPermission" />
+	<keyword match="SSLProtocolException" />
+	<keyword match="SSLServerSocket" />
+	<keyword match="SSLServerSocketFactory" />
+	<keyword match="SSLSession" />
+	<keyword match="SSLSessionBindingEvent" />
+	<keyword match="SSLSessionBindingListener" />
+	<keyword match="SSLSessionContext" />
+	<keyword match="SSLSocket" />
+	<keyword match="SSLSocketFactory" />
+	<keyword match="Stack" />
+	<keyword match="StackOverflowError" />
+	<keyword match="StackTraceElement" />
+	<keyword match="StartTlsRequest" />
+	<keyword match="StartTlsResponse" />
+	<keyword match="State" />
+	<keyword match="StateEdit" />
+	<keyword match="StateEditable" />
+	<keyword match="StateFactory" />
+	<keyword match="Statement" />
+	<keyword match="Statement" />
+	<keyword match="Streamable" />
+	<keyword match="StreamableValue" />
+	<keyword match="StreamCorruptedException" />
+	<keyword match="StreamHandler" />
+	<keyword match="StreamPrintService" />
+	<keyword match="StreamPrintServiceFactory" />
+	<keyword match="StreamResult" />
+	<keyword match="StreamSource" />
+	<keyword match="StreamTokenizer" />
+	<keyword match="StrictMath" />
+	<keyword match="String" />
+	<keyword match="StringBuffer" />
+	<keyword match="StringBufferInputStream" />
+	<keyword match="StringCharacterIterator" />
+	<keyword match="StringContent" />
+	<keyword match="StringHolder" />
+	<keyword match="StringIndexOutOfBoundsException" />
+	<keyword match="StringNameHelper" />
+	<keyword match="StringReader" />
+	<keyword match="StringRefAddr" />
+	<keyword match="StringSelection" />
+	<keyword match="StringSeqHelper" />
+	<keyword match="StringSeqHolder" />
+	<keyword match="StringTokenizer" />
+	<keyword match="StringValueHelper" />
+	<keyword match="StringWriter" />
+	<keyword match="Stroke" />
+	<keyword match="Struct" />
+	<keyword match="StructMember" />
+	<keyword match="StructMemberHelper" />
+	<keyword match="Stub" />
+	<keyword match="StubDelegate" />
+	<keyword match="StubNotFoundException" />
+	<keyword match="Style" />
+	<keyword match="StyleConstants" />
+	
+	
+	
+	
+	<keyword match="StyleContext" />
+	<keyword match="StyledDocument" />
+	<keyword match="StyledEditorKit" />
+	
+	
+	
+	
+	
+	
+	
+	
+	<keyword match="StyleSheet" />
+	
+	
+	<keyword match="Subject" />
+	<keyword match="SubjectDomainCombiner" />
+	<keyword match="SUCCESSFUL" />
+	<keyword match="SupportedValuesAttribute" />
+	<keyword match="SwingConstants" />
+	<keyword match="SwingPropertyChangeSupport" />
+	<keyword match="SwingUtilities" />
+	<keyword match="SYNC_WITH_TRANSPORT" />
+	<keyword match="SyncFailedException" />
+	<keyword match="SyncScopeHelper" />
+	<keyword match="Synthesizer" />
+	<keyword match="SysexMessage" />
+	<keyword match="System" />
+	<keyword match="SYSTEM_EXCEPTION" />
+	<keyword match="SystemColor" />
+	<keyword match="SystemException" />
+	<keyword match="SystemFlavorMap" />
+	<keyword match="TabableView" />
+	<keyword match="TabbedPaneUI" />
+	<keyword match="TabExpander" />
+	<keyword match="TableCellEditor" />
+	<keyword match="TableCellRenderer" />
+	<keyword match="TableColumn" />
+	<keyword match="TableColumnModel" />
+	<keyword match="TableColumnModelEvent" />
+	<keyword match="TableColumnModelListener" />
+	<keyword match="TableHeaderUI" />
+	<keyword match="TableModel" />
+	<keyword match="TableModelEvent" />
+	<keyword match="TableModelListener" />
+	<keyword match="TableUI" />
+	<keyword match="TableView" />
+	<keyword match="TabSet" />
+	<keyword match="TabStop" />
+	<keyword match="TAG_ALTERNATE_IIOP_ADDRESS" />
+	<keyword match="TAG_CODE_SETS" />
+	<keyword match="TAG_INTERNET_IOP" />
+	<keyword match="TAG_JAVA_CODEBASE" />
+	<keyword match="TAG_MULTIPLE_COMPONENTS" />
+	<keyword match="TAG_ORB_TYPE" />
+	<keyword match="TAG_POLICIES" />
+	<keyword match="TagElement" />
+	<keyword match="TaggedComponent" />
+	<keyword match="TaggedComponentHelper" />
+	<keyword match="TaggedComponentHolder" />
+	<keyword match="TaggedProfile" />
+	<keyword match="TaggedProfileHelper" />
+	<keyword match="TaggedProfileHolder" />
+	<keyword match="TargetDataLine" />
+	<keyword match="TCKind" />
+	<keyword match="Templates" />
+	<keyword match="TemplatesHandler" />
+	<keyword match="Text" />
+	<keyword match="TextAction" />
+	<keyword match="TextArea" />
+	<keyword match="TextAttribute" />
+	<keyword match="TextComponent" />
+	<keyword match="TextEvent" />
+	<keyword match="TextField" />
+	<keyword match="TextHitInfo" />
+	<keyword match="TextInputCallback" />
+	<keyword match="TextLayout" />
+	
+	<keyword match="TextListener" />
+	<keyword match="TextMeasurer" />
+	<keyword match="TextOutputCallback" />
+	<keyword match="TextSyntax" />
+	<keyword match="TextUI" />
+	<keyword match="TexturePaint" />
+	<keyword match="Thread" />
+	<keyword match="THREAD_POLICY_ID" />
+	<keyword match="ThreadDeath" />
+	<keyword match="ThreadGroup" />
+	<keyword match="ThreadLocal" />
+	<keyword match="ThreadPolicy" />
+	<keyword match="ThreadPolicyOperations" />
+	<keyword match="ThreadPolicyValue" />
+	<keyword match="Throwable" />
+	<keyword match="Tie" />
+	<keyword match="TileObserver" />
+	<keyword match="Time" />
+	<keyword match="TimeLimitExceededException" />
+	<keyword match="Timer" />
+	<keyword match="Timer" />
+	<keyword match="TimerTask" />
+	<keyword match="Timestamp" />
+	<keyword match="TimeZone" />
+	<keyword match="TitledBorder" />
+	<keyword match="ToolBarUI" />
+	<keyword match="Toolkit" />
+	<keyword match="ToolTipManager" />
+	<keyword match="ToolTipUI" />
+	<keyword match="TooManyListenersException" />
+	<keyword match="Track" />
+	<keyword match="TRANSACTION_REQUIRED" />
+	<keyword match="TRANSACTION_ROLLEDBACK" />
+	<keyword match="TransactionRequiredException" />
+	<keyword match="TransactionRolledbackException" />
+	<keyword match="TransactionService" />
+	<keyword match="Transferable" />
+	<keyword match="TransferHandler" />
+	<keyword match="TransformAttribute" />
+	<keyword match="Transformer" />
+	<keyword match="TransformerConfigurationException" />
+	<keyword match="TransformerException" />
+	<keyword match="TransformerFactory" />
+	<keyword match="TransformerFactoryConfigurationError" />
+	<keyword match="TransformerHandler" />
+	<keyword match="TRANSIENT" />
+	<keyword match="Transmitter" />
+	<keyword match="Transparency" />
+	<keyword match="TRANSPORT_RETRY" />
+	<keyword match="TreeCellEditor" />
+	<keyword match="TreeCellRenderer" />
+	<keyword match="TreeExpansionEvent" />
+	<keyword match="TreeExpansionListener" />
+	<keyword match="TreeMap" />
+	<keyword match="TreeModel" />
+	<keyword match="TreeModelEvent" />
+	<keyword match="TreeModelListener" />
+	<keyword match="TreeNode" />
+	<keyword match="TreePath" />
+	<keyword match="TreeSelectionEvent" />
+	<keyword match="TreeSelectionListener" />
+	<keyword match="TreeSelectionModel" />
+	<keyword match="TreeSet" />
+	<keyword match="TreeUI" />
+	<keyword match="TreeWillExpandListener" />
+	<keyword match="TrustAnchor" />
+	<keyword match="TrustManager" />
+	<keyword match="TrustManagerFactory" />
+	<keyword match="TrustManagerFactorySpi" />
+	<keyword match="TypeCode" />
+	<keyword match="TypeCodeHolder" />
+	<keyword match="TypeMismatch" />
+	<keyword match="TypeMismatch" />
+	<keyword match="TypeMismatch" />
+	<keyword match="TypeMismatchHelper" />
+	<keyword match="TypeMismatchHelper" />
+	<keyword match="Types" />
+	<keyword match="UID" />
+	<keyword match="UIDefaults" />
+	
+	
+	
+	
+	<keyword match="UIManager" />
+	
+	<keyword match="UIResource" />
+	<keyword match="ULongLongSeqHelper" />
+	<keyword match="ULongLongSeqHolder" />
+	<keyword match="ULongSeqHelper" />
+	<keyword match="ULongSeqHolder" />
+	<keyword match="UndeclaredThrowableException" />
+	<keyword match="UndoableEdit" />
+	<keyword match="UndoableEditEvent" />
+	<keyword match="UndoableEditListener" />
+	<keyword match="UndoableEditSupport" />
+	<keyword match="UndoManager" />
+	<keyword match="UnexpectedException" />
+	<keyword match="UnicastRemoteObject" />
+	<keyword match="UnionMember" />
+	<keyword match="UnionMemberHelper" />
+	<keyword match="UNKNOWN" />
+	<keyword match="UnknownEncoding" />
+	<keyword match="UnknownEncodingHelper" />
+	<keyword match="UnknownError" />
+	<keyword match="UnknownException" />
+	<keyword match="UnknownGroupException" />
+	<keyword match="UnknownHostException" />
+	<keyword match="UnknownHostException" />
+	<keyword match="UnknownObjectException" />
+	<keyword match="UnknownServiceException" />
+	<keyword match="UnknownUserException" />
+	<keyword match="UnknownUserExceptionHelper" />
+	<keyword match="UnknownUserExceptionHolder" />
+	<keyword match="UnmappableCharacterException" />
+	<keyword match="UnmarshalException" />
+	<keyword match="UnmodifiableSetException" />
+	<keyword match="UnrecoverableKeyException" />
+	<keyword match="Unreferenced" />
+	<keyword match="UnresolvedAddressException" />
+	<keyword match="UnresolvedPermission" />
+	<keyword match="UnsatisfiedLinkError" />
+	<keyword match="UnsolicitedNotification" />
+	<keyword match="UnsolicitedNotificationEvent" />
+	<keyword match="UnsolicitedNotificationListener" />
+	<keyword match="UNSUPPORTED_POLICY" />
+	<keyword match="UNSUPPORTED_POLICY_VALUE" />
+	<keyword match="UnsupportedAddressTypeException" />
+	<keyword match="UnsupportedAudioFileException" />
+	<keyword match="UnsupportedCallbackException" />
+	<keyword match="UnsupportedCharsetException" />
+	<keyword match="UnsupportedClassVersionError" />
+	<keyword match="UnsupportedEncodingException" />
+	<keyword match="UnsupportedFlavorException" />
+	<keyword match="UnsupportedLookAndFeelException" />
+	<keyword match="UnsupportedOperationException" />
+	<keyword match="URI" />
+	<keyword match="URIException" />
+	<keyword match="URIResolver" />
+	<keyword match="URISyntax" />
+	<keyword match="URISyntaxException" />
+	<keyword match="URL" />
+	<keyword match="URLClassLoader" />
+	<keyword match="URLConnection" />
+	<keyword match="URLDecoder" />
+	<keyword match="URLEncoder" />
+	<keyword match="URLStreamHandler" />
+	<keyword match="URLStreamHandlerFactory" />
+	<keyword match="URLStringHelper" />
+	<keyword match="USER_EXCEPTION" />
+	<keyword match="UserException" />
+	<keyword match="UShortSeqHelper" />
+	<keyword match="UShortSeqHolder" />
+	<keyword match="UTFDataFormatException" />
+	<keyword match="Util" />
+	<keyword match="UtilDelegate" />
+	<keyword match="Utilities" />
+	<keyword match="ValueBase" />
+	<keyword match="ValueBaseHelper" />
+	<keyword match="ValueBaseHolder" />
+	<keyword match="ValueFactory" />
+	<keyword match="ValueHandler" />
+	<keyword match="ValueMember" />
+	<keyword match="ValueMemberHelper" />
+	<keyword match="VariableHeightLayoutCache" />
+	<keyword match="Vector" />
+	<keyword match="VerifyError" />
+	<keyword match="VersionSpecHelper" />
+	<keyword match="VetoableChangeListener" />
+	<keyword match="VetoableChangeListenerProxy" />
+	<keyword match="VetoableChangeSupport" />
+	<keyword match="View" />
+	<keyword match="ViewFactory" />
+	<keyword match="ViewportLayout" />
+	<keyword match="ViewportUI" />
+	<keyword match="VirtualMachineError" />
+	<keyword match="Visibility" />
+	<keyword match="VisibilityHelper" />
+	<keyword match="VM_ABSTRACT" />
+	<keyword match="VM_CUSTOM" />
+	<keyword match="VM_NONE" />
+	<keyword match="VM_TRUNCATABLE" />
+	<keyword match="VMID" />
+	<keyword match="VoiceStatus" />
+	<keyword match="Void" />
+	<keyword match="VolatileImage" />
+	<keyword match="WCharSeqHelper" />
+	<keyword match="WCharSeqHolder" />
+	<keyword match="WeakHashMap" />
+	<keyword match="WeakReference" />
+	<keyword match="Window" />
+	<keyword match="WindowAdapter" />
+	<keyword match="WindowConstants" />
+	<keyword match="WindowEvent" />
+	<keyword match="WindowFocusListener" />
+	<keyword match="WindowListener" />
+	<keyword match="WindowStateListener" />
+	<keyword match="WrappedPlainView" />
+	<keyword match="WritableByteChannel" />
+	<keyword match="WritableRaster" />
+	<keyword match="WritableRenderedImage" />
+	<keyword match="WriteAbortedException" />
+	<keyword match="Writer" />
+	<keyword match="WrongAdapter" />
+	<keyword match="WrongAdapterHelper" />
+	<keyword match="WrongPolicy" />
+	<keyword match="WrongPolicyHelper" />
+	<keyword match="WrongTransaction" />
+	<keyword match="WrongTransactionHelper" />
+	<keyword match="WrongTransactionHolder" />
+	<keyword match="WStringSeqHelper" />
+	<keyword match="WStringSeqHolder" />
+	<keyword match="WStringValueHelper" />
+	<keyword match="X500Principal" />
+	<keyword match="X500PrivateCredential" />
+	<keyword match="X509Certificate" />
+	<keyword match="X509Certificate" />
+	<keyword match="X509CertSelector" />
+	<keyword match="X509CRL" />
+	<keyword match="X509CRLEntry" />
+	<keyword match="X509CRLSelector" />
+	<keyword match="X509EncodedKeySpec" />
+	<keyword match="X509Extension" />
+	<keyword match="X509KeyManager" />
+	<keyword match="X509TrustManager" />
+	<keyword match="XAConnection" />
+	<keyword match="XADataSource" />
+	<keyword match="XAException" />
+	<keyword match="XAResource" />
+	<keyword match="Xid" />
+	<keyword match="XMLDecoder" />
+	<keyword match="XMLEncoder" />
+	<keyword match="XMLFilter" />
+	<keyword match="XMLFilterImpl" />
+	<keyword match="XMLFormatter" />
+	<keyword match="XMLReader" />
+	<keyword match="XMLReaderAdapter" />
+	<keyword match="XMLReaderFactory" />
+	<keyword match="ZipEntry" />
+	<keyword match="ZipException" />
+	<keyword match="ZipFile" />
+	<keyword match="ZipInputStream" />
+	<keyword match="ZipOutputStream" />
+	<keyword match="ZoneView" />
+	<keyword match="_BindingIteratorImplBase" />
+	<keyword match="_BindingIteratorStub" />
+	<keyword match="_DynAnyFactoryStub" />
+	<keyword match="_DynAnyStub" />
+	<keyword match="_DynArrayStub" />
+	<keyword match="_DynEnumStub" />
+	<keyword match="_DynFixedStub" />
+	<keyword match="_DynSequenceStub" />
+	<keyword match="_DynStructStub" />
+	<keyword match="_DynUnionStub" />
+	<keyword match="_DynValueStub" />
+	<keyword match="_IDLTypeStub" />
+	<keyword match="_NamingContextExtStub" />
+	<keyword match="_NamingContextImplBase" />
+	<keyword match="_NamingContextStub" />
+	<keyword match="_PolicyStub" />
+	<keyword match="_Remote_Stub" />
+	<keyword match="_ServantActivatorStub" />
+	<keyword match="_ServantLocatorStub" />
+  </keywords>
+
+</highlight>
diff --git a/library/Text_Highlighter/javascript.xml b/library/Text_Highlighter/javascript.xml
new file mode 100644
index 000000000..e478515a7
--- /dev/null
+++ b/library/Text_Highlighter/javascript.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<!-- $Id: javascript.xml,v 1.3 2008-01-01 23:43:36 ssttoo Exp $ -->
+
+<highlight lang="javascript" case = "no">
+
+  <authors>
+    <author name="Andrey Demenev" email ="demenev@gmail.com"/>
+  </authors>
+
+  <default innerClass="code" />
+
+  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
+    <contains all="yes"/>
+  </region>
+
+  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
+    <contains all="yes"/>
+  </region>
+
+  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
+    <contains all="yes"/>
+  </region>
+
+
+  <region name="mlcomment" innerClass="comment" start="\/\*" end="\*\/" >
+    <contains block="cvstag"/>
+  </region>
+
+  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;"/>
+
+  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'" />
+
+  <block name="escaped" match="\\\\|\\&quot;|\\'|\\`" innerClass="special" contained="yes">
+    <onlyin region="strsingle"/>
+  </block>
+
+  <block name="descaped" match="\\\\|\\&quot;|\\'|\\`|\\t|\\n|\\r" innerClass="special" contained="yes">
+    <onlyin region="strdouble"/>
+  </block>
+
+  <region name="comment" start="\/\/" end="/$/m" innerClass="comment">
+    <contains block="cvstag"/>
+  </region>
+
+  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
+
+  <block name="number" match="0x\d*|\d*\.?\d+" innerClass="number"/>
+
+
+  <block name="url" match="((https?|ftp):\/\/[\w\?\.\-\&amp;=\/%+]+)|(^|[\s,!?])www\.\w+\.\w+[\w\?\.\&amp;=\/%+]*" innerClass="url" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+
+  <block name="email" match="\w+[\.\w\-]+@(\w+[\.\w\-])+" innerClass="url" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+
+  <block name="note" match="\b(note|fixme):" innerClass="inlinedoc" contained="yes" case="no">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+
+
+  <block name="cvstag" match="\$\w+:.+\$" innerClass="inlinedoc" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+
+  <keywords name="builtin" inherits="identifier" innerClass="builtin" case = "yes">
+    <keyword match="String"/>
+    <keyword match="Array"/>
+    <keyword match="RegExp"/>
+    <keyword match="Function"/>
+    <keyword match="Math"/>
+    <keyword match="Number"/>
+    <keyword match="Date"/>
+    <keyword match="Image"/>
+    <keyword match="window"/>
+    <keyword match="document"/>
+    <keyword match="navigator"/>
+    <keyword match="onAbort"/>
+    <keyword match="onBlur"/>
+    <keyword match="onChange"/>
+    <keyword match="onClick"/>
+    <keyword match="onDblClick"/>
+    <keyword match="onDragDrop"/>
+    <keyword match="onError"/>
+    <keyword match="onFocus"/>
+    <keyword match="onKeyDown"/>
+    <keyword match="onKeyPress"/>
+    <keyword match="onKeyUp"/>
+    <keyword match="onLoad"/>
+    <keyword match="onMouseDown"/>
+    <keyword match="onMouseOver"/>
+    <keyword match="onMouseOut"/>
+    <keyword match="onMouseMove"/>
+    <keyword match="onMouseUp"/>
+    <keyword match="onMove"/>
+    <keyword match="onReset"/>
+    <keyword match="onResize"/>
+    <keyword match="onSelect"/>
+    <keyword match="onSubmit"/>
+    <keyword match="onUnload"/>
+  </keywords>
+
+  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "yes">
+    <keyword match="break"/>
+    <keyword match="continue"/>
+    <keyword match="do"/>
+    <keyword match="while"/>
+    <keyword match="do"/>
+    <keyword match="export"/>
+    <keyword match="for"/>
+    <keyword match="in"/>
+    <keyword match="if"/>
+    <keyword match="else"/>
+    <keyword match="import"/>
+    <keyword match="return"/>
+    <keyword match="label"/>
+    <keyword match="switch"/>
+    <keyword match="case"/>
+    <keyword match="var"/>
+    <keyword match="with"/>
+    <keyword match="delete"/>
+    <keyword match="new"/>
+    <keyword match="this"/>
+    <keyword match="typeof"/>
+    <keyword match="void"/>
+    <keyword match="abstract"/>
+    <keyword match="boolean"/>
+    <keyword match="byte"/>
+    <keyword match="catch"/>
+    <keyword match="char"/>
+    <keyword match="class"/>
+    <keyword match="const"/>
+    <keyword match="continue"/>
+    <keyword match="debugger"/>
+    <keyword match="default"/>
+    <keyword match="double"/>
+    <keyword match="enum"/>
+    <keyword match="extends"/>
+    <keyword match="false"/>
+    <keyword match="final"/>
+    <keyword match="finally"/>
+    <keyword match="float"/>
+    <keyword match="function"/>
+    <keyword match="implements"/>
+    <keyword match="goto"/>
+    <keyword match="in"/>
+    <keyword match="instanceof"/>
+    <keyword match="int"/>
+    <keyword match="interface"/>
+    <keyword match="long"/>
+    <keyword match="native"/>
+    <keyword match="null"/>
+    <keyword match="package"/>
+    <keyword match="private"/>
+    <keyword match="protected"/>
+    <keyword match="public"/>
+    <keyword match="short"/>
+    <keyword match="static"/>
+    <keyword match="super"/>
+    <keyword match="synchronized"/>
+    <keyword match="throw"/>
+    <keyword match="throws"/>
+    <keyword match="transient"/>
+    <keyword match="true"/>
+    <keyword match="try"/>
+    <keyword match="volatile"/>
+  </keywords>
+
+</highlight>
diff --git a/library/Text_Highlighter/mysql.xml b/library/Text_Highlighter/mysql.xml
new file mode 100644
index 000000000..082b62795
--- /dev/null
+++ b/library/Text_Highlighter/mysql.xml
@@ -0,0 +1,424 @@
+<?xml version="1.0"?>
+<!-- $Id: mysql.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="mysql" case="no">
+
+  <authors>
+    <author name="Andrey Demenev" email="demenev@gmail.com"/>
+  </authors>
+
+
+  <default innerClass="code" />
+
+  <region name="qidentifier" delimClass="quotes" innerClass="identifier" 
+          start="`" end="`" />
+
+  <region name="mlcomment" delimClass="comment" innerClass="comment" 
+          start="\/\*" end="\*\/" />
+
+  <block name="comment" match="(#|--\s).*" innerClass="comment" />
+
+  <block name="possiblefunction" match="[a-z_]\w*(?=\s*\()" innerClass="identifier" />
+
+  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" />
+
+  <region name="strdouble" delimClass="quotes" innerClass="string" 
+          start="&quot;" end="&quot;" >
+  </region>
+  
+  <region name="brackets" delimClass="brackets" innerClass="code" 
+          start="\(" end="\)" >
+    <contains all="yes"/>
+  </region>
+
+  <region name="strsingle" delimClass="quotes" innerClass="string" 
+          start="'" end="'" />
+
+  <block name="escaped" match="\\." innerClass="special" contained="yes">
+    <onlyin region="strsingle"/>
+    <onlyin region="strdouble"/>
+  </block>
+
+  <block name="exponent" 
+         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
+         innerClass="number" />
+
+  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
+
+  <block name="integer" match="\d+l?|\b0l?\b" innerClass="number" />
+
+  <block name="hexinteger" match="0[xX][\da-f]+l?" innerClass="number" />
+
+  <keywords name="reserved" inherits="identifier" innerClass="reserved" 
+            case="no">
+    <keyword match="action" />
+    <keyword match="add" />
+    <keyword match="aggregate" />
+    <keyword match="all" />
+    <keyword match="alter" />
+    <keyword match="after" />
+    <keyword match="and" />
+    <keyword match="as" />
+    <keyword match="asc" />
+    <keyword match="avg" />
+    <keyword match="avg_row_length" />
+    <keyword match="auto_increment" />
+    <keyword match="between" />
+    <keyword match="bigint" />
+    <keyword match="bit" />
+
+    <keyword match="binary" />
+    <keyword match="blob" />
+    <keyword match="bool" />
+    <keyword match="both" />
+    <keyword match="by" />
+    <keyword match="cascade" />
+    <keyword match="case" />
+    <keyword match="char" />
+    <keyword match="character" />
+    <keyword match="change" />
+    <keyword match="check" />
+    <keyword match="checksum" />
+    <keyword match="column" />
+    <keyword match="columns" />
+    <keyword match="comment" />
+    <keyword match="constraint" />
+    <keyword match="create" />
+
+    <keyword match="cross" />
+    <keyword match="current_date" />
+    <keyword match="current_time" />
+    <keyword match="current_timestamp" />
+    <keyword match="data" />
+    <keyword match="database" />
+    <keyword match="databases" />
+    <keyword match="date" />
+    <keyword match="datetime" />
+    <keyword match="day" />
+    <keyword match="day_hour" />
+    <keyword match="day_minute" />
+    <keyword match="day_second" />
+    <keyword match="dayofmonth" />
+    <keyword match="dayofweek" />
+    <keyword match="dayofyear" />
+    <keyword match="dec" />
+
+    <keyword match="decimal" />
+    <keyword match="default" />
+    <keyword match="delayed" />
+    <keyword match="delay_key_write" />
+    <keyword match="delete" />
+    <keyword match="desc" />
+    <keyword match="describe" />
+    <keyword match="distinct" />
+    <keyword match="distinctrow" />
+    <keyword match="double" />
+    <keyword match="drop" />
+    <keyword match="end" />
+    <keyword match="else" />
+    <keyword match="escape" />
+    <keyword match="escaped" />
+    <keyword match="enclosed" />
+    <keyword match="enum" />
+
+    <keyword match="explain" />
+    <keyword match="exists" />
+    <keyword match="fields" />
+    <keyword match="file" />
+    <keyword match="first" />
+    <keyword match="float" />
+    <keyword match="float4" />
+    <keyword match="float8" />
+    <keyword match="flush" />
+    <keyword match="foreign" />
+    <keyword match="from" />
+    <keyword match="for" />
+    <keyword match="full" />
+    <keyword match="function" />
+    <keyword match="global" />
+    <keyword match="grant" />
+    <keyword match="grants" />
+
+    <keyword match="group" />
+    <keyword match="having" />
+    <keyword match="heap" />
+    <keyword match="high_priority" />
+    <keyword match="hour" />
+    <keyword match="hour_minute" />
+    <keyword match="hour_second" />
+    <keyword match="hosts" />
+    <keyword match="identified" />
+    <keyword match="ignore" />
+    <keyword match="in" />
+    <keyword match="index" />
+    <keyword match="infile" />
+    <keyword match="inner" />
+    <keyword match="insert" />
+    <keyword match="insert_id" />
+    <keyword match="int" />
+
+    <keyword match="integer" />
+    <keyword match="interval" />
+    <keyword match="int1" />
+    <keyword match="int2" />
+    <keyword match="int3" />
+    <keyword match="int4" />
+    <keyword match="int8" />
+    <keyword match="into" />
+    <keyword match="if" />
+    <keyword match="is" />
+    <keyword match="isam" />
+    <keyword match="join" />
+    <keyword match="key" />
+    <keyword match="keys" />
+    <keyword match="kill" />
+    <keyword match="last_insert_id" />
+    <keyword match="leading" />
+
+    <keyword match="left" />
+    <keyword match="length" />
+    <keyword match="like" />
+    <keyword match="lines" />
+    <keyword match="limit" />
+    <keyword match="load" />
+    <keyword match="local" />
+    <keyword match="lock" />
+    <keyword match="logs" />
+    <keyword match="long" />
+    <keyword match="longblob" />
+    <keyword match="longtext" />
+    <keyword match="low_priority" />
+    <keyword match="max" />
+    <keyword match="max_rows" />
+    <keyword match="match" />
+    <keyword match="mediumblob" />
+
+    <keyword match="mediumtext" />
+    <keyword match="mediumint" />
+    <keyword match="middleint" />
+    <keyword match="min_rows" />
+    <keyword match="minute" />
+    <keyword match="minute_second" />
+    <keyword match="modify" />
+    <keyword match="month" />
+    <keyword match="monthname" />
+    <keyword match="myisam" />
+    <keyword match="natural" />
+    <keyword match="numeric" />
+    <keyword match="no" />
+    <keyword match="not" />
+    <keyword match="null" />
+    <keyword match="on" />
+    <keyword match="optimize" />
+
+    <keyword match="option" />
+    <keyword match="optionally" />
+    <keyword match="or" />
+    <keyword match="order" />
+    <keyword match="outer" />
+    <keyword match="outfile" />
+    <keyword match="pack_keys" />
+    <keyword match="partial" />
+    <keyword match="password" />
+    <keyword match="precision" />
+    <keyword match="primary" />
+    <keyword match="procedure" />
+    <keyword match="process" />
+    <keyword match="processlist" />
+    <keyword match="privileges" />
+    <keyword match="read" />
+    <keyword match="real" />
+
+    <keyword match="references" />
+    <keyword match="reload" />
+    <keyword match="regexp" />
+    <keyword match="rename" />
+    <keyword match="replace" />
+    <keyword match="restrict" />
+    <keyword match="returns" />
+    <keyword match="revoke" />
+    <keyword match="rlike" />
+    <keyword match="row" />
+    <keyword match="rows" />
+    <keyword match="second" />
+    <keyword match="select" />
+    <keyword match="set" />
+    <keyword match="show" />
+    <keyword match="shutdown" />
+    <keyword match="smallint" />
+
+    <keyword match="soname" />
+    <keyword match="sql_big_tables" />
+    <keyword match="sql_big_selects" />
+    <keyword match="sql_low_priority_updates" />
+    <keyword match="sql_log_off" />
+    <keyword match="sql_log_update" />
+    <keyword match="sql_select_limit" />
+    <keyword match="sql_small_result" />
+    <keyword match="sql_big_result" />
+    <keyword match="sql_warnings" />
+    <keyword match="straight_join" />
+    <keyword match="starting" />
+    <keyword match="status" />
+    <keyword match="string" />
+    <keyword match="table" />
+    <keyword match="tables" />
+    <keyword match="temporary" />
+
+    <keyword match="terminated" />
+    <keyword match="text" />
+    <keyword match="then" />
+    <keyword match="time" />
+    <keyword match="timestamp" />
+    <keyword match="tinyblob" />
+    <keyword match="tinytext" />
+    <keyword match="tinyint" />
+    <keyword match="trailing" />
+    <keyword match="to" />
+    <keyword match="type" />
+    <keyword match="use" />
+    <keyword match="using" />
+    <keyword match="unique" />
+    <keyword match="unlock" />
+    <keyword match="unsigned" />
+    <keyword match="update" />
+
+    <keyword match="usage" />
+    <keyword match="values" />
+    <keyword match="varchar" />
+    <keyword match="variables" />
+    <keyword match="varying" />
+    <keyword match="varbinary" />
+    <keyword match="with" />
+    <keyword match="write" />
+    <keyword match="when" />
+    <keyword match="where" />
+    <keyword match="year" />
+    <keyword match="year_month" />
+    <keyword match="zerofill" />
+  </keywords> 
+
+  <keywords name="function" inherits="possiblefunction" innerClass="reserved"
+            case="no" otherwise="identifier">
+    <keyword match="ABS" />
+    <keyword match="ACOS" />
+    <keyword match="ADDDATE" />
+    <keyword match="ASCII" />
+    <keyword match="ASIN" />
+    <keyword match="ATAN" />
+    <keyword match="ATAN2" />
+    <keyword match="AVG" />
+    <keyword match="BENCHMARK" />
+    <keyword match="BIN" />
+    <keyword match="CEILING" />
+    <keyword match="CHAR" />
+    <keyword match="COALESCE" />
+    <keyword match="CONCAT" />
+    <keyword match="CONV" />
+    <keyword match="COS" />
+    <keyword match="COT" />
+    <keyword match="COUNT" />
+    <keyword match="CURDATE" />
+    <keyword match="CURTIME" />
+    <keyword match="DATABASE" />
+    <keyword match="DAYNAME" />
+    <keyword match="DAYOFMONTH" />
+    <keyword match="DAYOFWEEK" />
+    <keyword match="DAYOFYEAR" />
+    <keyword match="DECODE" />
+    <keyword match="DEGREES" />
+    <keyword match="ELT" />
+
+    <keyword match="ENCODE" />
+    <keyword match="ENCRYPT" />
+    <keyword match="EXP" />
+    <keyword match="EXTRACT" />
+
+    <keyword match="EXTRACT" />
+    <keyword match="FIELD" />
+    <keyword match="FLOOR" />
+    <keyword match="FORMAT" />
+    <keyword match="GREATEST" />
+    <keyword match="HEX" />
+    <keyword match="HOUR" />
+    <keyword match="IF" />
+    <keyword match="IFNULL" />
+    <keyword match="INSERT" />
+    <keyword match="INSTR" />
+    <keyword match="INTERVAL" />
+
+    <keyword match="ISNULL" />
+    <keyword match="LCASE" />
+    <keyword match="LEAST" />
+    <keyword match="LEFT" />
+    <keyword match="LENGTH" />
+    <keyword match="LOCATE" />
+
+    <keyword match="LOCATE" />
+    <keyword match="LOG" />
+    <keyword match="LOG10" />
+    <keyword match="LOWER" />
+    <keyword match="LPAD" />
+    <keyword match="LTRIM" />
+    <keyword match="MAX" />
+    <keyword match="MD5" />
+    <keyword match="MID" />
+    <keyword match="MIN" />
+
+    <keyword match="MINUTE" />
+    <keyword match="MOD" />
+    <keyword match="MONTH" />
+    <keyword match="MONTHNAME" />
+    <keyword match="NOW" />
+    <keyword match="NULLIF" />
+    <keyword match="OCT" />
+    <keyword match="ORD" />
+    <keyword match="PASSWORD" />
+    <keyword match="PI" />
+    <keyword match="POSITION" />
+
+    <keyword match="POW" />
+    <keyword match="POWER" />
+    <keyword match="prepare" />
+    <keyword match="QUARTER" />
+    <keyword match="RADIANS" />
+    <keyword match="RAND" />
+    <keyword match="REPEAT" />
+    <keyword match="REPLACE" />
+    <keyword match="REVERSE" />
+    <keyword match="RIGHT" />
+    <keyword match="ROUND" />
+
+    <keyword match="ROUND" />
+    <keyword match="RPAD" />
+
+    <keyword match="RTRIM" />
+    <keyword match="SECOND" />
+    <keyword match="SIGN" />
+    <keyword match="SIN" />
+    <keyword match="SOUNDEX" />
+    <keyword match="SPACE" />
+    <keyword match="SQRT" />
+    <keyword match="STD" />
+    <keyword match="STDDEV" />
+    <keyword match="STRCMP" />
+    <keyword match="SUBDATE" />
+    <keyword match="SUBSTRING" />
+
+    <keyword match="SUBSTRING" />
+    <keyword match="SUM" />
+    <keyword match="SYSDATE" />
+    <keyword match="TAN" />
+
+    <keyword match="TRIM" />
+    <keyword match="TRUNCATE" />
+    <keyword match="UCASE" />
+    <keyword match="UPPER" />
+    <keyword match="USER" />
+    <keyword match="VERSION" />
+    <keyword match="WEEK" />
+    <keyword match="WEEKDAY" />
+    <keyword match="YEAR" />
+  </keywords> 
+
+</highlight>
diff --git a/library/Text_Highlighter/perl.xml b/library/Text_Highlighter/perl.xml
new file mode 100644
index 000000000..54f8835ea
--- /dev/null
+++ b/library/Text_Highlighter/perl.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0"?>
+<!-- $Id: perl.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="perl" case = "yes">
+
+  <authors>
+    <author name="Mariusz 'kg' Jakubowski" email="kg@alternatywa.info" jid="kg@chrome.pl"/>
+    <author name="Andrey Demenev" email="demenev@gmail.com"/>
+  </authors>
+
+  <comment>This highlighter is EXPERIMENTAL, so that it may work incorrectly. 
+Most rules were created by Mariusz Jakubowski, and extended by me.
+My  knowledge  of  Perl  is  poor,  and  Perl  syntax  seems  too
+complicated to me.</comment>
+
+  <default innerClass="code"/>
+
+  <block name="interpreter" match="/^(#!)(.*)/m" innerClass="special">
+   <partClass index="1" innerClass="special" />
+   <partClass index="2" innerClass="string" />
+  </block>
+
+  <region name="pod" innerClass="comment" start="/^=\w+/m" end="/^=cut[^\n]*/m" startBOL="yes" endBOL="yes"/>
+
+  <!-- 
+  brackets 
+  -->
+  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
+    <contains all="yes"/>
+  </region>
+
+  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
+    <contains all="yes"/>
+  </region>
+
+  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
+    <contains all="yes"/>
+  </region>
+
+  <!-- 
+  use smth 
+  -->
+  <block name="usestatement" match="(use)\s+([\w:]*)" innerClass="special">
+   <partClass index="1" innerClass="reserved" />
+   <partClass index="2" innerClass="special" />
+  </block>
+  
+  <block name="packagereference" match="[&amp; ](\w{2,}::)+\w{2,}" innerClass="special"/>
+
+  <region name="q-w-q-statement" 
+    start="/\b(q[wq]\s*((\{)|(\()|(\[)|(\&lt;)|([\W\S])))(?=(.*)((?(3)\})(?(4)\))(?(5)\])(?(6)\&gt;)(?(7)\7)))/Us"
+    end="%b2%"
+    innerClass="string" delimClass="quotes" remember="yes">
+
+    <contains block="containedvar"/>
+    <contains block="specialvar"/>
+    <contains block="curlyvar"/>
+
+  </region>
+
+  <region name="qstatement" 
+    start="/\b(q\s*((\{)|(\()|(\[)|(\&lt;)|([\W\S])))(?=(.*)((?(3)\})(?(4)\))(?(5)\])(?(6)\&gt;)(?(7)\7)))/Us"
+    end="%b2%"
+    innerClass="string" delimClass="quotes" remember="yes">
+
+  </region>
+
+  <!-- 
+  comments 
+  -->
+  <block name="comment" match="#.*" innerClass="comment" />
+  
+  
+  <!-- 
+  regexpr
+  FIXME: this should be rewrited
+  -->
+  <block name="dblregexprver1" match="/(s|tr) ([|#~`!@$%^&amp;*-+=\\;:'&quot;,.\/?])  ((\\.|[^\\])*?) (\2)((\\.|[^\\])*?)(\2[ecgimosx]*)/x" innerClass="string">
+   <partClass index="1" innerClass="quotes" />
+   <partClass index="2" innerClass="quotes" />
+   <partClass index="3" innerClass="string" />
+   <partClass index="5" innerClass="quotes" />
+   <partClass index="6" innerClass="string" />
+   <partClass index="8" innerClass="quotes" />
+  </block>
+  
+  <block name="dblregexprver2" match="/(m) ([|#~`!@$%^&amp;*-+=\\;:'&quot;,.\/?])  ((\\.|[^\\])*?) (\2[ecgimosx]*)/x" innerClass="string">
+   <partClass index="1" innerClass="quotes" />
+   <partClass index="2" innerClass="quotes" />
+   <partClass index="3" innerClass="string" />
+   <partClass index="5" innerClass="quotes" />
+  </block>
+  
+
+  <region name="regexp" start=" \/" end="\/[cgimosx]*" innerClass="string" delimClass="quotes" case="yes">
+    <contains block="reescaped"/>
+  </region> 
+  
+  <block name="reescaped" match="\\\/" innerClass="string" contained="yes">
+    <onlyin region="regexp"/>
+  </block> 
+  
+  <!-- 
+  variables 
+  FIXME: @{...} 
+  -->
+  <block name="bracketsvars" match="([a-z1-9_]+)(\s*=>)" innerClass="string" contained="yes" case="no">
+    <partClass index="1" innerClass="string" />
+    <partClass index="2" innerClass="code" />
+    <onlyin region="brackets"/>
+  </block>
+
+  <block name="specialvar" match="\$#?[1-9'`@!]" innerClass="var"/>
+  
+  <block name="var" match="(\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\^(?-i)[A-Z]?(?i))" innerClass="var" case="no"/>
+  <block name="containedvar" match="\$([a-z1-9_]+|\^(?-i)[A-Z]?(?i))" innerClass="var" case="no"/>
+
+  <!-- not shure what is this, but the Perlers do it :) -->
+  <block name="var2" match="(&amp;|\w+)'[\w_']+\b" innerClass="var" case="no"/>
+
+  <block name="classvar" match="(\{)([a-z1-9]+)(\})" innerClass="var" case="no">
+   <partClass index="1" innerClass="brackets" />
+   <partClass index="2" innerClass="var" />
+   <partClass index="3" innerClass="brackets" />
+  </block>
+
+  <block name="curlyvar" match="[\$@%]#?\{[a-z1-9]+\}" innerClass="var" case="no"/>
+
+  <!-- 
+  quotes
+  -->
+  <region name="exec" delimClass="quotes" innerClass="string" start="`" end="`">
+    <contains block="containedvar"/>
+    <contains block="specialvar"/>
+    <contains block="curlyvar"/>
+  </region>
+
+  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'"/>
+
+  <block name="escaped" match="\\\\|\\&quot;|\\'|\\`" innerClass="special" contained="yes">
+    <onlyin region="qstatement"/>
+    <onlyin region="strsingle"/>
+    <onlyin region="exec"/>
+  </block>
+
+  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;">
+    <contains block="containedvar"/>
+    <contains block="specialvar"/>
+    <contains block="curlyvar"/>
+  </region>
+
+  <block name="descaped" match="\\[\\&quot;'`tnr\$\{@]" innerClass="special" contained="yes">
+    <onlyin region="strdouble"/>
+    <onlyin region="q-w-q-statement"/>
+  </block>
+ 
+  <!-- logical op. 
+  <block name="logic" match="\|\||&amp;&amp;" innerClass="reserved" contained="yes"/>-->
+ 
+  <!-- 
+  identifiers 
+  -->
+  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
+
+  <!-- 
+  numbers 
+  -->
+  <block name="number" match="\d*\.?\d+" innerClass="number"/>
+
+  <!-- 
+  http://www.perldoc.com/perl5.6/pod/perlfunc.html 
+  Alphabetical Listing of Perl Functions 
+  -->
+  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "yes">
+      <keyword match="abs"/>
+      <keyword match="accept"/>
+      <keyword match="alarm"/>
+      <keyword match="atan2"/>
+      
+      <keyword match="bind"/>
+      <keyword match="binmode"/>
+      <keyword match="bless"/>
+      
+      <keyword match="caller"/>
+      <keyword match="chdir"/>
+      <keyword match="chmod"/>
+      <keyword match="chomp"/>
+      <keyword match="chop"/>
+      <keyword match="chown"/>
+      <keyword match="chr"/>
+      <keyword match="chroot"/>
+      <keyword match="close"/>
+      <keyword match="closedir"/>
+      <keyword match="connect"/>
+      <keyword match="continue"/>
+      <keyword match="cos"/>
+      <keyword match="crypt"/>
+
+      <keyword match="dbmclose"/>
+      <keyword match="dbmopen"/>
+      <keyword match="defined"/>
+      <keyword match="delete"/>
+      <keyword match="die"/>
+      <keyword match="do"/>
+      <keyword match="dump"/>
+      
+      <keyword match="each"/>
+      <keyword match="endgrent"/>
+      <keyword match="endhostent"/>
+      <keyword match="endnetent"/>
+      <keyword match="endprotoent"/>
+      <keyword match="endpwent"/>
+      <keyword match="endservent"/>
+      <keyword match="eof"/>
+      <keyword match="eval"/>
+      <keyword match="exec"/>
+      <keyword match="exists"/>
+      <keyword match="exit"/>
+      <keyword match="exp"/>
+      
+      <keyword match="fcntl"/>
+      <keyword match="fileno"/>
+      <keyword match="flock"/>
+      <keyword match="fork"/>
+      <keyword match="format"/>
+      <keyword match="formline"/>
+      
+      <keyword match="getc"/>
+      <keyword match="getgrent"/>
+      <keyword match="getgrgid"/>
+      <keyword match="getgrnam"/>
+      <keyword match="gethostbyaddr"/>
+      <keyword match="gethostbyname"/>
+      <keyword match="gethostent"/>
+      <keyword match="getlogin"/>
+      <keyword match="getnetbyaddr"/>
+      <keyword match="getnetbyname"/>
+      <keyword match="getnetent"/>
+      <keyword match="getpeername"/>
+      <keyword match="getpgrp"/>
+      <keyword match="getppid"/>
+      <keyword match="getpriority"/>
+      <keyword match="getprotobyname"/>
+      <keyword match="getprotobynumber"/>
+      <keyword match="getprotoent"/>
+      <keyword match="getpwent"/>
+      <keyword match="getpwnam"/>
+      <keyword match="getpwuid"/>
+      <keyword match="getservbyname"/>
+      <keyword match="getservbyport"/>
+      <keyword match="getservent"/>
+      <keyword match="getsockname"/>
+      <keyword match="getsockopt"/>
+      <keyword match="glob"/>
+      <keyword match="gmtime"/>
+      <keyword match="goto"/>
+      <keyword match="grep"/>
+      
+      <keyword match="hex"/>
+      
+      <keyword match="import"/>
+      <keyword match="index"/>
+      <keyword match="int"/>
+      <keyword match="ioctl"/>
+      
+      <keyword match="join"/>
+      
+      <keyword match="keys"/>
+      <keyword match="kill"/>
+      
+      <keyword match="last"/>
+      <keyword match="lc"/>
+      <keyword match="lcfirst"/>
+      <keyword match="length"/>
+      <keyword match="link"/>
+      <keyword match="listen"/>
+      <keyword match="local"/>
+      <keyword match="localtime"/>
+      <keyword match="lock"/>
+      <keyword match="log"/>
+      <keyword match="lstat"/>
+      
+      <!--<keyword match="m"/>-->
+      <keyword match="map"/>
+      <keyword match="mkdir"/>
+      <keyword match="msgctl"/>
+      <keyword match="msgget"/>
+      <keyword match="msgrcv"/>
+      <keyword match="msgsnd"/>
+      <keyword match="my"/>
+      
+      <keyword match="next"/>
+      <keyword match="no"/>
+      
+      <keyword match="oct"/>
+      <keyword match="open"/>
+      <keyword match="opendir"/>
+      <keyword match="ord"/>
+      <keyword match="our"/>
+      
+      <keyword match="pack"/>
+      <keyword match="package"/>
+      <keyword match="pipe"/>
+      <keyword match="pop"/>
+      <keyword match="pos"/>
+      <keyword match="print"/>
+      <keyword match="printf"/>
+      <keyword match="prototype"/>
+      <keyword match="push"/>
+      
+      <!--<keyword match="q"/>
+      <keyword match="qq"/>
+      <keyword match="qr"/>-->
+      <keyword match="quotemeta"/>
+      <!--<keyword match="qw"/>
+      <keyword match="qx"/>-->
+      
+      <keyword match="rand"/>
+      <keyword match="read"/>
+      <keyword match="readdir"/>
+      <keyword match="readline"/>
+      <keyword match="readlink"/>
+      <keyword match="readpipe"/>
+      <keyword match="recv"/>
+      <keyword match="redo"/>
+      <keyword match="ref"/>
+      <keyword match="rename"/>
+      <keyword match="require"/>
+      <keyword match="reset"/>
+      <keyword match="return"/>
+      <keyword match="reverse"/>
+      <keyword match="rewinddir"/>
+      <keyword match="rindex"/>
+      <keyword match="rmdir"/>
+      
+      <!--<keyword match="s"/>-->
+      <keyword match="scalar"/>
+      <keyword match="seek"/>
+      <keyword match="seekdir"/>
+      <keyword match="select"/>
+      <keyword match="semctl"/>
+      <keyword match="semget"/>
+      <keyword match="semop"/>
+      <keyword match="send"/>
+      <keyword match="setgrent"/>
+      <keyword match="sethostent"/>
+      <keyword match="setnetent"/>
+      <keyword match="setpgrp"/>
+      <keyword match="setpriority"/>
+      <keyword match="setprotoent"/>
+      <keyword match="setpwent"/>
+      <keyword match="setservent"/>
+      <keyword match="setsockopt"/>
+      <keyword match="shift"/>
+      <keyword match="shmctl"/>
+      <keyword match="shmget"/>
+      <keyword match="shmread"/>
+      <keyword match="shmwrite"/>
+      <keyword match="shutdown"/>
+      <keyword match="sin"/>
+      <keyword match="sleep"/>
+      <keyword match="socket"/>
+      <keyword match="socketpair"/>
+      <keyword match="sort"/>
+      <keyword match="splice"/>
+      <keyword match="split"/>
+      <keyword match="sprintf"/>
+      <keyword match="sqrt"/>
+      <keyword match="srand"/>
+      <keyword match="stat"/>
+      <keyword match="study"/>
+      <keyword match="sub"/>
+      <keyword match="substr"/>
+      <keyword match="symlink"/>
+      <keyword match="syscall"/>
+      <keyword match="sysopen"/>
+      <keyword match="sysread"/>
+      <keyword match="sysseek"/>
+      <keyword match="system"/>
+      <keyword match="syswrite"/>
+      
+      <keyword match="tell"/>
+      <keyword match="telldir"/>
+      <keyword match="tie"/>
+      <keyword match="tied"/>
+      <keyword match="time"/>
+      <keyword match="times"/>
+      <!--<keyword match="tr"/>-->
+      <keyword match="truncate"/>
+      
+      <keyword match="uc"/>
+      <keyword match="ucfirst"/>
+      <keyword match="umask"/>
+      <keyword match="undef"/>
+      <keyword match="unlink"/>
+      <keyword match="unpack"/>
+      <keyword match="unshift"/>
+      <keyword match="untie"/>
+      <keyword match="use"/>
+      <keyword match="utime"/>
+      
+      <keyword match="values"/>
+      <keyword match="vec"/>
+      
+      <keyword match="wait"/>
+      <keyword match="waitpid"/>
+      <keyword match="wantarray"/>
+      <keyword match="warn"/>
+      <keyword match="write"/>
+      
+      <keyword match="y"/> 
+  </keywords> 
+
+  <keywords name="missingreserved" inherits="identifier" innerClass="reserved" case = "yes">
+      <keyword match="new"/> 
+  </keywords> 
+
+
+  <keywords name="flowcontrol" inherits="identifier" innerClass="reserved" case = "yes">
+      <keyword match="if"/> 
+      <keyword match="else"/> 
+      <keyword match="elsif"/> 
+      <keyword match="while"/> 
+      <keyword match="unless"/> 
+      <keyword match="for"/> 
+      <keyword match="foreach"/> 
+      <keyword match="until"/> 
+      <keyword match="do"/> 
+      <keyword match="continue"/> 
+      <keyword match="not"/> 
+      <keyword match="or"/> 
+      <keyword match="and"/> 
+      <keyword match="eq"/> 
+      <keyword match="ne"/> 
+      <keyword match="gt"/> 
+      <keyword match="lt"/> 
+  </keywords> 
+
+</highlight>
diff --git a/library/Text_Highlighter/php.xml b/library/Text_Highlighter/php.xml
new file mode 100644
index 000000000..1b08ea203
--- /dev/null
+++ b/library/Text_Highlighter/php.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0"?>
+<!-- $Id: php.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="php">
+
+  <authors>
+    <author name="Andrey Demenev" email ="demenev@gmail.com"/>
+  </authors>
+
+
+  <default innerClass="code" />
+
+  <region name="phpCode" delimClass="inlinetags" innerClass="code"
+          start="\&lt;\?(php|=)?" end="\?\>" never-contained="yes">
+    <contains all="yes"/>
+  </region>
+
+  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}" contained="yes">
+    <contains all="yes"/>
+  </region>
+
+  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)" contained="yes" >
+    <contains all="yes"/>
+  </region>
+
+  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]" contained="yes">
+    <contains all="yes"/>
+  </region>
+
+
+  <region name="mlcomment" innerClass="comment" start="\/\*" end="\*\/" contained="yes">
+    <contains block="phpdoc"/>
+    <contains block="cvstag"/>
+  </region>
+
+  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;" contained="yes">
+    <contains block="var"/>
+  </region>
+
+  <region name="exec" delimClass="quotes" innerClass="string" start="`" end="`" contained="yes">
+    <contains block="var"/>
+  </region>
+
+  <region name="heredoc" delimClass="quotes" innerClass="string" start="/\&lt;\&lt;\&lt;[\x20\x09]*(\w+)$/m" end="/^%1%;?$/m" contained="yes" remember="yes">
+    <contains block="var"/>
+  </region>
+
+  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'" contained="yes"/>
+
+  <block name="escaped" match="\\\\|\\&quot;|\\'|\\`" innerClass="special" contained="yes">
+    <onlyin region="strsingle"/>
+    <onlyin region="exec"/>
+  </block>
+
+  <block name="descaped" match="\\[\\&quot;'`tnr\$\{]" innerClass="special" contained="yes">
+    <onlyin region="strdouble"/>
+    <onlyin region="heredoc"/>
+  </block>
+
+
+  <region name="comment" start="(#|\/\/)" end="/$|(?=\?\>)/m" innerClass="comment" contained="yes">
+    <contains block="cvstag"/>
+  </region>
+
+
+  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" contained="yes"/>
+
+  <block name="typecast" match="\((array|int|integer|string|bool|boolean|object|float|double)\)" innerClass="reserved" contained="yes"/>
+
+  <block name="curlyvar" match="\{\$[a-z_].*\}" innerClass="var" contained="yes">
+    <onlyin region="strdouble"/>
+    <onlyin region="heredoc"/>
+    <onlyin region="exec"/>
+  </block>
+
+  <region name="codeescape" delimClass="inlinetags" innerClass="default" end="\&lt;\?(php|=)?" start="\?\>" contained="yes">
+    <onlyin region="block"/>
+  </region>
+
+  <block name="hexinteger" match="0[xX][\da-f]+" innerClass="number" contained="yes"/>
+  <block name="var" match="\$[a-z_]\w*" innerClass="var" contained="yes"/>
+
+  <block name="integer" match="\d\d*|\b0\b" innerClass="number" contained="yes"/>
+
+
+  <block name="octinteger" match="0[0-7]+" innerClass="number" contained="yes"/>
+
+  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number" contained="yes"/>
+
+  <block name="exponent" 
+         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
+         innerClass="number" contained="yes"/>
+
+  <block name="phpdoc" match="\s@\w+\s" innerClass="inlinedoc" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+
+  <block name="url" match="((https?|ftp):\/\/[\w\?\.\-\&amp;=\/%+]+)|(^|[\s,!?])www\.\w+\.\w+[\w\?\.\&amp;=\/%+]*" innerClass="url" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+  
+  <block name="email" match="\w+[\.\w\-]+@(\w+[\.\w\-])+" innerClass="url" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+  
+  <block name="note" match="\bnote:" innerClass="inlinedoc" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+  
+
+  <block name="cvstag" match="\$\w+\s*:.*\$" innerClass="inlinedoc" contained="yes">
+    <onlyin region="mlcomment"/>
+    <onlyin region="comment"/>
+  </block>
+
+  <keywords name="constants" inherits="identifier" innerClass="reserved" case = "yes">
+    <keyword match="DIRECTORY_SEPARATOR"/>
+    <keyword match="PATH_SEPARATOR"/>
+  </keywords> 
+
+  <keywords name="reserved" inherits="identifier" innerClass="reserved">
+    <keyword match="echo"/>
+    <keyword match="foreach"/>
+    <keyword match="else"/>
+    <keyword match="if"/>
+    <keyword match="elseif"/>
+    <keyword match="for"/>
+    <keyword match="as"/>
+    <keyword match="while"/>
+    <keyword match="foreach"/>
+    <keyword match="break"/>
+    <keyword match="continue"/>
+    <keyword match="class"/>
+    <keyword match="const"/>
+    <keyword match="declare"/>
+    <keyword match="switch"/>
+    <keyword match="case"/>
+    <keyword match="endfor"/>
+    <keyword match="endswitch"/>
+    <keyword match="endforeach"/>
+    <keyword match="endswitch"/>
+    <keyword match="endif"/>
+    <keyword match="array"/>
+    <keyword match="default"/>
+    <keyword match="do"/>
+    <keyword match="enddeclare"/>
+    <keyword match="eval"/>
+    <keyword match="exit"/>
+    <keyword match="die"/>
+    <keyword match="extends"/>
+    <keyword match="function"/>
+    <keyword match="global"/>
+    <keyword match="include"/>
+    <keyword match="include_once"/>
+    <keyword match="require"/>
+    <keyword match="require_once"/>
+    <keyword match="isset"/>
+    <keyword match="empty"/>
+    <keyword match="list"/>
+    <keyword match="new"/>
+    <keyword match="static"/>
+    <keyword match="unset"/>
+    <keyword match="var"/>
+    <keyword match="return"/>
+    <keyword match="try"/>
+    <keyword match="catch"/>
+    <keyword match="final"/>
+    <keyword match="throw"/>
+    <keyword match="public"/>
+    <keyword match="private"/>
+    <keyword match="protected"/>
+    <keyword match="abstract"/>
+    <keyword match="interface"/>
+    <keyword match="implements"/>
+    <keyword match="const"/>
+    <keyword match="define"/>
+    <keyword match="__FILE__"/>
+    <keyword match="__LINE__"/>
+    <keyword match="__CLASS__"/>
+    <keyword match="__METHOD__"/>
+    <keyword match="__FUNCTION__"/>
+    <keyword match="NULL"/>
+    <keyword match="true"/>
+    <keyword match="false"/>
+    <keyword match="and"/>
+    <keyword match="or"/>
+    <keyword match="xor"/>
+  </keywords> 
+
+</highlight>
diff --git a/library/Text_Highlighter/python.xml b/library/Text_Highlighter/python.xml
new file mode 100644
index 000000000..29e77203c
--- /dev/null
+++ b/library/Text_Highlighter/python.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0"?>
+<!-- $Id: python.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="python" case="no">
+
+  <authors>
+    <author name="Andrey Demenev" email="demenev@gmail.com"/>
+  </authors>
+
+  <default innerClass="code" />
+
+  <region name="strsingle3" delimClass="quotes" innerClass="string" 
+          start="'''" end="'''" />
+
+  <region name="strdouble3" delimClass="quotes" innerClass="string" 
+          start="&quot;&quot;&quot;" end="&quot;&quot;&quot;">
+  </region>
+
+  <region name="strdouble" delimClass="quotes" innerClass="string" 
+          start="&quot;" end="&quot;" >
+  </region>
+  
+  <region name="strsingle" delimClass="quotes" innerClass="string" 
+          start="'" end="'" />
+  
+  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)" >
+    <contains all="yes"/>
+  </region>
+
+  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]" >
+    <contains all="yes"/>
+  </region>
+
+  <block name="escaped" match="\\." innerClass="special" contained="yes">
+    <onlyin region="strsingle"/>
+    <onlyin region="strsingle3"/>
+    <onlyin region="strdouble"/>
+    <onlyin region="strdouble3"/>
+  </block>
+
+  <block name="possiblefunction" match="[a-z_]\w*(?=\s*\()" innerClass="identifier" />
+
+  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" />
+
+  <block name="exponent" 
+         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
+         innerClass="number" />
+
+  <block name="imaginary" match="((\d*\.\d+)|(\d+\.\d*)|(\d+))j" innerClass="number"/>
+
+  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
+
+  <block name="integer" match="\d+l?|\b0l?\b" innerClass="number" />
+
+  <block name="hexinteger" match="0[xX][\da-f]+l?" innerClass="number" />
+
+  <block name="octinteger" match="0[0-7]+l?" innerClass="number" />
+
+  <block name="comment" innerClass="comment" 
+          match="#.+" />
+
+  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "yes">
+    <keyword match="and"/>
+    <keyword match="del"/>
+    <keyword match="for"/>
+    <keyword match="is"/>
+    <keyword match="raise"/>
+    <keyword match="assert"/>
+    <keyword match="elif"/>
+    <keyword match="from"/>
+    <keyword match="lambda"/>
+    <keyword match="return"/>
+    <keyword match="break"/>
+    <keyword match="else"/>
+    <keyword match="global"/>
+    <keyword match="not"/>
+    <keyword match="try"/>
+    <keyword match="class"/>
+    <keyword match="except"/>
+    <keyword match="if"/>
+    <keyword match="or"/>
+    <keyword match="while"/>
+    <keyword match="continue"/>
+    <keyword match="exec"/>
+    <keyword match="import"/>
+    <keyword match="pass"/>
+    <keyword match="yield"/>
+    <keyword match="def"/>
+    <keyword match="finally"/>
+    <keyword match="in"/>
+    <keyword match="print"/>
+    <keyword match="False"/>
+    <keyword match="True"/>
+    <keyword match="None"/>
+    <keyword match="NotImplemented"/>
+    <keyword match="Ellipsis"/>
+
+    <keyword match="Exception" />
+    <keyword match="SystemExit" />
+    <keyword match="StopIteration" />
+    <keyword match="StandardError" />
+    <keyword match="KeyboardInterrupt" />
+    <keyword match="ImportError" />
+    <keyword match="EnvironmentError" />
+    <keyword match="IOError" />
+    <keyword match="OSError" />
+    <keyword match="WindowsError" />
+    <keyword match="EOFError" />
+    <keyword match="RuntimeError" />
+    <keyword match="NotImplementedError" />
+    <keyword match="NameError" />
+    <keyword match="UnboundLocalError" />
+
+    <keyword match="AttributeError" />
+    <keyword match="SyntaxError" />
+    <keyword match="IndentationError" />
+    <keyword match="TabError" />
+    <keyword match="TypeError" />
+    <keyword match="AssertionError" />
+    <keyword match="LookupError" />
+    <keyword match="IndexError" />
+    <keyword match="KeyError" />
+    <keyword match="ArithmeticError" />
+    <keyword match="OverflowError" />
+    <keyword match="ZeroDivisionError" />
+    <keyword match="FloatingPointError" />
+    <keyword match="ValueError" />
+    <keyword match="UnicodeError" />
+    <keyword match="UnicodeEncodeError" />
+    <keyword match="UnicodeDecodeError" />
+
+    <keyword match="UnicodeTranslateError" />
+    <keyword match="ReferenceError" />
+    <keyword match="SystemError" />
+    <keyword match="MemoryError" />
+    <keyword match="Warning" />
+    <keyword match="UserWarning" />
+    <keyword match="DeprecationWarning" />
+    <keyword match="PendingDeprecationWarning" />
+    <keyword match="SyntaxWarning" />
+    <keyword match="OverflowWarning" />
+    <keyword match="RuntimeWarning" />
+    <keyword match="FutureWarning" />
+
+  </keywords>
+
+  <keywords name="builtin" inherits="possiblefunction" 
+            innerClass="builtin" otherwise="identifier" case = "yes"> 
+    <keyword match="__import__"/>
+
+    <keyword match="abs"/>
+    <keyword match="apply"/>
+    <keyword match="basestring"/>
+    <keyword match="bool"/>
+    <keyword match="buffer"/>
+    <keyword match="callable"/>
+    <keyword match="chr"/>
+    <keyword match="classmethod"/>
+    <keyword match="cmp"/>
+
+    <keyword match="coerce"/>
+    <keyword match="compile"/>
+    <keyword match="complex"/>
+    <keyword match="delattr"/>
+    <keyword match="dict"/>
+    <keyword match="dir"/>
+    <keyword match="divmod"/>
+    <keyword match="enumerate"/>
+    <keyword match="eval"/>
+
+    <keyword match="execfile"/>
+    <keyword match="file"/>
+    <keyword match="filter"/>
+    <keyword match="float"/>
+    <keyword match="getattr"/>
+    <keyword match="globals"/>
+    <keyword match="hasattr"/>
+    <keyword match="hash"/>
+    <keyword match="help"/>
+
+    <keyword match="hex"/>
+    <keyword match="id"/>
+    <keyword match="input"/>
+    <keyword match="int"/>
+    <keyword match="intern"/>
+    <keyword match="isinstance"/>
+    <keyword match="issubclass"/>
+    <keyword match="iter"/>
+    <keyword match="len"/>
+
+    <keyword match="list"/>
+    <keyword match="locals"/>
+    <keyword match="long"/>
+    <keyword match="map"/>
+    <keyword match="max"/>
+    <keyword match="min"/>
+    <keyword match="object"/>
+    <keyword match="oct"/>
+    <keyword match="open"/>
+
+    <keyword match="ord"/>
+    <keyword match="pow"/>
+    <keyword match="property"/>
+    <keyword match="range"/>
+    <keyword match="raw_input"/>
+    <keyword match="reduce"/>
+    <keyword match="reload"/>
+    <keyword match="repr"/>
+    <keyword match="round"/>
+
+    <keyword match="setattr"/>
+    <keyword match="slice"/>
+    <keyword match="staticmethod"/>
+    <keyword match="sum"/>
+    <keyword match="super"/>
+    <keyword match="str"/>
+    <keyword match="tuple"/>
+    <keyword match="type"/>
+    <keyword match="unichr"/>
+
+    <keyword match="unicode"/>
+    <keyword match="vars"/>
+    <keyword match="xrange"/>
+    <keyword match="zip"/>
+    
+  </keywords>
+
+</highlight>
+
diff --git a/library/Text_Highlighter/release b/library/Text_Highlighter/release
new file mode 100644
index 000000000..66f1fa603
--- /dev/null
+++ b/library/Text_Highlighter/release
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/usr/local/bin/php package.php make
+/usr/local/bin/pear package
diff --git a/library/Text_Highlighter/ruby.xml b/library/Text_Highlighter/ruby.xml
new file mode 100644
index 000000000..599f5af17
--- /dev/null
+++ b/library/Text_Highlighter/ruby.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+<!-- $Id: ruby.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="ruby" case="no">
+
+  <authors>
+    <author name="Andrey Demenev" email="demenev@gmail.com"/>
+  </authors>
+
+  <comment>
+FIXME:  While this construction : s.split /z/i 
+is valid, regular expression is not recognized as such
+(/ folowing an identifier or number is not recognized as
+start of RE), making highlighting improper
+
+%q(a (nested) string) does not get highlighted correctly
+  </comment>
+
+  <default innerClass="code" />
+
+  <region name="data" start="/^__END__$/m" end="$" delimClass="reserved" innerClass="comment" never-conteined="yes" />
+  
+  <region name="strdouble" delimClass="quotes" innerClass="string" 
+          start="&quot;" end="&quot;" >
+  </region>
+
+  <region name="qstrdouble" delimClass="quotes" innerClass="string" 
+      start="%[Qx]([!&quot;#\$%&amp;'+\-*.\/:;=?@^`|~{&lt;\[(])" end="%b1%"  remember="yes" />
+  
+  <region name="strsingle" delimClass="quotes" innerClass="string" 
+          start="'" end="'" />
+
+  <region name="qstrsingle" delimClass="quotes" innerClass="string" 
+      start="%[wq]([!&quot;#\$%&amp;'+\-*.\/:;=?@^`|~{&lt;\[(])" end="%b1%"  remember="yes" />
+
+  <block name="global" match="\$(\W|\w+)" innerClass="var" />
+
+  <block name="classvar" match="/@@?[_a-z][\d_a-z]*/i" innerClass="var" />
+  
+  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)" >
+    <contains all="yes"/>
+  </region>
+
+  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]" >
+    <contains all="yes"/>
+  </region>
+
+  <block name="escaped" match="\\." innerClass="special" contained="yes">
+    <onlyin region="qstrsingle"/>
+    <onlyin region="strsingle"/>
+    <onlyin region="qstrdouble"/>
+    <onlyin region="strdouble"/>
+    <onlyin region="regexp"/>
+  </block>
+
+  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" />
+
+  <block name="exponent" 
+         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
+         innerClass="number" />
+
+  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
+
+  <block name="hexinteger" match="0[xX][\da-f]+l?" innerClass="number" />
+  
+  <block name="integer" match="\d+l?|\b0l?\b" innerClass="number" />
+
+  <block name="octinteger" match="0[0-7]+l?" innerClass="number" />
+
+
+  <region name="rubydoc" start="/^=begin$/m" end="/^=end$/m" delimClass="comment" innerClass="comment">
+      <contains block="cvstag" />
+  </region>
+  
+  <block name="cvstag" match="\$\w+\s*:.+\$" innerClass="inlinedoc" contained="yes">
+    <onlyin region="comment"/>
+    <onlyin region="rubydoc"/>
+  </block>
+
+  <region name="comment" innerClass="comment" start="#" end="/$/m" delimClass="comment" >
+      <contains block="cvstag" />
+  </region>
+
+  <region name="regexp" delimClass="quotes" innerClass="string" start="\s*\/" end="\/[iomx]*" 
+   neverAfter="(?&lt;!\band|\bor|\bwhile|\buntil|\bunless|\bif|\belsif|\bwhen|[~=!|&amp;(,\[])$">
+  </region>
+  
+  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "yes">
+      <keyword match="__FILE__" />
+      <keyword match="require" />
+      <keyword match="and" />
+      <keyword match="def" />
+      <keyword match="end" />
+      <keyword match="in" />
+      <keyword match="or" />
+      <keyword match="self" />
+      <keyword match="unless" />
+      <keyword match="__LINE__" />
+      <keyword match="begin" />
+      <keyword match="defined?" />
+      <keyword match="ensure" />
+      <keyword match="module" />
+      <keyword match="redo" />
+      <keyword match="super" />
+      <keyword match="until" />
+      <keyword match="BEGIN" />
+      <keyword match="break" />
+      <keyword match="do" />
+      <keyword match="false" />
+      <keyword match="next" />
+      <keyword match="rescue" />
+      <keyword match="then" />
+      <keyword match="when" />
+      <keyword match="END" />
+      <keyword match="case" />
+      <keyword match="else" />
+      <keyword match="for" />
+      <keyword match="nil" />
+      <keyword match="retry" />
+      <keyword match="true" />
+      <keyword match="while" />
+      <keyword match="alias" />
+      <keyword match="module_function" />
+      <keyword match="private" />
+      <keyword match="public" />
+      <keyword match="protected" />
+      <keyword match="attr_reader" />
+      <keyword match="attr_writer" />
+      <keyword match="attr_accessor" />
+      <keyword match="class" />
+      <keyword match="elsif" />
+      <keyword match="if" />
+      <keyword match="not" />
+      <keyword match="return" />
+      <keyword match="undef" />
+      <keyword match="yield" />
+  </keywords>
+
+
+</highlight>
+
diff --git a/library/Text_Highlighter/sample.css b/library/Text_Highlighter/sample.css
new file mode 100644
index 000000000..b4b38c5fc
--- /dev/null
+++ b/library/Text_Highlighter/sample.css
@@ -0,0 +1,62 @@
+.hl-main ol {
+	line-height: 1.0;
+}
+.hl-default {
+    color: Black;
+}
+.hl-code {
+    color: Black;
+}
+.hl-brackets {
+    color: Olive;
+}
+.hl-comment {
+    color: Purple;
+}
+.hl-quotes {
+    color: Darkred;
+}
+.hl-string {
+    color: Red;
+}
+.hl-identifier {
+    color: Blue;
+}
+.hl-builtin {
+    color: Teal;
+}
+.hl-reserved {
+    color: Green;
+}
+.hl-inlinedoc {
+    color: Blue;
+}
+.hl-var {
+    color: Darkblue;
+}
+.hl-url {
+    color: Blue;
+}
+.hl-special {
+    color: Navy;
+}
+.hl-number {
+    color: Maroon;
+}
+.hl-inlinetags {
+    color: Blue;
+}
+.hl-main {
+	background: #ccc none repeat scroll 0 0;
+    color: #000;
+/*    background-color: White; */
+}
+.hl-gutter {
+    background-color: #999999;
+    color: White
+}
+.hl-table {
+    font-family: courier;
+    font-size: 12px;
+    border: solid 1px Lightgrey;
+}
diff --git a/library/Text_Highlighter/sh.xml b/library/Text_Highlighter/sh.xml
new file mode 100644
index 000000000..1250de3bc
--- /dev/null
+++ b/library/Text_Highlighter/sh.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0"?>
+<!-- $Id: sh.xml,v 1.2 2007-06-14 00:15:50 ssttoo Exp $ -->
+
+<highlight lang="sh" case = "yes">
+
+  <authors>
+    <author name="Noah Spurrier" email="noah@noah.org" />
+  </authors>
+
+  <comment>This highlighter is EXPERIMENTAL. It may work incorrectly.
+      It is a crude hack of the perl syntax, which itself wasn't so good.
+      But this seems to work OK.
+  </comment>
+
+  <default innerClass="code"/>
+
+  <block name="interpreter" match="/^(#!)(.*)/m" innerClass="special">
+   <partClass index="1" innerClass="special" />
+   <partClass index="2" innerClass="string" />
+  </block>
+
+  <!--
+  brackets
+  -->
+  <region name="block" delimClass="brackets" innerClass="code" start="\{" end="\}">
+    <contains all="yes"/>
+  </region>
+
+  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
+    <contains all="yes"/>
+  </region>
+
+  <region name="sqbrackets" delimClass="brackets" innerClass="code" start="\[" end="\]">
+    <contains all="yes"/>
+  </region>
+
+  <!--
+  use smth
+  -->
+  <block name="usestatement" match="(use)\s+([\w:]*)" innerClass="special">
+   <partClass index="1" innerClass="reserved" />
+   <partClass index="2" innerClass="special" />
+  </block>
+
+
+  <region name="q-w-q-statement"
+    start="/\b(q[wq]\s*((\{)|(\()|(\[)|(\&lt;)|([\W\S])))(?=(.*)((?(3)\})(?(4)\))(?(5)\])(?(6)\&gt;)(?(7)\7)))/Us"
+    end="%b2%"
+    innerClass="string" delimClass="quotes" remember="yes">
+
+    <contains block="containedvar"/>
+    <contains block="specialvar"/>
+    <contains block="curlyvar"/>
+
+  </region>
+
+  <region name="qstatement"
+    start="/\b(q\s*((\{)|(\()|(\[)|(\&lt;)|([\W\S])))(?=(.*)((?(3)\})(?(4)\))(?(5)\])(?(6)\&gt;)(?(7)\7)))/Us"
+    end="%b2%"
+    innerClass="string" delimClass="quotes" remember="yes">
+
+  </region>
+
+  <!--
+  comments
+  -->
+  <block name="comment" match="#.*" innerClass="comment" />
+
+
+  <!--
+  regexpr
+  FIXME: this should be rewritten
+  -->
+  <block name="dblregexprver1" match="/(s|tr) ([|#~`!@$%^&amp;*-+=\\;:'&quot;,.\/?])  ((\\.|[^\\])*?) (\2)((\\.|[^\\])*?)(\2[ecgimosx]*)/x" innerClass="string">
+   <partClass index="1" innerClass="quotes" />
+   <partClass index="2" innerClass="quotes" />
+   <partClass index="3" innerClass="string" />
+   <partClass index="5" innerClass="quotes" />
+   <partClass index="6" innerClass="string" />
+   <partClass index="8" innerClass="quotes" />
+  </block>
+
+  <block name="dblregexprver2" match="/(m) ([|#~`!@$%^&amp;*-+=\\;:'&quot;,.\/?])  ((\\.|[^\\])*?) (\2[ecgimosx]*)/x" innerClass="string">
+   <partClass index="1" innerClass="quotes" />
+   <partClass index="2" innerClass="quotes" />
+   <partClass index="3" innerClass="string" />
+   <partClass index="5" innerClass="quotes" />
+  </block>
+
+
+  <region name="regexp" start=" \/" end="\/[cgimosx]*" innerClass="string" delimClass="quotes" case="yes">
+    <contains block="reescaped"/>
+  </region>
+
+  <block name="reescaped" match="\\\/" innerClass="string" contained="yes">
+    <onlyin region="regexp"/>
+  </block>
+
+  <!--
+  variables
+  FIXME: @{...}
+  -->
+  <block name="bracketsvars" match="([a-z1-9_]+)(\s*=>)" innerClass="string" contained="yes" case="no">
+    <partClass index="1" innerClass="string" />
+    <partClass index="2" innerClass="code" />
+    <onlyin region="brackets"/>
+  </block>
+
+  <block name="specialvar" match="\$#?[1-9'`@!]" innerClass="var"/>
+
+  <block name="var" match="(\$#?|[@%*])([a-z1-9_]+::)*([a-z1-9_]+|\^(?-i)[A-Z]?(?i))" innerClass="var" case="no"/>
+  <block name="containedvar" match="\$([a-z1-9_]+|\^(?-i)[A-Z]?(?i))" innerClass="var" case="no"/>
+
+  <block name="classvar" match="(\{)([a-z1-9]+)(\})" innerClass="var" case="no">
+   <partClass index="1" innerClass="brackets" />
+   <partClass index="2" innerClass="var" />
+   <partClass index="3" innerClass="brackets" />
+  </block>
+
+  <block name="curlyvar" match="[\$@%]#?\{[a-z1-9]+\}" innerClass="var" case="no"/>
+
+  <!--
+  quotes
+  -->
+  <region name="exec" delimClass="quotes" innerClass="string" start="`" end="`">
+    <contains block="containedvar"/>
+    <contains block="specialvar"/>
+    <contains block="curlyvar"/>
+  </region>
+
+  <region name="strsingle" delimClass="quotes" innerClass="string" start="'" end="'"/>
+
+  <block name="escaped" match="\\\\|\\&quot;|\\'|\\`" innerClass="special" contained="yes">
+    <onlyin region="qstatement"/>
+    <onlyin region="strsingle"/>
+    <onlyin region="exec"/>
+  </block>
+
+  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;">
+    <contains block="containedvar"/>
+    <contains block="specialvar"/>
+    <contains block="curlyvar"/>
+  </region>
+
+  <block name="descaped" match="\\[\\&quot;'`tnr\$\{@]" innerClass="special" contained="yes">
+    <onlyin region="strdouble"/>
+    <onlyin region="q-w-q-statement"/>
+  </block>
+
+  <!-- logical op.
+  <block name="logic" match="\|\||&amp;&amp;" innerClass="reserved" contained="yes"/>-->
+
+  <!--
+  identifiers
+  -->
+  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
+
+  <!--
+  numbers
+  -->
+  <block name="number" match="\d*\.?\d+" innerClass="number"/>
+
+  <!--
+  GNU and posix standard shell utilities here.
+  -->
+  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "yes">
+      <keyword match="cd"/>
+      <keyword match="cp"/>
+      <keyword match="rm"/>
+      <keyword match="echo"/>
+      <keyword match="printf"/>
+      <keyword match="exit"/>
+      <keyword match="cut"/>
+      <keyword match="join"/>
+      <keyword match="comm"/>
+      <keyword match="fmt"/>
+      <keyword match="grep"/>
+      <keyword match="egrep"/>
+      <keyword match="fgrep"/>
+      <keyword match="sed"/>
+      <keyword match="awk"/>
+      <keyword match="yes"/>
+      <keyword match="false"/>
+      <keyword match="true"/>
+      <keyword match="test"/>
+      <keyword match="expr"/>
+      <keyword match="tee"/>
+      <keyword match="basename"/>
+      <keyword match="dirname"/>
+      <keyword match="pathchk"/>
+      <keyword match="pwd"/>
+      <keyword match="stty"/>
+      <keyword match="tty"/>
+      <keyword match="env"/>
+      <keyword match="printenv"/>
+      <keyword match="id"/>
+      <keyword match="logname"/>
+      <keyword match="whoami"/>
+      <keyword match="groups"/>
+      <keyword match="users"/>
+      <keyword match="who"/>
+      <keyword match="date"/>
+      <keyword match="uname"/>
+      <keyword match="hostname"/>
+      <keyword match="chroot"/>
+      <keyword match="nice"/>
+      <keyword match="nohup"/>
+      <keyword match="sleep"/>
+      <keyword match="factor"/>
+      <keyword match="seq"/>
+      <keyword match="getopt"/>
+      <keyword match="getopts"/>
+      <keyword match="options"/>
+      <keyword match="shift"/>
+  </keywords>
+
+  <keywords name="flowcontrol" inherits="identifier" innerClass="reserved" case = "yes">
+      <keyword match="if"/>
+      <keyword match="fi"/>
+      <keyword match="then"/>
+      <keyword match="else"/>
+      <keyword match="elif"/>
+      <keyword match="case"/>
+      <keyword match="esac"/>
+      <keyword match="while"/>
+      <keyword match="done"/>
+      <keyword match="for"/>
+      <keyword match="in"/>
+      <keyword match="function"/>
+      <keyword match="until"/>
+      <keyword match="do"/>
+      <keyword match="select"/>
+      <keyword match="time"/>
+      <!--
+      <keyword match="[["/>
+      <keyword match="]]"/>
+      -->
+      <keyword match="read"/>
+      <keyword match="set"/>
+  </keywords>
+
+</highlight>
diff --git a/library/Text_Highlighter/sql.xml b/library/Text_Highlighter/sql.xml
new file mode 100644
index 000000000..19cae49a0
--- /dev/null
+++ b/library/Text_Highlighter/sql.xml
@@ -0,0 +1,496 @@
+<?xml version="1.0"?>
+<!-- $Id: sql.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="sql" case="no">
+
+  <authors>
+    <author name="Andrey Demenev" email="demenev@gmail.com"/>
+  </authors>
+
+
+  <comment>Based on SQL-99</comment>
+
+  <default innerClass="code" />
+
+  <region name="qidentifier" delimClass="quotes" innerClass="identifier" 
+          start="`" end="`" />
+
+  <region name="mlcomment" delimClass="comment" innerClass="comment" 
+          start="\/\*" end="\*\/" />
+
+  <block name="comment" match="(#|--\s).*" innerClass="comment" />
+
+  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" />
+
+  <region name="strdouble" delimClass="quotes" innerClass="string" 
+          start="&quot;" end="&quot;" >
+  </region>
+  
+  <region name="brackets" delimClass="brackets" innerClass="code" 
+          start="\(" end="\)" >
+    <contains all="yes"/>
+  </region>
+
+  <region name="strsingle" delimClass="quotes" innerClass="string" 
+          start="'" end="'" />
+
+  <block name="escaped" match="\\." innerClass="special" contained="yes">
+    <onlyin region="strsingle"/>
+    <onlyin region="strdouble"/>
+  </block>
+
+  <block name="exponent" 
+         match="((\d+|((\d*\.\d+)|(\d+\.\d*)))[eE][+-]?\d+)" 
+         innerClass="number" />
+
+  <block name="float" match="(\d*\.\d+)|(\d+\.\d*)" innerClass="number"/>
+
+  <block name="integer" match="\d+l?|\b0l?\b" innerClass="number" />
+
+  <block name="hexinteger" match="0[xX][\da-f]+l?" innerClass="number" />
+
+  <keywords name="reserved" inherits="identifier" innerClass="reserved" case = "no">
+    <keyword match="ABSOLUTE" />
+    <keyword match="ACTION" />
+    <keyword match="ADD" />
+    <keyword match="ADMIN" />
+    <keyword match="AFTER" />
+    <keyword match="AGGREGATE" />
+    <keyword match="ALIAS" />
+    <keyword match="ALL" />
+    <keyword match="ALLOCATE" />
+    <keyword match="ALTER" />
+    <keyword match="AND" />
+    <keyword match="ANY" />
+    <keyword match="ARE" />
+    <keyword match="ARRAY" />
+    <keyword match="AS" />
+    <keyword match="ASC" />
+    <keyword match="ASSERTION" />
+    <keyword match="AT" />
+    <keyword match="AUTHORIZATION" />
+    <keyword match="BEFORE" />
+    <keyword match="BEGIN" />
+    <keyword match="BINARY" />
+    <keyword match="BIT" />
+    <keyword match="BLOB" />
+    <keyword match="BOOLEAN" />
+    <keyword match="BOTH" />
+    <keyword match="BREADTH" />
+    <keyword match="BY" />
+    <keyword match="CALL" />
+    <keyword match="CASCADE" />
+    <keyword match="CASCADED" />
+    <keyword match="CASE" />
+    <keyword match="CAST" />
+    <keyword match="CATALOG" />
+    <keyword match="CHAR" />
+    <keyword match="CHARACTER" />
+    <keyword match="CHECK" />
+    <keyword match="CLASS" />
+    <keyword match="CLOB" />
+    <keyword match="CLOSE" />
+    <keyword match="COLLATE" />
+    <keyword match="COLLATION" />
+    <keyword match="COLUMN" />
+    <keyword match="COMMIT" />
+    <keyword match="COMPLETION" />
+    <keyword match="CONNECT" />
+    <keyword match="CONNECTION" />
+    <keyword match="CONSTRAINT" />
+    <keyword match="CONSTRAINTS" />
+    <keyword match="CONSTRUCTOR" />
+    <keyword match="CONTINUE" />
+    <keyword match="CORRESPONDING" />
+    <keyword match="CREATE" />
+    <keyword match="CROSS" />
+    <keyword match="CUBE" />
+    <keyword match="CURRENT" />
+    <keyword match="CURRENT_DATE" />
+    <keyword match="CURRENT_PATH" />
+    <keyword match="CURRENT_ROLE" />
+    <keyword match="CURRENT_TIME" />
+    <keyword match="CURRENT_TIMESTAMP" />
+    <keyword match="CURRENT_USER" />
+    <keyword match="CURSOR" />
+    <keyword match="CYCLE" />
+    <keyword match="DATA" />
+    <keyword match="DATE" />
+    <keyword match="DAY" />
+    <keyword match="DEALLOCATE" />
+    <keyword match="DEC" />
+    <keyword match="DECIMAL" />
+    <keyword match="DECLARE" />
+    <keyword match="DEFAULT" />
+    <keyword match="DEFERRABLE" />
+    <keyword match="DEFERRED" />
+    <keyword match="DELETE" />
+    <keyword match="DEPTH" />
+    <keyword match="DEREF" />
+    <keyword match="DESC" />
+    <keyword match="DESCRIBE" />
+    <keyword match="DESCRIPTOR" />
+    <keyword match="DESTROY" />
+    <keyword match="DESTRUCTOR" />
+    <keyword match="DETERMINISTIC" />
+    <keyword match="DIAGNOSTICS" />
+    <keyword match="DICTIONARY" />
+    <keyword match="DISCONNECT" />
+    <keyword match="DISTINCT" />
+    <keyword match="DOMAIN" />
+    <keyword match="DOUBLE" />
+    <keyword match="DROP" />
+    <keyword match="DYNAMIC" />
+    <keyword match="EACH" />
+    <keyword match="ELSE" />
+    <keyword match="END" />
+    <keyword match="END-EXEC" />
+    <keyword match="EQUALS" />
+    <keyword match="ESCAPE" />
+    <keyword match="EVERY" />
+    <keyword match="EXCEPT" />
+    <keyword match="EXCEPTION" />
+    <keyword match="EXEC" />
+    <keyword match="EXECUTE" />
+    <keyword match="EXTERNAL" />
+    <keyword match="FALSE" />
+    <keyword match="FETCH" />
+    <keyword match="FIRST" />
+    <keyword match="FLOAT" />
+    <keyword match="FOR" />
+    <keyword match="FOREIGN" />
+    <keyword match="FOUND" />
+    <keyword match="FREE" />
+    <keyword match="FROM" />
+    <keyword match="FULL" />
+    <keyword match="FUNCTION" />
+    <keyword match="GENERAL" />
+    <keyword match="GET" />
+    <keyword match="GLOBAL" />
+    <keyword match="GO" />
+    <keyword match="GOTO" />
+    <keyword match="GRANT" />
+    <keyword match="GROUP" />
+    <keyword match="GROUPING" />
+    <keyword match="HAVING" />
+    <keyword match="HOST" />
+    <keyword match="HOUR" />
+    <keyword match="IDENTITY" />
+    <keyword match="IGNORE" />
+    <keyword match="IMMEDIATE" />
+    <keyword match="IN" />
+    <keyword match="INDICATOR" />
+    <keyword match="INITIALIZE" />
+    <keyword match="INITIALLY" />
+    <keyword match="INNER" />
+    <keyword match="INOUT" />
+    <keyword match="INPUT" />
+    <keyword match="INSERT" />
+    <keyword match="INT" />
+    <keyword match="INTEGER" />
+    <keyword match="INTERSECT" />
+    <keyword match="INTERVAL" />
+    <keyword match="INTO" />
+    <keyword match="IS" />
+    <keyword match="ISOLATION" />
+    <keyword match="ITERATE" />
+    <keyword match="JOIN" />
+    <keyword match="KEY" />
+    <keyword match="LANGUAGE" />
+    <keyword match="LARGE" />
+    <keyword match="LAST" />
+    <keyword match="LATERAL" />
+    <keyword match="LEADING" />
+    <keyword match="LEFT" />
+    <keyword match="LESS" />
+    <keyword match="LEVEL" />
+    <keyword match="LIKE" />
+    <keyword match="LIMIT" />
+    <keyword match="LOCAL" />
+    <keyword match="LOCALTIME" />
+    <keyword match="LOCALTIMESTAMP" />
+    <keyword match="LOCATOR" />
+    <keyword match="MAP" />
+    <keyword match="MATCH" />
+    <keyword match="MINUTE" />
+    <keyword match="MODIFIES" />
+    <keyword match="MODIFY" />
+    <keyword match="MODULE" />
+    <keyword match="MONTH" />
+    <keyword match="NAMES" />
+    <keyword match="NATIONAL" />
+    <keyword match="NATURAL" />
+    <keyword match="NCHAR" />
+    <keyword match="NCLOB" />
+    <keyword match="NEW" />
+    <keyword match="NEXT" />
+    <keyword match="NO" />
+    <keyword match="NONE" />
+    <keyword match="NOT" />
+    <keyword match="NULL" />
+    <keyword match="NUMERIC" />
+    <keyword match="OBJECT" />
+    <keyword match="OF" />
+    <keyword match="OFF" />
+    <keyword match="OLD" />
+    <keyword match="ON" />
+    <keyword match="ONLY" />
+    <keyword match="OPEN" />
+    <keyword match="OPERATION" />
+    <keyword match="OPTION" />
+    <keyword match="OR" />
+    <keyword match="ORDER" />
+    <keyword match="ORDINALITY" />
+    <keyword match="OUT" />
+    <keyword match="OUTER" />
+    <keyword match="OUTPUT" />
+    <keyword match="PAD" />
+    <keyword match="PARAMETER" />
+    <keyword match="PARAMETERS" />
+    <keyword match="PARTIAL" />
+    <keyword match="PATH" />
+    <keyword match="POSTFIX" />
+    <keyword match="PRECISION" />
+    <keyword match="PREFIX" />
+    <keyword match="PREORDER" />
+    <keyword match="PREPARE" />
+    <keyword match="PRESERVE" />
+    <keyword match="PRIMARY" />
+    <keyword match="PRIOR" />
+    <keyword match="PRIVILEGES" />
+    <keyword match="PROCEDURE" />
+    <keyword match="PUBLIC" />
+    <keyword match="READ" />
+    <keyword match="READS" />
+    <keyword match="REAL" />
+    <keyword match="RECURSIVE" />
+    <keyword match="REF" />
+    <keyword match="REFERENCES" />
+    <keyword match="REFERENCING" />
+    <keyword match="RELATIVE" />
+    <keyword match="RESTRICT" />
+    <keyword match="RESULT" />
+    <keyword match="RETURN" />
+    <keyword match="RETURNS" />
+    <keyword match="REVOKE" />
+    <keyword match="RIGHT" />
+    <keyword match="ROLE" />
+    <keyword match="ROLLBACK" />
+    <keyword match="ROLLUP" />
+    <keyword match="ROUTINE" />
+    <keyword match="ROW" />
+    <keyword match="ROWS" />
+    <keyword match="SAVEPOINT" />
+    <keyword match="SCHEMA" />
+    <keyword match="SCOPE" />
+    <keyword match="SCROLL" />
+    <keyword match="SEARCH" />
+    <keyword match="SECOND" />
+    <keyword match="SECTION" />
+    <keyword match="SELECT" />
+    <keyword match="SEQUENCE" />
+    <keyword match="SESSION" />
+    <keyword match="SESSION_USER" />
+    <keyword match="SET" />
+    <keyword match="SETS" />
+    <keyword match="SIZE" />
+    <keyword match="SMALLINT" />
+    <keyword match="SOME" />
+    <keyword match="SPACE" />
+    <keyword match="SPECIFIC" />
+    <keyword match="SPECIFICTYPE" />
+    <keyword match="SQL" />
+    <keyword match="SQLEXCEPTION" />
+    <keyword match="SQLSTATE" />
+    <keyword match="SQLWARNING" />
+    <keyword match="START" />
+    <keyword match="STATE" />
+    <keyword match="STATEMENT" />
+    <keyword match="STATIC" />
+    <keyword match="STRUCTURE" />
+    <keyword match="SYSTEM_USER" />
+    <keyword match="TABLE" />
+    <keyword match="TEMPORARY" />
+    <keyword match="TERMINATE" />
+    <keyword match="THAN" />
+    <keyword match="THEN" />
+    <keyword match="TIME" />
+    <keyword match="TIMESTAMP" />
+    <keyword match="TIMEZONE_HOUR" />
+    <keyword match="TIMEZONE_MINUTE" />
+    <keyword match="TO" />
+    <keyword match="TRAILING" />
+    <keyword match="TRANSACTION" />
+    <keyword match="TRANSLATION" />
+    <keyword match="TREAT" />
+    <keyword match="TRIGGER" />
+    <keyword match="TRUE" />
+    <keyword match="UNDER" />
+    <keyword match="UNION" />
+    <keyword match="UNIQUE" />
+    <keyword match="UNKNOWN" />
+    <keyword match="UNNEST" />
+    <keyword match="UPDATE" />
+    <keyword match="USAGE" />
+    <keyword match="USER" />
+    <keyword match="USING" />
+    <keyword match="VALUE" />
+    <keyword match="VALUES" />
+    <keyword match="VARCHAR" />
+    <keyword match="VARIABLE" />
+    <keyword match="VARYING" />
+    <keyword match="VIEW" />
+    <keyword match="WHEN" />
+    <keyword match="WHENEVER" />
+    <keyword match="WHERE" />
+    <keyword match="WITH" />
+    <keyword match="WITHOUT" />
+    <keyword match="WORK" />
+    <keyword match="WRITE" />
+    <keyword match="YEAR" />
+    <keyword match="ZONE" />
+  </keywords>
+  <keywords name="keyword" inherits="identifier" innerClass="var" case = "no">
+    <keyword match="ABS" />
+    <keyword match="ADA" />
+    <keyword match="ASENSITIVE" />
+    <keyword match="ASSIGNMENT" />
+    <keyword match="ASYMMETRIC" />
+    <keyword match="ATOMIC" />
+    <keyword match="AVG" />
+    <keyword match="BETWEEN" />
+    <keyword match="BITVAR" />
+    <keyword match="BIT_LENGTH" />
+    <keyword match="C" />
+    <keyword match="CALLED" />
+    <keyword match="CARDINALITY" />
+    <keyword match="CATALOG_NAME" />
+    <keyword match="CHAIN" />
+    <keyword match="CHARACTER_LENGTH" />
+    <keyword match="CHARACTER_SET_CATALOG" />
+    <keyword match="CHARACTER_SET_NAME" />
+    <keyword match="CHARACTER_SET_SCHEMA" />
+    <keyword match="CHAR_LENGTH" />
+    <keyword match="CHECKED" />
+    <keyword match="CLASS_ORIGIN" />
+    <keyword match="COALESCE" />
+    <keyword match="COBOL" />
+    <keyword match="COLLATION_CATALOG" />
+    <keyword match="COLLATION_NAME" />
+    <keyword match="COLLATION_SCHEMA" />
+    <keyword match="COLUMN_NAME" />
+    <keyword match="COMMAND_FUNCTION" />
+    <keyword match="COMMAND_FUNCTION_CODE" />
+    <keyword match="COMMITTED" />
+    <keyword match="CONDITION_NUMBER" />
+    <keyword match="CONNECTION_NAME" />
+    <keyword match="CONSTRAINT_CATALOG" />
+    <keyword match="CONSTRAINT_NAME" />
+    <keyword match="CONSTRAINT_SCHEMA" />
+    <keyword match="CONTAINS" />
+    <keyword match="CONVERT" />
+    <keyword match="COUNT" />
+    <keyword match="CURSOR_NAME" />
+    <keyword match="DATETIME_INTERVAL_CODE" />
+    <keyword match="DATETIME_INTERVAL_PRECISION" />
+    <keyword match="DEFINED" />
+    <keyword match="DEFINER" />
+    <keyword match="DISPATCH" />
+    <keyword match="DYNAMIC_FUNCTION" />
+    <keyword match="DYNAMIC_FUNCTION_CODE" />
+    <keyword match="EXISTING" />
+    <keyword match="EXISTS" />
+    <keyword match="EXTRACT" />
+    <keyword match="FINAL" />
+    <keyword match="FORTRAN" />
+    <keyword match="G" />
+    <keyword match="GENERATED" />
+    <keyword match="GRANTED" />
+    <keyword match="HIERARCHY" />
+    <keyword match="HOLD" />
+    <keyword match="IMPLEMENTATION" />
+    <keyword match="INFIX" />
+    <keyword match="INSENSITIVE" />
+    <keyword match="INSTANCE" />
+    <keyword match="INSTANTIABLE" />
+    <keyword match="INVOKER" />
+    <keyword match="K" />
+    <keyword match="KEY_MEMBER" />
+    <keyword match="KEY_TYPE" />
+    <keyword match="LENGTH" />
+    <keyword match="LOWER" />
+    <keyword match="M" />
+    <keyword match="MAX" />
+    <keyword match="MESSAGE_LENGTH" />
+    <keyword match="MESSAGE_OCTET_LENGTH" />
+    <keyword match="MESSAGE_TEXT" />
+    <keyword match="METHOD" />
+    <keyword match="MIN" />
+    <keyword match="MOD" />
+    <keyword match="MORE" />
+    <keyword match="MUMPS" />
+    <keyword match="NAME" />
+    <keyword match="NULLABLE" />
+    <keyword match="NULLIF" />
+    <keyword match="NUMBER" />
+    <keyword match="OCTET_LENGTH" />
+    <keyword match="OPTIONS" />
+    <keyword match="OVERLAPS" />
+    <keyword match="OVERLAY" />
+    <keyword match="OVERRIDING" />
+    <keyword match="PARAMETER_MODE" />
+    <keyword match="PARAMETER_NAME" />
+    <keyword match="PARAMETER_ORDINAL_POSITION" />
+    <keyword match="PARAMETER_SPECIFIC_CATALOG" />
+    <keyword match="PARAMETER_SPECIFIC_NAME" />
+    <keyword match="PARAMETER_SPECIFIC_SCHEMA" />
+    <keyword match="PASCAL" />
+    <keyword match="PLI" />
+    <keyword match="POSITION" />
+    <keyword match="REPEATABLE" />
+    <keyword match="RETURNED_LENGTH" />
+    <keyword match="RETURNED_OCTET_LENGTH" />
+    <keyword match="RETURNED_SQLSTATE" />
+    <keyword match="ROUTINE_CATALOG" />
+    <keyword match="ROUTINE_NAME" />
+    <keyword match="ROUTINE_SCHEMA" />
+    <keyword match="ROW_COUNT" />
+    <keyword match="SCALE" />
+    <keyword match="SCHEMA_NAME" />
+    <keyword match="SECURITY" />
+    <keyword match="SELF" />
+    <keyword match="SENSITIVE" />
+    <keyword match="SERIALIZABLE" />
+    <keyword match="SERVER_NAME" />
+    <keyword match="SIMILAR" />
+    <keyword match="SIMPLE" />
+    <keyword match="SOURCE" />
+    <keyword match="SPECIFIC_NAME" />
+    <keyword match="STYLE" />
+    <keyword match="SUBCLASS_ORIGIN" />
+    <keyword match="SUBLIST" />
+    <keyword match="SUBSTRING" />
+    <keyword match="SUM" />
+    <keyword match="SYMMETRIC" />
+    <keyword match="SYSTEM" />
+    <keyword match="TABLE_NAME" />
+    <keyword match="TRANSACTIONS_COMMITTED" />
+    <keyword match="TRANSACTIONS_ROLLED_BACK" />
+    <keyword match="TRANSACTION_ACTIVE" />
+    <keyword match="TRANSFORM" />
+    <keyword match="TRANSFORMS" />
+    <keyword match="TRANSLATE" />
+    <keyword match="TRIGGER_CATALOG" />
+    <keyword match="TRIGGER_NAME" />
+    <keyword match="TRIGGER_SCHEMA" />
+    <keyword match="TRIM" />
+    <keyword match="TYPE" />
+    <keyword match="UNCOMMITTED" />
+    <keyword match="UNNAMED" />
+    <keyword match="UPPER" />
+    <keyword match="USER_DEFINED_TYPE_CATALOG" />
+    <keyword match="USER_DEFINED_TYPE_NAME" />
+    <keyword match="USER_DEFINED_TYPE_SCHEMA" />
+  </keywords>
+
+</highlight>
diff --git a/library/Text_Highlighter/vbscript.xml b/library/Text_Highlighter/vbscript.xml
new file mode 100644
index 000000000..09c37ffde
--- /dev/null
+++ b/library/Text_Highlighter/vbscript.xml
@@ -0,0 +1,305 @@
+<?xml version="1.0"?>
+<!-- $Id: vbscript.xml,v 1.2 2008-01-02 00:05:52 ssttoo Exp $ -->
+
+<highlight lang="vbscript" case="no">
+
+  <authors>
+    <author name="Daniel Fruzynski" email="daniel-AT-poradnik-webmastera.com" />
+  </authors>
+
+  <default innerClass="code" />
+
+  <region name="brackets" delimClass="brackets" innerClass="code" start="\(" end="\)">
+    <contains all="yes"/>
+  </region>
+
+
+  <region name="strdouble" delimClass="quotes" innerClass="string" start="&quot;" end="&quot;"/>
+
+  <region name="comment" start="'|[Rr][Ee][Mm]\b" end="/$/m" innerClass="comment">
+    <contains block="cvstag"/>
+  </region>
+
+  <block name="number" match="\d*\.?\d+" innerClass="number"/>
+  <block name="hexnumber" match="&amp;H[0-9a-fA-F]+" innerClass="number"/>
+
+  <block name="identifier" match="[a-z_]\w*" innerClass="identifier" case="no"/>
+
+  <block name="url" match="((https?|ftp):\/\/[\w\?\.\-\&amp;=\/%+]+)|(^|[\s,!?])www\.\w+\.\w+[\w\?\.\&amp;=\/%+]*" innerClass="url" contained="yes">
+    <onlyin region="comment"/>
+  </block>
+
+  <block name="email" match="\w+[\.\w\-]+@(\w+[\.\w\-])+" innerClass="url" contained="yes">
+    <onlyin region="comment"/>
+  </block>
+
+  <block name="note" match="\b(note|fixme):" innerClass="inlinedoc" contained="yes" case="no">
+    <onlyin region="comment"/>
+  </block>
+
+
+  <block name="cvstag" match="\$\w+:.+\$" innerClass="inlinedoc" contained="yes">
+    <onlyin region="comment"/>
+  </block>
+
+  <keywords name="constants" inherits="identifier" innerClass="builtin" case="no">
+    <!-- Color Constants -->
+    <keyword match="vbBlack" />
+    <keyword match="vbRed" />
+    <keyword match="vbGreen" />
+    <keyword match="vbYellow" />
+    <keyword match="vbBlue" />
+    <keyword match="vbMagenta" />
+    <keyword match="vbCyan" />
+    <keyword match="vbWhite" />
+    <!-- Comparison Constants -->
+    <keyword match="vbBinaryCompare" />
+    <keyword match="vbTextCompare" />
+    <!-- Date and Time Constants -->
+    <keyword match="vbSunday" />
+    <keyword match="vbMonday" />
+    <keyword match="vbTuesday" />
+    <keyword match="vbWednesday" />
+    <keyword match="vbThursday" />
+    <keyword match="vbFriday" />
+    <keyword match="vbSaturday" />
+    <keyword match="vbUseSystemDayOfWeek" />
+    <keyword match="vbFirstJan1" />
+    <keyword match="vbFirstFourDays" />
+    <keyword match="vbFirstFullWeek" />
+    <!-- Date Format Constants -->
+    <keyword match="vbGeneralDate" />
+    <keyword match="vbLongDate" />
+    <keyword match="vbShortDate" />
+    <keyword match="vbLongTime" />
+    <keyword match="vbShortTime" />
+    <!-- Miscellaneous Constants -->
+    <keyword match="vbObjectError" />
+    <!-- MsgBox Constants -->
+    <keyword match="vbOKOnly" />
+    <keyword match="vbOKCancel" />
+    <keyword match="vbAbortRetryIgnore" />
+    <keyword match="vbYesNoCancel" />
+    <keyword match="vbYesNo" />
+    <keyword match="vbRetryCancel" />
+    <keyword match="vbCritical" />
+    <keyword match="vbQuestion" />
+    <keyword match="vbExclamation" />
+    <keyword match="vbInformation" />
+    <keyword match="vbDefaultButton1" />
+    <keyword match="vbDefaultButton2" />
+    <keyword match="vbDefaultButton3" />
+    <keyword match="vbDefaultButton4" />
+    <keyword match="vbApplicationModal" />
+    <keyword match="vbSystemModal" />
+    <keyword match="vbOK" />
+    <keyword match="vbCancel" />
+    <keyword match="vbAbort" />
+    <keyword match="vbRetry" />
+    <keyword match="vbIgnore" />
+    <keyword match="vbYes" />
+    <keyword match="vbNo" />
+    <!-- String Constants -->
+    <keyword match="vbCr" />
+    <keyword match="VbCrLf" />
+    <keyword match="vbFormFeed" />
+    <keyword match="vbLf" />
+    <keyword match="vbNewLine" />
+    <keyword match="vbNullChar" />
+    <keyword match="vbNullString" />
+    <keyword match="vbTab" />
+    <keyword match="vbVerticalTab" />
+    <!-- Tristate Constants -->
+    <keyword match="vbUseDefault" />
+    <keyword match="vbTrue" />
+    <keyword match="vbFalse" />
+    <!-- VarType Constants -->
+    <keyword match="vbEmpty" />
+    <keyword match="vbNull" />
+    <keyword match="vbInteger" />
+    <keyword match="vbLong" />
+    <keyword match="vbSingle" />
+    <keyword match="vbDouble" />
+    <keyword match="vbCurrency" />
+    <keyword match="vbDate" />
+    <keyword match="vbString" />
+    <keyword match="vbObject" />
+    <keyword match="vbError" />
+    <keyword match="vbBoolean" />
+    <keyword match="vbVariant" />
+    <keyword match="vbDataObject" />
+    <keyword match="vbDecimal" />
+    <keyword match="vbByte" />
+    <keyword match="vbArray" />
+  </keywords>
+
+  <keywords name="functions" inherits="identifier" innerClass="builtin" case="no">
+    <keyword match="Abs" />
+    <keyword match="Array" />
+    <keyword match="Asc" />
+    <keyword match="Atn" />
+    <keyword match="CBool" />
+    <keyword match="CByte" />
+    <keyword match="CCur" />
+    <keyword match="CDate" />
+    <keyword match="CDbl" />
+    <keyword match="Chr" />
+    <keyword match="CInt" />
+    <keyword match="CLng" />
+    <keyword match="Cos" />
+    <keyword match="CreateObject" />
+    <keyword match="CSng" />
+    <keyword match="CStr" />
+    <keyword match="Date" />
+    <keyword match="DateAdd" />
+    <keyword match="DateDiff" />
+    <keyword match="DatePart" />
+    <keyword match="DateSerial" />
+    <keyword match="DateValue" />
+    <keyword match="Day" />
+    <keyword match="Escape" />
+    <keyword match="Eval" />
+    <keyword match="Exp" />
+    <keyword match="Filter" />
+    <keyword match="FormatCurrency" />
+    <keyword match="FormatDateTime" />
+    <keyword match="FormatNumber" />
+    <keyword match="FormatPercent" />
+    <keyword match="GetLocale" />
+    <keyword match="GetObject" />
+    <keyword match="GetRef" />
+    <keyword match="Hex" />
+    <keyword match="Hour" />
+    <keyword match="InputBox" />
+    <keyword match="InStr" />
+    <keyword match="InStrRev" />
+    <keyword match="Int" />
+    <keyword match="Fix" />
+    <keyword match="IsArray" />
+    <keyword match="IsDate" />
+    <keyword match="IsEmpty" />
+    <keyword match="IsNull" />
+    <keyword match="IsNumeric" />
+    <keyword match="IsObject" />
+    <keyword match="Join" />
+    <keyword match="LBound" />
+    <keyword match="LCase" />
+    <keyword match="Left" />
+    <keyword match="Len" />
+    <keyword match="LoadPicture" />
+    <keyword match="Log" />
+    <keyword match="LTrim" />
+    <keyword match="RTrim" />
+    <keyword match="Trim" />
+    <keyword match="Mid" />
+    <keyword match="Minute" />
+    <keyword match="Month" />
+    <keyword match="MonthName" />
+    <keyword match="MsgBox" />
+    <keyword match="Now" />
+    <keyword match="Oct" />
+    <keyword match="Replace" />
+    <keyword match="RGB" />
+    <keyword match="Right" />
+    <keyword match="Rnd" />
+    <keyword match="Round" />
+    <keyword match="ScriptEngine" />
+    <keyword match="ScriptEngineBuildVersion" />
+    <keyword match="ScriptEngineMajorVersion" />
+    <keyword match="ScriptEngineMinorVersion" />
+    <keyword match="Second" />
+    <keyword match="SetLocale" />
+    <keyword match="Sgn" />
+    <keyword match="Sin" />
+    <keyword match="Space" />
+    <keyword match="Split" />
+    <keyword match="Sqr" />
+    <keyword match="StrComp" />
+    <keyword match="String" />
+    <keyword match="StrReverse" />
+    <keyword match="Tan" />
+    <keyword match="Time" />
+    <keyword match="Timer" />
+    <keyword match="TimeSerial" />
+    <keyword match="TimeValue" />
+    <keyword match="TypeName" />
+    <keyword match="UBound" />
+    <keyword match="UCase" />
+    <keyword match="Unescape" />
+    <keyword match="VarType" />
+    <keyword match="Weekday" />
+    <keyword match="WeekdayName" />
+    <keyword match="Year" />
+  </keywords>
+
+  <keywords name="builtin" inherits="identifier" innerClass="builtin" case="no">
+    <!--<keyword match="Class" />-->
+    <keyword match="Debug" />
+    <keyword match="Err" />
+    <keyword match="Match" />
+    <keyword match="RegExp" />
+  </keywords>
+
+  <keywords name="reserved" inherits="identifier" innerClass="reserved" case="no">
+    <keyword match="Empty" />
+    <keyword match="False" />
+    <keyword match="Nothing" />
+    <keyword match="Null" />
+    <keyword match="True" />
+    <keyword match="And" />
+    <keyword match="Eqv" />
+    <keyword match="Imp" />
+    <keyword match="Is" />
+    <keyword match="Mod" />
+    <keyword match="Not" />
+    <keyword match="Or" />
+    <keyword match="Xor" />
+    <keyword match="Call" />
+    <keyword match="Class" />
+    <keyword match="End" />
+    <keyword match="Const" />
+    <keyword match="Public" />
+    <keyword match="Private" />
+    <keyword match="Dim" />
+    <keyword match="Do" />
+    <keyword match="While" />
+    <keyword match="Until" />
+    <keyword match="Exit" />
+    <keyword match="Loop" />
+    <keyword match="Erase" />
+    <keyword match="Execute" />
+    <keyword match="ExecuteGlobal" />
+    <keyword match="For" />
+    <keyword match="Each" />
+    <keyword match="In" />
+    <keyword match="To" />
+    <keyword match="Step" />
+    <keyword match="Next" />
+    <keyword match="Function" />
+    <keyword match="Default" />
+    <keyword match="If" />
+    <keyword match="Then" />
+    <keyword match="Else" />
+    <keyword match="ElseIf" />
+    <keyword match="On" />
+    <keyword match="Error" />
+    <keyword match="Resume" />
+    <keyword match="Goto" />
+    <keyword match="Option" />
+    <keyword match="Explicit" />
+    <keyword match="Property" />
+    <keyword match="Get" />
+    <keyword match="Let" />
+    <keyword match="Set" />
+    <keyword match="Randomize" />
+    <keyword match="ReDim" />
+    <keyword match="Preserve" />
+    <keyword match="Select" />
+    <keyword match="Case" />
+    <keyword match="Stop" />
+    <keyword match="Sub" />
+    <keyword match="Wend" />
+    <keyword match="With" />
+  </keywords>
+
+</highlight>
diff --git a/library/Text_Highlighter/xml.xml b/library/Text_Highlighter/xml.xml
new file mode 100644
index 000000000..2271ff3ae
--- /dev/null
+++ b/library/Text_Highlighter/xml.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!-- $Id: xml.xml,v 1.1 2007-06-03 02:35:28 ssttoo Exp $ -->
+
+<highlight lang="xml" case="no">
+
+  <authors>
+    <author name="Andrey Demenev" email="demenev@gmail.com"/>
+  </authors>
+
+
+  <default innerClass="code" />
+
+  <region name="cdata" delimClass="comment" innerClass="comment"
+          start="\&lt;\!\[CDATA\[" end="\]\]\&gt;">
+  </region>
+
+  <region name="comment" delimClass="comment" innerClass="comment"
+          start="\&lt;!--" end="--\&gt;">
+  </region>
+
+  <region name="tag" delimClass="brackets" innerClass="code" start="\&lt;[\?\/]?" end="[\/\?]?\&gt;">
+    <contains block="tagname"/>
+    <contains region="param"/>
+    <contains block="paramname"/>
+  </region>
+
+  <block name="tagname" match="(?&lt;=[\&lt;\/?])[\w\-\:]+" innerClass="reserved" contained="yes"/>
+
+  <block name="paramname" match="[\w\-\:]+" innerClass="var" contained="yes"/>
+
+  <block name="entity" match="(&amp;|%)[\w\-\.]+;" innerClass="special" />
+
+  <region name="param" start="&quot;" end="&quot;" delimClass="quotes" innerClass="string" contained="yes">
+    <contains block="entity"/>
+  </region>
+
+</highlight>
diff --git a/library/cacert.pem b/library/cacert.pem
index ef43898ab..29dbfa286 100644
--- a/library/cacert.pem
+++ b/library/cacert.pem
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Wed Sep  2 18:30:34 2015
+## Certificate data from Mozilla as of: Wed Apr 20 03:12:05 2016
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,30 +14,10 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.25.
-## SHA1: ed3c0bbfb7912bcc00cd2033b0cb85c98d10559c
+## SHA1: 5df367cda83086392e1acdf22bfef00c48d5eba6
 ##
 
 
-Equifax Secure CA
-=================
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE
-ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT
-B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR
-fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW
-8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE
-CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS
-spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961
-zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB
-BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
-70+sB3c4
------END CERTIFICATE-----
-
 GlobalSign Root CA
 ==================
 -----BEGIN CERTIFICATE-----
@@ -105,30 +85,6 @@ xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
 t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
 -----END CERTIFICATE-----
 
-Verisign Class 4 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS
-tBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM
-8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW
-Lugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrX
-Razwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-j/ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXtt
-mhwwjIDLk5Mqg6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
-fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd
-RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG
-UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
------END CERTIFICATE-----
-
 Entrust.net Premium 2048 Secure Server CA
 =========================================
 -----BEGIN CERTIFICATE-----
@@ -673,53 +629,6 @@ EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
 llpwrN9M
 -----END CERTIFICATE-----
 
-Staat der Nederlanden Root CA
-=============================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
-ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
-HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
-bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
-vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
-jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
-C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
-vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
-22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
-HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
-dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
-BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
-EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
-MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
-nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
-iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
------END CERTIFICATE-----
-
-UTN DATACorp SGC Root CA
-========================
------BEGIN CERTIFICATE-----
-MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ
-BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa
-MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w
-HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy
-dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ys
-raP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlo
-wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA
-9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv
-33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud
-DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9
-BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD
-LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3
-DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
-Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0
-I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx
-EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP
-DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI
------END CERTIFICATE-----
-
 UTN USERFirst Hardware Root CA
 ==============================
 -----BEGIN CERTIFICATE-----
@@ -800,41 +709,6 @@ IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
 t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
 -----END CERTIFICATE-----
 
-NetLock Notary (Class A) Root
-=============================
------BEGIN CERTIFICATE-----
-MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
-EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
-dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
-ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
-DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
-EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
-VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
-cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
-D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
-z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
-/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
-tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
-4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
-A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
-Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
-bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
-IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
-LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
-ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
-IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
-IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
-b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
-bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
-Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
-bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
-ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
-ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
-CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
-KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
-8CgHrTwXZoi1/baI
------END CERTIFICATE-----
-
 XRamp Global CA Root
 ====================
 -----BEGIN CERTIFICATE-----
@@ -1142,54 +1016,6 @@ vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
 oKfN5XozNmr6mis=
 -----END CERTIFICATE-----
 
-TURKTRUST Certificate Services Provider Root 1
-==============================================
------BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP
-MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
-acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx
-MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg
-U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB
-TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC
-aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX
-yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i
-Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ
-8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4
-W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46
-sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE
-q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
-B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY
-nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H
------END CERTIFICATE-----
-
-TURKTRUST Certificate Services Provider Root 2
-==============================================
------BEGIN CERTIFICATE-----
-MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
-MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
-QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN
-MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr
-dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G
-A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
-acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe
-LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKI
-x+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2g
-QrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr
-5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMB
-AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/ntt
-Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
-Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+
-hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P
-9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5
-UrbnBEI=
------END CERTIFICATE-----
-
 SwissSign Gold CA - G2
 ======================
 -----BEGIN CERTIFICATE-----
@@ -1589,56 +1415,6 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
 WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
 -----END CERTIFICATE-----
 
-TC TrustCenter Class 2 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw
-MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw
-IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2
-xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ
-Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u
-SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G
-dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ
-KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj
-TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP
-JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk
-vQ==
------END CERTIFICATE-----
-
-TC TrustCenter Universal CA I
-=============================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
-IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN
-MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg
-VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw
-JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC
-qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv
-xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw
-ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O
-gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j
-BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG
-1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy
-vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3
-ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
-ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a
-7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
------END CERTIFICATE-----
-
 Deutsche Telekom Root CA 2
 ==========================
 -----BEGIN CERTIFICATE-----
@@ -1661,28 +1437,6 @@ dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
 Cm26OWMohpLzGITY+9HPBVZkVw==
 -----END CERTIFICATE-----
 
-ComSign Secured CA
-==================
------BEGIN CERTIFICATE-----
-MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE
-AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w
-NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD
-QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs
-49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH
-7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB
-kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1
-9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw
-AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t
-U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA
-j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC
-AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a
-BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp
-FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP
-51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
-OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
------END CERTIFICATE-----
-
 Cybertrust Global Root
 ======================
 -----BEGIN CERTIFICATE-----
@@ -1784,26 +1538,6 @@ fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
 wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
 -----END CERTIFICATE-----
 
-Buypass Class 3 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
-MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
-ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
-n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
-AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
-1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
-pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
-EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
-htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
-el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
------END CERTIFICATE-----
-
 EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
 ==========================================================================
 -----BEGIN CERTIFICATE-----
@@ -2085,30 +1819,6 @@ IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
 66+KAQ==
 -----END CERTIFICATE-----
 
-CA Disig
-========
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
-QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
-MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
-bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
-GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
-Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
-hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
-ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
-gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
-AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
-aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
-ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
-BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
-WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
-mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
-CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
-ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
-4Z7CRneC9VkGjCFMhwnN5ag=
------END CERTIFICATE-----
-
 Juur-SK
 =======
 -----BEGIN CERTIFICATE-----
@@ -2635,29 +2345,6 @@ iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
 +GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
 -----END CERTIFICATE-----
 
-A-Trust-nQual-03
-================
------BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE
-Cgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
-a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R
-dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw
-RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0
-ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1
-c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA/OQO8BBC4SA
-zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73+n
-yfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE
-SU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4
-iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3V
-cuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdV
-eRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40
-ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmr
-sQd7TZjTXLDR8KdCoLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZd
-JXDRZslo+S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
-mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6
-ahq97BvIxYSazQ==
------END CERTIFICATE-----
-
 TWCA Root Certification Authority
 =================================
 -----BEGIN CERTIFICATE-----
@@ -3986,6 +3673,196 @@ PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
 kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
 ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
 -----END CERTIFICATE-----
+
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIxDzAN
+BgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
+bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1Qg
+RWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAw
+ODA3MDFaFw0yMzA0MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0w
+SwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnE
+n2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRp
+ZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApCUZ4WWe60ghUEoI5RHwWrom/4NZzkQqL/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537
+jVJp45wnEFPzpALFp/kRGml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1m
+ep5Fimh34khon6La8eHBEJ/rPCmBp+EyCNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z5UNP
+9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0hO8EuPbJbKoCPrZV
+4jI3X/xml1/N1p7HIL9Nxqw/dV8c7TKcfGkAaZHjIxhT6QIDAQABo0IwQDAdBgNVHQ4EFgQUVpkH
+HtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAJ5FdnsXSDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPo
+BP5yCccLqh0lVX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq
+URawXs3qZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nfpeYVhDfwwvJl
+lpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8
+B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU=
+-----END CERTIFICATE-----
+
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEPMA0G
+A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
+acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5
+MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBL
+BgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSf
+aSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2VydGlm
+aWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a
+2uqsxgbPJQ1BgfbBOCK9+bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EED
+wnS3/faAz1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5Fb
+HH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV
++DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT
+9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQsFAAOCAQEAb1gNl0OqFlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3R
+fdCaqaXKGDsCQC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy
+o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseW
+hvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm9ocJV612ph1jmv3XZch4gyt1
+O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw==
+-----END CERTIFICATE-----
+
+Certinomis - Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
+LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
+EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
+ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
+P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
+d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
+z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
+8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
+RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
+6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
+FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
+PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
+i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
+YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
+6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
+AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
+WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
+Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
+lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
+y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
+Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
+DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
+I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
+cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
+hkIGuUE=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GB CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+
+Certification Authority of WoSign G2
+====================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQayXaioidfLwPBbOxemFFRDANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxLTArBgNVBAMTJENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5IG9mIFdvU2lnbiBHMjAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMFgx
+CzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEtMCsGA1UEAxMkQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkgb2YgV29TaWduIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvsXEoCKASU+/2YcRxlPhuw+9YH+v9oIOH9ywjj2X4FA8jzrvZjtFB5sg+OPXJYY1kBai
+XW8wGQiHC38Gsp1ij96vkqVg1CuAmlI/9ZqD6TRay9nVYlzmDuDfBpgOgHzKtB0TiGsOqCR3A9Du
+W/PKaZE1OVbFbeP3PU9ekzgkyhjpJMuSA93MHD0JcOQg5PGurLtzaaNjOg9FD6FKmsLRY6zLEPg9
+5k4ot+vElbGs/V6r+kHLXZ1L3PR8du9nfwB6jdKgGlxNIuG12t12s9R23164i5jIFFTMaxeSt+BK
+v0mUYQs4kI9dJGwlezt52eJ+na2fmKEG/HgUYFf47oB3sQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU+mCp62XF3RYUCE4MD42b4Pdkr2cwDQYJKoZI
+hvcNAQELBQADggEBAFfDejaCnI2Y4qtAqkePx6db7XznPWZaOzG73/MWM5H8fHulwqZm46qwtyeY
+P0nXYGdnPzZPSsvxFPpahygc7Y9BMsaV+X3avXtbwrAh449G3CE4Q3RM+zD4F3LBMvzIkRfEzFg3
+TgvMWvchNSiDbGAtROtSjFA9tWwS1/oJu2yySrHFieT801LYYRf+epSEj3m2M1m6D8QL4nCgS3gu
++sif/a+RZQp4OBXllxcU3fngLDT4ONCEIgDAFFEYKwLcMFrw6AF8NTojrwjkr6qOKEJJLvD1mTS+
+7Q9LGOHSJDy7XUe3IfKN0QqZjuNuPq1w4I+5ysxugTH2e5x6eeRncRg=
+-----END CERTIFICATE-----
+
+CA WoSign ECC Root
+==================
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY+gAwIBAgIQaEpYcIBr8I8C+vbe6LCQkDAKBggqhkjOPQQDAzBGMQswCQYDVQQGEwJD
+TjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMTEkNBIFdvU2lnbiBFQ0MgUm9v
+dDAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQK
+ExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAxMSQ0EgV29TaWduIEVDQyBSb290MHYwEAYHKoZI
+zj0CAQYFK4EEACIDYgAE4f2OuEMkq5Z7hcK6C62N4DrjJLnSsb6IOsq/Srj57ywvr1FQPEd1bPiU
+t5v8KB7FVMxjnRZLU8HnIKvNrCXSf4/CwVqCXjCLelTOA7WRf6qU0NGKSMyCBSah1VES1ns2o0Iw
+QDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqv3VWqP2h4syhf3R
+MluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB1T2wdKyUpOgOPQB0TKGXa/kNUTyh2Tv0
+Daupn75OcsqF1NnstTJFGG+rrQIwfcf3aWMvoeGY7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYu
+a/GRspBl9JrmkO5K
+-----END CERTIFICATE-----
+
+SZAFIR ROOT CA2
+===============
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
+BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
+BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
+VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
+qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
+DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
+2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
+ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
+ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
+AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
+O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
+oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
+4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA 2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
+ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
+TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
+IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
+7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
+CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
+Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
+uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
+GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
+9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
+Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
+hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
+BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
+hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
+Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
+L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
+clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
+pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
+w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
+J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
+ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
+is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
+zAYspsbiDrW5viSP
+-----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIGCDCCA/CgAwIBAgIQKy5u6tl1NmwUim7bo3yMBzANBgkqhkiG9w0BAQwFADCB
 hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
@@ -4078,33 +3955,30 @@ Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
 c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
 mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
 -----END CERTIFICATE-----
-
-Lets Encrypt
-============
 -----BEGIN CERTIFICATE-----
-MIIEqDCCA5CgAwIBAgIRAJgT9HUT5XULQ+dDHpceRL0wDQYJKoZIhvcNAQELBQAw
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzAeFw0xNTEwMTkyMjMzMzZaFw0yMDEwMTkyMjMzMzZa
-MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJzTDPBa5S5Ht3JdN4OzaGMw6tc1Jhkl4b2+NfFwki+3uEtB
-BaupnjUIWOyxKsRohwuj43Xk5vOnYnG6eYFgH9eRmp/z0HhncchpDpWRz/7mmelg
-PEjMfspNdxIknUcbWuu57B43ABycrHunBerOSuu9QeU2mLnL/W08lmjfIypCkAyG
-dGfIf6WauFJhFBM/ZemCh8vb+g5W9oaJ84U/l4avsNwa72sNlRZ9xCugZbKZBDZ1
-gGusSvMbkEl4L6KWTyogJSkExnTA0DHNjzE4lRa6qDO4Q/GxH8Mwf6J5MRM9LTb4
-4/zyM2q5OTHFr8SNDR1kFjOq+oQpttQLwNh9w5MCAwEAAaOCAZIwggGOMBIGA1Ud
-EwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMH8GCCsGAQUFBwEBBHMwcTAy
-BggrBgEFBQcwAYYmaHR0cDovL2lzcmcudHJ1c3RpZC5vY3NwLmlkZW50cnVzdC5j
-b20wOwYIKwYBBQUHMAKGL2h0dHA6Ly9hcHBzLmlkZW50cnVzdC5jb20vcm9vdHMv
-ZHN0cm9vdGNheDMucDdjMB8GA1UdIwQYMBaAFMSnsaR7LHH62+FLkHX/xBVghYkQ
-MFQGA1UdIARNMEswCAYGZ4EMAQIBMD8GCysGAQQBgt8TAQEBMDAwLgYIKwYBBQUH
-AgEWImh0dHA6Ly9jcHMucm9vdC14MS5sZXRzZW5jcnlwdC5vcmcwPAYDVR0fBDUw
-MzAxoC+gLYYraHR0cDovL2NybC5pZGVudHJ1c3QuY29tL0RTVFJPT1RDQVgzQ1JM
-LmNybDATBgNVHR4EDDAKoQgwBoIELm1pbDAdBgNVHQ4EFgQUqEpqYwR93brm0Tm3
-pkVl7/Oo7KEwDQYJKoZIhvcNAQELBQADggEBANHIIkus7+MJiZZQsY14cCoBG1hd
-v0J20/FyWo5ppnfjL78S2k4s2GLRJ7iD9ZDKErndvbNFGcsW+9kKK/TnY21hp4Dd
-ITv8S9ZYQ7oaoqs7HwhEMY9sibED4aXw09xrJZTC9zK1uIfW6t5dHQjuOWv+HHoW
-ZnupyxpsEUlEaFb+/SCI4KCSBdAsYxAcsHYI5xxEI4LutHp6s3OT2FuO90WfdsIk
-6q78OMSdn875bNjdBYAqxUp2/LEIHfDBkLoQz0hFJmwAbYahqKaLn73PAAm1X2kj
-f1w8DdnkabOLGeOVcj9LQ+s67vBykx4anTjURkbqZslUEUsn2k5xeua2zUk=
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
+q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
+SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
+Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
+a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
+/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
+Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
+AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
+uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
+wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
+X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
+PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
+KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
 -----END CERTIFICATE-----
diff --git a/library/certs/cacert.pem b/library/certs/cacert.pem
index e4da7fc15..c15368bdc 100644
--- a/library/certs/cacert.pem
+++ b/library/certs/cacert.pem
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Wed Sep  2 18:30:34 2015
+## Certificate data from Mozilla as of: Wed Apr 20 03:12:05 2016
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,30 +14,10 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.25.
-## SHA1: ed3c0bbfb7912bcc00cd2033b0cb85c98d10559c
+## SHA1: 5df367cda83086392e1acdf22bfef00c48d5eba6
 ##
 
 
-Equifax Secure CA
-=================
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEQMA4GA1UE
-ChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoT
-B0VxdWlmYXgxLTArBgNVBAsTJEVxdWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPR
-fM6fBeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+AcJkVV5MW
-8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kCAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UE
-CxMkRXF1aWZheCBTZWN1cmUgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTgwODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvS
-spXXR9gjIBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAFjOKer89961
-zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y7qj/WsjTVbJmcVfewCHrPSqnI0kB
-BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
-70+sB3c4
------END CERTIFICATE-----
-
 GlobalSign Root CA
 ==================
 -----BEGIN CERTIFICATE-----
@@ -105,30 +85,6 @@ xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
 t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
 -----END CERTIFICATE-----
 
-Verisign Class 4 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDQgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAK3LpRFpxlmr8Y+1GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaS
-tBO3IFsJ+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0GbdU6LM
-8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLmNxdLMEYH5IBtptiW
-Lugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XYufTsgsbSPZUd5cBPhMnZo0QoBmrX
-Razwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-j/ola09b5KROJ1WrIhVZPMq1CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXtt
-mhwwjIDLk5Mqg6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
-fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c2NU8Qh0XwRJd
-RTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/bLvSHgCwIe34QWKCudiyxLtG
-UPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
------END CERTIFICATE-----
-
 Entrust.net Premium 2048 Secure Server CA
 =========================================
 -----BEGIN CERTIFICATE-----
@@ -673,53 +629,6 @@ EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
 llpwrN9M
 -----END CERTIFICATE-----
 
-Staat der Nederlanden Root CA
-=============================
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE
-ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g
-Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w
-HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh
-bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt
-vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P
-jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca
-C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth
-vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6
-22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV
-HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v
-dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN
-BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR
-EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw
-MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y
-nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
-iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
------END CERTIFICATE-----
-
-UTN DATACorp SGC Root CA
-========================
------BEGIN CERTIFICATE-----
-MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCBkzELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZ
-BgNVBAMTElVUTiAtIERBVEFDb3JwIFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBa
-MIGTMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4w
-HAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRy
-dXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ys
-raP6LnD43m77VkIVni5c7yPeIbkFdicZD0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlo
-wHDyUwDAXlCCpVZvNvlK4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA
-9P4yPykqlXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulWbfXv
-33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQABo4GrMIGoMAsGA1Ud
-DwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRTMtGzz3/64PGgXYVOktKeRR20TzA9
-BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dD
-LmNybDAqBgNVHSUEIzAhBggrBgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3
-DQEBBQUAA4IBAQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
-Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyjj98C5OBxOvG0
-I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVHKWss5nbZqSl9Mt3JNjy9rjXx
-EZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwP
-DPafepE39peC4N1xaf92P2BNPM/3mfnGV/TJVTl4uix5yaaIK/QI
------END CERTIFICATE-----
-
 UTN USERFirst Hardware Root CA
 ==============================
 -----BEGIN CERTIFICATE-----
@@ -800,41 +709,6 @@ IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
 t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
 -----END CERTIFICATE-----
 
-NetLock Notary (Class A) Root
-=============================
------BEGIN CERTIFICATE-----
-MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI
-EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6
-dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j
-ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX
-DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH
-EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD
-VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz
-cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM
-D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ
-z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC
-/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7
-tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6
-4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG
-A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC
-Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv
-bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
-IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn
-LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0
-ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz
-IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh
-IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu
-b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh
-bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg
-Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp
-bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5
-ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP
-ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB
-CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr
-KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM
-8CgHrTwXZoi1/baI
------END CERTIFICATE-----
-
 XRamp Global CA Root
 ====================
 -----BEGIN CERTIFICATE-----
@@ -1142,54 +1016,6 @@ vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
 oKfN5XozNmr6mis=
 -----END CERTIFICATE-----
 
-TURKTRUST Certificate Services Provider Root 1
-==============================================
------BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGDAJUUjEP
-MA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykgMjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0
-acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMx
-MDI3MTdaFw0xNTAzMjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsg
-U2VydGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYDVQQHDAZB
-TktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBC
-aWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEuxZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GX
-yGl8hMW0kWxsE2qkVa2kheiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8i
-Si9BB35JYbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5CurKZ
-8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1JuTm5Rh8i27fbMx4
-W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51b0dewQIDAQABoxAwDjAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46
-sWrv7/hg0Uw2ZkUd82YCdAR7kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxE
-q8Sn5RTOPEFhfEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
-B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdAaLX/7KfS0zgY
-nNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKSRGQDJereW26fyfJOrN3H
------END CERTIFICATE-----
-
-TURKTRUST Certificate Services Provider Root 2
-==============================================
------BEGIN CERTIFICATE-----
-MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
-MA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
-QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcN
-MDUxMTA3MTAwNzU3WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVr
-dHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEPMA0G
-A1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
-acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqe
-LCDe2JAOCtFp0if7qnefJ1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKI
-x+XlZEdhR3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJQv2g
-QrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGXJHpsmxcPbe9TmJEr
-5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1pzpwACPI2/z7woQ8arBT9pmAPAgMB
-AAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58SFq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/ntt
-Rbj2hWyfIvwqECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
-Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFzgw2lGh1uEpJ+
-hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotHuFEJjOp9zYhys2AzsfAKRO8P
-9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LSy3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5
-UrbnBEI=
------END CERTIFICATE-----
-
 SwissSign Gold CA - G2
 ======================
 -----BEGIN CERTIFICATE-----
@@ -1589,56 +1415,6 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
 WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
 -----END CERTIFICATE-----
 
-TC TrustCenter Class 2 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw
-MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw
-IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2
-xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ
-Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u
-SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G
-dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ
-KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj
-TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP
-JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk
-vQ==
------END CERTIFICATE-----
-
-TC TrustCenter Universal CA I
-=============================
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
-IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN
-MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg
-VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw
-JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC
-qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv
-xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw
-ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O
-gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j
-BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG
-1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy
-vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3
-ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
-ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a
-7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
------END CERTIFICATE-----
-
 Deutsche Telekom Root CA 2
 ==========================
 -----BEGIN CERTIFICATE-----
@@ -1661,28 +1437,6 @@ dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
 Cm26OWMohpLzGITY+9HPBVZkVw==
 -----END CERTIFICATE-----
 
-ComSign Secured CA
-==================
------BEGIN CERTIFICATE-----
-MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE
-AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w
-NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD
-QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs
-49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH
-7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB
-kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1
-9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw
-AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t
-U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA
-j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC
-AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a
-BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp
-FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP
-51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
-OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
------END CERTIFICATE-----
-
 Cybertrust Global Root
 ======================
 -----BEGIN CERTIFICATE-----
@@ -1784,26 +1538,6 @@ fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w
 wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
 -----END CERTIFICATE-----
 
-Buypass Class 3 CA 1
-====================
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
-QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMyBDQSAxMB4XDTA1
-MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh
-c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKx
-ifZgisRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//zNIqeKNc0
-n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI+MkcVyzwPX6UvCWThOia
-AJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2RhzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c
-1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0P
-AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFPBdy7
-pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27sEzNxZy5p+qksP2bA
-EllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2mSlf56oBzKwzqBwKu5HEA6BvtjT5
-htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yCe/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQj
-el/wroQk5PMr+4okoyeYZdowdXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
------END CERTIFICATE-----
-
 EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1
 ==========================================================================
 -----BEGIN CERTIFICATE-----
@@ -2085,30 +1819,6 @@ IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
 66+KAQ==
 -----END CERTIFICATE-----
 
-CA Disig
-========
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK
-QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw
-MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz
-bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm
-GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD
-Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo
-hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt
-ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w
-gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P
-AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz
-aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff
-ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa
-BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t
-WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3
-mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
-CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K
-ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA
-4Z7CRneC9VkGjCFMhwnN5ag=
------END CERTIFICATE-----
-
 Juur-SK
 =======
 -----BEGIN CERTIFICATE-----
@@ -2635,29 +2345,6 @@ iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt
 +GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
 -----END CERTIFICATE-----
 
-A-Trust-nQual-03
-================
------BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJBVDFIMEYGA1UE
-Cgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVy
-a2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5RdWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5R
-dWFsLTAzMB4XDTA1MDgxNzIyMDAwMFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgw
-RgYDVQQKDD9BLVRydXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0
-ZW52ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMMEEEtVHJ1
-c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtPWFuA/OQO8BBC4SA
-zewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUjlUC5B3ilJfYKvUWG6Nm9wASOhURh73+n
-yfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZznF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPE
-SU7l0+m0iKsMrmKS1GWH2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4
-iHQF63n1k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs2e3V
-cuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0OBAoECERqlWdV
-eRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAVdRU0VlIXLOThaq/Yy/kgM40
-ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fGKOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmr
-sQd7TZjTXLDR8KdCoLXEjq/+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZd
-JXDRZslo+S4RFGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
-mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmEDNuxUCAKGkq6
-ahq97BvIxYSazQ==
------END CERTIFICATE-----
-
 TWCA Root Certification Authority
 =================================
 -----BEGIN CERTIFICATE-----
@@ -3987,32 +3674,192 @@ kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
 ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
 -----END CERTIFICATE-----
 
-Lets Encrypt
-============
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5
+=========================================================
 -----BEGIN CERTIFICATE-----
-MIIEqDCCA5CgAwIBAgIRAJgT9HUT5XULQ+dDHpceRL0wDQYJKoZIhvcNAQELBQAw
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzAeFw0xNTEwMTkyMjMzMzZaFw0yMDEwMTkyMjMzMzZa
-MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJzTDPBa5S5Ht3JdN4OzaGMw6tc1Jhkl4b2+NfFwki+3uEtB
-BaupnjUIWOyxKsRohwuj43Xk5vOnYnG6eYFgH9eRmp/z0HhncchpDpWRz/7mmelg
-PEjMfspNdxIknUcbWuu57B43ABycrHunBerOSuu9QeU2mLnL/W08lmjfIypCkAyG
-dGfIf6WauFJhFBM/ZemCh8vb+g5W9oaJ84U/l4avsNwa72sNlRZ9xCugZbKZBDZ1
-gGusSvMbkEl4L6KWTyogJSkExnTA0DHNjzE4lRa6qDO4Q/GxH8Mwf6J5MRM9LTb4
-4/zyM2q5OTHFr8SNDR1kFjOq+oQpttQLwNh9w5MCAwEAAaOCAZIwggGOMBIGA1Ud
-EwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMH8GCCsGAQUFBwEBBHMwcTAy
-BggrBgEFBQcwAYYmaHR0cDovL2lzcmcudHJ1c3RpZC5vY3NwLmlkZW50cnVzdC5j
-b20wOwYIKwYBBQUHMAKGL2h0dHA6Ly9hcHBzLmlkZW50cnVzdC5jb20vcm9vdHMv
-ZHN0cm9vdGNheDMucDdjMB8GA1UdIwQYMBaAFMSnsaR7LHH62+FLkHX/xBVghYkQ
-MFQGA1UdIARNMEswCAYGZ4EMAQIBMD8GCysGAQQBgt8TAQEBMDAwLgYIKwYBBQUH
-AgEWImh0dHA6Ly9jcHMucm9vdC14MS5sZXRzZW5jcnlwdC5vcmcwPAYDVR0fBDUw
-MzAxoC+gLYYraHR0cDovL2NybC5pZGVudHJ1c3QuY29tL0RTVFJPT1RDQVgzQ1JM
-LmNybDATBgNVHR4EDDAKoQgwBoIELm1pbDAdBgNVHQ4EFgQUqEpqYwR93brm0Tm3
-pkVl7/Oo7KEwDQYJKoZIhvcNAQELBQADggEBANHIIkus7+MJiZZQsY14cCoBG1hd
-v0J20/FyWo5ppnfjL78S2k4s2GLRJ7iD9ZDKErndvbNFGcsW+9kKK/TnY21hp4Dd
-ITv8S9ZYQ7oaoqs7HwhEMY9sibED4aXw09xrJZTC9zK1uIfW6t5dHQjuOWv+HHoW
-ZnupyxpsEUlEaFb+/SCI4KCSBdAsYxAcsHYI5xxEI4LutHp6s3OT2FuO90WfdsIk
-6q78OMSdn875bNjdBYAqxUp2/LEIHfDBkLoQz0hFJmwAbYahqKaLn73PAAm1X2kj
-f1w8DdnkabOLGeOVcj9LQ+s67vBykx4anTjURkbqZslUEUsn2k5xeua2zUk=
+MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIxDzAN
+BgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
+bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1Qg
+RWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAw
+ODA3MDFaFw0yMzA0MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0w
+SwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnE
+n2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRp
+ZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApCUZ4WWe60ghUEoI5RHwWrom/4NZzkQqL/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537
+jVJp45wnEFPzpALFp/kRGml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1m
+ep5Fimh34khon6La8eHBEJ/rPCmBp+EyCNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z5UNP
+9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0hO8EuPbJbKoCPrZV
+4jI3X/xml1/N1p7HIL9Nxqw/dV8c7TKcfGkAaZHjIxhT6QIDAQABo0IwQDAdBgNVHQ4EFgQUVpkH
+HtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAJ5FdnsXSDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPo
+BP5yCccLqh0lVX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq
+URawXs3qZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nfpeYVhDfwwvJl
+lpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8
+B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU=
+-----END CERTIFICATE-----
+
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEPMA0G
+A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
+acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5
+MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBL
+BgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSf
+aSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2VydGlm
+aWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a
+2uqsxgbPJQ1BgfbBOCK9+bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EED
+wnS3/faAz1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5Fb
+HH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV
++DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT
+9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQsFAAOCAQEAb1gNl0OqFlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3R
+fdCaqaXKGDsCQC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy
+o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseW
+hvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm9ocJV612ph1jmv3XZch4gyt1
+O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw==
+-----END CERTIFICATE-----
+
+Certinomis - Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
+LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
+EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
+ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
+P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
+d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
+z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
+8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
+RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
+6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
+FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
+PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
+i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
+YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
+6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
+AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
+WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
+Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
+lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
+y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
+Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
+DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
+I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
+cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
+hkIGuUE=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GB CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+
+Certification Authority of WoSign G2
+====================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQayXaioidfLwPBbOxemFFRDANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxLTArBgNVBAMTJENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5IG9mIFdvU2lnbiBHMjAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMFgx
+CzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEtMCsGA1UEAxMkQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkgb2YgV29TaWduIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvsXEoCKASU+/2YcRxlPhuw+9YH+v9oIOH9ywjj2X4FA8jzrvZjtFB5sg+OPXJYY1kBai
+XW8wGQiHC38Gsp1ij96vkqVg1CuAmlI/9ZqD6TRay9nVYlzmDuDfBpgOgHzKtB0TiGsOqCR3A9Du
+W/PKaZE1OVbFbeP3PU9ekzgkyhjpJMuSA93MHD0JcOQg5PGurLtzaaNjOg9FD6FKmsLRY6zLEPg9
+5k4ot+vElbGs/V6r+kHLXZ1L3PR8du9nfwB6jdKgGlxNIuG12t12s9R23164i5jIFFTMaxeSt+BK
+v0mUYQs4kI9dJGwlezt52eJ+na2fmKEG/HgUYFf47oB3sQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU+mCp62XF3RYUCE4MD42b4Pdkr2cwDQYJKoZI
+hvcNAQELBQADggEBAFfDejaCnI2Y4qtAqkePx6db7XznPWZaOzG73/MWM5H8fHulwqZm46qwtyeY
+P0nXYGdnPzZPSsvxFPpahygc7Y9BMsaV+X3avXtbwrAh449G3CE4Q3RM+zD4F3LBMvzIkRfEzFg3
+TgvMWvchNSiDbGAtROtSjFA9tWwS1/oJu2yySrHFieT801LYYRf+epSEj3m2M1m6D8QL4nCgS3gu
++sif/a+RZQp4OBXllxcU3fngLDT4ONCEIgDAFFEYKwLcMFrw6AF8NTojrwjkr6qOKEJJLvD1mTS+
+7Q9LGOHSJDy7XUe3IfKN0QqZjuNuPq1w4I+5ysxugTH2e5x6eeRncRg=
+-----END CERTIFICATE-----
+
+CA WoSign ECC Root
+==================
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY+gAwIBAgIQaEpYcIBr8I8C+vbe6LCQkDAKBggqhkjOPQQDAzBGMQswCQYDVQQGEwJD
+TjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMTEkNBIFdvU2lnbiBFQ0MgUm9v
+dDAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQK
+ExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAxMSQ0EgV29TaWduIEVDQyBSb290MHYwEAYHKoZI
+zj0CAQYFK4EEACIDYgAE4f2OuEMkq5Z7hcK6C62N4DrjJLnSsb6IOsq/Srj57ywvr1FQPEd1bPiU
+t5v8KB7FVMxjnRZLU8HnIKvNrCXSf4/CwVqCXjCLelTOA7WRf6qU0NGKSMyCBSah1VES1ns2o0Iw
+QDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqv3VWqP2h4syhf3R
+MluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB1T2wdKyUpOgOPQB0TKGXa/kNUTyh2Tv0
+Daupn75OcsqF1NnstTJFGG+rrQIwfcf3aWMvoeGY7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYu
+a/GRspBl9JrmkO5K
+-----END CERTIFICATE-----
+
+SZAFIR ROOT CA2
+===============
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
+BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
+BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
+VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
+qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
+DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
+2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
+ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
+ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
+AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
+O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
+oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
+4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA 2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
+ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
+TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
+IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
+7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
+CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
+Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
+uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
+GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
+9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
+Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
+hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
+BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
+hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
+Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
+L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
+clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
+pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
+w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
+J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
+ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
+is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
+zAYspsbiDrW5viSP
 -----END CERTIFICATE-----
diff --git a/library/certs/lets-encrypt-x3-cross-signed.pem b/library/certs/lets-encrypt-x3-cross-signed.pem
new file mode 100644
index 000000000..0002462ce
--- /dev/null
+++ b/library/certs/lets-encrypt-x3-cross-signed.pem
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
+q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
+SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
+Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
+a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
+/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
+Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
+AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
+uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
+wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
+X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
+PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
+KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+-----END CERTIFICATE-----
diff --git a/library/class.Diff.php b/library/class.Diff.php
new file mode 100644
index 000000000..689abe9e7
--- /dev/null
+++ b/library/class.Diff.php
@@ -0,0 +1,386 @@
+<?php
+
+/*
+
+class.Diff.php
+
+A class containing a diff implementation
+
+Created by Stephen Morley - http://stephenmorley.org/ - and released under the
+terms of the CC0 1.0 Universal legal code:
+
+http://creativecommons.org/publicdomain/zero/1.0/legalcode
+
+*/
+
+// A class containing functions for computing diffs and formatting the output.
+class Diff{
+
+  // define the constants
+  const UNMODIFIED = 0;
+  const DELETED    = 1;
+  const INSERTED   = 2;
+
+  /* Returns the diff for two strings. The return value is an array, each of
+   * whose values is an array containing two values: a line (or character, if
+   * $compareCharacters is true), and one of the constants DIFF::UNMODIFIED (the
+   * line or character is in both strings), DIFF::DELETED (the line or character
+   * is only in the first string), and DIFF::INSERTED (the line or character is
+   * only in the second string). The parameters are:
+   *
+   * $string1           - the first string
+   * $string2           - the second string
+   * $compareCharacters - true to compare characters, and false to compare
+   *                      lines; this optional parameter defaults to false
+   */
+  public static function compare(
+      $string1, $string2, $compareCharacters = false){
+
+    // initialise the sequences and comparison start and end positions
+    $start = 0;
+    if ($compareCharacters){
+      $sequence1 = $string1;
+      $sequence2 = $string2;
+      $end1 = strlen($string1) - 1;
+      $end2 = strlen($string2) - 1;
+    }else{
+      $sequence1 = preg_split('/\R/', $string1);
+      $sequence2 = preg_split('/\R/', $string2);
+      $end1 = count($sequence1) - 1;
+      $end2 = count($sequence2) - 1;
+    }
+
+    // skip any common prefix
+    while ($start <= $end1 && $start <= $end2
+        && $sequence1[$start] == $sequence2[$start]){
+      $start ++;
+    }
+
+    // skip any common suffix
+    while ($end1 >= $start && $end2 >= $start
+        && $sequence1[$end1] == $sequence2[$end2]){
+      $end1 --;
+      $end2 --;
+    }
+
+    // compute the table of longest common subsequence lengths
+    $table = self::computeTable($sequence1, $sequence2, $start, $end1, $end2);
+
+    // generate the partial diff
+    $partialDiff =
+        self::generatePartialDiff($table, $sequence1, $sequence2, $start);
+
+    // generate the full diff
+    $diff = array();
+    for ($index = 0; $index < $start; $index ++){
+      $diff[] = array($sequence1[$index], self::UNMODIFIED);
+    }
+    while (count($partialDiff) > 0) $diff[] = array_pop($partialDiff);
+    for ($index = $end1 + 1;
+        $index < ($compareCharacters ? strlen($sequence1) : count($sequence1));
+        $index ++){
+      $diff[] = array($sequence1[$index], self::UNMODIFIED);
+    }
+
+    // return the diff
+    return $diff;
+
+  }
+
+  /* Returns the diff for two files. The parameters are:
+   *
+   * $file1             - the path to the first file
+   * $file2             - the path to the second file
+   * $compareCharacters - true to compare characters, and false to compare
+   *                      lines; this optional parameter defaults to false
+   */
+  public static function compareFiles(
+      $file1, $file2, $compareCharacters = false){
+
+    // return the diff of the files
+    return self::compare(
+        file_get_contents($file1),
+        file_get_contents($file2),
+        $compareCharacters);
+
+  }
+
+  /* Returns the table of longest common subsequence lengths for the specified
+   * sequences. The parameters are:
+   *
+   * $sequence1 - the first sequence
+   * $sequence2 - the second sequence
+   * $start     - the starting index
+   * $end1      - the ending index for the first sequence
+   * $end2      - the ending index for the second sequence
+   */
+  private static function computeTable(
+      $sequence1, $sequence2, $start, $end1, $end2){
+
+    // determine the lengths to be compared
+    $length1 = $end1 - $start + 1;
+    $length2 = $end2 - $start + 1;
+
+    // initialise the table
+    $table = array(array_fill(0, $length2 + 1, 0));
+
+    // loop over the rows
+    for ($index1 = 1; $index1 <= $length1; $index1 ++){
+
+      // create the new row
+      $table[$index1] = array(0);
+
+      // loop over the columns
+      for ($index2 = 1; $index2 <= $length2; $index2 ++){
+
+        // store the longest common subsequence length
+        if ($sequence1[$index1 + $start - 1]
+            == $sequence2[$index2 + $start - 1]){
+          $table[$index1][$index2] = $table[$index1 - 1][$index2 - 1] + 1;
+        }else{
+          $table[$index1][$index2] =
+              max($table[$index1 - 1][$index2], $table[$index1][$index2 - 1]);
+        }
+
+      }
+    }
+
+    // return the table
+    return $table;
+
+  }
+
+  /* Returns the partial diff for the specificed sequences, in reverse order.
+   * The parameters are:
+   *
+   * $table     - the table returned by the computeTable function
+   * $sequence1 - the first sequence
+   * $sequence2 - the second sequence
+   * $start     - the starting index
+   */
+  private static function generatePartialDiff(
+      $table, $sequence1, $sequence2, $start){
+
+    //  initialise the diff
+    $diff = array();
+
+    // initialise the indices
+    $index1 = count($table) - 1;
+    $index2 = count($table[0]) - 1;
+
+    // loop until there are no items remaining in either sequence
+    while ($index1 > 0 || $index2 > 0){
+
+      // check what has happened to the items at these indices
+      if ($index1 > 0 && $index2 > 0
+          && $sequence1[$index1 + $start - 1]
+              == $sequence2[$index2 + $start - 1]){
+
+        // update the diff and the indices
+        $diff[] = array($sequence1[$index1 + $start - 1], self::UNMODIFIED);
+        $index1 --;
+        $index2 --;
+
+      }elseif ($index2 > 0
+          && $table[$index1][$index2] == $table[$index1][$index2 - 1]){
+
+        // update the diff and the indices
+        $diff[] = array($sequence2[$index2 + $start - 1], self::INSERTED);
+        $index2 --;
+
+      }else{
+
+        // update the diff and the indices
+        $diff[] = array($sequence1[$index1 + $start - 1], self::DELETED);
+        $index1 --;
+
+      }
+
+    }
+
+    // return the diff
+    return $diff;
+
+  }
+
+  /* Returns a diff as a string, where unmodified lines are prefixed by '  ',
+   * deletions are prefixed by '- ', and insertions are prefixed by '+ '. The
+   * parameters are:
+   *
+   * $diff      - the diff array
+   * $separator - the separator between lines; this optional parameter defaults
+   *              to "\n"
+   */
+  public static function toString($diff, $separator = "\n"){
+
+    // initialise the string
+    $string = '';
+
+    // loop over the lines in the diff
+    foreach ($diff as $line){
+
+      // extend the string with the line
+      switch ($line[1]){
+        case self::UNMODIFIED : $string .= '  ' . $line[0];break;
+        case self::DELETED    : $string .= '- ' . $line[0];break;
+        case self::INSERTED   : $string .= '+ ' . $line[0];break;
+      }
+
+      // extend the string with the separator
+      $string .= $separator;
+
+    }
+
+    // return the string
+    return $string;
+
+  }
+
+  /* Returns a diff as an HTML string, where unmodified lines are contained
+   * within 'span' elements, deletions are contained within 'del' elements, and
+   * insertions are contained within 'ins' elements. The parameters are:
+   *
+   * $diff      - the diff array
+   * $separator - the separator between lines; this optional parameter defaults
+   *              to '<br>'
+   */
+  public static function toHTML($diff, $separator = '<br>'){
+
+    // initialise the HTML
+    $html = '';
+
+    // loop over the lines in the diff
+    foreach ($diff as $line){
+
+      // extend the HTML with the line
+      switch ($line[1]){
+        case self::UNMODIFIED : $element = 'span'; break;
+        case self::DELETED    : $element = 'del';  break;
+        case self::INSERTED   : $element = 'ins';  break;
+      }
+      $html .=
+          '<' . $element . '>'
+          . htmlspecialchars($line[0])
+          . '</' . $element . '>';
+
+      // extend the HTML with the separator
+      $html .= $separator;
+
+    }
+
+    // return the HTML
+    return $html;
+
+  }
+
+  /* Returns a diff as an HTML table. The parameters are:
+   *
+   * $diff        - the diff array
+   * $indentation - indentation to add to every line of the generated HTML; this
+   *                optional parameter defaults to ''
+   * $separator   - the separator between lines; this optional parameter
+   *                defaults to '<br>'
+   */
+  public static function toTable($diff, $indentation = '', $separator = '<br>'){
+
+    // initialise the HTML
+    $html = $indentation . "<table class=\"diff\">\n";
+
+    // loop over the lines in the diff
+    $index = 0;
+    while ($index < count($diff)){
+
+      // determine the line type
+      switch ($diff[$index][1]){
+
+        // display the content on the left and right
+        case self::UNMODIFIED:
+          $leftCell =
+              self::getCellContent(
+                  $diff, $indentation, $separator, $index, self::UNMODIFIED);
+          $rightCell = $leftCell;
+          break;
+
+        // display the deleted on the left and inserted content on the right
+        case self::DELETED:
+          $leftCell =
+              self::getCellContent(
+                  $diff, $indentation, $separator, $index, self::DELETED);
+          $rightCell =
+              self::getCellContent(
+                  $diff, $indentation, $separator, $index, self::INSERTED);
+          break;
+
+        // display the inserted content on the right
+        case self::INSERTED:
+          $leftCell = '';
+          $rightCell =
+              self::getCellContent(
+                  $diff, $indentation, $separator, $index, self::INSERTED);
+          break;
+
+      }
+
+      // extend the HTML with the new row
+      $html .=
+          $indentation
+          . "  <tr>\n"
+          . $indentation
+          . '    <td class="diff'
+          . ($leftCell == $rightCell
+              ? 'Unmodified'
+              : ($leftCell == '' ? 'Blank' : 'Deleted'))
+          . '">'
+          . $leftCell
+          . "</td>\n"
+          . $indentation
+          . '    <td class="diff'
+          . ($leftCell == $rightCell
+              ? 'Unmodified'
+              : ($rightCell == '' ? 'Blank' : 'Inserted'))
+          . '">'
+          . $rightCell
+          . "</td>\n"
+          . $indentation
+          . "  </tr>\n";
+
+    }
+
+    // return the HTML
+    return $html . $indentation . "</table>\n";
+
+  }
+
+  /* Returns the content of the cell, for use in the toTable function. The
+   * parameters are:
+   *
+   * $diff        - the diff array
+   * $indentation - indentation to add to every line of the generated HTML
+   * $separator   - the separator between lines
+   * $index       - the current index, passes by reference
+   * $type        - the type of line
+   */
+  private static function getCellContent(
+      $diff, $indentation, $separator, &$index, $type){
+
+    // initialise the HTML
+    $html = '';
+
+    // loop over the matching lines, adding them to the HTML
+    while ($index < count($diff) && $diff[$index][1] == $type){
+      $html .=
+          '<span>'
+          . htmlspecialchars($diff[$index][0])
+          . '</span>'
+          . $separator;
+      $index ++;
+    }
+
+    // return the HTML
+    return $html;
+
+  }
+
+}
+
+?>
diff --git a/library/fullcalendar/CHANGELOG.txt b/library/fullcalendar/CHANGELOG.txt
index d753163e3..f488738b8 100644
--- a/library/fullcalendar/CHANGELOG.txt
+++ b/library/fullcalendar/CHANGELOG.txt
@@ -1,8 +1,71 @@
 
+v2.8.0 (2016-06-19)
+-------------------
+
+- getEventSources method (#3103, #2433)
+- getEventSourceById method (#3223)
+- refetchEventSources method (#3103, #1328, #254)
+- removeEventSources method (#3165, #948)
+- prevent flicker when refetchEvents is called (#3123, #2558)
+- fix for removing event sources that share same URL (#3209)
+- jQuery 3 support (#3197, #3124)
+- Travis CI integration (#3218)
+- EditorConfig for promoting consistent code style (#141)
+- use en dash when formatting ranges (#3077)
+- height:auto always shows scrollbars in month view on FF (#3202)
+- new languages:
+	- Basque (#2992)
+	- Galician (#194)
+	- Luxembourgish (#2979)
+
+
+v2.7.3 (2016-06-02)
+-------------------
+
+internal enhancements that plugins can benefit from:
+- EventEmitter not correctly working with stopListeningTo
+- normalizeEvent hook for manipulating event data
+
+
+v2.7.2 (2016-05-20)
+-------------------
+
+- fixed desktops/laptops with touch support not accepting mouse events for
+  dayClick/dragging/resizing (#3154, #3149)
+- fixed dayClick incorrectly triggered on touch scroll (#3152)
+- fixed touch event dragging wrongfully beginning upon scrolling document (#3160)
+- fixed minified JS still contained comments
+- UI change: mouse users must hover over an event to reveal its resizers
+
+
+v2.7.1 (2016-05-01)
+-------------------
+
+- dayClick not firing on touch devices (#3138)
+- icons for prev/next not working in MS Edge (#2852)
+- fix bad languages troubles with firewalls (#3133, #3132)
+- update all dev dependencies (#3145, #3010, #2901, #251)
+- git-ignore npm debug logs (#3011)
+- misc automated test updates (#3139, #3147)
+- Google Calendar htmlLink not always defined (#2844)
+
+
+v2.7.0 (2016-04-23)
+-------------------
+
+touch device support (#994):
+	- smoother scrolling
+	- interactions initiated via "long press":
+		- event drag-n-drop
+		- event resize
+		- time-range selecting
+	- `longPressDelay`
+
+
 v2.6.1 (2016-02-17)
 -------------------
 
-- make nowIndicator positioning refresh on window resize
+- make `nowIndicator` positioning refresh on window resize
 
 
 v2.6.0 (2016-01-07)
diff --git a/library/fullcalendar/CONTRIBUTING.txt b/library/fullcalendar/CONTRIBUTING.txt
index 0204d12c7..5c6dce4ac 100644
--- a/library/fullcalendar/CONTRIBUTING.txt
+++ b/library/fullcalendar/CONTRIBUTING.txt
@@ -41,7 +41,7 @@ Also, you will need the [grunt-cli][grunt-cli] and [bower][bower] packages insta
 
 Then, clone FullCalendar's git repo:
 
-	git clone git://github.com/arshaw/fullcalendar.git
+	git clone git://github.com/fullcalendar/fullcalendar.git
 
 Enter the directory and install FullCalendar's development dependencies:
 
diff --git a/library/fullcalendar/fullcalendar.css b/library/fullcalendar/fullcalendar.css
index b43d666ef..166bd09d3 100644
--- a/library/fullcalendar/fullcalendar.css
+++ b/library/fullcalendar/fullcalendar.css
@@ -1,7 +1,7 @@
 /*!
- * FullCalendar v2.6.1 Stylesheet
+ * FullCalendar v2.8.0 Stylesheet
  * Docs & License: http://fullcalendar.io/
- * (c) 2015 Adam Shaw
+ * (c) 2016 Adam Shaw
  */
 
 
@@ -28,6 +28,7 @@ body .fc { /* extra precedence to overcome jqui */
 .fc-unthemed tbody,
 .fc-unthemed .fc-divider,
 .fc-unthemed .fc-row,
+.fc-unthemed .fc-content, /* for gutter border */
 .fc-unthemed .fc-popover {
 	border-color: #ddd;
 }
@@ -72,7 +73,6 @@ body .fc { /* extra precedence to overcome jqui */
 
 .fc-icon {
 	display: inline-block;
-	width: 1em;
 	height: 1em;
 	line-height: 1em;
 	font-size: 1em;
@@ -99,7 +99,6 @@ NOTE: use percentage font sizes or else old IE chokes
 
 .fc-icon:after {
 	position: relative;
-	margin: 0 -1em; /* ensures character will be centered, regardless of width */
 }
 
 .fc-icon-left-single-arrow:after {
@@ -107,7 +106,6 @@ NOTE: use percentage font sizes or else old IE chokes
 	font-weight: bold;
 	font-size: 200%;
 	top: -7%;
-	left: 3%;
 }
 
 .fc-icon-right-single-arrow:after {
@@ -115,7 +113,6 @@ NOTE: use percentage font sizes or else old IE chokes
 	font-weight: bold;
 	font-size: 200%;
 	top: -7%;
-	left: -3%;
 }
 
 .fc-icon-left-double-arrow:after {
@@ -134,14 +131,12 @@ NOTE: use percentage font sizes or else old IE chokes
 	content: "\25C4";
 	font-size: 125%;
 	top: 3%;
-	left: -2%;
 }
 
 .fc-icon-right-triangle:after {
 	content: "\25BA";
 	font-size: 125%;
 	top: 3%;
-	left: 2%;
 }
 
 .fc-icon-down-triangle:after {
@@ -372,6 +367,7 @@ hr.fc-divider {
 
 .fc table {
 	width: 100%;
+	box-sizing: border-box; /* fix scrollbar issue in firefox */
 	table-layout: fixed;
 	border-collapse: collapse;
 	border-spacing: 0;
@@ -491,15 +487,15 @@ temporary rendered events).
 /* Scrolling Container
 --------------------------------------------------------------------------------------------------*/
 
-.fc-scroller { /* this class goes on elements for guaranteed vertical scrollbars */
-	overflow-y: scroll;
-	overflow-x: hidden;
+.fc-scroller {
+	-webkit-overflow-scrolling: touch;
 }
 
-.fc-scroller > * { /* we expect an immediate inner element */
+/* TODO: move to agenda/basic */
+.fc-scroller > .fc-day-grid,
+.fc-scroller > .fc-time-grid {
 	position: relative; /* re-scope all positions */
 	width: 100%; /* hack to force re-sizing this inner element when scrollbars appear/disappear */
-	overflow: hidden; /* don't let negative margins or absolute positioning create further scroll */
 }
 
 
@@ -547,15 +543,68 @@ temporary rendered events).
 	z-index: 2;
 }
 
+/* resizer (cursor AND touch devices) */
+
 .fc-event .fc-resizer {
 	position: absolute;
-	z-index: 3;
+	z-index: 4;
+}
+
+/* resizer (touch devices) */
+
+.fc-event .fc-resizer {
+	display: none;
+}
+
+.fc-event.fc-allow-mouse-resize .fc-resizer,
+.fc-event.fc-selected .fc-resizer {
+	/* only show when hovering or selected (with touch) */
+	display: block;
+}
+
+/* hit area */
+
+.fc-event.fc-selected .fc-resizer:before {
+	/* 40x40 touch area */
+	content: "";
+	position: absolute;
+	z-index: 9999; /* user of this util can scope within a lower z-index */
+	top: 50%;
+	left: 50%;
+	width: 40px;
+	height: 40px;
+	margin-left: -20px;
+	margin-top: -20px;
+}
+
+
+/* Event Selection (only for touch devices)
+--------------------------------------------------------------------------------------------------*/
+
+.fc-event.fc-selected {
+	z-index: 9999 !important; /* overcomes inline z-index */
+	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
+}
+
+.fc-event.fc-selected.fc-dragging {
+	box-shadow: 0 2px 7px rgba(0, 0, 0, 0.3);
 }
 
 
 /* Horizontal Events
 --------------------------------------------------------------------------------------------------*/
 
+/* bigger touch area when selected */
+.fc-h-event.fc-selected:before {
+	content: "";
+	position: absolute;
+	z-index: 3; /* below resizers */
+	top: -10px;
+	bottom: -10px;
+	left: 0;
+	right: 0;
+}
+
 /* events that are continuing to/from another week. kill rounded corners and butt up against edge */
 
 .fc-ltr .fc-h-event.fc-not-start,
@@ -576,36 +625,56 @@ temporary rendered events).
 	border-bottom-right-radius: 0;
 }
 
-/* resizer */
-
-.fc-h-event .fc-resizer { /* positioned it to overcome the event's borders */
-	top: -1px;
-	bottom: -1px;
-	left: -1px;
-	right: -1px;
-	width: 5px;
-}
+/* resizer (cursor AND touch devices) */
 
 /* left resizer  */
 .fc-ltr .fc-h-event .fc-start-resizer,
-.fc-ltr .fc-h-event .fc-start-resizer:before,
-.fc-ltr .fc-h-event .fc-start-resizer:after,
-.fc-rtl .fc-h-event .fc-end-resizer,
-.fc-rtl .fc-h-event .fc-end-resizer:before,
-.fc-rtl .fc-h-event .fc-end-resizer:after {
-	right: auto; /* ignore the right and only use the left */
+.fc-rtl .fc-h-event .fc-end-resizer {
 	cursor: w-resize;
+	left: -1px; /* overcome border */
 }
 
 /* right resizer */
 .fc-ltr .fc-h-event .fc-end-resizer,
-.fc-ltr .fc-h-event .fc-end-resizer:before,
-.fc-ltr .fc-h-event .fc-end-resizer:after,
-.fc-rtl .fc-h-event .fc-start-resizer,
-.fc-rtl .fc-h-event .fc-start-resizer:before,
-.fc-rtl .fc-h-event .fc-start-resizer:after {
-	left: auto; /* ignore the left and only use the right */
+.fc-rtl .fc-h-event .fc-start-resizer {
 	cursor: e-resize;
+	right: -1px; /* overcome border */
+}
+
+/* resizer (mouse devices) */
+
+.fc-h-event.fc-allow-mouse-resize .fc-resizer {
+	width: 7px;
+	top: -1px; /* overcome top border */
+	bottom: -1px; /* overcome bottom border */
+}
+
+/* resizer (touch devices) */
+
+.fc-h-event.fc-selected .fc-resizer {
+	/* 8x8 little dot */
+	border-radius: 4px;
+	border-width: 1px;
+	width: 6px;
+	height: 6px;
+	border-style: solid;
+	border-color: inherit;
+	background: #fff;
+	/* vertically center */
+	top: 50%;
+	margin-top: -4px;
+}
+
+/* left resizer  */
+.fc-ltr .fc-h-event.fc-selected .fc-start-resizer,
+.fc-rtl .fc-h-event.fc-selected .fc-end-resizer {
+	margin-left: -4px; /* centers the 8x8 dot on the left edge */
+}
+
+/* right resizer */
+.fc-ltr .fc-h-event.fc-selected .fc-end-resizer,
+.fc-rtl .fc-h-event.fc-selected .fc-start-resizer {
+	margin-right: -4px; /* centers the 8x8 dot on the right edge */
 }
 
 
@@ -620,6 +689,20 @@ be a descendant of the grid when it is being dragged.
 	padding: 0 1px;
 }
 
+.fc-day-grid-event.fc-selected:after {
+	content: "";
+	position: absolute;
+	z-index: 1; /* same z-index as fc-bg, behind text */
+	/* overcome the borders */
+	top: -1px;
+	right: -1px;
+	bottom: -1px;
+	left: -1px;
+	/* darkening effect */
+	background: #000;
+	opacity: .25;
+	filter: alpha(opacity=25); /* for IE */
+}
 
 .fc-day-grid-event .fc-content { /* force events to be one-line tall */
 	white-space: nowrap;
@@ -630,10 +713,18 @@ be a descendant of the grid when it is being dragged.
 	font-weight: bold;
 }
 
-.fc-day-grid-event .fc-resizer { /* enlarge the default hit area */
-	left: -3px;
-	right: -3px;
-	width: 7px;
+/* resizer (cursor devices) */
+
+/* left resizer  */
+.fc-ltr .fc-day-grid-event.fc-allow-mouse-resize .fc-start-resizer,
+.fc-rtl .fc-day-grid-event.fc-allow-mouse-resize .fc-end-resizer {
+	margin-left: -2px; /* to the day cell's edge */
+}
+
+/* right resizer */
+.fc-ltr .fc-day-grid-event.fc-allow-mouse-resize .fc-end-resizer,
+.fc-rtl .fc-day-grid-event.fc-allow-mouse-resize .fc-start-resizer {
+	margin-right: -2px; /* to the day cell's edge */
 }
 
 
@@ -681,6 +772,20 @@ a.fc-more:hover {
 	border: 0 solid red;
 }
 
+
+/* Utilities
+--------------------------------------------------------------------------------------------------*/
+
+.fc-unselectable {
+	-webkit-user-select: none;
+	 -khtml-user-select: none;
+	   -moz-user-select: none;
+	    -ms-user-select: none;
+	        user-select: none;
+	-webkit-touch-callout: none;
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
 /* Toolbar
 --------------------------------------------------------------------------------------------------*/
 
@@ -1031,6 +1136,20 @@ be a descendant of the grid when it is being dragged.
 	overflow: hidden; /* don't let the bg flow over rounded corners */
 }
 
+.fc-time-grid-event.fc-selected {
+	/* need to allow touch resizers to extend outside event's bounding box */
+	/* common fc-selected styles hide the fc-bg, so don't need this anyway */
+	overflow: visible;
+}
+
+.fc-time-grid-event.fc-selected .fc-bg {
+	display: none; /* hide semi-white background, to appear darker */
+}
+
+.fc-time-grid-event .fc-content {
+	overflow: hidden; /* for when .fc-selected */
+}
+
 .fc-time-grid-event .fc-time,
 .fc-time-grid-event .fc-title {
 	padding: 0 1px;
@@ -1072,9 +1191,9 @@ be a descendant of the grid when it is being dragged.
 	padding: 0; /* undo padding from above */
 }
 
-/* resizer */
+/* resizer (cursor device) */
 
-.fc-time-grid-event .fc-resizer {
+.fc-time-grid-event.fc-allow-mouse-resize .fc-resizer {
 	left: 0;
 	right: 0;
 	bottom: 0;
@@ -1087,10 +1206,28 @@ be a descendant of the grid when it is being dragged.
 	cursor: s-resize;
 }
 
-.fc-time-grid-event .fc-resizer:after {
+.fc-time-grid-event.fc-allow-mouse-resize .fc-resizer:after {
 	content: "=";
 }
 
+/* resizer (touch device) */
+
+.fc-time-grid-event.fc-selected .fc-resizer {
+	/* 10x10 dot */
+	border-radius: 5px;
+	border-width: 1px;
+	width: 8px;
+	height: 8px;
+	border-style: solid;
+	border-color: inherit;
+	background: #fff;
+	/* horizontally center */
+	left: 50%;
+	margin-left: -5px;
+	/* center on the bottom edge */
+	bottom: -5px;
+}
+
 
 /* Now Indicator
 --------------------------------------------------------------------------------------------------*/
diff --git a/library/fullcalendar/fullcalendar.js b/library/fullcalendar/fullcalendar.js
index d6042cc17..2460eb5e7 100644
--- a/library/fullcalendar/fullcalendar.js
+++ b/library/fullcalendar/fullcalendar.js
@@ -1,7 +1,7 @@
 /*!
- * FullCalendar v2.6.1
+ * FullCalendar v2.8.0
  * Docs & License: http://fullcalendar.io/
- * (c) 2015 Adam Shaw
+ * (c) 2016 Adam Shaw
  */
 
 (function(factory) {
@@ -19,8 +19,8 @@
 ;;
 
 var FC = $.fullCalendar = {
-	version: "2.6.1",
-	internalApiVersion: 3
+	version: "2.8.0",
+	internalApiVersion: 4
 };
 var fcViews = FC.views = {};
 
@@ -262,29 +262,25 @@ function matchCellWidths(els) {
 }
 
 
-// Turns a container element into a scroller if its contents is taller than the allotted height.
-// Returns true if the element is now a scroller, false otherwise.
-// NOTE: this method is best because it takes weird zooming dimensions into account
-function setPotentialScroller(containerEl, height) {
-	containerEl.height(height).addClass('fc-scroller');
+// Given one element that resides inside another,
+// Subtracts the height of the inner element from the outer element.
+function subtractInnerElHeight(outerEl, innerEl) {
+	var both = outerEl.add(innerEl);
+	var diff;
 
-	// are scrollbars needed?
-	if (containerEl[0].scrollHeight - 1 > containerEl[0].clientHeight) { // !!! -1 because IE is often off-by-one :(
-		return true;
-	}
+	// effin' IE8/9/10/11 sometimes returns 0 for dimensions. this weird hack was the only thing that worked
+	both.css({
+		position: 'relative', // cause a reflow, which will force fresh dimension recalculation
+		left: -1 // ensure reflow in case the el was already relative. negative is less likely to cause new scroll
+	});
+	diff = outerEl.outerHeight() - innerEl.outerHeight(); // grab the dimensions
+	both.css({ position: '', left: '' }); // undo hack
 
-	unsetScroller(containerEl); // undo
-	return false;
+	return diff;
 }
 
 
-// Takes an element that might have been a scroller, and turns it back into a normal element.
-function unsetScroller(containerEl) {
-	containerEl.height('').removeClass('fc-scroller');
-}
-
-
-/* General DOM Utilities
+/* Element Geom Utilities
 ----------------------------------------------------------------------------------------------------------------------*/
 
 FC.getOuterRect = getOuterRect;
@@ -309,26 +305,30 @@ function getScrollParent(el) {
 
 // Queries the outer bounding area of a jQuery element.
 // Returns a rectangle with absolute coordinates: left, right (exclusive), top, bottom (exclusive).
-function getOuterRect(el) {
+// Origin is optional.
+function getOuterRect(el, origin) {
 	var offset = el.offset();
+	var left = offset.left - (origin ? origin.left : 0);
+	var top = offset.top - (origin ? origin.top : 0);
 
 	return {
-		left: offset.left,
-		right: offset.left + el.outerWidth(),
-		top: offset.top,
-		bottom: offset.top + el.outerHeight()
+		left: left,
+		right: left + el.outerWidth(),
+		top: top,
+		bottom: top + el.outerHeight()
 	};
 }
 
 
 // Queries the area within the margin/border/scrollbars of a jQuery element. Does not go within the padding.
 // Returns a rectangle with absolute coordinates: left, right (exclusive), top, bottom (exclusive).
+// Origin is optional.
 // NOTE: should use clientLeft/clientTop, but very unreliable cross-browser.
-function getClientRect(el) {
+function getClientRect(el, origin) {
 	var offset = el.offset();
 	var scrollbarWidths = getScrollbarWidths(el);
-	var left = offset.left + getCssFloat(el, 'border-left-width') + scrollbarWidths.left;
-	var top = offset.top + getCssFloat(el, 'border-top-width') + scrollbarWidths.top;
+	var left = offset.left + getCssFloat(el, 'border-left-width') + scrollbarWidths.left - (origin ? origin.left : 0);
+	var top = offset.top + getCssFloat(el, 'border-top-width') + scrollbarWidths.top - (origin ? origin.top : 0);
 
 	return {
 		left: left,
@@ -341,10 +341,13 @@ function getClientRect(el) {
 
 // Queries the area within the margin/border/padding of a jQuery element. Assumed not to have scrollbars.
 // Returns a rectangle with absolute coordinates: left, right (exclusive), top, bottom (exclusive).
-function getContentRect(el) {
+// Origin is optional.
+function getContentRect(el, origin) {
 	var offset = el.offset(); // just outside of border, margin not included
-	var left = offset.left + getCssFloat(el, 'border-left-width') + getCssFloat(el, 'padding-left');
-	var top = offset.top + getCssFloat(el, 'border-top-width') + getCssFloat(el, 'padding-top');
+	var left = offset.left + getCssFloat(el, 'border-left-width') + getCssFloat(el, 'padding-left') -
+		(origin ? origin.left : 0);
+	var top = offset.top + getCssFloat(el, 'border-top-width') + getCssFloat(el, 'padding-top') -
+		(origin ? origin.top : 0);
 
 	return {
 		left: left,
@@ -414,13 +417,82 @@ function getCssFloat(el, prop) {
 }
 
 
+/* Mouse / Touch Utilities
+----------------------------------------------------------------------------------------------------------------------*/
+
+FC.preventDefault = preventDefault;
+
+
 // Returns a boolean whether this was a left mouse click and no ctrl key (which means right click on Mac)
 function isPrimaryMouseButton(ev) {
 	return ev.which == 1 && !ev.ctrlKey;
 }
 
 
-/* Geometry
+function getEvX(ev) {
+	if (ev.pageX !== undefined) {
+		return ev.pageX;
+	}
+	var touches = ev.originalEvent.touches;
+	if (touches) {
+		return touches[0].pageX;
+	}
+}
+
+
+function getEvY(ev) {
+	if (ev.pageY !== undefined) {
+		return ev.pageY;
+	}
+	var touches = ev.originalEvent.touches;
+	if (touches) {
+		return touches[0].pageY;
+	}
+}
+
+
+function getEvIsTouch(ev) {
+	return /^touch/.test(ev.type);
+}
+
+
+function preventSelection(el) {
+	el.addClass('fc-unselectable')
+		.on('selectstart', preventDefault);
+}
+
+
+// Stops a mouse/touch event from doing it's native browser action
+function preventDefault(ev) {
+	ev.preventDefault();
+}
+
+
+// attach a handler to get called when ANY scroll action happens on the page.
+// this was impossible to do with normal on/off because 'scroll' doesn't bubble.
+// http://stackoverflow.com/a/32954565/96342
+// returns `true` on success.
+function bindAnyScroll(handler) {
+	if (window.addEventListener) {
+		window.addEventListener('scroll', handler, true); // useCapture=true
+		return true;
+	}
+	return false;
+}
+
+
+// undoes bindAnyScroll. must pass in the original function.
+// returns `true` on success.
+function unbindAnyScroll(handler) {
+	if (window.removeEventListener) {
+		window.removeEventListener('scroll', handler, true); // useCapture=true
+		return true;
+	}
+	return false;
+}
+
+
+/* General Geometry Utils
 ----------------------------------------------------------------------------------------------------------------------*/
 
 FC.intersectRects = intersectRects;
@@ -946,22 +1018,21 @@ function proxy(obj, methodName) {
 
 // Returns a function, that, as long as it continues to be invoked, will not
 // be triggered. The function will be called after it stops being called for
-// N milliseconds.
+// N milliseconds. If `immediate` is passed, trigger the function on the
+// leading edge, instead of the trailing.
 // https://github.com/jashkenas/underscore/blob/1.6.0/underscore.js#L714
-function debounce(func, wait) {
-	var timeoutId;
-	var args;
-	var context;
-	var timestamp; // of most recent call
+function debounce(func, wait, immediate) {
+	var timeout, args, context, timestamp, result;
+
 	var later = function() {
 		var last = +new Date() - timestamp;
-		if (last < wait && last > 0) {
-			timeoutId = setTimeout(later, wait - last);
+		if (last < wait) {
+			timeout = setTimeout(later, wait - last);
 		}
 		else {
-			timeoutId = null;
-			func.apply(context, args);
-			if (!timeoutId) {
+			timeout = null;
+			if (!immediate) {
+				result = func.apply(context, args);
 				context = args = null;
 			}
 		}
@@ -971,12 +1042,32 @@ function debounce(func, wait) {
 		context = this;
 		args = arguments;
 		timestamp = +new Date();
-		if (!timeoutId) {
-			timeoutId = setTimeout(later, wait);
+		var callNow = immediate && !timeout;
+		if (!timeout) {
+			timeout = setTimeout(later, wait);
 		}
+		if (callNow) {
+			result = func.apply(context, args);
+			context = args = null;
+		}
+		return result;
 	};
 }
 
+
+// HACK around jQuery's now A+ promises: execute callback synchronously if already resolved.
+// thenFunc shouldn't accept args.
+// similar to whenResources in Scheduler plugin.
+function syncThen(promise, thenFunc) {
+	// not a promise, or an already-resolved promise?
+	if (!promise || !promise.then || promise.state() === 'resolved') {
+		return $.when(thenFunc()); // resolve immediately
+	}
+	else if (thenFunc) {
+		return promise.then(thenFunc);
+	}
+}
+
 ;;
 
 var ambigDateOfMonthRegex = /^\s*\d{4}-\d\d$/;
@@ -1777,61 +1868,162 @@ function extendClass(superClass, members) {
 
 
 function mixIntoClass(theClass, members) {
-	copyOwnProps(members.prototype || members, theClass.prototype); // TODO: copyNativeMethods?
+	copyOwnProps(members, theClass.prototype); // TODO: copyNativeMethods?
 }
 ;;
 
-var Emitter = FC.Emitter = Class.extend({
+var EmitterMixin = FC.EmitterMixin = {
 
-	callbackHash: null,
+	// jQuery-ification via $(this) allows a non-DOM object to have
+	// the same event handling capabilities (including namespaces).
 
 
-	on: function(name, callback) {
-		this.getCallbacks(name).add(callback);
-		return this; // for chaining
-	},
+	on: function(types, handler) {
 
+		// handlers are always called with an "event" object as their first param.
+		// sneak the `this` context and arguments into the extra parameter object
+		// and forward them on to the original handler.
+		var intercept = function(ev, extra) {
+			return handler.apply(
+				extra.context || this,
+				extra.args || []
+			);
+		};
 
-	off: function(name, callback) {
-		this.getCallbacks(name).remove(callback);
-		return this; // for chaining
-	},
-
-
-	trigger: function(name) { // args...
-		var args = Array.prototype.slice.call(arguments, 1);
-
-		this.triggerWith(name, this, args);
-
-		return this; // for chaining
-	},
-
-
-	triggerWith: function(name, context, args) {
-		var callbacks = this.getCallbacks(name);
-
-		callbacks.fireWith(context, args);
-
-		return this; // for chaining
-	},
-
-
-	getCallbacks: function(name) {
-		var callbacks;
-
-		if (!this.callbackHash) {
-			this.callbackHash = {};
+		// mimick jQuery's internal "proxy" system (risky, I know)
+		// causing all functions with the same .guid to appear to be the same.
+		// https://github.com/jquery/jquery/blob/2.2.4/src/core.js#L448
+		// this is needed for calling .off with the original non-intercept handler.
+		if (!handler.guid) {
+			handler.guid = $.guid++;
 		}
+		intercept.guid = handler.guid;
 
-		callbacks = this.callbackHash[name];
-		if (!callbacks) {
-			callbacks = this.callbackHash[name] = $.Callbacks();
-		}
+		$(this).on(types, intercept);
 
-		return callbacks;
+		return this; // for chaining
+	},
+
+
+	off: function(types, handler) {
+		$(this).off(types, handler);
+
+		return this; // for chaining
+	},
+
+
+	trigger: function(types) {
+		var args = Array.prototype.slice.call(arguments, 1); // arguments after the first
+
+		// pass in "extra" info to the intercept
+		$(this).triggerHandler(types, { args: args });
+
+		return this; // for chaining
+	},
+
+
+	triggerWith: function(types, context, args) {
+
+		// `triggerHandler` is less reliant on the DOM compared to `trigger`.
+		// pass in "extra" info to the intercept.
+		$(this).triggerHandler(types, { context: context, args: args });
+
+		return this; // for chaining
 	}
 
-});
+};
+
+;;
+
+/*
+Utility methods for easily listening to events on another object,
+and more importantly, easily unlistening from them.
+*/
+var ListenerMixin = FC.ListenerMixin = (function() {
+	var guid = 0;
+	var ListenerMixin = {
+
+		listenerId: null,
+
+		/*
+		Given an `other` object that has on/off methods, bind the given `callback` to an event by the given name.
+		The `callback` will be called with the `this` context of the object that .listenTo is being called on.
+		Can be called:
+			.listenTo(other, eventName, callback)
+		OR
+			.listenTo(other, {
+				eventName1: callback1,
+				eventName2: callback2
+			})
+		*/
+		listenTo: function(other, arg, callback) {
+			if (typeof arg === 'object') { // given dictionary of callbacks
+				for (var eventName in arg) {
+					if (arg.hasOwnProperty(eventName)) {
+						this.listenTo(other, eventName, arg[eventName]);
+					}
+				}
+			}
+			else if (typeof arg === 'string') {
+				other.on(
+					arg + '.' + this.getListenerNamespace(), // use event namespacing to identify this object
+					$.proxy(callback, this) // always use `this` context
+						// the usually-undesired jQuery guid behavior doesn't matter,
+						// because we always unbind via namespace
+				);
+			}
+		},
+
+		/*
+		Causes the current object to stop listening to events on the `other` object.
+		`eventName` is optional. If omitted, will stop listening to ALL events on `other`.
+		*/
+		stopListeningTo: function(other, eventName) {
+			other.off((eventName || '') + '.' + this.getListenerNamespace());
+		},
+
+		/*
+		Returns a string, unique to this object, to be used for event namespacing
+		*/
+		getListenerNamespace: function() {
+			if (this.listenerId == null) {
+				this.listenerId = guid++;
+			}
+			return '_listener' + this.listenerId;
+		}
+
+	};
+	return ListenerMixin;
+})();
+;;
+
+// simple class for toggle a `isIgnoringMouse` flag on delay
+// initMouseIgnoring must first be called, with a millisecond delay setting.
+var MouseIgnorerMixin = {
+
+	isIgnoringMouse: false, // bool
+	delayUnignoreMouse: null, // method
+
+
+	initMouseIgnoring: function(delay) {
+		this.delayUnignoreMouse = debounce(proxy(this, 'unignoreMouse'), delay || 1000);
+	},
+
+
+	// temporarily ignore mouse actions on segments
+	tempIgnoreMouse: function() {
+		this.isIgnoringMouse = true;
+		this.delayUnignoreMouse();
+	},
+
+
+	// delayUnignoreMouse eventually calls this
+	unignoreMouse: function() {
+		this.isIgnoringMouse = false;
+	}
+
+};
+
 ;;
 
 /* A rectangular panel that is absolutely positioned over other content
@@ -1848,12 +2040,11 @@ Options:
 	- hide (callback)
 */
 
-var Popover = Class.extend({
+var Popover = Class.extend(ListenerMixin, {
 
 	isHidden: true,
 	options: null,
 	el: null, // the container element for the popover. generated by this object
-	documentMousedownProxy: null, // document mousedown handler bound to `this`
 	margin: 10, // the space required between the popover and the edges of the scroll container
 
 
@@ -1907,7 +2098,7 @@ var Popover = Class.extend({
 		});
 
 		if (options.autoHide) {
-			$(document).on('mousedown', this.documentMousedownProxy = proxy(this, 'documentMousedown'));
+			this.listenTo($(document), 'mousedown', this.documentMousedown);
 		}
 	},
 
@@ -1930,7 +2121,7 @@ var Popover = Class.extend({
 			this.el = null;
 		}
 
-		$(document).off('mousedown', this.documentMousedownProxy);
+		this.stopListeningTo($(document), 'mousedown');
 	},
 
 
@@ -2243,148 +2434,325 @@ var CoordCache = FC.CoordCache = Class.extend({
 ----------------------------------------------------------------------------------------------------------------------*/
 // TODO: use Emitter
 
-var DragListener = FC.DragListener = Class.extend({
+var DragListener = FC.DragListener = Class.extend(ListenerMixin, MouseIgnorerMixin, {
 
 	options: null,
 
-	isListening: false,
-	isDragging: false,
+	// for IE8 bug-fighting behavior
+	subjectEl: null,
+	subjectHref: null,
 
 	// coordinates of the initial mousedown
 	originX: null,
 	originY: null,
 
-	// handler attached to the document, bound to the DragListener's `this`
-	mousemoveProxy: null,
-	mouseupProxy: null,
-
-	// for IE8 bug-fighting behavior, for now
-	subjectEl: null, // the element being draged. optional
-	subjectHref: null,
-
+	// the wrapping element that scrolls, or MIGHT scroll if there's overflow.
+	// TODO: do this for wrappers that have overflow:hidden as well.
 	scrollEl: null,
-	scrollBounds: null, // { top, bottom, left, right }
-	scrollTopVel: null, // pixels per second
-	scrollLeftVel: null, // pixels per second
-	scrollIntervalId: null, // ID of setTimeout for scrolling animation loop
-	scrollHandlerProxy: null, // this-scoped function for handling when scrollEl is scrolled
 
-	scrollSensitivity: 30, // pixels from edge for scrolling to start
-	scrollSpeed: 200, // pixels per second, at maximum speed
-	scrollIntervalMs: 50, // millisecond wait between scroll increment
+	isInteracting: false,
+	isDistanceSurpassed: false,
+	isDelayEnded: false,
+	isDragging: false,
+	isTouch: false,
+
+	delay: null,
+	delayTimeoutId: null,
+	minDistance: null,
+
+	handleTouchScrollProxy: null, // calls handleTouchScroll, always bound to `this`
 
 
 	constructor: function(options) {
-		options = options || {};
-		this.options = options;
-		this.subjectEl = options.subjectEl;
+		this.options = options || {};
+		this.handleTouchScrollProxy = proxy(this, 'handleTouchScroll');
+		this.initMouseIgnoring(500);
 	},
 
 
-	// Call this when the user does a mousedown. Will probably lead to startListening
-	mousedown: function(ev) {
-		if (isPrimaryMouseButton(ev)) {
+	// Interaction (high-level)
+	// -----------------------------------------------------------------------------------------------------------------
 
-			ev.preventDefault(); // prevents native selection in most browsers
 
-			this.startListening(ev);
+	startInteraction: function(ev, extraOptions) {
+		var isTouch = getEvIsTouch(ev);
 
-			// start the drag immediately if there is no minimum distance for a drag start
-			if (!this.options.distance) {
-				this.startDrag(ev);
+		if (ev.type === 'mousedown') {
+			if (this.isIgnoringMouse) {
+				return;
 			}
-		}
-	},
-
-
-	// Call this to start tracking mouse movements
-	startListening: function(ev) {
-		var scrollParent;
-
-		if (!this.isListening) {
-
-			// grab scroll container and attach handler
-			if (ev && this.options.scroll) {
-				scrollParent = getScrollParent($(ev.target));
-				if (!scrollParent.is(window) && !scrollParent.is(document)) {
-					this.scrollEl = scrollParent;
-
-					// scope to `this`, and use `debounce` to make sure rapid calls don't happen
-					this.scrollHandlerProxy = debounce(proxy(this, 'scrollHandler'), 100);
-					this.scrollEl.on('scroll', this.scrollHandlerProxy);
-				}
-			}
-
-			$(document)
-				.on('mousemove', this.mousemoveProxy = proxy(this, 'mousemove'))
-				.on('mouseup', this.mouseupProxy = proxy(this, 'mouseup'))
-				.on('selectstart', this.preventDefault); // prevents native selection in IE<=8
-
-			if (ev) {
-				this.originX = ev.pageX;
-				this.originY = ev.pageY;
+			else if (!isPrimaryMouseButton(ev)) {
+				return;
 			}
 			else {
-				// if no starting information was given, origin will be the topleft corner of the screen.
-				// if so, dx/dy in the future will be the absolute coordinates.
-				this.originX = 0;
-				this.originY = 0;
+				ev.preventDefault(); // prevents native selection in most browsers
 			}
+		}
 
-			this.isListening = true;
-			this.listenStart(ev);
+		if (!this.isInteracting) {
+
+			// process options
+			extraOptions = extraOptions || {};
+			this.delay = firstDefined(extraOptions.delay, this.options.delay, 0);
+			this.minDistance = firstDefined(extraOptions.distance, this.options.distance, 0);
+			this.subjectEl = this.options.subjectEl;
+
+			this.isInteracting = true;
+			this.isTouch = isTouch;
+			this.isDelayEnded = false;
+			this.isDistanceSurpassed = false;
+
+			this.originX = getEvX(ev);
+			this.originY = getEvY(ev);
+			this.scrollEl = getScrollParent($(ev.target));
+
+			this.bindHandlers();
+			this.initAutoScroll();
+			this.handleInteractionStart(ev);
+			this.startDelay(ev);
+
+			if (!this.minDistance) {
+				this.handleDistanceSurpassed(ev);
+			}
 		}
 	},
 
 
-	// Called when drag listening has started (but a real drag has not necessarily began)
-	listenStart: function(ev) {
-		this.trigger('listenStart', ev);
+	handleInteractionStart: function(ev) {
+		this.trigger('interactionStart', ev);
 	},
 
 
-	// Called when the user moves the mouse
-	mousemove: function(ev) {
-		var dx = ev.pageX - this.originX;
-		var dy = ev.pageY - this.originY;
-		var minDistance;
+	endInteraction: function(ev, isCancelled) {
+		if (this.isInteracting) {
+			this.endDrag(ev);
+
+			if (this.delayTimeoutId) {
+				clearTimeout(this.delayTimeoutId);
+				this.delayTimeoutId = null;
+			}
+
+			this.destroyAutoScroll();
+			this.unbindHandlers();
+
+			this.isInteracting = false;
+			this.handleInteractionEnd(ev, isCancelled);
+
+			// a touchstart+touchend on the same element will result in the following addition simulated events:
+			// mouseover + mouseout + click
+			// let's ignore these bogus events
+			if (this.isTouch) {
+				this.tempIgnoreMouse();
+			}
+		}
+	},
+
+
+	handleInteractionEnd: function(ev, isCancelled) {
+		this.trigger('interactionEnd', ev, isCancelled || false);
+	},
+
+
+	// Binding To DOM
+	// -----------------------------------------------------------------------------------------------------------------
+
+
+	bindHandlers: function() {
+		var _this = this;
+		var touchStartIgnores = 1;
+
+		if (this.isTouch) {
+			this.listenTo($(document), {
+				touchmove: this.handleTouchMove,
+				touchend: this.endInteraction,
+				touchcancel: this.endInteraction,
+
+				// Sometimes touchend doesn't fire
+				// (can't figure out why. touchcancel doesn't fire either. has to do with scrolling?)
+				// If another touchstart happens, we know it's bogus, so cancel the drag.
+				// touchend will continue to be broken until user does a shorttap/scroll, but this is best we can do.
+				touchstart: function(ev) {
+					if (touchStartIgnores) { // bindHandlers is called from within a touchstart,
+						touchStartIgnores--; // and we don't want this to fire immediately, so ignore.
+					}
+					else {
+						_this.endInteraction(ev, true); // isCancelled=true
+					}
+				}
+			});
+
+			// listen to ALL scroll actions on the page
+			if (
+				!bindAnyScroll(this.handleTouchScrollProxy) && // hopefully this works and short-circuits the rest
+				this.scrollEl // otherwise, attach a single handler to this
+			) {
+				this.listenTo(this.scrollEl, 'scroll', this.handleTouchScroll);
+			}
+		}
+		else {
+			this.listenTo($(document), {
+				mousemove: this.handleMouseMove,
+				mouseup: this.endInteraction
+			});
+		}
+
+		this.listenTo($(document), {
+			selectstart: preventDefault, // don't allow selection while dragging
+			contextmenu: preventDefault // long taps would open menu on Chrome dev tools
+		});
+	},
+
+
+	unbindHandlers: function() {
+		this.stopListeningTo($(document));
+
+		// unbind scroll listening
+		unbindAnyScroll(this.handleTouchScrollProxy);
+		if (this.scrollEl) {
+			this.stopListeningTo(this.scrollEl, 'scroll');
+		}
+	},
+
+
+	// Drag (high-level)
+	// -----------------------------------------------------------------------------------------------------------------
+
+
+	// extraOptions ignored if drag already started
+	startDrag: function(ev, extraOptions) {
+		this.startInteraction(ev, extraOptions); // ensure interaction began
+
+		if (!this.isDragging) {
+			this.isDragging = true;
+			this.handleDragStart(ev);
+		}
+	},
+
+
+	handleDragStart: function(ev) {
+		this.trigger('dragStart', ev);
+		this.initHrefHack();
+	},
+
+
+	handleMove: function(ev) {
+		var dx = getEvX(ev) - this.originX;
+		var dy = getEvY(ev) - this.originY;
+		var minDistance = this.minDistance;
 		var distanceSq; // current distance from the origin, squared
 
-		if (!this.isDragging) { // if not already dragging...
-			// then start the drag if the minimum distance criteria is met
-			minDistance = this.options.distance || 1;
+		if (!this.isDistanceSurpassed) {
 			distanceSq = dx * dx + dy * dy;
 			if (distanceSq >= minDistance * minDistance) { // use pythagorean theorem
-				this.startDrag(ev);
+				this.handleDistanceSurpassed(ev);
 			}
 		}
 
 		if (this.isDragging) {
-			this.drag(dx, dy, ev); // report a drag, even if this mousemove initiated the drag
+			this.handleDrag(dx, dy, ev);
 		}
 	},
 
 
-	// Call this to initiate a legitimate drag.
-	// This function is called internally from this class, but can also be called explicitly from outside
-	startDrag: function(ev) {
+	// Called while the mouse is being moved and when we know a legitimate drag is taking place
+	handleDrag: function(dx, dy, ev) {
+		this.trigger('drag', dx, dy, ev);
+		this.updateAutoScroll(ev); // will possibly cause scrolling
+	},
 
-		if (!this.isListening) { // startDrag must have manually initiated
-			this.startListening();
+
+	endDrag: function(ev) {
+		if (this.isDragging) {
+			this.isDragging = false;
+			this.handleDragEnd(ev);
+		}
+	},
+
+
+	handleDragEnd: function(ev) {
+		this.trigger('dragEnd', ev);
+		this.destroyHrefHack();
+	},
+
+
+	// Delay
+	// -----------------------------------------------------------------------------------------------------------------
+
+
+	startDelay: function(initialEv) {
+		var _this = this;
+
+		if (this.delay) {
+			this.delayTimeoutId = setTimeout(function() {
+				_this.handleDelayEnd(initialEv);
+			}, this.delay);
+		}
+		else {
+			this.handleDelayEnd(initialEv);
+		}
+	},
+
+
+	handleDelayEnd: function(initialEv) {
+		this.isDelayEnded = true;
+
+		if (this.isDistanceSurpassed) {
+			this.startDrag(initialEv);
+		}
+	},
+
+
+	// Distance
+	// -----------------------------------------------------------------------------------------------------------------
+
+
+	handleDistanceSurpassed: function(ev) {
+		this.isDistanceSurpassed = true;
+
+		if (this.isDelayEnded) {
+			this.startDrag(ev);
+		}
+	},
+
+
+	// Mouse / Touch
+	// -----------------------------------------------------------------------------------------------------------------
+
+
+	handleTouchMove: function(ev) {
+		// prevent inertia and touchmove-scrolling while dragging
+		if (this.isDragging) {
+			ev.preventDefault();
 		}
 
+		this.handleMove(ev);
+	},
+
+
+	handleMouseMove: function(ev) {
+		this.handleMove(ev);
+	},
+
+
+	// Scrolling (unrelated to auto-scroll)
+	// -----------------------------------------------------------------------------------------------------------------
+
+
+	handleTouchScroll: function(ev) {
+		// if the drag is being initiated by touch, but a scroll happens before
+		// the drag-initiating delay is over, cancel the drag
 		if (!this.isDragging) {
-			this.isDragging = true;
-			this.dragStart(ev);
+			this.endInteraction(ev, true); // isCancelled=true
 		}
 	},
 
 
-	// Called when the actual drag has started (went beyond minDistance)
-	dragStart: function(ev) {
-		var subjectEl = this.subjectEl;
+	// <A> HREF Hack
+	// -----------------------------------------------------------------------------------------------------------------
 
-		this.trigger('dragStart', ev);
+
+	initHrefHack: function() {
+		var subjectEl = this.subjectEl;
 
 		// remove a mousedown'd <a>'s href so it is not visited (IE8 bug)
 		if ((this.subjectHref = subjectEl ? subjectEl.attr('href') : null)) {
@@ -2393,75 +2761,21 @@ var DragListener = FC.DragListener = Class.extend({
 	},
 
 
-	// Called while the mouse is being moved and when we know a legitimate drag is taking place
-	drag: function(dx, dy, ev) {
-		this.trigger('drag', dx, dy, ev);
-		this.updateScroll(ev); // will possibly cause scrolling
-	},
-
-
-	// Called when the user does a mouseup
-	mouseup: function(ev) {
-		this.stopListening(ev);
-	},
-
-
-	// Called when the drag is over. Will not cause listening to stop however.
-	// A concluding 'cellOut' event will NOT be triggered.
-	stopDrag: function(ev) {
-		if (this.isDragging) {
-			this.stopScrolling();
-			this.dragStop(ev);
-			this.isDragging = false;
-		}
-	},
-
-
-	// Called when dragging has been stopped
-	dragStop: function(ev) {
-		var _this = this;
-
-		this.trigger('dragStop', ev);
+	destroyHrefHack: function() {
+		var subjectEl = this.subjectEl;
+		var subjectHref = this.subjectHref;
 
 		// restore a mousedown'd <a>'s href (for IE8 bug)
 		setTimeout(function() { // must be outside of the click's execution
-			if (_this.subjectHref) {
-				_this.subjectEl.attr('href', _this.subjectHref);
+			if (subjectHref) {
+				subjectEl.attr('href', subjectHref);
 			}
 		}, 0);
 	},
 
 
-	// Call this to stop listening to the user's mouse events
-	stopListening: function(ev) {
-		this.stopDrag(ev); // if there's a current drag, kill it
-
-		if (this.isListening) {
-
-			// remove the scroll handler if there is a scrollEl
-			if (this.scrollEl) {
-				this.scrollEl.off('scroll', this.scrollHandlerProxy);
-				this.scrollHandlerProxy = null;
-			}
-
-			$(document)
-				.off('mousemove', this.mousemoveProxy)
-				.off('mouseup', this.mouseupProxy)
-				.off('selectstart', this.preventDefault);
-
-			this.mousemoveProxy = null;
-			this.mouseupProxy = null;
-
-			this.isListening = false;
-			this.listenStop(ev);
-		}
-	},
-
-
-	// Called when drag listening has stopped
-	listenStop: function(ev) {
-		this.trigger('listenStop', ev);
-	},
+	// Utils
+	// -----------------------------------------------------------------------------------------------------------------
 
 
 	// Triggers a callback. Calls a function in the option hash of the same name.
@@ -2470,30 +2784,71 @@ var DragListener = FC.DragListener = Class.extend({
 		if (this.options[name]) {
 			this.options[name].apply(this, Array.prototype.slice.call(arguments, 1));
 		}
+		// makes _methods callable by event name. TODO: kill this
+		if (this['_' + name]) {
+			this['_' + name].apply(this, Array.prototype.slice.call(arguments, 1));
+		}
+	}
+
+
+});
+
+;;
+/*
+this.scrollEl is set in DragListener
+*/
+DragListener.mixin({
+
+	isAutoScroll: false,
+
+	scrollBounds: null, // { top, bottom, left, right }
+	scrollTopVel: null, // pixels per second
+	scrollLeftVel: null, // pixels per second
+	scrollIntervalId: null, // ID of setTimeout for scrolling animation loop
+
+	// defaults
+	scrollSensitivity: 30, // pixels from edge for scrolling to start
+	scrollSpeed: 200, // pixels per second, at maximum speed
+	scrollIntervalMs: 50, // millisecond wait between scroll increment
+
+
+	initAutoScroll: function() {
+		var scrollEl = this.scrollEl;
+
+		this.isAutoScroll =
+			this.options.scroll &&
+			scrollEl &&
+			!scrollEl.is(window) &&
+			!scrollEl.is(document);
+
+		if (this.isAutoScroll) {
+			// debounce makes sure rapid calls don't happen
+			this.listenTo(scrollEl, 'scroll', debounce(this.handleDebouncedScroll, 100));
+		}
 	},
 
 
-	// Stops a given mouse event from doing it's native browser action. In our case, text selection.
-	preventDefault: function(ev) {
-		ev.preventDefault();
+	destroyAutoScroll: function() {
+		this.endAutoScroll(); // kill any animation loop
+
+		// remove the scroll handler if there is a scrollEl
+		if (this.isAutoScroll) {
+			this.stopListeningTo(this.scrollEl, 'scroll'); // will probably get removed by unbindHandlers too :(
+		}
 	},
 
 
-	/* Scrolling
-	------------------------------------------------------------------------------------------------------------------*/
-
-
 	// Computes and stores the bounding rectangle of scrollEl
 	computeScrollBounds: function() {
-		var el = this.scrollEl;
-
-		this.scrollBounds = el ? getOuterRect(el) : null;
+		if (this.isAutoScroll) {
+			this.scrollBounds = getOuterRect(this.scrollEl);
 			// TODO: use getClientRect in future. but prevents auto scrolling when on top of scrollbars
+		}
 	},
 
 
 	// Called when the dragging is in progress and scrolling should be updated
-	updateScroll: function(ev) {
+	updateAutoScroll: function(ev) {
 		var sensitivity = this.scrollSensitivity;
 		var bounds = this.scrollBounds;
 		var topCloseness, bottomCloseness;
@@ -2504,10 +2859,10 @@ var DragListener = FC.DragListener = Class.extend({
 		if (bounds) { // only scroll if scrollEl exists
 
 			// compute closeness to edges. valid range is from 0.0 - 1.0
-			topCloseness = (sensitivity - (ev.pageY - bounds.top)) / sensitivity;
-			bottomCloseness = (sensitivity - (bounds.bottom - ev.pageY)) / sensitivity;
-			leftCloseness = (sensitivity - (ev.pageX - bounds.left)) / sensitivity;
-			rightCloseness = (sensitivity - (bounds.right - ev.pageX)) / sensitivity;
+			topCloseness = (sensitivity - (getEvY(ev) - bounds.top)) / sensitivity;
+			bottomCloseness = (sensitivity - (bounds.bottom - getEvY(ev))) / sensitivity;
+			leftCloseness = (sensitivity - (getEvX(ev) - bounds.left)) / sensitivity;
+			rightCloseness = (sensitivity - (bounds.right - getEvX(ev))) / sensitivity;
 
 			// translate vertical closeness into velocity.
 			// mouse must be completely in bounds for velocity to happen.
@@ -2594,38 +2949,36 @@ var DragListener = FC.DragListener = Class.extend({
 
 		// if scrolled all the way, which causes the vels to be zero, stop the animation loop
 		if (!this.scrollTopVel && !this.scrollLeftVel) {
-			this.stopScrolling();
+			this.endAutoScroll();
 		}
 	},
 
 
 	// Kills any existing scrolling animation loop
-	stopScrolling: function() {
+	endAutoScroll: function() {
 		if (this.scrollIntervalId) {
 			clearInterval(this.scrollIntervalId);
 			this.scrollIntervalId = null;
 
-			// when all done with scrolling, recompute positions since they probably changed
-			this.scrollStop();
+			this.handleScrollEnd();
 		}
 	},
 
 
 	// Get called when the scrollEl is scrolled (NOTE: this is delayed via debounce)
-	scrollHandler: function() {
+	handleDebouncedScroll: function() {
 		// recompute all coordinates, but *only* if this is *not* part of our scrolling animation
 		if (!this.scrollIntervalId) {
-			this.scrollStop();
+			this.handleScrollEnd();
 		}
 	},
 
 
 	// Called when scrolling has stopped, whether through auto scroll, or the user scrolling
-	scrollStop: function() {
+	handleScrollEnd: function() {
 	}
 
 });
-
 ;;
 
 /* Tracks mouse movements over a component and raises events about which hit the mouse is over.
@@ -2654,18 +3007,16 @@ var HitDragListener = DragListener.extend({
 
 	// Called when drag listening starts (but a real drag has not necessarily began).
 	// ev might be undefined if dragging was started manually.
-	listenStart: function(ev) {
+	handleInteractionStart: function(ev) {
 		var subjectEl = this.subjectEl;
 		var subjectRect;
 		var origPoint;
 		var point;
 
-		DragListener.prototype.listenStart.apply(this, arguments); // call the super-method
-
 		this.computeCoords();
 
 		if (ev) {
-			origPoint = { left: ev.pageX, top: ev.pageY };
+			origPoint = { left: getEvX(ev), top: getEvY(ev) };
 			point = origPoint;
 
 			// constrain the point to bounds of the element being dragged
@@ -2695,61 +3046,64 @@ var HitDragListener = DragListener.extend({
 			this.origHit = null;
 			this.coordAdjust = null;
 		}
+
+		// call the super-method. do it after origHit has been computed
+		DragListener.prototype.handleInteractionStart.apply(this, arguments);
 	},
 
 
 	// Recomputes the drag-critical positions of elements
 	computeCoords: function() {
 		this.component.prepareHits();
-		this.computeScrollBounds(); // why is this here???
+		this.computeScrollBounds(); // why is this here??????
 	},
 
 
 	// Called when the actual drag has started
-	dragStart: function(ev) {
+	handleDragStart: function(ev) {
 		var hit;
 
-		DragListener.prototype.dragStart.apply(this, arguments); // call the super-method
+		DragListener.prototype.handleDragStart.apply(this, arguments); // call the super-method
 
 		// might be different from this.origHit if the min-distance is large
-		hit = this.queryHit(ev.pageX, ev.pageY);
+		hit = this.queryHit(getEvX(ev), getEvY(ev));
 
 		// report the initial hit the mouse is over
 		// especially important if no min-distance and drag starts immediately
 		if (hit) {
-			this.hitOver(hit);
+			this.handleHitOver(hit);
 		}
 	},
 
 
 	// Called when the drag moves
-	drag: function(dx, dy, ev) {
+	handleDrag: function(dx, dy, ev) {
 		var hit;
 
-		DragListener.prototype.drag.apply(this, arguments); // call the super-method
+		DragListener.prototype.handleDrag.apply(this, arguments); // call the super-method
 
-		hit = this.queryHit(ev.pageX, ev.pageY);
+		hit = this.queryHit(getEvX(ev), getEvY(ev));
 
 		if (!isHitsEqual(hit, this.hit)) { // a different hit than before?
 			if (this.hit) {
-				this.hitOut();
+				this.handleHitOut();
 			}
 			if (hit) {
-				this.hitOver(hit);
+				this.handleHitOver(hit);
 			}
 		}
 	},
 
 
 	// Called when dragging has been stopped
-	dragStop: function() {
-		this.hitDone();
-		DragListener.prototype.dragStop.apply(this, arguments); // call the super-method
+	handleDragEnd: function() {
+		this.handleHitDone();
+		DragListener.prototype.handleDragEnd.apply(this, arguments); // call the super-method
 	},
 
 
 	// Called when a the mouse has just moved over a new hit
-	hitOver: function(hit) {
+	handleHitOver: function(hit) {
 		var isOrig = isHitsEqual(hit, this.origHit);
 
 		this.hit = hit;
@@ -2759,26 +3113,26 @@ var HitDragListener = DragListener.extend({
 
 
 	// Called when the mouse has just moved out of a hit
-	hitOut: function() {
+	handleHitOut: function() {
 		if (this.hit) {
 			this.trigger('hitOut', this.hit);
-			this.hitDone();
+			this.handleHitDone();
 			this.hit = null;
 		}
 	},
 
 
 	// Called after a hitOut. Also called before a dragStop
-	hitDone: function() {
+	handleHitDone: function() {
 		if (this.hit) {
 			this.trigger('hitDone', this.hit);
 		}
 	},
 
 
-	// Called when drag listening has stopped
-	listenStop: function() {
-		DragListener.prototype.listenStop.apply(this, arguments); // call the super-method
+	// Called when the interaction ends, whether there was a real drag or not
+	handleInteractionEnd: function() {
+		DragListener.prototype.handleInteractionEnd.apply(this, arguments); // call the super-method
 
 		this.origHit = null;
 		this.hit = null;
@@ -2788,8 +3142,8 @@ var HitDragListener = DragListener.extend({
 
 
 	// Called when scrolling has stopped, whether through auto scroll, or the user scrolling
-	scrollStop: function() {
-		DragListener.prototype.scrollStop.apply(this, arguments); // call the super-method
+	handleScrollEnd: function() {
+		DragListener.prototype.handleScrollEnd.apply(this, arguments); // call the super-method
 
 		this.computeCoords(); // hits' absolute positions will be in new places. recompute
 	},
@@ -2844,7 +3198,7 @@ function isHitPropsWithin(subHit, superHit) {
 /* Creates a clone of an element and lets it track the mouse as it moves
 ----------------------------------------------------------------------------------------------------------------------*/
 
-var MouseFollower = Class.extend({
+var MouseFollower = Class.extend(ListenerMixin, {
 
 	options: null,
 
@@ -2856,16 +3210,14 @@ var MouseFollower = Class.extend({
 	top0: null,
 	left0: null,
 
-	// the initial position of the mouse
-	mouseY0: null,
-	mouseX0: null,
+	// the absolute coordinates of the initiating touch/mouse action
+	y0: null,
+	x0: null,
 
 	// the number of pixels the mouse has moved from its initial position
 	topDelta: null,
 	leftDelta: null,
 
-	mousemoveProxy: null, // document mousemove handler, bound to the MouseFollower's `this`
-
 	isFollowing: false,
 	isHidden: false,
 	isAnimating: false, // doing the revert animation?
@@ -2882,8 +3234,8 @@ var MouseFollower = Class.extend({
 		if (!this.isFollowing) {
 			this.isFollowing = true;
 
-			this.mouseY0 = ev.pageY;
-			this.mouseX0 = ev.pageX;
+			this.y0 = getEvY(ev);
+			this.x0 = getEvX(ev);
 			this.topDelta = 0;
 			this.leftDelta = 0;
 
@@ -2891,7 +3243,12 @@ var MouseFollower = Class.extend({
 				this.updatePosition();
 			}
 
-			$(document).on('mousemove', this.mousemoveProxy = proxy(this, 'mousemove'));
+			if (getEvIsTouch(ev)) {
+				this.listenTo($(document), 'touchmove', this.handleMove);
+			}
+			else {
+				this.listenTo($(document), 'mousemove', this.handleMove);
+			}
 		}
 	},
 
@@ -2916,7 +3273,7 @@ var MouseFollower = Class.extend({
 		if (this.isFollowing && !this.isAnimating) { // disallow more than one stop animation at a time
 			this.isFollowing = false;
 
-			$(document).off('mousemove', this.mousemoveProxy);
+			this.stopListeningTo($(document));
 
 			if (shouldRevert && revertDuration && !this.isHidden) { // do a revert animation?
 				this.isAnimating = true;
@@ -2942,6 +3299,7 @@ var MouseFollower = Class.extend({
 		if (!el) {
 			this.sourceEl.width(); // hack to force IE8 to compute correct bounding box
 			el = this.el = this.sourceEl.clone()
+				.addClass(this.options.additionalClass || '')
 				.css({
 					position: 'absolute',
 					visibility: '', // in case original element was hidden (commonly through hideEvents())
@@ -2953,8 +3311,13 @@ var MouseFollower = Class.extend({
 					height: this.sourceEl.height(), // explicit width in case there was a 'bottom' value
 					opacity: this.options.opacity || '',
 					zIndex: this.options.zIndex
-				})
-				.appendTo(this.parentEl);
+				});
+
+			// we don't want long taps or any mouse interaction causing selection/menus.
+			// would use preventSelection(), but that prevents selectstart, causing problems.
+			el.addClass('fc-unselectable');
+
+			el.appendTo(this.parentEl);
 		}
 
 		return el;
@@ -2994,9 +3357,9 @@ var MouseFollower = Class.extend({
 
 
 	// Gets called when the user moves the mouse
-	mousemove: function(ev) {
-		this.topDelta = ev.pageY - this.mouseY0;
-		this.leftDelta = ev.pageX - this.mouseX0;
+	handleMove: function(ev) {
+		this.topDelta = getEvY(ev) - this.y0;
+		this.leftDelta = getEvX(ev) - this.x0;
 
 		if (!this.isHidden) {
 			this.updatePosition();
@@ -3031,7 +3394,7 @@ var MouseFollower = Class.extend({
 /* An abstract class comprised of a "grid" of areas that each represent a specific datetime
 ----------------------------------------------------------------------------------------------------------------------*/
 
-var Grid = FC.Grid = Class.extend({
+var Grid = FC.Grid = Class.extend(ListenerMixin, MouseIgnorerMixin, {
 
 	view: null, // a View object
 	isRTL: null, // shortcut to the view's isRTL option
@@ -3042,8 +3405,6 @@ var Grid = FC.Grid = Class.extend({
 	el: null, // the containing element
 	elsByFill: null, // a hash of jQuery element sets used for rendering each fill. Keyed by fill name.
 
-	externalDragStartProxy: null, // binds the Grid's scope to externalDragStart (in DayGrid.events)
-
 	// derived from options
 	eventTimeFormat: null,
 	displayEventTime: null,
@@ -3056,13 +3417,19 @@ var Grid = FC.Grid = Class.extend({
 	// TODO: port isTimeScale into same system?
 	largeUnit: null,
 
+	dayDragListener: null,
+	segDragListener: null,
+	segResizeListener: null,
+	externalDragListener: null,
+
 
 	constructor: function(view) {
 		this.view = view;
 		this.isRTL = view.opt('isRTL');
-
 		this.elsByFill = {};
-		this.externalDragStartProxy = proxy(this, 'externalDragStart');
+
+		this.dayDragListener = this.buildDayDragListener();
+		this.initMouseIgnoring();
 	},
 
 
@@ -3195,20 +3562,11 @@ var Grid = FC.Grid = Class.extend({
 	// Sets the container element that the grid should render inside of.
 	// Does other DOM-related initializations.
 	setElement: function(el) {
-		var _this = this;
-
 		this.el = el;
+		preventSelection(el);
 
-		// attach a handler to the grid's root element.
-		// jQuery will take care of unregistering them when removeElement gets called.
-		el.on('mousedown', function(ev) {
-			if (
-				!$(ev.target).is('.fc-event-container *, .fc-more') && // not an an event element, or "more.." link
-				!$(ev.target).closest('.fc-popover').length // not on a popover (like the "more.." events one)
-			) {
-				_this.dayMousedown(ev);
-			}
-		});
+		this.bindDayHandler('touchstart', this.dayTouchStart);
+		this.bindDayHandler('mousedown', this.dayMousedown);
 
 		// attach event-element-related handlers. in Grid.events
 		// same garbage collection note as above.
@@ -3218,10 +3576,27 @@ var Grid = FC.Grid = Class.extend({
 	},
 
 
+	bindDayHandler: function(name, handler) {
+		var _this = this;
+
+		// attach a handler to the grid's root element.
+		// jQuery will take care of unregistering them when removeElement gets called.
+		this.el.on(name, function(ev) {
+			if (
+				!$(ev.target).is('.fc-event-container *, .fc-more') && // not an an event element, or "more.." link
+				!$(ev.target).closest('.fc-popover').length // not on a popover (like the "more.." events one)
+			) {
+				return handler.call(_this, ev);
+			}
+		});
+	},
+
+
 	// Removes the grid's container element from the DOM. Undoes any other DOM-related attachments.
 	// DOES NOT remove any content beforehand (doesn't clear events or call unrenderDates), unlike View
 	removeElement: function() {
 		this.unbindGlobalHandlers();
+		this.clearDragListeners();
 
 		this.el.remove();
 
@@ -3254,18 +3629,47 @@ var Grid = FC.Grid = Class.extend({
 
 	// Binds DOM handlers to elements that reside outside the grid, such as the document
 	bindGlobalHandlers: function() {
-		$(document).on('dragstart sortstart', this.externalDragStartProxy); // jqui
+		this.listenTo($(document), {
+			dragstart: this.externalDragStart, // jqui
+			sortstart: this.externalDragStart // jqui
+		});
 	},
 
 
 	// Unbinds DOM handlers from elements that reside outside the grid
 	unbindGlobalHandlers: function() {
-		$(document).off('dragstart sortstart', this.externalDragStartProxy); // jqui
+		this.stopListeningTo($(document));
 	},
 
 
 	// Process a mousedown on an element that represents a day. For day clicking and selecting.
 	dayMousedown: function(ev) {
+		if (!this.isIgnoringMouse) {
+			this.dayDragListener.startInteraction(ev, {
+				//distance: 5, // needs more work if we want dayClick to fire correctly
+			});
+		}
+	},
+
+
+	dayTouchStart: function(ev) {
+		var view = this.view;
+
+		// HACK to prevent a user's clickaway for unselecting a range or an event
+		// from causing a dayClick.
+		if (view.isSelected || view.selectedEvent) {
+			this.tempIgnoreMouse();
+		}
+
+		this.dayDragListener.startInteraction(ev, {
+			delay: this.view.opt('longPressDelay')
+		});
+	},
+
+
+	// Creates a listener that tracks the user's drag across day elements.
+	// For day clicking and selecting.
+	buildDayDragListener: function() {
 		var _this = this;
 		var view = this.view;
 		var isSelectable = view.opt('selectable');
@@ -3276,14 +3680,21 @@ var Grid = FC.Grid = Class.extend({
 		// if the drag ends on the same day, it is a 'dayClick'.
 		// if 'selectable' is enabled, this listener also detects selections.
 		var dragListener = new HitDragListener(this, {
-			//distance: 5, // needs more work if we want dayClick to fire correctly
 			scroll: view.opt('dragScroll'),
+			interactionStart: function() {
+				dayClickHit = dragListener.origHit; // for dayClick, where no dragging happens
+			},
 			dragStart: function() {
 				view.unselect(); // since we could be rendering a new selection, we want to clear any old one
 			},
 			hitOver: function(hit, isOrig, origHit) {
 				if (origHit) { // click needs to have started on a hit
-					dayClickHit = isOrig ? hit : null; // single-hit selection is a day click
+
+					// if user dragged to another cell at any point, it can no longer be a dayClick
+					if (!isOrig) {
+						dayClickHit = null;
+					}
+
 					if (isSelectable) {
 						selectionSpan = _this.computeSelection(
 							_this.getHitSpan(origHit),
@@ -3304,23 +3715,46 @@ var Grid = FC.Grid = Class.extend({
 				_this.unrenderSelection();
 				enableCursor();
 			},
-			listenStop: function(ev) {
-				if (dayClickHit) {
-					view.triggerDayClick(
-						_this.getHitSpan(dayClickHit),
-						_this.getHitEl(dayClickHit),
-						ev
-					);
+			interactionEnd: function(ev, isCancelled) {
+				if (!isCancelled) {
+					if (
+						dayClickHit &&
+						!_this.isIgnoringMouse // see hack in dayTouchStart
+					) {
+						view.triggerDayClick(
+							_this.getHitSpan(dayClickHit),
+							_this.getHitEl(dayClickHit),
+							ev
+						);
+					}
+					if (selectionSpan) {
+						// the selection will already have been rendered. just report it
+						view.reportSelection(selectionSpan, ev);
+					}
+					enableCursor();
 				}
-				if (selectionSpan) {
-					// the selection will already have been rendered. just report it
-					view.reportSelection(selectionSpan, ev);
-				}
-				enableCursor();
 			}
 		});
 
-		dragListener.mousedown(ev); // start listening, which will eventually initiate a dragStart
+		return dragListener;
+	},
+
+
+	// Kills all in-progress dragging.
+	// Useful for when public API methods that result in re-rendering are invoked during a drag.
+	// Also useful for when touch devices misbehave and don't fire their touchend.
+	clearDragListeners: function() {
+		this.dayDragListener.endInteraction();
+
+		if (this.segDragListener) {
+			this.segDragListener.endInteraction(); // will clear this.segDragListener
+		}
+		if (this.segResizeListener) {
+			this.segResizeListener.endInteraction(); // will clear this.segResizeListener
+		}
+		if (this.externalDragListener) {
+			this.externalDragListener.endInteraction(); // will clear this.externalDragListener
+		}
 	},
 
 
@@ -3330,10 +3764,11 @@ var Grid = FC.Grid = Class.extend({
 
 
 	// Renders a mock event at the given event location, which contains zoned start/end properties.
+	// Returns all mock event elements.
 	renderEventLocationHelper: function(eventLocation, sourceSeg) {
 		var fakeEvent = this.fabricateHelperEvent(eventLocation, sourceSeg);
 
-		this.renderHelper(fakeEvent, sourceSeg); // do the actual rendering
+		return this.renderHelper(fakeEvent, sourceSeg); // do the actual rendering
 	},
 
 
@@ -3361,6 +3796,7 @@ var Grid = FC.Grid = Class.extend({
 
 
 	// Renders a mock event. Given zoned event date properties.
+	// Must return all mock event elements.
 	renderHelper: function(eventLocation, sourceSeg) {
 		// subclasses must implement
 	},
@@ -3538,7 +3974,7 @@ var Grid = FC.Grid = Class.extend({
 	fillSegTag: 'div', // subclasses can override
 
 
-	// Builds the HTML needed for one fill segment. Generic enought o work with different types.
+	// Builds the HTML needed for one fill segment. Generic enough to work with different types.
 	fillSegHtml: function(type, seg) {
 
 		// custom hooks per-type
@@ -3640,7 +4076,8 @@ Grid.mixin({
 
 	// Unrenders all events currently rendered on the grid
 	unrenderEvents: function() {
-		this.triggerSegMouseout(); // trigger an eventMouseout if user's mouse is over an event
+		this.handleSegMouseout(); // trigger an eventMouseout if user's mouse is over an event
+		this.clearDragListeners();
 
 		this.unrenderFgSegs();
 		this.unrenderBgSegs();
@@ -3768,48 +4205,44 @@ Grid.mixin({
 
 	// Attaches event-element-related handlers to the container element and leverage bubbling
 	bindSegHandlers: function() {
+		this.bindSegHandler('touchstart', this.handleSegTouchStart);
+		this.bindSegHandler('touchend', this.handleSegTouchEnd);
+		this.bindSegHandler('mouseenter', this.handleSegMouseover);
+		this.bindSegHandler('mouseleave', this.handleSegMouseout);
+		this.bindSegHandler('mousedown', this.handleSegMousedown);
+		this.bindSegHandler('click', this.handleSegClick);
+	},
+
+
+	// Executes a handler for any a user-interaction on a segment.
+	// Handler gets called with (seg, ev), and with the `this` context of the Grid
+	bindSegHandler: function(name, handler) {
 		var _this = this;
-		var view = this.view;
 
-		$.each(
-			{
-				mouseenter: function(seg, ev) {
-					_this.triggerSegMouseover(seg, ev);
-				},
-				mouseleave: function(seg, ev) {
-					_this.triggerSegMouseout(seg, ev);
-				},
-				click: function(seg, ev) {
-					return view.trigger('eventClick', this, seg.event, ev); // can return `false` to cancel
-				},
-				mousedown: function(seg, ev) {
-					if ($(ev.target).is('.fc-resizer') && view.isEventResizable(seg.event)) {
-						_this.segResizeMousedown(seg, ev, $(ev.target).is('.fc-start-resizer'));
-					}
-					else if (view.isEventDraggable(seg.event)) {
-						_this.segDragMousedown(seg, ev);
-					}
-				}
-			},
-			function(name, func) {
-				// attach the handler to the container element and only listen for real event elements via bubbling
-				_this.el.on(name, '.fc-event-container > *', function(ev) {
-					var seg = $(this).data('fc-seg'); // grab segment data. put there by View::renderEvents
+		this.el.on(name, '.fc-event-container > *', function(ev) {
+			var seg = $(this).data('fc-seg'); // grab segment data. put there by View::renderEvents
 
-					// only call the handlers if there is not a drag/resize in progress
-					if (seg && !_this.isDraggingSeg && !_this.isResizingSeg) {
-						return func.call(this, seg, ev); // `this` will be the event element
-					}
-				});
+			// only call the handlers if there is not a drag/resize in progress
+			if (seg && !_this.isDraggingSeg && !_this.isResizingSeg) {
+				return handler.call(_this, seg, ev); // context will be the Grid
 			}
-		);
+		});
+	},
+
+
+	handleSegClick: function(seg, ev) {
+		return this.view.trigger('eventClick', seg.el[0], seg.event, ev); // can return `false` to cancel
 	},
 
 
 	// Updates internal state and triggers handlers for when an event element is moused over
-	triggerSegMouseover: function(seg, ev) {
-		if (!this.mousedOverSeg) {
+	handleSegMouseover: function(seg, ev) {
+		if (
+			!this.isIgnoringMouse &&
+			!this.mousedOverSeg
+		) {
 			this.mousedOverSeg = seg;
+			seg.el.addClass('fc-allow-mouse-resize');
 			this.view.trigger('eventMouseover', seg.el[0], seg.event, ev);
 		}
 	},
@@ -3817,56 +4250,132 @@ Grid.mixin({
 
 	// Updates internal state and triggers handlers for when an event element is moused out.
 	// Can be given no arguments, in which case it will mouseout the segment that was previously moused over.
-	triggerSegMouseout: function(seg, ev) {
+	handleSegMouseout: function(seg, ev) {
 		ev = ev || {}; // if given no args, make a mock mouse event
 
 		if (this.mousedOverSeg) {
 			seg = seg || this.mousedOverSeg; // if given no args, use the currently moused-over segment
 			this.mousedOverSeg = null;
+			seg.el.removeClass('fc-allow-mouse-resize');
 			this.view.trigger('eventMouseout', seg.el[0], seg.event, ev);
 		}
 	},
 
 
+	handleSegMousedown: function(seg, ev) {
+		var isResizing = this.startSegResize(seg, ev, { distance: 5 });
+
+		if (!isResizing && this.view.isEventDraggable(seg.event)) {
+			this.buildSegDragListener(seg)
+				.startInteraction(ev, {
+					distance: 5
+				});
+		}
+	},
+
+
+	handleSegTouchStart: function(seg, ev) {
+		var view = this.view;
+		var event = seg.event;
+		var isSelected = view.isEventSelected(event);
+		var isDraggable = view.isEventDraggable(event);
+		var isResizable = view.isEventResizable(event);
+		var isResizing = false;
+		var dragListener;
+
+		if (isSelected && isResizable) {
+			// only allow resizing of the event is selected
+			isResizing = this.startSegResize(seg, ev);
+		}
+
+		if (!isResizing && (isDraggable || isResizable)) { // allowed to be selected?
+
+			dragListener = isDraggable ?
+				this.buildSegDragListener(seg) :
+				this.buildSegSelectListener(seg); // seg isn't draggable, but still needs to be selected
+
+			dragListener.startInteraction(ev, { // won't start if already started
+				delay: isSelected ? 0 : this.view.opt('longPressDelay') // do delay if not already selected
+			});
+		}
+
+		// a long tap simulates a mouseover. ignore this bogus mouseover.
+		this.tempIgnoreMouse();
+	},
+
+
+	handleSegTouchEnd: function(seg, ev) {
+		// touchstart+touchend = click, which simulates a mouseover.
+		// ignore this bogus mouseover.
+		this.tempIgnoreMouse();
+	},
+
+
+	// returns boolean whether resizing actually started or not.
+	// assumes the seg allows resizing.
+	// `dragOptions` are optional.
+	startSegResize: function(seg, ev, dragOptions) {
+		if ($(ev.target).is('.fc-resizer')) {
+			this.buildSegResizeListener(seg, $(ev.target).is('.fc-start-resizer'))
+				.startInteraction(ev, dragOptions);
+			return true;
+		}
+		return false;
+	},
+
+
+
 	/* Event Dragging
 	------------------------------------------------------------------------------------------------------------------*/
 
 
-	// Called when the user does a mousedown on an event, which might lead to dragging.
+	// Builds a listener that will track user-dragging on an event segment.
 	// Generic enough to work with any type of Grid.
-	segDragMousedown: function(seg, ev) {
+	// Has side effect of setting/unsetting `segDragListener`
+	buildSegDragListener: function(seg) {
 		var _this = this;
 		var view = this.view;
 		var calendar = view.calendar;
 		var el = seg.el;
 		var event = seg.event;
+		var isDragging;
+		var mouseFollower; // A clone of the original element that will move with the mouse
 		var dropLocation; // zoned event date properties
 
-		// A clone of the original element that will move with the mouse
-		var mouseFollower = new MouseFollower(seg.el, {
-			parentEl: view.el,
-			opacity: view.opt('dragOpacity'),
-			revertDuration: view.opt('dragRevertDuration'),
-			zIndex: 2 // one above the .fc-view
-		});
+		if (this.segDragListener) {
+			return this.segDragListener;
+		}
 
 		// Tracks mouse movement over the *view's* coordinate map. Allows dragging and dropping between subcomponents
 		// of the view.
-		var dragListener = new HitDragListener(view, {
-			distance: 5,
+		var dragListener = this.segDragListener = new HitDragListener(view, {
 			scroll: view.opt('dragScroll'),
 			subjectEl: el,
 			subjectCenter: true,
-			listenStart: function(ev) {
+			interactionStart: function(ev) {
+				isDragging = false;
+				mouseFollower = new MouseFollower(seg.el, {
+					additionalClass: 'fc-dragging',
+					parentEl: view.el,
+					opacity: dragListener.isTouch ? null : view.opt('dragOpacity'),
+					revertDuration: view.opt('dragRevertDuration'),
+					zIndex: 2 // one above the .fc-view
+				});
 				mouseFollower.hide(); // don't show until we know this is a real drag
 				mouseFollower.start(ev);
 			},
 			dragStart: function(ev) {
-				_this.triggerSegMouseout(seg, ev); // ensure a mouseout on the manipulated event has been reported
+				if (dragListener.isTouch && !view.isEventSelected(event)) {
+					// if not previously selected, will fire after a delay. then, select the event
+					view.selectEvent(event);
+				}
+				isDragging = true;
+				_this.handleSegMouseout(seg, ev); // ensure a mouseout on the manipulated event has been reported
 				_this.segDragStart(seg, ev);
 				view.hideEvent(event); // hide all event segments. our mouseFollower will take over
 			},
 			hitOver: function(hit, isOrig, origHit) {
+				var dragHelperEls;
 
 				// starting hit could be forced (DayGrid.limit)
 				if (seg.hit) {
@@ -3886,7 +4395,13 @@ Grid.mixin({
 				}
 
 				// if a valid drop location, have the subclass render a visual indication
-				if (dropLocation && view.renderDrag(dropLocation, seg)) {
+				if (dropLocation && (dragHelperEls = view.renderDrag(dropLocation, seg))) {
+
+					dragHelperEls.addClass('fc-dragging');
+					if (!dragListener.isTouch) {
+						_this.applyDragOpacity(dragHelperEls);
+					}
+
 					mouseFollower.hide(); // if the subclass is already using a mock event "helper", hide our own
 				}
 				else {
@@ -3902,27 +4417,54 @@ Grid.mixin({
 				mouseFollower.show(); // show in case we are moving out of all hits
 				dropLocation = null;
 			},
-			hitDone: function() { // Called after a hitOut OR before a dragStop
+			hitDone: function() { // Called after a hitOut OR before a dragEnd
 				enableCursor();
 			},
-			dragStop: function(ev) {
+			interactionEnd: function(ev) {
 				// do revert animation if hasn't changed. calls a callback when finished (whether animation or not)
 				mouseFollower.stop(!dropLocation, function() {
-					view.unrenderDrag();
-					view.showEvent(event);
-					_this.segDragStop(seg, ev);
-
+					if (isDragging) {
+						view.unrenderDrag();
+						view.showEvent(event);
+						_this.segDragStop(seg, ev);
+					}
 					if (dropLocation) {
 						view.reportEventDrop(event, dropLocation, this.largeUnit, el, ev);
 					}
 				});
-			},
-			listenStop: function() {
-				mouseFollower.stop(); // put in listenStop in case there was a mousedown but the drag never started
+				_this.segDragListener = null;
 			}
 		});
 
-		dragListener.mousedown(ev); // start listening, which will eventually lead to a dragStart
+		return dragListener;
+	},
+
+
+	// seg isn't draggable, but let's use a generic DragListener
+	// simply for the delay, so it can be selected.
+	// Has side effect of setting/unsetting `segDragListener`
+	buildSegSelectListener: function(seg) {
+		var _this = this;
+		var view = this.view;
+		var event = seg.event;
+
+		if (this.segDragListener) {
+			return this.segDragListener;
+		}
+
+		var dragListener = this.segDragListener = new DragListener({
+			dragStart: function(ev) {
+				if (dragListener.isTouch && !view.isEventSelected(event)) {
+					// if not previously selected, will fire after a delay. then, select the event
+					view.selectEvent(event);
+				}
+			},
+			interactionEnd: function(ev) {
+				_this.segDragListener = null;
+			}
+		});
+
+		return dragListener;
 	},
 
 
@@ -4038,8 +4580,8 @@ Grid.mixin({
 		var dropLocation; // a null value signals an unsuccessful drag
 
 		// listener that tracks mouse movement over date-associated pixel regions
-		var dragListener = new HitDragListener(this, {
-			listenStart: function() {
+		var dragListener = _this.externalDragListener = new HitDragListener(this, {
+			interactionStart: function() {
 				_this.isDraggingExternal = true;
 			},
 			hitOver: function(hit) {
@@ -4063,17 +4605,16 @@ Grid.mixin({
 			hitOut: function() {
 				dropLocation = null; // signal unsuccessful
 			},
-			hitDone: function() { // Called after a hitOut OR before a dragStop
+			hitDone: function() { // Called after a hitOut OR before a dragEnd
 				enableCursor();
 				_this.unrenderDrag();
 			},
-			dragStop: function() {
+			interactionEnd: function(ev) {
 				if (dropLocation) { // element was dropped on a valid hit
 					_this.view.reportExternalDrop(meta, dropLocation, el, ev, ui);
 				}
-			},
-			listenStop: function() {
 				_this.isDraggingExternal = false;
+				_this.externalDragListener = null;
 			}
 		});
 
@@ -4114,6 +4655,7 @@ Grid.mixin({
 	// `dropLocation` contains hypothetical start/end/allDay values the event would have if dropped. end can be null.
 	// `seg` is the internal segment object that is being dragged. If dragging an external element, `seg` is null.
 	// A truthy returned value indicates this method has rendered a helper element.
+	// Must return elements used for any mock events.
 	renderDrag: function(dropLocation, seg) {
 		// subclasses must implement
 	},
@@ -4129,24 +4671,28 @@ Grid.mixin({
 	------------------------------------------------------------------------------------------------------------------*/
 
 
-	// Called when the user does a mousedown on an event's resizer, which might lead to resizing.
+	// Creates a listener that tracks the user as they resize an event segment.
 	// Generic enough to work with any type of Grid.
-	segResizeMousedown: function(seg, ev, isStart) {
+	buildSegResizeListener: function(seg, isStart) {
 		var _this = this;
 		var view = this.view;
 		var calendar = view.calendar;
 		var el = seg.el;
 		var event = seg.event;
 		var eventEnd = calendar.getEventEnd(event);
+		var isDragging;
 		var resizeLocation; // zoned event date properties. falsy if invalid resize
 
 		// Tracks mouse movement over the *grid's* coordinate map
-		var dragListener = new HitDragListener(this, {
-			distance: 5,
+		var dragListener = this.segResizeListener = new HitDragListener(this, {
 			scroll: view.opt('dragScroll'),
 			subjectEl: el,
+			interactionStart: function() {
+				isDragging = false;
+			},
 			dragStart: function(ev) {
-				_this.triggerSegMouseout(seg, ev); // ensure a mouseout on the manipulated event has been reported
+				isDragging = true;
+				_this.handleSegMouseout(seg, ev); // ensure a mouseout on the manipulated event has been reported
 				_this.segResizeStart(seg, ev);
 			},
 			hitOver: function(hit, isOrig, origHit) {
@@ -4181,16 +4727,18 @@ Grid.mixin({
 				view.showEvent(event);
 				enableCursor();
 			},
-			dragStop: function(ev) {
-				_this.segResizeStop(seg, ev);
-
+			interactionEnd: function(ev) {
+				if (isDragging) {
+					_this.segResizeStop(seg, ev);
+				}
 				if (resizeLocation) { // valid date to resize to?
 					view.reportEventResize(event, resizeLocation, this.largeUnit, el, ev);
 				}
+				_this.segResizeListener = null;
 			}
 		});
 
-		dragListener.mousedown(ev); // start listening, which will eventually lead to a dragStart
+		return dragListener;
 	},
 
 
@@ -4267,6 +4815,7 @@ Grid.mixin({
 
 	// Renders a visual indication of an event being resized.
 	// `range` has the updated dates of the event. `seg` is the original segment object involved in the drag.
+	// Must return elements used for any mock events.
 	renderEventResize: function(range, seg) {
 		// subclasses must implement
 	},
@@ -4312,6 +4861,7 @@ Grid.mixin({
 
 	// Generic utility for generating the HTML classNames for an event segment's element
 	getSegClasses: function(seg, isDraggable, isResizable) {
+		var view = this.view;
 		var event = seg.event;
 		var classes = [
 			'fc-event',
@@ -4329,6 +4879,11 @@ Grid.mixin({
 			classes.push('fc-resizable');
 		}
 
+		// event is currently selected? attach a className.
+		if (view.isEventSelected(event)) {
+			classes.push('fc-selected');
+		}
+
 		return classes;
 	},
 
@@ -5311,10 +5866,7 @@ var DayGrid = FC.DayGrid = Grid.extend(DayTableMixin, {
 		// if a segment from the same calendar but another component is being dragged, render a helper event
 		if (seg && !seg.el.closest(this.el).length) {
 
-			this.renderEventLocationHelper(eventLocation, seg);
-			this.applyDragOpacity(this.helperEls);
-
-			return true; // a helper has been rendered
+			return this.renderEventLocationHelper(eventLocation, seg); // returns mock event elements
 		}
 	},
 
@@ -5333,7 +5885,7 @@ var DayGrid = FC.DayGrid = Grid.extend(DayTableMixin, {
 	// Renders a visual indication of an event being resized
 	renderEventResize: function(eventLocation, seg) {
 		this.renderHighlight(this.eventToSpan(eventLocation));
-		this.renderEventLocationHelper(eventLocation, seg);
+		return this.renderEventLocationHelper(eventLocation, seg); // returns mock event elements
 	},
 
 
@@ -5379,7 +5931,9 @@ var DayGrid = FC.DayGrid = Grid.extend(DayTableMixin, {
 			helperNodes.push(skeletonEl[0]);
 		});
 
-		this.helperEls = $(helperNodes); // array -> jQuery set
+		return ( // must return the elements rendered
+			this.helperEls = $(helperNodes) // array -> jQuery set
+		);
 	},
 
 
@@ -6165,6 +6719,7 @@ var TimeGrid = FC.TimeGrid = Grid.extend(DayTableMixin, {
 	labelInterval: null, // duration of how often a label should be displayed for a slot
 
 	colEls: null, // cells elements in the day-row background
+	slatContainerEl: null, // div that wraps all the slat rows
 	slatEls: null, // elements running horizontally across all columns
 	nowIndicatorEls: null,
 
@@ -6184,7 +6739,8 @@ var TimeGrid = FC.TimeGrid = Grid.extend(DayTableMixin, {
 	renderDates: function() {
 		this.el.html(this.renderHtml());
 		this.colEls = this.el.find('.fc-day');
-		this.slatEls = this.el.find('.fc-slats tr');
+		this.slatContainerEl = this.el.find('.fc-slats');
+		this.slatEls = this.slatContainerEl.find('tr');
 
 		this.colCoordCache = new CoordCache({
 			els: this.colEls,
@@ -6463,6 +7019,11 @@ var TimeGrid = FC.TimeGrid = Grid.extend(DayTableMixin, {
 	},
 
 
+	getTotalSlatHeight: function() {
+		return this.slatContainerEl.outerHeight();
+	},
+
+
 	// Computes the top coordinate, relative to the bounds of the grid, of the given date.
 	// A `startOfDayDate` must be given for avoiding ambiguity over how to treat midnight.
 	computeDateTop: function(date, startOfDayDate) {
@@ -6511,13 +7072,10 @@ var TimeGrid = FC.TimeGrid = Grid.extend(DayTableMixin, {
 	renderDrag: function(eventLocation, seg) {
 
 		if (seg) { // if there is event information for this drag, render a helper event
-			this.renderEventLocationHelper(eventLocation, seg);
 
-			for (var i = 0; i < this.helperSegs.length; i++) {
-				this.applyDragOpacity(this.helperSegs[i].el);
-			}
-
-			return true; // signal that a helper has been rendered
+			// returns mock event elements
+			// signal that a helper has been rendered
+			return this.renderEventLocationHelper(eventLocation, seg);
 		}
 		else {
 			// otherwise, just render a highlight
@@ -6539,7 +7097,7 @@ var TimeGrid = FC.TimeGrid = Grid.extend(DayTableMixin, {
 
 	// Renders a visual indication of an event being resized
 	renderEventResize: function(eventLocation, seg) {
-		this.renderEventLocationHelper(eventLocation, seg);
+		return this.renderEventLocationHelper(eventLocation, seg); // returns mock event elements
 	},
 
 
@@ -6555,7 +7113,7 @@ var TimeGrid = FC.TimeGrid = Grid.extend(DayTableMixin, {
 
 	// Renders a mock "helper" event. `sourceSeg` is the original segment object and might be null (an external drag)
 	renderHelper: function(event, sourceSeg) {
-		this.renderHelperSegs(this.eventToSegs(event), sourceSeg);
+		return this.renderHelperSegs(this.eventToSegs(event), sourceSeg); // returns mock event elements
 	},
 
 
@@ -6749,6 +7307,7 @@ TimeGrid.mixin({
 
 
 	renderHelperSegs: function(segs, sourceSeg) {
+		var helperEls = [];
 		var i, seg;
 		var sourceEl;
 
@@ -6766,9 +7325,12 @@ TimeGrid.mixin({
 					'margin-right': sourceEl.css('margin-right')
 				});
 			}
+			helperEls.push(seg.el[0]);
 		}
 
 		this.helperSegs = segs;
+
+		return $(helperEls); // must return rendered helpers
 	},
 
 
@@ -7279,7 +7841,7 @@ function isSlotSegCollision(seg1, seg2) {
 /* An abstract class from which other views inherit from
 ----------------------------------------------------------------------------------------------------------------------*/
 
-var View = FC.View = Class.extend({
+var View = FC.View = Class.extend(EmitterMixin, ListenerMixin, {
 
 	type: null, // subclass' view name (string)
 	name: null, // deprecated. use `type` instead
@@ -7306,13 +7868,10 @@ var View = FC.View = Class.extend({
 
 	isRTL: false,
 	isSelected: false, // boolean whether a range of time is user-selected or not
+	selectedEvent: null,
 
 	eventOrderSpecs: null, // criteria for ordering events when they have same date/time
 
-	// subclasses can optionally use a scroll container
-	scrollerEl: null, // the element that will most likely scroll when content is too tall
-	scrollTop: null, // cached vertical scroll value
-
 	// classNames styled by jqui themes
 	widgetHeaderClass: null,
 	widgetContentClass: null,
@@ -7322,9 +7881,6 @@ var View = FC.View = Class.extend({
 	nextDayThreshold: null,
 	isHiddenDayHash: null,
 
-	// document handlers, bound to `this` object
-	documentMousedownProxy: null, // TODO: doesn't work with touch
-
 	// now indicator
 	isNowIndicatorRendered: null,
 	initialNowDate: null, // result first getNow call
@@ -7347,8 +7903,6 @@ var View = FC.View = Class.extend({
 
 		this.eventOrderSpecs = parseFieldSpecs(this.opt('eventOrder'));
 
-		this.documentMousedownProxy = proxy(this, 'documentMousedown');
-
 		this.initialize();
 	},
 
@@ -7566,15 +8120,14 @@ var View = FC.View = Class.extend({
 
 		this.calendar.freezeContentHeight();
 
-		return this.clear().then(function() { // clear the content first (async)
+		return syncThen(this.clear(), function() { // clear the content first
 			return (
 				_this.displaying =
-					$.when(_this.displayView(date)) // displayView might return a promise
-						.then(function() {
-							_this.forceScroll(_this.computeInitialScroll(scrollState));
-							_this.calendar.unfreezeContentHeight();
-							_this.triggerRender();
-						})
+					syncThen(_this.displayView(date), function() { // displayView might return a promise
+						_this.forceScroll(_this.computeInitialScroll(scrollState));
+						_this.calendar.unfreezeContentHeight();
+						_this.triggerRender();
+					})
 			);
 		});
 	},
@@ -7588,7 +8141,7 @@ var View = FC.View = Class.extend({
 		var displaying = this.displaying;
 
 		if (displaying) { // previously displayed, or in the process of being displayed?
-			return displaying.then(function() { // wait for the display to finish
+			return syncThen(displaying, function() { // wait for the display to finish
 				_this.displaying = null;
 				_this.clearEvents();
 				return _this.clearView(); // might return a promise. chain it
@@ -7674,13 +8227,14 @@ var View = FC.View = Class.extend({
 
 	// Binds DOM handlers to elements that reside outside the view container, such as the document
 	bindGlobalHandlers: function() {
-		$(document).on('mousedown', this.documentMousedownProxy);
+		this.listenTo($(document), 'mousedown', this.handleDocumentMousedown);
+		this.listenTo($(document), 'touchstart', this.processUnselect);
 	},
 
 
 	// Unbinds DOM handlers from elements that reside outside the view container
 	unbindGlobalHandlers: function() {
-		$(document).off('mousedown', this.documentMousedownProxy);
+		this.stopListeningTo($(document));
 	},
 
 
@@ -7848,27 +8402,6 @@ var View = FC.View = Class.extend({
 	------------------------------------------------------------------------------------------------------------------*/
 
 
-	// Given the total height of the view, return the number of pixels that should be used for the scroller.
-	// Utility for subclasses.
-	computeScrollerHeight: function(totalHeight) {
-		var scrollerEl = this.scrollerEl;
-		var both;
-		var otherHeight; // cumulative height of everything that is not the scrollerEl in the view (header+borders)
-
-		both = this.el.add(scrollerEl);
-
-		// fuckin IE8/9/10/11 sometimes returns 0 for dimensions. this weird hack was the only thing that worked
-		both.css({
-			position: 'relative', // cause a reflow, which will force fresh dimension recalculation
-			left: -1 // ensure reflow in case the el was already relative. negative is less likely to cause new scroll
-		});
-		otherHeight = this.el.outerHeight() - scrollerEl.height(); // grab the dimensions
-		both.css({ position: '', left: '' }); // undo hack
-
-		return totalHeight - otherHeight;
-	},
-
-
 	// Computes the initial pre-configured scroll state prior to allowing the user to change it.
 	// Given the scroll state from the previous rendering. If first time rendering, given null.
 	computeInitialScroll: function(previousScrollState) {
@@ -7878,17 +8411,13 @@ var View = FC.View = Class.extend({
 
 	// Retrieves the view's current natural scroll state. Can return an arbitrary format.
 	queryScroll: function() {
-		if (this.scrollerEl) {
-			return this.scrollerEl.scrollTop(); // operates on scrollerEl by default
-		}
+		// subclasses must implement
 	},
 
 
 	// Sets the view's scroll state. Will accept the same format computeInitialScroll and queryScroll produce.
 	setScroll: function(scrollState) {
-		if (this.scrollerEl) {
-			return this.scrollerEl.scrollTop(scrollState); // operates on scrollerEl by default
-		}
+		// subclasses must implement
 	},
 
 
@@ -8103,7 +8632,8 @@ var View = FC.View = Class.extend({
 
 
 	// Renders a visual indication of a event or external-element drag over the given drop zone.
-	// If an external-element, seg will be `null`
+	// If an external-element, seg will be `null`.
+	// Must return elements used for any mock events.
 	renderDrag: function(dropLocation, seg) {
 		// subclasses must implement
 	},
@@ -8166,7 +8696,7 @@ var View = FC.View = Class.extend({
 	},
 
 
-	/* Selection
+	/* Selection (time range)
 	------------------------------------------------------------------------------------------------------------------*/
 
 
@@ -8224,13 +8754,62 @@ var View = FC.View = Class.extend({
 	},
 
 
-	// Handler for unselecting when the user clicks something and the 'unselectAuto' setting is on
-	documentMousedown: function(ev) {
+	/* Event Selection
+	------------------------------------------------------------------------------------------------------------------*/
+
+
+	selectEvent: function(event) {
+		if (!this.selectedEvent || this.selectedEvent !== event) {
+			this.unselectEvent();
+			this.renderedEventSegEach(function(seg) {
+				seg.el.addClass('fc-selected');
+			}, event);
+			this.selectedEvent = event;
+		}
+	},
+
+
+	unselectEvent: function() {
+		if (this.selectedEvent) {
+			this.renderedEventSegEach(function(seg) {
+				seg.el.removeClass('fc-selected');
+			}, this.selectedEvent);
+			this.selectedEvent = null;
+		}
+	},
+
+
+	isEventSelected: function(event) {
+		// event references might change on refetchEvents(), while selectedEvent doesn't,
+		// so compare IDs
+		return this.selectedEvent && this.selectedEvent._id === event._id;
+	},
+
+
+	/* Mouse / Touch Unselecting (time range & event unselection)
+	------------------------------------------------------------------------------------------------------------------*/
+	// TODO: move consistently to down/start or up/end?
+	// TODO: don't kill previous selection if touch scrolling
+
+
+	handleDocumentMousedown: function(ev) {
+		if (isPrimaryMouseButton(ev)) {
+			this.processUnselect(ev);
+		}
+	},
+
+
+	processUnselect: function(ev) {
+		this.processRangeUnselect(ev);
+		this.processEventUnselect(ev);
+	},
+
+
+	processRangeUnselect: function(ev) {
 		var ignore;
 
-		// is there a selection, and has the user made a proper left click?
-		if (this.isSelected && this.opt('unselectAuto') && isPrimaryMouseButton(ev)) {
-
+		// is there a time-range selection?
+		if (this.isSelected && this.opt('unselectAuto')) {
 			// only unselect if the clicked element is not identical to or inside of an 'unselectCancel' element
 			ignore = this.opt('unselectCancel');
 			if (!ignore || !$(ev.target).closest(ignore).length) {
@@ -8240,6 +8819,15 @@ var View = FC.View = Class.extend({
 	},
 
 
+	processEventUnselect: function(ev) {
+		if (this.selectedEvent) {
+			if (!$(ev.target).closest('.fc-selected').length) {
+				this.unselectEvent();
+			}
+		}
+	},
+
+
 	/* Day Click
 	------------------------------------------------------------------------------------------------------------------*/
 
@@ -8354,6 +8942,127 @@ var View = FC.View = Class.extend({
 
 ;;
 
+/*
+Embodies a div that has potential scrollbars
+*/
+var Scroller = FC.Scroller = Class.extend({
+
+	el: null, // the guaranteed outer element
+	scrollEl: null, // the element with the scrollbars
+	overflowX: null,
+	overflowY: null,
+
+
+	constructor: function(options) {
+		options = options || {};
+		this.overflowX = options.overflowX || options.overflow || 'auto';
+		this.overflowY = options.overflowY || options.overflow || 'auto';
+	},
+
+
+	render: function() {
+		this.el = this.renderEl();
+		this.applyOverflow();
+	},
+
+
+	renderEl: function() {
+		return (this.scrollEl = $('<div class="fc-scroller"></div>'));
+	},
+
+
+	// sets to natural height, unlocks overflow
+	clear: function() {
+		this.setHeight('auto');
+		this.applyOverflow();
+	},
+
+
+	destroy: function() {
+		this.el.remove();
+	},
+
+
+	// Overflow
+	// -----------------------------------------------------------------------------------------------------------------
+
+
+	applyOverflow: function() {
+		this.scrollEl.css({
+			'overflow-x': this.overflowX,
+			'overflow-y': this.overflowY
+		});
+	},
+
+
+	// Causes any 'auto' overflow values to resolves to 'scroll' or 'hidden'.
+	// Useful for preserving scrollbar widths regardless of future resizes.
+	// Can pass in scrollbarWidths for optimization.
+	lockOverflow: function(scrollbarWidths) {
+		var overflowX = this.overflowX;
+		var overflowY = this.overflowY;
+
+		scrollbarWidths = scrollbarWidths || this.getScrollbarWidths();
+
+		if (overflowX === 'auto') {
+			overflowX = (
+					scrollbarWidths.top || scrollbarWidths.bottom || // horizontal scrollbars?
+					// OR scrolling pane with massless scrollbars?
+					this.scrollEl[0].scrollWidth - 1 > this.scrollEl[0].clientWidth
+						// subtract 1 because of IE off-by-one issue
+				) ? 'scroll' : 'hidden';
+		}
+
+		if (overflowY === 'auto') {
+			overflowY = (
+					scrollbarWidths.left || scrollbarWidths.right || // vertical scrollbars?
+					// OR scrolling pane with massless scrollbars?
+					this.scrollEl[0].scrollHeight - 1 > this.scrollEl[0].clientHeight
+						// subtract 1 because of IE off-by-one issue
+				) ? 'scroll' : 'hidden';
+		}
+
+		this.scrollEl.css({ 'overflow-x': overflowX, 'overflow-y': overflowY });
+	},
+
+
+	// Getters / Setters
+	// -----------------------------------------------------------------------------------------------------------------
+
+
+	setHeight: function(height) {
+		this.scrollEl.height(height);
+	},
+
+
+	getScrollTop: function() {
+		return this.scrollEl.scrollTop();
+	},
+
+
+	setScrollTop: function(top) {
+		this.scrollEl.scrollTop(top);
+	},
+
+
+	getClientWidth: function() {
+		return this.scrollEl[0].clientWidth;
+	},
+
+
+	getClientHeight: function() {
+		return this.scrollEl[0].clientHeight;
+	},
+
+
+	getScrollbarWidths: function() {
+		return getScrollbarWidths(this.scrollEl);
+	}
+
+});
+
+;;
+
 var Calendar = FC.Calendar = Class.extend({
 
 	dirDefaults: null, // option defaults related to LTR or RTL
@@ -8608,7 +9317,7 @@ var Calendar = FC.Calendar = Class.extend({
 });
 
 
-Calendar.mixin(Emitter);
+Calendar.mixin(EmitterMixin);
 
 
 function Calendar_constructor(element, overrides) {
@@ -8625,6 +9334,7 @@ function Calendar_constructor(element, overrides) {
 	t.render = render;
 	t.destroy = destroy;
 	t.refetchEvents = refetchEvents;
+	t.refetchEventSources = refetchEventSources;
 	t.reportEvents = reportEvents;
 	t.reportEventChange = reportEventChange;
 	t.rerenderEvents = renderEvents; // `renderEvents` serves as a rerender. an API method
@@ -8815,6 +9525,7 @@ function Calendar_constructor(element, overrides) {
 	EventManager.call(t, options);
 	var isFetchNeeded = t.isFetchNeeded;
 	var fetchEvents = t.fetchEvents;
+	var fetchEventSources = t.fetchEventSources;
 
 
 
@@ -9054,11 +9765,16 @@ function Calendar_constructor(element, overrides) {
 
 
 	function refetchEvents() { // can be called as an API method
-		destroyEvents(); // so that events are cleared before user starts waiting for AJAX
 		fetchAndRenderEvents();
 	}
 
 
+	// TODO: move this into EventManager?
+	function refetchEventSources(matchInputs) {
+		fetchEventSources(t.getEventSourcesByMatchArray(matchInputs));
+	}
+
+
 	function renderEvents() { // destroys old events if previously rendered
 		if (elementVisible()) {
 			freezeContentHeight();
@@ -9066,13 +9782,6 @@ function Calendar_constructor(element, overrides) {
 			unfreezeContentHeight();
 		}
 	}
-
-
-	function destroyEvents() {
-		freezeContentHeight();
-		currentView.clearEvents();
-		unfreezeContentHeight();
-	}
 	
 
 	function getAndRenderEvents() {
@@ -9283,7 +9992,7 @@ function Calendar_constructor(element, overrides) {
 
 Calendar.defaults = {
 
-	titleRangeSeparator: ' \u2014 ', // emphasized dash
+	titleRangeSeparator: ' \u2013 ', // en dash
 	monthYearFormat: 'MMMM YYYY', // required for en. other languages rely on datepicker computable option
 
 	defaultTimedEventDuration: '02:00:00',
@@ -9369,7 +10078,9 @@ Calendar.defaults = {
 	dayPopoverFormat: 'LL',
 	
 	handleWindowResize: true,
-	windowResizeDelay: 200 // milliseconds before an updateSize happens
+	windowResizeDelay: 200, // milliseconds before an updateSize happens
+
+	longPressDelay: 1000
 	
 };
 
@@ -9830,14 +10541,14 @@ function Header(calendar, options) {
 	
 	function disableButton(buttonName) {
 		el.find('.fc-' + buttonName + '-button')
-			.attr('disabled', 'disabled')
+			.prop('disabled', true)
 			.addClass(tm + '-state-disabled');
 	}
 	
 	
 	function enableButton(buttonName) {
 		el.find('.fc-' + buttonName + '-button')
-			.removeAttr('disabled')
+			.prop('disabled', false)
 			.removeClass(tm + '-state-disabled');
 	}
 
@@ -9868,8 +10579,14 @@ function EventManager(options) { // assumed to be a calendar
 	// exports
 	t.isFetchNeeded = isFetchNeeded;
 	t.fetchEvents = fetchEvents;
+	t.fetchEventSources = fetchEventSources;
+	t.getEventSources = getEventSources;
+	t.getEventSourceById = getEventSourceById;
+	t.getEventSourcesByMatchArray = getEventSourcesByMatchArray;
+	t.getEventSourcesByMatch = getEventSourcesByMatch;
 	t.addEventSource = addEventSource;
 	t.removeEventSource = removeEventSource;
+	t.removeEventSources = removeEventSources;
 	t.updateEvent = updateEvent;
 	t.renderEvent = renderEvent;
 	t.removeEvents = removeEvents;
@@ -9887,8 +10604,7 @@ function EventManager(options) { // assumed to be a calendar
 	var stickySource = { events: [] };
 	var sources = [ stickySource ];
 	var rangeStart, rangeEnd;
-	var currentFetchID = 0;
-	var pendingSourceCnt = 0;
+	var pendingSourceCnt = 0; // outstanding fetch requests, max one per source
 	var cache = []; // holds events that have already been expanded
 
 
@@ -9918,23 +10634,58 @@ function EventManager(options) { // assumed to be a calendar
 	function fetchEvents(start, end) {
 		rangeStart = start;
 		rangeEnd = end;
-		cache = [];
-		var fetchID = ++currentFetchID;
-		var len = sources.length;
-		pendingSourceCnt = len;
-		for (var i=0; i<len; i++) {
-			fetchEventSource(sources[i], fetchID);
+		fetchEventSources(sources, 'reset');
+	}
+
+
+	// expects an array of event source objects (the originals, not copies)
+	// `specialFetchType` is an optimization parameter that affects purging of the event cache.
+	function fetchEventSources(specificSources, specialFetchType) {
+		var i, source;
+
+		if (specialFetchType === 'reset') {
+			cache = [];
+		}
+		else if (specialFetchType !== 'add') {
+			cache = excludeEventsBySources(cache, specificSources);
+		}
+
+		for (i = 0; i < specificSources.length; i++) {
+			source = specificSources[i];
+
+			// already-pending sources have already been accounted for in pendingSourceCnt
+			if (source._status !== 'pending') {
+				pendingSourceCnt++;
+			}
+
+			source._fetchId = (source._fetchId || 0) + 1;
+			source._status = 'pending';
+		}
+
+		for (i = 0; i < specificSources.length; i++) {
+			source = specificSources[i];
+
+			tryFetchEventSource(source, source._fetchId);
 		}
 	}
-	
-	
-	function fetchEventSource(source, fetchID) {
+
+
+	// fetches an event source and processes its result ONLY if it is still the current fetch.
+	// caller is responsible for incrementing pendingSourceCnt first.
+	function tryFetchEventSource(source, fetchId) {
 		_fetchEventSource(source, function(eventInputs) {
 			var isArraySource = $.isArray(source.events);
 			var i, eventInput;
 			var abstractEvent;
 
-			if (fetchID == currentFetchID) {
+			if (
+				// is this the source's most recent fetch?
+				// if not, rely on an upcoming fetch of this source to decrement pendingSourceCnt
+				fetchId === source._fetchId &&
+				// event source no longer valid?
+				source._status !== 'rejected'
+			) {
+				source._status = 'resolved';
 
 				if (eventInputs) {
 					for (i = 0; i < eventInputs.length; i++) {
@@ -9956,13 +10707,29 @@ function EventManager(options) { // assumed to be a calendar
 					}
 				}
 
-				pendingSourceCnt--;
-				if (!pendingSourceCnt) {
-					reportEvents(cache);
-				}
+				decrementPendingSourceCnt();
 			}
 		});
 	}
+
+
+	function rejectEventSource(source) {
+		var wasPending = source._status === 'pending';
+
+		source._status = 'rejected';
+
+		if (wasPending) {
+			decrementPendingSourceCnt();
+		}
+	}
+
+
+	function decrementPendingSourceCnt() {
+		pendingSourceCnt--;
+		if (!pendingSourceCnt) {
+			reportEvents(cache);
+		}
+	}
 	
 	
 	function _fetchEventSource(source, callback) {
@@ -10078,14 +10845,13 @@ function EventManager(options) { // assumed to be a calendar
 	
 	/* Sources
 	-----------------------------------------------------------------------------*/
-	
+
 
 	function addEventSource(sourceInput) {
 		var source = buildEventSource(sourceInput);
 		if (source) {
 			sources.push(source);
-			pendingSourceCnt++;
-			fetchEventSource(source, currentFetchID); // will eventually call reportEvents
+			fetchEventSources([ source ], 'add'); // will eventually call reportEvents
 		}
 	}
 
@@ -10135,19 +10901,120 @@ function EventManager(options) { // assumed to be a calendar
 	}
 
 
-	function removeEventSource(source) {
-		sources = $.grep(sources, function(src) {
-			return !isSourcesEqual(src, source);
-		});
-		// remove all client events from that source
-		cache = $.grep(cache, function(e) {
-			return !isSourcesEqual(e.source, source);
-		});
+	function removeEventSource(matchInput) {
+		removeSpecificEventSources(
+			getEventSourcesByMatch(matchInput)
+		);
+	}
+
+
+	// if called with no arguments, removes all.
+	function removeEventSources(matchInputs) {
+		if (matchInputs == null) {
+			removeSpecificEventSources(sources, true); // isAll=true
+		}
+		else {
+			removeSpecificEventSources(
+				getEventSourcesByMatchArray(matchInputs)
+			);
+		}
+	}
+
+
+	function removeSpecificEventSources(targetSources, isAll) {
+		var i;
+
+		// cancel pending requests
+		for (i = 0; i < targetSources.length; i++) {
+			rejectEventSource(targetSources[i]);
+		}
+
+		if (isAll) { // an optimization
+			sources = [];
+			cache = [];
+		}
+		else {
+			// remove from persisted source list
+			sources = $.grep(sources, function(source) {
+				for (i = 0; i < targetSources.length; i++) {
+					if (source === targetSources[i]) {
+						return false; // exclude
+					}
+				}
+				return true; // include
+			});
+
+			cache = excludeEventsBySources(cache, targetSources);
+		}
+
 		reportEvents(cache);
 	}
 
 
-	function isSourcesEqual(source1, source2) {
+	function getEventSources() {
+		return sources.slice(1); // returns a shallow copy of sources with stickySource removed
+	}
+
+
+	function getEventSourceById(id) {
+		return $.grep(sources, function(source) {
+			return source.id && source.id === id;
+		})[0];
+	}
+
+
+	// like getEventSourcesByMatch, but accepts multple match criteria (like multiple IDs)
+	function getEventSourcesByMatchArray(matchInputs) {
+
+		// coerce into an array
+		if (!matchInputs) {
+			matchInputs = [];
+		}
+		else if (!$.isArray(matchInputs)) {
+			matchInputs = [ matchInputs ];
+		}
+
+		var matchingSources = [];
+		var i;
+
+		// resolve raw inputs to real event source objects
+		for (i = 0; i < matchInputs.length; i++) {
+			matchingSources.push.apply( // append
+				matchingSources,
+				getEventSourcesByMatch(matchInputs[i])
+			);
+		}
+
+		return matchingSources;
+	}
+
+
+	// matchInput can either by a real event source object, an ID, or the function/URL for the source.
+	// returns an array of matching source objects.
+	function getEventSourcesByMatch(matchInput) {
+		var i, source;
+
+		// given an proper event source object
+		for (i = 0; i < sources.length; i++) {
+			source = sources[i];
+			if (source === matchInput) {
+				return [ source ];
+			}
+		}
+
+		// an ID match
+		source = getEventSourceById(matchInput);
+		if (source) {
+			return [ source ];
+		}
+
+		return $.grep(sources, function(source) {
+			return isSourcesEquivalent(matchInput, source);
+		});
+	}
+
+
+	function isSourcesEquivalent(source1, source2) {
 		return source1 && source2 && getSourcePrimitive(source1) == getSourcePrimitive(source2);
 	}
 
@@ -10160,6 +11027,20 @@ function EventManager(options) { // assumed to be a calendar
 		) ||
 		source; // the given argument *is* the primitive
 	}
+
+
+	// util
+	// returns a filtered array without events that are part of any of the given sources
+	function excludeEventsBySources(specificEvents, specificSources) {
+		return $.grep(specificEvents, function(event) {
+			for (var i = 0; i < specificSources.length; i++) {
+				if (event.source === specificSources[i]) {
+					return false; // exclude
+				}
+			}
+			return true; // keep
+		});
+	}
 	
 	
 	
@@ -10368,6 +11249,8 @@ function EventManager(options) { // assumed to be a calendar
 			assignDatesToEvent(start, end, allDay, out);
 		}
 
+		t.normalizeEvent(out); // hook for external use. a prototype method
+
 		return out;
 	}
 
@@ -10900,6 +11783,12 @@ function EventManager(options) { // assumed to be a calendar
 }
 
 
+// hook for external libs to manipulate event properties upon creation.
+// should manipulate the event in-place.
+Calendar.prototype.normalizeEvent = function(event) {
+};
+
+
 // Returns a list of events that the given event should be compared against when being considered for a move to
 // the specified span. Attached to the Calendar's prototype because EventManager is a mixin for a Calendar.
 Calendar.prototype.getPeerEvents = function(span, event) {
@@ -10937,6 +11826,8 @@ function backupEventDates(event) {
 
 var BasicView = FC.BasicView = View.extend({
 
+	scroller: null,
+
 	dayGridClass: DayGrid, // class the dayGrid will be instantiated from (overridable by subclasses)
 	dayGrid: null, // the main subcomponent that does most of the heavy lifting
 
@@ -10951,6 +11842,11 @@ var BasicView = FC.BasicView = View.extend({
 
 	initialize: function() {
 		this.dayGrid = this.instantiateDayGrid();
+
+		this.scroller = new Scroller({
+			overflowX: 'hidden',
+			overflowY: 'auto'
+		});
 	},
 
 
@@ -11003,9 +11899,12 @@ var BasicView = FC.BasicView = View.extend({
 		this.el.addClass('fc-basic-view').html(this.renderSkeletonHtml());
 		this.renderHead();
 
-		this.scrollerEl = this.el.find('.fc-day-grid-container');
+		this.scroller.render();
+		var dayGridContainerEl = this.scroller.el.addClass('fc-day-grid-container');
+		var dayGridEl = $('<div class="fc-day-grid" />').appendTo(dayGridContainerEl);
+		this.el.find('.fc-body > tr > td').append(dayGridContainerEl);
 
-		this.dayGrid.setElement(this.el.find('.fc-day-grid'));
+		this.dayGrid.setElement(dayGridEl);
 		this.dayGrid.renderDates(this.hasRigidRows());
 	},
 
@@ -11024,6 +11923,7 @@ var BasicView = FC.BasicView = View.extend({
 	unrenderDates: function() {
 		this.dayGrid.unrenderDates();
 		this.dayGrid.removeElement();
+		this.scroller.destroy();
 	},
 
 
@@ -11044,11 +11944,7 @@ var BasicView = FC.BasicView = View.extend({
 				'</thead>' +
 				'<tbody class="fc-body">' +
 					'<tr>' +
-						'<td class="' + this.widgetContentClass + '">' +
-							'<div class="fc-day-grid-container">' +
-								'<div class="fc-day-grid"/>' +
-							'</div>' +
-						'</td>' +
+						'<td class="' + this.widgetContentClass + '"></td>' +
 					'</tr>' +
 				'</tbody>' +
 			'</table>';
@@ -11091,9 +11987,10 @@ var BasicView = FC.BasicView = View.extend({
 	setHeight: function(totalHeight, isAuto) {
 		var eventLimit = this.opt('eventLimit');
 		var scrollerHeight;
+		var scrollbarWidths;
 
 		// reset all heights to be natural
-		unsetScroller(this.scrollerEl);
+		this.scroller.clear();
 		uncompensateScroll(this.headRowEl);
 
 		this.dayGrid.removeSegPopover(); // kill the "more" popover if displayed
@@ -11103,6 +12000,8 @@ var BasicView = FC.BasicView = View.extend({
 			this.dayGrid.limitRows(eventLimit); // limit the levels first so the height can redistribute after
 		}
 
+		// distribute the height to the rows
+		// (totalHeight is a "recommended" value if isAuto)
 		scrollerHeight = this.computeScrollerHeight(totalHeight);
 		this.setGridHeight(scrollerHeight, isAuto);
 
@@ -11111,17 +12010,33 @@ var BasicView = FC.BasicView = View.extend({
 			this.dayGrid.limitRows(eventLimit); // limit the levels after the grid's row heights have been set
 		}
 
-		if (!isAuto && setPotentialScroller(this.scrollerEl, scrollerHeight)) { // using scrollbars?
+		if (!isAuto) { // should we force dimensions of the scroll container?
 
-			compensateScroll(this.headRowEl, getScrollbarWidths(this.scrollerEl));
+			this.scroller.setHeight(scrollerHeight);
+			scrollbarWidths = this.scroller.getScrollbarWidths();
 
-			// doing the scrollbar compensation might have created text overflow which created more height. redo
-			scrollerHeight = this.computeScrollerHeight(totalHeight);
-			this.scrollerEl.height(scrollerHeight);
+			if (scrollbarWidths.left || scrollbarWidths.right) { // using scrollbars?
+
+				compensateScroll(this.headRowEl, scrollbarWidths);
+
+				// doing the scrollbar compensation might have created text overflow which created more height. redo
+				scrollerHeight = this.computeScrollerHeight(totalHeight);
+				this.scroller.setHeight(scrollerHeight);
+			}
+
+			// guarantees the same scrollbar widths
+			this.scroller.lockOverflow(scrollbarWidths);
 		}
 	},
 
 
+	// given a desired total height of the view, returns what the height of the scroller should be
+	computeScrollerHeight: function(totalHeight) {
+		return totalHeight -
+			subtractInnerElHeight(this.el, this.scroller.el); // everything that's NOT the scroller
+	},
+
+
 	// Sets the height of just the DayGrid component in this view
 	setGridHeight: function(height, isAuto) {
 		if (isAuto) {
@@ -11133,6 +12048,20 @@ var BasicView = FC.BasicView = View.extend({
 	},
 
 
+	/* Scroll
+	------------------------------------------------------------------------------------------------------------------*/
+
+
+	queryScroll: function() {
+		return this.scroller.getScrollTop();
+	},
+
+
+	setScroll: function(top) {
+		this.scroller.setScrollTop(top);
+	},
+
+
 	/* Hit Areas
 	------------------------------------------------------------------------------------------------------------------*/
 	// forward all hit-related method calls to dayGrid
@@ -11368,6 +12297,8 @@ fcViews.month = {
 
 var AgendaView = FC.AgendaView = View.extend({
 
+	scroller: null,
+
 	timeGridClass: TimeGrid, // class used to instantiate the timeGrid. subclasses can override
 	timeGrid: null, // the main time-grid subcomponent of this view
 
@@ -11377,11 +12308,10 @@ var AgendaView = FC.AgendaView = View.extend({
 	axisWidth: null, // the width of the time axis running down the side
 
 	headContainerEl: null, // div that hold's the timeGrid's rendered date header
-	noScrollRowEls: null, // set of fake row elements that must compensate when scrollerEl has scrollbars
+	noScrollRowEls: null, // set of fake row elements that must compensate when scroller has scrollbars
 
 	// when the time-grid isn't tall enough to occupy the given height, we render an <hr> underneath
 	bottomRuleEl: null,
-	bottomRuleHeight: null,
 
 
 	initialize: function() {
@@ -11390,6 +12320,11 @@ var AgendaView = FC.AgendaView = View.extend({
 		if (this.opt('allDaySlot')) { // should we display the "all-day" area?
 			this.dayGrid = this.instantiateDayGrid(); // the all-day subcomponent of this view
 		}
+
+		this.scroller = new Scroller({
+			overflowX: 'hidden',
+			overflowY: 'auto'
+		});
 	},
 
 
@@ -11430,10 +12365,12 @@ var AgendaView = FC.AgendaView = View.extend({
 		this.el.addClass('fc-agenda-view').html(this.renderSkeletonHtml());
 		this.renderHead();
 
-		// the element that wraps the time-grid that will probably scroll
-		this.scrollerEl = this.el.find('.fc-time-grid-container');
+		this.scroller.render();
+		var timeGridWrapEl = this.scroller.el.addClass('fc-time-grid-container');
+		var timeGridEl = $('<div class="fc-time-grid" />').appendTo(timeGridWrapEl);
+		this.el.find('.fc-body > tr > td').append(timeGridWrapEl);
 
-		this.timeGrid.setElement(this.el.find('.fc-time-grid'));
+		this.timeGrid.setElement(timeGridEl);
 		this.timeGrid.renderDates();
 
 		// the <hr> that sometimes displays under the time-grid
@@ -11470,6 +12407,8 @@ var AgendaView = FC.AgendaView = View.extend({
 			this.dayGrid.unrenderDates();
 			this.dayGrid.removeElement();
 		}
+
+		this.scroller.destroy();
 	},
 
 
@@ -11491,9 +12430,6 @@ var AgendaView = FC.AgendaView = View.extend({
 								'<hr class="fc-divider ' + this.widgetHeaderClass + '"/>' :
 								''
 								) +
-							'<div class="fc-time-grid-container">' +
-								'<div class="fc-time-grid"/>' +
-							'</div>' +
 						'</td>' +
 					'</tr>' +
 				'</tbody>' +
@@ -11573,16 +12509,11 @@ var AgendaView = FC.AgendaView = View.extend({
 	setHeight: function(totalHeight, isAuto) {
 		var eventLimit;
 		var scrollerHeight;
-
-		if (this.bottomRuleHeight === null) {
-			// calculate the height of the rule the very first time
-			this.bottomRuleHeight = this.bottomRuleEl.outerHeight();
-		}
-		this.bottomRuleEl.hide(); // .show() will be called later if this <hr> is necessary
+		var scrollbarWidths;
 
 		// reset all dimensions back to the original state
-		this.scrollerEl.css('overflow', '');
-		unsetScroller(this.scrollerEl);
+		this.bottomRuleEl.hide(); // .show() will be called later if this <hr> is necessary
+		this.scroller.clear(); // sets height to 'auto' and clears overflow
 		uncompensateScroll(this.noScrollRowEls);
 
 		// limit number of events in the all-day area
@@ -11598,28 +12529,46 @@ var AgendaView = FC.AgendaView = View.extend({
 			}
 		}
 
-		if (!isAuto) { // should we force dimensions of the scroll container, or let the contents be natural height?
+		if (!isAuto) { // should we force dimensions of the scroll container?
 
 			scrollerHeight = this.computeScrollerHeight(totalHeight);
-			if (setPotentialScroller(this.scrollerEl, scrollerHeight)) { // using scrollbars?
+			this.scroller.setHeight(scrollerHeight);
+			scrollbarWidths = this.scroller.getScrollbarWidths();
+
+			if (scrollbarWidths.left || scrollbarWidths.right) { // using scrollbars?
 
 				// make the all-day and header rows lines up
-				compensateScroll(this.noScrollRowEls, getScrollbarWidths(this.scrollerEl));
+				compensateScroll(this.noScrollRowEls, scrollbarWidths);
 
 				// the scrollbar compensation might have changed text flow, which might affect height, so recalculate
 				// and reapply the desired height to the scroller.
 				scrollerHeight = this.computeScrollerHeight(totalHeight);
-				this.scrollerEl.height(scrollerHeight);
+				this.scroller.setHeight(scrollerHeight);
 			}
-			else { // no scrollbars
-				// still, force a height and display the bottom rule (marks the end of day)
-				this.scrollerEl.height(scrollerHeight).css('overflow', 'hidden'); // in case <hr> goes outside
+
+			// guarantees the same scrollbar widths
+			this.scroller.lockOverflow(scrollbarWidths);
+
+			// if there's any space below the slats, show the horizontal rule.
+			// this won't cause any new overflow, because lockOverflow already called.
+			if (this.timeGrid.getTotalSlatHeight() < scrollerHeight) {
 				this.bottomRuleEl.show();
 			}
 		}
 	},
 
 
+	// given a desired total height of the view, returns what the height of the scroller should be
+	computeScrollerHeight: function(totalHeight) {
+		return totalHeight -
+			subtractInnerElHeight(this.el, this.scroller.el); // everything that's NOT the scroller
+	},
+
+
+	/* Scroll
+	------------------------------------------------------------------------------------------------------------------*/
+
+
 	// Computes the initial pre-configured scroll state prior to allowing the user to change it
 	computeInitialScroll: function() {
 		var scrollTime = moment.duration(this.opt('scrollTime'));
@@ -11636,6 +12585,16 @@ var AgendaView = FC.AgendaView = View.extend({
 	},
 
 
+	queryScroll: function() {
+		return this.scroller.getScrollTop();
+	},
+
+
+	setScroll: function(top) {
+		this.scroller.setScrollTop(top);
+	},
+
+
 	/* Hit Areas
 	------------------------------------------------------------------------------------------------------------------*/
 	// forward all hit-related method calls to the grids (dayGrid might not be defined)
diff --git a/library/fullcalendar/fullcalendar.min.css b/library/fullcalendar/fullcalendar.min.css
index 2dc7e9f8a..9f395b445 100644
--- a/library/fullcalendar/fullcalendar.min.css
+++ b/library/fullcalendar/fullcalendar.min.css
@@ -1,5 +1,5 @@
 /*!
- * FullCalendar v2.6.1 Stylesheet
+ * FullCalendar v2.8.0 Stylesheet
  * Docs & License: http://fullcalendar.io/
- * (c) 2015 Adam Shaw
- */.fc{direction:ltr;text-align:left}.fc-rtl{text-align:right}body .fc{font-size:1em}.fc-unthemed .fc-divider,.fc-unthemed .fc-popover,.fc-unthemed .fc-row,.fc-unthemed tbody,.fc-unthemed td,.fc-unthemed th,.fc-unthemed thead{border-color:#ddd}.fc-unthemed .fc-popover{background-color:#fff}.fc-unthemed .fc-divider,.fc-unthemed .fc-popover .fc-header{background:#eee}.fc-unthemed .fc-popover .fc-header .fc-close{color:#666}.fc-unthemed .fc-today{background:#fcf8e3}.fc-highlight{background:#bce8f1;opacity:.3;filter:alpha(opacity=30)}.fc-bgevent{background:#8fdf82;opacity:.3;filter:alpha(opacity=30)}.fc-nonbusiness{background:#d7d7d7}.fc-icon{display:inline-block;width:1em;height:1em;line-height:1em;font-size:1em;text-align:center;overflow:hidden;font-family:"Courier New",Courier,monospace;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fc-icon:after{position:relative;margin:0 -1em}.fc-icon-left-single-arrow:after{content:"\02039";font-weight:700;font-size:200%;top:-7%;left:3%}.fc-icon-right-single-arrow:after{content:"\0203A";font-weight:700;font-size:200%;top:-7%;left:-3%}.fc-icon-left-double-arrow:after{content:"\000AB";font-size:160%;top:-7%}.fc-icon-right-double-arrow:after{content:"\000BB";font-size:160%;top:-7%}.fc-icon-left-triangle:after{content:"\25C4";font-size:125%;top:3%;left:-2%}.fc-icon-right-triangle:after{content:"\25BA";font-size:125%;top:3%;left:2%}.fc-icon-down-triangle:after{content:"\25BC";font-size:125%;top:2%}.fc-icon-x:after{content:"\000D7";font-size:200%;top:6%}.fc button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin:0;height:2.1em;padding:0 .6em;font-size:1em;white-space:nowrap;cursor:pointer}.fc button::-moz-focus-inner{margin:0;padding:0}.fc-state-default{border:1px solid}.fc-state-default.fc-corner-left{border-top-left-radius:4px;border-bottom-left-radius:4px}.fc-state-default.fc-corner-right{border-top-right-radius:4px;border-bottom-right-radius:4px}.fc button .fc-icon{position:relative;top:-.05em;margin:0 .2em;vertical-align:middle}.fc-state-default{background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);color:#333;text-shadow:0 1px 1px rgba(255,255,255,.75);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)}.fc-state-active,.fc-state-disabled,.fc-state-down,.fc-state-hover{color:#333;background-color:#e6e6e6}.fc-state-hover{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.fc-state-active,.fc-state-down{background-color:#ccc;background-image:none;box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.fc-state-disabled{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);box-shadow:none}.fc-button-group{display:inline-block}.fc .fc-button-group>*{float:left;margin:0 0 0 -1px}.fc .fc-button-group>:first-child{margin-left:0}.fc-popover{position:absolute;box-shadow:0 2px 6px rgba(0,0,0,.15)}.fc-popover .fc-header{padding:2px 4px}.fc-popover .fc-header .fc-title{margin:0 2px}.fc-popover .fc-header .fc-close{cursor:pointer}.fc-ltr .fc-popover .fc-header .fc-title,.fc-rtl .fc-popover .fc-header .fc-close{float:left}.fc-ltr .fc-popover .fc-header .fc-close,.fc-rtl .fc-popover .fc-header .fc-title{float:right}.fc-unthemed .fc-popover{border-width:1px;border-style:solid}.fc-unthemed .fc-popover .fc-header .fc-close{font-size:.9em;margin-top:2px}.fc-popover>.ui-widget-header+.ui-widget-content{border-top:0}.fc-divider{border-style:solid;border-width:1px}hr.fc-divider{height:0;margin:0;padding:0 0 2px;border-width:1px 0}.fc-clear{clear:both}.fc-bg,.fc-bgevent-skeleton,.fc-helper-skeleton,.fc-highlight-skeleton{position:absolute;top:0;left:0;right:0}.fc-bg{bottom:0}.fc-bg table{height:100%}.fc table{width:100%;table-layout:fixed;border-collapse:collapse;border-spacing:0;font-size:1em}.fc th{text-align:center}.fc td,.fc th{border-style:solid;border-width:1px;padding:0;vertical-align:top}.fc td.fc-today{border-style:double}.fc .fc-row{border-style:solid;border-width:0}.fc-row table{border-left:0 hidden transparent;border-right:0 hidden transparent;border-bottom:0 hidden transparent}.fc-row:first-child table{border-top:0 hidden transparent}.fc-row{position:relative}.fc-row .fc-bg{z-index:1}.fc-row .fc-bgevent-skeleton,.fc-row .fc-highlight-skeleton{bottom:0}.fc-row .fc-bgevent-skeleton table,.fc-row .fc-highlight-skeleton table{height:100%}.fc-row .fc-bgevent-skeleton td,.fc-row .fc-highlight-skeleton td{border-color:transparent}.fc-row .fc-bgevent-skeleton{z-index:2}.fc-row .fc-highlight-skeleton{z-index:3}.fc-row .fc-content-skeleton{position:relative;z-index:4;padding-bottom:2px}.fc-row .fc-helper-skeleton{z-index:5}.fc-row .fc-content-skeleton td,.fc-row .fc-helper-skeleton td{background:0 0;border-color:transparent;border-bottom:0}.fc-row .fc-content-skeleton tbody td,.fc-row .fc-helper-skeleton tbody td{border-top:0}.fc-scroller{overflow-y:scroll;overflow-x:hidden}.fc-scroller>*{position:relative;width:100%;overflow:hidden}.fc-event{position:relative;display:block;font-size:.85em;line-height:1.3;border-radius:3px;border:1px solid #3a87ad;background-color:#3a87ad;font-weight:400}.fc-event,.fc-event:hover,.ui-widget .fc-event{color:#fff;text-decoration:none}.fc-event.fc-draggable,.fc-event[href]{cursor:pointer}.fc-not-allowed,.fc-not-allowed .fc-event{cursor:not-allowed}.fc-event .fc-bg{z-index:1;background:#fff;opacity:.25;filter:alpha(opacity=25)}.fc-event .fc-content{position:relative;z-index:2}.fc-event .fc-resizer{position:absolute;z-index:3}.fc-ltr .fc-h-event.fc-not-start,.fc-rtl .fc-h-event.fc-not-end{margin-left:0;border-left-width:0;padding-left:1px;border-top-left-radius:0;border-bottom-left-radius:0}.fc-ltr .fc-h-event.fc-not-end,.fc-rtl .fc-h-event.fc-not-start{margin-right:0;border-right-width:0;padding-right:1px;border-top-right-radius:0;border-bottom-right-radius:0}.fc-h-event .fc-resizer{top:-1px;bottom:-1px;left:-1px;right:-1px;width:5px}.fc-ltr .fc-h-event .fc-start-resizer,.fc-ltr .fc-h-event .fc-start-resizer:after,.fc-ltr .fc-h-event .fc-start-resizer:before,.fc-rtl .fc-h-event .fc-end-resizer,.fc-rtl .fc-h-event .fc-end-resizer:after,.fc-rtl .fc-h-event .fc-end-resizer:before{right:auto;cursor:w-resize}.fc-ltr .fc-h-event .fc-end-resizer,.fc-ltr .fc-h-event .fc-end-resizer:after,.fc-ltr .fc-h-event .fc-end-resizer:before,.fc-rtl .fc-h-event .fc-start-resizer,.fc-rtl .fc-h-event .fc-start-resizer:after,.fc-rtl .fc-h-event .fc-start-resizer:before{left:auto;cursor:e-resize}.fc-day-grid-event{margin:1px 2px 0;padding:0 1px}.fc-day-grid-event .fc-content{white-space:nowrap;overflow:hidden}.fc-day-grid-event .fc-time{font-weight:700}.fc-day-grid-event .fc-resizer{left:-3px;right:-3px;width:7px}a.fc-more{margin:1px 3px;font-size:.85em;cursor:pointer;text-decoration:none}a.fc-more:hover{text-decoration:underline}.fc-limited{display:none}.fc-day-grid .fc-row{z-index:1}.fc-more-popover{z-index:2;width:220px}.fc-more-popover .fc-event-container{padding:10px}.fc-now-indicator{position:absolute;border:0 solid red}.fc-toolbar{text-align:center;margin-bottom:1em}.fc-toolbar .fc-left{float:left}.fc-toolbar .fc-right{float:right}.fc-toolbar .fc-center{display:inline-block}.fc .fc-toolbar>*>*{float:left;margin-left:.75em}.fc .fc-toolbar>*>:first-child{margin-left:0}.fc-toolbar h2{margin:0}.fc-toolbar button{position:relative}.fc-toolbar .fc-state-hover,.fc-toolbar .ui-state-hover{z-index:2}.fc-toolbar .fc-state-down{z-index:3}.fc-toolbar .fc-state-active,.fc-toolbar .ui-state-active{z-index:4}.fc-toolbar button:focus{z-index:5}.fc-view-container *,.fc-view-container :after,.fc-view-container :before{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fc-view,.fc-view>table{position:relative;z-index:1}.fc-basicDay-view .fc-content-skeleton,.fc-basicWeek-view .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc-basic-view .fc-body .fc-row{min-height:4em}.fc-row.fc-rigid{overflow:hidden}.fc-row.fc-rigid .fc-content-skeleton{position:absolute;top:0;left:0;right:0}.fc-basic-view .fc-day-number,.fc-basic-view .fc-week-number{padding:0 2px}.fc-basic-view td.fc-day-number,.fc-basic-view td.fc-week-number span{padding-top:2px;padding-bottom:2px}.fc-basic-view .fc-week-number{text-align:center}.fc-basic-view .fc-week-number span{display:inline-block;min-width:1.25em}.fc-ltr .fc-basic-view .fc-day-number{text-align:right}.fc-rtl .fc-basic-view .fc-day-number{text-align:left}.fc-day-number.fc-other-month{opacity:.3;filter:alpha(opacity=30)}.fc-agenda-view .fc-day-grid{position:relative;z-index:2}.fc-agenda-view .fc-day-grid .fc-row{min-height:3em}.fc-agenda-view .fc-day-grid .fc-row .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc .fc-axis{vertical-align:middle;padding:0 4px;white-space:nowrap}.fc-ltr .fc-axis{text-align:right}.fc-rtl .fc-axis{text-align:left}.ui-widget td.fc-axis{font-weight:400}.fc-time-grid,.fc-time-grid-container{position:relative;z-index:1}.fc-time-grid{min-height:100%}.fc-time-grid table{border:0 hidden transparent}.fc-time-grid>.fc-bg{z-index:1}.fc-time-grid .fc-slats,.fc-time-grid>hr{position:relative;z-index:2}.fc-time-grid .fc-content-col{position:relative}.fc-time-grid .fc-content-skeleton{position:absolute;z-index:3;top:0;left:0;right:0}.fc-time-grid .fc-business-container{position:relative;z-index:1}.fc-time-grid .fc-bgevent-container{position:relative;z-index:2}.fc-time-grid .fc-highlight-container{z-index:3}.fc-time-grid .fc-event-container{position:relative;z-index:4}.fc-time-grid .fc-now-indicator-line{z-index:5}.fc-time-grid .fc-helper-container{position:relative;z-index:6}.fc-time-grid .fc-slats td{height:1.5em;border-bottom:0}.fc-time-grid .fc-slats .fc-minor td{border-top-style:dotted}.fc-time-grid .fc-slats .ui-widget-content{background:0 0}.fc-time-grid .fc-highlight-container{position:relative}.fc-time-grid .fc-highlight{position:absolute;left:0;right:0}.fc-ltr .fc-time-grid .fc-event-container{margin:0 2.5% 0 2px}.fc-rtl .fc-time-grid .fc-event-container{margin:0 2px 0 2.5%}.fc-time-grid .fc-bgevent,.fc-time-grid .fc-event{position:absolute;z-index:1}.fc-time-grid .fc-bgevent{left:0;right:0}.fc-v-event.fc-not-start{border-top-width:0;padding-top:1px;border-top-left-radius:0;border-top-right-radius:0}.fc-v-event.fc-not-end{border-bottom-width:0;padding-bottom:1px;border-bottom-left-radius:0;border-bottom-right-radius:0}.fc-time-grid-event{overflow:hidden}.fc-time-grid-event .fc-time,.fc-time-grid-event .fc-title{padding:0 1px}.fc-time-grid-event .fc-time{font-size:.85em;white-space:nowrap}.fc-time-grid-event.fc-short .fc-content{white-space:nowrap}.fc-time-grid-event.fc-short .fc-time,.fc-time-grid-event.fc-short .fc-title{display:inline-block;vertical-align:top}.fc-time-grid-event.fc-short .fc-time span{display:none}.fc-time-grid-event.fc-short .fc-time:before{content:attr(data-start)}.fc-time-grid-event.fc-short .fc-time:after{content:"\000A0-\000A0"}.fc-time-grid-event.fc-short .fc-title{font-size:.85em;padding:0}.fc-time-grid-event .fc-resizer{left:0;right:0;bottom:0;height:8px;overflow:hidden;line-height:8px;font-size:11px;font-family:monospace;text-align:center;cursor:s-resize}.fc-time-grid-event .fc-resizer:after{content:"="}.fc-time-grid .fc-now-indicator-line{border-top-width:1px;left:0;right:0}.fc-time-grid .fc-now-indicator-arrow{margin-top:-5px}.fc-ltr .fc-time-grid .fc-now-indicator-arrow{left:0;border-width:5px 0 5px 6px;border-top-color:transparent;border-bottom-color:transparent}.fc-rtl .fc-time-grid .fc-now-indicator-arrow{right:0;border-width:5px 6px 5px 0;border-top-color:transparent;border-bottom-color:transparent}
\ No newline at end of file
+ * (c) 2016 Adam Shaw
+ */.fc-bgevent,.fc-highlight{opacity:.3;filter:alpha(opacity=30)}.fc-icon,body .fc{font-size:1em}.fc-button-group,.fc-icon{display:inline-block}.fc-bg,.fc-row .fc-bgevent-skeleton,.fc-row .fc-highlight-skeleton{bottom:0}.fc-icon,.fc-unselectable{-khtml-user-select:none;-webkit-touch-callout:none}.fc .fc-axis,.fc button,.fc-time-grid-event .fc-time,.fc-time-grid-event.fc-short .fc-content{white-space:nowrap}.fc{direction:ltr;text-align:left}.fc-rtl{text-align:right}.fc th,.fc-basic-view .fc-week-number,.fc-icon,.fc-toolbar{text-align:center}.fc-unthemed .fc-content,.fc-unthemed .fc-divider,.fc-unthemed .fc-popover,.fc-unthemed .fc-row,.fc-unthemed tbody,.fc-unthemed td,.fc-unthemed th,.fc-unthemed thead{border-color:#ddd}.fc-unthemed .fc-popover{background-color:#fff}.fc-unthemed .fc-divider,.fc-unthemed .fc-popover .fc-header{background:#eee}.fc-unthemed .fc-popover .fc-header .fc-close{color:#666}.fc-unthemed .fc-today{background:#fcf8e3}.fc-highlight{background:#bce8f1}.fc-bgevent{background:#8fdf82}.fc-nonbusiness{background:#d7d7d7}.fc-icon{height:1em;line-height:1em;overflow:hidden;font-family:"Courier New",Courier,monospace;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fc-icon:after{position:relative}.fc-icon-left-single-arrow:after{content:"\02039";font-weight:700;font-size:200%;top:-7%}.fc-icon-right-single-arrow:after{content:"\0203A";font-weight:700;font-size:200%;top:-7%}.fc-icon-left-double-arrow:after{content:"\000AB";font-size:160%;top:-7%}.fc-icon-right-double-arrow:after{content:"\000BB";font-size:160%;top:-7%}.fc-icon-left-triangle:after{content:"\25C4";font-size:125%;top:3%}.fc-icon-right-triangle:after{content:"\25BA";font-size:125%;top:3%}.fc-icon-down-triangle:after{content:"\25BC";font-size:125%;top:2%}.fc-icon-x:after{content:"\000D7";font-size:200%;top:6%}.fc button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;margin:0;height:2.1em;padding:0 .6em;font-size:1em;cursor:pointer}.fc button::-moz-focus-inner{margin:0;padding:0}.fc-state-default{border:1px solid;background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);color:#333;text-shadow:0 1px 1px rgba(255,255,255,.75);box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)}.fc-state-default.fc-corner-left{border-top-left-radius:4px;border-bottom-left-radius:4px}.fc-state-default.fc-corner-right{border-top-right-radius:4px;border-bottom-right-radius:4px}.fc button .fc-icon{position:relative;top:-.05em;margin:0 .2em;vertical-align:middle}.fc-state-active,.fc-state-disabled,.fc-state-down,.fc-state-hover{color:#333;background-color:#e6e6e6}.fc-state-hover{color:#333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.fc-state-active,.fc-state-down{background-color:#ccc;background-image:none;box-shadow:inset 0 2px 4px rgba(0,0,0,.15),0 1px 2px rgba(0,0,0,.05)}.fc-state-disabled{cursor:default;background-image:none;opacity:.65;filter:alpha(opacity=65);box-shadow:none}.fc-event.fc-draggable,.fc-event[href],.fc-popover .fc-header .fc-close{cursor:pointer}.fc .fc-button-group>*{float:left;margin:0 0 0 -1px}.fc .fc-button-group>:first-child{margin-left:0}.fc-popover{position:absolute;box-shadow:0 2px 6px rgba(0,0,0,.15)}.fc-popover .fc-header{padding:2px 4px}.fc-popover .fc-header .fc-title{margin:0 2px}.fc-ltr .fc-popover .fc-header .fc-title,.fc-rtl .fc-popover .fc-header .fc-close{float:left}.fc-ltr .fc-popover .fc-header .fc-close,.fc-rtl .fc-popover .fc-header .fc-title{float:right}.fc-unthemed .fc-popover{border-width:1px;border-style:solid}.fc-unthemed .fc-popover .fc-header .fc-close{font-size:.9em;margin-top:2px}.fc-popover>.ui-widget-header+.ui-widget-content{border-top:0}.fc-divider{border-style:solid;border-width:1px}hr.fc-divider{height:0;margin:0;padding:0 0 2px;border-width:1px 0}.fc-bg table,.fc-row .fc-bgevent-skeleton table,.fc-row .fc-highlight-skeleton table{height:100%}.fc-clear{clear:both}.fc-bg,.fc-bgevent-skeleton,.fc-helper-skeleton,.fc-highlight-skeleton{position:absolute;top:0;left:0;right:0}.fc table{width:100%;box-sizing:border-box;table-layout:fixed;border-collapse:collapse;border-spacing:0;font-size:1em}.fc td,.fc th{border-style:solid;border-width:1px;padding:0;vertical-align:top}.fc td.fc-today{border-style:double}.fc .fc-row{border-style:solid;border-width:0}.fc-row table{border-left:0 hidden transparent;border-right:0 hidden transparent;border-bottom:0 hidden transparent}.fc-row:first-child table{border-top:0 hidden transparent}.fc-row{position:relative}.fc-row .fc-bg{z-index:1}.fc-row .fc-bgevent-skeleton td,.fc-row .fc-highlight-skeleton td{border-color:transparent}.fc-row .fc-bgevent-skeleton{z-index:2}.fc-row .fc-highlight-skeleton{z-index:3}.fc-row .fc-content-skeleton{position:relative;z-index:4;padding-bottom:2px}.fc-row .fc-helper-skeleton{z-index:5}.fc-row .fc-content-skeleton td,.fc-row .fc-helper-skeleton td{background:0 0;border-color:transparent;border-bottom:0}.fc-row .fc-content-skeleton tbody td,.fc-row .fc-helper-skeleton tbody td{border-top:0}.fc-scroller{-webkit-overflow-scrolling:touch}.fc-row.fc-rigid,.fc-time-grid-event{overflow:hidden}.fc-scroller>.fc-day-grid,.fc-scroller>.fc-time-grid{position:relative;width:100%}.fc-event{position:relative;display:block;font-size:.85em;line-height:1.3;border-radius:3px;border:1px solid #3a87ad;background-color:#3a87ad;font-weight:400}.fc-event,.fc-event:hover,.ui-widget .fc-event{color:#fff;text-decoration:none}.fc-not-allowed,.fc-not-allowed .fc-event{cursor:not-allowed}.fc-event .fc-bg{z-index:1;background:#fff;opacity:.25;filter:alpha(opacity=25)}.fc-event .fc-content{position:relative;z-index:2}.fc-event .fc-resizer{position:absolute;z-index:4;display:none}.fc-event.fc-allow-mouse-resize .fc-resizer,.fc-event.fc-selected .fc-resizer{display:block}.fc-event.fc-selected .fc-resizer:before{content:"";position:absolute;z-index:9999;top:50%;left:50%;width:40px;height:40px;margin-left:-20px;margin-top:-20px}.fc-event.fc-selected{z-index:9999!important;box-shadow:0 2px 5px rgba(0,0,0,.2)}.fc-event.fc-selected.fc-dragging{box-shadow:0 2px 7px rgba(0,0,0,.3)}.fc-h-event.fc-selected:before{content:"";position:absolute;z-index:3;top:-10px;bottom:-10px;left:0;right:0}.fc-ltr .fc-h-event.fc-not-start,.fc-rtl .fc-h-event.fc-not-end{margin-left:0;border-left-width:0;padding-left:1px;border-top-left-radius:0;border-bottom-left-radius:0}.fc-ltr .fc-h-event.fc-not-end,.fc-rtl .fc-h-event.fc-not-start{margin-right:0;border-right-width:0;padding-right:1px;border-top-right-radius:0;border-bottom-right-radius:0}.fc-ltr .fc-h-event .fc-start-resizer,.fc-rtl .fc-h-event .fc-end-resizer{cursor:w-resize;left:-1px}.fc-ltr .fc-h-event .fc-end-resizer,.fc-rtl .fc-h-event .fc-start-resizer{cursor:e-resize;right:-1px}.fc-h-event.fc-allow-mouse-resize .fc-resizer{width:7px;top:-1px;bottom:-1px}.fc-h-event.fc-selected .fc-resizer{border-radius:4px;border-width:1px;width:6px;height:6px;border-style:solid;border-color:inherit;background:#fff;top:50%;margin-top:-4px}.fc-ltr .fc-h-event.fc-selected .fc-start-resizer,.fc-rtl .fc-h-event.fc-selected .fc-end-resizer{margin-left:-4px}.fc-ltr .fc-h-event.fc-selected .fc-end-resizer,.fc-rtl .fc-h-event.fc-selected .fc-start-resizer{margin-right:-4px}.fc-day-grid-event{margin:1px 2px 0;padding:0 1px}.fc-day-grid-event.fc-selected:after{content:"";position:absolute;z-index:1;top:-1px;right:-1px;bottom:-1px;left:-1px;background:#000;opacity:.25;filter:alpha(opacity=25)}.fc-day-grid-event .fc-content{white-space:nowrap;overflow:hidden}.fc-day-grid-event .fc-time{font-weight:700}.fc-ltr .fc-day-grid-event.fc-allow-mouse-resize .fc-start-resizer,.fc-rtl .fc-day-grid-event.fc-allow-mouse-resize .fc-end-resizer{margin-left:-2px}.fc-ltr .fc-day-grid-event.fc-allow-mouse-resize .fc-end-resizer,.fc-rtl .fc-day-grid-event.fc-allow-mouse-resize .fc-start-resizer{margin-right:-2px}a.fc-more{margin:1px 3px;font-size:.85em;cursor:pointer;text-decoration:none}a.fc-more:hover{text-decoration:underline}.fc-limited{display:none}.fc-day-grid .fc-row{z-index:1}.fc-more-popover{z-index:2;width:220px}.fc-more-popover .fc-event-container{padding:10px}.fc-now-indicator{position:absolute;border:0 solid red}.fc-unselectable{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-tap-highlight-color:transparent}.fc-toolbar{margin-bottom:1em}.fc-toolbar .fc-left{float:left}.fc-toolbar .fc-right{float:right}.fc-toolbar .fc-center{display:inline-block}.fc .fc-toolbar>*>*{float:left;margin-left:.75em}.fc .fc-toolbar>*>:first-child{margin-left:0}.fc-toolbar h2{margin:0}.fc-toolbar button{position:relative}.fc-toolbar .fc-state-hover,.fc-toolbar .ui-state-hover{z-index:2}.fc-toolbar .fc-state-down{z-index:3}.fc-toolbar .fc-state-active,.fc-toolbar .ui-state-active{z-index:4}.fc-toolbar button:focus{z-index:5}.fc-view-container *,.fc-view-container :after,.fc-view-container :before{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.fc-view,.fc-view>table{position:relative;z-index:1}.fc-basicDay-view .fc-content-skeleton,.fc-basicWeek-view .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc-basic-view .fc-body .fc-row{min-height:4em}.fc-row.fc-rigid .fc-content-skeleton{position:absolute;top:0;left:0;right:0}.fc-basic-view .fc-day-number,.fc-basic-view .fc-week-number{padding:0 2px}.fc-basic-view td.fc-day-number,.fc-basic-view td.fc-week-number span{padding-top:2px;padding-bottom:2px}.fc-basic-view .fc-week-number span{display:inline-block;min-width:1.25em}.fc-ltr .fc-basic-view .fc-day-number{text-align:right}.fc-rtl .fc-basic-view .fc-day-number{text-align:left}.fc-day-number.fc-other-month{opacity:.3;filter:alpha(opacity=30)}.fc-agenda-view .fc-day-grid{position:relative;z-index:2}.fc-agenda-view .fc-day-grid .fc-row{min-height:3em}.fc-agenda-view .fc-day-grid .fc-row .fc-content-skeleton{padding-top:1px;padding-bottom:1em}.fc .fc-axis{vertical-align:middle;padding:0 4px}.fc-ltr .fc-axis{text-align:right}.fc-rtl .fc-axis{text-align:left}.ui-widget td.fc-axis{font-weight:400}.fc-time-grid,.fc-time-grid-container{position:relative;z-index:1}.fc-time-grid{min-height:100%}.fc-time-grid table{border:0 hidden transparent}.fc-time-grid>.fc-bg{z-index:1}.fc-time-grid .fc-slats,.fc-time-grid>hr{position:relative;z-index:2}.fc-time-grid .fc-content-col{position:relative}.fc-time-grid .fc-content-skeleton{position:absolute;z-index:3;top:0;left:0;right:0}.fc-time-grid .fc-business-container{position:relative;z-index:1}.fc-time-grid .fc-bgevent-container{position:relative;z-index:2}.fc-time-grid .fc-highlight-container{z-index:3;position:relative}.fc-time-grid .fc-event-container{position:relative;z-index:4}.fc-time-grid .fc-now-indicator-line{z-index:5}.fc-time-grid .fc-helper-container{position:relative;z-index:6}.fc-time-grid .fc-slats td{height:1.5em;border-bottom:0}.fc-time-grid .fc-slats .fc-minor td{border-top-style:dotted}.fc-time-grid .fc-slats .ui-widget-content{background:0 0}.fc-time-grid .fc-highlight{position:absolute;left:0;right:0}.fc-ltr .fc-time-grid .fc-event-container{margin:0 2.5% 0 2px}.fc-rtl .fc-time-grid .fc-event-container{margin:0 2px 0 2.5%}.fc-time-grid .fc-bgevent,.fc-time-grid .fc-event{position:absolute;z-index:1}.fc-time-grid .fc-bgevent{left:0;right:0}.fc-v-event.fc-not-start{border-top-width:0;padding-top:1px;border-top-left-radius:0;border-top-right-radius:0}.fc-v-event.fc-not-end{border-bottom-width:0;padding-bottom:1px;border-bottom-left-radius:0;border-bottom-right-radius:0}.fc-time-grid-event.fc-selected{overflow:visible}.fc-time-grid-event.fc-selected .fc-bg{display:none}.fc-time-grid-event .fc-content{overflow:hidden}.fc-time-grid-event .fc-time,.fc-time-grid-event .fc-title{padding:0 1px}.fc-time-grid-event .fc-time{font-size:.85em}.fc-time-grid-event.fc-short .fc-time,.fc-time-grid-event.fc-short .fc-title{display:inline-block;vertical-align:top}.fc-time-grid-event.fc-short .fc-time span{display:none}.fc-time-grid-event.fc-short .fc-time:before{content:attr(data-start)}.fc-time-grid-event.fc-short .fc-time:after{content:"\000A0-\000A0"}.fc-time-grid-event.fc-short .fc-title{font-size:.85em;padding:0}.fc-time-grid-event.fc-allow-mouse-resize .fc-resizer{left:0;right:0;bottom:0;height:8px;overflow:hidden;line-height:8px;font-size:11px;font-family:monospace;text-align:center;cursor:s-resize}.fc-time-grid-event.fc-allow-mouse-resize .fc-resizer:after{content:"="}.fc-time-grid-event.fc-selected .fc-resizer{border-radius:5px;border-width:1px;width:8px;height:8px;border-style:solid;border-color:inherit;background:#fff;left:50%;margin-left:-5px;bottom:-5px}.fc-time-grid .fc-now-indicator-line{border-top-width:1px;left:0;right:0}.fc-time-grid .fc-now-indicator-arrow{margin-top:-5px}.fc-ltr .fc-time-grid .fc-now-indicator-arrow{left:0;border-width:5px 0 5px 6px;border-top-color:transparent;border-bottom-color:transparent}.fc-rtl .fc-time-grid .fc-now-indicator-arrow{right:0;border-width:5px 6px 5px 0;border-top-color:transparent;border-bottom-color:transparent}
\ No newline at end of file
diff --git a/library/fullcalendar/fullcalendar.min.js b/library/fullcalendar/fullcalendar.min.js
index 5c3cce29f..d05408974 100644
--- a/library/fullcalendar/fullcalendar.min.js
+++ b/library/fullcalendar/fullcalendar.min.js
@@ -1,9 +1,9 @@
 /*!
- * FullCalendar v2.6.1
+ * FullCalendar v2.8.0
  * Docs & License: http://fullcalendar.io/
- * (c) 2015 Adam Shaw
+ * (c) 2016 Adam Shaw
  */
-!function(a){"function"==typeof define&&define.amd?define(["jquery","moment"],a):"object"==typeof exports?module.exports=a(require("jquery"),require("moment")):a(jQuery,moment)}(function(a,b){function c(a){return Q(a,Ra)}function d(b){var c,d={views:b.views||{}};return a.each(b,function(b,e){"views"!=b&&(a.isPlainObject(e)&&!/(time|duration|interval)$/i.test(b)&&-1==a.inArray(b,Ra)?(c=null,a.each(e,function(a,e){/^(month|week|day|default|basic(Week|Day)?|agenda(Week|Day)?)$/.test(a)?(d.views[a]||(d.views[a]={}),d.views[a][b]=e):(c||(c={}),c[a]=e)}),c&&(d[b]=c)):d[b]=e)}),d}function e(a,b){b.left&&a.css({"border-left-width":1,"margin-left":b.left-1}),b.right&&a.css({"border-right-width":1,"margin-right":b.right-1})}function f(a){a.css({"margin-left":"","margin-right":"","border-left-width":"","border-right-width":""})}function g(){a("body").addClass("fc-not-allowed")}function h(){a("body").removeClass("fc-not-allowed")}function i(b,c,d){var e=Math.floor(c/b.length),f=Math.floor(c-e*(b.length-1)),g=[],h=[],i=[],k=0;j(b),b.each(function(c,d){var j=c===b.length-1?f:e,l=a(d).outerHeight(!0);j>l?(g.push(d),h.push(l),i.push(a(d).height())):k+=l}),d&&(c-=k,e=Math.floor(c/g.length),f=Math.floor(c-e*(g.length-1))),a(g).each(function(b,c){var d=b===g.length-1?f:e,j=h[b],k=i[b],l=d-(j-k);d>j&&a(c).height(l)})}function j(a){a.height("")}function k(b){var c=0;return b.find("> span").each(function(b,d){var e=a(d).outerWidth();e>c&&(c=e)}),c++,b.width(c),c}function l(a,b){return a.height(b).addClass("fc-scroller"),a[0].scrollHeight-1>a[0].clientHeight?!0:(m(a),!1)}function m(a){a.height("").removeClass("fc-scroller")}function n(b){var c=b.css("position"),d=b.parents().filter(function(){var b=a(this);return/(auto|scroll)/.test(b.css("overflow")+b.css("overflow-y")+b.css("overflow-x"))}).eq(0);return"fixed"!==c&&d.length?d:a(b[0].ownerDocument||document)}function o(a){var b=a.offset();return{left:b.left,right:b.left+a.outerWidth(),top:b.top,bottom:b.top+a.outerHeight()}}function p(a){var b=a.offset(),c=r(a),d=b.left+u(a,"border-left-width")+c.left,e=b.top+u(a,"border-top-width")+c.top;return{left:d,right:d+a[0].clientWidth,top:e,bottom:e+a[0].clientHeight}}function q(a){var b=a.offset(),c=b.left+u(a,"border-left-width")+u(a,"padding-left"),d=b.top+u(a,"border-top-width")+u(a,"padding-top");return{left:c,right:c+a.width(),top:d,bottom:d+a.height()}}function r(a){var b=a.innerWidth()-a[0].clientWidth,c={left:0,right:0,top:0,bottom:a.innerHeight()-a[0].clientHeight};return s()&&"rtl"==a.css("direction")?c.left=b:c.right=b,c}function s(){return null===Sa&&(Sa=t()),Sa}function t(){var b=a("<div><div/></div>").css({position:"absolute",top:-1e3,left:0,border:0,padding:0,overflow:"scroll",direction:"rtl"}).appendTo("body"),c=b.children(),d=c.offset().left>b.offset().left;return b.remove(),d}function u(a,b){return parseFloat(a.css(b))||0}function v(a){return 1==a.which&&!a.ctrlKey}function w(a,b){var c={left:Math.max(a.left,b.left),right:Math.min(a.right,b.right),top:Math.max(a.top,b.top),bottom:Math.min(a.bottom,b.bottom)};return c.left<c.right&&c.top<c.bottom?c:!1}function x(a,b){return{left:Math.min(Math.max(a.left,b.left),b.right),top:Math.min(Math.max(a.top,b.top),b.bottom)}}function y(a){return{left:(a.left+a.right)/2,top:(a.top+a.bottom)/2}}function z(a,b){return{left:a.left-b.left,top:a.top-b.top}}function A(b){var c,d,e=[],f=[];for("string"==typeof b?f=b.split(/\s*,\s*/):"function"==typeof b?f=[b]:a.isArray(b)&&(f=b),c=0;c<f.length;c++)d=f[c],"string"==typeof d?e.push("-"==d.charAt(0)?{field:d.substring(1),order:-1}:{field:d,order:1}):"function"==typeof d&&e.push({func:d});return e}function B(a,b,c){var d,e;for(d=0;d<c.length;d++)if(e=C(a,b,c[d]))return e;return 0}function C(a,b,c){return c.func?c.func(a,b):D(a[c.field],b[c.field])*(c.order||1)}function D(b,c){return b||c?null==c?-1:null==b?1:"string"===a.type(b)||"string"===a.type(c)?String(b).localeCompare(String(c)):b-c:0}function E(a,b){var c,d,e,f,g=a.start,h=a.end,i=b.start,j=b.end;return h>i&&j>g?(g>=i?(c=g.clone(),e=!0):(c=i.clone(),e=!1),j>=h?(d=h.clone(),f=!0):(d=j.clone(),f=!1),{start:c,end:d,isStart:e,isEnd:f}):void 0}function F(a,c){return b.duration({days:a.clone().stripTime().diff(c.clone().stripTime(),"days"),ms:a.time()-c.time()})}function G(a,c){return b.duration({days:a.clone().stripTime().diff(c.clone().stripTime(),"days")})}function H(a,c,d){return b.duration(Math.round(a.diff(c,d,!0)),d)}function I(a,b){var c,d,e;for(c=0;c<Ua.length&&(d=Ua[c],e=J(d,a,b),!(e>=1&&ba(e)));c++);return d}function J(a,c,d){return null!=d?d.diff(c,a,!0):b.isDuration(c)?c.as(a):c.end.diff(c.start,a,!0)}function K(a,b,c){var d;return N(c)?(b-a)/c:(d=c.asMonths(),Math.abs(d)>=1&&ba(d)?b.diff(a,"months",!0)/d:b.diff(a,"days",!0)/c.asDays())}function L(a,b){var c,d;return N(a)||N(b)?a/b:(c=a.asMonths(),d=b.asMonths(),Math.abs(c)>=1&&ba(c)&&Math.abs(d)>=1&&ba(d)?c/d:a.asDays()/b.asDays())}function M(a,c){var d;return N(a)?b.duration(a*c):(d=a.asMonths(),Math.abs(d)>=1&&ba(d)?b.duration({months:d*c}):b.duration({days:a.asDays()*c}))}function N(a){return Boolean(a.hours()||a.minutes()||a.seconds()||a.milliseconds())}function O(a){return"[object Date]"===Object.prototype.toString.call(a)||a instanceof Date}function P(a){return/^\d+\:\d+(?:\:\d+\.?(?:\d{3})?)?$/.test(a)}function Q(a,b){var c,d,e,f,g,h,i={};if(b)for(c=0;c<b.length;c++){for(d=b[c],e=[],f=a.length-1;f>=0;f--)if(g=a[f][d],"object"==typeof g)e.unshift(g);else if(void 0!==g){i[d]=g;break}e.length&&(i[d]=Q(e))}for(c=a.length-1;c>=0;c--){h=a[c];for(d in h)d in i||(i[d]=h[d])}return i}function R(a){var b=function(){};return b.prototype=a,new b}function S(a,b){for(var c in a)U(a,c)&&(b[c]=a[c])}function T(a,b){var c,d,e=["constructor","toString","valueOf"];for(c=0;c<e.length;c++)d=e[c],a[d]!==Object.prototype[d]&&(b[d]=a[d])}function U(a,b){return Ya.call(a,b)}function V(b){return/undefined|null|boolean|number|string/.test(a.type(b))}function W(b,c,d){if(a.isFunction(b)&&(b=[b]),b){var e,f;for(e=0;e<b.length;e++)f=b[e].apply(c,d)||f;return f}}function X(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]}function Y(a){return(a+"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#039;").replace(/"/g,"&quot;").replace(/\n/g,"<br />")}function Z(a){return a.replace(/&.*?;/g,"")}function $(b){var c=[];return a.each(b,function(a,b){null!=b&&c.push(a+":"+b)}),c.join(";")}function _(a){return a.charAt(0).toUpperCase()+a.slice(1)}function aa(a,b){return a-b}function ba(a){return a%1===0}function ca(a,b){var c=a[b];return function(){return c.apply(a,arguments)}}function da(a,b){var c,d,e,f,g=function(){var h=+new Date-f;b>h&&h>0?c=setTimeout(g,b-h):(c=null,a.apply(e,d),c||(e=d=null))};return function(){e=this,d=arguments,f=+new Date,c||(c=setTimeout(g,b))}}function ea(c,d,e){var f,g,h,i,j=c[0],k=1==c.length&&"string"==typeof j;return b.isMoment(j)?(i=b.apply(null,c),ga(j,i)):O(j)||void 0===j?i=b.apply(null,c):(f=!1,g=!1,k?Za.test(j)?(j+="-01",c=[j],f=!0,g=!0):(h=$a.exec(j))&&(f=!h[5],g=!0):a.isArray(j)&&(g=!0),i=d||f?b.utc.apply(b,c):b.apply(null,c),f?(i._ambigTime=!0,i._ambigZone=!0):e&&(g?i._ambigZone=!0:k&&(i.utcOffset?i.utcOffset(j):i.zone(j)))),i._fullCalendar=!0,i}function fa(a,c){var d,e,f=!1,g=!1,h=a.length,i=[];for(d=0;h>d;d++)e=a[d],b.isMoment(e)||(e=Pa.moment.parseZone(e)),f=f||e._ambigTime,g=g||e._ambigZone,i.push(e);for(d=0;h>d;d++)e=i[d],c||!f||e._ambigTime?g&&!e._ambigZone&&(i[d]=e.clone().stripZone()):i[d]=e.clone().stripTime();return i}function ga(a,b){a._ambigTime?b._ambigTime=!0:b._ambigTime&&(b._ambigTime=!1),a._ambigZone?b._ambigZone=!0:b._ambigZone&&(b._ambigZone=!1)}function ha(a,b){a.year(b[0]||0).month(b[1]||0).date(b[2]||0).hours(b[3]||0).minutes(b[4]||0).seconds(b[5]||0).milliseconds(b[6]||0)}function ia(a,b){return ab.format.call(a,b)}function ja(a,b){return ka(a,pa(b))}function ka(a,b){var c,d="";for(c=0;c<b.length;c++)d+=la(a,b[c]);return d}function la(a,b){var c,d;return"string"==typeof b?b:(c=b.token)?bb[c]?bb[c](a):ia(a,c):b.maybe&&(d=ka(a,b.maybe),d.match(/[1-9]/))?d:""}function ma(a,b,c,d,e){var f;return a=Pa.moment.parseZone(a),b=Pa.moment.parseZone(b),f=(a.localeData||a.lang).call(a),c=f.longDateFormat(c)||c,d=d||" - ",na(a,b,pa(c),d,e)}function na(a,b,c,d,e){var f,g,h,i,j=a.clone().stripZone(),k=b.clone().stripZone(),l="",m="",n="",o="",p="";for(g=0;g<c.length&&(f=oa(a,b,j,k,c[g]),f!==!1);g++)l+=f;for(h=c.length-1;h>g&&(f=oa(a,b,j,k,c[h]),f!==!1);h--)m=f+m;for(i=g;h>=i;i++)n+=la(a,c[i]),o+=la(b,c[i]);return(n||o)&&(p=e?o+d+n:n+d+o),l+p+m}function oa(a,b,c,d,e){var f,g;return"string"==typeof e?e:(f=e.token)&&(g=cb[f.charAt(0)],g&&c.isSame(d,g))?ia(a,f):!1}function pa(a){return a in db?db[a]:db[a]=qa(a)}function qa(a){for(var b,c=[],d=/\[([^\]]*)\]|\(([^\)]*)\)|(LTS|LT|(\w)\4*o?)|([^\w\[\(]+)/g;b=d.exec(a);)b[1]?c.push(b[1]):b[2]?c.push({maybe:qa(b[2])}):b[3]?c.push({token:b[3]}):b[5]&&c.push(b[5]);return c}function ra(){}function sa(a,b){var c;return U(b,"constructor")&&(c=b.constructor),"function"!=typeof c&&(c=b.constructor=function(){a.apply(this,arguments)}),c.prototype=R(a.prototype),S(b,c.prototype),T(b,c.prototype),S(a,c),c}function ta(a,b){S(b.prototype||b,a.prototype)}function ua(a,b){return a||b?a&&b?a.component===b.component&&va(a,b)&&va(b,a):!1:!0}function va(a,b){for(var c in a)if(!/^(component|left|right|top|bottom)$/.test(c)&&a[c]!==b[c])return!1;return!0}function wa(a){var b=ya(a);return"background"===b||"inverse-background"===b}function xa(a){return"inverse-background"===ya(a)}function ya(a){return X((a.source||{}).rendering,a.rendering)}function za(a){var b,c,d={};for(b=0;b<a.length;b++)c=a[b],(d[c._id]||(d[c._id]=[])).push(c);return d}function Aa(a,b){return a.start-b.start}function Ba(c){var d,e,f,g,h=Pa.dataAttrPrefix;return h&&(h+="-"),d=c.data(h+"event")||null,d&&(d="object"==typeof d?a.extend({},d):{},e=d.start,null==e&&(e=d.time),f=d.duration,g=d.stick,delete d.start,delete d.time,delete d.duration,delete d.stick),null==e&&(e=c.data(h+"start")),null==e&&(e=c.data(h+"time")),null==f&&(f=c.data(h+"duration")),null==g&&(g=c.data(h+"stick")),e=null!=e?b.duration(e):null,f=null!=f?b.duration(f):null,g=Boolean(g),{eventProps:d,startTime:e,duration:f,stick:g}}function Ca(a,b){var c,d;for(c=0;c<b.length;c++)if(d=b[c],d.leftCol<=a.rightCol&&d.rightCol>=a.leftCol)return!0;return!1}function Da(a,b){return a.leftCol-b.leftCol}function Ea(a){var b,c,d,e=[];for(b=0;b<a.length;b++){for(c=a[b],d=0;d<e.length&&Ha(c,e[d]).length;d++);c.level=d,(e[d]||(e[d]=[])).push(c)}return e}function Fa(a){var b,c,d,e,f;for(b=0;b<a.length;b++)for(c=a[b],d=0;d<c.length;d++)for(e=c[d],e.forwardSegs=[],f=b+1;f<a.length;f++)Ha(e,a[f],e.forwardSegs)}function Ga(a){var b,c,d=a.forwardSegs,e=0;if(void 0===a.forwardPressure){for(b=0;b<d.length;b++)c=d[b],Ga(c),e=Math.max(e,1+c.forwardPressure);a.forwardPressure=e}}function Ha(a,b,c){c=c||[];for(var d=0;d<b.length;d++)Ia(a,b[d])&&c.push(b[d]);return c}function Ia(a,b){return a.bottom>b.top&&a.top<b.bottom}function Ja(c,d){function e(){U?h()&&(k(),i()):f()}function f(){V=O.theme?"ui":"fc",c.addClass("fc"),O.isRTL?c.addClass("fc-rtl"):c.addClass("fc-ltr"),O.theme?c.addClass("ui-widget"):c.addClass("fc-unthemed"),U=a("<div class='fc-view-container'/>").prependTo(c),S=N.header=new Ma(N,O),T=S.render(),T&&c.prepend(T),i(O.defaultView),O.handleWindowResize&&(Y=da(m,O.windowResizeDelay),a(window).resize(Y))}function g(){W&&W.removeElement(),S.removeElement(),U.remove(),c.removeClass("fc fc-ltr fc-rtl fc-unthemed ui-widget"),Y&&a(window).unbind("resize",Y)}function h(){return c.is(":visible")}function i(b){ca++,W&&b&&W.type!==b&&(S.deactivateButton(W.type),H(),W.removeElement(),W=N.view=null),!W&&b&&(W=N.view=ba[b]||(ba[b]=N.instantiateView(b)),W.setElement(a("<div class='fc-view fc-"+b+"-view' />").appendTo(U)),S.activateButton(b)),W&&(Z=W.massageCurrentDate(Z),W.displaying&&Z.isWithin(W.intervalStart,W.intervalEnd)||h()&&(W.display(Z),I(),u(),v(),q())),I(),ca--}function j(a){return h()?(a&&l(),ca++,W.updateSize(!0),ca--,!0):void 0}function k(){h()&&l()}function l(){X="number"==typeof O.contentHeight?O.contentHeight:"number"==typeof O.height?O.height-(T?T.outerHeight(!0):0):Math.round(U.width()/Math.max(O.aspectRatio,.5))}function m(a){!ca&&a.target===window&&W.start&&j(!0)&&W.trigger("windowResize",aa)}function n(){p(),r()}function o(){h()&&(H(),W.displayEvents(ea),I())}function p(){H(),W.clearEvents(),I()}function q(){!O.lazyFetching||$(W.start,W.end)?r():o()}function r(){_(W.start,W.end)}function s(a){ea=a,o()}function t(){o()}function u(){S.updateTitle(W.title)}function v(){var a=N.getNow();a.isWithin(W.intervalStart,W.intervalEnd)?S.disableButton("today"):S.enableButton("today")}function w(a,b){W.select(N.buildSelectSpan.apply(N,arguments))}function x(){W&&W.unselect()}function y(){Z=W.computePrevDate(Z),i()}function z(){Z=W.computeNextDate(Z),i()}function A(){Z.add(-1,"years"),i()}function B(){Z.add(1,"years"),i()}function C(){Z=N.getNow(),i()}function D(a){Z=N.moment(a).stripZone(),i()}function E(a){Z.add(b.duration(a)),i()}function F(a,b){var c;b=b||"day",c=N.getViewSpec(b)||N.getUnitViewSpec(b),Z=a.clone(),i(c?c.type:null)}function G(){return N.applyTimezone(Z)}function H(){U.css({width:"100%",height:U.height(),overflow:"hidden"})}function I(){U.css({width:"",height:"",overflow:""})}function J(){return N}function K(){return W}function L(a,b){return void 0===b?O[a]:void(("height"==a||"contentHeight"==a||"aspectRatio"==a)&&(O[a]=b,j(!0)))}function M(a,b){var c=Array.prototype.slice.call(arguments,2);return b=b||aa,this.triggerWith(a,b,c),O[a]?O[a].apply(b,c):void 0}var N=this;N.initOptions(d||{});var O=this.options;N.render=e,N.destroy=g,N.refetchEvents=n,N.reportEvents=s,N.reportEventChange=t,N.rerenderEvents=o,N.changeView=i,N.select=w,N.unselect=x,N.prev=y,N.next=z,N.prevYear=A,N.nextYear=B,N.today=C,N.gotoDate=D,N.incrementDate=E,N.zoomTo=F,N.getDate=G,N.getCalendar=J,N.getView=K,N.option=L,N.trigger=M;var P=R(La(O.lang));if(O.monthNames&&(P._months=O.monthNames),O.monthNamesShort&&(P._monthsShort=O.monthNamesShort),O.dayNames&&(P._weekdays=O.dayNames),O.dayNamesShort&&(P._weekdaysShort=O.dayNamesShort),null!=O.firstDay){var Q=R(P._week);Q.dow=O.firstDay,P._week=Q}P._fullCalendar_weekCalc=function(a){return"function"==typeof a?a:"local"===a?a:"iso"===a||"ISO"===a?"ISO":void 0}(O.weekNumberCalculation),N.defaultAllDayEventDuration=b.duration(O.defaultAllDayEventDuration),N.defaultTimedEventDuration=b.duration(O.defaultTimedEventDuration),N.moment=function(){var a;return"local"===O.timezone?(a=Pa.moment.apply(null,arguments),a.hasTime()&&a.local()):a="UTC"===O.timezone?Pa.moment.utc.apply(null,arguments):Pa.moment.parseZone.apply(null,arguments),"_locale"in a?a._locale=P:a._lang=P,a},N.getIsAmbigTimezone=function(){return"local"!==O.timezone&&"UTC"!==O.timezone},N.applyTimezone=function(a){if(!a.hasTime())return a.clone();var b,c=N.moment(a.toArray()),d=a.time()-c.time();return d&&(b=c.clone().add(d),a.time()-b.time()===0&&(c=b)),c},N.getNow=function(){var a=O.now;return"function"==typeof a&&(a=a()),N.moment(a).stripZone()},N.getEventEnd=function(a){return a.end?a.end.clone():N.getDefaultEventEnd(a.allDay,a.start)},N.getDefaultEventEnd=function(a,b){var c=b.clone();return a?c.stripTime().add(N.defaultAllDayEventDuration):c.add(N.defaultTimedEventDuration),N.getIsAmbigTimezone()&&c.stripZone(),c},N.humanizeDuration=function(a){return(a.locale||a.lang).call(a,O.lang).humanize()},Na.call(N,O);var S,T,U,V,W,X,Y,Z,$=N.isFetchNeeded,_=N.fetchEvents,aa=c[0],ba={},ca=0,ea=[];Z=null!=O.defaultDate?N.moment(O.defaultDate).stripZone():N.getNow(),N.getSuggestedViewHeight=function(){return void 0===X&&k(),X},N.isHeightAuto=function(){return"auto"===O.contentHeight||"auto"===O.height},N.freezeContentHeight=H,N.unfreezeContentHeight=I,N.initialize()}function Ka(b){a.each(tb,function(a,c){null==b[a]&&(b[a]=c(b))})}function La(a){var c=b.localeData||b.langData;return c.call(b,a)||c.call(b,"en")}function Ma(b,c){function d(){var b=c.header;return n=c.theme?"ui":"fc",b?o=a("<div class='fc-toolbar'/>").append(f("left")).append(f("right")).append(f("center")).append('<div class="fc-clear"/>'):void 0}function e(){o.remove(),o=a()}function f(d){var e=a('<div class="fc-'+d+'"/>'),f=c.header[d];return f&&a.each(f.split(" "),function(d){var f,g=a(),h=!0;a.each(this.split(","),function(d,e){var f,i,j,k,l,m,o,q,r,s;"title"==e?(g=g.add(a("<h2>&nbsp;</h2>")),h=!1):((f=(b.options.customButtons||{})[e])?(j=function(a){f.click&&f.click.call(s[0],a)},k="",l=f.text):(i=b.getViewSpec(e))?(j=function(){b.changeView(e)},p.push(e),k=i.buttonTextOverride,l=i.buttonTextDefault):b[e]&&(j=function(){b[e]()},k=(b.overrides.buttonText||{})[e],l=c.buttonText[e]),j&&(m=f?f.themeIcon:c.themeButtonIcons[e],o=f?f.icon:c.buttonIcons[e],q=k?Y(k):m&&c.theme?"<span class='ui-icon ui-icon-"+m+"'></span>":o&&!c.theme?"<span class='fc-icon fc-icon-"+o+"'></span>":Y(l),r=["fc-"+e+"-button",n+"-button",n+"-state-default"],s=a('<button type="button" class="'+r.join(" ")+'">'+q+"</button>").click(function(a){s.hasClass(n+"-state-disabled")||(j(a),(s.hasClass(n+"-state-active")||s.hasClass(n+"-state-disabled"))&&s.removeClass(n+"-state-hover"))}).mousedown(function(){s.not("."+n+"-state-active").not("."+n+"-state-disabled").addClass(n+"-state-down")}).mouseup(function(){s.removeClass(n+"-state-down")}).hover(function(){s.not("."+n+"-state-active").not("."+n+"-state-disabled").addClass(n+"-state-hover")},function(){s.removeClass(n+"-state-hover").removeClass(n+"-state-down")}),g=g.add(s)))}),h&&g.first().addClass(n+"-corner-left").end().last().addClass(n+"-corner-right").end(),g.length>1?(f=a("<div/>"),h&&f.addClass("fc-button-group"),f.append(g),e.append(f)):e.append(g)}),e}function g(a){o.find("h2").text(a)}function h(a){o.find(".fc-"+a+"-button").addClass(n+"-state-active")}function i(a){o.find(".fc-"+a+"-button").removeClass(n+"-state-active")}function j(a){o.find(".fc-"+a+"-button").attr("disabled","disabled").addClass(n+"-state-disabled")}function k(a){o.find(".fc-"+a+"-button").removeAttr("disabled").removeClass(n+"-state-disabled")}function l(){return p}var m=this;m.render=d,m.removeElement=e,m.updateTitle=g,m.activateButton=h,m.deactivateButton=i,m.disableButton=j,m.enableButton=k,m.getViewsWithButtons=l;var n,o=a(),p=[]}function Na(c){function d(a,b){return!L||L>a||b>M}function e(a,b){L=a,M=b,T=[];var c=++R,d=Q.length;S=d;for(var e=0;d>e;e++)f(Q[e],c)}function f(b,c){g(b,function(d){var e,f,g,h=a.isArray(b.events);if(c==R){if(d)for(e=0;e<d.length;e++)f=d[e],g=h?f:s(f,b),g&&T.push.apply(T,w(g));S--,S||N(T)}})}function g(b,d){var e,f,h=Pa.sourceFetchers;for(e=0;e<h.length;e++){if(f=h[e].call(K,b,L.clone(),M.clone(),c.timezone,d),f===!0)return;if("object"==typeof f)return void g(f,d)}var i=b.events;if(i)a.isFunction(i)?(K.pushLoading(),i.call(K,L.clone(),M.clone(),c.timezone,function(a){d(a),K.popLoading()})):a.isArray(i)?d(i):d();else{var j=b.url;if(j){var k,l=b.success,m=b.error,n=b.complete;k=a.isFunction(b.data)?b.data():b.data;var o=a.extend({},k||{}),p=X(b.startParam,c.startParam),q=X(b.endParam,c.endParam),r=X(b.timezoneParam,c.timezoneParam);p&&(o[p]=L.format()),q&&(o[q]=M.format()),c.timezone&&"local"!=c.timezone&&(o[r]=c.timezone),K.pushLoading(),a.ajax(a.extend({},ub,b,{data:o,success:function(b){b=b||[];var c=W(l,this,arguments);a.isArray(c)&&(b=c),d(b)},error:function(){W(m,this,arguments),d()},complete:function(){W(n,this,arguments),K.popLoading()}}))}else d()}}function h(a){var b=i(a);b&&(Q.push(b),S++,f(b,R))}function i(b){var c,d,e=Pa.sourceNormalizers;if(a.isFunction(b)||a.isArray(b)?c={events:b}:"string"==typeof b?c={url:b}:"object"==typeof b&&(c=a.extend({},b)),c){for(c.className?"string"==typeof c.className&&(c.className=c.className.split(/\s+/)):c.className=[],a.isArray(c.events)&&(c.origArray=c.events,c.events=a.map(c.events,function(a){return s(a,c)})),d=0;d<e.length;d++)e[d].call(K,c);return c}}function j(b){Q=a.grep(Q,function(a){return!k(a,b)}),T=a.grep(T,function(a){return!k(a.source,b)}),N(T)}function k(a,b){return a&&b&&l(a)==l(b)}function l(a){return("object"==typeof a?a.origArray||a.googleCalendarId||a.url||a.events:null)||a}function m(a){a.start=K.moment(a.start),a.end?a.end=K.moment(a.end):a.end=null,x(a,n(a)),N(T)}function n(b){var c={};return a.each(b,function(a,b){o(a)&&void 0!==b&&V(b)&&(c[a]=b)}),c}function o(a){return!/^_|^(id|allDay|start|end)$/.test(a)}function p(a,b){var c,d,e,f=s(a);if(f){for(c=w(f),d=0;d<c.length;d++)e=c[d],e.source||(b&&(O.events.push(e),e.source=O),T.push(e));return N(T),c}return[]}function q(b){var c,d;for(null==b?b=function(){return!0}:a.isFunction(b)||(c=b+"",b=function(a){return a._id==c}),T=a.grep(T,b,!0),d=0;d<Q.length;d++)a.isArray(Q[d].events)&&(Q[d].events=a.grep(Q[d].events,b,!0));N(T)}function r(b){return a.isFunction(b)?a.grep(T,b):null!=b?(b+="",a.grep(T,function(a){return a._id==b})):T}function s(d,e){var f,g,h,i={};if(c.eventDataTransform&&(d=c.eventDataTransform(d)),e&&e.eventDataTransform&&(d=e.eventDataTransform(d)),a.extend(i,d),e&&(i.source=e),i._id=d._id||(void 0===d.id?"_fc"+vb++:d.id+""),d.className?"string"==typeof d.className?i.className=d.className.split(/\s+/):i.className=d.className:i.className=[],f=d.start||d.date,g=d.end,P(f)&&(f=b.duration(f)),P(g)&&(g=b.duration(g)),d.dow||b.isDuration(f)||b.isDuration(g))i.start=f?b.duration(f):null,i.end=g?b.duration(g):null,i._recurring=!0;else{if(f&&(f=K.moment(f),!f.isValid()))return!1;g&&(g=K.moment(g),g.isValid()||(g=null)),h=d.allDay,void 0===h&&(h=X(e?e.allDayDefault:void 0,c.allDayDefault)),t(f,g,h,i)}return i}function t(a,b,c,d){d.start=a,d.end=b,d.allDay=c,u(d),Oa(d)}function u(a){v(a),a.end&&!a.end.isAfter(a.start)&&(a.end=null),a.end||(c.forceEventDuration?a.end=K.getDefaultEventEnd(a.allDay,a.start):a.end=null)}function v(a){null==a.allDay&&(a.allDay=!(a.start.hasTime()||a.end&&a.end.hasTime())),a.allDay?(a.start.stripTime(),a.end&&a.end.stripTime()):(a.start.hasTime()||(a.start=K.applyTimezone(a.start.time(0))),a.end&&!a.end.hasTime()&&(a.end=K.applyTimezone(a.end.time(0))))}function w(b,c,d){var e,f,g,h,i,j,k,l,m,n=[];if(c=c||L,d=d||M,b)if(b._recurring){if(f=b.dow)for(e={},g=0;g<f.length;g++)e[f[g]]=!0;for(h=c.clone().stripTime();h.isBefore(d);)(!e||e[h.day()])&&(i=b.start,j=b.end,k=h.clone(),l=null,i&&(k=k.time(i)),j&&(l=h.clone().time(j)),m=a.extend({},b),t(k,l,!i&&!j,m),n.push(m)),h.add(1,"days")}else n.push(b);return n}function x(b,c,d){function e(a,b){return d?H(a,b,d):c.allDay?G(a,b):F(a,b)}var f,g,h,i,j,k,l={};return c=c||{},c.start||(c.start=b.start.clone()),void 0===c.end&&(c.end=b.end?b.end.clone():null),null==c.allDay&&(c.allDay=b.allDay),u(c),f={start:b._start.clone(),end:b._end?b._end.clone():K.getDefaultEventEnd(b._allDay,b._start),allDay:c.allDay},u(f),g=null!==b._end&&null===c.end,h=e(c.start,f.start),c.end?(i=e(c.end,f.end),j=i.subtract(h)):j=null,a.each(c,function(a,b){o(a)&&void 0!==b&&(l[a]=b)}),k=y(r(b._id),g,c.allDay,h,j,l),{dateDelta:h,durationDelta:j,undo:k}}function y(b,c,d,e,f,g){var h=K.getIsAmbigTimezone(),i=[];return e&&!e.valueOf()&&(e=null),f&&!f.valueOf()&&(f=null),a.each(b,function(b,j){var k,l;k={start:j.start.clone(),end:j.end?j.end.clone():null,allDay:j.allDay},a.each(g,function(a){k[a]=j[a]}),l={start:j._start,end:j._end,allDay:d},u(l),c?l.end=null:f&&!l.end&&(l.end=K.getDefaultEventEnd(l.allDay,l.start)),e&&(l.start.add(e),l.end&&l.end.add(e)),f&&l.end.add(f),h&&!l.allDay&&(e||f)&&(l.start.stripZone(),l.end&&l.end.stripZone()),a.extend(j,g,l),Oa(j),i.push(function(){a.extend(j,k),Oa(j)})}),function(){for(var a=0;a<i.length;a++)i[a]()}}function z(b){var d,e=c.businessHours,f={className:"fc-nonbusiness",start:"09:00",end:"17:00",dow:[1,2,3,4,5],rendering:"inverse-background"},g=K.getView();return e&&(d=a.extend({},f,"object"==typeof e?e:{})),d?(b&&(d.start=null,d.end=null),w(s(d),g.start,g.end)):[]}function A(a,b){var d=b.source||{},e=X(b.constraint,d.constraint,c.eventConstraint),f=X(b.overlap,d.overlap,c.eventOverlap);return D(a,e,f,b)}function B(b,c,d){var e,f;return d&&(e=a.extend({},d,c),f=w(s(e))[0]),f?A(b,f):C(b)}function C(a){return D(a,c.selectConstraint,c.selectOverlap)}function D(a,b,c,d){var e,f,g,h,i,j;if(null!=b){for(e=E(b),f=!1,h=0;h<e.length;h++)if(I(e[h],a)){f=!0;break}if(!f)return!1}for(g=K.getPeerEvents(a,d),h=0;h<g.length;h++)if(i=g[h],J(i,a)){if(c===!1)return!1;if("function"==typeof c&&!c(i,d))return!1;if(d){if(j=X(i.overlap,(i.source||{}).overlap),j===!1)return!1;if("function"==typeof j&&!j(d,i))return!1}}return!0}function E(a){return"businessHours"===a?z():"object"==typeof a?w(s(a)):r(a)}function I(a,b){var c=a.start.clone().stripZone(),d=K.getEventEnd(a).stripZone();return b.start>=c&&b.end<=d}function J(a,b){var c=a.start.clone().stripZone(),d=K.getEventEnd(a).stripZone();return b.start<d&&b.end>c}var K=this;K.isFetchNeeded=d,K.fetchEvents=e,K.addEventSource=h,K.removeEventSource=j,K.updateEvent=m,K.renderEvent=p,K.removeEvents=q,K.clientEvents=r,K.mutateEvent=x,K.normalizeEventDates=u,K.normalizeEventTimes=v;var L,M,N=K.reportEvents,O={events:[]},Q=[O],R=0,S=0,T=[];a.each((c.events?[c.events]:[]).concat(c.eventSources||[]),function(a,b){var c=i(b);c&&Q.push(c)}),K.getBusinessHoursEvents=z,K.isEventSpanAllowed=A,K.isExternalSpanAllowed=B,K.isSelectionSpanAllowed=C,K.getEventCache=function(){return T}}function Oa(a){a._allDay=a.allDay,a._start=a.start.clone(),a._end=a.end?a.end.clone():null}var Pa=a.fullCalendar={version:"2.6.1",internalApiVersion:3},Qa=Pa.views={};a.fn.fullCalendar=function(b){var c=Array.prototype.slice.call(arguments,1),d=this;return this.each(function(e,f){var g,h=a(f),i=h.data("fullCalendar");"string"==typeof b?i&&a.isFunction(i[b])&&(g=i[b].apply(i,c),e||(d=g),"destroy"===b&&h.removeData("fullCalendar")):i||(i=new pb(h,b),h.data("fullCalendar",i),i.render())}),d};var Ra=["header","buttonText","buttonIcons","themeButtonIcons"];Pa.intersectRanges=E,Pa.applyAll=W,Pa.debounce=da,Pa.isInt=ba,Pa.htmlEscape=Y,Pa.cssToStr=$,Pa.proxy=ca,Pa.capitaliseFirstLetter=_,Pa.getOuterRect=o,Pa.getClientRect=p,Pa.getContentRect=q,Pa.getScrollbarWidths=r;var Sa=null;Pa.intersectRects=w,Pa.parseFieldSpecs=A,Pa.compareByFieldSpecs=B,Pa.compareByFieldSpec=C,Pa.flexibleCompare=D,Pa.computeIntervalUnit=I,Pa.divideRangeByDuration=K,Pa.divideDurationByDuration=L,Pa.multiplyDuration=M,Pa.durationHasTime=N;var Ta=["sun","mon","tue","wed","thu","fri","sat"],Ua=["year","month","week","day","hour","minute","second","millisecond"];Pa.log=function(){var a=window.console;return a&&a.log?a.log.apply(a,arguments):void 0},Pa.warn=function(){var a=window.console;return a&&a.warn?a.warn.apply(a,arguments):Pa.log.apply(Pa,arguments)};var Va,Wa,Xa,Ya={}.hasOwnProperty,Za=/^\s*\d{4}-\d\d$/,$a=/^\s*\d{4}-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?)?$/,_a=b.fn,ab=a.extend({},_a);Pa.moment=function(){return ea(arguments)},Pa.moment.utc=function(){var a=ea(arguments,!0);return a.hasTime()&&a.utc(),a},Pa.moment.parseZone=function(){return ea(arguments,!0,!0)},_a.clone=function(){var a=ab.clone.apply(this,arguments);return ga(this,a),this._fullCalendar&&(a._fullCalendar=!0),a},_a.week=_a.weeks=function(a){var b=(this._locale||this._lang)._fullCalendar_weekCalc;return null==a&&"function"==typeof b?b(this):"ISO"===b?ab.isoWeek.apply(this,arguments):ab.week.apply(this,arguments)},_a.time=function(a){if(!this._fullCalendar)return ab.time.apply(this,arguments);if(null==a)return b.duration({hours:this.hours(),minutes:this.minutes(),seconds:this.seconds(),milliseconds:this.milliseconds()});this._ambigTime=!1,b.isDuration(a)||b.isMoment(a)||(a=b.duration(a));var c=0;return b.isDuration(a)&&(c=24*Math.floor(a.asDays())),this.hours(c+a.hours()).minutes(a.minutes()).seconds(a.seconds()).milliseconds(a.milliseconds())},_a.stripTime=function(){var a;return this._ambigTime||(a=this.toArray(),this.utc(),Wa(this,a.slice(0,3)),this._ambigTime=!0,this._ambigZone=!0),this},_a.hasTime=function(){return!this._ambigTime},_a.stripZone=function(){var a,b;return this._ambigZone||(a=this.toArray(),b=this._ambigTime,this.utc(),Wa(this,a),this._ambigTime=b||!1,this._ambigZone=!0),this},_a.hasZone=function(){return!this._ambigZone},_a.local=function(){var a=this.toArray(),b=this._ambigZone;return ab.local.apply(this,arguments),this._ambigTime=!1,this._ambigZone=!1,b&&Xa(this,a),this},_a.utc=function(){return ab.utc.apply(this,arguments),this._ambigTime=!1,this._ambigZone=!1,this},a.each(["zone","utcOffset"],function(a,b){ab[b]&&(_a[b]=function(a){return null!=a&&(this._ambigTime=!1,this._ambigZone=!1),ab[b].apply(this,arguments)})}),_a.format=function(){return this._fullCalendar&&arguments[0]?ja(this,arguments[0]):this._ambigTime?ia(this,"YYYY-MM-DD"):this._ambigZone?ia(this,"YYYY-MM-DD[T]HH:mm:ss"):ab.format.apply(this,arguments)},_a.toISOString=function(){return this._ambigTime?ia(this,"YYYY-MM-DD"):this._ambigZone?ia(this,"YYYY-MM-DD[T]HH:mm:ss"):ab.toISOString.apply(this,arguments)},_a.isWithin=function(a,b){var c=fa([this,a,b]);return c[0]>=c[1]&&c[0]<c[2]},_a.isSame=function(a,b){var c;return this._fullCalendar?b?(c=fa([this,a],!0),ab.isSame.call(c[0],c[1],b)):(a=Pa.moment.parseZone(a),ab.isSame.call(this,a)&&Boolean(this._ambigTime)===Boolean(a._ambigTime)&&Boolean(this._ambigZone)===Boolean(a._ambigZone)):ab.isSame.apply(this,arguments)},a.each(["isBefore","isAfter"],function(a,b){_a[b]=function(a,c){var d;return this._fullCalendar?(d=fa([this,a]),ab[b].call(d[0],d[1],c)):ab[b].apply(this,arguments)}}),Va="_d"in b()&&"updateOffset"in b,Wa=Va?function(a,c){a._d.setTime(Date.UTC.apply(Date,c)),b.updateOffset(a,!1)}:ha,Xa=Va?function(a,c){a._d.setTime(+new Date(c[0]||0,c[1]||0,c[2]||0,c[3]||0,c[4]||0,c[5]||0,c[6]||0)),b.updateOffset(a,!1)}:ha;var bb={t:function(a){return ia(a,"a").charAt(0)},T:function(a){return ia(a,"A").charAt(0)}};Pa.formatRange=ma;var cb={Y:"year",M:"month",D:"day",d:"day",A:"second",a:"second",T:"second",t:"second",H:"second",h:"second",m:"second",s:"second"},db={};Pa.Class=ra,ra.extend=function(){var a,b,c=arguments.length;for(a=0;c>a;a++)b=arguments[a],c-1>a&&ta(this,b);return sa(this,b||{})},ra.mixin=function(a){ta(this,a)};var eb=Pa.Emitter=ra.extend({callbackHash:null,on:function(a,b){return this.getCallbacks(a).add(b),this},off:function(a,b){return this.getCallbacks(a).remove(b),this},trigger:function(a){var b=Array.prototype.slice.call(arguments,1);return this.triggerWith(a,this,b),this},triggerWith:function(a,b,c){var d=this.getCallbacks(a);return d.fireWith(b,c),this},getCallbacks:function(b){var c;return this.callbackHash||(this.callbackHash={}),c=this.callbackHash[b],c||(c=this.callbackHash[b]=a.Callbacks()),c}}),fb=ra.extend({isHidden:!0,options:null,el:null,documentMousedownProxy:null,margin:10,constructor:function(a){this.options=a||{}},show:function(){this.isHidden&&(this.el||this.render(),this.el.show(),this.position(),this.isHidden=!1,this.trigger("show"))},hide:function(){this.isHidden||(this.el.hide(),this.isHidden=!0,this.trigger("hide"))},render:function(){var b=this,c=this.options;this.el=a('<div class="fc-popover"/>').addClass(c.className||"").css({top:0,left:0}).append(c.content).appendTo(c.parentEl),this.el.on("click",".fc-close",function(){b.hide()}),c.autoHide&&a(document).on("mousedown",this.documentMousedownProxy=ca(this,"documentMousedown"))},documentMousedown:function(b){this.el&&!a(b.target).closest(this.el).length&&this.hide()},removeElement:function(){this.hide(),this.el&&(this.el.remove(),this.el=null),a(document).off("mousedown",this.documentMousedownProxy)},position:function(){var b,c,d,e,f,g=this.options,h=this.el.offsetParent().offset(),i=this.el.outerWidth(),j=this.el.outerHeight(),k=a(window),l=n(this.el);e=g.top||0,f=void 0!==g.left?g.left:void 0!==g.right?g.right-i:0,l.is(window)||l.is(document)?(l=k,b=0,c=0):(d=l.offset(),b=d.top,c=d.left),b+=k.scrollTop(),c+=k.scrollLeft(),g.viewportConstrain!==!1&&(e=Math.min(e,b+l.outerHeight()-j-this.margin),e=Math.max(e,b+this.margin),f=Math.min(f,c+l.outerWidth()-i-this.margin),
-f=Math.max(f,c+this.margin)),this.el.css({top:e-h.top,left:f-h.left})},trigger:function(a){this.options[a]&&this.options[a].apply(this,Array.prototype.slice.call(arguments,1))}}),gb=Pa.CoordCache=ra.extend({els:null,forcedOffsetParentEl:null,origin:null,boundingRect:null,isHorizontal:!1,isVertical:!1,lefts:null,rights:null,tops:null,bottoms:null,constructor:function(b){this.els=a(b.els),this.isHorizontal=b.isHorizontal,this.isVertical=b.isVertical,this.forcedOffsetParentEl=b.offsetParent?a(b.offsetParent):null},build:function(){var a=this.forcedOffsetParentEl||this.els.eq(0).offsetParent();this.origin=a.offset(),this.boundingRect=this.queryBoundingRect(),this.isHorizontal&&this.buildElHorizontals(),this.isVertical&&this.buildElVerticals()},clear:function(){this.origin=null,this.boundingRect=null,this.lefts=null,this.rights=null,this.tops=null,this.bottoms=null},ensureBuilt:function(){this.origin||this.build()},queryBoundingRect:function(){var a=n(this.els.eq(0));return a.is(document)?void 0:p(a)},buildElHorizontals:function(){var b=[],c=[];this.els.each(function(d,e){var f=a(e),g=f.offset().left,h=f.outerWidth();b.push(g),c.push(g+h)}),this.lefts=b,this.rights=c},buildElVerticals:function(){var b=[],c=[];this.els.each(function(d,e){var f=a(e),g=f.offset().top,h=f.outerHeight();b.push(g),c.push(g+h)}),this.tops=b,this.bottoms=c},getHorizontalIndex:function(a){this.ensureBuilt();var b,c=this.boundingRect,d=this.lefts,e=this.rights,f=d.length;if(!c||a>=c.left&&a<c.right)for(b=0;f>b;b++)if(a>=d[b]&&a<e[b])return b},getVerticalIndex:function(a){this.ensureBuilt();var b,c=this.boundingRect,d=this.tops,e=this.bottoms,f=d.length;if(!c||a>=c.top&&a<c.bottom)for(b=0;f>b;b++)if(a>=d[b]&&a<e[b])return b},getLeftOffset:function(a){return this.ensureBuilt(),this.lefts[a]},getLeftPosition:function(a){return this.ensureBuilt(),this.lefts[a]-this.origin.left},getRightOffset:function(a){return this.ensureBuilt(),this.rights[a]},getRightPosition:function(a){return this.ensureBuilt(),this.rights[a]-this.origin.left},getWidth:function(a){return this.ensureBuilt(),this.rights[a]-this.lefts[a]},getTopOffset:function(a){return this.ensureBuilt(),this.tops[a]},getTopPosition:function(a){return this.ensureBuilt(),this.tops[a]-this.origin.top},getBottomOffset:function(a){return this.ensureBuilt(),this.bottoms[a]},getBottomPosition:function(a){return this.ensureBuilt(),this.bottoms[a]-this.origin.top},getHeight:function(a){return this.ensureBuilt(),this.bottoms[a]-this.tops[a]}}),hb=Pa.DragListener=ra.extend({options:null,isListening:!1,isDragging:!1,originX:null,originY:null,mousemoveProxy:null,mouseupProxy:null,subjectEl:null,subjectHref:null,scrollEl:null,scrollBounds:null,scrollTopVel:null,scrollLeftVel:null,scrollIntervalId:null,scrollHandlerProxy:null,scrollSensitivity:30,scrollSpeed:200,scrollIntervalMs:50,constructor:function(a){a=a||{},this.options=a,this.subjectEl=a.subjectEl},mousedown:function(a){v(a)&&(a.preventDefault(),this.startListening(a),this.options.distance||this.startDrag(a))},startListening:function(b){var c;this.isListening||(b&&this.options.scroll&&(c=n(a(b.target)),c.is(window)||c.is(document)||(this.scrollEl=c,this.scrollHandlerProxy=da(ca(this,"scrollHandler"),100),this.scrollEl.on("scroll",this.scrollHandlerProxy))),a(document).on("mousemove",this.mousemoveProxy=ca(this,"mousemove")).on("mouseup",this.mouseupProxy=ca(this,"mouseup")).on("selectstart",this.preventDefault),b?(this.originX=b.pageX,this.originY=b.pageY):(this.originX=0,this.originY=0),this.isListening=!0,this.listenStart(b))},listenStart:function(a){this.trigger("listenStart",a)},mousemove:function(a){var b,c,d=a.pageX-this.originX,e=a.pageY-this.originY;this.isDragging||(b=this.options.distance||1,c=d*d+e*e,c>=b*b&&this.startDrag(a)),this.isDragging&&this.drag(d,e,a)},startDrag:function(a){this.isListening||this.startListening(),this.isDragging||(this.isDragging=!0,this.dragStart(a))},dragStart:function(a){var b=this.subjectEl;this.trigger("dragStart",a),(this.subjectHref=b?b.attr("href"):null)&&b.removeAttr("href")},drag:function(a,b,c){this.trigger("drag",a,b,c),this.updateScroll(c)},mouseup:function(a){this.stopListening(a)},stopDrag:function(a){this.isDragging&&(this.stopScrolling(),this.dragStop(a),this.isDragging=!1)},dragStop:function(a){var b=this;this.trigger("dragStop",a),setTimeout(function(){b.subjectHref&&b.subjectEl.attr("href",b.subjectHref)},0)},stopListening:function(b){this.stopDrag(b),this.isListening&&(this.scrollEl&&(this.scrollEl.off("scroll",this.scrollHandlerProxy),this.scrollHandlerProxy=null),a(document).off("mousemove",this.mousemoveProxy).off("mouseup",this.mouseupProxy).off("selectstart",this.preventDefault),this.mousemoveProxy=null,this.mouseupProxy=null,this.isListening=!1,this.listenStop(b))},listenStop:function(a){this.trigger("listenStop",a)},trigger:function(a){this.options[a]&&this.options[a].apply(this,Array.prototype.slice.call(arguments,1))},preventDefault:function(a){a.preventDefault()},computeScrollBounds:function(){var a=this.scrollEl;this.scrollBounds=a?o(a):null},updateScroll:function(a){var b,c,d,e,f=this.scrollSensitivity,g=this.scrollBounds,h=0,i=0;g&&(b=(f-(a.pageY-g.top))/f,c=(f-(g.bottom-a.pageY))/f,d=(f-(a.pageX-g.left))/f,e=(f-(g.right-a.pageX))/f,b>=0&&1>=b?h=b*this.scrollSpeed*-1:c>=0&&1>=c&&(h=c*this.scrollSpeed),d>=0&&1>=d?i=d*this.scrollSpeed*-1:e>=0&&1>=e&&(i=e*this.scrollSpeed)),this.setScrollVel(h,i)},setScrollVel:function(a,b){this.scrollTopVel=a,this.scrollLeftVel=b,this.constrainScrollVel(),!this.scrollTopVel&&!this.scrollLeftVel||this.scrollIntervalId||(this.scrollIntervalId=setInterval(ca(this,"scrollIntervalFunc"),this.scrollIntervalMs))},constrainScrollVel:function(){var a=this.scrollEl;this.scrollTopVel<0?a.scrollTop()<=0&&(this.scrollTopVel=0):this.scrollTopVel>0&&a.scrollTop()+a[0].clientHeight>=a[0].scrollHeight&&(this.scrollTopVel=0),this.scrollLeftVel<0?a.scrollLeft()<=0&&(this.scrollLeftVel=0):this.scrollLeftVel>0&&a.scrollLeft()+a[0].clientWidth>=a[0].scrollWidth&&(this.scrollLeftVel=0)},scrollIntervalFunc:function(){var a=this.scrollEl,b=this.scrollIntervalMs/1e3;this.scrollTopVel&&a.scrollTop(a.scrollTop()+this.scrollTopVel*b),this.scrollLeftVel&&a.scrollLeft(a.scrollLeft()+this.scrollLeftVel*b),this.constrainScrollVel(),this.scrollTopVel||this.scrollLeftVel||this.stopScrolling()},stopScrolling:function(){this.scrollIntervalId&&(clearInterval(this.scrollIntervalId),this.scrollIntervalId=null,this.scrollStop())},scrollHandler:function(){this.scrollIntervalId||this.scrollStop()},scrollStop:function(){}}),ib=hb.extend({component:null,origHit:null,hit:null,coordAdjust:null,constructor:function(a,b){hb.call(this,b),this.component=a},listenStart:function(a){var b,c,d,e=this.subjectEl;hb.prototype.listenStart.apply(this,arguments),this.computeCoords(),a?(c={left:a.pageX,top:a.pageY},d=c,e&&(b=o(e),d=x(d,b)),this.origHit=this.queryHit(d.left,d.top),e&&this.options.subjectCenter&&(this.origHit&&(b=w(this.origHit,b)||b),d=y(b)),this.coordAdjust=z(d,c)):(this.origHit=null,this.coordAdjust=null)},computeCoords:function(){this.component.prepareHits(),this.computeScrollBounds()},dragStart:function(a){var b;hb.prototype.dragStart.apply(this,arguments),b=this.queryHit(a.pageX,a.pageY),b&&this.hitOver(b)},drag:function(a,b,c){var d;hb.prototype.drag.apply(this,arguments),d=this.queryHit(c.pageX,c.pageY),ua(d,this.hit)||(this.hit&&this.hitOut(),d&&this.hitOver(d))},dragStop:function(){this.hitDone(),hb.prototype.dragStop.apply(this,arguments)},hitOver:function(a){var b=ua(a,this.origHit);this.hit=a,this.trigger("hitOver",this.hit,b,this.origHit)},hitOut:function(){this.hit&&(this.trigger("hitOut",this.hit),this.hitDone(),this.hit=null)},hitDone:function(){this.hit&&this.trigger("hitDone",this.hit)},listenStop:function(){hb.prototype.listenStop.apply(this,arguments),this.origHit=null,this.hit=null,this.component.releaseHits()},scrollStop:function(){hb.prototype.scrollStop.apply(this,arguments),this.computeCoords()},queryHit:function(a,b){return this.coordAdjust&&(a+=this.coordAdjust.left,b+=this.coordAdjust.top),this.component.queryHit(a,b)}}),jb=ra.extend({options:null,sourceEl:null,el:null,parentEl:null,top0:null,left0:null,mouseY0:null,mouseX0:null,topDelta:null,leftDelta:null,mousemoveProxy:null,isFollowing:!1,isHidden:!1,isAnimating:!1,constructor:function(b,c){this.options=c=c||{},this.sourceEl=b,this.parentEl=c.parentEl?a(c.parentEl):b.parent()},start:function(b){this.isFollowing||(this.isFollowing=!0,this.mouseY0=b.pageY,this.mouseX0=b.pageX,this.topDelta=0,this.leftDelta=0,this.isHidden||this.updatePosition(),a(document).on("mousemove",this.mousemoveProxy=ca(this,"mousemove")))},stop:function(b,c){function d(){this.isAnimating=!1,e.removeElement(),this.top0=this.left0=null,c&&c()}var e=this,f=this.options.revertDuration;this.isFollowing&&!this.isAnimating&&(this.isFollowing=!1,a(document).off("mousemove",this.mousemoveProxy),b&&f&&!this.isHidden?(this.isAnimating=!0,this.el.animate({top:this.top0,left:this.left0},{duration:f,complete:d})):d())},getEl:function(){var a=this.el;return a||(this.sourceEl.width(),a=this.el=this.sourceEl.clone().css({position:"absolute",visibility:"",display:this.isHidden?"none":"",margin:0,right:"auto",bottom:"auto",width:this.sourceEl.width(),height:this.sourceEl.height(),opacity:this.options.opacity||"",zIndex:this.options.zIndex}).appendTo(this.parentEl)),a},removeElement:function(){this.el&&(this.el.remove(),this.el=null)},updatePosition:function(){var a,b;this.getEl(),null===this.top0&&(this.sourceEl.width(),a=this.sourceEl.offset(),b=this.el.offsetParent().offset(),this.top0=a.top-b.top,this.left0=a.left-b.left),this.el.css({top:this.top0+this.topDelta,left:this.left0+this.leftDelta})},mousemove:function(a){this.topDelta=a.pageY-this.mouseY0,this.leftDelta=a.pageX-this.mouseX0,this.isHidden||this.updatePosition()},hide:function(){this.isHidden||(this.isHidden=!0,this.el&&this.el.hide())},show:function(){this.isHidden&&(this.isHidden=!1,this.updatePosition(),this.getEl().show())}}),kb=Pa.Grid=ra.extend({view:null,isRTL:null,start:null,end:null,el:null,elsByFill:null,externalDragStartProxy:null,eventTimeFormat:null,displayEventTime:null,displayEventEnd:null,minResizeDuration:null,largeUnit:null,constructor:function(a){this.view=a,this.isRTL=a.opt("isRTL"),this.elsByFill={},this.externalDragStartProxy=ca(this,"externalDragStart")},computeEventTimeFormat:function(){return this.view.opt("smallTimeFormat")},computeDisplayEventTime:function(){return!0},computeDisplayEventEnd:function(){return!0},setRange:function(a){this.start=a.start.clone(),this.end=a.end.clone(),this.rangeUpdated(),this.processRangeOptions()},rangeUpdated:function(){},processRangeOptions:function(){var a,b,c=this.view;this.eventTimeFormat=c.opt("eventTimeFormat")||c.opt("timeFormat")||this.computeEventTimeFormat(),a=c.opt("displayEventTime"),null==a&&(a=this.computeDisplayEventTime()),b=c.opt("displayEventEnd"),null==b&&(b=this.computeDisplayEventEnd()),this.displayEventTime=a,this.displayEventEnd=b},spanToSegs:function(a){},diffDates:function(a,b){return this.largeUnit?H(a,b,this.largeUnit):F(a,b)},prepareHits:function(){},releaseHits:function(){},queryHit:function(a,b){},getHitSpan:function(a){},getHitEl:function(a){},setElement:function(b){var c=this;this.el=b,b.on("mousedown",function(b){a(b.target).is(".fc-event-container *, .fc-more")||a(b.target).closest(".fc-popover").length||c.dayMousedown(b)}),this.bindSegHandlers(),this.bindGlobalHandlers()},removeElement:function(){this.unbindGlobalHandlers(),this.el.remove()},renderSkeleton:function(){},renderDates:function(){},unrenderDates:function(){},bindGlobalHandlers:function(){a(document).on("dragstart sortstart",this.externalDragStartProxy)},unbindGlobalHandlers:function(){a(document).off("dragstart sortstart",this.externalDragStartProxy)},dayMousedown:function(a){var b,c,d=this,e=this.view,f=e.opt("selectable"),i=new ib(this,{scroll:e.opt("dragScroll"),dragStart:function(){e.unselect()},hitOver:function(a,e,h){h&&(b=e?a:null,f&&(c=d.computeSelection(d.getHitSpan(h),d.getHitSpan(a)),c?d.renderSelection(c):c===!1&&g()))},hitOut:function(){b=null,c=null,d.unrenderSelection(),h()},listenStop:function(a){b&&e.triggerDayClick(d.getHitSpan(b),d.getHitEl(b),a),c&&e.reportSelection(c,a),h()}});i.mousedown(a)},renderEventLocationHelper:function(a,b){var c=this.fabricateHelperEvent(a,b);this.renderHelper(c,b)},fabricateHelperEvent:function(a,b){var c=b?R(b.event):{};return c.start=a.start.clone(),c.end=a.end?a.end.clone():null,c.allDay=null,this.view.calendar.normalizeEventDates(c),c.className=(c.className||[]).concat("fc-helper"),b||(c.editable=!1),c},renderHelper:function(a,b){},unrenderHelper:function(){},renderSelection:function(a){this.renderHighlight(a)},unrenderSelection:function(){this.unrenderHighlight()},computeSelection:function(a,b){var c=this.computeSelectionSpan(a,b);return c&&!this.view.calendar.isSelectionSpanAllowed(c)?!1:c},computeSelectionSpan:function(a,b){var c=[a.start,a.end,b.start,b.end];return c.sort(aa),{start:c[0].clone(),end:c[3].clone()}},renderHighlight:function(a){this.renderFill("highlight",this.spanToSegs(a))},unrenderHighlight:function(){this.unrenderFill("highlight")},highlightSegClasses:function(){return["fc-highlight"]},renderBusinessHours:function(){},unrenderBusinessHours:function(){},getNowIndicatorUnit:function(){},renderNowIndicator:function(a){},unrenderNowIndicator:function(){},renderFill:function(a,b){},unrenderFill:function(a){var b=this.elsByFill[a];b&&(b.remove(),delete this.elsByFill[a])},renderFillSegEls:function(b,c){var d,e=this,f=this[b+"SegEl"],g="",h=[];if(c.length){for(d=0;d<c.length;d++)g+=this.fillSegHtml(b,c[d]);a(g).each(function(b,d){var g=c[b],i=a(d);f&&(i=f.call(e,g,i)),i&&(i=a(i),i.is(e.fillSegTag)&&(g.el=i,h.push(g)))})}return h},fillSegTag:"div",fillSegHtml:function(a,b){var c=this[a+"SegClasses"],d=this[a+"SegCss"],e=c?c.call(this,b):[],f=$(d?d.call(this,b):{});return"<"+this.fillSegTag+(e.length?' class="'+e.join(" ")+'"':"")+(f?' style="'+f+'"':"")+" />"},getDayClasses:function(a){var b=this.view,c=b.calendar.getNow(),d=["fc-"+Ta[a.day()]];return 1==b.intervalDuration.as("months")&&a.month()!=b.intervalStart.month()&&d.push("fc-other-month"),a.isSame(c,"day")?d.push("fc-today",b.highlightStateClass):c>a?d.push("fc-past"):d.push("fc-future"),d}});kb.mixin({mousedOverSeg:null,isDraggingSeg:!1,isResizingSeg:!1,isDraggingExternal:!1,segs:null,renderEvents:function(a){var b,c=[],d=[];for(b=0;b<a.length;b++)(wa(a[b])?c:d).push(a[b]);this.segs=[].concat(this.renderBgEvents(c),this.renderFgEvents(d))},renderBgEvents:function(a){var b=this.eventsToSegs(a);return this.renderBgSegs(b)||b},renderFgEvents:function(a){var b=this.eventsToSegs(a);return this.renderFgSegs(b)||b},unrenderEvents:function(){this.triggerSegMouseout(),this.unrenderFgSegs(),this.unrenderBgSegs(),this.segs=null},getEventSegs:function(){return this.segs||[]},renderFgSegs:function(a){},unrenderFgSegs:function(){},renderFgSegEls:function(b,c){var d,e=this.view,f="",g=[];if(b.length){for(d=0;d<b.length;d++)f+=this.fgSegHtml(b[d],c);a(f).each(function(c,d){var f=b[c],h=e.resolveEventEl(f.event,a(d));h&&(h.data("fc-seg",f),f.el=h,g.push(f))})}return g},fgSegHtml:function(a,b){},renderBgSegs:function(a){return this.renderFill("bgEvent",a)},unrenderBgSegs:function(){this.unrenderFill("bgEvent")},bgEventSegEl:function(a,b){return this.view.resolveEventEl(a.event,b)},bgEventSegClasses:function(a){var b=a.event,c=b.source||{};return["fc-bgevent"].concat(b.className,c.className||[])},bgEventSegCss:function(a){return{"background-color":this.getSegSkinCss(a)["background-color"]}},businessHoursSegClasses:function(a){return["fc-nonbusiness","fc-bgevent"]},bindSegHandlers:function(){var b=this,c=this.view;a.each({mouseenter:function(a,c){b.triggerSegMouseover(a,c)},mouseleave:function(a,c){b.triggerSegMouseout(a,c)},click:function(a,b){return c.trigger("eventClick",this,a.event,b)},mousedown:function(d,e){a(e.target).is(".fc-resizer")&&c.isEventResizable(d.event)?b.segResizeMousedown(d,e,a(e.target).is(".fc-start-resizer")):c.isEventDraggable(d.event)&&b.segDragMousedown(d,e)}},function(c,d){b.el.on(c,".fc-event-container > *",function(c){var e=a(this).data("fc-seg");return!e||b.isDraggingSeg||b.isResizingSeg?void 0:d.call(this,e,c)})})},triggerSegMouseover:function(a,b){this.mousedOverSeg||(this.mousedOverSeg=a,this.view.trigger("eventMouseover",a.el[0],a.event,b))},triggerSegMouseout:function(a,b){b=b||{},this.mousedOverSeg&&(a=a||this.mousedOverSeg,this.mousedOverSeg=null,this.view.trigger("eventMouseout",a.el[0],a.event,b))},segDragMousedown:function(a,b){var c,d=this,e=this.view,f=e.calendar,i=a.el,j=a.event,k=new jb(a.el,{parentEl:e.el,opacity:e.opt("dragOpacity"),revertDuration:e.opt("dragRevertDuration"),zIndex:2}),l=new ib(e,{distance:5,scroll:e.opt("dragScroll"),subjectEl:i,subjectCenter:!0,listenStart:function(a){k.hide(),k.start(a)},dragStart:function(b){d.triggerSegMouseout(a,b),d.segDragStart(a,b),e.hideEvent(j)},hitOver:function(b,h,i){a.hit&&(i=a.hit),c=d.computeEventDrop(i.component.getHitSpan(i),b.component.getHitSpan(b),j),c&&!f.isEventSpanAllowed(d.eventToSpan(c),j)&&(g(),c=null),c&&e.renderDrag(c,a)?k.hide():k.show(),h&&(c=null)},hitOut:function(){e.unrenderDrag(),k.show(),c=null},hitDone:function(){h()},dragStop:function(b){k.stop(!c,function(){e.unrenderDrag(),e.showEvent(j),d.segDragStop(a,b),c&&e.reportEventDrop(j,c,this.largeUnit,i,b)})},listenStop:function(){k.stop()}});l.mousedown(b)},segDragStart:function(a,b){this.isDraggingSeg=!0,this.view.trigger("eventDragStart",a.el[0],a.event,b,{})},segDragStop:function(a,b){this.isDraggingSeg=!1,this.view.trigger("eventDragStop",a.el[0],a.event,b,{})},computeEventDrop:function(a,b,c){var d,e,f=this.view.calendar,g=a.start,h=b.start;return g.hasTime()===h.hasTime()?(d=this.diffDates(h,g),c.allDay&&N(d)?(e={start:c.start.clone(),end:f.getEventEnd(c),allDay:!1},f.normalizeEventTimes(e)):e={start:c.start.clone(),end:c.end?c.end.clone():null,allDay:c.allDay},e.start.add(d),e.end&&e.end.add(d)):e={start:h.clone(),end:null,allDay:!h.hasTime()},e},applyDragOpacity:function(a){var b=this.view.opt("dragOpacity");null!=b&&a.each(function(a,c){c.style.opacity=b})},externalDragStart:function(b,c){var d,e,f=this.view;f.opt("droppable")&&(d=a((c?c.item:null)||b.target),e=f.opt("dropAccept"),(a.isFunction(e)?e.call(d[0],d):d.is(e))&&(this.isDraggingExternal||this.listenToExternalDrag(d,b,c)))},listenToExternalDrag:function(a,b,c){var d,e=this,f=this.view.calendar,i=Ba(a),j=new ib(this,{listenStart:function(){e.isDraggingExternal=!0},hitOver:function(a){d=e.computeExternalDrop(a.component.getHitSpan(a),i),d&&!f.isExternalSpanAllowed(e.eventToSpan(d),d,i.eventProps)&&(g(),d=null),d&&e.renderDrag(d)},hitOut:function(){d=null},hitDone:function(){h(),e.unrenderDrag()},dragStop:function(){d&&e.view.reportExternalDrop(i,d,a,b,c)},listenStop:function(){e.isDraggingExternal=!1}});j.startDrag(b)},computeExternalDrop:function(a,b){var c=this.view.calendar,d={start:c.applyTimezone(a.start),end:null};return b.startTime&&!d.start.hasTime()&&d.start.time(b.startTime),b.duration&&(d.end=d.start.clone().add(b.duration)),d},renderDrag:function(a,b){},unrenderDrag:function(){},segResizeMousedown:function(a,b,c){var d,e=this,f=this.view,i=f.calendar,j=a.el,k=a.event,l=i.getEventEnd(k),m=new ib(this,{distance:5,scroll:f.opt("dragScroll"),subjectEl:j,dragStart:function(b){e.triggerSegMouseout(a,b),e.segResizeStart(a,b)},hitOver:function(b,h,j){var m=e.getHitSpan(j),n=e.getHitSpan(b);d=c?e.computeEventStartResize(m,n,k):e.computeEventEndResize(m,n,k),d&&(i.isEventSpanAllowed(e.eventToSpan(d),k)?d.start.isSame(k.start)&&d.end.isSame(l)&&(d=null):(g(),d=null)),d&&(f.hideEvent(k),e.renderEventResize(d,a))},hitOut:function(){d=null},hitDone:function(){e.unrenderEventResize(),f.showEvent(k),h()},dragStop:function(b){e.segResizeStop(a,b),d&&f.reportEventResize(k,d,this.largeUnit,j,b)}});m.mousedown(b)},segResizeStart:function(a,b){this.isResizingSeg=!0,this.view.trigger("eventResizeStart",a.el[0],a.event,b,{})},segResizeStop:function(a,b){this.isResizingSeg=!1,this.view.trigger("eventResizeStop",a.el[0],a.event,b,{})},computeEventStartResize:function(a,b,c){return this.computeEventResize("start",a,b,c)},computeEventEndResize:function(a,b,c){return this.computeEventResize("end",a,b,c)},computeEventResize:function(a,b,c,d){var e,f,g=this.view.calendar,h=this.diffDates(c[a],b[a]);return e={start:d.start.clone(),end:g.getEventEnd(d),allDay:d.allDay},e.allDay&&N(h)&&(e.allDay=!1,g.normalizeEventTimes(e)),e[a].add(h),e.start.isBefore(e.end)||(f=this.minResizeDuration||(d.allDay?g.defaultAllDayEventDuration:g.defaultTimedEventDuration),"start"==a?e.start=e.end.clone().subtract(f):e.end=e.start.clone().add(f)),e},renderEventResize:function(a,b){},unrenderEventResize:function(){},getEventTimeText:function(a,b,c){return null==b&&(b=this.eventTimeFormat),null==c&&(c=this.displayEventEnd),this.displayEventTime&&a.start.hasTime()?c&&a.end?this.view.formatRange(a,b):a.start.format(b):""},getSegClasses:function(a,b,c){var d=a.event,e=["fc-event",a.isStart?"fc-start":"fc-not-start",a.isEnd?"fc-end":"fc-not-end"].concat(d.className,d.source?d.source.className:[]);return b&&e.push("fc-draggable"),c&&e.push("fc-resizable"),e},getSegSkinCss:function(a){var b=a.event,c=this.view,d=b.source||{},e=b.color,f=d.color,g=c.opt("eventColor");return{"background-color":b.backgroundColor||e||d.backgroundColor||f||c.opt("eventBackgroundColor")||g,"border-color":b.borderColor||e||d.borderColor||f||c.opt("eventBorderColor")||g,color:b.textColor||d.textColor||c.opt("eventTextColor")}},eventToSegs:function(a){return this.eventsToSegs([a])},eventToSpan:function(a){return this.eventToSpans(a)[0]},eventToSpans:function(a){var b=this.eventToRange(a);return this.eventRangeToSpans(b,a)},eventsToSegs:function(b,c){var d=this,e=za(b),f=[];return a.each(e,function(a,b){var e,g=[];for(e=0;e<b.length;e++)g.push(d.eventToRange(b[e]));if(xa(b[0]))for(g=d.invertRanges(g),e=0;e<g.length;e++)f.push.apply(f,d.eventRangeToSegs(g[e],b[0],c));else for(e=0;e<g.length;e++)f.push.apply(f,d.eventRangeToSegs(g[e],b[e],c))}),f},eventToRange:function(a){return{start:a.start.clone().stripZone(),end:(a.end?a.end.clone():this.view.calendar.getDefaultEventEnd(null!=a.allDay?a.allDay:!a.start.hasTime(),a.start)).stripZone()}},eventRangeToSegs:function(a,b,c){var d,e=this.eventRangeToSpans(a,b),f=[];for(d=0;d<e.length;d++)f.push.apply(f,this.eventSpanToSegs(e[d],b,c));return f},eventRangeToSpans:function(b,c){return[a.extend({},b)]},eventSpanToSegs:function(a,b,c){var d,e,f=c?c(a):this.spanToSegs(a);for(d=0;d<f.length;d++)e=f[d],e.event=b,e.eventStartMS=+a.start,e.eventDurationMS=a.end-a.start;return f},invertRanges:function(a){var b,c,d=this.view,e=d.start.clone(),f=d.end.clone(),g=[],h=e;for(a.sort(Aa),b=0;b<a.length;b++)c=a[b],c.start>h&&g.push({start:h,end:c.start}),h=c.end;return f>h&&g.push({start:h,end:f}),g},sortEventSegs:function(a){a.sort(ca(this,"compareEventSegs"))},compareEventSegs:function(a,b){return a.eventStartMS-b.eventStartMS||b.eventDurationMS-a.eventDurationMS||b.event.allDay-a.event.allDay||B(a.event,b.event,this.view.eventOrderSpecs)}}),Pa.isBgEvent=wa,Pa.dataAttrPrefix="";var lb=Pa.DayTableMixin={breakOnWeeks:!1,dayDates:null,dayIndices:null,daysPerRow:null,rowCnt:null,colCnt:null,colHeadFormat:null,updateDayTable:function(){for(var a,b,c,d=this.view,e=this.start.clone(),f=-1,g=[],h=[];e.isBefore(this.end);)d.isHiddenDay(e)?g.push(f+.5):(f++,g.push(f),h.push(e.clone())),e.add(1,"days");if(this.breakOnWeeks){for(b=h[0].day(),a=1;a<h.length&&h[a].day()!=b;a++);c=Math.ceil(h.length/a)}else c=1,a=h.length;this.dayDates=h,this.dayIndices=g,this.daysPerRow=a,this.rowCnt=c,this.updateDayTableCols()},updateDayTableCols:function(){this.colCnt=this.computeColCnt(),this.colHeadFormat=this.view.opt("columnFormat")||this.computeColHeadFormat()},computeColCnt:function(){return this.daysPerRow},getCellDate:function(a,b){return this.dayDates[this.getCellDayIndex(a,b)].clone()},getCellRange:function(a,b){var c=this.getCellDate(a,b),d=c.clone().add(1,"days");return{start:c,end:d}},getCellDayIndex:function(a,b){return a*this.daysPerRow+this.getColDayIndex(b)},getColDayIndex:function(a){return this.isRTL?this.colCnt-1-a:a},getDateDayIndex:function(a){var b=this.dayIndices,c=a.diff(this.start,"days");return 0>c?b[0]-1:c>=b.length?b[b.length-1]+1:b[c]},computeColHeadFormat:function(){return this.rowCnt>1||this.colCnt>10?"ddd":this.colCnt>1?this.view.opt("dayOfMonthFormat"):"dddd"},sliceRangeByRow:function(a){var b,c,d,e,f,g=this.daysPerRow,h=this.view.computeDayRange(a),i=this.getDateDayIndex(h.start),j=this.getDateDayIndex(h.end.clone().subtract(1,"days")),k=[];for(b=0;b<this.rowCnt;b++)c=b*g,d=c+g-1,e=Math.max(i,c),f=Math.min(j,d),e=Math.ceil(e),f=Math.floor(f),f>=e&&k.push({row:b,firstRowDayIndex:e-c,lastRowDayIndex:f-c,isStart:e===i,isEnd:f===j});return k},sliceRangeByDay:function(a){var b,c,d,e,f,g,h=this.daysPerRow,i=this.view.computeDayRange(a),j=this.getDateDayIndex(i.start),k=this.getDateDayIndex(i.end.clone().subtract(1,"days")),l=[];for(b=0;b<this.rowCnt;b++)for(c=b*h,d=c+h-1,e=c;d>=e;e++)f=Math.max(j,e),g=Math.min(k,e),f=Math.ceil(f),g=Math.floor(g),g>=f&&l.push({row:b,firstRowDayIndex:f-c,lastRowDayIndex:g-c,isStart:f===j,isEnd:g===k});return l},renderHeadHtml:function(){var a=this.view;return'<div class="fc-row '+a.widgetHeaderClass+'"><table><thead>'+this.renderHeadTrHtml()+"</thead></table></div>"},renderHeadIntroHtml:function(){return this.renderIntroHtml()},renderHeadTrHtml:function(){return"<tr>"+(this.isRTL?"":this.renderHeadIntroHtml())+this.renderHeadDateCellsHtml()+(this.isRTL?this.renderHeadIntroHtml():"")+"</tr>"},renderHeadDateCellsHtml:function(){var a,b,c=[];for(a=0;a<this.colCnt;a++)b=this.getCellDate(0,a),c.push(this.renderHeadDateCellHtml(b));return c.join("")},renderHeadDateCellHtml:function(a,b,c){var d=this.view;return'<th class="fc-day-header '+d.widgetHeaderClass+" fc-"+Ta[a.day()]+'"'+(1==this.rowCnt?' data-date="'+a.format("YYYY-MM-DD")+'"':"")+(b>1?' colspan="'+b+'"':"")+(c?" "+c:"")+">"+Y(a.format(this.colHeadFormat))+"</th>"},renderBgTrHtml:function(a){return"<tr>"+(this.isRTL?"":this.renderBgIntroHtml(a))+this.renderBgCellsHtml(a)+(this.isRTL?this.renderBgIntroHtml(a):"")+"</tr>"},renderBgIntroHtml:function(a){return this.renderIntroHtml()},renderBgCellsHtml:function(a){var b,c,d=[];for(b=0;b<this.colCnt;b++)c=this.getCellDate(a,b),d.push(this.renderBgCellHtml(c));return d.join("")},renderBgCellHtml:function(a,b){var c=this.view,d=this.getDayClasses(a);return d.unshift("fc-day",c.widgetContentClass),'<td class="'+d.join(" ")+'" data-date="'+a.format("YYYY-MM-DD")+'"'+(b?" "+b:"")+"></td>"},renderIntroHtml:function(){},bookendCells:function(a){var b=this.renderIntroHtml();b&&(this.isRTL?a.append(b):a.prepend(b))}},mb=Pa.DayGrid=kb.extend(lb,{numbersVisible:!1,bottomCoordPadding:0,rowEls:null,cellEls:null,helperEls:null,rowCoordCache:null,colCoordCache:null,renderDates:function(a){var b,c,d=this.view,e=this.rowCnt,f=this.colCnt,g="";for(b=0;e>b;b++)g+=this.renderDayRowHtml(b,a);for(this.el.html(g),this.rowEls=this.el.find(".fc-row"),this.cellEls=this.el.find(".fc-day"),this.rowCoordCache=new gb({els:this.rowEls,isVertical:!0}),this.colCoordCache=new gb({els:this.cellEls.slice(0,this.colCnt),isHorizontal:!0}),b=0;e>b;b++)for(c=0;f>c;c++)d.trigger("dayRender",null,this.getCellDate(b,c),this.getCellEl(b,c))},unrenderDates:function(){this.removeSegPopover()},renderBusinessHours:function(){var a=this.view.calendar.getBusinessHoursEvents(!0),b=this.eventsToSegs(a);this.renderFill("businessHours",b,"bgevent")},renderDayRowHtml:function(a,b){var c=this.view,d=["fc-row","fc-week",c.widgetContentClass];return b&&d.push("fc-rigid"),'<div class="'+d.join(" ")+'"><div class="fc-bg"><table>'+this.renderBgTrHtml(a)+'</table></div><div class="fc-content-skeleton"><table>'+(this.numbersVisible?"<thead>"+this.renderNumberTrHtml(a)+"</thead>":"")+"</table></div></div>"},renderNumberTrHtml:function(a){return"<tr>"+(this.isRTL?"":this.renderNumberIntroHtml(a))+this.renderNumberCellsHtml(a)+(this.isRTL?this.renderNumberIntroHtml(a):"")+"</tr>"},renderNumberIntroHtml:function(a){return this.renderIntroHtml()},renderNumberCellsHtml:function(a){var b,c,d=[];for(b=0;b<this.colCnt;b++)c=this.getCellDate(a,b),d.push(this.renderNumberCellHtml(c));return d.join("")},renderNumberCellHtml:function(a){var b;return this.view.dayNumbersVisible?(b=this.getDayClasses(a),b.unshift("fc-day-number"),'<td class="'+b.join(" ")+'" data-date="'+a.format()+'">'+a.date()+"</td>"):"<td/>"},computeEventTimeFormat:function(){return this.view.opt("extraSmallTimeFormat")},computeDisplayEventEnd:function(){return 1==this.colCnt},rangeUpdated:function(){this.updateDayTable()},spanToSegs:function(a){var b,c,d=this.sliceRangeByRow(a);for(b=0;b<d.length;b++)c=d[b],this.isRTL?(c.leftCol=this.daysPerRow-1-c.lastRowDayIndex,c.rightCol=this.daysPerRow-1-c.firstRowDayIndex):(c.leftCol=c.firstRowDayIndex,c.rightCol=c.lastRowDayIndex);return d},prepareHits:function(){this.colCoordCache.build(),this.rowCoordCache.build(),this.rowCoordCache.bottoms[this.rowCnt-1]+=this.bottomCoordPadding},releaseHits:function(){this.colCoordCache.clear(),this.rowCoordCache.clear()},queryHit:function(a,b){var c=this.colCoordCache.getHorizontalIndex(a),d=this.rowCoordCache.getVerticalIndex(b);return null!=d&&null!=c?this.getCellHit(d,c):void 0},getHitSpan:function(a){return this.getCellRange(a.row,a.col)},getHitEl:function(a){return this.getCellEl(a.row,a.col)},getCellHit:function(a,b){return{row:a,col:b,component:this,left:this.colCoordCache.getLeftOffset(b),right:this.colCoordCache.getRightOffset(b),top:this.rowCoordCache.getTopOffset(a),bottom:this.rowCoordCache.getBottomOffset(a)}},getCellEl:function(a,b){return this.cellEls.eq(a*this.colCnt+b)},renderDrag:function(a,b){return this.renderHighlight(this.eventToSpan(a)),b&&!b.el.closest(this.el).length?(this.renderEventLocationHelper(a,b),this.applyDragOpacity(this.helperEls),!0):void 0},unrenderDrag:function(){this.unrenderHighlight(),this.unrenderHelper()},renderEventResize:function(a,b){this.renderHighlight(this.eventToSpan(a)),this.renderEventLocationHelper(a,b)},unrenderEventResize:function(){this.unrenderHighlight(),this.unrenderHelper()},renderHelper:function(b,c){var d,e=[],f=this.eventToSegs(b);f=this.renderFgSegEls(f),d=this.renderSegRows(f),this.rowEls.each(function(b,f){var g,h=a(f),i=a('<div class="fc-helper-skeleton"><table/></div>');g=c&&c.row===b?c.el.position().top:h.find(".fc-content-skeleton tbody").position().top,i.css("top",g).find("table").append(d[b].tbodyEl),h.append(i),e.push(i[0])}),this.helperEls=a(e)},unrenderHelper:function(){this.helperEls&&(this.helperEls.remove(),this.helperEls=null)},fillSegTag:"td",renderFill:function(b,c,d){var e,f,g,h=[];for(c=this.renderFillSegEls(b,c),e=0;e<c.length;e++)f=c[e],g=this.renderFillRow(b,f,d),this.rowEls.eq(f.row).append(g),h.push(g[0]);return this.elsByFill[b]=a(h),c},renderFillRow:function(b,c,d){var e,f,g=this.colCnt,h=c.leftCol,i=c.rightCol+1;return d=d||b.toLowerCase(),e=a('<div class="fc-'+d+'-skeleton"><table><tr/></table></div>'),f=e.find("tr"),h>0&&f.append('<td colspan="'+h+'"/>'),f.append(c.el.attr("colspan",i-h)),g>i&&f.append('<td colspan="'+(g-i)+'"/>'),this.bookendCells(f),e}});mb.mixin({rowStructs:null,unrenderEvents:function(){this.removeSegPopover(),kb.prototype.unrenderEvents.apply(this,arguments)},getEventSegs:function(){return kb.prototype.getEventSegs.call(this).concat(this.popoverSegs||[])},renderBgSegs:function(b){var c=a.grep(b,function(a){return a.event.allDay});return kb.prototype.renderBgSegs.call(this,c)},renderFgSegs:function(b){var c;return b=this.renderFgSegEls(b),c=this.rowStructs=this.renderSegRows(b),this.rowEls.each(function(b,d){a(d).find(".fc-content-skeleton > table").append(c[b].tbodyEl)}),b},unrenderFgSegs:function(){for(var a,b=this.rowStructs||[];a=b.pop();)a.tbodyEl.remove();
-this.rowStructs=null},renderSegRows:function(a){var b,c,d=[];for(b=this.groupSegRows(a),c=0;c<b.length;c++)d.push(this.renderSegRow(c,b[c]));return d},fgSegHtml:function(a,b){var c,d,e=this.view,f=a.event,g=e.isEventDraggable(f),h=!b&&f.allDay&&a.isStart&&e.isEventResizableFromStart(f),i=!b&&f.allDay&&a.isEnd&&e.isEventResizableFromEnd(f),j=this.getSegClasses(a,g,h||i),k=$(this.getSegSkinCss(a)),l="";return j.unshift("fc-day-grid-event","fc-h-event"),a.isStart&&(c=this.getEventTimeText(f),c&&(l='<span class="fc-time">'+Y(c)+"</span>")),d='<span class="fc-title">'+(Y(f.title||"")||"&nbsp;")+"</span>",'<a class="'+j.join(" ")+'"'+(f.url?' href="'+Y(f.url)+'"':"")+(k?' style="'+k+'"':"")+'><div class="fc-content">'+(this.isRTL?d+" "+l:l+" "+d)+"</div>"+(h?'<div class="fc-resizer fc-start-resizer" />':"")+(i?'<div class="fc-resizer fc-end-resizer" />':"")+"</a>"},renderSegRow:function(b,c){function d(b){for(;b>g;)k=(r[e-1]||[])[g],k?k.attr("rowspan",parseInt(k.attr("rowspan")||1,10)+1):(k=a("<td/>"),h.append(k)),q[e][g]=k,r[e][g]=k,g++}var e,f,g,h,i,j,k,l=this.colCnt,m=this.buildSegLevels(c),n=Math.max(1,m.length),o=a("<tbody/>"),p=[],q=[],r=[];for(e=0;n>e;e++){if(f=m[e],g=0,h=a("<tr/>"),p.push([]),q.push([]),r.push([]),f)for(i=0;i<f.length;i++){for(j=f[i],d(j.leftCol),k=a('<td class="fc-event-container"/>').append(j.el),j.leftCol!=j.rightCol?k.attr("colspan",j.rightCol-j.leftCol+1):r[e][g]=k;g<=j.rightCol;)q[e][g]=k,p[e][g]=j,g++;h.append(k)}d(l),this.bookendCells(h),o.append(h)}return{row:b,tbodyEl:o,cellMatrix:q,segMatrix:p,segLevels:m,segs:c}},buildSegLevels:function(a){var b,c,d,e=[];for(this.sortEventSegs(a),b=0;b<a.length;b++){for(c=a[b],d=0;d<e.length&&Ca(c,e[d]);d++);c.level=d,(e[d]||(e[d]=[])).push(c)}for(d=0;d<e.length;d++)e[d].sort(Da);return e},groupSegRows:function(a){var b,c=[];for(b=0;b<this.rowCnt;b++)c.push([]);for(b=0;b<a.length;b++)c[a[b].row].push(a[b]);return c}}),mb.mixin({segPopover:null,popoverSegs:null,removeSegPopover:function(){this.segPopover&&this.segPopover.hide()},limitRows:function(a){var b,c,d=this.rowStructs||[];for(b=0;b<d.length;b++)this.unlimitRow(b),c=a?"number"==typeof a?a:this.computeRowLevelLimit(b):!1,c!==!1&&this.limitRow(b,c)},computeRowLevelLimit:function(b){function c(b,c){f=Math.max(f,a(c).outerHeight())}var d,e,f,g=this.rowEls.eq(b),h=g.height(),i=this.rowStructs[b].tbodyEl.children();for(d=0;d<i.length;d++)if(e=i.eq(d).removeClass("fc-limited"),f=0,e.find("> td > :first-child").each(c),e.position().top+f>h)return d;return!1},limitRow:function(b,c){function d(d){for(;d>w;)j=t.getCellSegs(b,w,c),j.length&&(m=f[c-1][w],s=t.renderMoreLink(b,w,j),r=a("<div/>").append(s),m.append(r),v.push(r[0])),w++}var e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t=this,u=this.rowStructs[b],v=[],w=0;if(c&&c<u.segLevels.length){for(e=u.segLevels[c-1],f=u.cellMatrix,g=u.tbodyEl.children().slice(c).addClass("fc-limited").get(),h=0;h<e.length;h++){for(i=e[h],d(i.leftCol),l=[],k=0;w<=i.rightCol;)j=this.getCellSegs(b,w,c),l.push(j),k+=j.length,w++;if(k){for(m=f[c-1][i.leftCol],n=m.attr("rowspan")||1,o=[],p=0;p<l.length;p++)q=a('<td class="fc-more-cell"/>').attr("rowspan",n),j=l[p],s=this.renderMoreLink(b,i.leftCol+p,[i].concat(j)),r=a("<div/>").append(s),q.append(r),o.push(q[0]),v.push(q[0]);m.addClass("fc-limited").after(a(o)),g.push(m[0])}}d(this.colCnt),u.moreEls=a(v),u.limitedEls=a(g)}},unlimitRow:function(a){var b=this.rowStructs[a];b.moreEls&&(b.moreEls.remove(),b.moreEls=null),b.limitedEls&&(b.limitedEls.removeClass("fc-limited"),b.limitedEls=null)},renderMoreLink:function(b,c,d){var e=this,f=this.view;return a('<a class="fc-more"/>').text(this.getMoreLinkText(d.length)).on("click",function(g){var h=f.opt("eventLimitClick"),i=e.getCellDate(b,c),j=a(this),k=e.getCellEl(b,c),l=e.getCellSegs(b,c),m=e.resliceDaySegs(l,i),n=e.resliceDaySegs(d,i);"function"==typeof h&&(h=f.trigger("eventLimitClick",null,{date:i,dayEl:k,moreEl:j,segs:m,hiddenSegs:n},g)),"popover"===h?e.showSegPopover(b,c,j,m):"string"==typeof h&&f.calendar.zoomTo(i,h)})},showSegPopover:function(a,b,c,d){var e,f,g=this,h=this.view,i=c.parent();e=1==this.rowCnt?h.el:this.rowEls.eq(a),f={className:"fc-more-popover",content:this.renderSegPopoverContent(a,b,d),parentEl:this.el,top:e.offset().top,autoHide:!0,viewportConstrain:h.opt("popoverViewportConstrain"),hide:function(){g.segPopover.removeElement(),g.segPopover=null,g.popoverSegs=null}},this.isRTL?f.right=i.offset().left+i.outerWidth()+1:f.left=i.offset().left-1,this.segPopover=new fb(f),this.segPopover.show()},renderSegPopoverContent:function(b,c,d){var e,f=this.view,g=f.opt("theme"),h=this.getCellDate(b,c).format(f.opt("dayPopoverFormat")),i=a('<div class="fc-header '+f.widgetHeaderClass+'"><span class="fc-close '+(g?"ui-icon ui-icon-closethick":"fc-icon fc-icon-x")+'"></span><span class="fc-title">'+Y(h)+'</span><div class="fc-clear"/></div><div class="fc-body '+f.widgetContentClass+'"><div class="fc-event-container"></div></div>'),j=i.find(".fc-event-container");for(d=this.renderFgSegEls(d,!0),this.popoverSegs=d,e=0;e<d.length;e++)this.prepareHits(),d[e].hit=this.getCellHit(b,c),this.releaseHits(),j.append(d[e].el);return i},resliceDaySegs:function(b,c){var d=a.map(b,function(a){return a.event}),e=c.clone(),f=e.clone().add(1,"days"),g={start:e,end:f};return b=this.eventsToSegs(d,function(a){var b=E(a,g);return b?[b]:[]}),this.sortEventSegs(b),b},getMoreLinkText:function(a){var b=this.view.opt("eventLimitText");return"function"==typeof b?b(a):"+"+a+" "+b},getCellSegs:function(a,b,c){for(var d,e=this.rowStructs[a].segMatrix,f=c||0,g=[];f<e.length;)d=e[f][b],d&&g.push(d),f++;return g}});var nb=Pa.TimeGrid=kb.extend(lb,{slotDuration:null,snapDuration:null,snapsPerSlot:null,minTime:null,maxTime:null,labelFormat:null,labelInterval:null,colEls:null,slatEls:null,nowIndicatorEls:null,colCoordCache:null,slatCoordCache:null,constructor:function(){kb.apply(this,arguments),this.processOptions()},renderDates:function(){this.el.html(this.renderHtml()),this.colEls=this.el.find(".fc-day"),this.slatEls=this.el.find(".fc-slats tr"),this.colCoordCache=new gb({els:this.colEls,isHorizontal:!0}),this.slatCoordCache=new gb({els:this.slatEls,isVertical:!0}),this.renderContentSkeleton()},renderHtml:function(){return'<div class="fc-bg"><table>'+this.renderBgTrHtml(0)+'</table></div><div class="fc-slats"><table>'+this.renderSlatRowHtml()+"</table></div>"},renderSlatRowHtml:function(){for(var a,c,d,e=this.view,f=this.isRTL,g="",h=b.duration(+this.minTime);h<this.maxTime;)a=this.start.clone().time(h),c=ba(L(h,this.labelInterval)),d='<td class="fc-axis fc-time '+e.widgetContentClass+'" '+e.axisStyleAttr()+">"+(c?"<span>"+Y(a.format(this.labelFormat))+"</span>":"")+"</td>",g+='<tr data-time="'+a.format("HH:mm:ss")+'"'+(c?"":' class="fc-minor"')+">"+(f?"":d)+'<td class="'+e.widgetContentClass+'"/>'+(f?d:"")+"</tr>",h.add(this.slotDuration);return g},processOptions:function(){var c,d=this.view,e=d.opt("slotDuration"),f=d.opt("snapDuration");e=b.duration(e),f=f?b.duration(f):e,this.slotDuration=e,this.snapDuration=f,this.snapsPerSlot=e/f,this.minResizeDuration=f,this.minTime=b.duration(d.opt("minTime")),this.maxTime=b.duration(d.opt("maxTime")),c=d.opt("slotLabelFormat"),a.isArray(c)&&(c=c[c.length-1]),this.labelFormat=c||d.opt("axisFormat")||d.opt("smallTimeFormat"),c=d.opt("slotLabelInterval"),this.labelInterval=c?b.duration(c):this.computeLabelInterval(e)},computeLabelInterval:function(a){var c,d,e;for(c=Db.length-1;c>=0;c--)if(d=b.duration(Db[c]),e=L(d,a),ba(e)&&e>1)return d;return b.duration(a)},computeEventTimeFormat:function(){return this.view.opt("noMeridiemTimeFormat")},computeDisplayEventEnd:function(){return!0},prepareHits:function(){this.colCoordCache.build(),this.slatCoordCache.build()},releaseHits:function(){this.colCoordCache.clear()},queryHit:function(a,b){var c=this.snapsPerSlot,d=this.colCoordCache,e=this.slatCoordCache,f=d.getHorizontalIndex(a),g=e.getVerticalIndex(b);if(null!=f&&null!=g){var h=e.getTopOffset(g),i=e.getHeight(g),j=(b-h)/i,k=Math.floor(j*c),l=g*c+k,m=h+k/c*i,n=h+(k+1)/c*i;return{col:f,snap:l,component:this,left:d.getLeftOffset(f),right:d.getRightOffset(f),top:m,bottom:n}}},getHitSpan:function(a){var b,c=this.getCellDate(0,a.col),d=this.computeSnapTime(a.snap);return c.time(d),b=c.clone().add(this.snapDuration),{start:c,end:b}},getHitEl:function(a){return this.colEls.eq(a.col)},rangeUpdated:function(){this.updateDayTable()},computeSnapTime:function(a){return b.duration(this.minTime+this.snapDuration*a)},spanToSegs:function(a){var b,c=this.sliceRangeByTimes(a);for(b=0;b<c.length;b++)this.isRTL?c[b].col=this.daysPerRow-1-c[b].dayIndex:c[b].col=c[b].dayIndex;return c},sliceRangeByTimes:function(a){var b,c,d,e,f=[];for(c=0;c<this.daysPerRow;c++)d=this.dayDates[c].clone(),e={start:d.clone().time(this.minTime),end:d.clone().time(this.maxTime)},b=E(a,e),b&&(b.dayIndex=c,f.push(b));return f},updateSize:function(a){this.slatCoordCache.build(),a&&this.updateSegVerticals([].concat(this.fgSegs||[],this.bgSegs||[],this.businessSegs||[]))},computeDateTop:function(a,c){return this.computeTimeTop(b.duration(a-c.clone().stripTime()))},computeTimeTop:function(a){var b,c,d=this.slatEls.length,e=(a-this.minTime)/this.slotDuration;return e=Math.max(0,e),e=Math.min(d,e),b=Math.floor(e),b=Math.min(b,d-1),c=e-b,this.slatCoordCache.getTopPosition(b)+this.slatCoordCache.getHeight(b)*c},renderDrag:function(a,b){if(b){this.renderEventLocationHelper(a,b);for(var c=0;c<this.helperSegs.length;c++)this.applyDragOpacity(this.helperSegs[c].el);return!0}this.renderHighlight(this.eventToSpan(a))},unrenderDrag:function(){this.unrenderHelper(),this.unrenderHighlight()},renderEventResize:function(a,b){this.renderEventLocationHelper(a,b)},unrenderEventResize:function(){this.unrenderHelper()},renderHelper:function(a,b){this.renderHelperSegs(this.eventToSegs(a),b)},unrenderHelper:function(){this.unrenderHelperSegs()},renderBusinessHours:function(){var a=this.view.calendar.getBusinessHoursEvents(),b=this.eventsToSegs(a);this.renderBusinessSegs(b)},unrenderBusinessHours:function(){this.unrenderBusinessSegs()},getNowIndicatorUnit:function(){return"minute"},renderNowIndicator:function(b){var c,d=this.spanToSegs({start:b,end:b}),e=this.computeDateTop(b,b),f=[];for(c=0;c<d.length;c++)f.push(a('<div class="fc-now-indicator fc-now-indicator-line"></div>').css("top",e).appendTo(this.colContainerEls.eq(d[c].col))[0]);d.length>0&&f.push(a('<div class="fc-now-indicator fc-now-indicator-arrow"></div>').css("top",e).appendTo(this.el.find(".fc-content-skeleton"))[0]),this.nowIndicatorEls=a(f)},unrenderNowIndicator:function(){this.nowIndicatorEls&&(this.nowIndicatorEls.remove(),this.nowIndicatorEls=null)},renderSelection:function(a){this.view.opt("selectHelper")?this.renderEventLocationHelper(a):this.renderHighlight(a)},unrenderSelection:function(){this.unrenderHelper(),this.unrenderHighlight()},renderHighlight:function(a){this.renderHighlightSegs(this.spanToSegs(a))},unrenderHighlight:function(){this.unrenderHighlightSegs()}});nb.mixin({colContainerEls:null,fgContainerEls:null,bgContainerEls:null,helperContainerEls:null,highlightContainerEls:null,businessContainerEls:null,fgSegs:null,bgSegs:null,helperSegs:null,highlightSegs:null,businessSegs:null,renderContentSkeleton:function(){var b,c,d="";for(b=0;b<this.colCnt;b++)d+='<td><div class="fc-content-col"><div class="fc-event-container fc-helper-container"></div><div class="fc-event-container"></div><div class="fc-highlight-container"></div><div class="fc-bgevent-container"></div><div class="fc-business-container"></div></div></td>';c=a('<div class="fc-content-skeleton"><table><tr>'+d+"</tr></table></div>"),this.colContainerEls=c.find(".fc-content-col"),this.helperContainerEls=c.find(".fc-helper-container"),this.fgContainerEls=c.find(".fc-event-container:not(.fc-helper-container)"),this.bgContainerEls=c.find(".fc-bgevent-container"),this.highlightContainerEls=c.find(".fc-highlight-container"),this.businessContainerEls=c.find(".fc-business-container"),this.bookendCells(c.find("tr")),this.el.append(c)},renderFgSegs:function(a){return a=this.renderFgSegsIntoContainers(a,this.fgContainerEls),this.fgSegs=a,a},unrenderFgSegs:function(){this.unrenderNamedSegs("fgSegs")},renderHelperSegs:function(a,b){var c,d,e;for(a=this.renderFgSegsIntoContainers(a,this.helperContainerEls),c=0;c<a.length;c++)d=a[c],b&&b.col===d.col&&(e=b.el,d.el.css({left:e.css("left"),right:e.css("right"),"margin-left":e.css("margin-left"),"margin-right":e.css("margin-right")}));this.helperSegs=a},unrenderHelperSegs:function(){this.unrenderNamedSegs("helperSegs")},renderBgSegs:function(a){return a=this.renderFillSegEls("bgEvent",a),this.updateSegVerticals(a),this.attachSegsByCol(this.groupSegsByCol(a),this.bgContainerEls),this.bgSegs=a,a},unrenderBgSegs:function(){this.unrenderNamedSegs("bgSegs")},renderHighlightSegs:function(a){a=this.renderFillSegEls("highlight",a),this.updateSegVerticals(a),this.attachSegsByCol(this.groupSegsByCol(a),this.highlightContainerEls),this.highlightSegs=a},unrenderHighlightSegs:function(){this.unrenderNamedSegs("highlightSegs")},renderBusinessSegs:function(a){a=this.renderFillSegEls("businessHours",a),this.updateSegVerticals(a),this.attachSegsByCol(this.groupSegsByCol(a),this.businessContainerEls),this.businessSegs=a},unrenderBusinessSegs:function(){this.unrenderNamedSegs("businessSegs")},groupSegsByCol:function(a){var b,c=[];for(b=0;b<this.colCnt;b++)c.push([]);for(b=0;b<a.length;b++)c[a[b].col].push(a[b]);return c},attachSegsByCol:function(a,b){var c,d,e;for(c=0;c<this.colCnt;c++)for(d=a[c],e=0;e<d.length;e++)b.eq(c).append(d[e].el)},unrenderNamedSegs:function(a){var b,c=this[a];if(c){for(b=0;b<c.length;b++)c[b].el.remove();this[a]=null}},renderFgSegsIntoContainers:function(a,b){var c,d;for(a=this.renderFgSegEls(a),c=this.groupSegsByCol(a),d=0;d<this.colCnt;d++)this.updateFgSegCoords(c[d]);return this.attachSegsByCol(c,b),a},fgSegHtml:function(a,b){var c,d,e,f=this.view,g=a.event,h=f.isEventDraggable(g),i=!b&&a.isStart&&f.isEventResizableFromStart(g),j=!b&&a.isEnd&&f.isEventResizableFromEnd(g),k=this.getSegClasses(a,h,i||j),l=$(this.getSegSkinCss(a));return k.unshift("fc-time-grid-event","fc-v-event"),f.isMultiDayEvent(g)?(a.isStart||a.isEnd)&&(c=this.getEventTimeText(a),d=this.getEventTimeText(a,"LT"),e=this.getEventTimeText(a,null,!1)):(c=this.getEventTimeText(g),d=this.getEventTimeText(g,"LT"),e=this.getEventTimeText(g,null,!1)),'<a class="'+k.join(" ")+'"'+(g.url?' href="'+Y(g.url)+'"':"")+(l?' style="'+l+'"':"")+'><div class="fc-content">'+(c?'<div class="fc-time" data-start="'+Y(e)+'" data-full="'+Y(d)+'"><span>'+Y(c)+"</span></div>":"")+(g.title?'<div class="fc-title">'+Y(g.title)+"</div>":"")+'</div><div class="fc-bg"/>'+(j?'<div class="fc-resizer fc-end-resizer" />':"")+"</a>"},updateSegVerticals:function(a){this.computeSegVerticals(a),this.assignSegVerticals(a)},computeSegVerticals:function(a){var b,c;for(b=0;b<a.length;b++)c=a[b],c.top=this.computeDateTop(c.start,c.start),c.bottom=this.computeDateTop(c.end,c.start)},assignSegVerticals:function(a){var b,c;for(b=0;b<a.length;b++)c=a[b],c.el.css(this.generateSegVerticalCss(c))},generateSegVerticalCss:function(a){return{top:a.top,bottom:-a.bottom}},updateFgSegCoords:function(a){this.computeSegVerticals(a),this.computeFgSegHorizontals(a),this.assignSegVerticals(a),this.assignFgSegHorizontals(a)},computeFgSegHorizontals:function(a){var b,c,d;if(this.sortEventSegs(a),b=Ea(a),Fa(b),c=b[0]){for(d=0;d<c.length;d++)Ga(c[d]);for(d=0;d<c.length;d++)this.computeFgSegForwardBack(c[d],0,0)}},computeFgSegForwardBack:function(a,b,c){var d,e=a.forwardSegs;if(void 0===a.forwardCoord)for(e.length?(this.sortForwardSegs(e),this.computeFgSegForwardBack(e[0],b+1,c),a.forwardCoord=e[0].backwardCoord):a.forwardCoord=1,a.backwardCoord=a.forwardCoord-(a.forwardCoord-c)/(b+1),d=0;d<e.length;d++)this.computeFgSegForwardBack(e[d],0,a.forwardCoord)},sortForwardSegs:function(a){a.sort(ca(this,"compareForwardSegs"))},compareForwardSegs:function(a,b){return b.forwardPressure-a.forwardPressure||(a.backwardCoord||0)-(b.backwardCoord||0)||this.compareEventSegs(a,b)},assignFgSegHorizontals:function(a){var b,c;for(b=0;b<a.length;b++)c=a[b],c.el.css(this.generateFgSegHorizontalCss(c)),c.bottom-c.top<30&&c.el.addClass("fc-short")},generateFgSegHorizontalCss:function(a){var b,c,d=this.view.opt("slotEventOverlap"),e=a.backwardCoord,f=a.forwardCoord,g=this.generateSegVerticalCss(a);return d&&(f=Math.min(1,e+2*(f-e))),this.isRTL?(b=1-f,c=e):(b=e,c=1-f),g.zIndex=a.level+1,g.left=100*b+"%",g.right=100*c+"%",d&&a.forwardPressure&&(g[this.isRTL?"marginLeft":"marginRight"]=20),g}});var ob=Pa.View=ra.extend({type:null,name:null,title:null,calendar:null,options:null,el:null,displaying:null,isSkeletonRendered:!1,isEventsRendered:!1,start:null,end:null,intervalStart:null,intervalEnd:null,intervalDuration:null,intervalUnit:null,isRTL:!1,isSelected:!1,eventOrderSpecs:null,scrollerEl:null,scrollTop:null,widgetHeaderClass:null,widgetContentClass:null,highlightStateClass:null,nextDayThreshold:null,isHiddenDayHash:null,documentMousedownProxy:null,isNowIndicatorRendered:null,initialNowDate:null,initialNowQueriedMs:null,nowIndicatorTimeoutID:null,nowIndicatorIntervalID:null,constructor:function(a,c,d,e){this.calendar=a,this.type=this.name=c,this.options=d,this.intervalDuration=e||b.duration(1,"day"),this.nextDayThreshold=b.duration(this.opt("nextDayThreshold")),this.initThemingProps(),this.initHiddenDays(),this.isRTL=this.opt("isRTL"),this.eventOrderSpecs=A(this.opt("eventOrder")),this.documentMousedownProxy=ca(this,"documentMousedown"),this.initialize()},initialize:function(){},opt:function(a){return this.options[a]},trigger:function(a,b){var c=this.calendar;return c.trigger.apply(c,[a,b||this].concat(Array.prototype.slice.call(arguments,2),[this]))},setDate:function(a){this.setRange(this.computeRange(a))},setRange:function(b){a.extend(this,b),this.updateTitle()},computeRange:function(a){var b,c,d=I(this.intervalDuration),e=a.clone().startOf(d),f=e.clone().add(this.intervalDuration);return/year|month|week|day/.test(d)?(e.stripTime(),f.stripTime()):(e.hasTime()||(e=this.calendar.time(0)),f.hasTime()||(f=this.calendar.time(0))),b=e.clone(),b=this.skipHiddenDays(b),c=f.clone(),c=this.skipHiddenDays(c,-1,!0),{intervalUnit:d,intervalStart:e,intervalEnd:f,start:b,end:c}},computePrevDate:function(a){return this.massageCurrentDate(a.clone().startOf(this.intervalUnit).subtract(this.intervalDuration),-1)},computeNextDate:function(a){return this.massageCurrentDate(a.clone().startOf(this.intervalUnit).add(this.intervalDuration))},massageCurrentDate:function(a,b){return this.intervalDuration.as("days")<=1&&this.isHiddenDay(a)&&(a=this.skipHiddenDays(a,b),a.startOf("day")),a},updateTitle:function(){this.title=this.computeTitle()},computeTitle:function(){return this.formatRange({start:this.calendar.applyTimezone(this.intervalStart),end:this.calendar.applyTimezone(this.intervalEnd)},this.opt("titleFormat")||this.computeTitleFormat(),this.opt("titleRangeSeparator"))},computeTitleFormat:function(){return"year"==this.intervalUnit?"YYYY":"month"==this.intervalUnit?this.opt("monthYearFormat"):this.intervalDuration.as("days")>1?"ll":"LL"},formatRange:function(a,b,c){var d=a.end;return d.hasTime()||(d=d.clone().subtract(1)),ma(a.start,d,b,c,this.opt("isRTL"))},setElement:function(a){this.el=a,this.bindGlobalHandlers()},removeElement:function(){this.clear(),this.isSkeletonRendered&&(this.unrenderSkeleton(),this.isSkeletonRendered=!1),this.unbindGlobalHandlers(),this.el.remove()},display:function(b){var c=this,d=null;return this.displaying&&(d=this.queryScroll()),this.calendar.freezeContentHeight(),this.clear().then(function(){return c.displaying=a.when(c.displayView(b)).then(function(){c.forceScroll(c.computeInitialScroll(d)),c.calendar.unfreezeContentHeight(),c.triggerRender()})})},clear:function(){var b=this,c=this.displaying;return c?c.then(function(){return b.displaying=null,b.clearEvents(),b.clearView()}):a.when()},displayView:function(a){this.isSkeletonRendered||(this.renderSkeleton(),this.isSkeletonRendered=!0),a&&this.setDate(a),this.render&&this.render(),this.renderDates(),this.updateSize(),this.renderBusinessHours(),this.startNowIndicator()},clearView:function(){this.unselect(),this.stopNowIndicator(),this.triggerUnrender(),this.unrenderBusinessHours(),this.unrenderDates(),this.destroy&&this.destroy()},renderSkeleton:function(){},unrenderSkeleton:function(){},renderDates:function(){},unrenderDates:function(){},triggerRender:function(){this.trigger("viewRender",this,this,this.el)},triggerUnrender:function(){this.trigger("viewDestroy",this,this,this.el)},bindGlobalHandlers:function(){a(document).on("mousedown",this.documentMousedownProxy)},unbindGlobalHandlers:function(){a(document).off("mousedown",this.documentMousedownProxy)},initThemingProps:function(){var a=this.opt("theme")?"ui":"fc";this.widgetHeaderClass=a+"-widget-header",this.widgetContentClass=a+"-widget-content",this.highlightStateClass=a+"-state-highlight"},renderBusinessHours:function(){},unrenderBusinessHours:function(){},startNowIndicator:function(){var a,c,d,e=this;this.opt("nowIndicator")&&(a=this.getNowIndicatorUnit(),a&&(c=ca(this,"updateNowIndicator"),this.initialNowDate=this.calendar.getNow(),this.initialNowQueriedMs=+new Date,this.renderNowIndicator(this.initialNowDate),this.isNowIndicatorRendered=!0,d=this.initialNowDate.clone().startOf(a).add(1,a)-this.initialNowDate,this.nowIndicatorTimeoutID=setTimeout(function(){e.nowIndicatorTimeoutID=null,c(),d=+b.duration(1,a),d=Math.max(100,d),e.nowIndicatorIntervalID=setInterval(c,d)},d)))},updateNowIndicator:function(){this.isNowIndicatorRendered&&(this.unrenderNowIndicator(),this.renderNowIndicator(this.initialNowDate.clone().add(new Date-this.initialNowQueriedMs)))},stopNowIndicator:function(){this.isNowIndicatorRendered&&(this.nowIndicatorTimeoutID&&(clearTimeout(this.nowIndicatorTimeoutID),this.nowIndicatorTimeoutID=null),this.nowIndicatorIntervalID&&(clearTimeout(this.nowIndicatorIntervalID),this.nowIndicatorIntervalID=null),this.unrenderNowIndicator(),this.isNowIndicatorRendered=!1)},getNowIndicatorUnit:function(){},renderNowIndicator:function(a){},unrenderNowIndicator:function(){},updateSize:function(a){var b;a&&(b=this.queryScroll()),this.updateHeight(a),this.updateWidth(a),this.updateNowIndicator(),a&&this.setScroll(b)},updateWidth:function(a){},updateHeight:function(a){var b=this.calendar;this.setHeight(b.getSuggestedViewHeight(),b.isHeightAuto())},setHeight:function(a,b){},computeScrollerHeight:function(a){var b,c,d=this.scrollerEl;return b=this.el.add(d),b.css({position:"relative",left:-1}),c=this.el.outerHeight()-d.height(),b.css({position:"",left:""}),a-c},computeInitialScroll:function(a){return 0},queryScroll:function(){return this.scrollerEl?this.scrollerEl.scrollTop():void 0},setScroll:function(a){return this.scrollerEl?this.scrollerEl.scrollTop(a):void 0},forceScroll:function(a){var b=this;this.setScroll(a),setTimeout(function(){b.setScroll(a)},0)},displayEvents:function(a){var b=this.queryScroll();this.clearEvents(),this.renderEvents(a),this.isEventsRendered=!0,this.setScroll(b),this.triggerEventRender()},clearEvents:function(){var a;this.isEventsRendered&&(a=this.queryScroll(),this.triggerEventUnrender(),this.destroyEvents&&this.destroyEvents(),this.unrenderEvents(),this.setScroll(a),this.isEventsRendered=!1)},renderEvents:function(a){},unrenderEvents:function(){},triggerEventRender:function(){this.renderedEventSegEach(function(a){this.trigger("eventAfterRender",a.event,a.event,a.el)}),this.trigger("eventAfterAllRender")},triggerEventUnrender:function(){this.renderedEventSegEach(function(a){this.trigger("eventDestroy",a.event,a.event,a.el)})},resolveEventEl:function(b,c){var d=this.trigger("eventRender",b,b,c);return d===!1?c=null:d&&d!==!0&&(c=a(d)),c},showEvent:function(a){this.renderedEventSegEach(function(a){a.el.css("visibility","")},a)},hideEvent:function(a){this.renderedEventSegEach(function(a){a.el.css("visibility","hidden")},a)},renderedEventSegEach:function(a,b){var c,d=this.getEventSegs();for(c=0;c<d.length;c++)b&&d[c].event._id!==b._id||d[c].el&&a.call(this,d[c])},getEventSegs:function(){return[]},isEventDraggable:function(a){var b=a.source||{};return X(a.startEditable,b.startEditable,this.opt("eventStartEditable"),a.editable,b.editable,this.opt("editable"))},reportEventDrop:function(a,b,c,d,e){var f=this.calendar,g=f.mutateEvent(a,b,c),h=function(){g.undo(),f.reportEventChange()};this.triggerEventDrop(a,g.dateDelta,h,d,e),f.reportEventChange()},triggerEventDrop:function(a,b,c,d,e){this.trigger("eventDrop",d[0],a,b,c,e,{})},reportExternalDrop:function(b,c,d,e,f){var g,h,i=b.eventProps;i&&(g=a.extend({},i,c),h=this.calendar.renderEvent(g,b.stick)[0]),this.triggerExternalDrop(h,c,d,e,f)},triggerExternalDrop:function(a,b,c,d,e){this.trigger("drop",c[0],b.start,d,e),a&&this.trigger("eventReceive",null,a)},renderDrag:function(a,b){},unrenderDrag:function(){},isEventResizableFromStart:function(a){return this.opt("eventResizableFromStart")&&this.isEventResizable(a)},isEventResizableFromEnd:function(a){return this.isEventResizable(a)},isEventResizable:function(a){var b=a.source||{};return X(a.durationEditable,b.durationEditable,this.opt("eventDurationEditable"),a.editable,b.editable,this.opt("editable"))},reportEventResize:function(a,b,c,d,e){var f=this.calendar,g=f.mutateEvent(a,b,c),h=function(){g.undo(),f.reportEventChange()};this.triggerEventResize(a,g.durationDelta,h,d,e),f.reportEventChange()},triggerEventResize:function(a,b,c,d,e){this.trigger("eventResize",d[0],a,b,c,e,{})},select:function(a,b){this.unselect(b),this.renderSelection(a),this.reportSelection(a,b)},renderSelection:function(a){},reportSelection:function(a,b){this.isSelected=!0,this.triggerSelect(a,b)},triggerSelect:function(a,b){this.trigger("select",null,this.calendar.applyTimezone(a.start),this.calendar.applyTimezone(a.end),b)},unselect:function(a){this.isSelected&&(this.isSelected=!1,this.destroySelection&&this.destroySelection(),this.unrenderSelection(),this.trigger("unselect",null,a))},unrenderSelection:function(){},documentMousedown:function(b){var c;this.isSelected&&this.opt("unselectAuto")&&v(b)&&(c=this.opt("unselectCancel"),c&&a(b.target).closest(c).length||this.unselect(b))},triggerDayClick:function(a,b,c){this.trigger("dayClick",b,this.calendar.applyTimezone(a.start),c)},initHiddenDays:function(){var b,c=this.opt("hiddenDays")||[],d=[],e=0;for(this.opt("weekends")===!1&&c.push(0,6),b=0;7>b;b++)(d[b]=-1!==a.inArray(b,c))||e++;if(!e)throw"invalid hiddenDays";this.isHiddenDayHash=d},isHiddenDay:function(a){return b.isMoment(a)&&(a=a.day()),this.isHiddenDayHash[a]},skipHiddenDays:function(a,b,c){var d=a.clone();for(b=b||1;this.isHiddenDayHash[(d.day()+(c?b:0)+7)%7];)d.add(b,"days");return d},computeDayRange:function(a){var b,c=a.start.clone().stripTime(),d=a.end,e=null;return d&&(e=d.clone().stripTime(),b=+d.time(),b&&b>=this.nextDayThreshold&&e.add(1,"days")),(!d||c>=e)&&(e=c.clone().add(1,"days")),{start:c,end:e}},isMultiDayEvent:function(a){var b=this.computeDayRange(a);return b.end.diff(b.start,"days")>1}}),pb=Pa.Calendar=ra.extend({dirDefaults:null,langDefaults:null,overrides:null,options:null,viewSpecCache:null,view:null,header:null,loadingLevel:0,constructor:Ja,initialize:function(){},initOptions:function(a){var b,e,f,g;a=d(a),b=a.lang,e=qb[b],e||(b=pb.defaults.lang,e=qb[b]||{}),f=X(a.isRTL,e.isRTL,pb.defaults.isRTL),g=f?pb.rtlDefaults:{},this.dirDefaults=g,this.langDefaults=e,this.overrides=a,this.options=c([pb.defaults,g,e,a]),Ka(this.options),this.viewSpecCache={}},getViewSpec:function(a){var b=this.viewSpecCache;return b[a]||(b[a]=this.buildViewSpec(a))},getUnitViewSpec:function(b){var c,d,e;if(-1!=a.inArray(b,Ua))for(c=this.header.getViewsWithButtons(),a.each(Pa.views,function(a){c.push(a)}),d=0;d<c.length;d++)if(e=this.getViewSpec(c[d]),e&&e.singleUnit==b)return e},buildViewSpec:function(a){for(var d,e,f,g,h=this.overrides.views||{},i=[],j=[],k=[],l=a;l;)d=Qa[l],e=h[l],l=null,"function"==typeof d&&(d={"class":d}),d&&(i.unshift(d),j.unshift(d.defaults||{}),f=f||d.duration,l=l||d.type),e&&(k.unshift(e),f=f||e.duration,l=l||e.type);return d=Q(i),d.type=a,d["class"]?(f&&(f=b.duration(f),f.valueOf()&&(d.duration=f,g=I(f),1===f.as(g)&&(d.singleUnit=g,k.unshift(h[g]||{})))),d.defaults=c(j),d.overrides=c(k),this.buildViewSpecOptions(d),this.buildViewSpecButtonText(d,a),d):!1},buildViewSpecOptions:function(a){a.options=c([pb.defaults,a.defaults,this.dirDefaults,this.langDefaults,this.overrides,a.overrides]),Ka(a.options)},buildViewSpecButtonText:function(a,b){function c(c){var d=c.buttonText||{};return d[b]||(a.singleUnit?d[a.singleUnit]:null)}a.buttonTextOverride=c(this.overrides)||a.overrides.buttonText,a.buttonTextDefault=c(this.langDefaults)||c(this.dirDefaults)||a.defaults.buttonText||c(pb.defaults)||(a.duration?this.humanizeDuration(a.duration):null)||b},instantiateView:function(a){var b=this.getViewSpec(a);return new b["class"](this,a,b.options,b.duration)},isValidViewType:function(a){return Boolean(this.getViewSpec(a))},pushLoading:function(){this.loadingLevel++||this.trigger("loading",null,!0,this.view)},popLoading:function(){--this.loadingLevel||this.trigger("loading",null,!1,this.view)},buildSelectSpan:function(a,b){var c,d=this.moment(a).stripZone();return c=b?this.moment(b).stripZone():d.hasTime()?d.clone().add(this.defaultTimedEventDuration):d.clone().add(this.defaultAllDayEventDuration),{start:d,end:c}}});pb.mixin(eb),pb.defaults={titleRangeSeparator:" — ",monthYearFormat:"MMMM YYYY",defaultTimedEventDuration:"02:00:00",defaultAllDayEventDuration:{days:1},forceEventDuration:!1,nextDayThreshold:"09:00:00",defaultView:"month",aspectRatio:1.35,header:{left:"title",center:"",right:"today prev,next"},weekends:!0,weekNumbers:!1,weekNumberTitle:"W",weekNumberCalculation:"local",scrollTime:"06:00:00",lazyFetching:!0,startParam:"start",endParam:"end",timezoneParam:"timezone",timezone:!1,isRTL:!1,buttonText:{prev:"prev",next:"next",prevYear:"prev year",nextYear:"next year",year:"year",today:"today",month:"month",week:"week",day:"day"},buttonIcons:{prev:"left-single-arrow",next:"right-single-arrow",prevYear:"left-double-arrow",nextYear:"right-double-arrow"},theme:!1,themeButtonIcons:{prev:"circle-triangle-w",next:"circle-triangle-e",prevYear:"seek-prev",nextYear:"seek-next"},dragOpacity:.75,dragRevertDuration:500,dragScroll:!0,unselectAuto:!0,dropAccept:"*",eventOrder:"title",eventLimit:!1,eventLimitText:"more",eventLimitClick:"popover",dayPopoverFormat:"LL",handleWindowResize:!0,windowResizeDelay:200},pb.englishDefaults={dayPopoverFormat:"dddd, MMMM D"},pb.rtlDefaults={header:{left:"next,prev today",center:"",right:"title"},buttonIcons:{prev:"right-single-arrow",next:"left-single-arrow",prevYear:"right-double-arrow",nextYear:"left-double-arrow"},themeButtonIcons:{prev:"circle-triangle-e",next:"circle-triangle-w",nextYear:"seek-prev",prevYear:"seek-next"}};var qb=Pa.langs={};Pa.datepickerLang=function(b,c,d){var e=qb[b]||(qb[b]={});e.isRTL=d.isRTL,e.weekNumberTitle=d.weekHeader,a.each(rb,function(a,b){e[a]=b(d)}),a.datepicker&&(a.datepicker.regional[c]=a.datepicker.regional[b]=d,a.datepicker.regional.en=a.datepicker.regional[""],a.datepicker.setDefaults(d))},Pa.lang=function(b,d){var e,f;e=qb[b]||(qb[b]={}),d&&(e=qb[b]=c([e,d])),f=La(b),a.each(sb,function(a,b){null==e[a]&&(e[a]=b(f,e))}),pb.defaults.lang=b};var rb={buttonText:function(a){return{prev:Z(a.prevText),next:Z(a.nextText),today:Z(a.currentText)}},monthYearFormat:function(a){return a.showMonthAfterYear?"YYYY["+a.yearSuffix+"] MMMM":"MMMM YYYY["+a.yearSuffix+"]"}},sb={dayOfMonthFormat:function(a,b){var c=a.longDateFormat("l");return c=c.replace(/^Y+[^\w\s]*|[^\w\s]*Y+$/g,""),b.isRTL?c+=" ddd":c="ddd "+c,c},mediumTimeFormat:function(a){return a.longDateFormat("LT").replace(/\s*a$/i,"a")},smallTimeFormat:function(a){return a.longDateFormat("LT").replace(":mm","(:mm)").replace(/(\Wmm)$/,"($1)").replace(/\s*a$/i,"a");
-},extraSmallTimeFormat:function(a){return a.longDateFormat("LT").replace(":mm","(:mm)").replace(/(\Wmm)$/,"($1)").replace(/\s*a$/i,"t")},hourFormat:function(a){return a.longDateFormat("LT").replace(":mm","").replace(/(\Wmm)$/,"").replace(/\s*a$/i,"a")},noMeridiemTimeFormat:function(a){return a.longDateFormat("LT").replace(/\s*a$/i,"")}},tb={smallDayDateFormat:function(a){return a.isRTL?"D dd":"dd D"},weekFormat:function(a){return a.isRTL?"w[ "+a.weekNumberTitle+"]":"["+a.weekNumberTitle+" ]w"},smallWeekFormat:function(a){return a.isRTL?"w["+a.weekNumberTitle+"]":"["+a.weekNumberTitle+"]w"}};Pa.lang("en",pb.englishDefaults),Pa.sourceNormalizers=[],Pa.sourceFetchers=[];var ub={dataType:"json",cache:!1},vb=1;pb.prototype.getPeerEvents=function(a,b){var c,d,e=this.getEventCache(),f=[];for(c=0;c<e.length;c++)d=e[c],b&&b._id===d._id||f.push(d);return f};var wb=Pa.BasicView=ob.extend({dayGridClass:mb,dayGrid:null,dayNumbersVisible:!1,weekNumbersVisible:!1,weekNumberWidth:null,headContainerEl:null,headRowEl:null,initialize:function(){this.dayGrid=this.instantiateDayGrid()},instantiateDayGrid:function(){var a=this.dayGridClass.extend(xb);return new a(this)},setRange:function(a){ob.prototype.setRange.call(this,a),this.dayGrid.breakOnWeeks=/year|month|week/.test(this.intervalUnit),this.dayGrid.setRange(a)},computeRange:function(a){var b=ob.prototype.computeRange.call(this,a);return/year|month/.test(b.intervalUnit)&&(b.start.startOf("week"),b.start=this.skipHiddenDays(b.start),b.end.weekday()&&(b.end.add(1,"week").startOf("week"),b.end=this.skipHiddenDays(b.end,-1,!0))),b},renderDates:function(){this.dayNumbersVisible=this.dayGrid.rowCnt>1,this.weekNumbersVisible=this.opt("weekNumbers"),this.dayGrid.numbersVisible=this.dayNumbersVisible||this.weekNumbersVisible,this.el.addClass("fc-basic-view").html(this.renderSkeletonHtml()),this.renderHead(),this.scrollerEl=this.el.find(".fc-day-grid-container"),this.dayGrid.setElement(this.el.find(".fc-day-grid")),this.dayGrid.renderDates(this.hasRigidRows())},renderHead:function(){this.headContainerEl=this.el.find(".fc-head-container").html(this.dayGrid.renderHeadHtml()),this.headRowEl=this.headContainerEl.find(".fc-row")},unrenderDates:function(){this.dayGrid.unrenderDates(),this.dayGrid.removeElement()},renderBusinessHours:function(){this.dayGrid.renderBusinessHours()},renderSkeletonHtml:function(){return'<table><thead class="fc-head"><tr><td class="fc-head-container '+this.widgetHeaderClass+'"></td></tr></thead><tbody class="fc-body"><tr><td class="'+this.widgetContentClass+'"><div class="fc-day-grid-container"><div class="fc-day-grid"/></div></td></tr></tbody></table>'},weekNumberStyleAttr:function(){return null!==this.weekNumberWidth?'style="width:'+this.weekNumberWidth+'px"':""},hasRigidRows:function(){var a=this.opt("eventLimit");return a&&"number"!=typeof a},updateWidth:function(){this.weekNumbersVisible&&(this.weekNumberWidth=k(this.el.find(".fc-week-number")))},setHeight:function(a,b){var c,d=this.opt("eventLimit");m(this.scrollerEl),f(this.headRowEl),this.dayGrid.removeSegPopover(),d&&"number"==typeof d&&this.dayGrid.limitRows(d),c=this.computeScrollerHeight(a),this.setGridHeight(c,b),d&&"number"!=typeof d&&this.dayGrid.limitRows(d),!b&&l(this.scrollerEl,c)&&(e(this.headRowEl,r(this.scrollerEl)),c=this.computeScrollerHeight(a),this.scrollerEl.height(c))},setGridHeight:function(a,b){b?j(this.dayGrid.rowEls):i(this.dayGrid.rowEls,a,!0)},prepareHits:function(){this.dayGrid.prepareHits()},releaseHits:function(){this.dayGrid.releaseHits()},queryHit:function(a,b){return this.dayGrid.queryHit(a,b)},getHitSpan:function(a){return this.dayGrid.getHitSpan(a)},getHitEl:function(a){return this.dayGrid.getHitEl(a)},renderEvents:function(a){this.dayGrid.renderEvents(a),this.updateHeight()},getEventSegs:function(){return this.dayGrid.getEventSegs()},unrenderEvents:function(){this.dayGrid.unrenderEvents()},renderDrag:function(a,b){return this.dayGrid.renderDrag(a,b)},unrenderDrag:function(){this.dayGrid.unrenderDrag()},renderSelection:function(a){this.dayGrid.renderSelection(a)},unrenderSelection:function(){this.dayGrid.unrenderSelection()}}),xb={renderHeadIntroHtml:function(){var a=this.view;return a.weekNumbersVisible?'<th class="fc-week-number '+a.widgetHeaderClass+'" '+a.weekNumberStyleAttr()+"><span>"+Y(a.opt("weekNumberTitle"))+"</span></th>":""},renderNumberIntroHtml:function(a){var b=this.view;return b.weekNumbersVisible?'<td class="fc-week-number" '+b.weekNumberStyleAttr()+"><span>"+this.getCellDate(a,0).format("w")+"</span></td>":""},renderBgIntroHtml:function(){var a=this.view;return a.weekNumbersVisible?'<td class="fc-week-number '+a.widgetContentClass+'" '+a.weekNumberStyleAttr()+"></td>":""},renderIntroHtml:function(){var a=this.view;return a.weekNumbersVisible?'<td class="fc-week-number" '+a.weekNumberStyleAttr()+"></td>":""}},yb=Pa.MonthView=wb.extend({computeRange:function(a){var b,c=wb.prototype.computeRange.call(this,a);return this.isFixedWeeks()&&(b=Math.ceil(c.end.diff(c.start,"weeks",!0)),c.end.add(6-b,"weeks")),c},setGridHeight:function(a,b){b=b||"variable"===this.opt("weekMode"),b&&(a*=this.rowCnt/6),i(this.dayGrid.rowEls,a,!b)},isFixedWeeks:function(){var a=this.opt("weekMode");return a?"fixed"===a:this.opt("fixedWeekCount")}});Qa.basic={"class":wb},Qa.basicDay={type:"basic",duration:{days:1}},Qa.basicWeek={type:"basic",duration:{weeks:1}},Qa.month={"class":yb,duration:{months:1},defaults:{fixedWeekCount:!0}};var zb=Pa.AgendaView=ob.extend({timeGridClass:nb,timeGrid:null,dayGridClass:mb,dayGrid:null,axisWidth:null,headContainerEl:null,noScrollRowEls:null,bottomRuleEl:null,bottomRuleHeight:null,initialize:function(){this.timeGrid=this.instantiateTimeGrid(),this.opt("allDaySlot")&&(this.dayGrid=this.instantiateDayGrid())},instantiateTimeGrid:function(){var a=this.timeGridClass.extend(Ab);return new a(this)},instantiateDayGrid:function(){var a=this.dayGridClass.extend(Bb);return new a(this)},setRange:function(a){ob.prototype.setRange.call(this,a),this.timeGrid.setRange(a),this.dayGrid&&this.dayGrid.setRange(a)},renderDates:function(){this.el.addClass("fc-agenda-view").html(this.renderSkeletonHtml()),this.renderHead(),this.scrollerEl=this.el.find(".fc-time-grid-container"),this.timeGrid.setElement(this.el.find(".fc-time-grid")),this.timeGrid.renderDates(),this.bottomRuleEl=a('<hr class="fc-divider '+this.widgetHeaderClass+'"/>').appendTo(this.timeGrid.el),this.dayGrid&&(this.dayGrid.setElement(this.el.find(".fc-day-grid")),this.dayGrid.renderDates(),this.dayGrid.bottomCoordPadding=this.dayGrid.el.next("hr").outerHeight()),this.noScrollRowEls=this.el.find(".fc-row:not(.fc-scroller *)")},renderHead:function(){this.headContainerEl=this.el.find(".fc-head-container").html(this.timeGrid.renderHeadHtml())},unrenderDates:function(){this.timeGrid.unrenderDates(),this.timeGrid.removeElement(),this.dayGrid&&(this.dayGrid.unrenderDates(),this.dayGrid.removeElement())},renderSkeletonHtml:function(){return'<table><thead class="fc-head"><tr><td class="fc-head-container '+this.widgetHeaderClass+'"></td></tr></thead><tbody class="fc-body"><tr><td class="'+this.widgetContentClass+'">'+(this.dayGrid?'<div class="fc-day-grid"/><hr class="fc-divider '+this.widgetHeaderClass+'"/>':"")+'<div class="fc-time-grid-container"><div class="fc-time-grid"/></div></td></tr></tbody></table>'},axisStyleAttr:function(){return null!==this.axisWidth?'style="width:'+this.axisWidth+'px"':""},renderBusinessHours:function(){this.timeGrid.renderBusinessHours(),this.dayGrid&&this.dayGrid.renderBusinessHours()},unrenderBusinessHours:function(){this.timeGrid.unrenderBusinessHours(),this.dayGrid&&this.dayGrid.unrenderBusinessHours()},getNowIndicatorUnit:function(){return this.timeGrid.getNowIndicatorUnit()},renderNowIndicator:function(a){this.timeGrid.renderNowIndicator(a)},unrenderNowIndicator:function(){this.timeGrid.unrenderNowIndicator()},updateSize:function(a){this.timeGrid.updateSize(a),ob.prototype.updateSize.call(this,a)},updateWidth:function(){this.axisWidth=k(this.el.find(".fc-axis"))},setHeight:function(a,b){var c,d;null===this.bottomRuleHeight&&(this.bottomRuleHeight=this.bottomRuleEl.outerHeight()),this.bottomRuleEl.hide(),this.scrollerEl.css("overflow",""),m(this.scrollerEl),f(this.noScrollRowEls),this.dayGrid&&(this.dayGrid.removeSegPopover(),c=this.opt("eventLimit"),c&&"number"!=typeof c&&(c=Cb),c&&this.dayGrid.limitRows(c)),b||(d=this.computeScrollerHeight(a),l(this.scrollerEl,d)?(e(this.noScrollRowEls,r(this.scrollerEl)),d=this.computeScrollerHeight(a),this.scrollerEl.height(d)):(this.scrollerEl.height(d).css("overflow","hidden"),this.bottomRuleEl.show()))},computeInitialScroll:function(){var a=b.duration(this.opt("scrollTime")),c=this.timeGrid.computeTimeTop(a);return c=Math.ceil(c),c&&c++,c},prepareHits:function(){this.timeGrid.prepareHits(),this.dayGrid&&this.dayGrid.prepareHits()},releaseHits:function(){this.timeGrid.releaseHits(),this.dayGrid&&this.dayGrid.releaseHits()},queryHit:function(a,b){var c=this.timeGrid.queryHit(a,b);return!c&&this.dayGrid&&(c=this.dayGrid.queryHit(a,b)),c},getHitSpan:function(a){return a.component.getHitSpan(a)},getHitEl:function(a){return a.component.getHitEl(a)},renderEvents:function(a){var b,c,d=[],e=[],f=[];for(c=0;c<a.length;c++)a[c].allDay?d.push(a[c]):e.push(a[c]);b=this.timeGrid.renderEvents(e),this.dayGrid&&(f=this.dayGrid.renderEvents(d)),this.updateHeight()},getEventSegs:function(){return this.timeGrid.getEventSegs().concat(this.dayGrid?this.dayGrid.getEventSegs():[])},unrenderEvents:function(){this.timeGrid.unrenderEvents(),this.dayGrid&&this.dayGrid.unrenderEvents()},renderDrag:function(a,b){return a.start.hasTime()?this.timeGrid.renderDrag(a,b):this.dayGrid?this.dayGrid.renderDrag(a,b):void 0},unrenderDrag:function(){this.timeGrid.unrenderDrag(),this.dayGrid&&this.dayGrid.unrenderDrag()},renderSelection:function(a){a.start.hasTime()||a.end.hasTime()?this.timeGrid.renderSelection(a):this.dayGrid&&this.dayGrid.renderSelection(a)},unrenderSelection:function(){this.timeGrid.unrenderSelection(),this.dayGrid&&this.dayGrid.unrenderSelection()}}),Ab={renderHeadIntroHtml:function(){var a,b=this.view;return b.opt("weekNumbers")?(a=this.start.format(b.opt("smallWeekFormat")),'<th class="fc-axis fc-week-number '+b.widgetHeaderClass+'" '+b.axisStyleAttr()+"><span>"+Y(a)+"</span></th>"):'<th class="fc-axis '+b.widgetHeaderClass+'" '+b.axisStyleAttr()+"></th>"},renderBgIntroHtml:function(){var a=this.view;return'<td class="fc-axis '+a.widgetContentClass+'" '+a.axisStyleAttr()+"></td>"},renderIntroHtml:function(){var a=this.view;return'<td class="fc-axis" '+a.axisStyleAttr()+"></td>"}},Bb={renderBgIntroHtml:function(){var a=this.view;return'<td class="fc-axis '+a.widgetContentClass+'" '+a.axisStyleAttr()+"><span>"+(a.opt("allDayHtml")||Y(a.opt("allDayText")))+"</span></td>"},renderIntroHtml:function(){var a=this.view;return'<td class="fc-axis" '+a.axisStyleAttr()+"></td>"}},Cb=5,Db=[{hours:1},{minutes:30},{minutes:15},{seconds:30},{seconds:15}];return Qa.agenda={"class":zb,defaults:{allDaySlot:!0,allDayText:"all-day",slotDuration:"00:30:00",minTime:"00:00:00",maxTime:"24:00:00",slotEventOverlap:!0}},Qa.agendaDay={type:"agenda",duration:{days:1}},Qa.agendaWeek={type:"agenda",duration:{weeks:1}},Pa});
\ No newline at end of file
+!function(a){"function"==typeof define&&define.amd?define(["jquery","moment"],a):"object"==typeof exports?module.exports=a(require("jquery"),require("moment")):a(jQuery,moment)}(function(a,b){function c(a){return W(a,Ya)}function d(b){var c,d={views:b.views||{}};return a.each(b,function(b,e){"views"!=b&&(a.isPlainObject(e)&&!/(time|duration|interval)$/i.test(b)&&-1==a.inArray(b,Ya)?(c=null,a.each(e,function(a,e){/^(month|week|day|default|basic(Week|Day)?|agenda(Week|Day)?)$/.test(a)?(d.views[a]||(d.views[a]={}),d.views[a][b]=e):(c||(c={}),c[a]=e)}),c&&(d[b]=c)):d[b]=e)}),d}function e(a,b){b.left&&a.css({"border-left-width":1,"margin-left":b.left-1}),b.right&&a.css({"border-right-width":1,"margin-right":b.right-1})}function f(a){a.css({"margin-left":"","margin-right":"","border-left-width":"","border-right-width":""})}function g(){a("body").addClass("fc-not-allowed")}function h(){a("body").removeClass("fc-not-allowed")}function i(b,c,d){var e=Math.floor(c/b.length),f=Math.floor(c-e*(b.length-1)),g=[],h=[],i=[],k=0;j(b),b.each(function(c,d){var j=c===b.length-1?f:e,l=a(d).outerHeight(!0);j>l?(g.push(d),h.push(l),i.push(a(d).height())):k+=l}),d&&(c-=k,e=Math.floor(c/g.length),f=Math.floor(c-e*(g.length-1))),a(g).each(function(b,c){var d=b===g.length-1?f:e,j=h[b],k=i[b],l=d-(j-k);d>j&&a(c).height(l)})}function j(a){a.height("")}function k(b){var c=0;return b.find("> span").each(function(b,d){var e=a(d).outerWidth();e>c&&(c=e)}),c++,b.width(c),c}function l(a,b){var c,d=a.add(b);return d.css({position:"relative",left:-1}),c=a.outerHeight()-b.outerHeight(),d.css({position:"",left:""}),c}function m(b){var c=b.css("position"),d=b.parents().filter(function(){var b=a(this);return/(auto|scroll)/.test(b.css("overflow")+b.css("overflow-y")+b.css("overflow-x"))}).eq(0);return"fixed"!==c&&d.length?d:a(b[0].ownerDocument||document)}function n(a,b){var c=a.offset(),d=c.left-(b?b.left:0),e=c.top-(b?b.top:0);return{left:d,right:d+a.outerWidth(),top:e,bottom:e+a.outerHeight()}}function o(a,b){var c=a.offset(),d=q(a),e=c.left+t(a,"border-left-width")+d.left-(b?b.left:0),f=c.top+t(a,"border-top-width")+d.top-(b?b.top:0);return{left:e,right:e+a[0].clientWidth,top:f,bottom:f+a[0].clientHeight}}function p(a,b){var c=a.offset(),d=c.left+t(a,"border-left-width")+t(a,"padding-left")-(b?b.left:0),e=c.top+t(a,"border-top-width")+t(a,"padding-top")-(b?b.top:0);return{left:d,right:d+a.width(),top:e,bottom:e+a.height()}}function q(a){var b=a.innerWidth()-a[0].clientWidth,c={left:0,right:0,top:0,bottom:a.innerHeight()-a[0].clientHeight};return r()&&"rtl"==a.css("direction")?c.left=b:c.right=b,c}function r(){return null===Za&&(Za=s()),Za}function s(){var b=a("<div><div/></div>").css({position:"absolute",top:-1e3,left:0,border:0,padding:0,overflow:"scroll",direction:"rtl"}).appendTo("body"),c=b.children(),d=c.offset().left>b.offset().left;return b.remove(),d}function t(a,b){return parseFloat(a.css(b))||0}function u(a){return 1==a.which&&!a.ctrlKey}function v(a){if(void 0!==a.pageX)return a.pageX;var b=a.originalEvent.touches;return b?b[0].pageX:void 0}function w(a){if(void 0!==a.pageY)return a.pageY;var b=a.originalEvent.touches;return b?b[0].pageY:void 0}function x(a){return/^touch/.test(a.type)}function y(a){a.addClass("fc-unselectable").on("selectstart",z)}function z(a){a.preventDefault()}function A(a){return window.addEventListener?(window.addEventListener("scroll",a,!0),!0):!1}function B(a){return window.removeEventListener?(window.removeEventListener("scroll",a,!0),!0):!1}function C(a,b){var c={left:Math.max(a.left,b.left),right:Math.min(a.right,b.right),top:Math.max(a.top,b.top),bottom:Math.min(a.bottom,b.bottom)};return c.left<c.right&&c.top<c.bottom?c:!1}function D(a,b){return{left:Math.min(Math.max(a.left,b.left),b.right),top:Math.min(Math.max(a.top,b.top),b.bottom)}}function E(a){return{left:(a.left+a.right)/2,top:(a.top+a.bottom)/2}}function F(a,b){return{left:a.left-b.left,top:a.top-b.top}}function G(b){var c,d,e=[],f=[];for("string"==typeof b?f=b.split(/\s*,\s*/):"function"==typeof b?f=[b]:a.isArray(b)&&(f=b),c=0;c<f.length;c++)d=f[c],"string"==typeof d?e.push("-"==d.charAt(0)?{field:d.substring(1),order:-1}:{field:d,order:1}):"function"==typeof d&&e.push({func:d});return e}function H(a,b,c){var d,e;for(d=0;d<c.length;d++)if(e=I(a,b,c[d]))return e;return 0}function I(a,b,c){return c.func?c.func(a,b):J(a[c.field],b[c.field])*(c.order||1)}function J(b,c){return b||c?null==c?-1:null==b?1:"string"===a.type(b)||"string"===a.type(c)?String(b).localeCompare(String(c)):b-c:0}function K(a,b){var c,d,e,f,g=a.start,h=a.end,i=b.start,j=b.end;return h>i&&j>g?(g>=i?(c=g.clone(),e=!0):(c=i.clone(),e=!1),j>=h?(d=h.clone(),f=!0):(d=j.clone(),f=!1),{start:c,end:d,isStart:e,isEnd:f}):void 0}function L(a,c){return b.duration({days:a.clone().stripTime().diff(c.clone().stripTime(),"days"),ms:a.time()-c.time()})}function M(a,c){return b.duration({days:a.clone().stripTime().diff(c.clone().stripTime(),"days")})}function N(a,c,d){return b.duration(Math.round(a.diff(c,d,!0)),d)}function O(a,b){var c,d,e;for(c=0;c<_a.length&&(d=_a[c],e=P(d,a,b),!(e>=1&&ha(e)));c++);return d}function P(a,c,d){return null!=d?d.diff(c,a,!0):b.isDuration(c)?c.as(a):c.end.diff(c.start,a,!0)}function Q(a,b,c){var d;return T(c)?(b-a)/c:(d=c.asMonths(),Math.abs(d)>=1&&ha(d)?b.diff(a,"months",!0)/d:b.diff(a,"days",!0)/c.asDays())}function R(a,b){var c,d;return T(a)||T(b)?a/b:(c=a.asMonths(),d=b.asMonths(),Math.abs(c)>=1&&ha(c)&&Math.abs(d)>=1&&ha(d)?c/d:a.asDays()/b.asDays())}function S(a,c){var d;return T(a)?b.duration(a*c):(d=a.asMonths(),Math.abs(d)>=1&&ha(d)?b.duration({months:d*c}):b.duration({days:a.asDays()*c}))}function T(a){return Boolean(a.hours()||a.minutes()||a.seconds()||a.milliseconds())}function U(a){return"[object Date]"===Object.prototype.toString.call(a)||a instanceof Date}function V(a){return/^\d+\:\d+(?:\:\d+\.?(?:\d{3})?)?$/.test(a)}function W(a,b){var c,d,e,f,g,h,i={};if(b)for(c=0;c<b.length;c++){for(d=b[c],e=[],f=a.length-1;f>=0;f--)if(g=a[f][d],"object"==typeof g)e.unshift(g);else if(void 0!==g){i[d]=g;break}e.length&&(i[d]=W(e))}for(c=a.length-1;c>=0;c--){h=a[c];for(d in h)d in i||(i[d]=h[d])}return i}function X(a){var b=function(){};return b.prototype=a,new b}function Y(a,b){for(var c in a)$(a,c)&&(b[c]=a[c])}function Z(a,b){var c,d,e=["constructor","toString","valueOf"];for(c=0;c<e.length;c++)d=e[c],a[d]!==Object.prototype[d]&&(b[d]=a[d])}function $(a,b){return db.call(a,b)}function _(b){return/undefined|null|boolean|number|string/.test(a.type(b))}function aa(b,c,d){if(a.isFunction(b)&&(b=[b]),b){var e,f;for(e=0;e<b.length;e++)f=b[e].apply(c,d)||f;return f}}function ba(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]}function ca(a){return(a+"").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#039;").replace(/"/g,"&quot;").replace(/\n/g,"<br />")}function da(a){return a.replace(/&.*?;/g,"")}function ea(b){var c=[];return a.each(b,function(a,b){null!=b&&c.push(a+":"+b)}),c.join(";")}function fa(a){return a.charAt(0).toUpperCase()+a.slice(1)}function ga(a,b){return a-b}function ha(a){return a%1===0}function ia(a,b){var c=a[b];return function(){return c.apply(a,arguments)}}function ja(a,b,c){var d,e,f,g,h,i=function(){var j=+new Date-g;b>j?d=setTimeout(i,b-j):(d=null,c||(h=a.apply(f,e),f=e=null))};return function(){f=this,e=arguments,g=+new Date;var j=c&&!d;return d||(d=setTimeout(i,b)),j&&(h=a.apply(f,e),f=e=null),h}}function ka(b,c){return b&&b.then&&"resolved"!==b.state()?c?b.then(c):void 0:a.when(c())}function la(c,d,e){var f,g,h,i,j=c[0],k=1==c.length&&"string"==typeof j;return b.isMoment(j)?(i=b.apply(null,c),na(j,i)):U(j)||void 0===j?i=b.apply(null,c):(f=!1,g=!1,k?eb.test(j)?(j+="-01",c=[j],f=!0,g=!0):(h=fb.exec(j))&&(f=!h[5],g=!0):a.isArray(j)&&(g=!0),i=d||f?b.utc.apply(b,c):b.apply(null,c),f?(i._ambigTime=!0,i._ambigZone=!0):e&&(g?i._ambigZone=!0:k&&(i.utcOffset?i.utcOffset(j):i.zone(j)))),i._fullCalendar=!0,i}function ma(a,c){var d,e,f=!1,g=!1,h=a.length,i=[];for(d=0;h>d;d++)e=a[d],b.isMoment(e)||(e=Wa.moment.parseZone(e)),f=f||e._ambigTime,g=g||e._ambigZone,i.push(e);for(d=0;h>d;d++)e=i[d],c||!f||e._ambigTime?g&&!e._ambigZone&&(i[d]=e.clone().stripZone()):i[d]=e.clone().stripTime();return i}function na(a,b){a._ambigTime?b._ambigTime=!0:b._ambigTime&&(b._ambigTime=!1),a._ambigZone?b._ambigZone=!0:b._ambigZone&&(b._ambigZone=!1)}function oa(a,b){a.year(b[0]||0).month(b[1]||0).date(b[2]||0).hours(b[3]||0).minutes(b[4]||0).seconds(b[5]||0).milliseconds(b[6]||0)}function pa(a,b){return hb.format.call(a,b)}function qa(a,b){return ra(a,wa(b))}function ra(a,b){var c,d="";for(c=0;c<b.length;c++)d+=sa(a,b[c]);return d}function sa(a,b){var c,d;return"string"==typeof b?b:(c=b.token)?ib[c]?ib[c](a):pa(a,c):b.maybe&&(d=ra(a,b.maybe),d.match(/[1-9]/))?d:""}function ta(a,b,c,d,e){var f;return a=Wa.moment.parseZone(a),b=Wa.moment.parseZone(b),f=(a.localeData||a.lang).call(a),c=f.longDateFormat(c)||c,d=d||" - ",ua(a,b,wa(c),d,e)}function ua(a,b,c,d,e){var f,g,h,i,j=a.clone().stripZone(),k=b.clone().stripZone(),l="",m="",n="",o="",p="";for(g=0;g<c.length&&(f=va(a,b,j,k,c[g]),f!==!1);g++)l+=f;for(h=c.length-1;h>g&&(f=va(a,b,j,k,c[h]),f!==!1);h--)m=f+m;for(i=g;h>=i;i++)n+=sa(a,c[i]),o+=sa(b,c[i]);return(n||o)&&(p=e?o+d+n:n+d+o),l+p+m}function va(a,b,c,d,e){var f,g;return"string"==typeof e?e:(f=e.token)&&(g=jb[f.charAt(0)],g&&c.isSame(d,g))?pa(a,f):!1}function wa(a){return a in kb?kb[a]:kb[a]=xa(a)}function xa(a){for(var b,c=[],d=/\[([^\]]*)\]|\(([^\)]*)\)|(LTS|LT|(\w)\4*o?)|([^\w\[\(]+)/g;b=d.exec(a);)b[1]?c.push(b[1]):b[2]?c.push({maybe:xa(b[2])}):b[3]?c.push({token:b[3]}):b[5]&&c.push(b[5]);return c}function ya(){}function za(a,b){var c;return $(b,"constructor")&&(c=b.constructor),"function"!=typeof c&&(c=b.constructor=function(){a.apply(this,arguments)}),c.prototype=X(a.prototype),Y(b,c.prototype),Z(b,c.prototype),Y(a,c),c}function Aa(a,b){Y(b,a.prototype)}function Ba(a,b){return a||b?a&&b?a.component===b.component&&Ca(a,b)&&Ca(b,a):!1:!0}function Ca(a,b){for(var c in a)if(!/^(component|left|right|top|bottom)$/.test(c)&&a[c]!==b[c])return!1;return!0}function Da(a){var b=Fa(a);return"background"===b||"inverse-background"===b}function Ea(a){return"inverse-background"===Fa(a)}function Fa(a){return ba((a.source||{}).rendering,a.rendering)}function Ga(a){var b,c,d={};for(b=0;b<a.length;b++)c=a[b],(d[c._id]||(d[c._id]=[])).push(c);return d}function Ha(a,b){return a.start-b.start}function Ia(c){var d,e,f,g,h=Wa.dataAttrPrefix;return h&&(h+="-"),d=c.data(h+"event")||null,d&&(d="object"==typeof d?a.extend({},d):{},e=d.start,null==e&&(e=d.time),f=d.duration,g=d.stick,delete d.start,delete d.time,delete d.duration,delete d.stick),null==e&&(e=c.data(h+"start")),null==e&&(e=c.data(h+"time")),null==f&&(f=c.data(h+"duration")),null==g&&(g=c.data(h+"stick")),e=null!=e?b.duration(e):null,f=null!=f?b.duration(f):null,g=Boolean(g),{eventProps:d,startTime:e,duration:f,stick:g}}function Ja(a,b){var c,d;for(c=0;c<b.length;c++)if(d=b[c],d.leftCol<=a.rightCol&&d.rightCol>=a.leftCol)return!0;return!1}function Ka(a,b){return a.leftCol-b.leftCol}function La(a){var b,c,d,e=[];for(b=0;b<a.length;b++){for(c=a[b],d=0;d<e.length&&Oa(c,e[d]).length;d++);c.level=d,(e[d]||(e[d]=[])).push(c)}return e}function Ma(a){var b,c,d,e,f;for(b=0;b<a.length;b++)for(c=a[b],d=0;d<c.length;d++)for(e=c[d],e.forwardSegs=[],f=b+1;f<a.length;f++)Oa(e,a[f],e.forwardSegs)}function Na(a){var b,c,d=a.forwardSegs,e=0;if(void 0===a.forwardPressure){for(b=0;b<d.length;b++)c=d[b],Na(c),e=Math.max(e,1+c.forwardPressure);a.forwardPressure=e}}function Oa(a,b,c){c=c||[];for(var d=0;d<b.length;d++)Pa(a,b[d])&&c.push(b[d]);return c}function Pa(a,b){return a.bottom>b.top&&a.top<b.bottom}function Qa(c,d){function e(){T?h()&&(k(),i()):f()}function f(){U=O.theme?"ui":"fc",c.addClass("fc"),O.isRTL?c.addClass("fc-rtl"):c.addClass("fc-ltr"),O.theme?c.addClass("ui-widget"):c.addClass("fc-unthemed"),T=a("<div class='fc-view-container'/>").prependTo(c),R=N.header=new Ta(N,O),S=R.render(),S&&c.prepend(S),i(O.defaultView),O.handleWindowResize&&(Y=ja(m,O.windowResizeDelay),a(window).resize(Y))}function g(){V&&V.removeElement(),R.removeElement(),T.remove(),c.removeClass("fc fc-ltr fc-rtl fc-unthemed ui-widget"),Y&&a(window).unbind("resize",Y)}function h(){return c.is(":visible")}function i(b){da++,V&&b&&V.type!==b&&(R.deactivateButton(V.type),H(),V.removeElement(),V=N.view=null),!V&&b&&(V=N.view=ca[b]||(ca[b]=N.instantiateView(b)),V.setElement(a("<div class='fc-view fc-"+b+"-view' />").appendTo(T)),R.activateButton(b)),V&&(Z=V.massageCurrentDate(Z),V.displaying&&Z.isWithin(V.intervalStart,V.intervalEnd)||h()&&(V.display(Z),I(),u(),v(),q())),I(),da--}function j(a){return h()?(a&&l(),da++,V.updateSize(!0),da--,!0):void 0}function k(){h()&&l()}function l(){W="number"==typeof O.contentHeight?O.contentHeight:"number"==typeof O.height?O.height-(S?S.outerHeight(!0):0):Math.round(T.width()/Math.max(O.aspectRatio,.5))}function m(a){!da&&a.target===window&&V.start&&j(!0)&&V.trigger("windowResize",ba)}function n(){r()}function o(a){aa(N.getEventSourcesByMatchArray(a))}function p(){h()&&(H(),V.displayEvents(ea),I())}function q(){!O.lazyFetching||$(V.start,V.end)?r():p()}function r(){_(V.start,V.end)}function s(a){ea=a,p()}function t(){p()}function u(){R.updateTitle(V.title)}function v(){var a=N.getNow();a.isWithin(V.intervalStart,V.intervalEnd)?R.disableButton("today"):R.enableButton("today")}function w(a,b){V.select(N.buildSelectSpan.apply(N,arguments))}function x(){V&&V.unselect()}function y(){Z=V.computePrevDate(Z),i()}function z(){Z=V.computeNextDate(Z),i()}function A(){Z.add(-1,"years"),i()}function B(){Z.add(1,"years"),i()}function C(){Z=N.getNow(),i()}function D(a){Z=N.moment(a).stripZone(),i()}function E(a){Z.add(b.duration(a)),i()}function F(a,b){var c;b=b||"day",c=N.getViewSpec(b)||N.getUnitViewSpec(b),Z=a.clone(),i(c?c.type:null)}function G(){return N.applyTimezone(Z)}function H(){T.css({width:"100%",height:T.height(),overflow:"hidden"})}function I(){T.css({width:"",height:"",overflow:""})}function J(){return N}function K(){return V}function L(a,b){return void 0===b?O[a]:void("height"!=a&&"contentHeight"!=a&&"aspectRatio"!=a||(O[a]=b,j(!0)))}function M(a,b){var c=Array.prototype.slice.call(arguments,2);return b=b||ba,this.triggerWith(a,b,c),O[a]?O[a].apply(b,c):void 0}var N=this;N.initOptions(d||{});var O=this.options;N.render=e,N.destroy=g,N.refetchEvents=n,N.refetchEventSources=o,N.reportEvents=s,N.reportEventChange=t,N.rerenderEvents=p,N.changeView=i,N.select=w,N.unselect=x,N.prev=y,N.next=z,N.prevYear=A,N.nextYear=B,N.today=C,N.gotoDate=D,N.incrementDate=E,N.zoomTo=F,N.getDate=G,N.getCalendar=J,N.getView=K,N.option=L,N.trigger=M;var P=X(Sa(O.lang));if(O.monthNames&&(P._months=O.monthNames),O.monthNamesShort&&(P._monthsShort=O.monthNamesShort),O.dayNames&&(P._weekdays=O.dayNames),O.dayNamesShort&&(P._weekdaysShort=O.dayNamesShort),null!=O.firstDay){var Q=X(P._week);Q.dow=O.firstDay,P._week=Q}P._fullCalendar_weekCalc=function(a){return"function"==typeof a?a:"local"===a?a:"iso"===a||"ISO"===a?"ISO":void 0}(O.weekNumberCalculation),N.defaultAllDayEventDuration=b.duration(O.defaultAllDayEventDuration),N.defaultTimedEventDuration=b.duration(O.defaultTimedEventDuration),N.moment=function(){var a;return"local"===O.timezone?(a=Wa.moment.apply(null,arguments),a.hasTime()&&a.local()):a="UTC"===O.timezone?Wa.moment.utc.apply(null,arguments):Wa.moment.parseZone.apply(null,arguments),"_locale"in a?a._locale=P:a._lang=P,a},N.getIsAmbigTimezone=function(){return"local"!==O.timezone&&"UTC"!==O.timezone},N.applyTimezone=function(a){if(!a.hasTime())return a.clone();var b,c=N.moment(a.toArray()),d=a.time()-c.time();return d&&(b=c.clone().add(d),a.time()-b.time()===0&&(c=b)),c},N.getNow=function(){var a=O.now;return"function"==typeof a&&(a=a()),N.moment(a).stripZone()},N.getEventEnd=function(a){return a.end?a.end.clone():N.getDefaultEventEnd(a.allDay,a.start)},N.getDefaultEventEnd=function(a,b){var c=b.clone();return a?c.stripTime().add(N.defaultAllDayEventDuration):c.add(N.defaultTimedEventDuration),N.getIsAmbigTimezone()&&c.stripZone(),c},N.humanizeDuration=function(a){return(a.locale||a.lang).call(a,O.lang).humanize()},Ua.call(N,O);var R,S,T,U,V,W,Y,Z,$=N.isFetchNeeded,_=N.fetchEvents,aa=N.fetchEventSources,ba=c[0],ca={},da=0,ea=[];Z=null!=O.defaultDate?N.moment(O.defaultDate).stripZone():N.getNow(),N.getSuggestedViewHeight=function(){return void 0===W&&k(),W},N.isHeightAuto=function(){return"auto"===O.contentHeight||"auto"===O.height},N.freezeContentHeight=H,N.unfreezeContentHeight=I,N.initialize()}function Ra(b){a.each(Db,function(a,c){null==b[a]&&(b[a]=c(b))})}function Sa(a){var c=b.localeData||b.langData;return c.call(b,a)||c.call(b,"en")}function Ta(b,c){function d(){var b=c.header;return n=c.theme?"ui":"fc",b?o=a("<div class='fc-toolbar'/>").append(f("left")).append(f("right")).append(f("center")).append('<div class="fc-clear"/>'):void 0}function e(){o.remove(),o=a()}function f(d){var e=a('<div class="fc-'+d+'"/>'),f=c.header[d];return f&&a.each(f.split(" "),function(d){var f,g=a(),h=!0;a.each(this.split(","),function(d,e){var f,i,j,k,l,m,o,q,r,s;"title"==e?(g=g.add(a("<h2>&nbsp;</h2>")),h=!1):((f=(b.options.customButtons||{})[e])?(j=function(a){f.click&&f.click.call(s[0],a)},k="",l=f.text):(i=b.getViewSpec(e))?(j=function(){b.changeView(e)},p.push(e),k=i.buttonTextOverride,l=i.buttonTextDefault):b[e]&&(j=function(){b[e]()},k=(b.overrides.buttonText||{})[e],l=c.buttonText[e]),j&&(m=f?f.themeIcon:c.themeButtonIcons[e],o=f?f.icon:c.buttonIcons[e],q=k?ca(k):m&&c.theme?"<span class='ui-icon ui-icon-"+m+"'></span>":o&&!c.theme?"<span class='fc-icon fc-icon-"+o+"'></span>":ca(l),r=["fc-"+e+"-button",n+"-button",n+"-state-default"],s=a('<button type="button" class="'+r.join(" ")+'">'+q+"</button>").click(function(a){s.hasClass(n+"-state-disabled")||(j(a),(s.hasClass(n+"-state-active")||s.hasClass(n+"-state-disabled"))&&s.removeClass(n+"-state-hover"))}).mousedown(function(){s.not("."+n+"-state-active").not("."+n+"-state-disabled").addClass(n+"-state-down")}).mouseup(function(){s.removeClass(n+"-state-down")}).hover(function(){s.not("."+n+"-state-active").not("."+n+"-state-disabled").addClass(n+"-state-hover")},function(){s.removeClass(n+"-state-hover").removeClass(n+"-state-down")}),g=g.add(s)))}),h&&g.first().addClass(n+"-corner-left").end().last().addClass(n+"-corner-right").end(),g.length>1?(f=a("<div/>"),h&&f.addClass("fc-button-group"),f.append(g),e.append(f)):e.append(g)}),e}function g(a){o.find("h2").text(a)}function h(a){o.find(".fc-"+a+"-button").addClass(n+"-state-active")}function i(a){o.find(".fc-"+a+"-button").removeClass(n+"-state-active")}function j(a){o.find(".fc-"+a+"-button").prop("disabled",!0).addClass(n+"-state-disabled")}function k(a){o.find(".fc-"+a+"-button").prop("disabled",!1).removeClass(n+"-state-disabled")}function l(){return p}var m=this;m.render=d,m.removeElement=e,m.updateTitle=g,m.activateButton=h,m.deactivateButton=i,m.disableButton=j,m.enableButton=k,m.getViewsWithButtons=l;var n,o=a(),p=[]}function Ua(c){function d(a,b){return!W||W>a||b>X}function e(a,b){W=a,X=b,f($,"reset")}function f(a,b){var c,d;for("reset"===b?da=[]:"add"!==b&&(da=v(da,a)),c=0;c<a.length;c++)d=a[c],"pending"!==d._status&&ca++,d._fetchId=(d._fetchId||0)+1,d._status="pending";for(c=0;c<a.length;c++)d=a[c],g(d,d._fetchId)}function g(b,c){j(b,function(d){var e,f,g,h=a.isArray(b.events);if(c===b._fetchId&&"rejected"!==b._status){if(b._status="resolved",d)for(e=0;e<d.length;e++)f=d[e],g=h?f:C(f,b),g&&da.push.apply(da,G(g));i()}})}function h(a){var b="pending"===a._status;a._status="rejected",b&&i()}function i(){ca--,ca||Y(da)}function j(b,d){var e,f,g=Wa.sourceFetchers;for(e=0;e<g.length;e++){if(f=g[e].call(U,b,W.clone(),X.clone(),c.timezone,d),f===!0)return;if("object"==typeof f)return void j(f,d)}var h=b.events;if(h)a.isFunction(h)?(U.pushLoading(),h.call(U,W.clone(),X.clone(),c.timezone,function(a){d(a),U.popLoading()})):a.isArray(h)?d(h):d();else{var i=b.url;if(i){var k,l=b.success,m=b.error,n=b.complete;k=a.isFunction(b.data)?b.data():b.data;var o=a.extend({},k||{}),p=ba(b.startParam,c.startParam),q=ba(b.endParam,c.endParam),r=ba(b.timezoneParam,c.timezoneParam);p&&(o[p]=W.format()),q&&(o[q]=X.format()),c.timezone&&"local"!=c.timezone&&(o[r]=c.timezone),U.pushLoading(),a.ajax(a.extend({},Eb,b,{data:o,success:function(b){b=b||[];var c=aa(l,this,arguments);a.isArray(c)&&(b=c),d(b)},error:function(){aa(m,this,arguments),d()},complete:function(){aa(n,this,arguments),U.popLoading()}}))}else d()}}function k(a){var b=l(a);b&&($.push(b),f([b],"add"))}function l(b){var c,d,e=Wa.sourceNormalizers;if(a.isFunction(b)||a.isArray(b)?c={events:b}:"string"==typeof b?c={url:b}:"object"==typeof b&&(c=a.extend({},b)),c){for(c.className?"string"==typeof c.className&&(c.className=c.className.split(/\s+/)):c.className=[],a.isArray(c.events)&&(c.origArray=c.events,c.events=a.map(c.events,function(a){return C(a,c)})),d=0;d<e.length;d++)e[d].call(U,c);return c}}function m(a){o(s(a))}function n(a){null==a?o($,!0):o(r(a))}function o(b,c){var d;for(d=0;d<b.length;d++)h(b[d]);c?($=[],da=[]):($=a.grep($,function(a){for(d=0;d<b.length;d++)if(a===b[d])return!1;return!0}),da=v(da,b)),Y(da)}function p(){return $.slice(1)}function q(b){return a.grep($,function(a){return a.id&&a.id===b})[0]}function r(b){b?a.isArray(b)||(b=[b]):b=[];var c,d=[];for(c=0;c<b.length;c++)d.push.apply(d,s(b[c]));return d}function s(b){var c,d;for(c=0;c<$.length;c++)if(d=$[c],d===b)return[d];return d=q(b),d?[d]:a.grep($,function(a){return t(b,a)})}function t(a,b){return a&&b&&u(a)==u(b)}function u(a){return("object"==typeof a?a.origArray||a.googleCalendarId||a.url||a.events:null)||a}function v(b,c){return a.grep(b,function(a){for(var b=0;b<c.length;b++)if(a.source===c[b])return!1;return!0})}function w(a){a.start=U.moment(a.start),a.end?a.end=U.moment(a.end):a.end=null,H(a,x(a)),Y(da)}function x(b){var c={};return a.each(b,function(a,b){y(a)&&void 0!==b&&_(b)&&(c[a]=b)}),c}function y(a){return!/^_|^(id|allDay|start|end)$/.test(a)}function z(a,b){var c,d,e,f=C(a);if(f){for(c=G(f),d=0;d<c.length;d++)e=c[d],e.source||(b&&(Z.events.push(e),e.source=Z),da.push(e));return Y(da),c}return[]}function A(b){var c,d;for(null==b?b=function(){return!0}:a.isFunction(b)||(c=b+"",b=function(a){return a._id==c}),da=a.grep(da,b,!0),d=0;d<$.length;d++)a.isArray($[d].events)&&($[d].events=a.grep($[d].events,b,!0));Y(da)}function B(b){return a.isFunction(b)?a.grep(da,b):null!=b?(b+="",a.grep(da,function(a){return a._id==b})):da}function C(d,e){var f,g,h,i={};if(c.eventDataTransform&&(d=c.eventDataTransform(d)),e&&e.eventDataTransform&&(d=e.eventDataTransform(d)),a.extend(i,d),e&&(i.source=e),i._id=d._id||(void 0===d.id?"_fc"+Fb++:d.id+""),d.className?"string"==typeof d.className?i.className=d.className.split(/\s+/):i.className=d.className:i.className=[],f=d.start||d.date,g=d.end,V(f)&&(f=b.duration(f)),V(g)&&(g=b.duration(g)),d.dow||b.isDuration(f)||b.isDuration(g))i.start=f?b.duration(f):null,i.end=g?b.duration(g):null,i._recurring=!0;else{if(f&&(f=U.moment(f),!f.isValid()))return!1;g&&(g=U.moment(g),g.isValid()||(g=null)),h=d.allDay,void 0===h&&(h=ba(e?e.allDayDefault:void 0,c.allDayDefault)),D(f,g,h,i)}return U.normalizeEvent(i),i}function D(a,b,c,d){d.start=a,d.end=b,d.allDay=c,E(d),Va(d)}function E(a){F(a),a.end&&!a.end.isAfter(a.start)&&(a.end=null),a.end||(c.forceEventDuration?a.end=U.getDefaultEventEnd(a.allDay,a.start):a.end=null)}function F(a){null==a.allDay&&(a.allDay=!(a.start.hasTime()||a.end&&a.end.hasTime())),a.allDay?(a.start.stripTime(),a.end&&a.end.stripTime()):(a.start.hasTime()||(a.start=U.applyTimezone(a.start.time(0))),a.end&&!a.end.hasTime()&&(a.end=U.applyTimezone(a.end.time(0))))}function G(b,c,d){var e,f,g,h,i,j,k,l,m,n=[];if(c=c||W,d=d||X,b)if(b._recurring){if(f=b.dow)for(e={},g=0;g<f.length;g++)e[f[g]]=!0;for(h=c.clone().stripTime();h.isBefore(d);)e&&!e[h.day()]||(i=b.start,j=b.end,k=h.clone(),l=null,i&&(k=k.time(i)),j&&(l=h.clone().time(j)),m=a.extend({},b),D(k,l,!i&&!j,m),n.push(m)),h.add(1,"days")}else n.push(b);return n}function H(b,c,d){function e(a,b){return d?N(a,b,d):c.allDay?M(a,b):L(a,b)}var f,g,h,i,j,k,l={};return c=c||{},c.start||(c.start=b.start.clone()),void 0===c.end&&(c.end=b.end?b.end.clone():null),null==c.allDay&&(c.allDay=b.allDay),E(c),f={start:b._start.clone(),end:b._end?b._end.clone():U.getDefaultEventEnd(b._allDay,b._start),allDay:c.allDay},E(f),g=null!==b._end&&null===c.end,h=e(c.start,f.start),c.end?(i=e(c.end,f.end),j=i.subtract(h)):j=null,a.each(c,function(a,b){y(a)&&void 0!==b&&(l[a]=b)}),k=I(B(b._id),g,c.allDay,h,j,l),{dateDelta:h,durationDelta:j,undo:k}}function I(b,c,d,e,f,g){var h=U.getIsAmbigTimezone(),i=[];return e&&!e.valueOf()&&(e=null),f&&!f.valueOf()&&(f=null),a.each(b,function(b,j){var k,l;k={start:j.start.clone(),end:j.end?j.end.clone():null,allDay:j.allDay},a.each(g,function(a){k[a]=j[a]}),l={start:j._start,end:j._end,allDay:d},E(l),c?l.end=null:f&&!l.end&&(l.end=U.getDefaultEventEnd(l.allDay,l.start)),e&&(l.start.add(e),l.end&&l.end.add(e)),f&&l.end.add(f),h&&!l.allDay&&(e||f)&&(l.start.stripZone(),l.end&&l.end.stripZone()),a.extend(j,g,l),Va(j),i.push(function(){a.extend(j,k),Va(j)})}),function(){for(var a=0;a<i.length;a++)i[a]()}}function J(b){var d,e=c.businessHours,f={className:"fc-nonbusiness",start:"09:00",end:"17:00",dow:[1,2,3,4,5],rendering:"inverse-background"},g=U.getView();return e&&(d=a.extend({},f,"object"==typeof e?e:{})),d?(b&&(d.start=null,d.end=null),G(C(d),g.start,g.end)):[]}function K(a,b){var d=b.source||{},e=ba(b.constraint,d.constraint,c.eventConstraint),f=ba(b.overlap,d.overlap,c.eventOverlap);return Q(a,e,f,b)}function O(b,c,d){var e,f;return d&&(e=a.extend({},d,c),f=G(C(e))[0]),f?K(b,f):P(b)}function P(a){return Q(a,c.selectConstraint,c.selectOverlap)}function Q(a,b,c,d){var e,f,g,h,i,j;if(null!=b){for(e=R(b),f=!1,h=0;h<e.length;h++)if(S(e[h],a)){f=!0;break}if(!f)return!1}for(g=U.getPeerEvents(a,d),h=0;h<g.length;h++)if(i=g[h],T(i,a)){if(c===!1)return!1;if("function"==typeof c&&!c(i,d))return!1;if(d){if(j=ba(i.overlap,(i.source||{}).overlap),j===!1)return!1;if("function"==typeof j&&!j(d,i))return!1}}return!0}function R(a){return"businessHours"===a?J():"object"==typeof a?G(C(a)):B(a)}function S(a,b){var c=a.start.clone().stripZone(),d=U.getEventEnd(a).stripZone();return b.start>=c&&b.end<=d}function T(a,b){var c=a.start.clone().stripZone(),d=U.getEventEnd(a).stripZone();return b.start<d&&b.end>c}var U=this;U.isFetchNeeded=d,U.fetchEvents=e,U.fetchEventSources=f,U.getEventSources=p,U.getEventSourceById=q,U.getEventSourcesByMatchArray=r,U.getEventSourcesByMatch=s,U.addEventSource=k,U.removeEventSource=m,U.removeEventSources=n,U.updateEvent=w,U.renderEvent=z,U.removeEvents=A,U.clientEvents=B,U.mutateEvent=H,U.normalizeEventDates=E,U.normalizeEventTimes=F;var W,X,Y=U.reportEvents,Z={events:[]},$=[Z],ca=0,da=[];a.each((c.events?[c.events]:[]).concat(c.eventSources||[]),function(a,b){var c=l(b);c&&$.push(c)}),U.getBusinessHoursEvents=J,U.isEventSpanAllowed=K,U.isExternalSpanAllowed=O,U.isSelectionSpanAllowed=P,U.getEventCache=function(){return da}}function Va(a){a._allDay=a.allDay,a._start=a.start.clone(),a._end=a.end?a.end.clone():null}var Wa=a.fullCalendar={version:"2.8.0",internalApiVersion:4},Xa=Wa.views={};a.fn.fullCalendar=function(b){var c=Array.prototype.slice.call(arguments,1),d=this;return this.each(function(e,f){var g,h=a(f),i=h.data("fullCalendar");"string"==typeof b?i&&a.isFunction(i[b])&&(g=i[b].apply(i,c),e||(d=g),"destroy"===b&&h.removeData("fullCalendar")):i||(i=new zb(h,b),h.data("fullCalendar",i),i.render())}),d};var Ya=["header","buttonText","buttonIcons","themeButtonIcons"];Wa.intersectRanges=K,Wa.applyAll=aa,Wa.debounce=ja,Wa.isInt=ha,Wa.htmlEscape=ca,Wa.cssToStr=ea,Wa.proxy=ia,Wa.capitaliseFirstLetter=fa,Wa.getOuterRect=n,Wa.getClientRect=o,Wa.getContentRect=p,Wa.getScrollbarWidths=q;var Za=null;Wa.preventDefault=z,Wa.intersectRects=C,Wa.parseFieldSpecs=G,Wa.compareByFieldSpecs=H,Wa.compareByFieldSpec=I,Wa.flexibleCompare=J,Wa.computeIntervalUnit=O,Wa.divideRangeByDuration=Q,Wa.divideDurationByDuration=R,Wa.multiplyDuration=S,Wa.durationHasTime=T;var $a=["sun","mon","tue","wed","thu","fri","sat"],_a=["year","month","week","day","hour","minute","second","millisecond"];Wa.log=function(){var a=window.console;return a&&a.log?a.log.apply(a,arguments):void 0},Wa.warn=function(){var a=window.console;return a&&a.warn?a.warn.apply(a,arguments):Wa.log.apply(Wa,arguments)};var ab,bb,cb,db={}.hasOwnProperty,eb=/^\s*\d{4}-\d\d$/,fb=/^\s*\d{4}-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?)?$/,gb=b.fn,hb=a.extend({},gb);Wa.moment=function(){return la(arguments)},Wa.moment.utc=function(){var a=la(arguments,!0);return a.hasTime()&&a.utc(),a},Wa.moment.parseZone=function(){return la(arguments,!0,!0)},gb.clone=function(){var a=hb.clone.apply(this,arguments);return na(this,a),this._fullCalendar&&(a._fullCalendar=!0),a},gb.week=gb.weeks=function(a){var b=(this._locale||this._lang)._fullCalendar_weekCalc;return null==a&&"function"==typeof b?b(this):"ISO"===b?hb.isoWeek.apply(this,arguments):hb.week.apply(this,arguments)},gb.time=function(a){if(!this._fullCalendar)return hb.time.apply(this,arguments);if(null==a)return b.duration({hours:this.hours(),minutes:this.minutes(),seconds:this.seconds(),milliseconds:this.milliseconds()});this._ambigTime=!1,b.isDuration(a)||b.isMoment(a)||(a=b.duration(a));var c=0;return b.isDuration(a)&&(c=24*Math.floor(a.asDays())),this.hours(c+a.hours()).minutes(a.minutes()).seconds(a.seconds()).milliseconds(a.milliseconds())},gb.stripTime=function(){var a;return this._ambigTime||(a=this.toArray(),this.utc(),bb(this,a.slice(0,3)),this._ambigTime=!0,this._ambigZone=!0),this},gb.hasTime=function(){return!this._ambigTime},gb.stripZone=function(){var a,b;return this._ambigZone||(a=this.toArray(),b=this._ambigTime,this.utc(),bb(this,a),this._ambigTime=b||!1,this._ambigZone=!0),this},gb.hasZone=function(){return!this._ambigZone},gb.local=function(){var a=this.toArray(),b=this._ambigZone;return hb.local.apply(this,arguments),this._ambigTime=!1,this._ambigZone=!1,b&&cb(this,a),this},gb.utc=function(){return hb.utc.apply(this,arguments),this._ambigTime=!1,this._ambigZone=!1,this},a.each(["zone","utcOffset"],function(a,b){hb[b]&&(gb[b]=function(a){return null!=a&&(this._ambigTime=!1,this._ambigZone=!1),hb[b].apply(this,arguments)})}),gb.format=function(){return this._fullCalendar&&arguments[0]?qa(this,arguments[0]):this._ambigTime?pa(this,"YYYY-MM-DD"):this._ambigZone?pa(this,"YYYY-MM-DD[T]HH:mm:ss"):hb.format.apply(this,arguments)},gb.toISOString=function(){return this._ambigTime?pa(this,"YYYY-MM-DD"):this._ambigZone?pa(this,"YYYY-MM-DD[T]HH:mm:ss"):hb.toISOString.apply(this,arguments)},gb.isWithin=function(a,b){var c=ma([this,a,b]);return c[0]>=c[1]&&c[0]<c[2]},gb.isSame=function(a,b){var c;return this._fullCalendar?b?(c=ma([this,a],!0),hb.isSame.call(c[0],c[1],b)):(a=Wa.moment.parseZone(a),hb.isSame.call(this,a)&&Boolean(this._ambigTime)===Boolean(a._ambigTime)&&Boolean(this._ambigZone)===Boolean(a._ambigZone)):hb.isSame.apply(this,arguments)},a.each(["isBefore","isAfter"],function(a,b){gb[b]=function(a,c){var d;return this._fullCalendar?(d=ma([this,a]),hb[b].call(d[0],d[1],c)):hb[b].apply(this,arguments)}}),ab="_d"in b()&&"updateOffset"in b,bb=ab?function(a,c){a._d.setTime(Date.UTC.apply(Date,c)),b.updateOffset(a,!1)}:oa,cb=ab?function(a,c){a._d.setTime(+new Date(c[0]||0,c[1]||0,c[2]||0,c[3]||0,c[4]||0,c[5]||0,c[6]||0)),b.updateOffset(a,!1)}:oa;var ib={t:function(a){return pa(a,"a").charAt(0)},T:function(a){return pa(a,"A").charAt(0)}};Wa.formatRange=ta;var jb={Y:"year",M:"month",D:"day",d:"day",A:"second",a:"second",T:"second",t:"second",H:"second",h:"second",m:"second",s:"second"},kb={};Wa.Class=ya,ya.extend=function(){var a,b,c=arguments.length;for(a=0;c>a;a++)b=arguments[a],c-1>a&&Aa(this,b);return za(this,b||{});
+},ya.mixin=function(a){Aa(this,a)};var lb=Wa.EmitterMixin={on:function(b,c){var d=function(a,b){return c.apply(b.context||this,b.args||[])};return c.guid||(c.guid=a.guid++),d.guid=c.guid,a(this).on(b,d),this},off:function(b,c){return a(this).off(b,c),this},trigger:function(b){var c=Array.prototype.slice.call(arguments,1);return a(this).triggerHandler(b,{args:c}),this},triggerWith:function(b,c,d){return a(this).triggerHandler(b,{context:c,args:d}),this}},mb=Wa.ListenerMixin=function(){var b=0,c={listenerId:null,listenTo:function(b,c,d){if("object"==typeof c)for(var e in c)c.hasOwnProperty(e)&&this.listenTo(b,e,c[e]);else"string"==typeof c&&b.on(c+"."+this.getListenerNamespace(),a.proxy(d,this))},stopListeningTo:function(a,b){a.off((b||"")+"."+this.getListenerNamespace())},getListenerNamespace:function(){return null==this.listenerId&&(this.listenerId=b++),"_listener"+this.listenerId}};return c}(),nb={isIgnoringMouse:!1,delayUnignoreMouse:null,initMouseIgnoring:function(a){this.delayUnignoreMouse=ja(ia(this,"unignoreMouse"),a||1e3)},tempIgnoreMouse:function(){this.isIgnoringMouse=!0,this.delayUnignoreMouse()},unignoreMouse:function(){this.isIgnoringMouse=!1}},ob=ya.extend(mb,{isHidden:!0,options:null,el:null,margin:10,constructor:function(a){this.options=a||{}},show:function(){this.isHidden&&(this.el||this.render(),this.el.show(),this.position(),this.isHidden=!1,this.trigger("show"))},hide:function(){this.isHidden||(this.el.hide(),this.isHidden=!0,this.trigger("hide"))},render:function(){var b=this,c=this.options;this.el=a('<div class="fc-popover"/>').addClass(c.className||"").css({top:0,left:0}).append(c.content).appendTo(c.parentEl),this.el.on("click",".fc-close",function(){b.hide()}),c.autoHide&&this.listenTo(a(document),"mousedown",this.documentMousedown)},documentMousedown:function(b){this.el&&!a(b.target).closest(this.el).length&&this.hide()},removeElement:function(){this.hide(),this.el&&(this.el.remove(),this.el=null),this.stopListeningTo(a(document),"mousedown")},position:function(){var b,c,d,e,f,g=this.options,h=this.el.offsetParent().offset(),i=this.el.outerWidth(),j=this.el.outerHeight(),k=a(window),l=m(this.el);e=g.top||0,f=void 0!==g.left?g.left:void 0!==g.right?g.right-i:0,l.is(window)||l.is(document)?(l=k,b=0,c=0):(d=l.offset(),b=d.top,c=d.left),b+=k.scrollTop(),c+=k.scrollLeft(),g.viewportConstrain!==!1&&(e=Math.min(e,b+l.outerHeight()-j-this.margin),e=Math.max(e,b+this.margin),f=Math.min(f,c+l.outerWidth()-i-this.margin),f=Math.max(f,c+this.margin)),this.el.css({top:e-h.top,left:f-h.left})},trigger:function(a){this.options[a]&&this.options[a].apply(this,Array.prototype.slice.call(arguments,1))}}),pb=Wa.CoordCache=ya.extend({els:null,forcedOffsetParentEl:null,origin:null,boundingRect:null,isHorizontal:!1,isVertical:!1,lefts:null,rights:null,tops:null,bottoms:null,constructor:function(b){this.els=a(b.els),this.isHorizontal=b.isHorizontal,this.isVertical=b.isVertical,this.forcedOffsetParentEl=b.offsetParent?a(b.offsetParent):null},build:function(){var a=this.forcedOffsetParentEl||this.els.eq(0).offsetParent();this.origin=a.offset(),this.boundingRect=this.queryBoundingRect(),this.isHorizontal&&this.buildElHorizontals(),this.isVertical&&this.buildElVerticals()},clear:function(){this.origin=null,this.boundingRect=null,this.lefts=null,this.rights=null,this.tops=null,this.bottoms=null},ensureBuilt:function(){this.origin||this.build()},queryBoundingRect:function(){var a=m(this.els.eq(0));return a.is(document)?void 0:o(a)},buildElHorizontals:function(){var b=[],c=[];this.els.each(function(d,e){var f=a(e),g=f.offset().left,h=f.outerWidth();b.push(g),c.push(g+h)}),this.lefts=b,this.rights=c},buildElVerticals:function(){var b=[],c=[];this.els.each(function(d,e){var f=a(e),g=f.offset().top,h=f.outerHeight();b.push(g),c.push(g+h)}),this.tops=b,this.bottoms=c},getHorizontalIndex:function(a){this.ensureBuilt();var b,c=this.boundingRect,d=this.lefts,e=this.rights,f=d.length;if(!c||a>=c.left&&a<c.right)for(b=0;f>b;b++)if(a>=d[b]&&a<e[b])return b},getVerticalIndex:function(a){this.ensureBuilt();var b,c=this.boundingRect,d=this.tops,e=this.bottoms,f=d.length;if(!c||a>=c.top&&a<c.bottom)for(b=0;f>b;b++)if(a>=d[b]&&a<e[b])return b},getLeftOffset:function(a){return this.ensureBuilt(),this.lefts[a]},getLeftPosition:function(a){return this.ensureBuilt(),this.lefts[a]-this.origin.left},getRightOffset:function(a){return this.ensureBuilt(),this.rights[a]},getRightPosition:function(a){return this.ensureBuilt(),this.rights[a]-this.origin.left},getWidth:function(a){return this.ensureBuilt(),this.rights[a]-this.lefts[a]},getTopOffset:function(a){return this.ensureBuilt(),this.tops[a]},getTopPosition:function(a){return this.ensureBuilt(),this.tops[a]-this.origin.top},getBottomOffset:function(a){return this.ensureBuilt(),this.bottoms[a]},getBottomPosition:function(a){return this.ensureBuilt(),this.bottoms[a]-this.origin.top},getHeight:function(a){return this.ensureBuilt(),this.bottoms[a]-this.tops[a]}}),qb=Wa.DragListener=ya.extend(mb,nb,{options:null,subjectEl:null,subjectHref:null,originX:null,originY:null,scrollEl:null,isInteracting:!1,isDistanceSurpassed:!1,isDelayEnded:!1,isDragging:!1,isTouch:!1,delay:null,delayTimeoutId:null,minDistance:null,handleTouchScrollProxy:null,constructor:function(a){this.options=a||{},this.handleTouchScrollProxy=ia(this,"handleTouchScroll"),this.initMouseIgnoring(500)},startInteraction:function(b,c){var d=x(b);if("mousedown"===b.type){if(this.isIgnoringMouse)return;if(!u(b))return;b.preventDefault()}this.isInteracting||(c=c||{},this.delay=ba(c.delay,this.options.delay,0),this.minDistance=ba(c.distance,this.options.distance,0),this.subjectEl=this.options.subjectEl,this.isInteracting=!0,this.isTouch=d,this.isDelayEnded=!1,this.isDistanceSurpassed=!1,this.originX=v(b),this.originY=w(b),this.scrollEl=m(a(b.target)),this.bindHandlers(),this.initAutoScroll(),this.handleInteractionStart(b),this.startDelay(b),this.minDistance||this.handleDistanceSurpassed(b))},handleInteractionStart:function(a){this.trigger("interactionStart",a)},endInteraction:function(a,b){this.isInteracting&&(this.endDrag(a),this.delayTimeoutId&&(clearTimeout(this.delayTimeoutId),this.delayTimeoutId=null),this.destroyAutoScroll(),this.unbindHandlers(),this.isInteracting=!1,this.handleInteractionEnd(a,b),this.isTouch&&this.tempIgnoreMouse())},handleInteractionEnd:function(a,b){this.trigger("interactionEnd",a,b||!1)},bindHandlers:function(){var b=this,c=1;this.isTouch?(this.listenTo(a(document),{touchmove:this.handleTouchMove,touchend:this.endInteraction,touchcancel:this.endInteraction,touchstart:function(a){c?c--:b.endInteraction(a,!0)}}),!A(this.handleTouchScrollProxy)&&this.scrollEl&&this.listenTo(this.scrollEl,"scroll",this.handleTouchScroll)):this.listenTo(a(document),{mousemove:this.handleMouseMove,mouseup:this.endInteraction}),this.listenTo(a(document),{selectstart:z,contextmenu:z})},unbindHandlers:function(){this.stopListeningTo(a(document)),B(this.handleTouchScrollProxy),this.scrollEl&&this.stopListeningTo(this.scrollEl,"scroll")},startDrag:function(a,b){this.startInteraction(a,b),this.isDragging||(this.isDragging=!0,this.handleDragStart(a))},handleDragStart:function(a){this.trigger("dragStart",a),this.initHrefHack()},handleMove:function(a){var b,c=v(a)-this.originX,d=w(a)-this.originY,e=this.minDistance;this.isDistanceSurpassed||(b=c*c+d*d,b>=e*e&&this.handleDistanceSurpassed(a)),this.isDragging&&this.handleDrag(c,d,a)},handleDrag:function(a,b,c){this.trigger("drag",a,b,c),this.updateAutoScroll(c)},endDrag:function(a){this.isDragging&&(this.isDragging=!1,this.handleDragEnd(a))},handleDragEnd:function(a){this.trigger("dragEnd",a),this.destroyHrefHack()},startDelay:function(a){var b=this;this.delay?this.delayTimeoutId=setTimeout(function(){b.handleDelayEnd(a)},this.delay):this.handleDelayEnd(a)},handleDelayEnd:function(a){this.isDelayEnded=!0,this.isDistanceSurpassed&&this.startDrag(a)},handleDistanceSurpassed:function(a){this.isDistanceSurpassed=!0,this.isDelayEnded&&this.startDrag(a)},handleTouchMove:function(a){this.isDragging&&a.preventDefault(),this.handleMove(a)},handleMouseMove:function(a){this.handleMove(a)},handleTouchScroll:function(a){this.isDragging||this.endInteraction(a,!0)},initHrefHack:function(){var a=this.subjectEl;(this.subjectHref=a?a.attr("href"):null)&&a.removeAttr("href")},destroyHrefHack:function(){var a=this.subjectEl,b=this.subjectHref;setTimeout(function(){b&&a.attr("href",b)},0)},trigger:function(a){this.options[a]&&this.options[a].apply(this,Array.prototype.slice.call(arguments,1)),this["_"+a]&&this["_"+a].apply(this,Array.prototype.slice.call(arguments,1))}});qb.mixin({isAutoScroll:!1,scrollBounds:null,scrollTopVel:null,scrollLeftVel:null,scrollIntervalId:null,scrollSensitivity:30,scrollSpeed:200,scrollIntervalMs:50,initAutoScroll:function(){var a=this.scrollEl;this.isAutoScroll=this.options.scroll&&a&&!a.is(window)&&!a.is(document),this.isAutoScroll&&this.listenTo(a,"scroll",ja(this.handleDebouncedScroll,100))},destroyAutoScroll:function(){this.endAutoScroll(),this.isAutoScroll&&this.stopListeningTo(this.scrollEl,"scroll")},computeScrollBounds:function(){this.isAutoScroll&&(this.scrollBounds=n(this.scrollEl))},updateAutoScroll:function(a){var b,c,d,e,f=this.scrollSensitivity,g=this.scrollBounds,h=0,i=0;g&&(b=(f-(w(a)-g.top))/f,c=(f-(g.bottom-w(a)))/f,d=(f-(v(a)-g.left))/f,e=(f-(g.right-v(a)))/f,b>=0&&1>=b?h=b*this.scrollSpeed*-1:c>=0&&1>=c&&(h=c*this.scrollSpeed),d>=0&&1>=d?i=d*this.scrollSpeed*-1:e>=0&&1>=e&&(i=e*this.scrollSpeed)),this.setScrollVel(h,i)},setScrollVel:function(a,b){this.scrollTopVel=a,this.scrollLeftVel=b,this.constrainScrollVel(),!this.scrollTopVel&&!this.scrollLeftVel||this.scrollIntervalId||(this.scrollIntervalId=setInterval(ia(this,"scrollIntervalFunc"),this.scrollIntervalMs))},constrainScrollVel:function(){var a=this.scrollEl;this.scrollTopVel<0?a.scrollTop()<=0&&(this.scrollTopVel=0):this.scrollTopVel>0&&a.scrollTop()+a[0].clientHeight>=a[0].scrollHeight&&(this.scrollTopVel=0),this.scrollLeftVel<0?a.scrollLeft()<=0&&(this.scrollLeftVel=0):this.scrollLeftVel>0&&a.scrollLeft()+a[0].clientWidth>=a[0].scrollWidth&&(this.scrollLeftVel=0)},scrollIntervalFunc:function(){var a=this.scrollEl,b=this.scrollIntervalMs/1e3;this.scrollTopVel&&a.scrollTop(a.scrollTop()+this.scrollTopVel*b),this.scrollLeftVel&&a.scrollLeft(a.scrollLeft()+this.scrollLeftVel*b),this.constrainScrollVel(),this.scrollTopVel||this.scrollLeftVel||this.endAutoScroll()},endAutoScroll:function(){this.scrollIntervalId&&(clearInterval(this.scrollIntervalId),this.scrollIntervalId=null,this.handleScrollEnd())},handleDebouncedScroll:function(){this.scrollIntervalId||this.handleScrollEnd()},handleScrollEnd:function(){}});var rb=qb.extend({component:null,origHit:null,hit:null,coordAdjust:null,constructor:function(a,b){qb.call(this,b),this.component=a},handleInteractionStart:function(a){var b,c,d,e=this.subjectEl;this.computeCoords(),a?(c={left:v(a),top:w(a)},d=c,e&&(b=n(e),d=D(d,b)),this.origHit=this.queryHit(d.left,d.top),e&&this.options.subjectCenter&&(this.origHit&&(b=C(this.origHit,b)||b),d=E(b)),this.coordAdjust=F(d,c)):(this.origHit=null,this.coordAdjust=null),qb.prototype.handleInteractionStart.apply(this,arguments)},computeCoords:function(){this.component.prepareHits(),this.computeScrollBounds()},handleDragStart:function(a){var b;qb.prototype.handleDragStart.apply(this,arguments),b=this.queryHit(v(a),w(a)),b&&this.handleHitOver(b)},handleDrag:function(a,b,c){var d;qb.prototype.handleDrag.apply(this,arguments),d=this.queryHit(v(c),w(c)),Ba(d,this.hit)||(this.hit&&this.handleHitOut(),d&&this.handleHitOver(d))},handleDragEnd:function(){this.handleHitDone(),qb.prototype.handleDragEnd.apply(this,arguments)},handleHitOver:function(a){var b=Ba(a,this.origHit);this.hit=a,this.trigger("hitOver",this.hit,b,this.origHit)},handleHitOut:function(){this.hit&&(this.trigger("hitOut",this.hit),this.handleHitDone(),this.hit=null)},handleHitDone:function(){this.hit&&this.trigger("hitDone",this.hit)},handleInteractionEnd:function(){qb.prototype.handleInteractionEnd.apply(this,arguments),this.origHit=null,this.hit=null,this.component.releaseHits()},handleScrollEnd:function(){qb.prototype.handleScrollEnd.apply(this,arguments),this.computeCoords()},queryHit:function(a,b){return this.coordAdjust&&(a+=this.coordAdjust.left,b+=this.coordAdjust.top),this.component.queryHit(a,b)}}),sb=ya.extend(mb,{options:null,sourceEl:null,el:null,parentEl:null,top0:null,left0:null,y0:null,x0:null,topDelta:null,leftDelta:null,isFollowing:!1,isHidden:!1,isAnimating:!1,constructor:function(b,c){this.options=c=c||{},this.sourceEl=b,this.parentEl=c.parentEl?a(c.parentEl):b.parent()},start:function(b){this.isFollowing||(this.isFollowing=!0,this.y0=w(b),this.x0=v(b),this.topDelta=0,this.leftDelta=0,this.isHidden||this.updatePosition(),x(b)?this.listenTo(a(document),"touchmove",this.handleMove):this.listenTo(a(document),"mousemove",this.handleMove))},stop:function(b,c){function d(){this.isAnimating=!1,e.removeElement(),this.top0=this.left0=null,c&&c()}var e=this,f=this.options.revertDuration;this.isFollowing&&!this.isAnimating&&(this.isFollowing=!1,this.stopListeningTo(a(document)),b&&f&&!this.isHidden?(this.isAnimating=!0,this.el.animate({top:this.top0,left:this.left0},{duration:f,complete:d})):d())},getEl:function(){var a=this.el;return a||(this.sourceEl.width(),a=this.el=this.sourceEl.clone().addClass(this.options.additionalClass||"").css({position:"absolute",visibility:"",display:this.isHidden?"none":"",margin:0,right:"auto",bottom:"auto",width:this.sourceEl.width(),height:this.sourceEl.height(),opacity:this.options.opacity||"",zIndex:this.options.zIndex}),a.addClass("fc-unselectable"),a.appendTo(this.parentEl)),a},removeElement:function(){this.el&&(this.el.remove(),this.el=null)},updatePosition:function(){var a,b;this.getEl(),null===this.top0&&(this.sourceEl.width(),a=this.sourceEl.offset(),b=this.el.offsetParent().offset(),this.top0=a.top-b.top,this.left0=a.left-b.left),this.el.css({top:this.top0+this.topDelta,left:this.left0+this.leftDelta})},handleMove:function(a){this.topDelta=w(a)-this.y0,this.leftDelta=v(a)-this.x0,this.isHidden||this.updatePosition()},hide:function(){this.isHidden||(this.isHidden=!0,this.el&&this.el.hide())},show:function(){this.isHidden&&(this.isHidden=!1,this.updatePosition(),this.getEl().show())}}),tb=Wa.Grid=ya.extend(mb,nb,{view:null,isRTL:null,start:null,end:null,el:null,elsByFill:null,eventTimeFormat:null,displayEventTime:null,displayEventEnd:null,minResizeDuration:null,largeUnit:null,dayDragListener:null,segDragListener:null,segResizeListener:null,externalDragListener:null,constructor:function(a){this.view=a,this.isRTL=a.opt("isRTL"),this.elsByFill={},this.dayDragListener=this.buildDayDragListener(),this.initMouseIgnoring()},computeEventTimeFormat:function(){return this.view.opt("smallTimeFormat")},computeDisplayEventTime:function(){return!0},computeDisplayEventEnd:function(){return!0},setRange:function(a){this.start=a.start.clone(),this.end=a.end.clone(),this.rangeUpdated(),this.processRangeOptions()},rangeUpdated:function(){},processRangeOptions:function(){var a,b,c=this.view;this.eventTimeFormat=c.opt("eventTimeFormat")||c.opt("timeFormat")||this.computeEventTimeFormat(),a=c.opt("displayEventTime"),null==a&&(a=this.computeDisplayEventTime()),b=c.opt("displayEventEnd"),null==b&&(b=this.computeDisplayEventEnd()),this.displayEventTime=a,this.displayEventEnd=b},spanToSegs:function(a){},diffDates:function(a,b){return this.largeUnit?N(a,b,this.largeUnit):L(a,b)},prepareHits:function(){},releaseHits:function(){},queryHit:function(a,b){},getHitSpan:function(a){},getHitEl:function(a){},setElement:function(a){this.el=a,y(a),this.bindDayHandler("touchstart",this.dayTouchStart),this.bindDayHandler("mousedown",this.dayMousedown),this.bindSegHandlers(),this.bindGlobalHandlers()},bindDayHandler:function(b,c){var d=this;this.el.on(b,function(b){return a(b.target).is(".fc-event-container *, .fc-more")||a(b.target).closest(".fc-popover").length?void 0:c.call(d,b)})},removeElement:function(){this.unbindGlobalHandlers(),this.clearDragListeners(),this.el.remove()},renderSkeleton:function(){},renderDates:function(){},unrenderDates:function(){},bindGlobalHandlers:function(){this.listenTo(a(document),{dragstart:this.externalDragStart,sortstart:this.externalDragStart})},unbindGlobalHandlers:function(){this.stopListeningTo(a(document))},dayMousedown:function(a){this.isIgnoringMouse||this.dayDragListener.startInteraction(a,{})},dayTouchStart:function(a){var b=this.view;(b.isSelected||b.selectedEvent)&&this.tempIgnoreMouse(),this.dayDragListener.startInteraction(a,{delay:this.view.opt("longPressDelay")})},buildDayDragListener:function(){var a,b,c=this,d=this.view,e=d.opt("selectable"),f=new rb(this,{scroll:d.opt("dragScroll"),interactionStart:function(){a=f.origHit},dragStart:function(){d.unselect()},hitOver:function(d,f,h){h&&(f||(a=null),e&&(b=c.computeSelection(c.getHitSpan(h),c.getHitSpan(d)),b?c.renderSelection(b):b===!1&&g()))},hitOut:function(){a=null,b=null,c.unrenderSelection(),h()},interactionEnd:function(e,f){f||(a&&!c.isIgnoringMouse&&d.triggerDayClick(c.getHitSpan(a),c.getHitEl(a),e),b&&d.reportSelection(b,e),h())}});return f},clearDragListeners:function(){this.dayDragListener.endInteraction(),this.segDragListener&&this.segDragListener.endInteraction(),this.segResizeListener&&this.segResizeListener.endInteraction(),this.externalDragListener&&this.externalDragListener.endInteraction()},renderEventLocationHelper:function(a,b){var c=this.fabricateHelperEvent(a,b);return this.renderHelper(c,b)},fabricateHelperEvent:function(a,b){var c=b?X(b.event):{};return c.start=a.start.clone(),c.end=a.end?a.end.clone():null,c.allDay=null,this.view.calendar.normalizeEventDates(c),c.className=(c.className||[]).concat("fc-helper"),b||(c.editable=!1),c},renderHelper:function(a,b){},unrenderHelper:function(){},renderSelection:function(a){this.renderHighlight(a)},unrenderSelection:function(){this.unrenderHighlight()},computeSelection:function(a,b){var c=this.computeSelectionSpan(a,b);return c&&!this.view.calendar.isSelectionSpanAllowed(c)?!1:c},computeSelectionSpan:function(a,b){var c=[a.start,a.end,b.start,b.end];return c.sort(ga),{start:c[0].clone(),end:c[3].clone()}},renderHighlight:function(a){this.renderFill("highlight",this.spanToSegs(a))},unrenderHighlight:function(){this.unrenderFill("highlight")},highlightSegClasses:function(){return["fc-highlight"]},renderBusinessHours:function(){},unrenderBusinessHours:function(){},getNowIndicatorUnit:function(){},renderNowIndicator:function(a){},unrenderNowIndicator:function(){},renderFill:function(a,b){},unrenderFill:function(a){var b=this.elsByFill[a];b&&(b.remove(),delete this.elsByFill[a])},renderFillSegEls:function(b,c){var d,e=this,f=this[b+"SegEl"],g="",h=[];if(c.length){for(d=0;d<c.length;d++)g+=this.fillSegHtml(b,c[d]);a(g).each(function(b,d){var g=c[b],i=a(d);f&&(i=f.call(e,g,i)),i&&(i=a(i),i.is(e.fillSegTag)&&(g.el=i,h.push(g)))})}return h},fillSegTag:"div",fillSegHtml:function(a,b){var c=this[a+"SegClasses"],d=this[a+"SegCss"],e=c?c.call(this,b):[],f=ea(d?d.call(this,b):{});return"<"+this.fillSegTag+(e.length?' class="'+e.join(" ")+'"':"")+(f?' style="'+f+'"':"")+" />"},getDayClasses:function(a){var b=this.view,c=b.calendar.getNow(),d=["fc-"+$a[a.day()]];return 1==b.intervalDuration.as("months")&&a.month()!=b.intervalStart.month()&&d.push("fc-other-month"),a.isSame(c,"day")?d.push("fc-today",b.highlightStateClass):c>a?d.push("fc-past"):d.push("fc-future"),d}});tb.mixin({mousedOverSeg:null,isDraggingSeg:!1,isResizingSeg:!1,isDraggingExternal:!1,segs:null,renderEvents:function(a){var b,c=[],d=[];for(b=0;b<a.length;b++)(Da(a[b])?c:d).push(a[b]);this.segs=[].concat(this.renderBgEvents(c),this.renderFgEvents(d))},renderBgEvents:function(a){var b=this.eventsToSegs(a);return this.renderBgSegs(b)||b},renderFgEvents:function(a){var b=this.eventsToSegs(a);return this.renderFgSegs(b)||b},unrenderEvents:function(){this.handleSegMouseout(),this.clearDragListeners(),this.unrenderFgSegs(),this.unrenderBgSegs(),this.segs=null},getEventSegs:function(){return this.segs||[]},renderFgSegs:function(a){},unrenderFgSegs:function(){},renderFgSegEls:function(b,c){var d,e=this.view,f="",g=[];if(b.length){for(d=0;d<b.length;d++)f+=this.fgSegHtml(b[d],c);a(f).each(function(c,d){var f=b[c],h=e.resolveEventEl(f.event,a(d));h&&(h.data("fc-seg",f),f.el=h,g.push(f))})}return g},fgSegHtml:function(a,b){},renderBgSegs:function(a){return this.renderFill("bgEvent",a)},unrenderBgSegs:function(){this.unrenderFill("bgEvent")},bgEventSegEl:function(a,b){return this.view.resolveEventEl(a.event,b)},bgEventSegClasses:function(a){var b=a.event,c=b.source||{};return["fc-bgevent"].concat(b.className,c.className||[])},bgEventSegCss:function(a){return{"background-color":this.getSegSkinCss(a)["background-color"]}},businessHoursSegClasses:function(a){return["fc-nonbusiness","fc-bgevent"]},bindSegHandlers:function(){this.bindSegHandler("touchstart",this.handleSegTouchStart),this.bindSegHandler("touchend",this.handleSegTouchEnd),this.bindSegHandler("mouseenter",this.handleSegMouseover),this.bindSegHandler("mouseleave",this.handleSegMouseout),this.bindSegHandler("mousedown",this.handleSegMousedown),this.bindSegHandler("click",this.handleSegClick)},bindSegHandler:function(b,c){var d=this;this.el.on(b,".fc-event-container > *",function(b){var e=a(this).data("fc-seg");return!e||d.isDraggingSeg||d.isResizingSeg?void 0:c.call(d,e,b)})},handleSegClick:function(a,b){return this.view.trigger("eventClick",a.el[0],a.event,b)},handleSegMouseover:function(a,b){this.isIgnoringMouse||this.mousedOverSeg||(this.mousedOverSeg=a,a.el.addClass("fc-allow-mouse-resize"),this.view.trigger("eventMouseover",a.el[0],a.event,b))},handleSegMouseout:function(a,b){b=b||{},this.mousedOverSeg&&(a=a||this.mousedOverSeg,this.mousedOverSeg=null,a.el.removeClass("fc-allow-mouse-resize"),this.view.trigger("eventMouseout",a.el[0],a.event,b))},handleSegMousedown:function(a,b){var c=this.startSegResize(a,b,{distance:5});!c&&this.view.isEventDraggable(a.event)&&this.buildSegDragListener(a).startInteraction(b,{distance:5})},handleSegTouchStart:function(a,b){var c,d=this.view,e=a.event,f=d.isEventSelected(e),g=d.isEventDraggable(e),h=d.isEventResizable(e),i=!1;f&&h&&(i=this.startSegResize(a,b)),i||!g&&!h||(c=g?this.buildSegDragListener(a):this.buildSegSelectListener(a),c.startInteraction(b,{delay:f?0:this.view.opt("longPressDelay")})),this.tempIgnoreMouse()},handleSegTouchEnd:function(a,b){this.tempIgnoreMouse()},startSegResize:function(b,c,d){return a(c.target).is(".fc-resizer")?(this.buildSegResizeListener(b,a(c.target).is(".fc-start-resizer")).startInteraction(c,d),!0):!1},buildSegDragListener:function(a){var b,c,d,e=this,f=this.view,i=f.calendar,j=a.el,k=a.event;if(this.segDragListener)return this.segDragListener;var l=this.segDragListener=new rb(f,{scroll:f.opt("dragScroll"),subjectEl:j,subjectCenter:!0,interactionStart:function(d){b=!1,c=new sb(a.el,{additionalClass:"fc-dragging",parentEl:f.el,opacity:l.isTouch?null:f.opt("dragOpacity"),revertDuration:f.opt("dragRevertDuration"),zIndex:2}),c.hide(),c.start(d)},dragStart:function(c){l.isTouch&&!f.isEventSelected(k)&&f.selectEvent(k),b=!0,e.handleSegMouseout(a,c),e.segDragStart(a,c),f.hideEvent(k)},hitOver:function(b,h,j){var m;a.hit&&(j=a.hit),d=e.computeEventDrop(j.component.getHitSpan(j),b.component.getHitSpan(b),k),d&&!i.isEventSpanAllowed(e.eventToSpan(d),k)&&(g(),d=null),d&&(m=f.renderDrag(d,a))?(m.addClass("fc-dragging"),l.isTouch||e.applyDragOpacity(m),c.hide()):c.show(),h&&(d=null)},hitOut:function(){f.unrenderDrag(),c.show(),d=null},hitDone:function(){h()},interactionEnd:function(g){c.stop(!d,function(){b&&(f.unrenderDrag(),f.showEvent(k),e.segDragStop(a,g)),d&&f.reportEventDrop(k,d,this.largeUnit,j,g)}),e.segDragListener=null}});return l},buildSegSelectListener:function(a){var b=this,c=this.view,d=a.event;if(this.segDragListener)return this.segDragListener;var e=this.segDragListener=new qb({dragStart:function(a){e.isTouch&&!c.isEventSelected(d)&&c.selectEvent(d)},interactionEnd:function(a){b.segDragListener=null}});return e},segDragStart:function(a,b){this.isDraggingSeg=!0,this.view.trigger("eventDragStart",a.el[0],a.event,b,{})},segDragStop:function(a,b){this.isDraggingSeg=!1,this.view.trigger("eventDragStop",a.el[0],a.event,b,{})},computeEventDrop:function(a,b,c){var d,e,f=this.view.calendar,g=a.start,h=b.start;return g.hasTime()===h.hasTime()?(d=this.diffDates(h,g),c.allDay&&T(d)?(e={start:c.start.clone(),end:f.getEventEnd(c),allDay:!1},f.normalizeEventTimes(e)):e={start:c.start.clone(),end:c.end?c.end.clone():null,allDay:c.allDay},e.start.add(d),e.end&&e.end.add(d)):e={start:h.clone(),end:null,allDay:!h.hasTime()},e},applyDragOpacity:function(a){var b=this.view.opt("dragOpacity");null!=b&&a.each(function(a,c){c.style.opacity=b})},externalDragStart:function(b,c){var d,e,f=this.view;f.opt("droppable")&&(d=a((c?c.item:null)||b.target),e=f.opt("dropAccept"),(a.isFunction(e)?e.call(d[0],d):d.is(e))&&(this.isDraggingExternal||this.listenToExternalDrag(d,b,c)))},listenToExternalDrag:function(a,b,c){var d,e=this,f=this.view.calendar,i=Ia(a),j=e.externalDragListener=new rb(this,{interactionStart:function(){e.isDraggingExternal=!0},hitOver:function(a){d=e.computeExternalDrop(a.component.getHitSpan(a),i),d&&!f.isExternalSpanAllowed(e.eventToSpan(d),d,i.eventProps)&&(g(),d=null),d&&e.renderDrag(d)},hitOut:function(){d=null},hitDone:function(){h(),e.unrenderDrag()},interactionEnd:function(b){d&&e.view.reportExternalDrop(i,d,a,b,c),e.isDraggingExternal=!1,e.externalDragListener=null}});j.startDrag(b)},computeExternalDrop:function(a,b){var c=this.view.calendar,d={start:c.applyTimezone(a.start),end:null};return b.startTime&&!d.start.hasTime()&&d.start.time(b.startTime),b.duration&&(d.end=d.start.clone().add(b.duration)),d},renderDrag:function(a,b){},unrenderDrag:function(){},buildSegResizeListener:function(a,b){var c,d,e=this,f=this.view,i=f.calendar,j=a.el,k=a.event,l=i.getEventEnd(k),m=this.segResizeListener=new rb(this,{scroll:f.opt("dragScroll"),subjectEl:j,interactionStart:function(){c=!1},dragStart:function(b){c=!0,e.handleSegMouseout(a,b),e.segResizeStart(a,b)},hitOver:function(c,h,j){var m=e.getHitSpan(j),n=e.getHitSpan(c);d=b?e.computeEventStartResize(m,n,k):e.computeEventEndResize(m,n,k),d&&(i.isEventSpanAllowed(e.eventToSpan(d),k)?d.start.isSame(k.start)&&d.end.isSame(l)&&(d=null):(g(),d=null)),d&&(f.hideEvent(k),e.renderEventResize(d,a))},hitOut:function(){d=null},hitDone:function(){e.unrenderEventResize(),f.showEvent(k),h()},interactionEnd:function(b){c&&e.segResizeStop(a,b),d&&f.reportEventResize(k,d,this.largeUnit,j,b),e.segResizeListener=null}});return m},segResizeStart:function(a,b){this.isResizingSeg=!0,this.view.trigger("eventResizeStart",a.el[0],a.event,b,{})},segResizeStop:function(a,b){this.isResizingSeg=!1,this.view.trigger("eventResizeStop",a.el[0],a.event,b,{})},computeEventStartResize:function(a,b,c){return this.computeEventResize("start",a,b,c)},computeEventEndResize:function(a,b,c){return this.computeEventResize("end",a,b,c)},computeEventResize:function(a,b,c,d){var e,f,g=this.view.calendar,h=this.diffDates(c[a],b[a]);return e={start:d.start.clone(),end:g.getEventEnd(d),allDay:d.allDay},e.allDay&&T(h)&&(e.allDay=!1,g.normalizeEventTimes(e)),e[a].add(h),e.start.isBefore(e.end)||(f=this.minResizeDuration||(d.allDay?g.defaultAllDayEventDuration:g.defaultTimedEventDuration),"start"==a?e.start=e.end.clone().subtract(f):e.end=e.start.clone().add(f)),e},renderEventResize:function(a,b){},unrenderEventResize:function(){},getEventTimeText:function(a,b,c){return null==b&&(b=this.eventTimeFormat),null==c&&(c=this.displayEventEnd),this.displayEventTime&&a.start.hasTime()?c&&a.end?this.view.formatRange(a,b):a.start.format(b):""},getSegClasses:function(a,b,c){var d=this.view,e=a.event,f=["fc-event",a.isStart?"fc-start":"fc-not-start",a.isEnd?"fc-end":"fc-not-end"].concat(e.className,e.source?e.source.className:[]);return b&&f.push("fc-draggable"),c&&f.push("fc-resizable"),d.isEventSelected(e)&&f.push("fc-selected"),f},getSegSkinCss:function(a){var b=a.event,c=this.view,d=b.source||{},e=b.color,f=d.color,g=c.opt("eventColor");return{"background-color":b.backgroundColor||e||d.backgroundColor||f||c.opt("eventBackgroundColor")||g,"border-color":b.borderColor||e||d.borderColor||f||c.opt("eventBorderColor")||g,color:b.textColor||d.textColor||c.opt("eventTextColor")}},eventToSegs:function(a){return this.eventsToSegs([a])},eventToSpan:function(a){return this.eventToSpans(a)[0]},eventToSpans:function(a){var b=this.eventToRange(a);return this.eventRangeToSpans(b,a)},eventsToSegs:function(b,c){var d=this,e=Ga(b),f=[];return a.each(e,function(a,b){var e,g=[];for(e=0;e<b.length;e++)g.push(d.eventToRange(b[e]));if(Ea(b[0]))for(g=d.invertRanges(g),e=0;e<g.length;e++)f.push.apply(f,d.eventRangeToSegs(g[e],b[0],c));else for(e=0;e<g.length;e++)f.push.apply(f,d.eventRangeToSegs(g[e],b[e],c))}),f},eventToRange:function(a){return{start:a.start.clone().stripZone(),end:(a.end?a.end.clone():this.view.calendar.getDefaultEventEnd(null!=a.allDay?a.allDay:!a.start.hasTime(),a.start)).stripZone()}},eventRangeToSegs:function(a,b,c){var d,e=this.eventRangeToSpans(a,b),f=[];for(d=0;d<e.length;d++)f.push.apply(f,this.eventSpanToSegs(e[d],b,c));return f},eventRangeToSpans:function(b,c){return[a.extend({},b)]},eventSpanToSegs:function(a,b,c){var d,e,f=c?c(a):this.spanToSegs(a);for(d=0;d<f.length;d++)e=f[d],e.event=b,e.eventStartMS=+a.start,e.eventDurationMS=a.end-a.start;return f},invertRanges:function(a){var b,c,d=this.view,e=d.start.clone(),f=d.end.clone(),g=[],h=e;for(a.sort(Ha),b=0;b<a.length;b++)c=a[b],c.start>h&&g.push({start:h,end:c.start}),h=c.end;return f>h&&g.push({start:h,end:f}),g},sortEventSegs:function(a){a.sort(ia(this,"compareEventSegs"))},compareEventSegs:function(a,b){return a.eventStartMS-b.eventStartMS||b.eventDurationMS-a.eventDurationMS||b.event.allDay-a.event.allDay||H(a.event,b.event,this.view.eventOrderSpecs)}}),Wa.isBgEvent=Da,Wa.dataAttrPrefix="";var ub=Wa.DayTableMixin={breakOnWeeks:!1,dayDates:null,dayIndices:null,daysPerRow:null,rowCnt:null,colCnt:null,colHeadFormat:null,updateDayTable:function(){for(var a,b,c,d=this.view,e=this.start.clone(),f=-1,g=[],h=[];e.isBefore(this.end);)d.isHiddenDay(e)?g.push(f+.5):(f++,g.push(f),h.push(e.clone())),e.add(1,"days");if(this.breakOnWeeks){for(b=h[0].day(),a=1;a<h.length&&h[a].day()!=b;a++);c=Math.ceil(h.length/a)}else c=1,a=h.length;this.dayDates=h,this.dayIndices=g,this.daysPerRow=a,this.rowCnt=c,this.updateDayTableCols()},updateDayTableCols:function(){this.colCnt=this.computeColCnt(),this.colHeadFormat=this.view.opt("columnFormat")||this.computeColHeadFormat()},computeColCnt:function(){return this.daysPerRow},getCellDate:function(a,b){return this.dayDates[this.getCellDayIndex(a,b)].clone()},getCellRange:function(a,b){var c=this.getCellDate(a,b),d=c.clone().add(1,"days");return{start:c,end:d}},getCellDayIndex:function(a,b){return a*this.daysPerRow+this.getColDayIndex(b)},getColDayIndex:function(a){return this.isRTL?this.colCnt-1-a:a},getDateDayIndex:function(a){var b=this.dayIndices,c=a.diff(this.start,"days");return 0>c?b[0]-1:c>=b.length?b[b.length-1]+1:b[c]},computeColHeadFormat:function(){return this.rowCnt>1||this.colCnt>10?"ddd":this.colCnt>1?this.view.opt("dayOfMonthFormat"):"dddd"},sliceRangeByRow:function(a){var b,c,d,e,f,g=this.daysPerRow,h=this.view.computeDayRange(a),i=this.getDateDayIndex(h.start),j=this.getDateDayIndex(h.end.clone().subtract(1,"days")),k=[];for(b=0;b<this.rowCnt;b++)c=b*g,d=c+g-1,e=Math.max(i,c),f=Math.min(j,d),e=Math.ceil(e),f=Math.floor(f),f>=e&&k.push({row:b,firstRowDayIndex:e-c,lastRowDayIndex:f-c,isStart:e===i,isEnd:f===j});return k},sliceRangeByDay:function(a){var b,c,d,e,f,g,h=this.daysPerRow,i=this.view.computeDayRange(a),j=this.getDateDayIndex(i.start),k=this.getDateDayIndex(i.end.clone().subtract(1,"days")),l=[];for(b=0;b<this.rowCnt;b++)for(c=b*h,
+d=c+h-1,e=c;d>=e;e++)f=Math.max(j,e),g=Math.min(k,e),f=Math.ceil(f),g=Math.floor(g),g>=f&&l.push({row:b,firstRowDayIndex:f-c,lastRowDayIndex:g-c,isStart:f===j,isEnd:g===k});return l},renderHeadHtml:function(){var a=this.view;return'<div class="fc-row '+a.widgetHeaderClass+'"><table><thead>'+this.renderHeadTrHtml()+"</thead></table></div>"},renderHeadIntroHtml:function(){return this.renderIntroHtml()},renderHeadTrHtml:function(){return"<tr>"+(this.isRTL?"":this.renderHeadIntroHtml())+this.renderHeadDateCellsHtml()+(this.isRTL?this.renderHeadIntroHtml():"")+"</tr>"},renderHeadDateCellsHtml:function(){var a,b,c=[];for(a=0;a<this.colCnt;a++)b=this.getCellDate(0,a),c.push(this.renderHeadDateCellHtml(b));return c.join("")},renderHeadDateCellHtml:function(a,b,c){var d=this.view;return'<th class="fc-day-header '+d.widgetHeaderClass+" fc-"+$a[a.day()]+'"'+(1==this.rowCnt?' data-date="'+a.format("YYYY-MM-DD")+'"':"")+(b>1?' colspan="'+b+'"':"")+(c?" "+c:"")+">"+ca(a.format(this.colHeadFormat))+"</th>"},renderBgTrHtml:function(a){return"<tr>"+(this.isRTL?"":this.renderBgIntroHtml(a))+this.renderBgCellsHtml(a)+(this.isRTL?this.renderBgIntroHtml(a):"")+"</tr>"},renderBgIntroHtml:function(a){return this.renderIntroHtml()},renderBgCellsHtml:function(a){var b,c,d=[];for(b=0;b<this.colCnt;b++)c=this.getCellDate(a,b),d.push(this.renderBgCellHtml(c));return d.join("")},renderBgCellHtml:function(a,b){var c=this.view,d=this.getDayClasses(a);return d.unshift("fc-day",c.widgetContentClass),'<td class="'+d.join(" ")+'" data-date="'+a.format("YYYY-MM-DD")+'"'+(b?" "+b:"")+"></td>"},renderIntroHtml:function(){},bookendCells:function(a){var b=this.renderIntroHtml();b&&(this.isRTL?a.append(b):a.prepend(b))}},vb=Wa.DayGrid=tb.extend(ub,{numbersVisible:!1,bottomCoordPadding:0,rowEls:null,cellEls:null,helperEls:null,rowCoordCache:null,colCoordCache:null,renderDates:function(a){var b,c,d=this.view,e=this.rowCnt,f=this.colCnt,g="";for(b=0;e>b;b++)g+=this.renderDayRowHtml(b,a);for(this.el.html(g),this.rowEls=this.el.find(".fc-row"),this.cellEls=this.el.find(".fc-day"),this.rowCoordCache=new pb({els:this.rowEls,isVertical:!0}),this.colCoordCache=new pb({els:this.cellEls.slice(0,this.colCnt),isHorizontal:!0}),b=0;e>b;b++)for(c=0;f>c;c++)d.trigger("dayRender",null,this.getCellDate(b,c),this.getCellEl(b,c))},unrenderDates:function(){this.removeSegPopover()},renderBusinessHours:function(){var a=this.view.calendar.getBusinessHoursEvents(!0),b=this.eventsToSegs(a);this.renderFill("businessHours",b,"bgevent")},renderDayRowHtml:function(a,b){var c=this.view,d=["fc-row","fc-week",c.widgetContentClass];return b&&d.push("fc-rigid"),'<div class="'+d.join(" ")+'"><div class="fc-bg"><table>'+this.renderBgTrHtml(a)+'</table></div><div class="fc-content-skeleton"><table>'+(this.numbersVisible?"<thead>"+this.renderNumberTrHtml(a)+"</thead>":"")+"</table></div></div>"},renderNumberTrHtml:function(a){return"<tr>"+(this.isRTL?"":this.renderNumberIntroHtml(a))+this.renderNumberCellsHtml(a)+(this.isRTL?this.renderNumberIntroHtml(a):"")+"</tr>"},renderNumberIntroHtml:function(a){return this.renderIntroHtml()},renderNumberCellsHtml:function(a){var b,c,d=[];for(b=0;b<this.colCnt;b++)c=this.getCellDate(a,b),d.push(this.renderNumberCellHtml(c));return d.join("")},renderNumberCellHtml:function(a){var b;return this.view.dayNumbersVisible?(b=this.getDayClasses(a),b.unshift("fc-day-number"),'<td class="'+b.join(" ")+'" data-date="'+a.format()+'">'+a.date()+"</td>"):"<td/>"},computeEventTimeFormat:function(){return this.view.opt("extraSmallTimeFormat")},computeDisplayEventEnd:function(){return 1==this.colCnt},rangeUpdated:function(){this.updateDayTable()},spanToSegs:function(a){var b,c,d=this.sliceRangeByRow(a);for(b=0;b<d.length;b++)c=d[b],this.isRTL?(c.leftCol=this.daysPerRow-1-c.lastRowDayIndex,c.rightCol=this.daysPerRow-1-c.firstRowDayIndex):(c.leftCol=c.firstRowDayIndex,c.rightCol=c.lastRowDayIndex);return d},prepareHits:function(){this.colCoordCache.build(),this.rowCoordCache.build(),this.rowCoordCache.bottoms[this.rowCnt-1]+=this.bottomCoordPadding},releaseHits:function(){this.colCoordCache.clear(),this.rowCoordCache.clear()},queryHit:function(a,b){var c=this.colCoordCache.getHorizontalIndex(a),d=this.rowCoordCache.getVerticalIndex(b);return null!=d&&null!=c?this.getCellHit(d,c):void 0},getHitSpan:function(a){return this.getCellRange(a.row,a.col)},getHitEl:function(a){return this.getCellEl(a.row,a.col)},getCellHit:function(a,b){return{row:a,col:b,component:this,left:this.colCoordCache.getLeftOffset(b),right:this.colCoordCache.getRightOffset(b),top:this.rowCoordCache.getTopOffset(a),bottom:this.rowCoordCache.getBottomOffset(a)}},getCellEl:function(a,b){return this.cellEls.eq(a*this.colCnt+b)},renderDrag:function(a,b){return this.renderHighlight(this.eventToSpan(a)),b&&!b.el.closest(this.el).length?this.renderEventLocationHelper(a,b):void 0},unrenderDrag:function(){this.unrenderHighlight(),this.unrenderHelper()},renderEventResize:function(a,b){return this.renderHighlight(this.eventToSpan(a)),this.renderEventLocationHelper(a,b)},unrenderEventResize:function(){this.unrenderHighlight(),this.unrenderHelper()},renderHelper:function(b,c){var d,e=[],f=this.eventToSegs(b);return f=this.renderFgSegEls(f),d=this.renderSegRows(f),this.rowEls.each(function(b,f){var g,h=a(f),i=a('<div class="fc-helper-skeleton"><table/></div>');g=c&&c.row===b?c.el.position().top:h.find(".fc-content-skeleton tbody").position().top,i.css("top",g).find("table").append(d[b].tbodyEl),h.append(i),e.push(i[0])}),this.helperEls=a(e)},unrenderHelper:function(){this.helperEls&&(this.helperEls.remove(),this.helperEls=null)},fillSegTag:"td",renderFill:function(b,c,d){var e,f,g,h=[];for(c=this.renderFillSegEls(b,c),e=0;e<c.length;e++)f=c[e],g=this.renderFillRow(b,f,d),this.rowEls.eq(f.row).append(g),h.push(g[0]);return this.elsByFill[b]=a(h),c},renderFillRow:function(b,c,d){var e,f,g=this.colCnt,h=c.leftCol,i=c.rightCol+1;return d=d||b.toLowerCase(),e=a('<div class="fc-'+d+'-skeleton"><table><tr/></table></div>'),f=e.find("tr"),h>0&&f.append('<td colspan="'+h+'"/>'),f.append(c.el.attr("colspan",i-h)),g>i&&f.append('<td colspan="'+(g-i)+'"/>'),this.bookendCells(f),e}});vb.mixin({rowStructs:null,unrenderEvents:function(){this.removeSegPopover(),tb.prototype.unrenderEvents.apply(this,arguments)},getEventSegs:function(){return tb.prototype.getEventSegs.call(this).concat(this.popoverSegs||[])},renderBgSegs:function(b){var c=a.grep(b,function(a){return a.event.allDay});return tb.prototype.renderBgSegs.call(this,c)},renderFgSegs:function(b){var c;return b=this.renderFgSegEls(b),c=this.rowStructs=this.renderSegRows(b),this.rowEls.each(function(b,d){a(d).find(".fc-content-skeleton > table").append(c[b].tbodyEl)}),b},unrenderFgSegs:function(){for(var a,b=this.rowStructs||[];a=b.pop();)a.tbodyEl.remove();this.rowStructs=null},renderSegRows:function(a){var b,c,d=[];for(b=this.groupSegRows(a),c=0;c<b.length;c++)d.push(this.renderSegRow(c,b[c]));return d},fgSegHtml:function(a,b){var c,d,e=this.view,f=a.event,g=e.isEventDraggable(f),h=!b&&f.allDay&&a.isStart&&e.isEventResizableFromStart(f),i=!b&&f.allDay&&a.isEnd&&e.isEventResizableFromEnd(f),j=this.getSegClasses(a,g,h||i),k=ea(this.getSegSkinCss(a)),l="";return j.unshift("fc-day-grid-event","fc-h-event"),a.isStart&&(c=this.getEventTimeText(f),c&&(l='<span class="fc-time">'+ca(c)+"</span>")),d='<span class="fc-title">'+(ca(f.title||"")||"&nbsp;")+"</span>",'<a class="'+j.join(" ")+'"'+(f.url?' href="'+ca(f.url)+'"':"")+(k?' style="'+k+'"':"")+'><div class="fc-content">'+(this.isRTL?d+" "+l:l+" "+d)+"</div>"+(h?'<div class="fc-resizer fc-start-resizer" />':"")+(i?'<div class="fc-resizer fc-end-resizer" />':"")+"</a>"},renderSegRow:function(b,c){function d(b){for(;b>g;)k=(r[e-1]||[])[g],k?k.attr("rowspan",parseInt(k.attr("rowspan")||1,10)+1):(k=a("<td/>"),h.append(k)),q[e][g]=k,r[e][g]=k,g++}var e,f,g,h,i,j,k,l=this.colCnt,m=this.buildSegLevels(c),n=Math.max(1,m.length),o=a("<tbody/>"),p=[],q=[],r=[];for(e=0;n>e;e++){if(f=m[e],g=0,h=a("<tr/>"),p.push([]),q.push([]),r.push([]),f)for(i=0;i<f.length;i++){for(j=f[i],d(j.leftCol),k=a('<td class="fc-event-container"/>').append(j.el),j.leftCol!=j.rightCol?k.attr("colspan",j.rightCol-j.leftCol+1):r[e][g]=k;g<=j.rightCol;)q[e][g]=k,p[e][g]=j,g++;h.append(k)}d(l),this.bookendCells(h),o.append(h)}return{row:b,tbodyEl:o,cellMatrix:q,segMatrix:p,segLevels:m,segs:c}},buildSegLevels:function(a){var b,c,d,e=[];for(this.sortEventSegs(a),b=0;b<a.length;b++){for(c=a[b],d=0;d<e.length&&Ja(c,e[d]);d++);c.level=d,(e[d]||(e[d]=[])).push(c)}for(d=0;d<e.length;d++)e[d].sort(Ka);return e},groupSegRows:function(a){var b,c=[];for(b=0;b<this.rowCnt;b++)c.push([]);for(b=0;b<a.length;b++)c[a[b].row].push(a[b]);return c}}),vb.mixin({segPopover:null,popoverSegs:null,removeSegPopover:function(){this.segPopover&&this.segPopover.hide()},limitRows:function(a){var b,c,d=this.rowStructs||[];for(b=0;b<d.length;b++)this.unlimitRow(b),c=a?"number"==typeof a?a:this.computeRowLevelLimit(b):!1,c!==!1&&this.limitRow(b,c)},computeRowLevelLimit:function(b){function c(b,c){f=Math.max(f,a(c).outerHeight())}var d,e,f,g=this.rowEls.eq(b),h=g.height(),i=this.rowStructs[b].tbodyEl.children();for(d=0;d<i.length;d++)if(e=i.eq(d).removeClass("fc-limited"),f=0,e.find("> td > :first-child").each(c),e.position().top+f>h)return d;return!1},limitRow:function(b,c){function d(d){for(;d>w;)j=t.getCellSegs(b,w,c),j.length&&(m=f[c-1][w],s=t.renderMoreLink(b,w,j),r=a("<div/>").append(s),m.append(r),v.push(r[0])),w++}var e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t=this,u=this.rowStructs[b],v=[],w=0;if(c&&c<u.segLevels.length){for(e=u.segLevels[c-1],f=u.cellMatrix,g=u.tbodyEl.children().slice(c).addClass("fc-limited").get(),h=0;h<e.length;h++){for(i=e[h],d(i.leftCol),l=[],k=0;w<=i.rightCol;)j=this.getCellSegs(b,w,c),l.push(j),k+=j.length,w++;if(k){for(m=f[c-1][i.leftCol],n=m.attr("rowspan")||1,o=[],p=0;p<l.length;p++)q=a('<td class="fc-more-cell"/>').attr("rowspan",n),j=l[p],s=this.renderMoreLink(b,i.leftCol+p,[i].concat(j)),r=a("<div/>").append(s),q.append(r),o.push(q[0]),v.push(q[0]);m.addClass("fc-limited").after(a(o)),g.push(m[0])}}d(this.colCnt),u.moreEls=a(v),u.limitedEls=a(g)}},unlimitRow:function(a){var b=this.rowStructs[a];b.moreEls&&(b.moreEls.remove(),b.moreEls=null),b.limitedEls&&(b.limitedEls.removeClass("fc-limited"),b.limitedEls=null)},renderMoreLink:function(b,c,d){var e=this,f=this.view;return a('<a class="fc-more"/>').text(this.getMoreLinkText(d.length)).on("click",function(g){var h=f.opt("eventLimitClick"),i=e.getCellDate(b,c),j=a(this),k=e.getCellEl(b,c),l=e.getCellSegs(b,c),m=e.resliceDaySegs(l,i),n=e.resliceDaySegs(d,i);"function"==typeof h&&(h=f.trigger("eventLimitClick",null,{date:i,dayEl:k,moreEl:j,segs:m,hiddenSegs:n},g)),"popover"===h?e.showSegPopover(b,c,j,m):"string"==typeof h&&f.calendar.zoomTo(i,h)})},showSegPopover:function(a,b,c,d){var e,f,g=this,h=this.view,i=c.parent();e=1==this.rowCnt?h.el:this.rowEls.eq(a),f={className:"fc-more-popover",content:this.renderSegPopoverContent(a,b,d),parentEl:this.el,top:e.offset().top,autoHide:!0,viewportConstrain:h.opt("popoverViewportConstrain"),hide:function(){g.segPopover.removeElement(),g.segPopover=null,g.popoverSegs=null}},this.isRTL?f.right=i.offset().left+i.outerWidth()+1:f.left=i.offset().left-1,this.segPopover=new ob(f),this.segPopover.show()},renderSegPopoverContent:function(b,c,d){var e,f=this.view,g=f.opt("theme"),h=this.getCellDate(b,c).format(f.opt("dayPopoverFormat")),i=a('<div class="fc-header '+f.widgetHeaderClass+'"><span class="fc-close '+(g?"ui-icon ui-icon-closethick":"fc-icon fc-icon-x")+'"></span><span class="fc-title">'+ca(h)+'</span><div class="fc-clear"/></div><div class="fc-body '+f.widgetContentClass+'"><div class="fc-event-container"></div></div>'),j=i.find(".fc-event-container");for(d=this.renderFgSegEls(d,!0),this.popoverSegs=d,e=0;e<d.length;e++)this.prepareHits(),d[e].hit=this.getCellHit(b,c),this.releaseHits(),j.append(d[e].el);return i},resliceDaySegs:function(b,c){var d=a.map(b,function(a){return a.event}),e=c.clone(),f=e.clone().add(1,"days"),g={start:e,end:f};return b=this.eventsToSegs(d,function(a){var b=K(a,g);return b?[b]:[]}),this.sortEventSegs(b),b},getMoreLinkText:function(a){var b=this.view.opt("eventLimitText");return"function"==typeof b?b(a):"+"+a+" "+b},getCellSegs:function(a,b,c){for(var d,e=this.rowStructs[a].segMatrix,f=c||0,g=[];f<e.length;)d=e[f][b],d&&g.push(d),f++;return g}});var wb=Wa.TimeGrid=tb.extend(ub,{slotDuration:null,snapDuration:null,snapsPerSlot:null,minTime:null,maxTime:null,labelFormat:null,labelInterval:null,colEls:null,slatContainerEl:null,slatEls:null,nowIndicatorEls:null,colCoordCache:null,slatCoordCache:null,constructor:function(){tb.apply(this,arguments),this.processOptions()},renderDates:function(){this.el.html(this.renderHtml()),this.colEls=this.el.find(".fc-day"),this.slatContainerEl=this.el.find(".fc-slats"),this.slatEls=this.slatContainerEl.find("tr"),this.colCoordCache=new pb({els:this.colEls,isHorizontal:!0}),this.slatCoordCache=new pb({els:this.slatEls,isVertical:!0}),this.renderContentSkeleton()},renderHtml:function(){return'<div class="fc-bg"><table>'+this.renderBgTrHtml(0)+'</table></div><div class="fc-slats"><table>'+this.renderSlatRowHtml()+"</table></div>"},renderSlatRowHtml:function(){for(var a,c,d,e=this.view,f=this.isRTL,g="",h=b.duration(+this.minTime);h<this.maxTime;)a=this.start.clone().time(h),c=ha(R(h,this.labelInterval)),d='<td class="fc-axis fc-time '+e.widgetContentClass+'" '+e.axisStyleAttr()+">"+(c?"<span>"+ca(a.format(this.labelFormat))+"</span>":"")+"</td>",g+='<tr data-time="'+a.format("HH:mm:ss")+'"'+(c?"":' class="fc-minor"')+">"+(f?"":d)+'<td class="'+e.widgetContentClass+'"/>'+(f?d:"")+"</tr>",h.add(this.slotDuration);return g},processOptions:function(){var c,d=this.view,e=d.opt("slotDuration"),f=d.opt("snapDuration");e=b.duration(e),f=f?b.duration(f):e,this.slotDuration=e,this.snapDuration=f,this.snapsPerSlot=e/f,this.minResizeDuration=f,this.minTime=b.duration(d.opt("minTime")),this.maxTime=b.duration(d.opt("maxTime")),c=d.opt("slotLabelFormat"),a.isArray(c)&&(c=c[c.length-1]),this.labelFormat=c||d.opt("axisFormat")||d.opt("smallTimeFormat"),c=d.opt("slotLabelInterval"),this.labelInterval=c?b.duration(c):this.computeLabelInterval(e)},computeLabelInterval:function(a){var c,d,e;for(c=Nb.length-1;c>=0;c--)if(d=b.duration(Nb[c]),e=R(d,a),ha(e)&&e>1)return d;return b.duration(a)},computeEventTimeFormat:function(){return this.view.opt("noMeridiemTimeFormat")},computeDisplayEventEnd:function(){return!0},prepareHits:function(){this.colCoordCache.build(),this.slatCoordCache.build()},releaseHits:function(){this.colCoordCache.clear()},queryHit:function(a,b){var c=this.snapsPerSlot,d=this.colCoordCache,e=this.slatCoordCache,f=d.getHorizontalIndex(a),g=e.getVerticalIndex(b);if(null!=f&&null!=g){var h=e.getTopOffset(g),i=e.getHeight(g),j=(b-h)/i,k=Math.floor(j*c),l=g*c+k,m=h+k/c*i,n=h+(k+1)/c*i;return{col:f,snap:l,component:this,left:d.getLeftOffset(f),right:d.getRightOffset(f),top:m,bottom:n}}},getHitSpan:function(a){var b,c=this.getCellDate(0,a.col),d=this.computeSnapTime(a.snap);return c.time(d),b=c.clone().add(this.snapDuration),{start:c,end:b}},getHitEl:function(a){return this.colEls.eq(a.col)},rangeUpdated:function(){this.updateDayTable()},computeSnapTime:function(a){return b.duration(this.minTime+this.snapDuration*a)},spanToSegs:function(a){var b,c=this.sliceRangeByTimes(a);for(b=0;b<c.length;b++)this.isRTL?c[b].col=this.daysPerRow-1-c[b].dayIndex:c[b].col=c[b].dayIndex;return c},sliceRangeByTimes:function(a){var b,c,d,e,f=[];for(c=0;c<this.daysPerRow;c++)d=this.dayDates[c].clone(),e={start:d.clone().time(this.minTime),end:d.clone().time(this.maxTime)},b=K(a,e),b&&(b.dayIndex=c,f.push(b));return f},updateSize:function(a){this.slatCoordCache.build(),a&&this.updateSegVerticals([].concat(this.fgSegs||[],this.bgSegs||[],this.businessSegs||[]))},getTotalSlatHeight:function(){return this.slatContainerEl.outerHeight()},computeDateTop:function(a,c){return this.computeTimeTop(b.duration(a-c.clone().stripTime()))},computeTimeTop:function(a){var b,c,d=this.slatEls.length,e=(a-this.minTime)/this.slotDuration;return e=Math.max(0,e),e=Math.min(d,e),b=Math.floor(e),b=Math.min(b,d-1),c=e-b,this.slatCoordCache.getTopPosition(b)+this.slatCoordCache.getHeight(b)*c},renderDrag:function(a,b){return b?this.renderEventLocationHelper(a,b):void this.renderHighlight(this.eventToSpan(a))},unrenderDrag:function(){this.unrenderHelper(),this.unrenderHighlight()},renderEventResize:function(a,b){return this.renderEventLocationHelper(a,b)},unrenderEventResize:function(){this.unrenderHelper()},renderHelper:function(a,b){return this.renderHelperSegs(this.eventToSegs(a),b)},unrenderHelper:function(){this.unrenderHelperSegs()},renderBusinessHours:function(){var a=this.view.calendar.getBusinessHoursEvents(),b=this.eventsToSegs(a);this.renderBusinessSegs(b)},unrenderBusinessHours:function(){this.unrenderBusinessSegs()},getNowIndicatorUnit:function(){return"minute"},renderNowIndicator:function(b){var c,d=this.spanToSegs({start:b,end:b}),e=this.computeDateTop(b,b),f=[];for(c=0;c<d.length;c++)f.push(a('<div class="fc-now-indicator fc-now-indicator-line"></div>').css("top",e).appendTo(this.colContainerEls.eq(d[c].col))[0]);d.length>0&&f.push(a('<div class="fc-now-indicator fc-now-indicator-arrow"></div>').css("top",e).appendTo(this.el.find(".fc-content-skeleton"))[0]),this.nowIndicatorEls=a(f)},unrenderNowIndicator:function(){this.nowIndicatorEls&&(this.nowIndicatorEls.remove(),this.nowIndicatorEls=null)},renderSelection:function(a){this.view.opt("selectHelper")?this.renderEventLocationHelper(a):this.renderHighlight(a)},unrenderSelection:function(){this.unrenderHelper(),this.unrenderHighlight()},renderHighlight:function(a){this.renderHighlightSegs(this.spanToSegs(a))},unrenderHighlight:function(){this.unrenderHighlightSegs()}});wb.mixin({colContainerEls:null,fgContainerEls:null,bgContainerEls:null,helperContainerEls:null,highlightContainerEls:null,businessContainerEls:null,fgSegs:null,bgSegs:null,helperSegs:null,highlightSegs:null,businessSegs:null,renderContentSkeleton:function(){var b,c,d="";for(b=0;b<this.colCnt;b++)d+='<td><div class="fc-content-col"><div class="fc-event-container fc-helper-container"></div><div class="fc-event-container"></div><div class="fc-highlight-container"></div><div class="fc-bgevent-container"></div><div class="fc-business-container"></div></div></td>';c=a('<div class="fc-content-skeleton"><table><tr>'+d+"</tr></table></div>"),this.colContainerEls=c.find(".fc-content-col"),this.helperContainerEls=c.find(".fc-helper-container"),this.fgContainerEls=c.find(".fc-event-container:not(.fc-helper-container)"),this.bgContainerEls=c.find(".fc-bgevent-container"),this.highlightContainerEls=c.find(".fc-highlight-container"),this.businessContainerEls=c.find(".fc-business-container"),this.bookendCells(c.find("tr")),this.el.append(c)},renderFgSegs:function(a){return a=this.renderFgSegsIntoContainers(a,this.fgContainerEls),this.fgSegs=a,a},unrenderFgSegs:function(){this.unrenderNamedSegs("fgSegs")},renderHelperSegs:function(b,c){var d,e,f,g=[];for(b=this.renderFgSegsIntoContainers(b,this.helperContainerEls),d=0;d<b.length;d++)e=b[d],c&&c.col===e.col&&(f=c.el,e.el.css({left:f.css("left"),right:f.css("right"),"margin-left":f.css("margin-left"),"margin-right":f.css("margin-right")})),g.push(e.el[0]);return this.helperSegs=b,a(g)},unrenderHelperSegs:function(){this.unrenderNamedSegs("helperSegs")},renderBgSegs:function(a){return a=this.renderFillSegEls("bgEvent",a),this.updateSegVerticals(a),this.attachSegsByCol(this.groupSegsByCol(a),this.bgContainerEls),this.bgSegs=a,a},unrenderBgSegs:function(){this.unrenderNamedSegs("bgSegs")},renderHighlightSegs:function(a){a=this.renderFillSegEls("highlight",a),this.updateSegVerticals(a),this.attachSegsByCol(this.groupSegsByCol(a),this.highlightContainerEls),this.highlightSegs=a},unrenderHighlightSegs:function(){this.unrenderNamedSegs("highlightSegs")},renderBusinessSegs:function(a){a=this.renderFillSegEls("businessHours",a),this.updateSegVerticals(a),this.attachSegsByCol(this.groupSegsByCol(a),this.businessContainerEls),this.businessSegs=a},unrenderBusinessSegs:function(){this.unrenderNamedSegs("businessSegs")},groupSegsByCol:function(a){var b,c=[];for(b=0;b<this.colCnt;b++)c.push([]);for(b=0;b<a.length;b++)c[a[b].col].push(a[b]);return c},attachSegsByCol:function(a,b){var c,d,e;for(c=0;c<this.colCnt;c++)for(d=a[c],e=0;e<d.length;e++)b.eq(c).append(d[e].el)},unrenderNamedSegs:function(a){var b,c=this[a];if(c){for(b=0;b<c.length;b++)c[b].el.remove();this[a]=null}},renderFgSegsIntoContainers:function(a,b){var c,d;for(a=this.renderFgSegEls(a),c=this.groupSegsByCol(a),d=0;d<this.colCnt;d++)this.updateFgSegCoords(c[d]);return this.attachSegsByCol(c,b),a},fgSegHtml:function(a,b){var c,d,e,f=this.view,g=a.event,h=f.isEventDraggable(g),i=!b&&a.isStart&&f.isEventResizableFromStart(g),j=!b&&a.isEnd&&f.isEventResizableFromEnd(g),k=this.getSegClasses(a,h,i||j),l=ea(this.getSegSkinCss(a));return k.unshift("fc-time-grid-event","fc-v-event"),f.isMultiDayEvent(g)?(a.isStart||a.isEnd)&&(c=this.getEventTimeText(a),d=this.getEventTimeText(a,"LT"),e=this.getEventTimeText(a,null,!1)):(c=this.getEventTimeText(g),d=this.getEventTimeText(g,"LT"),e=this.getEventTimeText(g,null,!1)),'<a class="'+k.join(" ")+'"'+(g.url?' href="'+ca(g.url)+'"':"")+(l?' style="'+l+'"':"")+'><div class="fc-content">'+(c?'<div class="fc-time" data-start="'+ca(e)+'" data-full="'+ca(d)+'"><span>'+ca(c)+"</span></div>":"")+(g.title?'<div class="fc-title">'+ca(g.title)+"</div>":"")+'</div><div class="fc-bg"/>'+(j?'<div class="fc-resizer fc-end-resizer" />':"")+"</a>"},updateSegVerticals:function(a){this.computeSegVerticals(a),this.assignSegVerticals(a)},computeSegVerticals:function(a){var b,c;for(b=0;b<a.length;b++)c=a[b],c.top=this.computeDateTop(c.start,c.start),c.bottom=this.computeDateTop(c.end,c.start)},assignSegVerticals:function(a){var b,c;for(b=0;b<a.length;b++)c=a[b],c.el.css(this.generateSegVerticalCss(c))},generateSegVerticalCss:function(a){return{top:a.top,bottom:-a.bottom}},updateFgSegCoords:function(a){this.computeSegVerticals(a),this.computeFgSegHorizontals(a),this.assignSegVerticals(a),this.assignFgSegHorizontals(a)},computeFgSegHorizontals:function(a){var b,c,d;if(this.sortEventSegs(a),b=La(a),Ma(b),c=b[0]){for(d=0;d<c.length;d++)Na(c[d]);for(d=0;d<c.length;d++)this.computeFgSegForwardBack(c[d],0,0)}},computeFgSegForwardBack:function(a,b,c){var d,e=a.forwardSegs;if(void 0===a.forwardCoord)for(e.length?(this.sortForwardSegs(e),this.computeFgSegForwardBack(e[0],b+1,c),a.forwardCoord=e[0].backwardCoord):a.forwardCoord=1,a.backwardCoord=a.forwardCoord-(a.forwardCoord-c)/(b+1),d=0;d<e.length;d++)this.computeFgSegForwardBack(e[d],0,a.forwardCoord)},sortForwardSegs:function(a){a.sort(ia(this,"compareForwardSegs"))},compareForwardSegs:function(a,b){return b.forwardPressure-a.forwardPressure||(a.backwardCoord||0)-(b.backwardCoord||0)||this.compareEventSegs(a,b)},assignFgSegHorizontals:function(a){var b,c;for(b=0;b<a.length;b++)c=a[b],c.el.css(this.generateFgSegHorizontalCss(c)),c.bottom-c.top<30&&c.el.addClass("fc-short")},generateFgSegHorizontalCss:function(a){var b,c,d=this.view.opt("slotEventOverlap"),e=a.backwardCoord,f=a.forwardCoord,g=this.generateSegVerticalCss(a);return d&&(f=Math.min(1,e+2*(f-e))),this.isRTL?(b=1-f,c=e):(b=e,c=1-f),g.zIndex=a.level+1,g.left=100*b+"%",g.right=100*c+"%",d&&a.forwardPressure&&(g[this.isRTL?"marginLeft":"marginRight"]=20),g}});var xb=Wa.View=ya.extend(lb,mb,{type:null,name:null,title:null,calendar:null,options:null,el:null,displaying:null,isSkeletonRendered:!1,isEventsRendered:!1,start:null,end:null,intervalStart:null,intervalEnd:null,intervalDuration:null,intervalUnit:null,isRTL:!1,isSelected:!1,selectedEvent:null,eventOrderSpecs:null,widgetHeaderClass:null,widgetContentClass:null,highlightStateClass:null,nextDayThreshold:null,isHiddenDayHash:null,isNowIndicatorRendered:null,initialNowDate:null,initialNowQueriedMs:null,nowIndicatorTimeoutID:null,nowIndicatorIntervalID:null,constructor:function(a,c,d,e){this.calendar=a,this.type=this.name=c,this.options=d,this.intervalDuration=e||b.duration(1,"day"),this.nextDayThreshold=b.duration(this.opt("nextDayThreshold")),this.initThemingProps(),this.initHiddenDays(),this.isRTL=this.opt("isRTL"),this.eventOrderSpecs=G(this.opt("eventOrder")),this.initialize()},initialize:function(){},opt:function(a){return this.options[a]},trigger:function(a,b){var c=this.calendar;return c.trigger.apply(c,[a,b||this].concat(Array.prototype.slice.call(arguments,2),[this]))},setDate:function(a){this.setRange(this.computeRange(a))},setRange:function(b){a.extend(this,b),this.updateTitle()},computeRange:function(a){var b,c,d=O(this.intervalDuration),e=a.clone().startOf(d),f=e.clone().add(this.intervalDuration);return/year|month|week|day/.test(d)?(e.stripTime(),f.stripTime()):(e.hasTime()||(e=this.calendar.time(0)),f.hasTime()||(f=this.calendar.time(0))),b=e.clone(),b=this.skipHiddenDays(b),c=f.clone(),c=this.skipHiddenDays(c,-1,!0),{intervalUnit:d,intervalStart:e,intervalEnd:f,start:b,end:c}},computePrevDate:function(a){return this.massageCurrentDate(a.clone().startOf(this.intervalUnit).subtract(this.intervalDuration),-1)},computeNextDate:function(a){return this.massageCurrentDate(a.clone().startOf(this.intervalUnit).add(this.intervalDuration))},massageCurrentDate:function(a,b){return this.intervalDuration.as("days")<=1&&this.isHiddenDay(a)&&(a=this.skipHiddenDays(a,b),a.startOf("day")),a},updateTitle:function(){this.title=this.computeTitle()},computeTitle:function(){return this.formatRange({start:this.calendar.applyTimezone(this.intervalStart),end:this.calendar.applyTimezone(this.intervalEnd)},this.opt("titleFormat")||this.computeTitleFormat(),this.opt("titleRangeSeparator"))},computeTitleFormat:function(){return"year"==this.intervalUnit?"YYYY":"month"==this.intervalUnit?this.opt("monthYearFormat"):this.intervalDuration.as("days")>1?"ll":"LL"},formatRange:function(a,b,c){var d=a.end;return d.hasTime()||(d=d.clone().subtract(1)),ta(a.start,d,b,c,this.opt("isRTL"))},setElement:function(a){this.el=a,this.bindGlobalHandlers()},removeElement:function(){this.clear(),this.isSkeletonRendered&&(this.unrenderSkeleton(),this.isSkeletonRendered=!1),this.unbindGlobalHandlers(),this.el.remove()},display:function(a){var b=this,c=null;return this.displaying&&(c=this.queryScroll()),this.calendar.freezeContentHeight(),ka(this.clear(),function(){return b.displaying=ka(b.displayView(a),function(){b.forceScroll(b.computeInitialScroll(c)),b.calendar.unfreezeContentHeight(),b.triggerRender()})})},clear:function(){var b=this,c=this.displaying;return c?ka(c,function(){return b.displaying=null,b.clearEvents(),b.clearView()}):a.when()},displayView:function(a){this.isSkeletonRendered||(this.renderSkeleton(),this.isSkeletonRendered=!0),a&&this.setDate(a),this.render&&this.render(),this.renderDates(),this.updateSize(),this.renderBusinessHours(),this.startNowIndicator()},clearView:function(){this.unselect(),this.stopNowIndicator(),this.triggerUnrender(),this.unrenderBusinessHours(),this.unrenderDates(),this.destroy&&this.destroy()},renderSkeleton:function(){},unrenderSkeleton:function(){},renderDates:function(){},unrenderDates:function(){},triggerRender:function(){this.trigger("viewRender",this,this,this.el)},triggerUnrender:function(){this.trigger("viewDestroy",this,this,this.el)},bindGlobalHandlers:function(){this.listenTo(a(document),"mousedown",this.handleDocumentMousedown),this.listenTo(a(document),"touchstart",this.processUnselect)},unbindGlobalHandlers:function(){this.stopListeningTo(a(document))},initThemingProps:function(){var a=this.opt("theme")?"ui":"fc";this.widgetHeaderClass=a+"-widget-header",this.widgetContentClass=a+"-widget-content",this.highlightStateClass=a+"-state-highlight"},renderBusinessHours:function(){},unrenderBusinessHours:function(){},startNowIndicator:function(){var a,c,d,e=this;this.opt("nowIndicator")&&(a=this.getNowIndicatorUnit(),a&&(c=ia(this,"updateNowIndicator"),this.initialNowDate=this.calendar.getNow(),this.initialNowQueriedMs=+new Date,this.renderNowIndicator(this.initialNowDate),this.isNowIndicatorRendered=!0,d=this.initialNowDate.clone().startOf(a).add(1,a)-this.initialNowDate,this.nowIndicatorTimeoutID=setTimeout(function(){e.nowIndicatorTimeoutID=null,c(),d=+b.duration(1,a),d=Math.max(100,d),e.nowIndicatorIntervalID=setInterval(c,d)},d)))},updateNowIndicator:function(){this.isNowIndicatorRendered&&(this.unrenderNowIndicator(),this.renderNowIndicator(this.initialNowDate.clone().add(new Date-this.initialNowQueriedMs)))},stopNowIndicator:function(){this.isNowIndicatorRendered&&(this.nowIndicatorTimeoutID&&(clearTimeout(this.nowIndicatorTimeoutID),this.nowIndicatorTimeoutID=null),this.nowIndicatorIntervalID&&(clearTimeout(this.nowIndicatorIntervalID),this.nowIndicatorIntervalID=null),this.unrenderNowIndicator(),this.isNowIndicatorRendered=!1)},getNowIndicatorUnit:function(){},renderNowIndicator:function(a){},unrenderNowIndicator:function(){},updateSize:function(a){var b;a&&(b=this.queryScroll()),this.updateHeight(a),this.updateWidth(a),this.updateNowIndicator(),a&&this.setScroll(b)},updateWidth:function(a){},updateHeight:function(a){var b=this.calendar;this.setHeight(b.getSuggestedViewHeight(),b.isHeightAuto())},setHeight:function(a,b){},computeInitialScroll:function(a){return 0},queryScroll:function(){},setScroll:function(a){},forceScroll:function(a){var b=this;this.setScroll(a),setTimeout(function(){b.setScroll(a)},0)},displayEvents:function(a){var b=this.queryScroll();this.clearEvents(),this.renderEvents(a),this.isEventsRendered=!0,this.setScroll(b),this.triggerEventRender()},clearEvents:function(){var a;this.isEventsRendered&&(a=this.queryScroll(),this.triggerEventUnrender(),this.destroyEvents&&this.destroyEvents(),this.unrenderEvents(),this.setScroll(a),this.isEventsRendered=!1)},renderEvents:function(a){},unrenderEvents:function(){},triggerEventRender:function(){this.renderedEventSegEach(function(a){this.trigger("eventAfterRender",a.event,a.event,a.el)}),this.trigger("eventAfterAllRender")},triggerEventUnrender:function(){this.renderedEventSegEach(function(a){this.trigger("eventDestroy",a.event,a.event,a.el)})},resolveEventEl:function(b,c){var d=this.trigger("eventRender",b,b,c);return d===!1?c=null:d&&d!==!0&&(c=a(d)),c},showEvent:function(a){this.renderedEventSegEach(function(a){a.el.css("visibility","")},a)},hideEvent:function(a){this.renderedEventSegEach(function(a){a.el.css("visibility","hidden")},a)},renderedEventSegEach:function(a,b){var c,d=this.getEventSegs();for(c=0;c<d.length;c++)b&&d[c].event._id!==b._id||d[c].el&&a.call(this,d[c])},getEventSegs:function(){return[]},isEventDraggable:function(a){var b=a.source||{};return ba(a.startEditable,b.startEditable,this.opt("eventStartEditable"),a.editable,b.editable,this.opt("editable"))},reportEventDrop:function(a,b,c,d,e){var f=this.calendar,g=f.mutateEvent(a,b,c),h=function(){g.undo(),f.reportEventChange()};this.triggerEventDrop(a,g.dateDelta,h,d,e),f.reportEventChange()},triggerEventDrop:function(a,b,c,d,e){this.trigger("eventDrop",d[0],a,b,c,e,{})},reportExternalDrop:function(b,c,d,e,f){var g,h,i=b.eventProps;i&&(g=a.extend({},i,c),h=this.calendar.renderEvent(g,b.stick)[0]),this.triggerExternalDrop(h,c,d,e,f)},triggerExternalDrop:function(a,b,c,d,e){this.trigger("drop",c[0],b.start,d,e),a&&this.trigger("eventReceive",null,a)},renderDrag:function(a,b){},unrenderDrag:function(){},isEventResizableFromStart:function(a){return this.opt("eventResizableFromStart")&&this.isEventResizable(a)},isEventResizableFromEnd:function(a){return this.isEventResizable(a)},isEventResizable:function(a){var b=a.source||{};return ba(a.durationEditable,b.durationEditable,this.opt("eventDurationEditable"),a.editable,b.editable,this.opt("editable"))},reportEventResize:function(a,b,c,d,e){var f=this.calendar,g=f.mutateEvent(a,b,c),h=function(){g.undo(),
+f.reportEventChange()};this.triggerEventResize(a,g.durationDelta,h,d,e),f.reportEventChange()},triggerEventResize:function(a,b,c,d,e){this.trigger("eventResize",d[0],a,b,c,e,{})},select:function(a,b){this.unselect(b),this.renderSelection(a),this.reportSelection(a,b)},renderSelection:function(a){},reportSelection:function(a,b){this.isSelected=!0,this.triggerSelect(a,b)},triggerSelect:function(a,b){this.trigger("select",null,this.calendar.applyTimezone(a.start),this.calendar.applyTimezone(a.end),b)},unselect:function(a){this.isSelected&&(this.isSelected=!1,this.destroySelection&&this.destroySelection(),this.unrenderSelection(),this.trigger("unselect",null,a))},unrenderSelection:function(){},selectEvent:function(a){this.selectedEvent&&this.selectedEvent===a||(this.unselectEvent(),this.renderedEventSegEach(function(a){a.el.addClass("fc-selected")},a),this.selectedEvent=a)},unselectEvent:function(){this.selectedEvent&&(this.renderedEventSegEach(function(a){a.el.removeClass("fc-selected")},this.selectedEvent),this.selectedEvent=null)},isEventSelected:function(a){return this.selectedEvent&&this.selectedEvent._id===a._id},handleDocumentMousedown:function(a){u(a)&&this.processUnselect(a)},processUnselect:function(a){this.processRangeUnselect(a),this.processEventUnselect(a)},processRangeUnselect:function(b){var c;this.isSelected&&this.opt("unselectAuto")&&(c=this.opt("unselectCancel"),c&&a(b.target).closest(c).length||this.unselect(b))},processEventUnselect:function(b){this.selectedEvent&&(a(b.target).closest(".fc-selected").length||this.unselectEvent())},triggerDayClick:function(a,b,c){this.trigger("dayClick",b,this.calendar.applyTimezone(a.start),c)},initHiddenDays:function(){var b,c=this.opt("hiddenDays")||[],d=[],e=0;for(this.opt("weekends")===!1&&c.push(0,6),b=0;7>b;b++)(d[b]=-1!==a.inArray(b,c))||e++;if(!e)throw"invalid hiddenDays";this.isHiddenDayHash=d},isHiddenDay:function(a){return b.isMoment(a)&&(a=a.day()),this.isHiddenDayHash[a]},skipHiddenDays:function(a,b,c){var d=a.clone();for(b=b||1;this.isHiddenDayHash[(d.day()+(c?b:0)+7)%7];)d.add(b,"days");return d},computeDayRange:function(a){var b,c=a.start.clone().stripTime(),d=a.end,e=null;return d&&(e=d.clone().stripTime(),b=+d.time(),b&&b>=this.nextDayThreshold&&e.add(1,"days")),(!d||c>=e)&&(e=c.clone().add(1,"days")),{start:c,end:e}},isMultiDayEvent:function(a){var b=this.computeDayRange(a);return b.end.diff(b.start,"days")>1}}),yb=Wa.Scroller=ya.extend({el:null,scrollEl:null,overflowX:null,overflowY:null,constructor:function(a){a=a||{},this.overflowX=a.overflowX||a.overflow||"auto",this.overflowY=a.overflowY||a.overflow||"auto"},render:function(){this.el=this.renderEl(),this.applyOverflow()},renderEl:function(){return this.scrollEl=a('<div class="fc-scroller"></div>')},clear:function(){this.setHeight("auto"),this.applyOverflow()},destroy:function(){this.el.remove()},applyOverflow:function(){this.scrollEl.css({"overflow-x":this.overflowX,"overflow-y":this.overflowY})},lockOverflow:function(a){var b=this.overflowX,c=this.overflowY;a=a||this.getScrollbarWidths(),"auto"===b&&(b=a.top||a.bottom||this.scrollEl[0].scrollWidth-1>this.scrollEl[0].clientWidth?"scroll":"hidden"),"auto"===c&&(c=a.left||a.right||this.scrollEl[0].scrollHeight-1>this.scrollEl[0].clientHeight?"scroll":"hidden"),this.scrollEl.css({"overflow-x":b,"overflow-y":c})},setHeight:function(a){this.scrollEl.height(a)},getScrollTop:function(){return this.scrollEl.scrollTop()},setScrollTop:function(a){this.scrollEl.scrollTop(a)},getClientWidth:function(){return this.scrollEl[0].clientWidth},getClientHeight:function(){return this.scrollEl[0].clientHeight},getScrollbarWidths:function(){return q(this.scrollEl)}}),zb=Wa.Calendar=ya.extend({dirDefaults:null,langDefaults:null,overrides:null,options:null,viewSpecCache:null,view:null,header:null,loadingLevel:0,constructor:Qa,initialize:function(){},initOptions:function(a){var b,e,f,g;a=d(a),b=a.lang,e=Ab[b],e||(b=zb.defaults.lang,e=Ab[b]||{}),f=ba(a.isRTL,e.isRTL,zb.defaults.isRTL),g=f?zb.rtlDefaults:{},this.dirDefaults=g,this.langDefaults=e,this.overrides=a,this.options=c([zb.defaults,g,e,a]),Ra(this.options),this.viewSpecCache={}},getViewSpec:function(a){var b=this.viewSpecCache;return b[a]||(b[a]=this.buildViewSpec(a))},getUnitViewSpec:function(b){var c,d,e;if(-1!=a.inArray(b,_a))for(c=this.header.getViewsWithButtons(),a.each(Wa.views,function(a){c.push(a)}),d=0;d<c.length;d++)if(e=this.getViewSpec(c[d]),e&&e.singleUnit==b)return e},buildViewSpec:function(a){for(var d,e,f,g,h=this.overrides.views||{},i=[],j=[],k=[],l=a;l;)d=Xa[l],e=h[l],l=null,"function"==typeof d&&(d={"class":d}),d&&(i.unshift(d),j.unshift(d.defaults||{}),f=f||d.duration,l=l||d.type),e&&(k.unshift(e),f=f||e.duration,l=l||e.type);return d=W(i),d.type=a,d["class"]?(f&&(f=b.duration(f),f.valueOf()&&(d.duration=f,g=O(f),1===f.as(g)&&(d.singleUnit=g,k.unshift(h[g]||{})))),d.defaults=c(j),d.overrides=c(k),this.buildViewSpecOptions(d),this.buildViewSpecButtonText(d,a),d):!1},buildViewSpecOptions:function(a){a.options=c([zb.defaults,a.defaults,this.dirDefaults,this.langDefaults,this.overrides,a.overrides]),Ra(a.options)},buildViewSpecButtonText:function(a,b){function c(c){var d=c.buttonText||{};return d[b]||(a.singleUnit?d[a.singleUnit]:null)}a.buttonTextOverride=c(this.overrides)||a.overrides.buttonText,a.buttonTextDefault=c(this.langDefaults)||c(this.dirDefaults)||a.defaults.buttonText||c(zb.defaults)||(a.duration?this.humanizeDuration(a.duration):null)||b},instantiateView:function(a){var b=this.getViewSpec(a);return new b["class"](this,a,b.options,b.duration)},isValidViewType:function(a){return Boolean(this.getViewSpec(a))},pushLoading:function(){this.loadingLevel++||this.trigger("loading",null,!0,this.view)},popLoading:function(){--this.loadingLevel||this.trigger("loading",null,!1,this.view)},buildSelectSpan:function(a,b){var c,d=this.moment(a).stripZone();return c=b?this.moment(b).stripZone():d.hasTime()?d.clone().add(this.defaultTimedEventDuration):d.clone().add(this.defaultAllDayEventDuration),{start:d,end:c}}});zb.mixin(lb),zb.defaults={titleRangeSeparator:" – ",monthYearFormat:"MMMM YYYY",defaultTimedEventDuration:"02:00:00",defaultAllDayEventDuration:{days:1},forceEventDuration:!1,nextDayThreshold:"09:00:00",defaultView:"month",aspectRatio:1.35,header:{left:"title",center:"",right:"today prev,next"},weekends:!0,weekNumbers:!1,weekNumberTitle:"W",weekNumberCalculation:"local",scrollTime:"06:00:00",lazyFetching:!0,startParam:"start",endParam:"end",timezoneParam:"timezone",timezone:!1,isRTL:!1,buttonText:{prev:"prev",next:"next",prevYear:"prev year",nextYear:"next year",year:"year",today:"today",month:"month",week:"week",day:"day"},buttonIcons:{prev:"left-single-arrow",next:"right-single-arrow",prevYear:"left-double-arrow",nextYear:"right-double-arrow"},theme:!1,themeButtonIcons:{prev:"circle-triangle-w",next:"circle-triangle-e",prevYear:"seek-prev",nextYear:"seek-next"},dragOpacity:.75,dragRevertDuration:500,dragScroll:!0,unselectAuto:!0,dropAccept:"*",eventOrder:"title",eventLimit:!1,eventLimitText:"more",eventLimitClick:"popover",dayPopoverFormat:"LL",handleWindowResize:!0,windowResizeDelay:200,longPressDelay:1e3},zb.englishDefaults={dayPopoverFormat:"dddd, MMMM D"},zb.rtlDefaults={header:{left:"next,prev today",center:"",right:"title"},buttonIcons:{prev:"right-single-arrow",next:"left-single-arrow",prevYear:"right-double-arrow",nextYear:"left-double-arrow"},themeButtonIcons:{prev:"circle-triangle-e",next:"circle-triangle-w",nextYear:"seek-prev",prevYear:"seek-next"}};var Ab=Wa.langs={};Wa.datepickerLang=function(b,c,d){var e=Ab[b]||(Ab[b]={});e.isRTL=d.isRTL,e.weekNumberTitle=d.weekHeader,a.each(Bb,function(a,b){e[a]=b(d)}),a.datepicker&&(a.datepicker.regional[c]=a.datepicker.regional[b]=d,a.datepicker.regional.en=a.datepicker.regional[""],a.datepicker.setDefaults(d))},Wa.lang=function(b,d){var e,f;e=Ab[b]||(Ab[b]={}),d&&(e=Ab[b]=c([e,d])),f=Sa(b),a.each(Cb,function(a,b){null==e[a]&&(e[a]=b(f,e))}),zb.defaults.lang=b};var Bb={buttonText:function(a){return{prev:da(a.prevText),next:da(a.nextText),today:da(a.currentText)}},monthYearFormat:function(a){return a.showMonthAfterYear?"YYYY["+a.yearSuffix+"] MMMM":"MMMM YYYY["+a.yearSuffix+"]"}},Cb={dayOfMonthFormat:function(a,b){var c=a.longDateFormat("l");return c=c.replace(/^Y+[^\w\s]*|[^\w\s]*Y+$/g,""),b.isRTL?c+=" ddd":c="ddd "+c,c},mediumTimeFormat:function(a){return a.longDateFormat("LT").replace(/\s*a$/i,"a")},smallTimeFormat:function(a){return a.longDateFormat("LT").replace(":mm","(:mm)").replace(/(\Wmm)$/,"($1)").replace(/\s*a$/i,"a")},extraSmallTimeFormat:function(a){return a.longDateFormat("LT").replace(":mm","(:mm)").replace(/(\Wmm)$/,"($1)").replace(/\s*a$/i,"t")},hourFormat:function(a){return a.longDateFormat("LT").replace(":mm","").replace(/(\Wmm)$/,"").replace(/\s*a$/i,"a")},noMeridiemTimeFormat:function(a){return a.longDateFormat("LT").replace(/\s*a$/i,"")}},Db={smallDayDateFormat:function(a){return a.isRTL?"D dd":"dd D"},weekFormat:function(a){return a.isRTL?"w[ "+a.weekNumberTitle+"]":"["+a.weekNumberTitle+" ]w"},smallWeekFormat:function(a){return a.isRTL?"w["+a.weekNumberTitle+"]":"["+a.weekNumberTitle+"]w"}};Wa.lang("en",zb.englishDefaults),Wa.sourceNormalizers=[],Wa.sourceFetchers=[];var Eb={dataType:"json",cache:!1},Fb=1;zb.prototype.normalizeEvent=function(a){},zb.prototype.getPeerEvents=function(a,b){var c,d,e=this.getEventCache(),f=[];for(c=0;c<e.length;c++)d=e[c],b&&b._id===d._id||f.push(d);return f};var Gb=Wa.BasicView=xb.extend({scroller:null,dayGridClass:vb,dayGrid:null,dayNumbersVisible:!1,weekNumbersVisible:!1,weekNumberWidth:null,headContainerEl:null,headRowEl:null,initialize:function(){this.dayGrid=this.instantiateDayGrid(),this.scroller=new yb({overflowX:"hidden",overflowY:"auto"})},instantiateDayGrid:function(){var a=this.dayGridClass.extend(Hb);return new a(this)},setRange:function(a){xb.prototype.setRange.call(this,a),this.dayGrid.breakOnWeeks=/year|month|week/.test(this.intervalUnit),this.dayGrid.setRange(a)},computeRange:function(a){var b=xb.prototype.computeRange.call(this,a);return/year|month/.test(b.intervalUnit)&&(b.start.startOf("week"),b.start=this.skipHiddenDays(b.start),b.end.weekday()&&(b.end.add(1,"week").startOf("week"),b.end=this.skipHiddenDays(b.end,-1,!0))),b},renderDates:function(){this.dayNumbersVisible=this.dayGrid.rowCnt>1,this.weekNumbersVisible=this.opt("weekNumbers"),this.dayGrid.numbersVisible=this.dayNumbersVisible||this.weekNumbersVisible,this.el.addClass("fc-basic-view").html(this.renderSkeletonHtml()),this.renderHead(),this.scroller.render();var b=this.scroller.el.addClass("fc-day-grid-container"),c=a('<div class="fc-day-grid" />').appendTo(b);this.el.find(".fc-body > tr > td").append(b),this.dayGrid.setElement(c),this.dayGrid.renderDates(this.hasRigidRows())},renderHead:function(){this.headContainerEl=this.el.find(".fc-head-container").html(this.dayGrid.renderHeadHtml()),this.headRowEl=this.headContainerEl.find(".fc-row")},unrenderDates:function(){this.dayGrid.unrenderDates(),this.dayGrid.removeElement(),this.scroller.destroy()},renderBusinessHours:function(){this.dayGrid.renderBusinessHours()},renderSkeletonHtml:function(){return'<table><thead class="fc-head"><tr><td class="fc-head-container '+this.widgetHeaderClass+'"></td></tr></thead><tbody class="fc-body"><tr><td class="'+this.widgetContentClass+'"></td></tr></tbody></table>'},weekNumberStyleAttr:function(){return null!==this.weekNumberWidth?'style="width:'+this.weekNumberWidth+'px"':""},hasRigidRows:function(){var a=this.opt("eventLimit");return a&&"number"!=typeof a},updateWidth:function(){this.weekNumbersVisible&&(this.weekNumberWidth=k(this.el.find(".fc-week-number")))},setHeight:function(a,b){var c,d,g=this.opt("eventLimit");this.scroller.clear(),f(this.headRowEl),this.dayGrid.removeSegPopover(),g&&"number"==typeof g&&this.dayGrid.limitRows(g),c=this.computeScrollerHeight(a),this.setGridHeight(c,b),g&&"number"!=typeof g&&this.dayGrid.limitRows(g),b||(this.scroller.setHeight(c),d=this.scroller.getScrollbarWidths(),(d.left||d.right)&&(e(this.headRowEl,d),c=this.computeScrollerHeight(a),this.scroller.setHeight(c)),this.scroller.lockOverflow(d))},computeScrollerHeight:function(a){return a-l(this.el,this.scroller.el)},setGridHeight:function(a,b){b?j(this.dayGrid.rowEls):i(this.dayGrid.rowEls,a,!0)},queryScroll:function(){return this.scroller.getScrollTop()},setScroll:function(a){this.scroller.setScrollTop(a)},prepareHits:function(){this.dayGrid.prepareHits()},releaseHits:function(){this.dayGrid.releaseHits()},queryHit:function(a,b){return this.dayGrid.queryHit(a,b)},getHitSpan:function(a){return this.dayGrid.getHitSpan(a)},getHitEl:function(a){return this.dayGrid.getHitEl(a)},renderEvents:function(a){this.dayGrid.renderEvents(a),this.updateHeight()},getEventSegs:function(){return this.dayGrid.getEventSegs()},unrenderEvents:function(){this.dayGrid.unrenderEvents()},renderDrag:function(a,b){return this.dayGrid.renderDrag(a,b)},unrenderDrag:function(){this.dayGrid.unrenderDrag()},renderSelection:function(a){this.dayGrid.renderSelection(a)},unrenderSelection:function(){this.dayGrid.unrenderSelection()}}),Hb={renderHeadIntroHtml:function(){var a=this.view;return a.weekNumbersVisible?'<th class="fc-week-number '+a.widgetHeaderClass+'" '+a.weekNumberStyleAttr()+"><span>"+ca(a.opt("weekNumberTitle"))+"</span></th>":""},renderNumberIntroHtml:function(a){var b=this.view;return b.weekNumbersVisible?'<td class="fc-week-number" '+b.weekNumberStyleAttr()+"><span>"+this.getCellDate(a,0).format("w")+"</span></td>":""},renderBgIntroHtml:function(){var a=this.view;return a.weekNumbersVisible?'<td class="fc-week-number '+a.widgetContentClass+'" '+a.weekNumberStyleAttr()+"></td>":""},renderIntroHtml:function(){var a=this.view;return a.weekNumbersVisible?'<td class="fc-week-number" '+a.weekNumberStyleAttr()+"></td>":""}},Ib=Wa.MonthView=Gb.extend({computeRange:function(a){var b,c=Gb.prototype.computeRange.call(this,a);return this.isFixedWeeks()&&(b=Math.ceil(c.end.diff(c.start,"weeks",!0)),c.end.add(6-b,"weeks")),c},setGridHeight:function(a,b){b=b||"variable"===this.opt("weekMode"),b&&(a*=this.rowCnt/6),i(this.dayGrid.rowEls,a,!b)},isFixedWeeks:function(){var a=this.opt("weekMode");return a?"fixed"===a:this.opt("fixedWeekCount")}});Xa.basic={"class":Gb},Xa.basicDay={type:"basic",duration:{days:1}},Xa.basicWeek={type:"basic",duration:{weeks:1}},Xa.month={"class":Ib,duration:{months:1},defaults:{fixedWeekCount:!0}};var Jb=Wa.AgendaView=xb.extend({scroller:null,timeGridClass:wb,timeGrid:null,dayGridClass:vb,dayGrid:null,axisWidth:null,headContainerEl:null,noScrollRowEls:null,bottomRuleEl:null,initialize:function(){this.timeGrid=this.instantiateTimeGrid(),this.opt("allDaySlot")&&(this.dayGrid=this.instantiateDayGrid()),this.scroller=new yb({overflowX:"hidden",overflowY:"auto"})},instantiateTimeGrid:function(){var a=this.timeGridClass.extend(Kb);return new a(this)},instantiateDayGrid:function(){var a=this.dayGridClass.extend(Lb);return new a(this)},setRange:function(a){xb.prototype.setRange.call(this,a),this.timeGrid.setRange(a),this.dayGrid&&this.dayGrid.setRange(a)},renderDates:function(){this.el.addClass("fc-agenda-view").html(this.renderSkeletonHtml()),this.renderHead(),this.scroller.render();var b=this.scroller.el.addClass("fc-time-grid-container"),c=a('<div class="fc-time-grid" />').appendTo(b);this.el.find(".fc-body > tr > td").append(b),this.timeGrid.setElement(c),this.timeGrid.renderDates(),this.bottomRuleEl=a('<hr class="fc-divider '+this.widgetHeaderClass+'"/>').appendTo(this.timeGrid.el),this.dayGrid&&(this.dayGrid.setElement(this.el.find(".fc-day-grid")),this.dayGrid.renderDates(),this.dayGrid.bottomCoordPadding=this.dayGrid.el.next("hr").outerHeight()),this.noScrollRowEls=this.el.find(".fc-row:not(.fc-scroller *)")},renderHead:function(){this.headContainerEl=this.el.find(".fc-head-container").html(this.timeGrid.renderHeadHtml())},unrenderDates:function(){this.timeGrid.unrenderDates(),this.timeGrid.removeElement(),this.dayGrid&&(this.dayGrid.unrenderDates(),this.dayGrid.removeElement()),this.scroller.destroy()},renderSkeletonHtml:function(){return'<table><thead class="fc-head"><tr><td class="fc-head-container '+this.widgetHeaderClass+'"></td></tr></thead><tbody class="fc-body"><tr><td class="'+this.widgetContentClass+'">'+(this.dayGrid?'<div class="fc-day-grid"/><hr class="fc-divider '+this.widgetHeaderClass+'"/>':"")+"</td></tr></tbody></table>"},axisStyleAttr:function(){return null!==this.axisWidth?'style="width:'+this.axisWidth+'px"':""},renderBusinessHours:function(){this.timeGrid.renderBusinessHours(),this.dayGrid&&this.dayGrid.renderBusinessHours()},unrenderBusinessHours:function(){this.timeGrid.unrenderBusinessHours(),this.dayGrid&&this.dayGrid.unrenderBusinessHours()},getNowIndicatorUnit:function(){return this.timeGrid.getNowIndicatorUnit()},renderNowIndicator:function(a){this.timeGrid.renderNowIndicator(a)},unrenderNowIndicator:function(){this.timeGrid.unrenderNowIndicator()},updateSize:function(a){this.timeGrid.updateSize(a),xb.prototype.updateSize.call(this,a)},updateWidth:function(){this.axisWidth=k(this.el.find(".fc-axis"))},setHeight:function(a,b){var c,d,g;this.bottomRuleEl.hide(),this.scroller.clear(),f(this.noScrollRowEls),this.dayGrid&&(this.dayGrid.removeSegPopover(),c=this.opt("eventLimit"),c&&"number"!=typeof c&&(c=Mb),c&&this.dayGrid.limitRows(c)),b||(d=this.computeScrollerHeight(a),this.scroller.setHeight(d),g=this.scroller.getScrollbarWidths(),(g.left||g.right)&&(e(this.noScrollRowEls,g),d=this.computeScrollerHeight(a),this.scroller.setHeight(d)),this.scroller.lockOverflow(g),this.timeGrid.getTotalSlatHeight()<d&&this.bottomRuleEl.show())},computeScrollerHeight:function(a){return a-l(this.el,this.scroller.el)},computeInitialScroll:function(){var a=b.duration(this.opt("scrollTime")),c=this.timeGrid.computeTimeTop(a);return c=Math.ceil(c),c&&c++,c},queryScroll:function(){return this.scroller.getScrollTop()},setScroll:function(a){this.scroller.setScrollTop(a)},prepareHits:function(){this.timeGrid.prepareHits(),this.dayGrid&&this.dayGrid.prepareHits()},releaseHits:function(){this.timeGrid.releaseHits(),this.dayGrid&&this.dayGrid.releaseHits()},queryHit:function(a,b){var c=this.timeGrid.queryHit(a,b);return!c&&this.dayGrid&&(c=this.dayGrid.queryHit(a,b)),c},getHitSpan:function(a){return a.component.getHitSpan(a)},getHitEl:function(a){return a.component.getHitEl(a)},renderEvents:function(a){var b,c,d=[],e=[],f=[];for(c=0;c<a.length;c++)a[c].allDay?d.push(a[c]):e.push(a[c]);b=this.timeGrid.renderEvents(e),this.dayGrid&&(f=this.dayGrid.renderEvents(d)),this.updateHeight()},getEventSegs:function(){return this.timeGrid.getEventSegs().concat(this.dayGrid?this.dayGrid.getEventSegs():[])},unrenderEvents:function(){this.timeGrid.unrenderEvents(),this.dayGrid&&this.dayGrid.unrenderEvents()},renderDrag:function(a,b){return a.start.hasTime()?this.timeGrid.renderDrag(a,b):this.dayGrid?this.dayGrid.renderDrag(a,b):void 0},unrenderDrag:function(){this.timeGrid.unrenderDrag(),this.dayGrid&&this.dayGrid.unrenderDrag()},renderSelection:function(a){a.start.hasTime()||a.end.hasTime()?this.timeGrid.renderSelection(a):this.dayGrid&&this.dayGrid.renderSelection(a)},unrenderSelection:function(){this.timeGrid.unrenderSelection(),this.dayGrid&&this.dayGrid.unrenderSelection()}}),Kb={renderHeadIntroHtml:function(){var a,b=this.view;return b.opt("weekNumbers")?(a=this.start.format(b.opt("smallWeekFormat")),'<th class="fc-axis fc-week-number '+b.widgetHeaderClass+'" '+b.axisStyleAttr()+"><span>"+ca(a)+"</span></th>"):'<th class="fc-axis '+b.widgetHeaderClass+'" '+b.axisStyleAttr()+"></th>"},renderBgIntroHtml:function(){var a=this.view;return'<td class="fc-axis '+a.widgetContentClass+'" '+a.axisStyleAttr()+"></td>"},renderIntroHtml:function(){var a=this.view;return'<td class="fc-axis" '+a.axisStyleAttr()+"></td>"}},Lb={renderBgIntroHtml:function(){var a=this.view;return'<td class="fc-axis '+a.widgetContentClass+'" '+a.axisStyleAttr()+"><span>"+(a.opt("allDayHtml")||ca(a.opt("allDayText")))+"</span></td>"},renderIntroHtml:function(){var a=this.view;return'<td class="fc-axis" '+a.axisStyleAttr()+"></td>"}},Mb=5,Nb=[{hours:1},{minutes:30},{minutes:15},{seconds:30},{seconds:15}];return Xa.agenda={"class":Jb,defaults:{allDaySlot:!0,allDayText:"all-day",slotDuration:"00:30:00",minTime:"00:00:00",maxTime:"24:00:00",slotEventOverlap:!0}},Xa.agendaDay={type:"agenda",duration:{days:1}},Xa.agendaWeek={type:"agenda",duration:{weeks:1}},Wa});
\ No newline at end of file
diff --git a/library/fullcalendar/fullcalendar.print.css b/library/fullcalendar/fullcalendar.print.css
index e399f614a..83d11563b 100644
--- a/library/fullcalendar/fullcalendar.print.css
+++ b/library/fullcalendar/fullcalendar.print.css
@@ -1,7 +1,7 @@
 /*!
- * FullCalendar v2.6.1 Print Stylesheet
+ * FullCalendar v2.8.0 Print Stylesheet
  * Docs & License: http://fullcalendar.io/
- * (c) 2015 Adam Shaw
+ * (c) 2016 Adam Shaw
  */
 
 /*
diff --git a/library/fullcalendar/gcal.js b/library/fullcalendar/gcal.js
index 98174ecb0..1d6b91c5b 100644
--- a/library/fullcalendar/gcal.js
+++ b/library/fullcalendar/gcal.js
@@ -1,7 +1,7 @@
 /*!
- * FullCalendar v2.6.1 Google Calendar Plugin
+ * FullCalendar v2.8.0 Google Calendar Plugin
  * Docs & License: http://fullcalendar.io/
- * (c) 2015 Adam Shaw
+ * (c) 2016 Adam Shaw
  */
  
 (function(factory) {
@@ -136,10 +136,10 @@ function transformOptions(sourceOptions, start, end, timezone, calendar) {
 			}
 			else if (data.items) {
 				$.each(data.items, function(i, entry) {
-					var url = entry.htmlLink;
+					var url = entry.htmlLink || null;
 
 					// make the URLs for each event show times in the correct timezone
-					if (timezoneArg) {
+					if (timezoneArg && url !== null) {
 						url = injectQsComponent(url, 'ctz=' + timezoneArg);
 					}
 
diff --git a/library/fullcalendar/lang-all.js b/library/fullcalendar/lang-all.js
index b38d942f6..dc7577063 100644
--- a/library/fullcalendar/lang-all.js
+++ b/library/fullcalendar/lang-all.js
@@ -1,4 +1,4 @@
-!function(a){"function"==typeof define&&define.amd?define(["jquery","moment"],a):"object"==typeof exports?module.exports=a(require("jquery"),require("moment")):a(jQuery,moment)}(function(a,b){!function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"ar-ma",{months:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),weekdays:"الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},week:{dow:6,doy:12}});return a}(),a.fullCalendar.datepickerLang("ar-ma","ar",{closeText:"إغلاق",prevText:"&#x3C;السابق",nextText:"التالي&#x3E;",currentText:"اليوم",monthNames:["كانون الثاني","شباط","آذار","نيسان","مايو","حزيران","تموز","آب","أيلول","تشرين الأول","تشرين الثاني","كانون الأول"],monthNamesShort:["1","2","3","4","5","6","7","8","9","10","11","12"],dayNames:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesShort:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesMin:["ح","ن","ث","ر","خ","ج","س"],weekHeader:"أسبوع",dateFormat:"dd/mm/yy",firstDay:6,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ar-ma",{buttonText:{month:"شهر",week:"أسبوع",day:"يوم",list:"أجندة"},allDayText:"اليوم كله",eventLimitText:"أخرى"})}(),function(){!function(){"use strict";var a={1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"},c={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"},d=(b.defineLocale||b.lang).call(b,"ar-sa",{months:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/ص|م/,isPM:function(a){return"م"===a},meridiem:function(a,b,c){return 12>a?"ص":"م"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},preparse:function(a){return a.replace(/[١٢٣٤٥٦٧٨٩٠]/g,function(a){return c[a]}).replace(/،/g,",")},postformat:function(b){return b.replace(/\d/g,function(b){return a[b]}).replace(/,/g,"،")},week:{dow:6,doy:12}});return d}(),a.fullCalendar.datepickerLang("ar-sa","ar",{closeText:"إغلاق",prevText:"&#x3C;السابق",nextText:"التالي&#x3E;",currentText:"اليوم",monthNames:["كانون الثاني","شباط","آذار","نيسان","مايو","حزيران","تموز","آب","أيلول","تشرين الأول","تشرين الثاني","كانون الأول"],monthNamesShort:["1","2","3","4","5","6","7","8","9","10","11","12"],dayNames:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesShort:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesMin:["ح","ن","ث","ر","خ","ج","س"],weekHeader:"أسبوع",dateFormat:"dd/mm/yy",firstDay:6,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ar-sa",{buttonText:{month:"شهر",week:"أسبوع",day:"يوم",list:"أجندة"},allDayText:"اليوم كله",eventLimitText:"أخرى"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"ar-tn",{months:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),monthsShort:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("ar-tn","ar",{closeText:"إغلاق",prevText:"&#x3C;السابق",nextText:"التالي&#x3E;",currentText:"اليوم",monthNames:["كانون الثاني","شباط","آذار","نيسان","مايو","حزيران","تموز","آب","أيلول","تشرين الأول","تشرين الثاني","كانون الأول"],monthNamesShort:["1","2","3","4","5","6","7","8","9","10","11","12"],dayNames:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesShort:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesMin:["ح","ن","ث","ر","خ","ج","س"],weekHeader:"أسبوع",dateFormat:"dd/mm/yy",firstDay:6,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ar-tn",{buttonText:{month:"شهر",week:"أسبوع",day:"يوم",list:"أجندة"},allDayText:"اليوم كله",eventLimitText:"أخرى"})}(),function(){!function(){"use strict";var a={1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"},c={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"},d=function(a){return 0===a?0:1===a?1:2===a?2:a%100>=3&&10>=a%100?3:a%100>=11?4:5},e={s:["أقل من ثانية","ثانية واحدة",["ثانيتان","ثانيتين"],"%d ثوان","%d ثانية","%d ثانية"],m:["أقل من دقيقة","دقيقة واحدة",["دقيقتان","دقيقتين"],"%d دقائق","%d دقيقة","%d دقيقة"],h:["أقل من ساعة","ساعة واحدة",["ساعتان","ساعتين"],"%d ساعات","%d ساعة","%d ساعة"],d:["أقل من يوم","يوم واحد",["يومان","يومين"],"%d أيام","%d يومًا","%d يوم"],M:["أقل من شهر","شهر واحد",["شهران","شهرين"],"%d أشهر","%d شهرا","%d شهر"],y:["أقل من عام","عام واحد",["عامان","عامين"],"%d أعوام","%d عامًا","%d عام"]},f=function(a){return function(b,c,f,g){var h=d(b),i=e[a][d(b)];return 2===h&&(i=i[c?0:1]),i.replace(/%d/i,b)}},g=["كانون الثاني يناير","شباط فبراير","آذار مارس","نيسان أبريل","أيار مايو","حزيران يونيو","تموز يوليو","آب أغسطس","أيلول سبتمبر","تشرين الأول أكتوبر","تشرين الثاني نوفمبر","كانون الأول ديسمبر"],h=(b.defineLocale||b.lang).call(b,"ar",{months:g,monthsShort:g,weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/‏M/‏YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/ص|م/,isPM:function(a){return"م"===a},meridiem:function(a,b,c){return 12>a?"ص":"م"},calendar:{sameDay:"[اليوم عند الساعة] LT",nextDay:"[غدًا عند الساعة] LT",nextWeek:"dddd [عند الساعة] LT",lastDay:"[أمس عند الساعة] LT",lastWeek:"dddd [عند الساعة] LT",sameElse:"L"},relativeTime:{future:"بعد %s",past:"منذ %s",s:f("s"),m:f("m"),mm:f("m"),h:f("h"),hh:f("h"),d:f("d"),dd:f("d"),M:f("M"),MM:f("M"),y:f("y"),yy:f("y")},preparse:function(a){return a.replace(/\u200f/g,"").replace(/[١٢٣٤٥٦٧٨٩٠]/g,function(a){return c[a]}).replace(/،/g,",")},postformat:function(b){return b.replace(/\d/g,function(b){return a[b]}).replace(/,/g,"،")},week:{dow:6,doy:12}});return h}(),a.fullCalendar.datepickerLang("ar","ar",{closeText:"إغلاق",prevText:"&#x3C;السابق",nextText:"التالي&#x3E;",currentText:"اليوم",monthNames:["كانون الثاني","شباط","آذار","نيسان","مايو","حزيران","تموز","آب","أيلول","تشرين الأول","تشرين الثاني","كانون الأول"],monthNamesShort:["1","2","3","4","5","6","7","8","9","10","11","12"],dayNames:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesShort:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesMin:["ح","ن","ث","ر","خ","ج","س"],weekHeader:"أسبوع",dateFormat:"dd/mm/yy",firstDay:6,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ar",{buttonText:{month:"شهر",week:"أسبوع",day:"يوم",list:"أجندة"},allDayText:"اليوم كله",eventLimitText:"أخرى"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"bg",{months:"януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември".split("_"),monthsShort:"янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек".split("_"),weekdays:"неделя_понеделник_вторник_сряда_четвъртък_петък_събота".split("_"),weekdaysShort:"нед_пон_вто_сря_чет_пет_съб".split("_"),weekdaysMin:"нд_пн_вт_ср_чт_пт_сб".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[Днес в] LT",nextDay:"[Утре в] LT",nextWeek:"dddd [в] LT",lastDay:"[Вчера в] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[В изминалата] dddd [в] LT";case 1:case 2:case 4:case 5:return"[В изминалия] dddd [в] LT"}},sameElse:"L"},relativeTime:{future:"след %s",past:"преди %s",s:"няколко секунди",m:"минута",mm:"%d минути",h:"час",hh:"%d часа",d:"ден",dd:"%d дни",M:"месец",MM:"%d месеца",y:"година",yy:"%d години"},ordinalParse:/\d{1,2}-(ев|ен|ти|ви|ри|ми)/,ordinal:function(a){var b=a%10,c=a%100;return 0===a?a+"-ев":0===c?a+"-ен":c>10&&20>c?a+"-ти":1===b?a+"-ви":2===b?a+"-ри":7===b||8===b?a+"-ми":a+"-ти"},week:{dow:1,doy:7}});return a}(),a.fullCalendar.datepickerLang("bg","bg",{closeText:"затвори",prevText:"&#x3C;назад",nextText:"напред&#x3E;",nextBigText:"&#x3E;&#x3E;",currentText:"днес",monthNames:["Януари","Февруари","Март","Април","Май","Юни","Юли","Август","Септември","Октомври","Ноември","Декември"],monthNamesShort:["Яну","Фев","Мар","Апр","Май","Юни","Юли","Авг","Сеп","Окт","Нов","Дек"],dayNames:["Неделя","Понеделник","Вторник","Сряда","Четвъртък","Петък","Събота"],dayNamesShort:["Нед","Пон","Вто","Сря","Чет","Пет","Съб"],dayNamesMin:["Не","По","Вт","Ср","Че","Пе","Съ"],weekHeader:"Wk",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("bg",{buttonText:{month:"Месец",week:"Седмица",day:"Ден",list:"График"},allDayText:"Цял ден",eventLimitText:function(a){return"+още "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"ca",{months:"gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre".split("_"),monthsShort:"gen._febr._mar._abr._mai._jun._jul._ag._set._oct._nov._des.".split("_"),weekdays:"diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte".split("_"),weekdaysShort:"dg._dl._dt._dc._dj._dv._ds.".split("_"),weekdaysMin:"Dg_Dl_Dt_Dc_Dj_Dv_Ds".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd D MMMM YYYY H:mm"},calendar:{sameDay:function(){return"[avui a "+(1!==this.hours()?"les":"la")+"] LT"},nextDay:function(){return"[demà a "+(1!==this.hours()?"les":"la")+"] LT"},nextWeek:function(){return"dddd [a "+(1!==this.hours()?"les":"la")+"] LT"},lastDay:function(){return"[ahir a "+(1!==this.hours()?"les":"la")+"] LT"},lastWeek:function(){return"[el] dddd [passat a "+(1!==this.hours()?"les":"la")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"fa %s",s:"uns segons",m:"un minut",mm:"%d minuts",h:"una hora",hh:"%d hores",d:"un dia",dd:"%d dies",M:"un mes",MM:"%d mesos",y:"un any",yy:"%d anys"},ordinalParse:/\d{1,2}(r|n|t|è|a)/,ordinal:function(a,b){var c=1===a?"r":2===a?"n":3===a?"r":4===a?"t":"è";return("w"===b||"W"===b)&&(c="a"),a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("ca","ca",{closeText:"Tanca",prevText:"Anterior",nextText:"Següent",currentText:"Avui",monthNames:["gener","febrer","març","abril","maig","juny","juliol","agost","setembre","octubre","novembre","desembre"],monthNamesShort:["gen","feb","març","abr","maig","juny","jul","ag","set","oct","nov","des"],dayNames:["diumenge","dilluns","dimarts","dimecres","dijous","divendres","dissabte"],dayNamesShort:["dg","dl","dt","dc","dj","dv","ds"],dayNamesMin:["dg","dl","dt","dc","dj","dv","ds"],weekHeader:"Set",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ca",{buttonText:{month:"Mes",week:"Setmana",day:"Dia",list:"Agenda"},allDayText:"Tot el dia",eventLimitText:"més"})}(),function(){!function(){"use strict";function a(a){return a>1&&5>a&&1!==~~(a/10)}function c(b,c,d,e){var f=b+" ";switch(d){case"s":return c||e?"pár sekund":"pár sekundami";case"m":return c?"minuta":e?"minutu":"minutou";case"mm":return c||e?f+(a(b)?"minuty":"minut"):f+"minutami";case"h":return c?"hodina":e?"hodinu":"hodinou";case"hh":return c||e?f+(a(b)?"hodiny":"hodin"):f+"hodinami";case"d":return c||e?"den":"dnem";case"dd":return c||e?f+(a(b)?"dny":"dní"):f+"dny";case"M":return c||e?"měsíc":"měsícem";case"MM":return c||e?f+(a(b)?"měsíce":"měsíců"):f+"měsíci";case"y":return c||e?"rok":"rokem";case"yy":return c||e?f+(a(b)?"roky":"let"):f+"lety"}}var d="leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec".split("_"),e="led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro".split("_"),f=(b.defineLocale||b.lang).call(b,"cs",{months:d,monthsShort:e,monthsParse:function(a,b){var c,d=[];for(c=0;12>c;c++)d[c]=new RegExp("^"+a[c]+"$|^"+b[c]+"$","i");return d}(d,e),shortMonthsParse:function(a){var b,c=[];for(b=0;12>b;b++)c[b]=new RegExp("^"+a[b]+"$","i");return c}(e),longMonthsParse:function(a){var b,c=[];for(b=0;12>b;b++)c[b]=new RegExp("^"+a[b]+"$","i");return c}(d),weekdays:"neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota".split("_"),weekdaysShort:"ne_po_út_st_čt_pá_so".split("_"),weekdaysMin:"ne_po_út_st_čt_pá_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd D. MMMM YYYY H:mm"},calendar:{sameDay:"[dnes v] LT",nextDay:"[zítra v] LT",nextWeek:function(){switch(this.day()){case 0:return"[v neděli v] LT";case 1:case 2:return"[v] dddd [v] LT";case 3:return"[ve středu v] LT";case 4:return"[ve čtvrtek v] LT";case 5:return"[v pátek v] LT";case 6:return"[v sobotu v] LT"}},lastDay:"[včera v] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulou neděli v] LT";case 1:case 2:return"[minulé] dddd [v] LT";case 3:return"[minulou středu v] LT";case 4:case 5:return"[minulý] dddd [v] LT";case 6:return"[minulou sobotu v] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"před %s",s:c,m:c,mm:c,h:c,hh:c,d:c,dd:c,M:c,MM:c,y:c,yy:c},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return f}(),a.fullCalendar.datepickerLang("cs","cs",{closeText:"Zavřít",prevText:"&#x3C;Dříve",nextText:"Později&#x3E;",currentText:"Nyní",monthNames:["leden","únor","březen","duben","květen","červen","červenec","srpen","září","říjen","listopad","prosinec"],monthNamesShort:["led","úno","bře","dub","kvě","čer","čvc","srp","zář","říj","lis","pro"],dayNames:["neděle","pondělí","úterý","středa","čtvrtek","pátek","sobota"],dayNamesShort:["ne","po","út","st","čt","pá","so"],dayNamesMin:["ne","po","út","st","čt","pá","so"],weekHeader:"Týd",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("cs",{buttonText:{month:"Měsíc",week:"Týden",day:"Den",list:"Agenda"},allDayText:"Celý den",eventLimitText:function(a){return"+další: "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"da",{months:"januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"søn_man_tir_ons_tor_fre_lør".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd [d.] D. MMMM YYYY HH:mm"},calendar:{sameDay:"[I dag kl.] LT",nextDay:"[I morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[I går kl.] LT",lastWeek:"[sidste] dddd [kl] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s siden",s:"få sekunder",m:"et minut",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dage",M:"en måned",MM:"%d måneder",y:"et år",yy:"%d år"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("da","da",{closeText:"Luk",prevText:"&#x3C;Forrige",nextText:"Næste&#x3E;",currentText:"Idag",monthNames:["Januar","Februar","Marts","April","Maj","Juni","Juli","August","September","Oktober","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec"],dayNames:["Søndag","Mandag","Tirsdag","Onsdag","Torsdag","Fredag","Lørdag"],dayNamesShort:["Søn","Man","Tir","Ons","Tor","Fre","Lør"],dayNamesMin:["Sø","Ma","Ti","On","To","Fr","Lø"],weekHeader:"Uge",dateFormat:"dd-mm-yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("da",{buttonText:{month:"Måned",week:"Uge",day:"Dag",list:"Agenda"},allDayText:"Hele dagen",eventLimitText:"flere"})}(),function(){!function(){"use strict";function a(a,b,c,d){var e={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[a+" Tage",a+" Tagen"],M:["ein Monat","einem Monat"],MM:[a+" Monate",a+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[a+" Jahre",a+" Jahren"]};return b?e[c][0]:e[c][1]}var c=(b.defineLocale||b.lang).call(b,"de-at",{months:"Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jän._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},calendar:{sameDay:"[heute um] LT [Uhr]",sameElse:"L",nextDay:"[morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",m:a,mm:"%d Minuten",h:a,hh:"%d Stunden",d:a,dd:a,M:a,MM:a,y:a,yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return c}(),a.fullCalendar.datepickerLang("de-at","de",{closeText:"Schließen",prevText:"&#x3C;Zurück",nextText:"Vor&#x3E;",currentText:"Heute",monthNames:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],monthNamesShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],dayNames:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],dayNamesShort:["So","Mo","Di","Mi","Do","Fr","Sa"],dayNamesMin:["So","Mo","Di","Mi","Do","Fr","Sa"],weekHeader:"KW",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("de-at",{buttonText:{month:"Monat",week:"Woche",day:"Tag",list:"Terminübersicht"},allDayText:"Ganztägig",eventLimitText:function(a){return"+ weitere "+a}})}(),function(){!function(){"use strict";function a(a,b,c,d){var e={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[a+" Tage",a+" Tagen"],M:["ein Monat","einem Monat"],MM:[a+" Monate",a+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[a+" Jahre",a+" Jahren"]};return b?e[c][0]:e[c][1]}var c=(b.defineLocale||b.lang).call(b,"de",{months:"Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},calendar:{sameDay:"[heute um] LT [Uhr]",sameElse:"L",nextDay:"[morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",m:a,mm:"%d Minuten",h:a,hh:"%d Stunden",d:a,dd:a,M:a,MM:a,y:a,yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return c}(),a.fullCalendar.datepickerLang("de","de",{closeText:"Schließen",prevText:"&#x3C;Zurück",nextText:"Vor&#x3E;",currentText:"Heute",monthNames:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],monthNamesShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],dayNames:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],dayNamesShort:["So","Mo","Di","Mi","Do","Fr","Sa"],dayNamesMin:["So","Mo","Di","Mi","Do","Fr","Sa"],weekHeader:"KW",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("de",{buttonText:{month:"Monat",week:"Woche",day:"Tag",list:"Terminübersicht"},allDayText:"Ganztägig",eventLimitText:function(a){return"+ weitere "+a}})}(),function(){!function(){"use strict";function a(a){return a instanceof Function||"[object Function]"===Object.prototype.toString.call(a)}var c=(b.defineLocale||b.lang).call(b,"el",{monthsNominativeEl:"Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος".split("_"),monthsGenitiveEl:"Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου".split("_"),months:function(a,b){return/D/.test(b.substring(0,b.indexOf("MMMM")))?this._monthsGenitiveEl[a.month()]:this._monthsNominativeEl[a.month()]},monthsShort:"Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ".split("_"),weekdays:"Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο".split("_"),weekdaysShort:"Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ".split("_"),weekdaysMin:"Κυ_Δε_Τρ_Τε_Πε_Πα_Σα".split("_"),meridiem:function(a,b,c){return a>11?c?"μμ":"ΜΜ":c?"πμ":"ΠΜ"},isPM:function(a){return"μ"===(a+"").toLowerCase()[0]},meridiemParse:/[ΠΜ]\.?Μ?\.?/i,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendarEl:{sameDay:"[Σήμερα {}] LT",nextDay:"[Αύριο {}] LT",nextWeek:"dddd [{}] LT",lastDay:"[Χθες {}] LT",lastWeek:function(){switch(this.day()){case 6:return"[το προηγούμενο] dddd [{}] LT";default:return"[την προηγούμενη] dddd [{}] LT"}},sameElse:"L"},calendar:function(b,c){var d=this._calendarEl[b],e=c&&c.hours();return a(d)&&(d=d.apply(c)),d.replace("{}",e%12===1?"στη":"στις")},relativeTime:{future:"σε %s",past:"%s πριν",s:"λίγα δευτερόλεπτα",m:"ένα λεπτό",mm:"%d λεπτά",h:"μία ώρα",hh:"%d ώρες",d:"μία μέρα",dd:"%d μέρες",M:"ένας μήνας",MM:"%d μήνες",y:"ένας χρόνος",yy:"%d χρόνια"},ordinalParse:/\d{1,2}η/,ordinal:"%dη",week:{dow:1,doy:4}});return c}(),a.fullCalendar.datepickerLang("el","el",{closeText:"Κλείσιμο",prevText:"Προηγούμενος",nextText:"Επόμενος",currentText:"Σήμερα",monthNames:["Ιανουάριος","Φεβρουάριος","Μάρτιος","Απρίλιος","Μάιος","Ιούνιος","Ιούλιος","Αύγουστος","Σεπτέμβριος","Οκτώβριος","Νοέμβριος","Δεκέμβριος"],monthNamesShort:["Ιαν","Φεβ","Μαρ","Απρ","Μαι","Ιουν","Ιουλ","Αυγ","Σεπ","Οκτ","Νοε","Δεκ"],dayNames:["Κυριακή","Δευτέρα","Τρίτη","Τετάρτη","Πέμπτη","Παρασκευή","Σάββατο"],dayNamesShort:["Κυρ","Δευ","Τρι","Τετ","Πεμ","Παρ","Σαβ"],dayNamesMin:["Κυ","Δε","Τρ","Τε","Πε","Πα","Σα"],weekHeader:"Εβδ",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("el",{buttonText:{month:"Μήνας",week:"Εβδομάδα",day:"Ημέρα",list:"Ατζέντα"},allDayText:"Ολοήμερο",eventLimitText:"περισσότερα"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"en-au",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sept_Oct_Nov_Dec".split("_"),monthsParse:[/^jan/i,/^feb/i,/^mar/i,/^apr/i,/^may/i,/^jun/i,/^jul/i,/^aug/i,/^sep/i,/^oct/i,/^nov/i,/^dec/i],longMonthsParse:[/^january$/i,/^february$/i,/^march$/i,/^april$/i,/^may$/i,/^june$/i,/^july$/i,/^august$/i,/^september$/i,/^october$/i,/^november$/i,/^december$/i],shortMonthsParse:[/^jan$/i,/^feb$/i,/^mar$/i,/^apr$/i,/^may$/i,/^jun$/i,/^jul$/i,/^aug/i,/^sept?$/i,/^oct$/i,/^nov$/i,/^dec$/i],weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("en-au","en-AU",{closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("en-au")}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"en-ca",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sept_Oct_Nov_Dec".split("_"),monthsParse:[/^jan/i,/^feb/i,/^mar/i,/^apr/i,/^may/i,/^jun/i,/^jul/i,/^aug/i,/^sep/i,/^oct/i,/^nov/i,/^dec/i],longMonthsParse:[/^january$/i,/^february$/i,/^march$/i,/^april$/i,/^may$/i,/^june$/i,/^july$/i,/^august$/i,/^september$/i,/^october$/i,/^november$/i,/^december$/i],shortMonthsParse:[/^jan$/i,/^feb$/i,/^mar$/i,/^apr$/i,/^may$/i,/^jun$/i,/^jul$/i,/^aug/i,/^sept?$/i,/^oct$/i,/^nov$/i,/^dec$/i],weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"YYYY-MM-DD",LL:"D MMMM, YYYY",LLL:"D MMMM, YYYY h:mm A",LLLL:"dddd, D MMMM, YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}});return a}(),a.fullCalendar.lang("en-ca")}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"en-gb",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sept_Oct_Nov_Dec".split("_"),monthsParse:[/^jan/i,/^feb/i,/^mar/i,/^apr/i,/^may/i,/^jun/i,/^jul/i,/^aug/i,/^sep/i,/^oct/i,/^nov/i,/^dec/i],longMonthsParse:[/^january$/i,/^february$/i,/^march$/i,/^april$/i,/^may$/i,/^june$/i,/^july$/i,/^august$/i,/^september$/i,/^october$/i,/^november$/i,/^december$/i],shortMonthsParse:[/^jan$/i,/^feb$/i,/^mar$/i,/^apr$/i,/^may$/i,/^jun$/i,/^jul$/i,/^aug/i,/^sept?$/i,/^oct$/i,/^nov$/i,/^dec$/i],weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("en-gb","en-GB",{closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("en-gb")}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"en-ie",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsParse:[/^jan/i,/^feb/i,/^mar/i,/^apr/i,/^may/i,/^jun/i,/^jul/i,/^aug/i,/^sep/i,/^oct/i,/^nov/i,/^dec/i],longMonthsParse:[/^january$/i,/^february$/i,/^march$/i,/^april$/i,/^may$/i,/^june$/i,/^july$/i,/^august$/i,/^september$/i,/^october$/i,/^november$/i,/^december$/i],shortMonthsParse:[/^jan$/i,/^feb$/i,/^mar$/i,/^apr$/i,/^may$/i,/^jun$/i,/^jul$/i,/^aug/i,/^sept?$/i,/^oct$/i,/^nov$/i,/^dec$/i],weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.lang("en-ie")}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"en-nz",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sept_Oct_Nov_Dec".split("_"),monthsParse:[/^jan/i,/^feb/i,/^mar/i,/^apr/i,/^may/i,/^jun/i,/^jul/i,/^aug/i,/^sep/i,/^oct/i,/^nov/i,/^dec/i],
-longMonthsParse:[/^january$/i,/^february$/i,/^march$/i,/^april$/i,/^may$/i,/^june$/i,/^july$/i,/^august$/i,/^september$/i,/^october$/i,/^november$/i,/^december$/i],shortMonthsParse:[/^jan$/i,/^feb$/i,/^mar$/i,/^apr$/i,/^may$/i,/^jun$/i,/^jul$/i,/^aug/i,/^sept?$/i,/^oct$/i,/^nov$/i,/^dec$/i],weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("en-nz","en-NZ",{closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("en-nz")}(),function(){!function(){"use strict";var a="ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),c="ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),d=(b.defineLocale||b.lang).call(b,"es",{months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:function(b,d){return/-MMM-/.test(d)?c[b.month()]:a[b.month()]},weekdays:"domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),weekdaysShort:"dom._lun._mar._mié._jue._vie._sáb.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_sá".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[mañana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}});return d}(),a.fullCalendar.datepickerLang("es","es",{closeText:"Cerrar",prevText:"&#x3C;Ant",nextText:"Sig&#x3E;",currentText:"Hoy",monthNames:["enero","febrero","marzo","abril","mayo","junio","julio","agosto","septiembre","octubre","noviembre","diciembre"],monthNamesShort:["ene","feb","mar","abr","may","jun","jul","ago","sep","oct","nov","dic"],dayNames:["domingo","lunes","martes","miércoles","jueves","viernes","sábado"],dayNamesShort:["dom","lun","mar","mié","jue","vie","sáb"],dayNamesMin:["D","L","M","X","J","V","S"],weekHeader:"Sm",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("es",{buttonText:{month:"Mes",week:"Semana",day:"Día",list:"Agenda"},allDayHtml:"Todo<br/>el día",eventLimitText:"más"})}(),function(){!function(){"use strict";var a={1:"۱",2:"۲",3:"۳",4:"۴",5:"۵",6:"۶",7:"۷",8:"۸",9:"۹",0:"۰"},c={"۱":"1","۲":"2","۳":"3","۴":"4","۵":"5","۶":"6","۷":"7","۸":"8","۹":"9","۰":"0"},d=(b.defineLocale||b.lang).call(b,"fa",{months:"ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),monthsShort:"ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),weekdays:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysShort:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysMin:"ی_د_س_چ_پ_ج_ش".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},meridiemParse:/قبل از ظهر|بعد از ظهر/,isPM:function(a){return/بعد از ظهر/.test(a)},meridiem:function(a,b,c){return 12>a?"قبل از ظهر":"بعد از ظهر"},calendar:{sameDay:"[امروز ساعت] LT",nextDay:"[فردا ساعت] LT",nextWeek:"dddd [ساعت] LT",lastDay:"[دیروز ساعت] LT",lastWeek:"dddd [پیش] [ساعت] LT",sameElse:"L"},relativeTime:{future:"در %s",past:"%s پیش",s:"چندین ثانیه",m:"یک دقیقه",mm:"%d دقیقه",h:"یک ساعت",hh:"%d ساعت",d:"یک روز",dd:"%d روز",M:"یک ماه",MM:"%d ماه",y:"یک سال",yy:"%d سال"},preparse:function(a){return a.replace(/[۰-۹]/g,function(a){return c[a]}).replace(/،/g,",")},postformat:function(b){return b.replace(/\d/g,function(b){return a[b]}).replace(/,/g,"،")},ordinalParse:/\d{1,2}م/,ordinal:"%dم",week:{dow:6,doy:12}});return d}(),a.fullCalendar.datepickerLang("fa","fa",{closeText:"بستن",prevText:"&#x3C;قبلی",nextText:"بعدی&#x3E;",currentText:"امروز",monthNames:["ژانویه","فوریه","مارس","آوریل","مه","ژوئن","ژوئیه","اوت","سپتامبر","اکتبر","نوامبر","دسامبر"],monthNamesShort:["1","2","3","4","5","6","7","8","9","10","11","12"],dayNames:["يکشنبه","دوشنبه","سه‌شنبه","چهارشنبه","پنجشنبه","جمعه","شنبه"],dayNamesShort:["ی","د","س","چ","پ","ج","ش"],dayNamesMin:["ی","د","س","چ","پ","ج","ش"],weekHeader:"هف",dateFormat:"yy/mm/dd",firstDay:6,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("fa",{buttonText:{month:"ماه",week:"هفته",day:"روز",list:"برنامه"},allDayText:"تمام روز",eventLimitText:function(a){return"بیش از "+a}})}(),function(){!function(){"use strict";function a(a,b,d,e){var f="";switch(d){case"s":return e?"muutaman sekunnin":"muutama sekunti";case"m":return e?"minuutin":"minuutti";case"mm":f=e?"minuutin":"minuuttia";break;case"h":return e?"tunnin":"tunti";case"hh":f=e?"tunnin":"tuntia";break;case"d":return e?"päivän":"päivä";case"dd":f=e?"päivän":"päivää";break;case"M":return e?"kuukauden":"kuukausi";case"MM":f=e?"kuukauden":"kuukautta";break;case"y":return e?"vuoden":"vuosi";case"yy":f=e?"vuoden":"vuotta"}return f=c(a,e)+" "+f}function c(a,b){return 10>a?b?e[a]:d[a]:a}var d="nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän".split(" "),e=["nolla","yhden","kahden","kolmen","neljän","viiden","kuuden",d[7],d[8],d[9]],f=(b.defineLocale||b.lang).call(b,"fi",{months:"tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu".split("_"),monthsShort:"tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu".split("_"),weekdays:"sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai".split("_"),weekdaysShort:"su_ma_ti_ke_to_pe_la".split("_"),weekdaysMin:"su_ma_ti_ke_to_pe_la".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD.MM.YYYY",LL:"Do MMMM[ta] YYYY",LLL:"Do MMMM[ta] YYYY, [klo] HH.mm",LLLL:"dddd, Do MMMM[ta] YYYY, [klo] HH.mm",l:"D.M.YYYY",ll:"Do MMM YYYY",lll:"Do MMM YYYY, [klo] HH.mm",llll:"ddd, Do MMM YYYY, [klo] HH.mm"},calendar:{sameDay:"[tänään] [klo] LT",nextDay:"[huomenna] [klo] LT",nextWeek:"dddd [klo] LT",lastDay:"[eilen] [klo] LT",lastWeek:"[viime] dddd[na] [klo] LT",sameElse:"L"},relativeTime:{future:"%s päästä",past:"%s sitten",s:a,m:a,mm:a,h:a,hh:a,d:a,dd:a,M:a,MM:a,y:a,yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return f}(),a.fullCalendar.datepickerLang("fi","fi",{closeText:"Sulje",prevText:"&#xAB;Edellinen",nextText:"Seuraava&#xBB;",currentText:"Tänään",monthNames:["Tammikuu","Helmikuu","Maaliskuu","Huhtikuu","Toukokuu","Kesäkuu","Heinäkuu","Elokuu","Syyskuu","Lokakuu","Marraskuu","Joulukuu"],monthNamesShort:["Tammi","Helmi","Maalis","Huhti","Touko","Kesä","Heinä","Elo","Syys","Loka","Marras","Joulu"],dayNamesShort:["Su","Ma","Ti","Ke","To","Pe","La"],dayNames:["Sunnuntai","Maanantai","Tiistai","Keskiviikko","Torstai","Perjantai","Lauantai"],dayNamesMin:["Su","Ma","Ti","Ke","To","Pe","La"],weekHeader:"Vk",dateFormat:"d.m.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("fi",{buttonText:{month:"Kuukausi",week:"Viikko",day:"Päivä",list:"Tapahtumat"},allDayText:"Koko päivä",eventLimitText:"lisää"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"fr-ca",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinalParse:/\d{1,2}(er|e)/,ordinal:function(a){return a+(1===a?"er":"e")}});return a}(),a.fullCalendar.datepickerLang("fr-ca","fr-CA",{closeText:"Fermer",prevText:"Précédent",nextText:"Suivant",currentText:"Aujourd'hui",monthNames:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],monthNamesShort:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","déc."],dayNames:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],dayNamesShort:["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],dayNamesMin:["D","L","M","M","J","V","S"],weekHeader:"Sem.",dateFormat:"yy-mm-dd",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("fr-ca",{buttonText:{month:"Mois",week:"Semaine",day:"Jour",list:"Mon planning"},allDayHtml:"Toute la<br/>journée",eventLimitText:"en plus"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"fr-ch",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinalParse:/\d{1,2}(er|e)/,ordinal:function(a){return a+(1===a?"er":"e")},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("fr-ch","fr-CH",{closeText:"Fermer",prevText:"&#x3C;Préc",nextText:"Suiv&#x3E;",currentText:"Courant",monthNames:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],monthNamesShort:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","déc."],dayNames:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],dayNamesShort:["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],dayNamesMin:["D","L","M","M","J","V","S"],weekHeader:"Sm",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("fr-ch",{buttonText:{month:"Mois",week:"Semaine",day:"Jour",list:"Mon planning"},allDayHtml:"Toute la<br/>journée",eventLimitText:"en plus"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"fr",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinalParse:/\d{1,2}(er|)/,ordinal:function(a){return a+(1===a?"er":"")},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("fr","fr",{closeText:"Fermer",prevText:"Précédent",nextText:"Suivant",currentText:"Aujourd'hui",monthNames:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],monthNamesShort:["janv.","févr.","mars","avr.","mai","juin","juil.","août","sept.","oct.","nov.","déc."],dayNames:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],dayNamesShort:["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],dayNamesMin:["D","L","M","M","J","V","S"],weekHeader:"Sem.",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("fr",{buttonText:{month:"Mois",week:"Semaine",day:"Jour",list:"Mon planning"},allDayHtml:"Toute la<br/>journée",eventLimitText:"en plus"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"he",{months:"ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר".split("_"),monthsShort:"ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳".split("_"),weekdays:"ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת".split("_"),weekdaysShort:"א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳".split("_"),weekdaysMin:"א_ב_ג_ד_ה_ו_ש".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [ב]MMMM YYYY",LLL:"D [ב]MMMM YYYY HH:mm",LLLL:"dddd, D [ב]MMMM YYYY HH:mm",l:"D/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"},calendar:{sameDay:"[היום ב־]LT",nextDay:"[מחר ב־]LT",nextWeek:"dddd [בשעה] LT",lastDay:"[אתמול ב־]LT",lastWeek:"[ביום] dddd [האחרון בשעה] LT",sameElse:"L"},relativeTime:{future:"בעוד %s",past:"לפני %s",s:"מספר שניות",m:"דקה",mm:"%d דקות",h:"שעה",hh:function(a){return 2===a?"שעתיים":a+" שעות"},d:"יום",dd:function(a){return 2===a?"יומיים":a+" ימים"},M:"חודש",MM:function(a){return 2===a?"חודשיים":a+" חודשים"},y:"שנה",yy:function(a){return 2===a?"שנתיים":a%10===0&&10!==a?a+" שנה":a+" שנים"}}});return a}(),a.fullCalendar.datepickerLang("he","he",{closeText:"סגור",prevText:"&#x3C;הקודם",nextText:"הבא&#x3E;",currentText:"היום",monthNames:["ינואר","פברואר","מרץ","אפריל","מאי","יוני","יולי","אוגוסט","ספטמבר","אוקטובר","נובמבר","דצמבר"],monthNamesShort:["ינו","פבר","מרץ","אפר","מאי","יוני","יולי","אוג","ספט","אוק","נוב","דצמ"],dayNames:["ראשון","שני","שלישי","רביעי","חמישי","שישי","שבת"],dayNamesShort:["א'","ב'","ג'","ד'","ה'","ו'","שבת"],dayNamesMin:["א'","ב'","ג'","ד'","ה'","ו'","שבת"],weekHeader:"Wk",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("he",{defaultButtonText:{month:"חודש",week:"שבוע",day:"יום",list:"סדר יום"},weekNumberTitle:"שבוע",allDayText:"כל היום",eventLimitText:"אחר"})}(),function(){!function(){"use strict";var a={1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"},c={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"},d=(b.defineLocale||b.lang).call(b,"hi",{months:"जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर".split("_"),monthsShort:"जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.".split("_"),weekdays:"रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार".split("_"),weekdaysShort:"रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि".split("_"),weekdaysMin:"र_सो_मं_बु_गु_शु_श".split("_"),longDateFormat:{LT:"A h:mm बजे",LTS:"A h:mm:ss बजे",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm बजे",LLLL:"dddd, D MMMM YYYY, A h:mm बजे"},calendar:{sameDay:"[आज] LT",nextDay:"[कल] LT",nextWeek:"dddd, LT",lastDay:"[कल] LT",lastWeek:"[पिछले] dddd, LT",sameElse:"L"},relativeTime:{future:"%s में",past:"%s पहले",s:"कुछ ही क्षण",m:"एक मिनट",mm:"%d मिनट",h:"एक घंटा",hh:"%d घंटे",d:"एक दिन",dd:"%d दिन",M:"एक महीने",MM:"%d महीने",y:"एक वर्ष",yy:"%d वर्ष"},preparse:function(a){return a.replace(/[१२३४५६७८९०]/g,function(a){return c[a]})},postformat:function(b){return b.replace(/\d/g,function(b){return a[b]})},meridiemParse:/रात|सुबह|दोपहर|शाम/,meridiemHour:function(a,b){return 12===a&&(a=0),"रात"===b?4>a?a:a+12:"सुबह"===b?a:"दोपहर"===b?a>=10?a:a+12:"शाम"===b?a+12:void 0},meridiem:function(a,b,c){return 4>a?"रात":10>a?"सुबह":17>a?"दोपहर":20>a?"शाम":"रात"},week:{dow:0,doy:6}});return d}(),a.fullCalendar.datepickerLang("hi","hi",{closeText:"बंद",prevText:"पिछला",nextText:"अगला",currentText:"आज",monthNames:["जनवरी ","फरवरी","मार्च","अप्रेल","मई","जून","जूलाई","अगस्त ","सितम्बर","अक्टूबर","नवम्बर","दिसम्बर"],monthNamesShort:["जन","फर","मार्च","अप्रेल","मई","जून","जूलाई","अग","सित","अक्ट","नव","दि"],dayNames:["रविवार","सोमवार","मंगलवार","बुधवार","गुरुवार","शुक्रवार","शनिवार"],dayNamesShort:["रवि","सोम","मंगल","बुध","गुरु","शुक्र","शनि"],dayNamesMin:["रवि","सोम","मंगल","बुध","गुरु","शुक्र","शनि"],weekHeader:"हफ्ता",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("hi",{buttonText:{month:"महीना",week:"सप्ताह",day:"दिन",list:"कार्यसूची"},allDayText:"सभी दिन",eventLimitText:function(a){return"+अधिक "+a}})}(),function(){!function(){"use strict";function a(a,b,c){var d=a+" ";switch(c){case"m":return b?"jedna minuta":"jedne minute";case"mm":return d+=1===a?"minuta":2===a||3===a||4===a?"minute":"minuta";case"h":return b?"jedan sat":"jednog sata";case"hh":return d+=1===a?"sat":2===a||3===a||4===a?"sata":"sati";case"dd":return d+=1===a?"dan":"dana";case"MM":return d+=1===a?"mjesec":2===a||3===a||4===a?"mjeseca":"mjeseci";case"yy":return d+=1===a?"godina":2===a||3===a||4===a?"godine":"godina"}}var c=(b.defineLocale||b.lang).call(b,"hr",{months:{format:"siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca".split("_"),standalone:"siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac".split("_")},monthsShort:"sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.".split("_"),weekdays:"nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._čet._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_če_pe_su".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[jučer u] LT",lastWeek:function(){switch(this.day()){case 0:case 3:return"[prošlu] dddd [u] LT";case 6:return"[prošle] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[prošli] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",m:a,mm:a,h:a,hh:a,d:"dan",dd:a,M:"mjesec",MM:a,y:"godinu",yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("hr","hr",{closeText:"Zatvori",prevText:"&#x3C;",nextText:"&#x3E;",currentText:"Danas",monthNames:["Siječanj","Veljača","Ožujak","Travanj","Svibanj","Lipanj","Srpanj","Kolovoz","Rujan","Listopad","Studeni","Prosinac"],monthNamesShort:["Sij","Velj","Ožu","Tra","Svi","Lip","Srp","Kol","Ruj","Lis","Stu","Pro"],dayNames:["Nedjelja","Ponedjeljak","Utorak","Srijeda","Četvrtak","Petak","Subota"],dayNamesShort:["Ned","Pon","Uto","Sri","Čet","Pet","Sub"],dayNamesMin:["Ne","Po","Ut","Sr","Če","Pe","Su"],weekHeader:"Tje",dateFormat:"dd.mm.yy.",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("hr",{buttonText:{month:"Mjesec",week:"Tjedan",day:"Dan",list:"Raspored"},allDayText:"Cijeli dan",eventLimitText:function(a){return"+ još "+a}})}(),function(){!function(){"use strict";function a(a,b,c,d){var e=a;switch(c){case"s":return d||b?"néhány másodperc":"néhány másodperce";case"m":return"egy"+(d||b?" perc":" perce");case"mm":return e+(d||b?" perc":" perce");case"h":return"egy"+(d||b?" óra":" órája");case"hh":return e+(d||b?" óra":" órája");case"d":return"egy"+(d||b?" nap":" napja");case"dd":return e+(d||b?" nap":" napja");case"M":return"egy"+(d||b?" hónap":" hónapja");case"MM":return e+(d||b?" hónap":" hónapja");case"y":return"egy"+(d||b?" év":" éve");case"yy":return e+(d||b?" év":" éve")}return""}function c(a){return(a?"":"[múlt] ")+"["+d[this.day()]+"] LT[-kor]"}var d="vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton".split(" "),e=(b.defineLocale||b.lang).call(b,"hu",{months:"január_február_március_április_május_június_július_augusztus_szeptember_október_november_december".split("_"),monthsShort:"jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec".split("_"),weekdays:"vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat".split("_"),weekdaysShort:"vas_hét_kedd_sze_csüt_pén_szo".split("_"),weekdaysMin:"v_h_k_sze_cs_p_szo".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"YYYY.MM.DD.",LL:"YYYY. MMMM D.",LLL:"YYYY. MMMM D. H:mm",LLLL:"YYYY. MMMM D., dddd H:mm"},meridiemParse:/de|du/i,isPM:function(a){return"u"===a.charAt(1).toLowerCase()},meridiem:function(a,b,c){return 12>a?c===!0?"de":"DE":c===!0?"du":"DU"},calendar:{sameDay:"[ma] LT[-kor]",nextDay:"[holnap] LT[-kor]",nextWeek:function(){return c.call(this,!0)},lastDay:"[tegnap] LT[-kor]",lastWeek:function(){return c.call(this,!1)},sameElse:"L"},relativeTime:{future:"%s múlva",past:"%s",s:a,m:a,mm:a,h:a,hh:a,d:a,dd:a,M:a,MM:a,y:a,yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return e}(),a.fullCalendar.datepickerLang("hu","hu",{closeText:"bezár",prevText:"vissza",nextText:"előre",currentText:"ma",monthNames:["Január","Február","Március","Április","Május","Június","Július","Augusztus","Szeptember","Október","November","December"],monthNamesShort:["Jan","Feb","Már","Ápr","Máj","Jún","Júl","Aug","Szep","Okt","Nov","Dec"],dayNames:["Vasárnap","Hétfő","Kedd","Szerda","Csütörtök","Péntek","Szombat"],dayNamesShort:["Vas","Hét","Ked","Sze","Csü","Pén","Szo"],dayNamesMin:["V","H","K","Sze","Cs","P","Szo"],weekHeader:"Hét",dateFormat:"yy.mm.dd.",firstDay:1,isRTL:!1,showMonthAfterYear:!0,yearSuffix:""}),a.fullCalendar.lang("hu",{buttonText:{month:"Hónap",week:"Hét",day:"Nap",list:"Napló"},allDayText:"Egész nap",eventLimitText:"további"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"id",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des".split("_"),weekdays:"Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu".split("_"),weekdaysShort:"Min_Sen_Sel_Rab_Kam_Jum_Sab".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},meridiemParse:/pagi|siang|sore|malam/,meridiemHour:function(a,b){return 12===a&&(a=0),"pagi"===b?a:"siang"===b?a>=11?a:a+12:"sore"===b||"malam"===b?a+12:void 0},meridiem:function(a,b,c){return 11>a?"pagi":15>a?"siang":19>a?"sore":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Besok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kemarin pukul] LT",lastWeek:"dddd [lalu pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lalu",s:"beberapa detik",m:"semenit",mm:"%d menit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}});return a}(),a.fullCalendar.datepickerLang("id","id",{closeText:"Tutup",prevText:"&#x3C;mundur",nextText:"maju&#x3E;",currentText:"hari ini",monthNames:["Januari","Februari","Maret","April","Mei","Juni","Juli","Agustus","September","Oktober","Nopember","Desember"],monthNamesShort:["Jan","Feb","Mar","Apr","Mei","Jun","Jul","Agus","Sep","Okt","Nop","Des"],dayNames:["Minggu","Senin","Selasa","Rabu","Kamis","Jumat","Sabtu"],dayNamesShort:["Min","Sen","Sel","Rab","kam","Jum","Sab"],dayNamesMin:["Mg","Sn","Sl","Rb","Km","jm","Sb"],weekHeader:"Mg",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("id",{buttonText:{month:"Bulan",week:"Minggu",day:"Hari",list:"Agenda"},allDayHtml:"Sehari<br/>penuh",eventLimitText:"lebih"})}(),function(){!function(){"use strict";function a(a){return a%100===11?!0:a%10===1?!1:!0}function c(b,c,d,e){var f=b+" ";switch(d){case"s":return c||e?"nokkrar sekúndur":"nokkrum sekúndum";case"m":return c?"mínúta":"mínútu";case"mm":return a(b)?f+(c||e?"mínútur":"mínútum"):c?f+"mínúta":f+"mínútu";case"hh":return a(b)?f+(c||e?"klukkustundir":"klukkustundum"):f+"klukkustund";case"d":return c?"dagur":e?"dag":"degi";case"dd":return a(b)?c?f+"dagar":f+(e?"daga":"dögum"):c?f+"dagur":f+(e?"dag":"degi");case"M":return c?"mánuður":e?"mánuð":"mánuði";case"MM":return a(b)?c?f+"mánuðir":f+(e?"mánuði":"mánuðum"):c?f+"mánuður":f+(e?"mánuð":"mánuði");case"y":return c||e?"ár":"ári";case"yy":return a(b)?f+(c||e?"ár":"árum"):f+(c||e?"ár":"ári")}}var d=(b.defineLocale||b.lang).call(b,"is",{months:"janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember".split("_"),monthsShort:"jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des".split("_"),weekdays:"sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur".split("_"),weekdaysShort:"sun_mán_þri_mið_fim_fös_lau".split("_"),weekdaysMin:"Su_Má_Þr_Mi_Fi_Fö_La".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] H:mm",LLLL:"dddd, D. MMMM YYYY [kl.] H:mm"},calendar:{sameDay:"[í dag kl.] LT",nextDay:"[á morgun kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[í gær kl.] LT",lastWeek:"[síðasta] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"eftir %s",past:"fyrir %s síðan",s:c,m:c,mm:c,h:"klukkustund",hh:c,d:c,dd:c,M:c,MM:c,y:c,yy:c},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return d}(),a.fullCalendar.datepickerLang("is","is",{closeText:"Loka",prevText:"&#x3C; Fyrri",nextText:"Næsti &#x3E;",currentText:"Í dag",monthNames:["Janúar","Febrúar","Mars","Apríl","Maí","Júní","Júlí","Ágúst","September","Október","Nóvember","Desember"],monthNamesShort:["Jan","Feb","Mar","Apr","Maí","Jún","Júl","Ágú","Sep","Okt","Nóv","Des"],dayNames:["Sunnudagur","Mánudagur","Þriðjudagur","Miðvikudagur","Fimmtudagur","Föstudagur","Laugardagur"],dayNamesShort:["Sun","Mán","Þri","Mið","Fim","Fös","Lau"],dayNamesMin:["Su","Má","Þr","Mi","Fi","Fö","La"],weekHeader:"Vika",dateFormat:"dd.mm.yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("is",{buttonText:{month:"Mánuður",week:"Vika",day:"Dagur",list:"Dagskrá"},allDayHtml:"Allan<br/>daginn",eventLimitText:"meira"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"it",{months:"gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),monthsShort:"gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),weekdays:"Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato".split("_"),weekdaysShort:"Dom_Lun_Mar_Mer_Gio_Ven_Sab".split("_"),weekdaysMin:"Do_Lu_Ma_Me_Gi_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Oggi alle] LT",nextDay:"[Domani alle] LT",nextWeek:"dddd [alle] LT",lastDay:"[Ieri alle] LT",lastWeek:function(){switch(this.day()){case 0:return"[la scorsa] dddd [alle] LT";default:return"[lo scorso] dddd [alle] LT"}},sameElse:"L"},relativeTime:{future:function(a){return(/^[0-9].+$/.test(a)?"tra":"in")+" "+a},past:"%s fa",s:"alcuni secondi",m:"un minuto",mm:"%d minuti",h:"un'ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("it","it",{closeText:"Chiudi",prevText:"&#x3C;Prec",nextText:"Succ&#x3E;",currentText:"Oggi",monthNames:["Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre"],monthNamesShort:["Gen","Feb","Mar","Apr","Mag","Giu","Lug","Ago","Set","Ott","Nov","Dic"],dayNames:["Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"],dayNamesShort:["Dom","Lun","Mar","Mer","Gio","Ven","Sab"],dayNamesMin:["Do","Lu","Ma","Me","Gi","Ve","Sa"],weekHeader:"Sm",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("it",{buttonText:{month:"Mese",week:"Settimana",day:"Giorno",list:"Agenda"},allDayHtml:"Tutto il<br/>giorno",eventLimitText:function(a){return"+altri "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"ja",{months:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日".split("_"),weekdaysShort:"日_月_火_水_木_金_土".split("_"),weekdaysMin:"日_月_火_水_木_金_土".split("_"),longDateFormat:{LT:"Ah時m分",LTS:"Ah時m分s秒",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日Ah時m分",LLLL:"YYYY年M月D日Ah時m分 dddd"},meridiemParse:/午前|午後/i,isPM:function(a){return"午後"===a},meridiem:function(a,b,c){return 12>a?"午前":"午後"},calendar:{sameDay:"[今日] LT",nextDay:"[明日] LT",nextWeek:"[来週]dddd LT",lastDay:"[昨日] LT",lastWeek:"[前週]dddd LT",sameElse:"L"},relativeTime:{future:"%s後",past:"%s前",s:"数秒",m:"1分",mm:"%d分",h:"1時間",hh:"%d時間",d:"1日",dd:"%d日",M:"1ヶ月",MM:"%dヶ月",y:"1年",yy:"%d年"}});return a}(),a.fullCalendar.datepickerLang("ja","ja",{closeText:"閉じる",prevText:"&#x3C;前",nextText:"次&#x3E;",currentText:"今日",monthNames:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],monthNamesShort:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],dayNames:["日曜日","月曜日","火曜日","水曜日","木曜日","金曜日","土曜日"],dayNamesShort:["日","月","火","水","木","金","土"],dayNamesMin:["日","月","火","水","木","金","土"],weekHeader:"週",dateFormat:"yy/mm/dd",firstDay:0,isRTL:!1,showMonthAfterYear:!0,yearSuffix:"年"}),a.fullCalendar.lang("ja",{buttonText:{month:"月",week:"週",day:"日",list:"予定リスト"},allDayText:"終日",eventLimitText:function(a){return"他 "+a+" 件"}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"ko",{months:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),monthsShort:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),weekdays:"일요일_월요일_화요일_수요일_목요일_금요일_토요일".split("_"),weekdaysShort:"일_월_화_수_목_금_토".split("_"),weekdaysMin:"일_월_화_수_목_금_토".split("_"),longDateFormat:{LT:"A h시 m분",LTS:"A h시 m분 s초",L:"YYYY.MM.DD",LL:"YYYY년 MMMM D일",LLL:"YYYY년 MMMM D일 A h시 m분",LLLL:"YYYY년 MMMM D일 dddd A h시 m분"},calendar:{sameDay:"오늘 LT",nextDay:"내일 LT",nextWeek:"dddd LT",lastDay:"어제 LT",lastWeek:"지난주 dddd LT",
-sameElse:"L"},relativeTime:{future:"%s 후",past:"%s 전",s:"몇초",ss:"%d초",m:"일분",mm:"%d분",h:"한시간",hh:"%d시간",d:"하루",dd:"%d일",M:"한달",MM:"%d달",y:"일년",yy:"%d년"},ordinalParse:/\d{1,2}일/,ordinal:"%d일",meridiemParse:/오전|오후/,isPM:function(a){return"오후"===a},meridiem:function(a,b,c){return 12>a?"오전":"오후"}});return a}(),a.fullCalendar.datepickerLang("ko","ko",{closeText:"닫기",prevText:"이전달",nextText:"다음달",currentText:"오늘",monthNames:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],monthNamesShort:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],dayNames:["일요일","월요일","화요일","수요일","목요일","금요일","토요일"],dayNamesShort:["일","월","화","수","목","금","토"],dayNamesMin:["일","월","화","수","목","금","토"],weekHeader:"Wk",dateFormat:"yy-mm-dd",firstDay:0,isRTL:!1,showMonthAfterYear:!0,yearSuffix:"년"}),a.fullCalendar.lang("ko",{buttonText:{month:"월",week:"주",day:"일",list:"일정목록"},allDayText:"종일",eventLimitText:"개"})}(),function(){!function(){"use strict";function a(a,b,c,d){return b?"kelios sekundės":d?"kelių sekundžių":"kelias sekundes"}function c(a,b,c,d){return b?e(c)[0]:d?e(c)[1]:e(c)[2]}function d(a){return a%10===0||a>10&&20>a}function e(a){return g[a].split("_")}function f(a,b,f,g){var h=a+" ";return 1===a?h+c(a,b,f[0],g):b?h+(d(a)?e(f)[1]:e(f)[0]):g?h+e(f)[1]:h+(d(a)?e(f)[1]:e(f)[2])}var g={m:"minutė_minutės_minutę",mm:"minutės_minučių_minutes",h:"valanda_valandos_valandą",hh:"valandos_valandų_valandas",d:"diena_dienos_dieną",dd:"dienos_dienų_dienas",M:"mėnuo_mėnesio_mėnesį",MM:"mėnesiai_mėnesių_mėnesius",y:"metai_metų_metus",yy:"metai_metų_metus"},h=(b.defineLocale||b.lang).call(b,"lt",{months:{format:"sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio".split("_"),standalone:"sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis".split("_")},monthsShort:"sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd".split("_"),weekdays:{format:"sekmadienį_pirmadienį_antradienį_trečiadienį_ketvirtadienį_penktadienį_šeštadienį".split("_"),standalone:"sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis".split("_"),isFormat:/dddd HH:mm/},weekdaysShort:"Sek_Pir_Ant_Tre_Ket_Pen_Šeš".split("_"),weekdaysMin:"S_P_A_T_K_Pn_Š".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY [m.] MMMM D [d.]",LLL:"YYYY [m.] MMMM D [d.], HH:mm [val.]",LLLL:"YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]",l:"YYYY-MM-DD",ll:"YYYY [m.] MMMM D [d.]",lll:"YYYY [m.] MMMM D [d.], HH:mm [val.]",llll:"YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]"},calendar:{sameDay:"[Šiandien] LT",nextDay:"[Rytoj] LT",nextWeek:"dddd LT",lastDay:"[Vakar] LT",lastWeek:"[Praėjusį] dddd LT",sameElse:"L"},relativeTime:{future:"po %s",past:"prieš %s",s:a,m:c,mm:f,h:c,hh:f,d:c,dd:f,M:c,MM:f,y:c,yy:f},ordinalParse:/\d{1,2}-oji/,ordinal:function(a){return a+"-oji"},week:{dow:1,doy:4}});return h}(),a.fullCalendar.datepickerLang("lt","lt",{closeText:"Uždaryti",prevText:"&#x3C;Atgal",nextText:"Pirmyn&#x3E;",currentText:"Šiandien",monthNames:["Sausis","Vasaris","Kovas","Balandis","Gegužė","Birželis","Liepa","Rugpjūtis","Rugsėjis","Spalis","Lapkritis","Gruodis"],monthNamesShort:["Sau","Vas","Kov","Bal","Geg","Bir","Lie","Rugp","Rugs","Spa","Lap","Gru"],dayNames:["sekmadienis","pirmadienis","antradienis","trečiadienis","ketvirtadienis","penktadienis","šeštadienis"],dayNamesShort:["sek","pir","ant","tre","ket","pen","šeš"],dayNamesMin:["Se","Pr","An","Tr","Ke","Pe","Še"],weekHeader:"SAV",dateFormat:"yy-mm-dd",firstDay:1,isRTL:!1,showMonthAfterYear:!0,yearSuffix:""}),a.fullCalendar.lang("lt",{buttonText:{month:"Mėnuo",week:"Savaitė",day:"Diena",list:"Darbotvarkė"},allDayText:"Visą dieną",eventLimitText:"daugiau"})}(),function(){!function(){"use strict";function a(a,b,c){return c?b%10===1&&11!==b?a[2]:a[3]:b%10===1&&11!==b?a[0]:a[1]}function c(b,c,d){return b+" "+a(f[d],b,c)}function d(b,c,d){return a(f[d],b,c)}function e(a,b){return b?"dažas sekundes":"dažām sekundēm"}var f={m:"minūtes_minūtēm_minūte_minūtes".split("_"),mm:"minūtes_minūtēm_minūte_minūtes".split("_"),h:"stundas_stundām_stunda_stundas".split("_"),hh:"stundas_stundām_stunda_stundas".split("_"),d:"dienas_dienām_diena_dienas".split("_"),dd:"dienas_dienām_diena_dienas".split("_"),M:"mēneša_mēnešiem_mēnesis_mēneši".split("_"),MM:"mēneša_mēnešiem_mēnesis_mēneši".split("_"),y:"gada_gadiem_gads_gadi".split("_"),yy:"gada_gadiem_gads_gadi".split("_")},g=(b.defineLocale||b.lang).call(b,"lv",{months:"janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris".split("_"),monthsShort:"jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec".split("_"),weekdays:"svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena".split("_"),weekdaysShort:"Sv_P_O_T_C_Pk_S".split("_"),weekdaysMin:"Sv_P_O_T_C_Pk_S".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY.",LL:"YYYY. [gada] D. MMMM",LLL:"YYYY. [gada] D. MMMM, HH:mm",LLLL:"YYYY. [gada] D. MMMM, dddd, HH:mm"},calendar:{sameDay:"[Šodien pulksten] LT",nextDay:"[Rīt pulksten] LT",nextWeek:"dddd [pulksten] LT",lastDay:"[Vakar pulksten] LT",lastWeek:"[Pagājušā] dddd [pulksten] LT",sameElse:"L"},relativeTime:{future:"pēc %s",past:"pirms %s",s:e,m:d,mm:c,h:d,hh:c,d:d,dd:c,M:d,MM:c,y:d,yy:c},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return g}(),a.fullCalendar.datepickerLang("lv","lv",{closeText:"Aizvērt",prevText:"Iepr.",nextText:"Nāk.",currentText:"Šodien",monthNames:["Janvāris","Februāris","Marts","Aprīlis","Maijs","Jūnijs","Jūlijs","Augusts","Septembris","Oktobris","Novembris","Decembris"],monthNamesShort:["Jan","Feb","Mar","Apr","Mai","Jūn","Jūl","Aug","Sep","Okt","Nov","Dec"],dayNames:["svētdiena","pirmdiena","otrdiena","trešdiena","ceturtdiena","piektdiena","sestdiena"],dayNamesShort:["svt","prm","otr","tre","ctr","pkt","sst"],dayNamesMin:["Sv","Pr","Ot","Tr","Ct","Pk","Ss"],weekHeader:"Ned.",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("lv",{buttonText:{month:"Mēnesis",week:"Nedēļa",day:"Diena",list:"Dienas kārtība"},allDayText:"Visu dienu",eventLimitText:function(a){return"+vēl "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"nb",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.".split("_"),weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"sø._ma._ti._on._to._fr._lø.".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] HH:mm",LLLL:"dddd D. MMMM YYYY [kl.] HH:mm"},calendar:{sameDay:"[i dag kl.] LT",nextDay:"[i morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[i går kl.] LT",lastWeek:"[forrige] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"for %s siden",s:"noen sekunder",m:"ett minutt",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dager",M:"en måned",MM:"%d måneder",y:"ett år",yy:"%d år"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("nb","nb",{closeText:"Lukk",prevText:"&#xAB;Forrige",nextText:"Neste&#xBB;",currentText:"I dag",monthNames:["januar","februar","mars","april","mai","juni","juli","august","september","oktober","november","desember"],monthNamesShort:["jan","feb","mar","apr","mai","jun","jul","aug","sep","okt","nov","des"],dayNamesShort:["søn","man","tir","ons","tor","fre","lør"],dayNames:["søndag","mandag","tirsdag","onsdag","torsdag","fredag","lørdag"],dayNamesMin:["sø","ma","ti","on","to","fr","lø"],weekHeader:"Uke",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("nb",{buttonText:{month:"Måned",week:"Uke",day:"Dag",list:"Agenda"},allDayText:"Hele dagen",eventLimitText:"til"})}(),function(){!function(){"use strict";var a="jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"),c="jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),d=(b.defineLocale||b.lang).call(b,"nl",{months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:function(b,d){return/-MMM-/.test(d)?c[b.month()]:a[b.month()]},weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"Zo_Ma_Di_Wo_Do_Vr_Za".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[vandaag om] LT",nextDay:"[morgen om] LT",nextWeek:"dddd [om] LT",lastDay:"[gisteren om] LT",lastWeek:"[afgelopen] dddd [om] LT",sameElse:"L"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",m:"één minuut",mm:"%d minuten",h:"één uur",hh:"%d uur",d:"één dag",dd:"%d dagen",M:"één maand",MM:"%d maanden",y:"één jaar",yy:"%d jaar"},ordinalParse:/\d{1,2}(ste|de)/,ordinal:function(a){return a+(1===a||8===a||a>=20?"ste":"de")},week:{dow:1,doy:4}});return d}(),a.fullCalendar.datepickerLang("nl","nl",{closeText:"Sluiten",prevText:"←",nextText:"→",currentText:"Vandaag",monthNames:["januari","februari","maart","april","mei","juni","juli","augustus","september","oktober","november","december"],monthNamesShort:["jan","feb","mrt","apr","mei","jun","jul","aug","sep","okt","nov","dec"],dayNames:["zondag","maandag","dinsdag","woensdag","donderdag","vrijdag","zaterdag"],dayNamesShort:["zon","maa","din","woe","don","vri","zat"],dayNamesMin:["zo","ma","di","wo","do","vr","za"],weekHeader:"Wk",dateFormat:"dd-mm-yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("nl",{buttonText:{month:"Maand",week:"Week",day:"Dag",list:"Agenda"},allDayText:"Hele dag",eventLimitText:"extra"})}(),function(){!function(){"use strict";function a(a){return 5>a%10&&a%10>1&&~~(a/10)%10!==1}function c(b,c,d){var e=b+" ";switch(d){case"m":return c?"minuta":"minutę";case"mm":return e+(a(b)?"minuty":"minut");case"h":return c?"godzina":"godzinę";case"hh":return e+(a(b)?"godziny":"godzin");case"MM":return e+(a(b)?"miesiące":"miesięcy");case"yy":return e+(a(b)?"lata":"lat")}}var d="styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień".split("_"),e="stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia".split("_"),f=(b.defineLocale||b.lang).call(b,"pl",{months:function(a,b){return""===b?"("+e[a.month()]+"|"+d[a.month()]+")":/D MMMM/.test(b)?e[a.month()]:d[a.month()]},monthsShort:"sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru".split("_"),weekdays:"niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota".split("_"),weekdaysShort:"nie_pon_wt_śr_czw_pt_sb".split("_"),weekdaysMin:"Nd_Pn_Wt_Śr_Cz_Pt_So".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Dziś o] LT",nextDay:"[Jutro o] LT",nextWeek:"[W] dddd [o] LT",lastDay:"[Wczoraj o] LT",lastWeek:function(){switch(this.day()){case 0:return"[W zeszłą niedzielę o] LT";case 3:return"[W zeszłą środę o] LT";case 6:return"[W zeszłą sobotę o] LT";default:return"[W zeszły] dddd [o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"%s temu",s:"kilka sekund",m:c,mm:c,h:c,hh:c,d:"1 dzień",dd:"%d dni",M:"miesiąc",MM:c,y:"rok",yy:c},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return f}(),a.fullCalendar.datepickerLang("pl","pl",{closeText:"Zamknij",prevText:"&#x3C;Poprzedni",nextText:"Następny&#x3E;",currentText:"Dziś",monthNames:["Styczeń","Luty","Marzec","Kwiecień","Maj","Czerwiec","Lipiec","Sierpień","Wrzesień","Październik","Listopad","Grudzień"],monthNamesShort:["Sty","Lu","Mar","Kw","Maj","Cze","Lip","Sie","Wrz","Pa","Lis","Gru"],dayNames:["Niedziela","Poniedziałek","Wtorek","Środa","Czwartek","Piątek","Sobota"],dayNamesShort:["Nie","Pn","Wt","Śr","Czw","Pt","So"],dayNamesMin:["N","Pn","Wt","Śr","Cz","Pt","So"],weekHeader:"Tydz",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("pl",{buttonText:{month:"Miesiąc",week:"Tydzień",day:"Dzień",list:"Plan dnia"},allDayText:"Cały dzień",eventLimitText:"więcej"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"pt-br",{months:"Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),weekdaysMin:"Dom_2ª_3ª_4ª_5ª_6ª_Sáb".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY [às] HH:mm",LLLL:"dddd, D [de] MMMM [de] YYYY [às] HH:mm"},calendar:{sameDay:"[Hoje às] LT",nextDay:"[Amanhã às] LT",nextWeek:"dddd [às] LT",lastDay:"[Ontem às] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[Último] dddd [às] LT":"[Última] dddd [às] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"%s atrás",s:"poucos segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº"});return a}(),a.fullCalendar.datepickerLang("pt-br","pt-BR",{closeText:"Fechar",prevText:"&#x3C;Anterior",nextText:"Próximo&#x3E;",currentText:"Hoje",monthNames:["Janeiro","Fevereiro","Março","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],monthNamesShort:["Jan","Fev","Mar","Abr","Mai","Jun","Jul","Ago","Set","Out","Nov","Dez"],dayNames:["Domingo","Segunda-feira","Terça-feira","Quarta-feira","Quinta-feira","Sexta-feira","Sábado"],dayNamesShort:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],dayNamesMin:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],weekHeader:"Sm",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("pt-br",{buttonText:{month:"Mês",week:"Semana",day:"Dia",list:"Compromissos"},allDayText:"dia inteiro",eventLimitText:function(a){return"mais +"+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"pt",{months:"Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),weekdaysMin:"Dom_2ª_3ª_4ª_5ª_6ª_Sáb".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY HH:mm",LLLL:"dddd, D [de] MMMM [de] YYYY HH:mm"},calendar:{sameDay:"[Hoje às] LT",nextDay:"[Amanhã às] LT",nextWeek:"dddd [às] LT",lastDay:"[Ontem às] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[Último] dddd [às] LT":"[Última] dddd [às] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"há %s",s:"segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("pt","pt",{closeText:"Fechar",prevText:"Anterior",nextText:"Seguinte",currentText:"Hoje",monthNames:["Janeiro","Fevereiro","Março","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],monthNamesShort:["Jan","Fev","Mar","Abr","Mai","Jun","Jul","Ago","Set","Out","Nov","Dez"],dayNames:["Domingo","Segunda-feira","Terça-feira","Quarta-feira","Quinta-feira","Sexta-feira","Sábado"],dayNamesShort:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],dayNamesMin:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],weekHeader:"Sem",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("pt",{buttonText:{month:"Mês",week:"Semana",day:"Dia",list:"Agenda"},allDayText:"Todo o dia",eventLimitText:"mais"})}(),function(){!function(){"use strict";function a(a,b,c){var d={mm:"minute",hh:"ore",dd:"zile",MM:"luni",yy:"ani"},e=" ";return(a%100>=20||a>=100&&a%100===0)&&(e=" de "),a+e+d[c]}var c=(b.defineLocale||b.lang).call(b,"ro",{months:"ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie".split("_"),monthsShort:"ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.".split("_"),weekdays:"duminică_luni_marți_miercuri_joi_vineri_sâmbătă".split("_"),weekdaysShort:"Dum_Lun_Mar_Mie_Joi_Vin_Sâm".split("_"),weekdaysMin:"Du_Lu_Ma_Mi_Jo_Vi_Sâ".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[azi la] LT",nextDay:"[mâine la] LT",nextWeek:"dddd [la] LT",lastDay:"[ieri la] LT",lastWeek:"[fosta] dddd [la] LT",sameElse:"L"},relativeTime:{future:"peste %s",past:"%s în urmă",s:"câteva secunde",m:"un minut",mm:a,h:"o oră",hh:a,d:"o zi",dd:a,M:"o lună",MM:a,y:"un an",yy:a},week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("ro","ro",{closeText:"Închide",prevText:"&#xAB; Luna precedentă",nextText:"Luna următoare &#xBB;",currentText:"Azi",monthNames:["Ianuarie","Februarie","Martie","Aprilie","Mai","Iunie","Iulie","August","Septembrie","Octombrie","Noiembrie","Decembrie"],monthNamesShort:["Ian","Feb","Mar","Apr","Mai","Iun","Iul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Duminică","Luni","Marţi","Miercuri","Joi","Vineri","Sâmbătă"],dayNamesShort:["Dum","Lun","Mar","Mie","Joi","Vin","Sâm"],dayNamesMin:["Du","Lu","Ma","Mi","Jo","Vi","Sâ"],weekHeader:"Săpt",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ro",{buttonText:{prev:"precedentă",next:"următoare",month:"Lună",week:"Săptămână",day:"Zi",list:"Agendă"},allDayText:"Toată ziua",eventLimitText:function(a){return"+alte "+a}})}(),function(){!function(){"use strict";function a(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function c(b,c,d){var e={mm:c?"минута_минуты_минут":"минуту_минуты_минут",hh:"час_часа_часов",dd:"день_дня_дней",MM:"месяц_месяца_месяцев",yy:"год_года_лет"};return"m"===d?c?"минута":"минуту":b+" "+a(e[d],+b)}var d=[/^янв/i,/^фев/i,/^мар/i,/^апр/i,/^ма[й|я]/i,/^июн/i,/^июл/i,/^авг/i,/^сен/i,/^окт/i,/^ноя/i,/^дек/i],e=(b.defineLocale||b.lang).call(b,"ru",{months:{format:"Января_Февраля_Марта_Апреля_Мая_Июня_Июля_Августа_Сентября_Октября_Ноября_Декабря".split("_"),standalone:"Январь_Февраль_Март_Апрель_Май_Июнь_Июль_Август_Сентябрь_Октябрь_Ноябрь_Декабрь".split("_")},monthsShort:{format:"янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек".split("_"),standalone:"янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек".split("_")},weekdays:{standalone:"Воскресенье_Понедельник_Вторник_Среда_Четверг_Пятница_Суббота".split("_"),format:"Воскресенье_Понедельник_Вторник_Среду_Четверг_Пятницу_Субботу".split("_"),isFormat:/\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/},weekdaysShort:"Вс_Пн_Вт_Ср_Чт_Пт_Сб".split("_"),weekdaysMin:"Вс_Пн_Вт_Ср_Чт_Пт_Сб".split("_"),monthsParse:d,longMonthsParse:d,shortMonthsParse:d,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., HH:mm",LLLL:"dddd, D MMMM YYYY г., HH:mm"},calendar:{sameDay:"[Сегодня в] LT",nextDay:"[Завтра в] LT",lastDay:"[Вчера в] LT",nextWeek:function(a){if(a.week()===this.week())return 2===this.day()?"[Во] dddd [в] LT":"[В] dddd [в] LT";switch(this.day()){case 0:return"[В следующее] dddd [в] LT";case 1:case 2:case 4:return"[В следующий] dddd [в] LT";case 3:case 5:case 6:return"[В следующую] dddd [в] LT"}},lastWeek:function(a){if(a.week()===this.week())return 2===this.day()?"[Во] dddd [в] LT":"[В] dddd [в] LT";switch(this.day()){case 0:return"[В прошлое] dddd [в] LT";case 1:case 2:case 4:return"[В прошлый] dddd [в] LT";case 3:case 5:case 6:return"[В прошлую] dddd [в] LT"}},sameElse:"L"},relativeTime:{future:"через %s",past:"%s назад",s:"несколько секунд",m:c,mm:c,h:"час",hh:c,d:"день",dd:c,M:"месяц",MM:c,y:"год",yy:c},meridiemParse:/ночи|утра|дня|вечера/i,isPM:function(a){return/^(дня|вечера)$/.test(a)},meridiem:function(a,b,c){return 4>a?"ночи":12>a?"утра":17>a?"дня":"вечера"},ordinalParse:/\d{1,2}-(й|го|я)/,ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":return a+"-й";case"D":return a+"-го";case"w":case"W":return a+"-я";default:return a}},week:{dow:1,doy:7}});return e}(),a.fullCalendar.datepickerLang("ru","ru",{closeText:"Закрыть",prevText:"&#x3C;Пред",nextText:"След&#x3E;",currentText:"Сегодня",monthNames:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"],monthNamesShort:["Янв","Фев","Мар","Апр","Май","Июн","Июл","Авг","Сен","Окт","Ноя","Дек"],dayNames:["воскресенье","понедельник","вторник","среда","четверг","пятница","суббота"],dayNamesShort:["вск","пнд","втр","срд","чтв","птн","сбт"],dayNamesMin:["Вс","Пн","Вт","Ср","Чт","Пт","Сб"],weekHeader:"Нед",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ru",{buttonText:{month:"Месяц",week:"Неделя",day:"День",list:"Повестка дня"},allDayText:"Весь день",eventLimitText:function(a){return"+ ещё "+a}})}(),function(){!function(){"use strict";function a(a){return a>1&&5>a}function c(b,c,d,e){var f=b+" ";switch(d){case"s":return c||e?"pár sekúnd":"pár sekundami";case"m":return c?"minúta":e?"minútu":"minútou";case"mm":return c||e?f+(a(b)?"minúty":"minút"):f+"minútami";case"h":return c?"hodina":e?"hodinu":"hodinou";case"hh":return c||e?f+(a(b)?"hodiny":"hodín"):f+"hodinami";case"d":return c||e?"deň":"dňom";case"dd":return c||e?f+(a(b)?"dni":"dní"):f+"dňami";case"M":return c||e?"mesiac":"mesiacom";case"MM":return c||e?f+(a(b)?"mesiace":"mesiacov"):f+"mesiacmi";case"y":return c||e?"rok":"rokom";case"yy":return c||e?f+(a(b)?"roky":"rokov"):f+"rokmi"}}var d="január_február_marec_apríl_máj_jún_júl_august_september_október_november_december".split("_"),e="jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec".split("_"),f=(b.defineLocale||b.lang).call(b,"sk",{months:d,monthsShort:e,weekdays:"nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota".split("_"),weekdaysShort:"ne_po_ut_st_št_pi_so".split("_"),weekdaysMin:"ne_po_ut_st_št_pi_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd D. MMMM YYYY H:mm"},calendar:{sameDay:"[dnes o] LT",nextDay:"[zajtra o] LT",nextWeek:function(){switch(this.day()){case 0:return"[v nedeľu o] LT";case 1:case 2:return"[v] dddd [o] LT";case 3:return"[v stredu o] LT";case 4:return"[vo štvrtok o] LT";case 5:return"[v piatok o] LT";case 6:return"[v sobotu o] LT"}},lastDay:"[včera o] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulú nedeľu o] LT";case 1:case 2:return"[minulý] dddd [o] LT";case 3:return"[minulú stredu o] LT";case 4:case 5:return"[minulý] dddd [o] LT";case 6:return"[minulú sobotu o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"pred %s",s:c,m:c,mm:c,h:c,hh:c,d:c,dd:c,M:c,MM:c,y:c,yy:c},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return f}(),a.fullCalendar.datepickerLang("sk","sk",{closeText:"Zavrieť",prevText:"&#x3C;Predchádzajúci",nextText:"Nasledujúci&#x3E;",currentText:"Dnes",monthNames:["január","február","marec","apríl","máj","jún","júl","august","september","október","november","december"],monthNamesShort:["Jan","Feb","Mar","Apr","Máj","Jún","Júl","Aug","Sep","Okt","Nov","Dec"],dayNames:["nedeľa","pondelok","utorok","streda","štvrtok","piatok","sobota"],dayNamesShort:["Ned","Pon","Uto","Str","Štv","Pia","Sob"],dayNamesMin:["Ne","Po","Ut","St","Št","Pia","So"],weekHeader:"Ty",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("sk",{buttonText:{month:"Mesiac",week:"Týždeň",day:"Deň",list:"Rozvrh"},allDayText:"Celý deň",eventLimitText:function(a){return"+ďalšie: "+a}})}(),function(){!function(){"use strict";function a(a,b,c,d){var e=a+" ";switch(c){case"s":return b||d?"nekaj sekund":"nekaj sekundami";case"m":return b?"ena minuta":"eno minuto";case"mm":return e+=1===a?b?"minuta":"minuto":2===a?b||d?"minuti":"minutama":5>a?b||d?"minute":"minutami":b||d?"minut":"minutami";case"h":return b?"ena ura":"eno uro";case"hh":return e+=1===a?b?"ura":"uro":2===a?b||d?"uri":"urama":5>a?b||d?"ure":"urami":b||d?"ur":"urami";case"d":return b||d?"en dan":"enim dnem";case"dd":return e+=1===a?b||d?"dan":"dnem":2===a?b||d?"dni":"dnevoma":b||d?"dni":"dnevi";case"M":return b||d?"en mesec":"enim mesecem";case"MM":return e+=1===a?b||d?"mesec":"mesecem":2===a?b||d?"meseca":"mesecema":5>a?b||d?"mesece":"meseci":b||d?"mesecev":"meseci";case"y":return b||d?"eno leto":"enim letom";case"yy":return e+=1===a?b||d?"leto":"letom":2===a?b||d?"leti":"letoma":5>a?b||d?"leta":"leti":b||d?"let":"leti"}}var c=(b.defineLocale||b.lang).call(b,"sl",{months:"januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"),weekdays:"nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota".split("_"),weekdaysShort:"ned._pon._tor._sre._čet._pet._sob.".split("_"),weekdaysMin:"ne_po_to_sr_če_pe_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danes ob] LT",nextDay:"[jutri ob] LT",nextWeek:function(){switch(this.day()){case 0:return"[v] [nedeljo] [ob] LT";case 3:return"[v] [sredo] [ob] LT";case 6:return"[v] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[v] dddd [ob] LT"}},lastDay:"[včeraj ob] LT",lastWeek:function(){switch(this.day()){case 0:return"[prejšnjo] [nedeljo] [ob] LT";case 3:return"[prejšnjo] [sredo] [ob] LT";case 6:return"[prejšnjo] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[prejšnji] dddd [ob] LT"}},sameElse:"L"},relativeTime:{future:"čez %s",past:"pred %s",s:a,m:a,mm:a,h:a,hh:a,d:a,dd:a,M:a,MM:a,y:a,yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("sl","sl",{closeText:"Zapri",prevText:"&#x3C;Prejšnji",nextText:"Naslednji&#x3E;",currentText:"Trenutni",monthNames:["Januar","Februar","Marec","April","Maj","Junij","Julij","Avgust","September","Oktober","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Avg","Sep","Okt","Nov","Dec"],dayNames:["Nedelja","Ponedeljek","Torek","Sreda","Četrtek","Petek","Sobota"],dayNamesShort:["Ned","Pon","Tor","Sre","Čet","Pet","Sob"],dayNamesMin:["Ne","Po","To","Sr","Če","Pe","So"],weekHeader:"Teden",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("sl",{buttonText:{month:"Mesec",week:"Teden",day:"Dan",list:"Dnevni red"},allDayText:"Ves dan",eventLimitText:"več"})}(),function(){!function(){"use strict";var a={words:{m:["један минут","једне минуте"],mm:["минут","минуте","минута"],h:["један сат","једног сата"],hh:["сат","сата","сати"],dd:["дан","дана","дана"],MM:["месец","месеца","месеци"],yy:["година","године","година"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(b,c,d){var e=a.words[d];return 1===d.length?c?e[0]:e[1]:b+" "+a.correctGrammaticalCase(b,e)}},c=(b.defineLocale||b.lang).call(b,"sr-cyrl",{months:["јануар","фебруар","март","април","мај","јун","јул","август","септембар","октобар","новембар","децембар"],monthsShort:["јан.","феб.","мар.","апр.","мај","јун","јул","авг.","сеп.","окт.","нов.","дец."],weekdays:["недеља","понедељак","уторак","среда","четвртак","петак","субота"],weekdaysShort:["нед.","пон.","уто.","сре.","чет.","пет.","суб."],weekdaysMin:["не","по","ут","ср","че","пе","су"],longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[данас у] LT",nextDay:"[сутра у] LT",nextWeek:function(){switch(this.day()){case 0:return"[у] [недељу] [у] LT";case 3:return"[у] [среду] [у] LT";case 6:return"[у] [суботу] [у] LT";case 1:case 2:case 4:case 5:return"[у] dddd [у] LT"}},lastDay:"[јуче у] LT",lastWeek:function(){var a=["[прошле] [недеље] [у] LT","[прошлог] [понедељка] [у] LT","[прошлог] [уторка] [у] LT","[прошле] [среде] [у] LT","[прошлог] [четвртка] [у] LT","[прошлог] [петка] [у] LT","[прошле] [суботе] [у] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"за %s",past:"пре %s",s:"неколико секунди",m:a.translate,mm:a.translate,h:a.translate,hh:a.translate,d:"дан",dd:a.translate,M:"месец",MM:a.translate,y:"годину",yy:a.translate},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("sr-cyrl","sr",{closeText:"Затвори",prevText:"&#x3C;",nextText:"&#x3E;",currentText:"Данас",monthNames:["Јануар","Фебруар","Март","Април","Мај","Јун","Јул","Август","Септембар","Октобар","Новембар","Децембар"],monthNamesShort:["Јан","Феб","Мар","Апр","Мај","Јун","Јул","Авг","Сеп","Окт","Нов","Дец"],dayNames:["Недеља","Понедељак","Уторак","Среда","Четвртак","Петак","Субота"],dayNamesShort:["Нед","Пон","Уто","Сре","Чет","Пет","Суб"],dayNamesMin:["Не","По","Ут","Ср","Че","Пе","Су"],weekHeader:"Сед",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("sr-cyrl",{buttonText:{month:"Месец",week:"Недеља",day:"Дан",list:"Планер"},allDayText:"Цео дан",eventLimitText:function(a){return"+ још "+a}})}(),function(){!function(){"use strict";var a={words:{m:["jedan minut","jedne minute"],mm:["minut","minute","minuta"],h:["jedan sat","jednog sata"],hh:["sat","sata","sati"],dd:["dan","dana","dana"],MM:["mesec","meseca","meseci"],yy:["godina","godine","godina"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(b,c,d){var e=a.words[d];return 1===d.length?c?e[0]:e[1]:b+" "+a.correctGrammaticalCase(b,e)}},c=(b.defineLocale||b.lang).call(b,"sr",{months:["januar","februar","mart","april","maj","jun","jul","avgust","septembar","oktobar","novembar","decembar"],monthsShort:["jan.","feb.","mar.","apr.","maj","jun","jul","avg.","sep.","okt.","nov.","dec."],weekdays:["nedelja","ponedeljak","utorak","sreda","četvrtak","petak","subota"],weekdaysShort:["ned.","pon.","uto.","sre.","čet.","pet.","sub."],weekdaysMin:["ne","po","ut","sr","če","pe","su"],longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedelju] [u] LT";case 3:return"[u] [sredu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[juče u] LT",lastWeek:function(){var a=["[prošle] [nedelje] [u] LT","[prošlog] [ponedeljka] [u] LT","[prošlog] [utorka] [u] LT","[prošle] [srede] [u] LT","[prošlog] [četvrtka] [u] LT","[prošlog] [petka] [u] LT","[prošle] [subote] [u] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"za %s",past:"pre %s",s:"nekoliko sekundi",m:a.translate,mm:a.translate,h:a.translate,hh:a.translate,d:"dan",dd:a.translate,M:"mesec",MM:a.translate,y:"godinu",yy:a.translate},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("sr","sr",{closeText:"Затвори",prevText:"&#x3C;",nextText:"&#x3E;",currentText:"Данас",monthNames:["Јануар","Фебруар","Март","Април","Мај","Јун","Јул","Август","Септембар","Октобар","Новембар","Децембар"],monthNamesShort:["Јан","Феб","Мар","Апр","Мај","Јун","Јул","Авг","Сеп","Окт","Нов","Дец"],dayNames:["Недеља","Понедељак","Уторак","Среда","Четвртак","Петак","Субота"],dayNamesShort:["Нед","Пон","Уто","Сре","Чет","Пет","Суб"],
-dayNamesMin:["Не","По","Ут","Ср","Че","Пе","Су"],weekHeader:"Сед",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("sr",{buttonText:{month:"Месец",week:"Недеља",day:"Дан",list:"Планер"},allDayText:"Цео дан",eventLimitText:function(a){return"+ још "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"sv",{months:"januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"),weekdaysShort:"sön_mån_tis_ons_tor_fre_lör".split("_"),weekdaysMin:"sö_må_ti_on_to_fr_lö".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Idag] LT",nextDay:"[Imorgon] LT",lastDay:"[Igår] LT",nextWeek:"[På] dddd LT",lastWeek:"[I] dddd[s] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"för %s sedan",s:"några sekunder",m:"en minut",mm:"%d minuter",h:"en timme",hh:"%d timmar",d:"en dag",dd:"%d dagar",M:"en månad",MM:"%d månader",y:"ett år",yy:"%d år"},ordinalParse:/\d{1,2}(e|a)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"e":1===b?"a":2===b?"a":"e";return a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("sv","sv",{closeText:"Stäng",prevText:"&#xAB;Förra",nextText:"Nästa&#xBB;",currentText:"Idag",monthNames:["Januari","Februari","Mars","April","Maj","Juni","Juli","Augusti","September","Oktober","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec"],dayNamesShort:["Sön","Mån","Tis","Ons","Tor","Fre","Lör"],dayNames:["Söndag","Måndag","Tisdag","Onsdag","Torsdag","Fredag","Lördag"],dayNamesMin:["Sö","Må","Ti","On","To","Fr","Lö"],weekHeader:"Ve",dateFormat:"yy-mm-dd",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("sv",{buttonText:{month:"Månad",week:"Vecka",day:"Dag",list:"Program"},allDayText:"Heldag",eventLimitText:"till"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"th",{months:"มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม".split("_"),monthsShort:"มกรา_กุมภา_มีนา_เมษา_พฤษภา_มิถุนา_กรกฎา_สิงหา_กันยา_ตุลา_พฤศจิกา_ธันวา".split("_"),weekdays:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์".split("_"),weekdaysShort:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์".split("_"),weekdaysMin:"อา._จ._อ._พ._พฤ._ศ._ส.".split("_"),longDateFormat:{LT:"H นาฬิกา m นาที",LTS:"H นาฬิกา m นาที s วินาที",L:"YYYY/MM/DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY เวลา H นาฬิกา m นาที",LLLL:"วันddddที่ D MMMM YYYY เวลา H นาฬิกา m นาที"},meridiemParse:/ก่อนเที่ยง|หลังเที่ยง/,isPM:function(a){return"หลังเที่ยง"===a},meridiem:function(a,b,c){return 12>a?"ก่อนเที่ยง":"หลังเที่ยง"},calendar:{sameDay:"[วันนี้ เวลา] LT",nextDay:"[พรุ่งนี้ เวลา] LT",nextWeek:"dddd[หน้า เวลา] LT",lastDay:"[เมื่อวานนี้ เวลา] LT",lastWeek:"[วัน]dddd[ที่แล้ว เวลา] LT",sameElse:"L"},relativeTime:{future:"อีก %s",past:"%sที่แล้ว",s:"ไม่กี่วินาที",m:"1 นาที",mm:"%d นาที",h:"1 ชั่วโมง",hh:"%d ชั่วโมง",d:"1 วัน",dd:"%d วัน",M:"1 เดือน",MM:"%d เดือน",y:"1 ปี",yy:"%d ปี"}});return a}(),a.fullCalendar.datepickerLang("th","th",{closeText:"ปิด",prevText:"&#xAB;&#xA0;ย้อน",nextText:"ถัดไป&#xA0;&#xBB;",currentText:"วันนี้",monthNames:["มกราคม","กุมภาพันธ์","มีนาคม","เมษายน","พฤษภาคม","มิถุนายน","กรกฎาคม","สิงหาคม","กันยายน","ตุลาคม","พฤศจิกายน","ธันวาคม"],monthNamesShort:["ม.ค.","ก.พ.","มี.ค.","เม.ย.","พ.ค.","มิ.ย.","ก.ค.","ส.ค.","ก.ย.","ต.ค.","พ.ย.","ธ.ค."],dayNames:["อาทิตย์","จันทร์","อังคาร","พุธ","พฤหัสบดี","ศุกร์","เสาร์"],dayNamesShort:["อา.","จ.","อ.","พ.","พฤ.","ศ.","ส."],dayNamesMin:["อา.","จ.","อ.","พ.","พฤ.","ศ.","ส."],weekHeader:"Wk",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("th",{buttonText:{month:"เดือน",week:"สัปดาห์",day:"วัน",list:"แผนงาน"},allDayText:"ตลอดวัน",eventLimitText:"เพิ่มเติม"})}(),function(){!function(){"use strict";var a={1:"'inci",5:"'inci",8:"'inci",70:"'inci",80:"'inci",2:"'nci",7:"'nci",20:"'nci",50:"'nci",3:"'üncü",4:"'üncü",100:"'üncü",6:"'ncı",9:"'uncu",10:"'uncu",30:"'uncu",60:"'ıncı",90:"'ıncı"},c=(b.defineLocale||b.lang).call(b,"tr",{months:"Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık".split("_"),monthsShort:"Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara".split("_"),weekdays:"Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi".split("_"),weekdaysShort:"Paz_Pts_Sal_Çar_Per_Cum_Cts".split("_"),weekdaysMin:"Pz_Pt_Sa_Ça_Pe_Cu_Ct".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[bugün saat] LT",nextDay:"[yarın saat] LT",nextWeek:"[haftaya] dddd [saat] LT",lastDay:"[dün] LT",lastWeek:"[geçen hafta] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s önce",s:"birkaç saniye",m:"bir dakika",mm:"%d dakika",h:"bir saat",hh:"%d saat",d:"bir gün",dd:"%d gün",M:"bir ay",MM:"%d ay",y:"bir yıl",yy:"%d yıl"},ordinalParse:/\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/,ordinal:function(b){if(0===b)return b+"'ıncı";var c=b%10,d=b%100-c,e=b>=100?100:null;return b+(a[c]||a[d]||a[e])},week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("tr","tr",{closeText:"kapat",prevText:"&#x3C;geri",nextText:"ileri&#x3e",currentText:"bugün",monthNames:["Ocak","Şubat","Mart","Nisan","Mayıs","Haziran","Temmuz","Ağustos","Eylül","Ekim","Kasım","Aralık"],monthNamesShort:["Oca","Şub","Mar","Nis","May","Haz","Tem","Ağu","Eyl","Eki","Kas","Ara"],dayNames:["Pazar","Pazartesi","Salı","Çarşamba","Perşembe","Cuma","Cumartesi"],dayNamesShort:["Pz","Pt","Sa","Ça","Pe","Cu","Ct"],dayNamesMin:["Pz","Pt","Sa","Ça","Pe","Cu","Ct"],weekHeader:"Hf",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("tr",{buttonText:{next:"ileri",month:"Ay",week:"Hafta",day:"Gün",list:"Ajanda"},allDayText:"Tüm gün",eventLimitText:"daha fazla"})}(),function(){!function(){"use strict";function a(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function c(b,c,d){var e={mm:c?"хвилина_хвилини_хвилин":"хвилину_хвилини_хвилин",hh:c?"година_години_годин":"годину_години_годин",dd:"день_дні_днів",MM:"місяць_місяці_місяців",yy:"рік_роки_років"};return"m"===d?c?"хвилина":"хвилину":"h"===d?c?"година":"годину":b+" "+a(e[d],+b)}function d(a,b){var c={nominative:"неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота".split("_"),accusative:"неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу".split("_"),genitive:"неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи".split("_")},d=/(\[[ВвУу]\]) ?dddd/.test(b)?"accusative":/\[?(?:минулої|наступної)? ?\] ?dddd/.test(b)?"genitive":"nominative";return c[d][a.day()]}function e(a){return function(){return a+"о"+(11===this.hours()?"б":"")+"] LT"}}var f=(b.defineLocale||b.lang).call(b,"uk",{months:{format:"січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня".split("_"),standalone:"січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень".split("_")},monthsShort:"січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд".split("_"),weekdays:d,weekdaysShort:"нд_пн_вт_ср_чт_пт_сб".split("_"),weekdaysMin:"нд_пн_вт_ср_чт_пт_сб".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY р.",LLL:"D MMMM YYYY р., HH:mm",LLLL:"dddd, D MMMM YYYY р., HH:mm"},calendar:{sameDay:e("[Сьогодні "),nextDay:e("[Завтра "),lastDay:e("[Вчора "),nextWeek:e("[У] dddd ["),lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return e("[Минулої] dddd [").call(this);case 1:case 2:case 4:return e("[Минулого] dddd [").call(this)}},sameElse:"L"},relativeTime:{future:"за %s",past:"%s тому",s:"декілька секунд",m:c,mm:c,h:"годину",hh:c,d:"день",dd:c,M:"місяць",MM:c,y:"рік",yy:c},meridiemParse:/ночі|ранку|дня|вечора/,isPM:function(a){return/^(дня|вечора)$/.test(a)},meridiem:function(a,b,c){return 4>a?"ночі":12>a?"ранку":17>a?"дня":"вечора"},ordinalParse:/\d{1,2}-(й|го)/,ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":case"w":case"W":return a+"-й";case"D":return a+"-го";default:return a}},week:{dow:1,doy:7}});return f}(),a.fullCalendar.datepickerLang("uk","uk",{closeText:"Закрити",prevText:"&#x3C;",nextText:"&#x3E;",currentText:"Сьогодні",monthNames:["Січень","Лютий","Березень","Квітень","Травень","Червень","Липень","Серпень","Вересень","Жовтень","Листопад","Грудень"],monthNamesShort:["Січ","Лют","Бер","Кві","Тра","Чер","Лип","Сер","Вер","Жов","Лис","Гру"],dayNames:["неділя","понеділок","вівторок","середа","четвер","п’ятниця","субота"],dayNamesShort:["нед","пнд","вів","срд","чтв","птн","сбт"],dayNamesMin:["Нд","Пн","Вт","Ср","Чт","Пт","Сб"],weekHeader:"Тиж",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("uk",{buttonText:{month:"Місяць",week:"Тиждень",day:"День",list:"Порядок денний"},allDayText:"Увесь день",eventLimitText:function(a){return"+ще "+a+"..."}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"vi",{months:"tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12".split("_"),monthsShort:"Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12".split("_"),weekdays:"chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy".split("_"),weekdaysShort:"CN_T2_T3_T4_T5_T6_T7".split("_"),weekdaysMin:"CN_T2_T3_T4_T5_T6_T7".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM [năm] YYYY",LLL:"D MMMM [năm] YYYY HH:mm",LLLL:"dddd, D MMMM [năm] YYYY HH:mm",l:"DD/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"},calendar:{sameDay:"[Hôm nay lúc] LT",nextDay:"[Ngày mai lúc] LT",nextWeek:"dddd [tuần tới lúc] LT",lastDay:"[Hôm qua lúc] LT",lastWeek:"dddd [tuần rồi lúc] LT",sameElse:"L"},relativeTime:{future:"%s tới",past:"%s trước",s:"vài giây",m:"một phút",mm:"%d phút",h:"một giờ",hh:"%d giờ",d:"một ngày",dd:"%d ngày",M:"một tháng",MM:"%d tháng",y:"một năm",yy:"%d năm"},ordinalParse:/\d{1,2}/,ordinal:function(a){return a},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("vi","vi",{closeText:"Đóng",prevText:"&#x3C;Trước",nextText:"Tiếp&#x3E;",currentText:"Hôm nay",monthNames:["Tháng Một","Tháng Hai","Tháng Ba","Tháng Tư","Tháng Năm","Tháng Sáu","Tháng Bảy","Tháng Tám","Tháng Chín","Tháng Mười","Tháng Mười Một","Tháng Mười Hai"],monthNamesShort:["Tháng 1","Tháng 2","Tháng 3","Tháng 4","Tháng 5","Tháng 6","Tháng 7","Tháng 8","Tháng 9","Tháng 10","Tháng 11","Tháng 12"],dayNames:["Chủ Nhật","Thứ Hai","Thứ Ba","Thứ Tư","Thứ Năm","Thứ Sáu","Thứ Bảy"],dayNamesShort:["CN","T2","T3","T4","T5","T6","T7"],dayNamesMin:["CN","T2","T3","T4","T5","T6","T7"],weekHeader:"Tu",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("vi",{buttonText:{month:"Tháng",week:"Tuần",day:"Ngày",list:"Lịch biểu"},allDayText:"Cả ngày",eventLimitText:function(a){return"+ thêm "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"zh-cn",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"Ah点mm分",LTS:"Ah点m分s秒",L:"YYYY-MM-DD",LL:"YYYY年MMMD日",LLL:"YYYY年MMMD日Ah点mm分",LLLL:"YYYY年MMMD日ddddAh点mm分",l:"YYYY-MM-DD",ll:"YYYY年MMMD日",lll:"YYYY年MMMD日Ah点mm分",llll:"YYYY年MMMD日ddddAh点mm分"},meridiemParse:/凌晨|早上|上午|中午|下午|晚上/,meridiemHour:function(a,b){return 12===a&&(a=0),"凌晨"===b||"早上"===b||"上午"===b?a:"下午"===b||"晚上"===b?a+12:a>=11?a:a+12},meridiem:function(a,b,c){var d=100*a+b;return 600>d?"凌晨":900>d?"早上":1130>d?"上午":1230>d?"中午":1800>d?"下午":"晚上"},calendar:{sameDay:function(){return 0===this.minutes()?"[今天]Ah[点整]":"[今天]LT"},nextDay:function(){return 0===this.minutes()?"[明天]Ah[点整]":"[明天]LT"},lastDay:function(){return 0===this.minutes()?"[昨天]Ah[点整]":"[昨天]LT"},nextWeek:function(){var a,c;return a=b().startOf("week"),c=this.unix()-a.unix()>=604800?"[下]":"[本]",0===this.minutes()?c+"dddAh点整":c+"dddAh点mm"},lastWeek:function(){var a,c;return a=b().startOf("week"),c=this.unix()<a.unix()?"[上]":"[本]",0===this.minutes()?c+"dddAh点整":c+"dddAh点mm"},sameElse:"LL"},ordinalParse:/\d{1,2}(日|月|周)/,ordinal:function(a,b){switch(b){case"d":case"D":case"DDD":return a+"日";case"M":return a+"月";case"w":case"W":return a+"周";default:return a}},relativeTime:{future:"%s内",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("zh-cn","zh-CN",{closeText:"关闭",prevText:"&#x3C;上月",nextText:"下月&#x3E;",currentText:"今天",monthNames:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthNamesShort:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayNames:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],dayNamesShort:["周日","周一","周二","周三","周四","周五","周六"],dayNamesMin:["日","一","二","三","四","五","六"],weekHeader:"周",dateFormat:"yy-mm-dd",firstDay:1,isRTL:!1,showMonthAfterYear:!0,yearSuffix:"年"}),a.fullCalendar.lang("zh-cn",{buttonText:{month:"月",week:"周",day:"日",list:"日程"},allDayText:"全天",eventLimitText:function(a){return"另外 "+a+" 个"}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"zh-tw",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"Ah點mm分",LTS:"Ah點m分s秒",L:"YYYY年MMMD日",LL:"YYYY年MMMD日",LLL:"YYYY年MMMD日Ah點mm分",LLLL:"YYYY年MMMD日ddddAh點mm分",l:"YYYY年MMMD日",ll:"YYYY年MMMD日",lll:"YYYY年MMMD日Ah點mm分",llll:"YYYY年MMMD日ddddAh點mm分"},meridiemParse:/早上|上午|中午|下午|晚上/,meridiemHour:function(a,b){return 12===a&&(a=0),"早上"===b||"上午"===b?a:"中午"===b?a>=11?a:a+12:"下午"===b||"晚上"===b?a+12:void 0},meridiem:function(a,b,c){var d=100*a+b;return 900>d?"早上":1130>d?"上午":1230>d?"中午":1800>d?"下午":"晚上"},calendar:{sameDay:"[今天]LT",nextDay:"[明天]LT",nextWeek:"[下]ddddLT",lastDay:"[昨天]LT",lastWeek:"[上]ddddLT",sameElse:"L"},ordinalParse:/\d{1,2}(日|月|週)/,ordinal:function(a,b){switch(b){case"d":case"D":case"DDD":return a+"日";case"M":return a+"月";case"w":case"W":return a+"週";default:return a}},relativeTime:{future:"%s內",past:"%s前",s:"幾秒",m:"一分鐘",mm:"%d分鐘",h:"一小時",hh:"%d小時",d:"一天",dd:"%d天",M:"一個月",MM:"%d個月",y:"一年",yy:"%d年"}});return a}(),a.fullCalendar.datepickerLang("zh-tw","zh-TW",{closeText:"關閉",prevText:"&#x3C;上月",nextText:"下月&#x3E;",currentText:"今天",monthNames:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthNamesShort:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayNames:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],dayNamesShort:["周日","周一","周二","周三","周四","周五","周六"],dayNamesMin:["日","一","二","三","四","五","六"],weekHeader:"周",dateFormat:"yy/mm/dd",firstDay:1,isRTL:!1,showMonthAfterYear:!0,yearSuffix:"年"}),a.fullCalendar.lang("zh-tw",{buttonText:{month:"月",week:"週",day:"天",list:"待辦事項"},allDayText:"全天",eventLimitText:"更多"})}(),(b.locale||b.lang).call(b,"en"),a.fullCalendar.lang("en"),a.datepicker&&a.datepicker.setDefaults(a.datepicker.regional[""])});
\ No newline at end of file
+!function(a){"function"==typeof define&&define.amd?define(["jquery","moment"],a):"object"==typeof exports?module.exports=a(require("jquery"),require("moment")):a(jQuery,moment)}(function(a,b){!function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"ar-ma",{months:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),weekdays:"الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},week:{dow:6,doy:12}});return a}(),a.fullCalendar.datepickerLang("ar-ma","ar",{closeText:"إغلاق",prevText:"&#x3C;السابق",nextText:"التالي&#x3E;",currentText:"اليوم",monthNames:["يناير","فبراير","مارس","أبريل","مايو","يونيو","يوليو","أغسطس","سبتمبر","أكتوبر","نوفمبر","ديسمبر"],monthNamesShort:["1","2","3","4","5","6","7","8","9","10","11","12"],dayNames:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesShort:["أحد","اثنين","ثلاثاء","أربعاء","خميس","جمعة","سبت"],dayNamesMin:["ح","ن","ث","ر","خ","ج","س"],weekHeader:"أسبوع",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ar-ma",{buttonText:{month:"شهر",week:"أسبوع",day:"يوم",list:"أجندة"},allDayText:"اليوم كله",eventLimitText:"أخرى"})}(),function(){!function(){"use strict";var a={1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"},c={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"},d=(b.defineLocale||b.lang).call(b,"ar-sa",{months:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/ص|م/,isPM:function(a){return"م"===a},meridiem:function(a,b,c){return 12>a?"ص":"م"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},preparse:function(a){return a.replace(/[١٢٣٤٥٦٧٨٩٠]/g,function(a){return c[a]}).replace(/،/g,",")},postformat:function(b){return b.replace(/\d/g,function(b){return a[b]}).replace(/,/g,"،")},week:{dow:6,doy:12}});return d}(),a.fullCalendar.datepickerLang("ar-sa","ar",{closeText:"إغلاق",prevText:"&#x3C;السابق",nextText:"التالي&#x3E;",currentText:"اليوم",monthNames:["يناير","فبراير","مارس","أبريل","مايو","يونيو","يوليو","أغسطس","سبتمبر","أكتوبر","نوفمبر","ديسمبر"],monthNamesShort:["1","2","3","4","5","6","7","8","9","10","11","12"],dayNames:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesShort:["أحد","اثنين","ثلاثاء","أربعاء","خميس","جمعة","سبت"],dayNamesMin:["ح","ن","ث","ر","خ","ج","س"],weekHeader:"أسبوع",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ar-sa",{buttonText:{month:"شهر",week:"أسبوع",day:"يوم",list:"أجندة"},allDayText:"اليوم كله",eventLimitText:"أخرى"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"ar-tn",{months:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),monthsShort:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("ar-tn","ar",{closeText:"إغلاق",prevText:"&#x3C;السابق",nextText:"التالي&#x3E;",currentText:"اليوم",monthNames:["يناير","فبراير","مارس","أبريل","مايو","يونيو","يوليو","أغسطس","سبتمبر","أكتوبر","نوفمبر","ديسمبر"],monthNamesShort:["1","2","3","4","5","6","7","8","9","10","11","12"],dayNames:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesShort:["أحد","اثنين","ثلاثاء","أربعاء","خميس","جمعة","سبت"],dayNamesMin:["ح","ن","ث","ر","خ","ج","س"],weekHeader:"أسبوع",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ar-tn",{buttonText:{month:"شهر",week:"أسبوع",day:"يوم",list:"أجندة"},allDayText:"اليوم كله",eventLimitText:"أخرى"})}(),function(){!function(){"use strict";var a={1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"},c={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"},d=function(a){return 0===a?0:1===a?1:2===a?2:a%100>=3&&10>=a%100?3:a%100>=11?4:5},e={s:["أقل من ثانية","ثانية واحدة",["ثانيتان","ثانيتين"],"%d ثوان","%d ثانية","%d ثانية"],m:["أقل من دقيقة","دقيقة واحدة",["دقيقتان","دقيقتين"],"%d دقائق","%d دقيقة","%d دقيقة"],h:["أقل من ساعة","ساعة واحدة",["ساعتان","ساعتين"],"%d ساعات","%d ساعة","%d ساعة"],d:["أقل من يوم","يوم واحد",["يومان","يومين"],"%d أيام","%d يومًا","%d يوم"],M:["أقل من شهر","شهر واحد",["شهران","شهرين"],"%d أشهر","%d شهرا","%d شهر"],y:["أقل من عام","عام واحد",["عامان","عامين"],"%d أعوام","%d عامًا","%d عام"]},f=function(a){return function(b,c,f,g){var h=d(b),i=e[a][d(b)];return 2===h&&(i=i[c?0:1]),i.replace(/%d/i,b)}},g=["كانون الثاني يناير","شباط فبراير","آذار مارس","نيسان أبريل","أيار مايو","حزيران يونيو","تموز يوليو","آب أغسطس","أيلول سبتمبر","تشرين الأول أكتوبر","تشرين الثاني نوفمبر","كانون الأول ديسمبر"],h=(b.defineLocale||b.lang).call(b,"ar",{months:g,monthsShort:g,weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/‏M/‏YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/ص|م/,isPM:function(a){return"م"===a},meridiem:function(a,b,c){return 12>a?"ص":"م"},calendar:{sameDay:"[اليوم عند الساعة] LT",nextDay:"[غدًا عند الساعة] LT",nextWeek:"dddd [عند الساعة] LT",lastDay:"[أمس عند الساعة] LT",lastWeek:"dddd [عند الساعة] LT",sameElse:"L"},relativeTime:{future:"بعد %s",past:"منذ %s",s:f("s"),m:f("m"),mm:f("m"),h:f("h"),hh:f("h"),d:f("d"),dd:f("d"),M:f("M"),MM:f("M"),y:f("y"),yy:f("y")},preparse:function(a){return a.replace(/\u200f/g,"").replace(/[١٢٣٤٥٦٧٨٩٠]/g,function(a){return c[a]}).replace(/،/g,",")},postformat:function(b){return b.replace(/\d/g,function(b){return a[b]}).replace(/,/g,"،")},week:{dow:6,doy:12}});return h}(),a.fullCalendar.datepickerLang("ar","ar",{closeText:"إغلاق",prevText:"&#x3C;السابق",nextText:"التالي&#x3E;",currentText:"اليوم",monthNames:["يناير","فبراير","مارس","أبريل","مايو","يونيو","يوليو","أغسطس","سبتمبر","أكتوبر","نوفمبر","ديسمبر"],monthNamesShort:["1","2","3","4","5","6","7","8","9","10","11","12"],dayNames:["الأحد","الاثنين","الثلاثاء","الأربعاء","الخميس","الجمعة","السبت"],dayNamesShort:["أحد","اثنين","ثلاثاء","أربعاء","خميس","جمعة","سبت"],dayNamesMin:["ح","ن","ث","ر","خ","ج","س"],weekHeader:"أسبوع",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ar",{buttonText:{month:"شهر",week:"أسبوع",day:"يوم",list:"أجندة"},allDayText:"اليوم كله",eventLimitText:"أخرى"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"bg",{months:"януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември".split("_"),monthsShort:"янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек".split("_"),weekdays:"неделя_понеделник_вторник_сряда_четвъртък_петък_събота".split("_"),weekdaysShort:"нед_пон_вто_сря_чет_пет_съб".split("_"),weekdaysMin:"нд_пн_вт_ср_чт_пт_сб".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[Днес в] LT",nextDay:"[Утре в] LT",nextWeek:"dddd [в] LT",lastDay:"[Вчера в] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[В изминалата] dddd [в] LT";case 1:case 2:case 4:case 5:return"[В изминалия] dddd [в] LT"}},sameElse:"L"},relativeTime:{future:"след %s",past:"преди %s",s:"няколко секунди",m:"минута",mm:"%d минути",h:"час",hh:"%d часа",d:"ден",dd:"%d дни",M:"месец",MM:"%d месеца",y:"година",yy:"%d години"},ordinalParse:/\d{1,2}-(ев|ен|ти|ви|ри|ми)/,ordinal:function(a){var b=a%10,c=a%100;return 0===a?a+"-ев":0===c?a+"-ен":c>10&&20>c?a+"-ти":1===b?a+"-ви":2===b?a+"-ри":7===b||8===b?a+"-ми":a+"-ти"},week:{dow:1,doy:7}});return a}(),a.fullCalendar.datepickerLang("bg","bg",{closeText:"затвори",prevText:"&#x3C;назад",nextText:"напред&#x3E;",nextBigText:"&#x3E;&#x3E;",currentText:"днес",monthNames:["Януари","Февруари","Март","Април","Май","Юни","Юли","Август","Септември","Октомври","Ноември","Декември"],monthNamesShort:["Яну","Фев","Мар","Апр","Май","Юни","Юли","Авг","Сеп","Окт","Нов","Дек"],dayNames:["Неделя","Понеделник","Вторник","Сряда","Четвъртък","Петък","Събота"],dayNamesShort:["Нед","Пон","Вто","Сря","Чет","Пет","Съб"],dayNamesMin:["Не","По","Вт","Ср","Че","Пе","Съ"],weekHeader:"Wk",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("bg",{buttonText:{month:"Месец",week:"Седмица",day:"Ден",list:"График"},allDayText:"Цял ден",eventLimitText:function(a){return"+още "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"ca",{months:"gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre".split("_"),monthsShort:"gen._febr._mar._abr._mai._jun._jul._ag._set._oct._nov._des.".split("_"),monthsParseExact:!0,weekdays:"diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte".split("_"),weekdaysShort:"dg._dl._dt._dc._dj._dv._ds.".split("_"),weekdaysMin:"Dg_Dl_Dt_Dc_Dj_Dv_Ds".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd D MMMM YYYY H:mm"},calendar:{sameDay:function(){return"[avui a "+(1!==this.hours()?"les":"la")+"] LT"},nextDay:function(){return"[demà a "+(1!==this.hours()?"les":"la")+"] LT"},nextWeek:function(){return"dddd [a "+(1!==this.hours()?"les":"la")+"] LT"},lastDay:function(){return"[ahir a "+(1!==this.hours()?"les":"la")+"] LT"},lastWeek:function(){return"[el] dddd [passat a "+(1!==this.hours()?"les":"la")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"fa %s",s:"uns segons",m:"un minut",mm:"%d minuts",h:"una hora",hh:"%d hores",d:"un dia",dd:"%d dies",M:"un mes",MM:"%d mesos",y:"un any",yy:"%d anys"},ordinalParse:/\d{1,2}(r|n|t|è|a)/,ordinal:function(a,b){var c=1===a?"r":2===a?"n":3===a?"r":4===a?"t":"è";return"w"!==b&&"W"!==b||(c="a"),a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("ca","ca",{closeText:"Tanca",prevText:"Anterior",nextText:"Següent",currentText:"Avui",monthNames:["gener","febrer","març","abril","maig","juny","juliol","agost","setembre","octubre","novembre","desembre"],monthNamesShort:["gen","feb","març","abr","maig","juny","jul","ag","set","oct","nov","des"],dayNames:["diumenge","dilluns","dimarts","dimecres","dijous","divendres","dissabte"],dayNamesShort:["dg","dl","dt","dc","dj","dv","ds"],dayNamesMin:["dg","dl","dt","dc","dj","dv","ds"],weekHeader:"Set",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ca",{buttonText:{month:"Mes",week:"Setmana",day:"Dia",list:"Agenda"},allDayText:"Tot el dia",eventLimitText:"més"})}(),function(){!function(){"use strict";function a(a){return a>1&&5>a&&1!==~~(a/10)}function c(b,c,d,e){var f=b+" ";switch(d){case"s":return c||e?"pár sekund":"pár sekundami";case"m":return c?"minuta":e?"minutu":"minutou";case"mm":return c||e?f+(a(b)?"minuty":"minut"):f+"minutami";case"h":return c?"hodina":e?"hodinu":"hodinou";case"hh":return c||e?f+(a(b)?"hodiny":"hodin"):f+"hodinami";case"d":return c||e?"den":"dnem";case"dd":return c||e?f+(a(b)?"dny":"dní"):f+"dny";case"M":return c||e?"měsíc":"měsícem";case"MM":return c||e?f+(a(b)?"měsíce":"měsíců"):f+"měsíci";case"y":return c||e?"rok":"rokem";case"yy":return c||e?f+(a(b)?"roky":"let"):f+"lety"}}var d="leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec".split("_"),e="led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro".split("_"),f=(b.defineLocale||b.lang).call(b,"cs",{months:d,monthsShort:e,monthsParse:function(a,b){var c,d=[];for(c=0;12>c;c++)d[c]=new RegExp("^"+a[c]+"$|^"+b[c]+"$","i");return d}(d,e),shortMonthsParse:function(a){var b,c=[];for(b=0;12>b;b++)c[b]=new RegExp("^"+a[b]+"$","i");return c}(e),longMonthsParse:function(a){var b,c=[];for(b=0;12>b;b++)c[b]=new RegExp("^"+a[b]+"$","i");return c}(d),weekdays:"neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota".split("_"),weekdaysShort:"ne_po_út_st_čt_pá_so".split("_"),weekdaysMin:"ne_po_út_st_čt_pá_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd D. MMMM YYYY H:mm"},calendar:{sameDay:"[dnes v] LT",nextDay:"[zítra v] LT",nextWeek:function(){switch(this.day()){case 0:return"[v neděli v] LT";case 1:case 2:return"[v] dddd [v] LT";case 3:return"[ve středu v] LT";case 4:return"[ve čtvrtek v] LT";case 5:return"[v pátek v] LT";case 6:return"[v sobotu v] LT"}},lastDay:"[včera v] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulou neděli v] LT";case 1:case 2:return"[minulé] dddd [v] LT";case 3:return"[minulou středu v] LT";case 4:case 5:return"[minulý] dddd [v] LT";case 6:return"[minulou sobotu v] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"před %s",s:c,m:c,mm:c,h:c,hh:c,d:c,dd:c,M:c,MM:c,y:c,yy:c},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return f}(),a.fullCalendar.datepickerLang("cs","cs",{closeText:"Zavřít",prevText:"&#x3C;Dříve",nextText:"Později&#x3E;",currentText:"Nyní",monthNames:["leden","únor","březen","duben","květen","červen","červenec","srpen","září","říjen","listopad","prosinec"],monthNamesShort:["led","úno","bře","dub","kvě","čer","čvc","srp","zář","říj","lis","pro"],dayNames:["neděle","pondělí","úterý","středa","čtvrtek","pátek","sobota"],dayNamesShort:["ne","po","út","st","čt","pá","so"],dayNamesMin:["ne","po","út","st","čt","pá","so"],weekHeader:"Týd",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("cs",{buttonText:{month:"Měsíc",week:"Týden",day:"Den",list:"Agenda"},allDayText:"Celý den",eventLimitText:function(a){return"+další: "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"da",{months:"januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"søn_man_tir_ons_tor_fre_lør".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd [d.] D. MMMM YYYY HH:mm"},calendar:{sameDay:"[I dag kl.] LT",nextDay:"[I morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[I går kl.] LT",lastWeek:"[sidste] dddd [kl] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s siden",s:"få sekunder",m:"et minut",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dage",M:"en måned",MM:"%d måneder",y:"et år",yy:"%d år"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("da","da",{closeText:"Luk",prevText:"&#x3C;Forrige",nextText:"Næste&#x3E;",currentText:"Idag",monthNames:["Januar","Februar","Marts","April","Maj","Juni","Juli","August","September","Oktober","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec"],dayNames:["Søndag","Mandag","Tirsdag","Onsdag","Torsdag","Fredag","Lørdag"],dayNamesShort:["Søn","Man","Tir","Ons","Tor","Fre","Lør"],dayNamesMin:["Sø","Ma","Ti","On","To","Fr","Lø"],weekHeader:"Uge",dateFormat:"dd-mm-yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("da",{buttonText:{month:"Måned",week:"Uge",day:"Dag",list:"Agenda"},allDayText:"Hele dagen",eventLimitText:"flere"})}(),function(){!function(){"use strict";function a(a,b,c,d){var e={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[a+" Tage",a+" Tagen"],M:["ein Monat","einem Monat"],MM:[a+" Monate",a+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[a+" Jahre",a+" Jahren"]};return b?e[c][0]:e[c][1]}var c=(b.defineLocale||b.lang).call(b,"de-at",{months:"Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jän._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},calendar:{sameDay:"[heute um] LT [Uhr]",sameElse:"L",nextDay:"[morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",m:a,mm:"%d Minuten",h:a,hh:"%d Stunden",d:a,dd:a,M:a,MM:a,y:a,yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return c}(),a.fullCalendar.datepickerLang("de-at","de",{closeText:"Schließen",prevText:"&#x3C;Zurück",nextText:"Vor&#x3E;",currentText:"Heute",monthNames:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],monthNamesShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],dayNames:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],dayNamesShort:["So","Mo","Di","Mi","Do","Fr","Sa"],dayNamesMin:["So","Mo","Di","Mi","Do","Fr","Sa"],weekHeader:"KW",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("de-at",{buttonText:{month:"Monat",week:"Woche",day:"Tag",list:"Terminübersicht"},allDayText:"Ganztägig",eventLimitText:function(a){return"+ weitere "+a}})}(),function(){!function(){"use strict";function a(a,b,c,d){var e={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[a+" Tage",a+" Tagen"],M:["ein Monat","einem Monat"],MM:[a+" Monate",a+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[a+" Jahre",a+" Jahren"]};return b?e[c][0]:e[c][1]}var c=(b.defineLocale||b.lang).call(b,"de",{months:"Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},calendar:{sameDay:"[heute um] LT [Uhr]",sameElse:"L",nextDay:"[morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",m:a,mm:"%d Minuten",h:a,hh:"%d Stunden",d:a,dd:a,M:a,MM:a,y:a,yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return c}(),a.fullCalendar.datepickerLang("de","de",{closeText:"Schließen",prevText:"&#x3C;Zurück",nextText:"Vor&#x3E;",currentText:"Heute",monthNames:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],monthNamesShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],dayNames:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],dayNamesShort:["So","Mo","Di","Mi","Do","Fr","Sa"],dayNamesMin:["So","Mo","Di","Mi","Do","Fr","Sa"],weekHeader:"KW",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("de",{buttonText:{month:"Monat",week:"Woche",day:"Tag",list:"Terminübersicht"},allDayText:"Ganztägig",eventLimitText:function(a){return"+ weitere "+a}})}(),function(){!function(){"use strict";function a(a){return a instanceof Function||"[object Function]"===Object.prototype.toString.call(a)}var c=(b.defineLocale||b.lang).call(b,"el",{monthsNominativeEl:"Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος".split("_"),monthsGenitiveEl:"Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου".split("_"),months:function(a,b){return/D/.test(b.substring(0,b.indexOf("MMMM")))?this._monthsGenitiveEl[a.month()]:this._monthsNominativeEl[a.month()]},monthsShort:"Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ".split("_"),weekdays:"Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο".split("_"),weekdaysShort:"Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ".split("_"),weekdaysMin:"Κυ_Δε_Τρ_Τε_Πε_Πα_Σα".split("_"),meridiem:function(a,b,c){return a>11?c?"μμ":"ΜΜ":c?"πμ":"ΠΜ"},isPM:function(a){return"μ"===(a+"").toLowerCase()[0]},meridiemParse:/[ΠΜ]\.?Μ?\.?/i,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendarEl:{sameDay:"[Σήμερα {}] LT",nextDay:"[Αύριο {}] LT",nextWeek:"dddd [{}] LT",lastDay:"[Χθες {}] LT",lastWeek:function(){switch(this.day()){case 6:return"[το προηγούμενο] dddd [{}] LT";default:return"[την προηγούμενη] dddd [{}] LT"}},sameElse:"L"},calendar:function(b,c){var d=this._calendarEl[b],e=c&&c.hours();return a(d)&&(d=d.apply(c)),d.replace("{}",e%12===1?"στη":"στις")},relativeTime:{future:"σε %s",past:"%s πριν",s:"λίγα δευτερόλεπτα",m:"ένα λεπτό",mm:"%d λεπτά",h:"μία ώρα",hh:"%d ώρες",d:"μία μέρα",dd:"%d μέρες",M:"ένας μήνας",MM:"%d μήνες",y:"ένας χρόνος",yy:"%d χρόνια"},ordinalParse:/\d{1,2}η/,ordinal:"%dη",week:{dow:1,doy:4}});return c}(),a.fullCalendar.datepickerLang("el","el",{closeText:"Κλείσιμο",prevText:"Προηγούμενος",nextText:"Επόμενος",currentText:"Σήμερα",monthNames:["Ιανουάριος","Φεβρουάριος","Μάρτιος","Απρίλιος","Μάιος","Ιούνιος","Ιούλιος","Αύγουστος","Σεπτέμβριος","Οκτώβριος","Νοέμβριος","Δεκέμβριος"],monthNamesShort:["Ιαν","Φεβ","Μαρ","Απρ","Μαι","Ιουν","Ιουλ","Αυγ","Σεπ","Οκτ","Νοε","Δεκ"],dayNames:["Κυριακή","Δευτέρα","Τρίτη","Τετάρτη","Πέμπτη","Παρασκευή","Σάββατο"],dayNamesShort:["Κυρ","Δευ","Τρι","Τετ","Πεμ","Παρ","Σαβ"],dayNamesMin:["Κυ","Δε","Τρ","Τε","Πε","Πα","Σα"],weekHeader:"Εβδ",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("el",{buttonText:{month:"Μήνας",week:"Εβδομάδα",day:"Ημέρα",list:"Ατζέντα"},allDayText:"Ολοήμερο",eventLimitText:"περισσότερα"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"en-au",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("en-au","en-AU",{closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("en-au")}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"en-ca",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"YYYY-MM-DD",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}});return a}(),a.fullCalendar.lang("en-ca")}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"en-gb",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("en-gb","en-GB",{closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("en-gb")}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"en-ie",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.lang("en-ie")}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"en-nz",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("en-nz","en-NZ",{closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("en-nz")}(),function(){!function(){"use strict";var a="ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),c="ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),d=(b.defineLocale||b.lang).call(b,"es",{
+months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:function(b,d){return/-MMM-/.test(d)?c[b.month()]:a[b.month()]},monthsParseExact:!0,weekdays:"domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),weekdaysShort:"dom._lun._mar._mié._jue._vie._sáb.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_sá".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[mañana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}});return d}(),a.fullCalendar.datepickerLang("es","es",{closeText:"Cerrar",prevText:"&#x3C;Ant",nextText:"Sig&#x3E;",currentText:"Hoy",monthNames:["enero","febrero","marzo","abril","mayo","junio","julio","agosto","septiembre","octubre","noviembre","diciembre"],monthNamesShort:["ene","feb","mar","abr","may","jun","jul","ago","sep","oct","nov","dic"],dayNames:["domingo","lunes","martes","miércoles","jueves","viernes","sábado"],dayNamesShort:["dom","lun","mar","mié","jue","vie","sáb"],dayNamesMin:["D","L","M","X","J","V","S"],weekHeader:"Sm",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("es",{buttonText:{month:"Mes",week:"Semana",day:"Día",list:"Agenda"},allDayHtml:"Todo<br/>el día",eventLimitText:"más"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"eu",{months:"urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua".split("_"),monthsShort:"urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.".split("_"),monthsParseExact:!0,weekdays:"igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata".split("_"),weekdaysShort:"ig._al._ar._az._og._ol._lr.".split("_"),weekdaysMin:"ig_al_ar_az_og_ol_lr".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY[ko] MMMM[ren] D[a]",LLL:"YYYY[ko] MMMM[ren] D[a] HH:mm",LLLL:"dddd, YYYY[ko] MMMM[ren] D[a] HH:mm",l:"YYYY-M-D",ll:"YYYY[ko] MMM D[a]",lll:"YYYY[ko] MMM D[a] HH:mm",llll:"ddd, YYYY[ko] MMM D[a] HH:mm"},calendar:{sameDay:"[gaur] LT[etan]",nextDay:"[bihar] LT[etan]",nextWeek:"dddd LT[etan]",lastDay:"[atzo] LT[etan]",lastWeek:"[aurreko] dddd LT[etan]",sameElse:"L"},relativeTime:{future:"%s barru",past:"duela %s",s:"segundo batzuk",m:"minutu bat",mm:"%d minutu",h:"ordu bat",hh:"%d ordu",d:"egun bat",dd:"%d egun",M:"hilabete bat",MM:"%d hilabete",y:"urte bat",yy:"%d urte"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return a}(),a.fullCalendar.datepickerLang("eu","eu",{closeText:"Egina",prevText:"&#x3C;Aur",nextText:"Hur&#x3E;",currentText:"Gaur",monthNames:["urtarrila","otsaila","martxoa","apirila","maiatza","ekaina","uztaila","abuztua","iraila","urria","azaroa","abendua"],monthNamesShort:["urt.","ots.","mar.","api.","mai.","eka.","uzt.","abu.","ira.","urr.","aza.","abe."],dayNames:["igandea","astelehena","asteartea","asteazkena","osteguna","ostirala","larunbata"],dayNamesShort:["ig.","al.","ar.","az.","og.","ol.","lr."],dayNamesMin:["ig","al","ar","az","og","ol","lr"],weekHeader:"As",dateFormat:"yy-mm-dd",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("eu",{buttonText:{month:"Hilabetea",week:"Astea",day:"Eguna",list:"Agenda"},allDayHtml:"Egun<br/>osoa",eventLimitText:"gehiago"})}(),function(){!function(){"use strict";var a={1:"۱",2:"۲",3:"۳",4:"۴",5:"۵",6:"۶",7:"۷",8:"۸",9:"۹",0:"۰"},c={"۱":"1","۲":"2","۳":"3","۴":"4","۵":"5","۶":"6","۷":"7","۸":"8","۹":"9","۰":"0"},d=(b.defineLocale||b.lang).call(b,"fa",{months:"ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),monthsShort:"ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),weekdays:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysShort:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysMin:"ی_د_س_چ_پ_ج_ش".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},meridiemParse:/قبل از ظهر|بعد از ظهر/,isPM:function(a){return/بعد از ظهر/.test(a)},meridiem:function(a,b,c){return 12>a?"قبل از ظهر":"بعد از ظهر"},calendar:{sameDay:"[امروز ساعت] LT",nextDay:"[فردا ساعت] LT",nextWeek:"dddd [ساعت] LT",lastDay:"[دیروز ساعت] LT",lastWeek:"dddd [پیش] [ساعت] LT",sameElse:"L"},relativeTime:{future:"در %s",past:"%s پیش",s:"چندین ثانیه",m:"یک دقیقه",mm:"%d دقیقه",h:"یک ساعت",hh:"%d ساعت",d:"یک روز",dd:"%d روز",M:"یک ماه",MM:"%d ماه",y:"یک سال",yy:"%d سال"},preparse:function(a){return a.replace(/[۰-۹]/g,function(a){return c[a]}).replace(/،/g,",")},postformat:function(b){return b.replace(/\d/g,function(b){return a[b]}).replace(/,/g,"،")},ordinalParse:/\d{1,2}م/,ordinal:"%dم",week:{dow:6,doy:12}});return d}(),a.fullCalendar.datepickerLang("fa","fa",{closeText:"بستن",prevText:"&#x3C;قبلی",nextText:"بعدی&#x3E;",currentText:"امروز",monthNames:["ژانویه","فوریه","مارس","آوریل","مه","ژوئن","ژوئیه","اوت","سپتامبر","اکتبر","نوامبر","دسامبر"],monthNamesShort:["1","2","3","4","5","6","7","8","9","10","11","12"],dayNames:["يکشنبه","دوشنبه","سه‌شنبه","چهارشنبه","پنجشنبه","جمعه","شنبه"],dayNamesShort:["ی","د","س","چ","پ","ج","ش"],dayNamesMin:["ی","د","س","چ","پ","ج","ش"],weekHeader:"هف",dateFormat:"yy/mm/dd",firstDay:6,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("fa",{buttonText:{month:"ماه",week:"هفته",day:"روز",list:"برنامه"},allDayText:"تمام روز",eventLimitText:function(a){return"بیش از "+a}})}(),function(){!function(){"use strict";function a(a,b,d,e){var f="";switch(d){case"s":return e?"muutaman sekunnin":"muutama sekunti";case"m":return e?"minuutin":"minuutti";case"mm":f=e?"minuutin":"minuuttia";break;case"h":return e?"tunnin":"tunti";case"hh":f=e?"tunnin":"tuntia";break;case"d":return e?"päivän":"päivä";case"dd":f=e?"päivän":"päivää";break;case"M":return e?"kuukauden":"kuukausi";case"MM":f=e?"kuukauden":"kuukautta";break;case"y":return e?"vuoden":"vuosi";case"yy":f=e?"vuoden":"vuotta"}return f=c(a,e)+" "+f}function c(a,b){return 10>a?b?e[a]:d[a]:a}var d="nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän".split(" "),e=["nolla","yhden","kahden","kolmen","neljän","viiden","kuuden",d[7],d[8],d[9]],f=(b.defineLocale||b.lang).call(b,"fi",{months:"tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu".split("_"),monthsShort:"tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu".split("_"),weekdays:"sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai".split("_"),weekdaysShort:"su_ma_ti_ke_to_pe_la".split("_"),weekdaysMin:"su_ma_ti_ke_to_pe_la".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD.MM.YYYY",LL:"Do MMMM[ta] YYYY",LLL:"Do MMMM[ta] YYYY, [klo] HH.mm",LLLL:"dddd, Do MMMM[ta] YYYY, [klo] HH.mm",l:"D.M.YYYY",ll:"Do MMM YYYY",lll:"Do MMM YYYY, [klo] HH.mm",llll:"ddd, Do MMM YYYY, [klo] HH.mm"},calendar:{sameDay:"[tänään] [klo] LT",nextDay:"[huomenna] [klo] LT",nextWeek:"dddd [klo] LT",lastDay:"[eilen] [klo] LT",lastWeek:"[viime] dddd[na] [klo] LT",sameElse:"L"},relativeTime:{future:"%s päästä",past:"%s sitten",s:a,m:a,mm:a,h:a,hh:a,d:a,dd:a,M:a,MM:a,y:a,yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return f}(),a.fullCalendar.datepickerLang("fi","fi",{closeText:"Sulje",prevText:"&#xAB;Edellinen",nextText:"Seuraava&#xBB;",currentText:"Tänään",monthNames:["Tammikuu","Helmikuu","Maaliskuu","Huhtikuu","Toukokuu","Kesäkuu","Heinäkuu","Elokuu","Syyskuu","Lokakuu","Marraskuu","Joulukuu"],monthNamesShort:["Tammi","Helmi","Maalis","Huhti","Touko","Kesä","Heinä","Elo","Syys","Loka","Marras","Joulu"],dayNamesShort:["Su","Ma","Ti","Ke","To","Pe","La"],dayNames:["Sunnuntai","Maanantai","Tiistai","Keskiviikko","Torstai","Perjantai","Lauantai"],dayNamesMin:["Su","Ma","Ti","Ke","To","Pe","La"],weekHeader:"Vk",dateFormat:"d.m.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("fi",{buttonText:{month:"Kuukausi",week:"Viikko",day:"Päivä",list:"Tapahtumat"},allDayText:"Koko päivä",eventLimitText:"lisää"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"fr-ca",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),monthsParseExact:!0,weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinalParse:/\d{1,2}(er|e)/,ordinal:function(a){return a+(1===a?"er":"e")}});return a}(),a.fullCalendar.datepickerLang("fr-ca","fr-CA",{closeText:"Fermer",prevText:"Précédent",nextText:"Suivant",currentText:"Aujourd'hui",monthNames:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],monthNamesShort:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","déc."],dayNames:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],dayNamesShort:["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],dayNamesMin:["D","L","M","M","J","V","S"],weekHeader:"Sem.",dateFormat:"yy-mm-dd",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("fr-ca",{buttonText:{year:"Année",month:"Mois",week:"Semaine",day:"Jour",list:"Mon planning"},allDayHtml:"Toute la<br/>journée",eventLimitText:"en plus"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"fr-ch",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),monthsParseExact:!0,weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinalParse:/\d{1,2}(er|e)/,ordinal:function(a){return a+(1===a?"er":"e")},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("fr-ch","fr-CH",{closeText:"Fermer",prevText:"&#x3C;Préc",nextText:"Suiv&#x3E;",currentText:"Courant",monthNames:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],monthNamesShort:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","déc."],dayNames:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],dayNamesShort:["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],dayNamesMin:["D","L","M","M","J","V","S"],weekHeader:"Sm",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("fr-ch",{buttonText:{year:"Année",month:"Mois",week:"Semaine",day:"Jour",list:"Mon planning"},allDayHtml:"Toute la<br/>journée",eventLimitText:"en plus"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"fr",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),monthsParseExact:!0,weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinalParse:/\d{1,2}(er|)/,ordinal:function(a){return a+(1===a?"er":"")},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("fr","fr",{closeText:"Fermer",prevText:"Précédent",nextText:"Suivant",currentText:"Aujourd'hui",monthNames:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],monthNamesShort:["janv.","févr.","mars","avr.","mai","juin","juil.","août","sept.","oct.","nov.","déc."],dayNames:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],dayNamesShort:["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],dayNamesMin:["D","L","M","M","J","V","S"],weekHeader:"Sem.",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("fr",{buttonText:{year:"Année",month:"Mois",week:"Semaine",day:"Jour",list:"Mon planning"},allDayHtml:"Toute la<br/>journée",eventLimitText:"en plus"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"gl",{months:"Xaneiro_Febreiro_Marzo_Abril_Maio_Xuño_Xullo_Agosto_Setembro_Outubro_Novembro_Decembro".split("_"),monthsShort:"Xan._Feb._Mar._Abr._Mai._Xuñ._Xul._Ago._Set._Out._Nov._Dec.".split("_"),monthsParseExact:!0,weekdays:"Domingo_Luns_Martes_Mércores_Xoves_Venres_Sábado".split("_"),weekdaysShort:"Dom._Lun._Mar._Mér._Xov._Ven._Sáb.".split("_"),weekdaysMin:"Do_Lu_Ma_Mé_Xo_Ve_Sá".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd D MMMM YYYY H:mm"},calendar:{sameDay:function(){return"[hoxe "+(1!==this.hours()?"ás":"á")+"] LT"},nextDay:function(){return"[mañá "+(1!==this.hours()?"ás":"á")+"] LT"},nextWeek:function(){return"dddd ["+(1!==this.hours()?"ás":"a")+"] LT"},lastDay:function(){return"[onte "+(1!==this.hours()?"á":"a")+"] LT"},lastWeek:function(){return"[o] dddd [pasado "+(1!==this.hours()?"ás":"a")+"] LT"},sameElse:"L"},relativeTime:{future:function(a){return"uns segundos"===a?"nuns segundos":"en "+a},past:"hai %s",s:"uns segundos",m:"un minuto",mm:"%d minutos",h:"unha hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:7}});return a}(),a.fullCalendar.datepickerLang("gl","gl",{closeText:"Pechar",prevText:"&#x3C;Ant",nextText:"Seg&#x3E;",currentText:"Hoxe",monthNames:["Xaneiro","Febreiro","Marzo","Abril","Maio","Xuño","Xullo","Agosto","Setembro","Outubro","Novembro","Decembro"],monthNamesShort:["Xan","Feb","Mar","Abr","Mai","Xuñ","Xul","Ago","Set","Out","Nov","Dec"],dayNames:["Domingo","Luns","Martes","Mércores","Xoves","Venres","Sábado"],dayNamesShort:["Dom","Lun","Mar","Mér","Xov","Ven","Sáb"],dayNamesMin:["Do","Lu","Ma","Mé","Xo","Ve","Sá"],weekHeader:"Sm",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("gl",{buttonText:{month:"Mes",week:"Semana",day:"Día",list:"Axenda"},allDayHtml:"Todo<br/>o día",eventLimitText:"máis"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"he",{months:"ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר".split("_"),monthsShort:"ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳".split("_"),weekdays:"ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת".split("_"),weekdaysShort:"א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳".split("_"),weekdaysMin:"א_ב_ג_ד_ה_ו_ש".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [ב]MMMM YYYY",LLL:"D [ב]MMMM YYYY HH:mm",LLLL:"dddd, D [ב]MMMM YYYY HH:mm",l:"D/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"},calendar:{sameDay:"[היום ב־]LT",nextDay:"[מחר ב־]LT",nextWeek:"dddd [בשעה] LT",lastDay:"[אתמול ב־]LT",lastWeek:"[ביום] dddd [האחרון בשעה] LT",sameElse:"L"},relativeTime:{future:"בעוד %s",past:"לפני %s",s:"מספר שניות",m:"דקה",mm:"%d דקות",h:"שעה",hh:function(a){return 2===a?"שעתיים":a+" שעות"},d:"יום",dd:function(a){return 2===a?"יומיים":a+" ימים"},M:"חודש",MM:function(a){return 2===a?"חודשיים":a+" חודשים"},y:"שנה",yy:function(a){return 2===a?"שנתיים":a%10===0&&10!==a?a+" שנה":a+" שנים"}},meridiemParse:/אחה"צ|לפנה"צ|אחרי הצהריים|לפני הצהריים|לפנות בוקר|בבוקר|בערב/i,isPM:function(a){return/^(אחה"צ|אחרי הצהריים|בערב)$/.test(a)},meridiem:function(a,b,c){return 5>a?"לפנות בוקר":10>a?"בבוקר":12>a?c?'לפנה"צ':"לפני הצהריים":18>a?c?'אחה"צ':"אחרי הצהריים":"בערב"}});return a}(),a.fullCalendar.datepickerLang("he","he",{closeText:"סגור",prevText:"&#x3C;הקודם",nextText:"הבא&#x3E;",currentText:"היום",monthNames:["ינואר","פברואר","מרץ","אפריל","מאי","יוני","יולי","אוגוסט","ספטמבר","אוקטובר","נובמבר","דצמבר"],monthNamesShort:["ינו","פבר","מרץ","אפר","מאי","יוני","יולי","אוג","ספט","אוק","נוב","דצמ"],dayNames:["ראשון","שני","שלישי","רביעי","חמישי","שישי","שבת"],dayNamesShort:["א'","ב'","ג'","ד'","ה'","ו'","שבת"],dayNamesMin:["א'","ב'","ג'","ד'","ה'","ו'","שבת"],weekHeader:"Wk",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!0,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("he",{defaultButtonText:{month:"חודש",week:"שבוע",day:"יום",list:"סדר יום"},weekNumberTitle:"שבוע",allDayText:"כל היום",eventLimitText:"אחר"})}(),function(){!function(){"use strict";var a={1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"},c={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"},d=(b.defineLocale||b.lang).call(b,"hi",{months:"जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर".split("_"),monthsShort:"जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.".split("_"),monthsParseExact:!0,weekdays:"रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार".split("_"),weekdaysShort:"रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि".split("_"),weekdaysMin:"र_सो_मं_बु_गु_शु_श".split("_"),longDateFormat:{LT:"A h:mm बजे",LTS:"A h:mm:ss बजे",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm बजे",LLLL:"dddd, D MMMM YYYY, A h:mm बजे"},calendar:{sameDay:"[आज] LT",nextDay:"[कल] LT",nextWeek:"dddd, LT",lastDay:"[कल] LT",lastWeek:"[पिछले] dddd, LT",sameElse:"L"},relativeTime:{future:"%s में",past:"%s पहले",s:"कुछ ही क्षण",m:"एक मिनट",mm:"%d मिनट",h:"एक घंटा",hh:"%d घंटे",d:"एक दिन",dd:"%d दिन",M:"एक महीने",MM:"%d महीने",y:"एक वर्ष",yy:"%d वर्ष"},preparse:function(a){return a.replace(/[१२३४५६७८९०]/g,function(a){return c[a]})},postformat:function(b){return b.replace(/\d/g,function(b){return a[b]})},meridiemParse:/रात|सुबह|दोपहर|शाम/,meridiemHour:function(a,b){return 12===a&&(a=0),"रात"===b?4>a?a:a+12:"सुबह"===b?a:"दोपहर"===b?a>=10?a:a+12:"शाम"===b?a+12:void 0},meridiem:function(a,b,c){return 4>a?"रात":10>a?"सुबह":17>a?"दोपहर":20>a?"शाम":"रात"},week:{dow:0,doy:6}});return d}(),a.fullCalendar.datepickerLang("hi","hi",{closeText:"बंद",prevText:"पिछला",nextText:"अगला",currentText:"आज",monthNames:["जनवरी ","फरवरी","मार्च","अप्रेल","मई","जून","जूलाई","अगस्त ","सितम्बर","अक्टूबर","नवम्बर","दिसम्बर"],monthNamesShort:["जन","फर","मार्च","अप्रेल","मई","जून","जूलाई","अग","सित","अक्ट","नव","दि"],dayNames:["रविवार","सोमवार","मंगलवार","बुधवार","गुरुवार","शुक्रवार","शनिवार"],dayNamesShort:["रवि","सोम","मंगल","बुध","गुरु","शुक्र","शनि"],dayNamesMin:["रवि","सोम","मंगल","बुध","गुरु","शुक्र","शनि"],weekHeader:"हफ्ता",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("hi",{buttonText:{month:"महीना",week:"सप्ताह",day:"दिन",list:"कार्यसूची"},allDayText:"सभी दिन",eventLimitText:function(a){return"+अधिक "+a}})}(),function(){!function(){"use strict";function a(a,b,c){var d=a+" ";switch(c){case"m":return b?"jedna minuta":"jedne minute";case"mm":return d+=1===a?"minuta":2===a||3===a||4===a?"minute":"minuta";case"h":return b?"jedan sat":"jednog sata";case"hh":return d+=1===a?"sat":2===a||3===a||4===a?"sata":"sati";case"dd":return d+=1===a?"dan":"dana";case"MM":return d+=1===a?"mjesec":2===a||3===a||4===a?"mjeseca":"mjeseci";case"yy":return d+=1===a?"godina":2===a||3===a||4===a?"godine":"godina"}}var c=(b.defineLocale||b.lang).call(b,"hr",{months:{format:"siječnja_veljače_ožujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca".split("_"),standalone:"siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac".split("_")},monthsShort:"sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.".split("_"),monthsParseExact:!0,weekdays:"nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._čet._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_če_pe_su".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[jučer u] LT",lastWeek:function(){switch(this.day()){case 0:case 3:return"[prošlu] dddd [u] LT";case 6:return"[prošle] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[prošli] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",m:a,mm:a,h:a,hh:a,d:"dan",dd:a,M:"mjesec",MM:a,y:"godinu",yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("hr","hr",{closeText:"Zatvori",prevText:"&#x3C;",nextText:"&#x3E;",currentText:"Danas",monthNames:["Siječanj","Veljača","Ožujak","Travanj","Svibanj","Lipanj","Srpanj","Kolovoz","Rujan","Listopad","Studeni","Prosinac"],monthNamesShort:["Sij","Velj","Ožu","Tra","Svi","Lip","Srp","Kol","Ruj","Lis","Stu","Pro"],dayNames:["Nedjelja","Ponedjeljak","Utorak","Srijeda","Četvrtak","Petak","Subota"],dayNamesShort:["Ned","Pon","Uto","Sri","Čet","Pet","Sub"],dayNamesMin:["Ne","Po","Ut","Sr","Če","Pe","Su"],weekHeader:"Tje",dateFormat:"dd.mm.yy.",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("hr",{buttonText:{month:"Mjesec",week:"Tjedan",day:"Dan",list:"Raspored"},allDayText:"Cijeli dan",eventLimitText:function(a){return"+ još "+a}})}(),function(){!function(){"use strict";function a(a,b,c,d){var e=a;switch(c){case"s":return d||b?"néhány másodperc":"néhány másodperce";case"m":return"egy"+(d||b?" perc":" perce");case"mm":return e+(d||b?" perc":" perce");case"h":return"egy"+(d||b?" óra":" órája");case"hh":return e+(d||b?" óra":" órája");case"d":return"egy"+(d||b?" nap":" napja");case"dd":return e+(d||b?" nap":" napja");case"M":return"egy"+(d||b?" hónap":" hónapja");case"MM":return e+(d||b?" hónap":" hónapja");case"y":return"egy"+(d||b?" év":" éve");case"yy":return e+(d||b?" év":" éve")}return""}function c(a){return(a?"":"[múlt] ")+"["+d[this.day()]+"] LT[-kor]"}var d="vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton".split(" "),e=(b.defineLocale||b.lang).call(b,"hu",{months:"január_február_március_április_május_június_július_augusztus_szeptember_október_november_december".split("_"),monthsShort:"jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec".split("_"),weekdays:"vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat".split("_"),weekdaysShort:"vas_hét_kedd_sze_csüt_pén_szo".split("_"),weekdaysMin:"v_h_k_sze_cs_p_szo".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"YYYY.MM.DD.",LL:"YYYY. MMMM D.",LLL:"YYYY. MMMM D. H:mm",LLLL:"YYYY. MMMM D., dddd H:mm"},meridiemParse:/de|du/i,isPM:function(a){return"u"===a.charAt(1).toLowerCase()},meridiem:function(a,b,c){return 12>a?c===!0?"de":"DE":c===!0?"du":"DU"},calendar:{sameDay:"[ma] LT[-kor]",nextDay:"[holnap] LT[-kor]",nextWeek:function(){return c.call(this,!0)},lastDay:"[tegnap] LT[-kor]",lastWeek:function(){return c.call(this,!1)},sameElse:"L"},relativeTime:{future:"%s múlva",past:"%s",s:a,m:a,mm:a,h:a,hh:a,d:a,dd:a,M:a,MM:a,y:a,yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return e}(),a.fullCalendar.datepickerLang("hu","hu",{closeText:"bezár",prevText:"vissza",nextText:"előre",currentText:"ma",monthNames:["Január","Február","Március","Április","Május","Június","Július","Augusztus","Szeptember","Október","November","December"],monthNamesShort:["Jan","Feb","Már","Ápr","Máj","Jún","Júl","Aug","Szep","Okt","Nov","Dec"],dayNames:["Vasárnap","Hétfő","Kedd","Szerda","Csütörtök","Péntek","Szombat"],dayNamesShort:["Vas","Hét","Ked","Sze","Csü","Pén","Szo"],dayNamesMin:["V","H","K","Sze","Cs","P","Szo"],weekHeader:"Hét",dateFormat:"yy.mm.dd.",firstDay:1,isRTL:!1,showMonthAfterYear:!0,yearSuffix:""}),a.fullCalendar.lang("hu",{buttonText:{month:"Hónap",week:"Hét",day:"Nap",list:"Napló"},allDayText:"Egész nap",eventLimitText:"további"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"id",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des".split("_"),weekdays:"Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu".split("_"),weekdaysShort:"Min_Sen_Sel_Rab_Kam_Jum_Sab".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},meridiemParse:/pagi|siang|sore|malam/,meridiemHour:function(a,b){return 12===a&&(a=0),"pagi"===b?a:"siang"===b?a>=11?a:a+12:"sore"===b||"malam"===b?a+12:void 0},meridiem:function(a,b,c){return 11>a?"pagi":15>a?"siang":19>a?"sore":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Besok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kemarin pukul] LT",lastWeek:"dddd [lalu pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lalu",s:"beberapa detik",m:"semenit",mm:"%d menit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}});return a}(),a.fullCalendar.datepickerLang("id","id",{closeText:"Tutup",prevText:"&#x3C;mundur",nextText:"maju&#x3E;",currentText:"hari ini",monthNames:["Januari","Februari","Maret","April","Mei","Juni","Juli","Agustus","September","Oktober","Nopember","Desember"],monthNamesShort:["Jan","Feb","Mar","Apr","Mei","Jun","Jul","Agus","Sep","Okt","Nop","Des"],dayNames:["Minggu","Senin","Selasa","Rabu","Kamis","Jumat","Sabtu"],dayNamesShort:["Min","Sen","Sel","Rab","kam","Jum","Sab"],dayNamesMin:["Mg","Sn","Sl","Rb","Km","jm","Sb"],weekHeader:"Mg",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("id",{buttonText:{month:"Bulan",week:"Minggu",day:"Hari",list:"Agenda"},allDayHtml:"Sehari<br/>penuh",eventLimitText:"lebih"})}(),function(){!function(){"use strict";function a(a){return a%100===11?!0:a%10!==1}function c(b,c,d,e){var f=b+" ";switch(d){case"s":return c||e?"nokkrar sekúndur":"nokkrum sekúndum";case"m":return c?"mínúta":"mínútu";case"mm":return a(b)?f+(c||e?"mínútur":"mínútum"):c?f+"mínúta":f+"mínútu";case"hh":return a(b)?f+(c||e?"klukkustundir":"klukkustundum"):f+"klukkustund";case"d":return c?"dagur":e?"dag":"degi";case"dd":return a(b)?c?f+"dagar":f+(e?"daga":"dögum"):c?f+"dagur":f+(e?"dag":"degi");case"M":return c?"mánuður":e?"mánuð":"mánuði";case"MM":return a(b)?c?f+"mánuðir":f+(e?"mánuði":"mánuðum"):c?f+"mánuður":f+(e?"mánuð":"mánuði");case"y":return c||e?"ár":"ári";case"yy":return a(b)?f+(c||e?"ár":"árum"):f+(c||e?"ár":"ári")}}var d=(b.defineLocale||b.lang).call(b,"is",{months:"janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember".split("_"),monthsShort:"jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des".split("_"),weekdays:"sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur".split("_"),weekdaysShort:"sun_mán_þri_mið_fim_fös_lau".split("_"),weekdaysMin:"Su_Má_Þr_Mi_Fi_Fö_La".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] H:mm",LLLL:"dddd, D. MMMM YYYY [kl.] H:mm"},calendar:{sameDay:"[í dag kl.] LT",nextDay:"[á morgun kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[í gær kl.] LT",lastWeek:"[síðasta] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"eftir %s",past:"fyrir %s síðan",s:c,m:c,mm:c,h:"klukkustund",hh:c,d:c,dd:c,M:c,MM:c,y:c,yy:c},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return d}(),a.fullCalendar.datepickerLang("is","is",{closeText:"Loka",prevText:"&#x3C; Fyrri",nextText:"Næsti &#x3E;",currentText:"Í dag",monthNames:["Janúar","Febrúar","Mars","Apríl","Maí","Júní","Júlí","Ágúst","September","Október","Nóvember","Desember"],monthNamesShort:["Jan","Feb","Mar","Apr","Maí","Jún","Júl","Ágú","Sep","Okt","Nóv","Des"],dayNames:["Sunnudagur","Mánudagur","Þriðjudagur","Miðvikudagur","Fimmtudagur","Föstudagur","Laugardagur"],dayNamesShort:["Sun","Mán","Þri","Mið","Fim","Fös","Lau"],dayNamesMin:["Su","Má","Þr","Mi","Fi","Fö","La"],weekHeader:"Vika",dateFormat:"dd.mm.yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("is",{buttonText:{month:"Mánuður",week:"Vika",day:"Dagur",list:"Dagskrá"},allDayHtml:"Allan<br/>daginn",eventLimitText:"meira"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"it",{months:"gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),monthsShort:"gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),weekdays:"Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato".split("_"),weekdaysShort:"Dom_Lun_Mar_Mer_Gio_Ven_Sab".split("_"),weekdaysMin:"Do_Lu_Ma_Me_Gi_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Oggi alle] LT",nextDay:"[Domani alle] LT",nextWeek:"dddd [alle] LT",lastDay:"[Ieri alle] LT",lastWeek:function(){switch(this.day()){case 0:return"[la scorsa] dddd [alle] LT";default:return"[lo scorso] dddd [alle] LT"}},sameElse:"L"},relativeTime:{future:function(a){return(/^[0-9].+$/.test(a)?"tra":"in")+" "+a},past:"%s fa",s:"alcuni secondi",m:"un minuto",mm:"%d minuti",h:"un'ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("it","it",{closeText:"Chiudi",prevText:"&#x3C;Prec",nextText:"Succ&#x3E;",currentText:"Oggi",monthNames:["Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre"],
+monthNamesShort:["Gen","Feb","Mar","Apr","Mag","Giu","Lug","Ago","Set","Ott","Nov","Dic"],dayNames:["Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"],dayNamesShort:["Dom","Lun","Mar","Mer","Gio","Ven","Sab"],dayNamesMin:["Do","Lu","Ma","Me","Gi","Ve","Sa"],weekHeader:"Sm",dateFormat:"dd/mm/yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("it",{buttonText:{month:"Mese",week:"Settimana",day:"Giorno",list:"Agenda"},allDayHtml:"Tutto il<br/>giorno",eventLimitText:function(a){return"+altri "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"ja",{months:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日".split("_"),weekdaysShort:"日_月_火_水_木_金_土".split("_"),weekdaysMin:"日_月_火_水_木_金_土".split("_"),longDateFormat:{LT:"Ah時m分",LTS:"Ah時m分s秒",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日Ah時m分",LLLL:"YYYY年M月D日Ah時m分 dddd"},meridiemParse:/午前|午後/i,isPM:function(a){return"午後"===a},meridiem:function(a,b,c){return 12>a?"午前":"午後"},calendar:{sameDay:"[今日] LT",nextDay:"[明日] LT",nextWeek:"[来週]dddd LT",lastDay:"[昨日] LT",lastWeek:"[前週]dddd LT",sameElse:"L"},ordinalParse:/\d{1,2}日/,ordinal:function(a,b){switch(b){case"d":case"D":case"DDD":return a+"日";default:return a}},relativeTime:{future:"%s後",past:"%s前",s:"数秒",m:"1分",mm:"%d分",h:"1時間",hh:"%d時間",d:"1日",dd:"%d日",M:"1ヶ月",MM:"%dヶ月",y:"1年",yy:"%d年"}});return a}(),a.fullCalendar.datepickerLang("ja","ja",{closeText:"閉じる",prevText:"&#x3C;前",nextText:"次&#x3E;",currentText:"今日",monthNames:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],monthNamesShort:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],dayNames:["日曜日","月曜日","火曜日","水曜日","木曜日","金曜日","土曜日"],dayNamesShort:["日","月","火","水","木","金","土"],dayNamesMin:["日","月","火","水","木","金","土"],weekHeader:"週",dateFormat:"yy/mm/dd",firstDay:0,isRTL:!1,showMonthAfterYear:!0,yearSuffix:"年"}),a.fullCalendar.lang("ja",{buttonText:{month:"月",week:"週",day:"日",list:"予定リスト"},allDayText:"終日",eventLimitText:function(a){return"他 "+a+" 件"}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"ko",{months:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),monthsShort:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),weekdays:"일요일_월요일_화요일_수요일_목요일_금요일_토요일".split("_"),weekdaysShort:"일_월_화_수_목_금_토".split("_"),weekdaysMin:"일_월_화_수_목_금_토".split("_"),longDateFormat:{LT:"A h시 m분",LTS:"A h시 m분 s초",L:"YYYY.MM.DD",LL:"YYYY년 MMMM D일",LLL:"YYYY년 MMMM D일 A h시 m분",LLLL:"YYYY년 MMMM D일 dddd A h시 m분"},calendar:{sameDay:"오늘 LT",nextDay:"내일 LT",nextWeek:"dddd LT",lastDay:"어제 LT",lastWeek:"지난주 dddd LT",sameElse:"L"},relativeTime:{future:"%s 후",past:"%s 전",s:"몇 초",ss:"%d초",m:"일분",mm:"%d분",h:"한 시간",hh:"%d시간",d:"하루",dd:"%d일",M:"한 달",MM:"%d달",y:"일 년",yy:"%d년"},ordinalParse:/\d{1,2}일/,ordinal:"%d일",meridiemParse:/오전|오후/,isPM:function(a){return"오후"===a},meridiem:function(a,b,c){return 12>a?"오전":"오후"}});return a}(),a.fullCalendar.datepickerLang("ko","ko",{closeText:"닫기",prevText:"이전달",nextText:"다음달",currentText:"오늘",monthNames:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],monthNamesShort:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],dayNames:["일요일","월요일","화요일","수요일","목요일","금요일","토요일"],dayNamesShort:["일","월","화","수","목","금","토"],dayNamesMin:["일","월","화","수","목","금","토"],weekHeader:"Wk",dateFormat:"yy-mm-dd",firstDay:0,isRTL:!1,showMonthAfterYear:!0,yearSuffix:"년"}),a.fullCalendar.lang("ko",{buttonText:{month:"월",week:"주",day:"일",list:"일정목록"},allDayText:"종일",eventLimitText:"개"})}(),function(){!function(){"use strict";function a(a,b,c,d){var e={m:["eng Minutt","enger Minutt"],h:["eng Stonn","enger Stonn"],d:["een Dag","engem Dag"],M:["ee Mount","engem Mount"],y:["ee Joer","engem Joer"]};return b?e[c][0]:e[c][1]}function c(a){var b=a.substr(0,a.indexOf(" "));return e(b)?"a "+a:"an "+a}function d(a){var b=a.substr(0,a.indexOf(" "));return e(b)?"viru "+a:"virun "+a}function e(a){if(a=parseInt(a,10),isNaN(a))return!1;if(0>a)return!0;if(10>a)return a>=4&&7>=a;if(100>a){var b=a%10,c=a/10;return e(0===b?c:b)}if(1e4>a){for(;a>=10;)a/=10;return e(a)}return a/=1e3,e(a)}var f=(b.defineLocale||b.lang).call(b,"lb",{months:"Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg".split("_"),weekdaysShort:"So._Mé._Dë._Më._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mé_Dë_Më_Do_Fr_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm [Auer]",LTS:"H:mm:ss [Auer]",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm [Auer]",LLLL:"dddd, D. MMMM YYYY H:mm [Auer]"},calendar:{sameDay:"[Haut um] LT",sameElse:"L",nextDay:"[Muer um] LT",nextWeek:"dddd [um] LT",lastDay:"[Gëschter um] LT",lastWeek:function(){switch(this.day()){case 2:case 4:return"[Leschten] dddd [um] LT";default:return"[Leschte] dddd [um] LT"}}},relativeTime:{future:c,past:d,s:"e puer Sekonnen",m:a,mm:"%d Minutten",h:a,hh:"%d Stonnen",d:a,dd:"%d Deeg",M:a,MM:"%d Méint",y:a,yy:"%d Joer"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return f}(),a.fullCalendar.datepickerLang("lb","lb",{closeText:"Fäerdeg",prevText:"Zréck",nextText:"Weider",currentText:"Haut",monthNames:["Januar","Februar","Mäerz","Abrëll","Mee","Juni","Juli","August","September","Oktober","November","Dezember"],monthNamesShort:["Jan","Feb","Mäe","Abr","Mee","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],dayNames:["Sonndeg","Méindeg","Dënschdeg","Mëttwoch","Donneschdeg","Freideg","Samschdeg"],dayNamesShort:["Son","Méi","Dën","Mët","Don","Fre","Sam"],dayNamesMin:["So","Mé","Dë","Më","Do","Fr","Sa"],weekHeader:"W",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("lb",{buttonText:{month:"Mount",week:"Woch",day:"Dag",list:"Terminiwwersiicht"},allDayText:"Ganzen Dag",eventLimitText:"méi"})}(),function(){!function(){"use strict";function a(a,b,c,d){return b?"kelios sekundės":d?"kelių sekundžių":"kelias sekundes"}function c(a,b,c,d){return b?e(c)[0]:d?e(c)[1]:e(c)[2]}function d(a){return a%10===0||a>10&&20>a}function e(a){return g[a].split("_")}function f(a,b,f,g){var h=a+" ";return 1===a?h+c(a,b,f[0],g):b?h+(d(a)?e(f)[1]:e(f)[0]):g?h+e(f)[1]:h+(d(a)?e(f)[1]:e(f)[2])}var g={m:"minutė_minutės_minutę",mm:"minutės_minučių_minutes",h:"valanda_valandos_valandą",hh:"valandos_valandų_valandas",d:"diena_dienos_dieną",dd:"dienos_dienų_dienas",M:"mėnuo_mėnesio_mėnesį",MM:"mėnesiai_mėnesių_mėnesius",y:"metai_metų_metus",yy:"metai_metų_metus"},h=(b.defineLocale||b.lang).call(b,"lt",{months:{format:"sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio".split("_"),standalone:"sausis_vasaris_kovas_balandis_gegužė_birželis_liepa_rugpjūtis_rugsėjis_spalis_lapkritis_gruodis".split("_")},monthsShort:"sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd".split("_"),weekdays:{format:"sekmadienį_pirmadienį_antradienį_trečiadienį_ketvirtadienį_penktadienį_šeštadienį".split("_"),standalone:"sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis".split("_"),isFormat:/dddd HH:mm/},weekdaysShort:"Sek_Pir_Ant_Tre_Ket_Pen_Šeš".split("_"),weekdaysMin:"S_P_A_T_K_Pn_Š".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY [m.] MMMM D [d.]",LLL:"YYYY [m.] MMMM D [d.], HH:mm [val.]",LLLL:"YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]",l:"YYYY-MM-DD",ll:"YYYY [m.] MMMM D [d.]",lll:"YYYY [m.] MMMM D [d.], HH:mm [val.]",llll:"YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]"},calendar:{sameDay:"[Šiandien] LT",nextDay:"[Rytoj] LT",nextWeek:"dddd LT",lastDay:"[Vakar] LT",lastWeek:"[Praėjusį] dddd LT",sameElse:"L"},relativeTime:{future:"po %s",past:"prieš %s",s:a,m:c,mm:f,h:c,hh:f,d:c,dd:f,M:c,MM:f,y:c,yy:f},ordinalParse:/\d{1,2}-oji/,ordinal:function(a){return a+"-oji"},week:{dow:1,doy:4}});return h}(),a.fullCalendar.datepickerLang("lt","lt",{closeText:"Uždaryti",prevText:"&#x3C;Atgal",nextText:"Pirmyn&#x3E;",currentText:"Šiandien",monthNames:["Sausis","Vasaris","Kovas","Balandis","Gegužė","Birželis","Liepa","Rugpjūtis","Rugsėjis","Spalis","Lapkritis","Gruodis"],monthNamesShort:["Sau","Vas","Kov","Bal","Geg","Bir","Lie","Rugp","Rugs","Spa","Lap","Gru"],dayNames:["sekmadienis","pirmadienis","antradienis","trečiadienis","ketvirtadienis","penktadienis","šeštadienis"],dayNamesShort:["sek","pir","ant","tre","ket","pen","šeš"],dayNamesMin:["Se","Pr","An","Tr","Ke","Pe","Še"],weekHeader:"SAV",dateFormat:"yy-mm-dd",firstDay:1,isRTL:!1,showMonthAfterYear:!0,yearSuffix:""}),a.fullCalendar.lang("lt",{buttonText:{month:"Mėnuo",week:"Savaitė",day:"Diena",list:"Darbotvarkė"},allDayText:"Visą dieną",eventLimitText:"daugiau"})}(),function(){!function(){"use strict";function a(a,b,c){return c?b%10===1&&11!==b?a[2]:a[3]:b%10===1&&11!==b?a[0]:a[1]}function c(b,c,d){return b+" "+a(f[d],b,c)}function d(b,c,d){return a(f[d],b,c)}function e(a,b){return b?"dažas sekundes":"dažām sekundēm"}var f={m:"minūtes_minūtēm_minūte_minūtes".split("_"),mm:"minūtes_minūtēm_minūte_minūtes".split("_"),h:"stundas_stundām_stunda_stundas".split("_"),hh:"stundas_stundām_stunda_stundas".split("_"),d:"dienas_dienām_diena_dienas".split("_"),dd:"dienas_dienām_diena_dienas".split("_"),M:"mēneša_mēnešiem_mēnesis_mēneši".split("_"),MM:"mēneša_mēnešiem_mēnesis_mēneši".split("_"),y:"gada_gadiem_gads_gadi".split("_"),yy:"gada_gadiem_gads_gadi".split("_")},g=(b.defineLocale||b.lang).call(b,"lv",{months:"janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris".split("_"),monthsShort:"jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec".split("_"),weekdays:"svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena".split("_"),weekdaysShort:"Sv_P_O_T_C_Pk_S".split("_"),weekdaysMin:"Sv_P_O_T_C_Pk_S".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY.",LL:"YYYY. [gada] D. MMMM",LLL:"YYYY. [gada] D. MMMM, HH:mm",LLLL:"YYYY. [gada] D. MMMM, dddd, HH:mm"},calendar:{sameDay:"[Šodien pulksten] LT",nextDay:"[Rīt pulksten] LT",nextWeek:"dddd [pulksten] LT",lastDay:"[Vakar pulksten] LT",lastWeek:"[Pagājušā] dddd [pulksten] LT",sameElse:"L"},relativeTime:{future:"pēc %s",past:"pirms %s",s:e,m:d,mm:c,h:d,hh:c,d:d,dd:c,M:d,MM:c,y:d,yy:c},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return g}(),a.fullCalendar.datepickerLang("lv","lv",{closeText:"Aizvērt",prevText:"Iepr.",nextText:"Nāk.",currentText:"Šodien",monthNames:["Janvāris","Februāris","Marts","Aprīlis","Maijs","Jūnijs","Jūlijs","Augusts","Septembris","Oktobris","Novembris","Decembris"],monthNamesShort:["Jan","Feb","Mar","Apr","Mai","Jūn","Jūl","Aug","Sep","Okt","Nov","Dec"],dayNames:["svētdiena","pirmdiena","otrdiena","trešdiena","ceturtdiena","piektdiena","sestdiena"],dayNamesShort:["svt","prm","otr","tre","ctr","pkt","sst"],dayNamesMin:["Sv","Pr","Ot","Tr","Ct","Pk","Ss"],weekHeader:"Ned.",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("lv",{buttonText:{month:"Mēnesis",week:"Nedēļa",day:"Diena",list:"Dienas kārtība"},allDayText:"Visu dienu",eventLimitText:function(a){return"+vēl "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"nb",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.".split("_"),monthsParseExact:!0,weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"sø._ma._ti._on._to._fr._lø.".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] HH:mm",LLLL:"dddd D. MMMM YYYY [kl.] HH:mm"},calendar:{sameDay:"[i dag kl.] LT",nextDay:"[i morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[i går kl.] LT",lastWeek:"[forrige] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s siden",s:"noen sekunder",m:"ett minutt",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dager",M:"en måned",MM:"%d måneder",y:"ett år",yy:"%d år"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("nb","nb",{closeText:"Lukk",prevText:"&#xAB;Forrige",nextText:"Neste&#xBB;",currentText:"I dag",monthNames:["januar","februar","mars","april","mai","juni","juli","august","september","oktober","november","desember"],monthNamesShort:["jan","feb","mar","apr","mai","jun","jul","aug","sep","okt","nov","des"],dayNamesShort:["søn","man","tir","ons","tor","fre","lør"],dayNames:["søndag","mandag","tirsdag","onsdag","torsdag","fredag","lørdag"],dayNamesMin:["sø","ma","ti","on","to","fr","lø"],weekHeader:"Uke",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("nb",{buttonText:{month:"Måned",week:"Uke",day:"Dag",list:"Agenda"},allDayText:"Hele dagen",eventLimitText:"til"})}(),function(){!function(){"use strict";var a="jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"),c="jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),d=(b.defineLocale||b.lang).call(b,"nl",{months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:function(b,d){return/-MMM-/.test(d)?c[b.month()]:a[b.month()]},monthsParseExact:!0,weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"Zo_Ma_Di_Wo_Do_Vr_Za".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[vandaag om] LT",nextDay:"[morgen om] LT",nextWeek:"dddd [om] LT",lastDay:"[gisteren om] LT",lastWeek:"[afgelopen] dddd [om] LT",sameElse:"L"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",m:"één minuut",mm:"%d minuten",h:"één uur",hh:"%d uur",d:"één dag",dd:"%d dagen",M:"één maand",MM:"%d maanden",y:"één jaar",yy:"%d jaar"},ordinalParse:/\d{1,2}(ste|de)/,ordinal:function(a){return a+(1===a||8===a||a>=20?"ste":"de")},week:{dow:1,doy:4}});return d}(),a.fullCalendar.datepickerLang("nl","nl",{closeText:"Sluiten",prevText:"←",nextText:"→",currentText:"Vandaag",monthNames:["januari","februari","maart","april","mei","juni","juli","augustus","september","oktober","november","december"],monthNamesShort:["jan","feb","mrt","apr","mei","jun","jul","aug","sep","okt","nov","dec"],dayNames:["zondag","maandag","dinsdag","woensdag","donderdag","vrijdag","zaterdag"],dayNamesShort:["zon","maa","din","woe","don","vri","zat"],dayNamesMin:["zo","ma","di","wo","do","vr","za"],weekHeader:"Wk",dateFormat:"dd-mm-yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("nl",{buttonText:{month:"Maand",week:"Week",day:"Dag",list:"Agenda"},allDayText:"Hele dag",eventLimitText:"extra"})}(),function(){!function(){"use strict";function a(a){return 5>a%10&&a%10>1&&~~(a/10)%10!==1}function c(b,c,d){var e=b+" ";switch(d){case"m":return c?"minuta":"minutę";case"mm":return e+(a(b)?"minuty":"minut");case"h":return c?"godzina":"godzinę";case"hh":return e+(a(b)?"godziny":"godzin");case"MM":return e+(a(b)?"miesiące":"miesięcy");case"yy":return e+(a(b)?"lata":"lat")}}var d="styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień".split("_"),e="stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia".split("_"),f=(b.defineLocale||b.lang).call(b,"pl",{months:function(a,b){return""===b?"("+e[a.month()]+"|"+d[a.month()]+")":/D MMMM/.test(b)?e[a.month()]:d[a.month()]},monthsShort:"sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru".split("_"),weekdays:"niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota".split("_"),weekdaysShort:"nie_pon_wt_śr_czw_pt_sb".split("_"),weekdaysMin:"Nd_Pn_Wt_Śr_Cz_Pt_So".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Dziś o] LT",nextDay:"[Jutro o] LT",nextWeek:"[W] dddd [o] LT",lastDay:"[Wczoraj o] LT",lastWeek:function(){switch(this.day()){case 0:return"[W zeszłą niedzielę o] LT";case 3:return"[W zeszłą środę o] LT";case 6:return"[W zeszłą sobotę o] LT";default:return"[W zeszły] dddd [o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"%s temu",s:"kilka sekund",m:c,mm:c,h:c,hh:c,d:"1 dzień",dd:"%d dni",M:"miesiąc",MM:c,y:"rok",yy:c},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return f}(),a.fullCalendar.datepickerLang("pl","pl",{closeText:"Zamknij",prevText:"&#x3C;Poprzedni",nextText:"Następny&#x3E;",currentText:"Dziś",monthNames:["Styczeń","Luty","Marzec","Kwiecień","Maj","Czerwiec","Lipiec","Sierpień","Wrzesień","Październik","Listopad","Grudzień"],monthNamesShort:["Sty","Lu","Mar","Kw","Maj","Cze","Lip","Sie","Wrz","Pa","Lis","Gru"],dayNames:["Niedziela","Poniedziałek","Wtorek","Środa","Czwartek","Piątek","Sobota"],dayNamesShort:["Nie","Pn","Wt","Śr","Czw","Pt","So"],dayNamesMin:["N","Pn","Wt","Śr","Cz","Pt","So"],weekHeader:"Tydz",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("pl",{buttonText:{month:"Miesiąc",week:"Tydzień",day:"Dzień",list:"Plan dnia"},allDayText:"Cały dzień",eventLimitText:"więcej"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"pt-br",{months:"Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),weekdaysMin:"Dom_2ª_3ª_4ª_5ª_6ª_Sáb".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY [às] HH:mm",LLLL:"dddd, D [de] MMMM [de] YYYY [às] HH:mm"},calendar:{sameDay:"[Hoje às] LT",nextDay:"[Amanhã às] LT",nextWeek:"dddd [às] LT",lastDay:"[Ontem às] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[Último] dddd [às] LT":"[Última] dddd [às] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"%s atrás",s:"poucos segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº"});return a}(),a.fullCalendar.datepickerLang("pt-br","pt-BR",{closeText:"Fechar",prevText:"&#x3C;Anterior",nextText:"Próximo&#x3E;",currentText:"Hoje",monthNames:["Janeiro","Fevereiro","Março","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],monthNamesShort:["Jan","Fev","Mar","Abr","Mai","Jun","Jul","Ago","Set","Out","Nov","Dez"],dayNames:["Domingo","Segunda-feira","Terça-feira","Quarta-feira","Quinta-feira","Sexta-feira","Sábado"],dayNamesShort:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],dayNamesMin:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],weekHeader:"Sm",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("pt-br",{buttonText:{month:"Mês",week:"Semana",day:"Dia",list:"Compromissos"},allDayText:"dia inteiro",eventLimitText:function(a){return"mais +"+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"pt",{months:"Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),weekdaysMin:"Dom_2ª_3ª_4ª_5ª_6ª_Sáb".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY HH:mm",LLLL:"dddd, D [de] MMMM [de] YYYY HH:mm"},calendar:{sameDay:"[Hoje às] LT",nextDay:"[Amanhã às] LT",nextWeek:"dddd [às] LT",lastDay:"[Ontem às] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[Último] dddd [às] LT":"[Última] dddd [às] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"há %s",s:"segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("pt","pt",{closeText:"Fechar",prevText:"Anterior",nextText:"Seguinte",currentText:"Hoje",monthNames:["Janeiro","Fevereiro","Março","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],monthNamesShort:["Jan","Fev","Mar","Abr","Mai","Jun","Jul","Ago","Set","Out","Nov","Dez"],dayNames:["Domingo","Segunda-feira","Terça-feira","Quarta-feira","Quinta-feira","Sexta-feira","Sábado"],dayNamesShort:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],dayNamesMin:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],weekHeader:"Sem",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("pt",{buttonText:{month:"Mês",week:"Semana",day:"Dia",list:"Agenda"},allDayText:"Todo o dia",eventLimitText:"mais"})}(),function(){!function(){"use strict";function a(a,b,c){var d={mm:"minute",hh:"ore",dd:"zile",MM:"luni",yy:"ani"},e=" ";return(a%100>=20||a>=100&&a%100===0)&&(e=" de "),a+e+d[c]}var c=(b.defineLocale||b.lang).call(b,"ro",{months:"ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie".split("_"),monthsShort:"ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"duminică_luni_marți_miercuri_joi_vineri_sâmbătă".split("_"),weekdaysShort:"Dum_Lun_Mar_Mie_Joi_Vin_Sâm".split("_"),weekdaysMin:"Du_Lu_Ma_Mi_Jo_Vi_Sâ".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[azi la] LT",nextDay:"[mâine la] LT",nextWeek:"dddd [la] LT",lastDay:"[ieri la] LT",lastWeek:"[fosta] dddd [la] LT",sameElse:"L"},relativeTime:{future:"peste %s",past:"%s în urmă",s:"câteva secunde",m:"un minut",mm:a,h:"o oră",hh:a,d:"o zi",dd:a,M:"o lună",MM:a,y:"un an",yy:a},week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("ro","ro",{closeText:"Închide",prevText:"&#xAB; Luna precedentă",nextText:"Luna următoare &#xBB;",currentText:"Azi",monthNames:["Ianuarie","Februarie","Martie","Aprilie","Mai","Iunie","Iulie","August","Septembrie","Octombrie","Noiembrie","Decembrie"],monthNamesShort:["Ian","Feb","Mar","Apr","Mai","Iun","Iul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Duminică","Luni","Marţi","Miercuri","Joi","Vineri","Sâmbătă"],dayNamesShort:["Dum","Lun","Mar","Mie","Joi","Vin","Sâm"],dayNamesMin:["Du","Lu","Ma","Mi","Jo","Vi","Sâ"],weekHeader:"Săpt",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ro",{buttonText:{prev:"precedentă",next:"următoare",month:"Lună",week:"Săptămână",day:"Zi",list:"Agendă"},allDayText:"Toată ziua",eventLimitText:function(a){return"+alte "+a}})}(),function(){!function(){"use strict";function a(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function c(b,c,d){var e={mm:c?"минута_минуты_минут":"минуту_минуты_минут",hh:"час_часа_часов",dd:"день_дня_дней",MM:"месяц_месяца_месяцев",yy:"год_года_лет"};return"m"===d?c?"минута":"минуту":b+" "+a(e[d],+b)}var d=[/^янв/i,/^фев/i,/^мар/i,/^апр/i,/^ма[йя]/i,/^июн/i,/^июл/i,/^авг/i,/^сен/i,/^окт/i,/^ноя/i,/^дек/i],e=(b.defineLocale||b.lang).call(b,"ru",{months:{format:"января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря".split("_"),standalone:"январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь".split("_")},monthsShort:{format:"янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.".split("_"),standalone:"янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.".split("_")},weekdays:{standalone:"воскресенье_понедельник_вторник_среда_четверг_пятница_суббота".split("_"),format:"воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу".split("_"),isFormat:/\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/},weekdaysShort:"вс_пн_вт_ср_чт_пт_сб".split("_"),weekdaysMin:"вс_пн_вт_ср_чт_пт_сб".split("_"),monthsParse:d,longMonthsParse:d,shortMonthsParse:d,monthsRegex:/^(сентябр[яь]|октябр[яь]|декабр[яь]|феврал[яь]|январ[яь]|апрел[яь]|августа?|ноябр[яь]|сент\.|февр\.|нояб\.|июнь|янв.|июль|дек.|авг.|апр.|марта|мар[.т]|окт.|июн[яь]|июл[яь]|ма[яй])/i,monthsShortRegex:/^(сентябр[яь]|октябр[яь]|декабр[яь]|феврал[яь]|январ[яь]|апрел[яь]|августа?|ноябр[яь]|сент\.|февр\.|нояб\.|июнь|янв.|июль|дек.|авг.|апр.|марта|мар[.т]|окт.|июн[яь]|июл[яь]|ма[яй])/i,monthsStrictRegex:/^(сентябр[яь]|октябр[яь]|декабр[яь]|феврал[яь]|январ[яь]|апрел[яь]|августа?|ноябр[яь]|марта?|июн[яь]|июл[яь]|ма[яй])/i,monthsShortStrictRegex:/^(нояб\.|февр\.|сент\.|июль|янв\.|июн[яь]|мар[.т]|авг\.|апр\.|окт\.|дек\.|ма[яй])/i,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., HH:mm",LLLL:"dddd, D MMMM YYYY г., HH:mm"},calendar:{sameDay:"[Сегодня в] LT",nextDay:"[Завтра в] LT",lastDay:"[Вчера в] LT",nextWeek:function(a){if(a.week()===this.week())return 2===this.day()?"[Во] dddd [в] LT":"[В] dddd [в] LT";switch(this.day()){case 0:return"[В следующее] dddd [в] LT";case 1:case 2:case 4:return"[В следующий] dddd [в] LT";case 3:case 5:case 6:return"[В следующую] dddd [в] LT"}},lastWeek:function(a){if(a.week()===this.week())return 2===this.day()?"[Во] dddd [в] LT":"[В] dddd [в] LT";switch(this.day()){case 0:return"[В прошлое] dddd [в] LT";case 1:case 2:case 4:return"[В прошлый] dddd [в] LT";case 3:case 5:case 6:return"[В прошлую] dddd [в] LT"}},sameElse:"L"},relativeTime:{future:"через %s",past:"%s назад",s:"несколько секунд",m:c,mm:c,h:"час",hh:c,d:"день",dd:c,M:"месяц",MM:c,y:"год",yy:c},meridiemParse:/ночи|утра|дня|вечера/i,isPM:function(a){return/^(дня|вечера)$/.test(a)},meridiem:function(a,b,c){return 4>a?"ночи":12>a?"утра":17>a?"дня":"вечера"},ordinalParse:/\d{1,2}-(й|го|я)/,ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":return a+"-й";case"D":return a+"-го";case"w":case"W":return a+"-я";default:return a}},week:{dow:1,doy:7}});return e}(),a.fullCalendar.datepickerLang("ru","ru",{closeText:"Закрыть",prevText:"&#x3C;Пред",nextText:"След&#x3E;",currentText:"Сегодня",monthNames:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"],monthNamesShort:["Янв","Фев","Мар","Апр","Май","Июн","Июл","Авг","Сен","Окт","Ноя","Дек"],dayNames:["воскресенье","понедельник","вторник","среда","четверг","пятница","суббота"],dayNamesShort:["вск","пнд","втр","срд","чтв","птн","сбт"],dayNamesMin:["Вс","Пн","Вт","Ср","Чт","Пт","Сб"],weekHeader:"Нед",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("ru",{buttonText:{month:"Месяц",week:"Неделя",day:"День",list:"Повестка дня"},allDayText:"Весь день",eventLimitText:function(a){return"+ ещё "+a}})}(),function(){!function(){"use strict";function a(a){return a>1&&5>a}function c(b,c,d,e){var f=b+" ";switch(d){case"s":return c||e?"pár sekúnd":"pár sekundami";case"m":return c?"minúta":e?"minútu":"minútou";case"mm":return c||e?f+(a(b)?"minúty":"minút"):f+"minútami";case"h":return c?"hodina":e?"hodinu":"hodinou";case"hh":return c||e?f+(a(b)?"hodiny":"hodín"):f+"hodinami";case"d":return c||e?"deň":"dňom";case"dd":return c||e?f+(a(b)?"dni":"dní"):f+"dňami";case"M":return c||e?"mesiac":"mesiacom";case"MM":return c||e?f+(a(b)?"mesiace":"mesiacov"):f+"mesiacmi";case"y":return c||e?"rok":"rokom";case"yy":return c||e?f+(a(b)?"roky":"rokov"):f+"rokmi"}}var d="január_február_marec_apríl_máj_jún_júl_august_september_október_november_december".split("_"),e="jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec".split("_"),f=(b.defineLocale||b.lang).call(b,"sk",{months:d,monthsShort:e,weekdays:"nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota".split("_"),weekdaysShort:"ne_po_ut_st_št_pi_so".split("_"),weekdaysMin:"ne_po_ut_st_št_pi_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd D. MMMM YYYY H:mm"},calendar:{sameDay:"[dnes o] LT",nextDay:"[zajtra o] LT",nextWeek:function(){switch(this.day()){case 0:return"[v nedeľu o] LT";case 1:case 2:return"[v] dddd [o] LT";case 3:return"[v stredu o] LT";case 4:return"[vo štvrtok o] LT";case 5:return"[v piatok o] LT";case 6:return"[v sobotu o] LT"}},lastDay:"[včera o] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulú nedeľu o] LT";case 1:case 2:return"[minulý] dddd [o] LT";case 3:return"[minulú stredu o] LT";case 4:case 5:return"[minulý] dddd [o] LT";case 6:return"[minulú sobotu o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"pred %s",s:c,m:c,mm:c,h:c,hh:c,d:c,dd:c,M:c,MM:c,y:c,yy:c},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return f}(),a.fullCalendar.datepickerLang("sk","sk",{closeText:"Zavrieť",prevText:"&#x3C;Predchádzajúci",nextText:"Nasledujúci&#x3E;",currentText:"Dnes",monthNames:["január","február","marec","apríl","máj","jún","júl","august","september","október","november","december"],monthNamesShort:["Jan","Feb","Mar","Apr","Máj","Jún","Júl","Aug","Sep","Okt","Nov","Dec"],dayNames:["nedeľa","pondelok","utorok","streda","štvrtok","piatok","sobota"],dayNamesShort:["Ned","Pon","Uto","Str","Štv","Pia","Sob"],dayNamesMin:["Ne","Po","Ut","St","Št","Pia","So"],weekHeader:"Ty",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("sk",{buttonText:{month:"Mesiac",week:"Týždeň",day:"Deň",list:"Rozvrh"},allDayText:"Celý deň",eventLimitText:function(a){return"+ďalšie: "+a}})}(),function(){!function(){"use strict";function a(a,b,c,d){var e=a+" ";switch(c){case"s":return b||d?"nekaj sekund":"nekaj sekundami";case"m":return b?"ena minuta":"eno minuto";case"mm":return e+=1===a?b?"minuta":"minuto":2===a?b||d?"minuti":"minutama":5>a?b||d?"minute":"minutami":b||d?"minut":"minutami";case"h":return b?"ena ura":"eno uro";case"hh":return e+=1===a?b?"ura":"uro":2===a?b||d?"uri":"urama":5>a?b||d?"ure":"urami":b||d?"ur":"urami";case"d":return b||d?"en dan":"enim dnem";case"dd":return e+=1===a?b||d?"dan":"dnem":2===a?b||d?"dni":"dnevoma":b||d?"dni":"dnevi";case"M":return b||d?"en mesec":"enim mesecem";case"MM":return e+=1===a?b||d?"mesec":"mesecem":2===a?b||d?"meseca":"mesecema":5>a?b||d?"mesece":"meseci":b||d?"mesecev":"meseci";case"y":return b||d?"eno leto":"enim letom";case"yy":return e+=1===a?b||d?"leto":"letom":2===a?b||d?"leti":"letoma":5>a?b||d?"leta":"leti":b||d?"let":"leti"}}var c=(b.defineLocale||b.lang).call(b,"sl",{months:"januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota".split("_"),weekdaysShort:"ned._pon._tor._sre._čet._pet._sob.".split("_"),weekdaysMin:"ne_po_to_sr_če_pe_so".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danes ob] LT",nextDay:"[jutri ob] LT",nextWeek:function(){switch(this.day()){case 0:return"[v] [nedeljo] [ob] LT";case 3:return"[v] [sredo] [ob] LT";case 6:return"[v] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[v] dddd [ob] LT"}},lastDay:"[včeraj ob] LT",lastWeek:function(){
+switch(this.day()){case 0:return"[prejšnjo] [nedeljo] [ob] LT";case 3:return"[prejšnjo] [sredo] [ob] LT";case 6:return"[prejšnjo] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[prejšnji] dddd [ob] LT"}},sameElse:"L"},relativeTime:{future:"čez %s",past:"pred %s",s:a,m:a,mm:a,h:a,hh:a,d:a,dd:a,M:a,MM:a,y:a,yy:a},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("sl","sl",{closeText:"Zapri",prevText:"&#x3C;Prejšnji",nextText:"Naslednji&#x3E;",currentText:"Trenutni",monthNames:["Januar","Februar","Marec","April","Maj","Junij","Julij","Avgust","September","Oktober","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Avg","Sep","Okt","Nov","Dec"],dayNames:["Nedelja","Ponedeljek","Torek","Sreda","Četrtek","Petek","Sobota"],dayNamesShort:["Ned","Pon","Tor","Sre","Čet","Pet","Sob"],dayNamesMin:["Ne","Po","To","Sr","Če","Pe","So"],weekHeader:"Teden",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("sl",{buttonText:{month:"Mesec",week:"Teden",day:"Dan",list:"Dnevni red"},allDayText:"Ves dan",eventLimitText:"več"})}(),function(){!function(){"use strict";var a={words:{m:["један минут","једне минуте"],mm:["минут","минуте","минута"],h:["један сат","једног сата"],hh:["сат","сата","сати"],dd:["дан","дана","дана"],MM:["месец","месеца","месеци"],yy:["година","године","година"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(b,c,d){var e=a.words[d];return 1===d.length?c?e[0]:e[1]:b+" "+a.correctGrammaticalCase(b,e)}},c=(b.defineLocale||b.lang).call(b,"sr-cyrl",{months:"јануар_фебруар_март_април_мај_јун_јул_август_септембар_октобар_новембар_децембар".split("_"),monthsShort:"јан._феб._мар._апр._мај_јун_јул_авг._сеп._окт._нов._дец.".split("_"),monthsParseExact:!0,weekdays:"недеља_понедељак_уторак_среда_четвртак_петак_субота".split("_"),weekdaysShort:"нед._пон._уто._сре._чет._пет._суб.".split("_"),weekdaysMin:"не_по_ут_ср_че_пе_су".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[данас у] LT",nextDay:"[сутра у] LT",nextWeek:function(){switch(this.day()){case 0:return"[у] [недељу] [у] LT";case 3:return"[у] [среду] [у] LT";case 6:return"[у] [суботу] [у] LT";case 1:case 2:case 4:case 5:return"[у] dddd [у] LT"}},lastDay:"[јуче у] LT",lastWeek:function(){var a=["[прошле] [недеље] [у] LT","[прошлог] [понедељка] [у] LT","[прошлог] [уторка] [у] LT","[прошле] [среде] [у] LT","[прошлог] [четвртка] [у] LT","[прошлог] [петка] [у] LT","[прошле] [суботе] [у] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"за %s",past:"пре %s",s:"неколико секунди",m:a.translate,mm:a.translate,h:a.translate,hh:a.translate,d:"дан",dd:a.translate,M:"месец",MM:a.translate,y:"годину",yy:a.translate},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("sr-cyrl","sr",{closeText:"Затвори",prevText:"&#x3C;",nextText:"&#x3E;",currentText:"Данас",monthNames:["Јануар","Фебруар","Март","Април","Мај","Јун","Јул","Август","Септембар","Октобар","Новембар","Децембар"],monthNamesShort:["Јан","Феб","Мар","Апр","Мај","Јун","Јул","Авг","Сеп","Окт","Нов","Дец"],dayNames:["Недеља","Понедељак","Уторак","Среда","Четвртак","Петак","Субота"],dayNamesShort:["Нед","Пон","Уто","Сре","Чет","Пет","Суб"],dayNamesMin:["Не","По","Ут","Ср","Че","Пе","Су"],weekHeader:"Сед",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("sr-cyrl",{buttonText:{month:"Месец",week:"Недеља",day:"Дан",list:"Планер"},allDayText:"Цео дан",eventLimitText:function(a){return"+ још "+a}})}(),function(){!function(){"use strict";var a={words:{m:["jedan minut","jedne minute"],mm:["minut","minute","minuta"],h:["jedan sat","jednog sata"],hh:["sat","sata","sati"],dd:["dan","dana","dana"],MM:["mesec","meseca","meseci"],yy:["godina","godine","godina"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(b,c,d){var e=a.words[d];return 1===d.length?c?e[0]:e[1]:b+" "+a.correctGrammaticalCase(b,e)}},c=(b.defineLocale||b.lang).call(b,"sr",{months:"januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar".split("_"),monthsShort:"jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"nedelja_ponedeljak_utorak_sreda_četvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sre._čet._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_če_pe_su".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedelju] [u] LT";case 3:return"[u] [sredu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[juče u] LT",lastWeek:function(){var a=["[prošle] [nedelje] [u] LT","[prošlog] [ponedeljka] [u] LT","[prošlog] [utorka] [u] LT","[prošle] [srede] [u] LT","[prošlog] [četvrtka] [u] LT","[prošlog] [petka] [u] LT","[prošle] [subote] [u] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"za %s",past:"pre %s",s:"nekoliko sekundi",m:a.translate,mm:a.translate,h:a.translate,hh:a.translate,d:"dan",dd:a.translate,M:"mesec",MM:a.translate,y:"godinu",yy:a.translate},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("sr","sr",{closeText:"Затвори",prevText:"&#x3C;",nextText:"&#x3E;",currentText:"Данас",monthNames:["Јануар","Фебруар","Март","Април","Мај","Јун","Јул","Август","Септембар","Октобар","Новембар","Децембар"],monthNamesShort:["Јан","Феб","Мар","Апр","Мај","Јун","Јул","Авг","Сеп","Окт","Нов","Дец"],dayNames:["Недеља","Понедељак","Уторак","Среда","Четвртак","Петак","Субота"],dayNamesShort:["Нед","Пон","Уто","Сре","Чет","Пет","Суб"],dayNamesMin:["Не","По","Ут","Ср","Че","Пе","Су"],weekHeader:"Сед",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("sr",{buttonText:{month:"Месец",week:"Недеља",day:"Дан",list:"Планер"},allDayText:"Цео дан",eventLimitText:function(a){return"+ још "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"sv",{months:"januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"),weekdaysShort:"sön_mån_tis_ons_tor_fre_lör".split("_"),weekdaysMin:"sö_må_ti_on_to_fr_lö".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [kl.] HH:mm",LLLL:"dddd D MMMM YYYY [kl.] HH:mm",lll:"D MMM YYYY HH:mm",llll:"ddd D MMM YYYY HH:mm"},calendar:{sameDay:"[Idag] LT",nextDay:"[Imorgon] LT",lastDay:"[Igår] LT",nextWeek:"[På] dddd LT",lastWeek:"[I] dddd[s] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"för %s sedan",s:"några sekunder",m:"en minut",mm:"%d minuter",h:"en timme",hh:"%d timmar",d:"en dag",dd:"%d dagar",M:"en månad",MM:"%d månader",y:"ett år",yy:"%d år"},ordinalParse:/\d{1,2}(e|a)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"e":1===b?"a":2===b?"a":"e";return a+c},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("sv","sv",{closeText:"Stäng",prevText:"&#xAB;Förra",nextText:"Nästa&#xBB;",currentText:"Idag",monthNames:["Januari","Februari","Mars","April","Maj","Juni","Juli","Augusti","September","Oktober","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","Maj","Jun","Jul","Aug","Sep","Okt","Nov","Dec"],dayNamesShort:["Sön","Mån","Tis","Ons","Tor","Fre","Lör"],dayNames:["Söndag","Måndag","Tisdag","Onsdag","Torsdag","Fredag","Lördag"],dayNamesMin:["Sö","Må","Ti","On","To","Fr","Lö"],weekHeader:"Ve",dateFormat:"yy-mm-dd",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("sv",{buttonText:{month:"Månad",week:"Vecka",day:"Dag",list:"Program"},allDayText:"Heldag",eventLimitText:"till"})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"th",{months:"มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม".split("_"),monthsShort:"มกรา_กุมภา_มีนา_เมษา_พฤษภา_มิถุนา_กรกฎา_สิงหา_กันยา_ตุลา_พฤศจิกา_ธันวา".split("_"),monthsParseExact:!0,weekdays:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์".split("_"),weekdaysShort:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์".split("_"),weekdaysMin:"อา._จ._อ._พ._พฤ._ศ._ส.".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H นาฬิกา m นาที",LTS:"H นาฬิกา m นาที s วินาที",L:"YYYY/MM/DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY เวลา H นาฬิกา m นาที",LLLL:"วันddddที่ D MMMM YYYY เวลา H นาฬิกา m นาที"},meridiemParse:/ก่อนเที่ยง|หลังเที่ยง/,isPM:function(a){return"หลังเที่ยง"===a},meridiem:function(a,b,c){return 12>a?"ก่อนเที่ยง":"หลังเที่ยง"},calendar:{sameDay:"[วันนี้ เวลา] LT",nextDay:"[พรุ่งนี้ เวลา] LT",nextWeek:"dddd[หน้า เวลา] LT",lastDay:"[เมื่อวานนี้ เวลา] LT",lastWeek:"[วัน]dddd[ที่แล้ว เวลา] LT",sameElse:"L"},relativeTime:{future:"อีก %s",past:"%sที่แล้ว",s:"ไม่กี่วินาที",m:"1 นาที",mm:"%d นาที",h:"1 ชั่วโมง",hh:"%d ชั่วโมง",d:"1 วัน",dd:"%d วัน",M:"1 เดือน",MM:"%d เดือน",y:"1 ปี",yy:"%d ปี"}});return a}(),a.fullCalendar.datepickerLang("th","th",{closeText:"ปิด",prevText:"&#xAB;&#xA0;ย้อน",nextText:"ถัดไป&#xA0;&#xBB;",currentText:"วันนี้",monthNames:["มกราคม","กุมภาพันธ์","มีนาคม","เมษายน","พฤษภาคม","มิถุนายน","กรกฎาคม","สิงหาคม","กันยายน","ตุลาคม","พฤศจิกายน","ธันวาคม"],monthNamesShort:["ม.ค.","ก.พ.","มี.ค.","เม.ย.","พ.ค.","มิ.ย.","ก.ค.","ส.ค.","ก.ย.","ต.ค.","พ.ย.","ธ.ค."],dayNames:["อาทิตย์","จันทร์","อังคาร","พุธ","พฤหัสบดี","ศุกร์","เสาร์"],dayNamesShort:["อา.","จ.","อ.","พ.","พฤ.","ศ.","ส."],dayNamesMin:["อา.","จ.","อ.","พ.","พฤ.","ศ.","ส."],weekHeader:"Wk",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("th",{buttonText:{month:"เดือน",week:"สัปดาห์",day:"วัน",list:"แผนงาน"},allDayText:"ตลอดวัน",eventLimitText:"เพิ่มเติม"})}(),function(){!function(){"use strict";var a={1:"'inci",5:"'inci",8:"'inci",70:"'inci",80:"'inci",2:"'nci",7:"'nci",20:"'nci",50:"'nci",3:"'üncü",4:"'üncü",100:"'üncü",6:"'ncı",9:"'uncu",10:"'uncu",30:"'uncu",60:"'ıncı",90:"'ıncı"},c=(b.defineLocale||b.lang).call(b,"tr",{months:"Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık".split("_"),monthsShort:"Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara".split("_"),weekdays:"Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi".split("_"),weekdaysShort:"Paz_Pts_Sal_Çar_Per_Cum_Cts".split("_"),weekdaysMin:"Pz_Pt_Sa_Ça_Pe_Cu_Ct".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[bugün saat] LT",nextDay:"[yarın saat] LT",nextWeek:"[haftaya] dddd [saat] LT",lastDay:"[dün] LT",lastWeek:"[geçen hafta] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s önce",s:"birkaç saniye",m:"bir dakika",mm:"%d dakika",h:"bir saat",hh:"%d saat",d:"bir gün",dd:"%d gün",M:"bir ay",MM:"%d ay",y:"bir yıl",yy:"%d yıl"},ordinalParse:/\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/,ordinal:function(b){if(0===b)return b+"'ıncı";var c=b%10,d=b%100-c,e=b>=100?100:null;return b+(a[c]||a[d]||a[e])},week:{dow:1,doy:7}});return c}(),a.fullCalendar.datepickerLang("tr","tr",{closeText:"kapat",prevText:"&#x3C;geri",nextText:"ileri&#x3e",currentText:"bugün",monthNames:["Ocak","Şubat","Mart","Nisan","Mayıs","Haziran","Temmuz","Ağustos","Eylül","Ekim","Kasım","Aralık"],monthNamesShort:["Oca","Şub","Mar","Nis","May","Haz","Tem","Ağu","Eyl","Eki","Kas","Ara"],dayNames:["Pazar","Pazartesi","Salı","Çarşamba","Perşembe","Cuma","Cumartesi"],dayNamesShort:["Pz","Pt","Sa","Ça","Pe","Cu","Ct"],dayNamesMin:["Pz","Pt","Sa","Ça","Pe","Cu","Ct"],weekHeader:"Hf",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("tr",{buttonText:{next:"ileri",month:"Ay",week:"Hafta",day:"Gün",list:"Ajanda"},allDayText:"Tüm gün",eventLimitText:"daha fazla"})}(),function(){!function(){"use strict";function a(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function c(b,c,d){var e={mm:c?"хвилина_хвилини_хвилин":"хвилину_хвилини_хвилин",hh:c?"година_години_годин":"годину_години_годин",dd:"день_дні_днів",MM:"місяць_місяці_місяців",yy:"рік_роки_років"};return"m"===d?c?"хвилина":"хвилину":"h"===d?c?"година":"годину":b+" "+a(e[d],+b)}function d(a,b){var c={nominative:"неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота".split("_"),accusative:"неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу".split("_"),genitive:"неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи".split("_")},d=/(\[[ВвУу]\]) ?dddd/.test(b)?"accusative":/\[?(?:минулої|наступної)? ?\] ?dddd/.test(b)?"genitive":"nominative";return c[d][a.day()]}function e(a){return function(){return a+"о"+(11===this.hours()?"б":"")+"] LT"}}var f=(b.defineLocale||b.lang).call(b,"uk",{months:{format:"січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня".split("_"),standalone:"січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень".split("_")},monthsShort:"січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд".split("_"),weekdays:d,weekdaysShort:"нд_пн_вт_ср_чт_пт_сб".split("_"),weekdaysMin:"нд_пн_вт_ср_чт_пт_сб".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY р.",LLL:"D MMMM YYYY р., HH:mm",LLLL:"dddd, D MMMM YYYY р., HH:mm"},calendar:{sameDay:e("[Сьогодні "),nextDay:e("[Завтра "),lastDay:e("[Вчора "),nextWeek:e("[У] dddd ["),lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return e("[Минулої] dddd [").call(this);case 1:case 2:case 4:return e("[Минулого] dddd [").call(this)}},sameElse:"L"},relativeTime:{future:"за %s",past:"%s тому",s:"декілька секунд",m:c,mm:c,h:"годину",hh:c,d:"день",dd:c,M:"місяць",MM:c,y:"рік",yy:c},meridiemParse:/ночі|ранку|дня|вечора/,isPM:function(a){return/^(дня|вечора)$/.test(a)},meridiem:function(a,b,c){return 4>a?"ночі":12>a?"ранку":17>a?"дня":"вечора"},ordinalParse:/\d{1,2}-(й|го)/,ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":case"w":case"W":return a+"-й";case"D":return a+"-го";default:return a}},week:{dow:1,doy:7}});return f}(),a.fullCalendar.datepickerLang("uk","uk",{closeText:"Закрити",prevText:"&#x3C;",nextText:"&#x3E;",currentText:"Сьогодні",monthNames:["Січень","Лютий","Березень","Квітень","Травень","Червень","Липень","Серпень","Вересень","Жовтень","Листопад","Грудень"],monthNamesShort:["Січ","Лют","Бер","Кві","Тра","Чер","Лип","Сер","Вер","Жов","Лис","Гру"],dayNames:["неділя","понеділок","вівторок","середа","четвер","п’ятниця","субота"],dayNamesShort:["нед","пнд","вів","срд","чтв","птн","сбт"],dayNamesMin:["Нд","Пн","Вт","Ср","Чт","Пт","Сб"],weekHeader:"Тиж",dateFormat:"dd.mm.yy",firstDay:1,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("uk",{buttonText:{month:"Місяць",week:"Тиждень",day:"День",list:"Порядок денний"},allDayText:"Увесь день",eventLimitText:function(a){return"+ще "+a+"..."}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"vi",{months:"tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12".split("_"),monthsShort:"Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12".split("_"),monthsParseExact:!0,weekdays:"chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy".split("_"),weekdaysShort:"CN_T2_T3_T4_T5_T6_T7".split("_"),weekdaysMin:"CN_T2_T3_T4_T5_T6_T7".split("_"),weekdaysParseExact:!0,meridiemParse:/sa|ch/i,isPM:function(a){return/^ch$/i.test(a)},meridiem:function(a,b,c){return 12>a?c?"sa":"SA":c?"ch":"CH"},longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM [năm] YYYY",LLL:"D MMMM [năm] YYYY HH:mm",LLLL:"dddd, D MMMM [năm] YYYY HH:mm",l:"DD/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"},calendar:{sameDay:"[Hôm nay lúc] LT",nextDay:"[Ngày mai lúc] LT",nextWeek:"dddd [tuần tới lúc] LT",lastDay:"[Hôm qua lúc] LT",lastWeek:"dddd [tuần rồi lúc] LT",sameElse:"L"},relativeTime:{future:"%s tới",past:"%s trước",s:"vài giây",m:"một phút",mm:"%d phút",h:"một giờ",hh:"%d giờ",d:"một ngày",dd:"%d ngày",M:"một tháng",MM:"%d tháng",y:"một năm",yy:"%d năm"},ordinalParse:/\d{1,2}/,ordinal:function(a){return a},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("vi","vi",{closeText:"Đóng",prevText:"&#x3C;Trước",nextText:"Tiếp&#x3E;",currentText:"Hôm nay",monthNames:["Tháng Một","Tháng Hai","Tháng Ba","Tháng Tư","Tháng Năm","Tháng Sáu","Tháng Bảy","Tháng Tám","Tháng Chín","Tháng Mười","Tháng Mười Một","Tháng Mười Hai"],monthNamesShort:["Tháng 1","Tháng 2","Tháng 3","Tháng 4","Tháng 5","Tháng 6","Tháng 7","Tháng 8","Tháng 9","Tháng 10","Tháng 11","Tháng 12"],dayNames:["Chủ Nhật","Thứ Hai","Thứ Ba","Thứ Tư","Thứ Năm","Thứ Sáu","Thứ Bảy"],dayNamesShort:["CN","T2","T3","T4","T5","T6","T7"],dayNamesMin:["CN","T2","T3","T4","T5","T6","T7"],weekHeader:"Tu",dateFormat:"dd/mm/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""}),a.fullCalendar.lang("vi",{buttonText:{month:"Tháng",week:"Tuần",day:"Ngày",list:"Lịch biểu"},allDayText:"Cả ngày",eventLimitText:function(a){return"+ thêm "+a}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"zh-cn",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"Ah点mm分",LTS:"Ah点m分s秒",L:"YYYY-MM-DD",LL:"YYYY年MMMD日",LLL:"YYYY年MMMD日Ah点mm分",LLLL:"YYYY年MMMD日ddddAh点mm分",l:"YYYY-MM-DD",ll:"YYYY年MMMD日",lll:"YYYY年MMMD日Ah点mm分",llll:"YYYY年MMMD日ddddAh点mm分"},meridiemParse:/凌晨|早上|上午|中午|下午|晚上/,meridiemHour:function(a,b){return 12===a&&(a=0),"凌晨"===b||"早上"===b||"上午"===b?a:"下午"===b||"晚上"===b?a+12:a>=11?a:a+12},meridiem:function(a,b,c){var d=100*a+b;return 600>d?"凌晨":900>d?"早上":1130>d?"上午":1230>d?"中午":1800>d?"下午":"晚上"},calendar:{sameDay:function(){return 0===this.minutes()?"[今天]Ah[点整]":"[今天]LT"},nextDay:function(){return 0===this.minutes()?"[明天]Ah[点整]":"[明天]LT"},lastDay:function(){return 0===this.minutes()?"[昨天]Ah[点整]":"[昨天]LT"},nextWeek:function(){var a,c;return a=b().startOf("week"),c=this.diff(a,"days")>=7?"[下]":"[本]",0===this.minutes()?c+"dddAh点整":c+"dddAh点mm"},lastWeek:function(){var a,c;return a=b().startOf("week"),c=this.unix()<a.unix()?"[上]":"[本]",0===this.minutes()?c+"dddAh点整":c+"dddAh点mm"},sameElse:"LL"},ordinalParse:/\d{1,2}(日|月|周)/,ordinal:function(a,b){switch(b){case"d":case"D":case"DDD":return a+"日";case"M":return a+"月";case"w":case"W":return a+"周";default:return a}},relativeTime:{future:"%s内",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},week:{dow:1,doy:4}});return a}(),a.fullCalendar.datepickerLang("zh-cn","zh-CN",{closeText:"关闭",prevText:"&#x3C;上月",nextText:"下月&#x3E;",currentText:"今天",monthNames:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthNamesShort:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayNames:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],dayNamesShort:["周日","周一","周二","周三","周四","周五","周六"],dayNamesMin:["日","一","二","三","四","五","六"],weekHeader:"周",dateFormat:"yy-mm-dd",firstDay:1,isRTL:!1,showMonthAfterYear:!0,yearSuffix:"年"}),a.fullCalendar.lang("zh-cn",{buttonText:{month:"月",week:"周",day:"日",list:"日程"},allDayText:"全天",eventLimitText:function(a){return"另外 "+a+" 个"}})}(),function(){!function(){"use strict";var a=(b.defineLocale||b.lang).call(b,"zh-tw",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"Ah點mm分",LTS:"Ah點m分s秒",L:"YYYY年MMMD日",LL:"YYYY年MMMD日",LLL:"YYYY年MMMD日Ah點mm分",LLLL:"YYYY年MMMD日ddddAh點mm分",l:"YYYY年MMMD日",ll:"YYYY年MMMD日",lll:"YYYY年MMMD日Ah點mm分",llll:"YYYY年MMMD日ddddAh點mm分"},meridiemParse:/早上|上午|中午|下午|晚上/,meridiemHour:function(a,b){return 12===a&&(a=0),"早上"===b||"上午"===b?a:"中午"===b?a>=11?a:a+12:"下午"===b||"晚上"===b?a+12:void 0},meridiem:function(a,b,c){var d=100*a+b;return 900>d?"早上":1130>d?"上午":1230>d?"中午":1800>d?"下午":"晚上"},calendar:{sameDay:"[今天]LT",nextDay:"[明天]LT",nextWeek:"[下]ddddLT",lastDay:"[昨天]LT",lastWeek:"[上]ddddLT",sameElse:"L"},ordinalParse:/\d{1,2}(日|月|週)/,ordinal:function(a,b){switch(b){case"d":case"D":case"DDD":return a+"日";case"M":return a+"月";case"w":case"W":return a+"週";default:return a}},relativeTime:{future:"%s內",past:"%s前",s:"幾秒",m:"1分鐘",mm:"%d分鐘",h:"1小時",hh:"%d小時",d:"1天",dd:"%d天",M:"1個月",MM:"%d個月",y:"1年",yy:"%d年"}});return a}(),a.fullCalendar.datepickerLang("zh-tw","zh-TW",{closeText:"關閉",prevText:"&#x3C;上月",nextText:"下月&#x3E;",currentText:"今天",monthNames:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthNamesShort:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],dayNames:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],dayNamesShort:["周日","周一","周二","周三","周四","周五","周六"],dayNamesMin:["日","一","二","三","四","五","六"],weekHeader:"周",dateFormat:"yy/mm/dd",firstDay:1,isRTL:!1,showMonthAfterYear:!0,yearSuffix:"年"}),a.fullCalendar.lang("zh-tw",{buttonText:{month:"月",week:"週",day:"天",list:"待辦事項"},allDayText:"全天",eventLimitText:"更多"})}(),(b.locale||b.lang).call(b,"en"),a.fullCalendar.lang("en"),a.datepicker&&a.datepicker.setDefaults(a.datepicker.regional[""])});
\ No newline at end of file
diff --git a/library/moment/CHANGELOG.md b/library/moment/CHANGELOG.md
index cc0e7f571..433fa857e 100644
--- a/library/moment/CHANGELOG.md
+++ b/library/moment/CHANGELOG.md
@@ -1,6 +1,27 @@
 Changelog
 =========
 
+### 2.13.0 [See full changelog](https://gist.github.com/ichernev/0132fcf5b61f7fc140b0bb0090480d49)
+
+## Enhancements:
+* [#2982](https://github.com/moment/moment/pull/2982) Add 'date' as alias to 'day' for startOf() and endOf().
+* [#2955](https://github.com/moment/moment/pull/2955) Add parsing negative components in durations when ISO 8601
+* [#2991](https://github.com/moment/moment/pull/2991) isBetween support for both open and closed intervals
+* [#3105](https://github.com/moment/moment/pull/3105) Add localeSorted argument to weekday listers
+* [#3102](https://github.com/moment/moment/pull/3102) Add k and kk formatting tokens
+
+## Bugfixes
+* [#3109](https://github.com/moment/moment/pull/3109) Fix [#1756](https://github.com/moment/moment/issues/1756) Resolved thread-safe issue on server side.
+* [#3078](https://github.com/moment/moment/pull/3078) Fix parsing for months/weekdays with weird characters
+* [#3098](https://github.com/moment/moment/pull/3098) Use Z suffix when in UTC mode ([#3020](https://github.com/moment/moment/issues/3020))
+* [#2995](https://github.com/moment/moment/pull/2995) Fix floating point rounding errors in durations
+* [#3059](https://github.com/moment/moment/pull/3059) fix bug where diff returns -0 in month-related diffs
+* [#3045](https://github.com/moment/moment/pull/3045) Fix mistaking any input for 'a' token
+* [#2877](https://github.com/moment/moment/pull/2877) Use explicit .valueOf() calls instead of coercion
+* [#3036](https://github.com/moment/moment/pull/3036) Year setter should keep time when DST changes
+
+Plus 3 new locales and locale fixes.
+
 ### 2.12.0 [See full changelog](https://gist.github.com/ichernev/6e5bfdf8d6522fc4ac73)
 
 ## Enhancements:
diff --git a/library/moment/README.md b/library/moment/README.md
index 6193e5eb8..c45e9d624 100644
--- a/library/moment/README.md
+++ b/library/moment/README.md
@@ -5,7 +5,7 @@
 
 A lightweight JavaScript date library for parsing, validating, manipulating, and formatting dates.
 
-## [Documentation](http://momentjs.com/docs/)
+**[Documentation](http://momentjs.com/docs/)**
 
 ## Port to ECMAScript 6 (version 2.10.0)
 
diff --git a/library/moment/moment.js b/library/moment/moment.js
index b5f0b3644..ed94e44a1 100644
--- a/library/moment/moment.js
+++ b/library/moment/moment.js
@@ -1,5 +1,5 @@
 //! moment.js
-//! version : 2.12.0
+//! version : 2.13.0
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
 //! license : MIT
 //! momentjs.com
@@ -76,7 +76,9 @@
             invalidMonth    : null,
             invalidFormat   : false,
             userInvalidated : false,
-            iso             : false
+            iso             : false,
+            parsedDateParts : [],
+            meridiem        : null
         };
     }
 
@@ -87,9 +89,30 @@
         return m._pf;
     }
 
+    var some;
+    if (Array.prototype.some) {
+        some = Array.prototype.some;
+    } else {
+        some = function (fun) {
+            var t = Object(this);
+            var len = t.length >>> 0;
+
+            for (var i = 0; i < len; i++) {
+                if (i in t && fun.call(this, t[i], i, t)) {
+                    return true;
+                }
+            }
+
+            return false;
+        };
+    }
+
     function valid__isValid(m) {
         if (m._isValid == null) {
             var flags = getParsingFlags(m);
+            var parsedParts = some.call(flags.parsedDateParts, function (i) {
+                return i != null;
+            });
             m._isValid = !isNaN(m._d.getTime()) &&
                 flags.overflow < 0 &&
                 !flags.empty &&
@@ -97,7 +120,8 @@
                 !flags.invalidWeekday &&
                 !flags.nullInput &&
                 !flags.invalidFormat &&
-                !flags.userInvalidated;
+                !flags.userInvalidated &&
+                (!flags.meridiem || (flags.meridiem && parsedParts));
 
             if (m._strict) {
                 m._isValid = m._isValid &&
@@ -240,6 +264,9 @@
         var firstTime = true;
 
         return extend(function () {
+            if (utils_hooks__hooks.deprecationHandler != null) {
+                utils_hooks__hooks.deprecationHandler(null, msg);
+            }
             if (firstTime) {
                 warn(msg + '\nArguments: ' + Array.prototype.slice.call(arguments).join(', ') + '\n' + (new Error()).stack);
                 firstTime = false;
@@ -251,6 +278,9 @@
     var deprecations = {};
 
     function deprecateSimple(name, msg) {
+        if (utils_hooks__hooks.deprecationHandler != null) {
+            utils_hooks__hooks.deprecationHandler(name, msg);
+        }
         if (!deprecations[name]) {
             warn(msg);
             deprecations[name] = true;
@@ -258,6 +288,7 @@
     }
 
     utils_hooks__hooks.suppressDeprecationWarnings = false;
+    utils_hooks__hooks.deprecationHandler = null;
 
     function isFunction(input) {
         return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
@@ -307,6 +338,22 @@
         }
     }
 
+    var keys;
+
+    if (Object.keys) {
+        keys = Object.keys;
+    } else {
+        keys = function (obj) {
+            var i, res = [];
+            for (i in obj) {
+                if (hasOwnProp(obj, i)) {
+                    res.push(i);
+                }
+            }
+            return res;
+        };
+    }
+
     // internal storage for locale config files
     var locales = {};
     var globalLocale;
@@ -461,7 +508,7 @@
     }
 
     function locale_locales__listLocales() {
-        return Object.keys(locales);
+        return keys(locales);
     }
 
     var aliases = {};
@@ -540,7 +587,7 @@
             Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;
     }
 
-    var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
+    var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
 
     var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
 
@@ -593,7 +640,7 @@
         }
 
         return function (mom) {
-            var output = '';
+            var output = '', i;
             for (i = 0; i < length; i++) {
                 output += array[i] instanceof Function ? array[i].call(mom, format) : array[i];
             }
@@ -722,6 +769,23 @@
     var WEEK = 7;
     var WEEKDAY = 8;
 
+    var indexOf;
+
+    if (Array.prototype.indexOf) {
+        indexOf = Array.prototype.indexOf;
+    } else {
+        indexOf = function (o) {
+            // I know
+            var i;
+            for (i = 0; i < this.length; ++i) {
+                if (this[i] === o) {
+                    return i;
+                }
+            }
+            return -1;
+        };
+    }
+
     function daysInMonth(year, month) {
         return new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
     }
@@ -784,15 +848,63 @@
             this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
     }
 
+    function units_month__handleStrictParse(monthName, format, strict) {
+        var i, ii, mom, llc = monthName.toLocaleLowerCase();
+        if (!this._monthsParse) {
+            // this is not used
+            this._monthsParse = [];
+            this._longMonthsParse = [];
+            this._shortMonthsParse = [];
+            for (i = 0; i < 12; ++i) {
+                mom = create_utc__createUTC([2000, i]);
+                this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase();
+                this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase();
+            }
+        }
+
+        if (strict) {
+            if (format === 'MMM') {
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._longMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        } else {
+            if (format === 'MMM') {
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._longMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._longMonthsParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortMonthsParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        }
+    }
+
     function localeMonthsParse (monthName, format, strict) {
         var i, mom, regex;
 
+        if (this._monthsParseExact) {
+            return units_month__handleStrictParse.call(this, monthName, format, strict);
+        }
+
         if (!this._monthsParse) {
             this._monthsParse = [];
             this._longMonthsParse = [];
             this._shortMonthsParse = [];
         }
 
+        // TODO: add sorting
+        // Sorting makes sure if one month (or abbr) is a prefix of another
+        // see sorting in computeMonthsParse
         for (i = 0; i < 12; i++) {
             // make the regex if we don't have it already
             mom = create_utc__createUTC([2000, i]);
@@ -918,8 +1030,8 @@
 
         this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
         this._monthsShortRegex = this._monthsRegex;
-        this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')$', 'i');
-        this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')$', 'i');
+        this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
+        this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
     }
 
     function checkOverflow (m) {
@@ -1146,7 +1258,7 @@
 
     // MOMENTS
 
-    var getSetYear = makeGetSet('FullYear', false);
+    var getSetYear = makeGetSet('FullYear', true);
 
     function getIsLeapYear () {
         return isLeapYear(this.year());
@@ -1415,6 +1527,9 @@
                 config._a[HOUR] > 0) {
             getParsingFlags(config).bigHour = undefined;
         }
+
+        getParsingFlags(config).parsedDateParts = config._a.slice(0);
+        getParsingFlags(config).meridiem = config._meridiem;
         // handle meridiem
         config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
 
@@ -1555,7 +1670,7 @@
         if (input === undefined) {
             config._d = new Date(utils_hooks__hooks.now());
         } else if (isDate(input)) {
-            config._d = new Date(+input);
+            config._d = new Date(input.valueOf());
         } else if (typeof input === 'string') {
             configFromString(config);
         } else if (isArray(input)) {
@@ -1675,7 +1790,7 @@
         this._milliseconds = +milliseconds +
             seconds * 1e3 + // 1000
             minutes * 6e4 + // 1000 * 60
-            hours * 36e5; // 1000 * 60 * 60
+            hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978
         // Because of dateAddRemove treats 24 hours as different from a
         // day when working around DST, we need to store them separately
         this._days = +days +
@@ -1745,9 +1860,9 @@
         var res, diff;
         if (model._isUTC) {
             res = model.clone();
-            diff = (isMoment(input) || isDate(input) ? +input : +local__createLocal(input)) - (+res);
+            diff = (isMoment(input) || isDate(input) ? input.valueOf() : local__createLocal(input).valueOf()) - res.valueOf();
             // Use low-level api, because this fn is low-level api.
-            res._d.setTime(+res._d + diff);
+            res._d.setTime(res._d.valueOf() + diff);
             utils_hooks__hooks.updateOffset(res, false);
             return res;
         } else {
@@ -1908,7 +2023,7 @@
     // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
     // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
     // and further modified to allow for strings containing both week and day
-    var isoRegex = /^(-)?P(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)W)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?$/;
+    var isoRegex = /^(-)?P(?:(-?[0-9,.]*)Y)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)W)?(?:(-?[0-9,.]*)D)?(?:T(?:(-?[0-9,.]*)H)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)S)?)?$/;
 
     function create__createDuration (input, key) {
         var duration = input,
@@ -2052,7 +2167,7 @@
         updateOffset = updateOffset == null ? true : updateOffset;
 
         if (milliseconds) {
-            mom._d.setTime(+mom._d + milliseconds * isAdding);
+            mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding);
         }
         if (days) {
             get_set__set(mom, 'Date', get_set__get(mom, 'Date') + days * isAdding);
@@ -2097,9 +2212,9 @@
         }
         units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
         if (units === 'millisecond') {
-            return +this > +localInput;
+            return this.valueOf() > localInput.valueOf();
         } else {
-            return +localInput < +this.clone().startOf(units);
+            return localInput.valueOf() < this.clone().startOf(units).valueOf();
         }
     }
 
@@ -2110,14 +2225,16 @@
         }
         units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
         if (units === 'millisecond') {
-            return +this < +localInput;
+            return this.valueOf() < localInput.valueOf();
         } else {
-            return +this.clone().endOf(units) < +localInput;
+            return this.clone().endOf(units).valueOf() < localInput.valueOf();
         }
     }
 
-    function isBetween (from, to, units) {
-        return this.isAfter(from, units) && this.isBefore(to, units);
+    function isBetween (from, to, units, inclusivity) {
+        inclusivity = inclusivity || '()';
+        return (inclusivity[0] === '(' ? this.isAfter(from, units) : !this.isBefore(from, units)) &&
+            (inclusivity[1] === ')' ? this.isBefore(to, units) : !this.isAfter(to, units));
     }
 
     function isSame (input, units) {
@@ -2128,10 +2245,10 @@
         }
         units = normalizeUnits(units || 'millisecond');
         if (units === 'millisecond') {
-            return +this === +localInput;
+            return this.valueOf() === localInput.valueOf();
         } else {
-            inputMs = +localInput;
-            return +(this.clone().startOf(units)) <= inputMs && inputMs <= +(this.clone().endOf(units));
+            inputMs = localInput.valueOf();
+            return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf();
         }
     }
 
@@ -2198,10 +2315,12 @@
             adjust = (b - anchor) / (anchor2 - anchor);
         }
 
-        return -(wholeMonthDiff + adjust);
+        //check for negative zero, return zero if negative zero
+        return -(wholeMonthDiff + adjust) || 0;
     }
 
     utils_hooks__hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
+    utils_hooks__hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]';
 
     function toString () {
         return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
@@ -2222,7 +2341,10 @@
     }
 
     function format (inputString) {
-        var output = formatMoment(this, inputString || utils_hooks__hooks.defaultFormat);
+        if (!inputString) {
+            inputString = this.isUtc() ? utils_hooks__hooks.defaultFormatUtc : utils_hooks__hooks.defaultFormat;
+        }
+        var output = formatMoment(this, inputString);
         return this.localeData().postformat(output);
     }
 
@@ -2301,6 +2423,7 @@
         case 'week':
         case 'isoWeek':
         case 'day':
+        case 'date':
             this.hours(0);
             /* falls through */
         case 'hour':
@@ -2334,19 +2457,25 @@
         if (units === undefined || units === 'millisecond') {
             return this;
         }
+
+        // 'date' is an alias for 'day', so it should be considered as such.
+        if (units === 'date') {
+            units = 'day';
+        }
+
         return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms');
     }
 
     function to_type__valueOf () {
-        return +this._d - ((this._offset || 0) * 60000);
+        return this._d.valueOf() - ((this._offset || 0) * 60000);
     }
 
     function unix () {
-        return Math.floor(+this / 1000);
+        return Math.floor(this.valueOf() / 1000);
     }
 
     function toDate () {
-        return this._offset ? new Date(+this) : this._d;
+        return this._offset ? new Date(this.valueOf()) : this._d;
     }
 
     function toArray () {
@@ -2615,9 +2744,15 @@
     addRegexToken('d',    match1to2);
     addRegexToken('e',    match1to2);
     addRegexToken('E',    match1to2);
-    addRegexToken('dd',   matchWord);
-    addRegexToken('ddd',  matchWord);
-    addRegexToken('dddd', matchWord);
+    addRegexToken('dd',   function (isStrict, locale) {
+        return locale.weekdaysMinRegex(isStrict);
+    });
+    addRegexToken('ddd',   function (isStrict, locale) {
+        return locale.weekdaysShortRegex(isStrict);
+    });
+    addRegexToken('dddd',   function (isStrict, locale) {
+        return locale.weekdaysRegex(isStrict);
+    });
 
     addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
         var weekday = config._locale.weekdaysParse(input, token, config._strict);
@@ -2670,9 +2805,77 @@
         return this._weekdaysMin[m.day()];
     }
 
+    function day_of_week__handleStrictParse(weekdayName, format, strict) {
+        var i, ii, mom, llc = weekdayName.toLocaleLowerCase();
+        if (!this._weekdaysParse) {
+            this._weekdaysParse = [];
+            this._shortWeekdaysParse = [];
+            this._minWeekdaysParse = [];
+
+            for (i = 0; i < 7; ++i) {
+                mom = create_utc__createUTC([2000, 1]).day(i);
+                this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase();
+                this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase();
+                this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase();
+            }
+        }
+
+        if (strict) {
+            if (format === 'dddd') {
+                ii = indexOf.call(this._weekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else if (format === 'ddd') {
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        } else {
+            if (format === 'dddd') {
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else if (format === 'ddd') {
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            } else {
+                ii = indexOf.call(this._minWeekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._weekdaysParse, llc);
+                if (ii !== -1) {
+                    return ii;
+                }
+                ii = indexOf.call(this._shortWeekdaysParse, llc);
+                return ii !== -1 ? ii : null;
+            }
+        }
+    }
+
     function localeWeekdaysParse (weekdayName, format, strict) {
         var i, mom, regex;
 
+        if (this._weekdaysParseExact) {
+            return day_of_week__handleStrictParse.call(this, weekdayName, format, strict);
+        }
+
         if (!this._weekdaysParse) {
             this._weekdaysParse = [];
             this._minWeekdaysParse = [];
@@ -2683,7 +2886,7 @@
         for (i = 0; i < 7; i++) {
             // make the regex if we don't have it already
 
-            mom = local__createLocal([2000, 1]).day(i);
+            mom = create_utc__createUTC([2000, 1]).day(i);
             if (strict && !this._fullWeekdaysParse[i]) {
                 this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\.?') + '$', 'i');
                 this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\.?') + '$', 'i');
@@ -2739,6 +2942,99 @@
         return input == null ? this.day() || 7 : this.day(this.day() % 7 ? input : input - 7);
     }
 
+    var defaultWeekdaysRegex = matchWord;
+    function weekdaysRegex (isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysStrictRegex;
+            } else {
+                return this._weekdaysRegex;
+            }
+        } else {
+            return this._weekdaysStrictRegex && isStrict ?
+                this._weekdaysStrictRegex : this._weekdaysRegex;
+        }
+    }
+
+    var defaultWeekdaysShortRegex = matchWord;
+    function weekdaysShortRegex (isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysShortStrictRegex;
+            } else {
+                return this._weekdaysShortRegex;
+            }
+        } else {
+            return this._weekdaysShortStrictRegex && isStrict ?
+                this._weekdaysShortStrictRegex : this._weekdaysShortRegex;
+        }
+    }
+
+    var defaultWeekdaysMinRegex = matchWord;
+    function weekdaysMinRegex (isStrict) {
+        if (this._weekdaysParseExact) {
+            if (!hasOwnProp(this, '_weekdaysRegex')) {
+                computeWeekdaysParse.call(this);
+            }
+            if (isStrict) {
+                return this._weekdaysMinStrictRegex;
+            } else {
+                return this._weekdaysMinRegex;
+            }
+        } else {
+            return this._weekdaysMinStrictRegex && isStrict ?
+                this._weekdaysMinStrictRegex : this._weekdaysMinRegex;
+        }
+    }
+
+
+    function computeWeekdaysParse () {
+        function cmpLenRev(a, b) {
+            return b.length - a.length;
+        }
+
+        var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [],
+            i, mom, minp, shortp, longp;
+        for (i = 0; i < 7; i++) {
+            // make the regex if we don't have it already
+            mom = create_utc__createUTC([2000, 1]).day(i);
+            minp = this.weekdaysMin(mom, '');
+            shortp = this.weekdaysShort(mom, '');
+            longp = this.weekdays(mom, '');
+            minPieces.push(minp);
+            shortPieces.push(shortp);
+            longPieces.push(longp);
+            mixedPieces.push(minp);
+            mixedPieces.push(shortp);
+            mixedPieces.push(longp);
+        }
+        // Sorting makes sure if one weekday (or abbr) is a prefix of another it
+        // will match the longer piece.
+        minPieces.sort(cmpLenRev);
+        shortPieces.sort(cmpLenRev);
+        longPieces.sort(cmpLenRev);
+        mixedPieces.sort(cmpLenRev);
+        for (i = 0; i < 7; i++) {
+            shortPieces[i] = regexEscape(shortPieces[i]);
+            longPieces[i] = regexEscape(longPieces[i]);
+            mixedPieces[i] = regexEscape(mixedPieces[i]);
+        }
+
+        this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
+        this._weekdaysShortRegex = this._weekdaysRegex;
+        this._weekdaysMinRegex = this._weekdaysRegex;
+
+        this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
+        this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
+        this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i');
+    }
+
     // FORMATTING
 
     addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
@@ -2770,8 +3066,13 @@
         return this.hours() % 12 || 12;
     }
 
+    function kFormat() {
+        return this.hours() || 24;
+    }
+
     addFormatToken('H', ['HH', 2], 0, 'hour');
     addFormatToken('h', ['hh', 2], 0, hFormat);
+    addFormatToken('k', ['kk', 2], 0, kFormat);
 
     addFormatToken('hmm', 0, 0, function () {
         return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
@@ -3232,6 +3533,13 @@
     prototype__proto._weekdaysShort = defaultLocaleWeekdaysShort;
     prototype__proto.weekdaysParse  =        localeWeekdaysParse;
 
+    prototype__proto._weekdaysRegex      = defaultWeekdaysRegex;
+    prototype__proto.weekdaysRegex       =        weekdaysRegex;
+    prototype__proto._weekdaysShortRegex = defaultWeekdaysShortRegex;
+    prototype__proto.weekdaysShortRegex  =        weekdaysShortRegex;
+    prototype__proto._weekdaysMinRegex   = defaultWeekdaysMinRegex;
+    prototype__proto.weekdaysMinRegex    =        weekdaysMinRegex;
+
     // Hours
     prototype__proto.isPM = localeIsPM;
     prototype__proto._meridiemParse = defaultLocaleMeridiemParse;
@@ -3243,7 +3551,7 @@
         return locale[field](utc, format);
     }
 
-    function list (format, index, field, count, setter) {
+    function listMonthsImpl (format, index, field) {
         if (typeof format === 'number') {
             index = format;
             format = undefined;
@@ -3252,35 +3560,79 @@
         format = format || '';
 
         if (index != null) {
-            return lists__get(format, index, field, setter);
+            return lists__get(format, index, field, 'month');
         }
 
         var i;
         var out = [];
-        for (i = 0; i < count; i++) {
-            out[i] = lists__get(format, i, field, setter);
+        for (i = 0; i < 12; i++) {
+            out[i] = lists__get(format, i, field, 'month');
+        }
+        return out;
+    }
+
+    // ()
+    // (5)
+    // (fmt, 5)
+    // (fmt)
+    // (true)
+    // (true, 5)
+    // (true, fmt, 5)
+    // (true, fmt)
+    function listWeekdaysImpl (localeSorted, format, index, field) {
+        if (typeof localeSorted === 'boolean') {
+            if (typeof format === 'number') {
+                index = format;
+                format = undefined;
+            }
+
+            format = format || '';
+        } else {
+            format = localeSorted;
+            index = format;
+            localeSorted = false;
+
+            if (typeof format === 'number') {
+                index = format;
+                format = undefined;
+            }
+
+            format = format || '';
+        }
+
+        var locale = locale_locales__getLocale(),
+            shift = localeSorted ? locale._week.dow : 0;
+
+        if (index != null) {
+            return lists__get(format, (index + shift) % 7, field, 'day');
+        }
+
+        var i;
+        var out = [];
+        for (i = 0; i < 7; i++) {
+            out[i] = lists__get(format, (i + shift) % 7, field, 'day');
         }
         return out;
     }
 
     function lists__listMonths (format, index) {
-        return list(format, index, 'months', 12, 'month');
+        return listMonthsImpl(format, index, 'months');
     }
 
     function lists__listMonthsShort (format, index) {
-        return list(format, index, 'monthsShort', 12, 'month');
+        return listMonthsImpl(format, index, 'monthsShort');
     }
 
-    function lists__listWeekdays (format, index) {
-        return list(format, index, 'weekdays', 7, 'day');
+    function lists__listWeekdays (localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdays');
     }
 
-    function lists__listWeekdaysShort (format, index) {
-        return list(format, index, 'weekdaysShort', 7, 'day');
+    function lists__listWeekdaysShort (localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort');
     }
 
-    function lists__listWeekdaysMin (format, index) {
-        return list(format, index, 'weekdaysMin', 7, 'day');
+    function lists__listWeekdaysMin (localeSorted, format, index) {
+        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin');
     }
 
     locale_locales__getSetGlobalLocale('en', {
@@ -3651,7 +4003,7 @@
     // Side effect imports
 
 
-    utils_hooks__hooks.version = '2.12.0';
+    utils_hooks__hooks.version = '2.13.0';
 
     setHookCallback(local__createLocal);
 
diff --git a/library/moment/moment.min.js b/library/moment/moment.min.js
index ba38995bd..d301ddbbe 100644
--- a/library/moment/moment.min.js
+++ b/library/moment/moment.min.js
@@ -1,7 +1,7 @@
 //! moment.js
-//! version : 2.12.0
+//! version : 2.13.0
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
 //! license : MIT
 //! momentjs.com
-!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.moment=b()}(this,function(){"use strict";function a(){return Zc.apply(null,arguments)}function b(a){Zc=a}function c(a){return a instanceof Array||"[object Array]"===Object.prototype.toString.call(a)}function d(a){return a instanceof Date||"[object Date]"===Object.prototype.toString.call(a)}function e(a,b){var c,d=[];for(c=0;c<a.length;++c)d.push(b(a[c],c));return d}function f(a,b){return Object.prototype.hasOwnProperty.call(a,b)}function g(a,b){for(var c in b)f(b,c)&&(a[c]=b[c]);return f(b,"toString")&&(a.toString=b.toString),f(b,"valueOf")&&(a.valueOf=b.valueOf),a}function h(a,b,c,d){return Ia(a,b,c,d,!0).utc()}function i(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function j(a){return null==a._pf&&(a._pf=i()),a._pf}function k(a){if(null==a._isValid){var b=j(a);a._isValid=!(isNaN(a._d.getTime())||!(b.overflow<0)||b.empty||b.invalidMonth||b.invalidWeekday||b.nullInput||b.invalidFormat||b.userInvalidated),a._strict&&(a._isValid=a._isValid&&0===b.charsLeftOver&&0===b.unusedTokens.length&&void 0===b.bigHour)}return a._isValid}function l(a){var b=h(NaN);return null!=a?g(j(b),a):j(b).userInvalidated=!0,b}function m(a){return void 0===a}function n(a,b){var c,d,e;if(m(b._isAMomentObject)||(a._isAMomentObject=b._isAMomentObject),m(b._i)||(a._i=b._i),m(b._f)||(a._f=b._f),m(b._l)||(a._l=b._l),m(b._strict)||(a._strict=b._strict),m(b._tzm)||(a._tzm=b._tzm),m(b._isUTC)||(a._isUTC=b._isUTC),m(b._offset)||(a._offset=b._offset),m(b._pf)||(a._pf=j(b)),m(b._locale)||(a._locale=b._locale),$c.length>0)for(c in $c)d=$c[c],e=b[d],m(e)||(a[d]=e);return a}function o(b){n(this,b),this._d=new Date(null!=b._d?b._d.getTime():NaN),_c===!1&&(_c=!0,a.updateOffset(this),_c=!1)}function p(a){return a instanceof o||null!=a&&null!=a._isAMomentObject}function q(a){return 0>a?Math.ceil(a):Math.floor(a)}function r(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=q(b)),c}function s(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&r(a[d])!==r(b[d]))&&g++;return g+f}function t(b){a.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+b)}function u(a,b){var c=!0;return g(function(){return c&&(t(a+"\nArguments: "+Array.prototype.slice.call(arguments).join(", ")+"\n"+(new Error).stack),c=!1),b.apply(this,arguments)},b)}function v(a,b){ad[a]||(t(b),ad[a]=!0)}function w(a){return a instanceof Function||"[object Function]"===Object.prototype.toString.call(a)}function x(a){return"[object Object]"===Object.prototype.toString.call(a)}function y(a){var b,c;for(c in a)b=a[c],w(b)?this[c]=b:this["_"+c]=b;this._config=a,this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)}function z(a,b){var c,d=g({},a);for(c in b)f(b,c)&&(x(a[c])&&x(b[c])?(d[c]={},g(d[c],a[c]),g(d[c],b[c])):null!=b[c]?d[c]=b[c]:delete d[c]);return d}function A(a){null!=a&&this.set(a)}function B(a){return a?a.toLowerCase().replace("_","-"):a}function C(a){for(var b,c,d,e,f=0;f<a.length;){for(e=B(a[f]).split("-"),b=e.length,c=B(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=D(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&s(e,c,!0)>=b-1)break;b--}f++}return null}function D(a){var b=null;if(!cd[a]&&"undefined"!=typeof module&&module&&module.exports)try{b=bd._abbr,require("./locale/"+a),E(b)}catch(c){}return cd[a]}function E(a,b){var c;return a&&(c=m(b)?H(a):F(a,b),c&&(bd=c)),bd._abbr}function F(a,b){return null!==b?(b.abbr=a,null!=cd[a]?(v("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale"),b=z(cd[a]._config,b)):null!=b.parentLocale&&(null!=cd[b.parentLocale]?b=z(cd[b.parentLocale]._config,b):v("parentLocaleUndefined","specified parentLocale is not defined yet")),cd[a]=new A(b),E(a),cd[a]):(delete cd[a],null)}function G(a,b){if(null!=b){var c;null!=cd[a]&&(b=z(cd[a]._config,b)),c=new A(b),c.parentLocale=cd[a],cd[a]=c,E(a)}else null!=cd[a]&&(null!=cd[a].parentLocale?cd[a]=cd[a].parentLocale:null!=cd[a]&&delete cd[a]);return cd[a]}function H(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return bd;if(!c(a)){if(b=D(a))return b;a=[a]}return C(a)}function I(){return Object.keys(cd)}function J(a,b){var c=a.toLowerCase();dd[c]=dd[c+"s"]=dd[b]=a}function K(a){return"string"==typeof a?dd[a]||dd[a.toLowerCase()]:void 0}function L(a){var b,c,d={};for(c in a)f(a,c)&&(b=K(c),b&&(d[b]=a[c]));return d}function M(b,c){return function(d){return null!=d?(O(this,b,d),a.updateOffset(this,c),this):N(this,b)}}function N(a,b){return a.isValid()?a._d["get"+(a._isUTC?"UTC":"")+b]():NaN}function O(a,b,c){a.isValid()&&a._d["set"+(a._isUTC?"UTC":"")+b](c)}function P(a,b){var c;if("object"==typeof a)for(c in a)this.set(c,a[c]);else if(a=K(a),w(this[a]))return this[a](b);return this}function Q(a,b,c){var d=""+Math.abs(a),e=b-d.length,f=a>=0;return(f?c?"+":"":"-")+Math.pow(10,Math.max(0,e)).toString().substr(1)+d}function R(a,b,c,d){var e=d;"string"==typeof d&&(e=function(){return this[d]()}),a&&(hd[a]=e),b&&(hd[b[0]]=function(){return Q(e.apply(this,arguments),b[1],b[2])}),c&&(hd[c]=function(){return this.localeData().ordinal(e.apply(this,arguments),a)})}function S(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function T(a){var b,c,d=a.match(ed);for(b=0,c=d.length;c>b;b++)hd[d[b]]?d[b]=hd[d[b]]:d[b]=S(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function U(a,b){return a.isValid()?(b=V(b,a.localeData()),gd[b]=gd[b]||T(b),gd[b](a)):a.localeData().invalidDate()}function V(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(fd.lastIndex=0;d>=0&&fd.test(a);)a=a.replace(fd,c),fd.lastIndex=0,d-=1;return a}function W(a,b,c){zd[a]=w(b)?b:function(a,d){return a&&c?c:b}}function X(a,b){return f(zd,a)?zd[a](b._strict,b._locale):new RegExp(Y(a))}function Y(a){return Z(a.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e}))}function Z(a){return a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function $(a,b){var c,d=b;for("string"==typeof a&&(a=[a]),"number"==typeof b&&(d=function(a,c){c[b]=r(a)}),c=0;c<a.length;c++)Ad[a[c]]=d}function _(a,b){$(a,function(a,c,d,e){d._w=d._w||{},b(a,d._w,d,e)})}function aa(a,b,c){null!=b&&f(Ad,a)&&Ad[a](b,c._a,c,a)}function ba(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function ca(a,b){return c(this._months)?this._months[a.month()]:this._months[Kd.test(b)?"format":"standalone"][a.month()]}function da(a,b){return c(this._monthsShort)?this._monthsShort[a.month()]:this._monthsShort[Kd.test(b)?"format":"standalone"][a.month()]}function ea(a,b,c){var d,e,f;for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),d=0;12>d;d++){if(e=h([2e3,d]),c&&!this._longMonthsParse[d]&&(this._longMonthsParse[d]=new RegExp("^"+this.months(e,"").replace(".","")+"$","i"),this._shortMonthsParse[d]=new RegExp("^"+this.monthsShort(e,"").replace(".","")+"$","i")),c||this._monthsParse[d]||(f="^"+this.months(e,"")+"|^"+this.monthsShort(e,""),this._monthsParse[d]=new RegExp(f.replace(".",""),"i")),c&&"MMMM"===b&&this._longMonthsParse[d].test(a))return d;if(c&&"MMM"===b&&this._shortMonthsParse[d].test(a))return d;if(!c&&this._monthsParse[d].test(a))return d}}function fa(a,b){var c;if(!a.isValid())return a;if("string"==typeof b)if(/^\d+$/.test(b))b=r(b);else if(b=a.localeData().monthsParse(b),"number"!=typeof b)return a;return c=Math.min(a.date(),ba(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a}function ga(b){return null!=b?(fa(this,b),a.updateOffset(this,!0),this):N(this,"Month")}function ha(){return ba(this.year(),this.month())}function ia(a){return this._monthsParseExact?(f(this,"_monthsRegex")||ka.call(this),a?this._monthsShortStrictRegex:this._monthsShortRegex):this._monthsShortStrictRegex&&a?this._monthsShortStrictRegex:this._monthsShortRegex}function ja(a){return this._monthsParseExact?(f(this,"_monthsRegex")||ka.call(this),a?this._monthsStrictRegex:this._monthsRegex):this._monthsStrictRegex&&a?this._monthsStrictRegex:this._monthsRegex}function ka(){function a(a,b){return b.length-a.length}var b,c,d=[],e=[],f=[];for(b=0;12>b;b++)c=h([2e3,b]),d.push(this.monthsShort(c,"")),e.push(this.months(c,"")),f.push(this.months(c,"")),f.push(this.monthsShort(c,""));for(d.sort(a),e.sort(a),f.sort(a),b=0;12>b;b++)d[b]=Z(d[b]),e[b]=Z(e[b]),f[b]=Z(f[b]);this._monthsRegex=new RegExp("^("+f.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+e.join("|")+")$","i"),this._monthsShortStrictRegex=new RegExp("^("+d.join("|")+")$","i")}function la(a){var b,c=a._a;return c&&-2===j(a).overflow&&(b=c[Cd]<0||c[Cd]>11?Cd:c[Dd]<1||c[Dd]>ba(c[Bd],c[Cd])?Dd:c[Ed]<0||c[Ed]>24||24===c[Ed]&&(0!==c[Fd]||0!==c[Gd]||0!==c[Hd])?Ed:c[Fd]<0||c[Fd]>59?Fd:c[Gd]<0||c[Gd]>59?Gd:c[Hd]<0||c[Hd]>999?Hd:-1,j(a)._overflowDayOfYear&&(Bd>b||b>Dd)&&(b=Dd),j(a)._overflowWeeks&&-1===b&&(b=Id),j(a)._overflowWeekday&&-1===b&&(b=Jd),j(a).overflow=b),a}function ma(a){var b,c,d,e,f,g,h=a._i,i=Pd.exec(h)||Qd.exec(h);if(i){for(j(a).iso=!0,b=0,c=Sd.length;c>b;b++)if(Sd[b][1].exec(i[1])){e=Sd[b][0],d=Sd[b][2]!==!1;break}if(null==e)return void(a._isValid=!1);if(i[3]){for(b=0,c=Td.length;c>b;b++)if(Td[b][1].exec(i[3])){f=(i[2]||" ")+Td[b][0];break}if(null==f)return void(a._isValid=!1)}if(!d&&null!=f)return void(a._isValid=!1);if(i[4]){if(!Rd.exec(i[4]))return void(a._isValid=!1);g="Z"}a._f=e+(f||"")+(g||""),Ba(a)}else a._isValid=!1}function na(b){var c=Ud.exec(b._i);return null!==c?void(b._d=new Date(+c[1])):(ma(b),void(b._isValid===!1&&(delete b._isValid,a.createFromInputFallback(b))))}function oa(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 100>a&&a>=0&&isFinite(h.getFullYear())&&h.setFullYear(a),h}function pa(a){var b=new Date(Date.UTC.apply(null,arguments));return 100>a&&a>=0&&isFinite(b.getUTCFullYear())&&b.setUTCFullYear(a),b}function qa(a){return ra(a)?366:365}function ra(a){return a%4===0&&a%100!==0||a%400===0}function sa(){return ra(this.year())}function ta(a,b,c){var d=7+b-c,e=(7+pa(a,0,d).getUTCDay()-b)%7;return-e+d-1}function ua(a,b,c,d,e){var f,g,h=(7+c-d)%7,i=ta(a,d,e),j=1+7*(b-1)+h+i;return 0>=j?(f=a-1,g=qa(f)+j):j>qa(a)?(f=a+1,g=j-qa(a)):(f=a,g=j),{year:f,dayOfYear:g}}function va(a,b,c){var d,e,f=ta(a.year(),b,c),g=Math.floor((a.dayOfYear()-f-1)/7)+1;return 1>g?(e=a.year()-1,d=g+wa(e,b,c)):g>wa(a.year(),b,c)?(d=g-wa(a.year(),b,c),e=a.year()+1):(e=a.year(),d=g),{week:d,year:e}}function wa(a,b,c){var d=ta(a,b,c),e=ta(a+1,b,c);return(qa(a)-d+e)/7}function xa(a,b,c){return null!=a?a:null!=b?b:c}function ya(b){var c=new Date(a.now());return b._useUTC?[c.getUTCFullYear(),c.getUTCMonth(),c.getUTCDate()]:[c.getFullYear(),c.getMonth(),c.getDate()]}function za(a){var b,c,d,e,f=[];if(!a._d){for(d=ya(a),a._w&&null==a._a[Dd]&&null==a._a[Cd]&&Aa(a),a._dayOfYear&&(e=xa(a._a[Bd],d[Bd]),a._dayOfYear>qa(e)&&(j(a)._overflowDayOfYear=!0),c=pa(e,0,a._dayOfYear),a._a[Cd]=c.getUTCMonth(),a._a[Dd]=c.getUTCDate()),b=0;3>b&&null==a._a[b];++b)a._a[b]=f[b]=d[b];for(;7>b;b++)a._a[b]=f[b]=null==a._a[b]?2===b?1:0:a._a[b];24===a._a[Ed]&&0===a._a[Fd]&&0===a._a[Gd]&&0===a._a[Hd]&&(a._nextDay=!0,a._a[Ed]=0),a._d=(a._useUTC?pa:oa).apply(null,f),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[Ed]=24)}}function Aa(a){var b,c,d,e,f,g,h,i;b=a._w,null!=b.GG||null!=b.W||null!=b.E?(f=1,g=4,c=xa(b.GG,a._a[Bd],va(Ja(),1,4).year),d=xa(b.W,1),e=xa(b.E,1),(1>e||e>7)&&(i=!0)):(f=a._locale._week.dow,g=a._locale._week.doy,c=xa(b.gg,a._a[Bd],va(Ja(),f,g).year),d=xa(b.w,1),null!=b.d?(e=b.d,(0>e||e>6)&&(i=!0)):null!=b.e?(e=b.e+f,(b.e<0||b.e>6)&&(i=!0)):e=f),1>d||d>wa(c,f,g)?j(a)._overflowWeeks=!0:null!=i?j(a)._overflowWeekday=!0:(h=ua(c,d,e,f,g),a._a[Bd]=h.year,a._dayOfYear=h.dayOfYear)}function Ba(b){if(b._f===a.ISO_8601)return void ma(b);b._a=[],j(b).empty=!0;var c,d,e,f,g,h=""+b._i,i=h.length,k=0;for(e=V(b._f,b._locale).match(ed)||[],c=0;c<e.length;c++)f=e[c],d=(h.match(X(f,b))||[])[0],d&&(g=h.substr(0,h.indexOf(d)),g.length>0&&j(b).unusedInput.push(g),h=h.slice(h.indexOf(d)+d.length),k+=d.length),hd[f]?(d?j(b).empty=!1:j(b).unusedTokens.push(f),aa(f,d,b)):b._strict&&!d&&j(b).unusedTokens.push(f);j(b).charsLeftOver=i-k,h.length>0&&j(b).unusedInput.push(h),j(b).bigHour===!0&&b._a[Ed]<=12&&b._a[Ed]>0&&(j(b).bigHour=void 0),b._a[Ed]=Ca(b._locale,b._a[Ed],b._meridiem),za(b),la(b)}function Ca(a,b,c){var d;return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&12>b&&(b+=12),d||12!==b||(b=0),b):b}function Da(a){var b,c,d,e,f;if(0===a._f.length)return j(a).invalidFormat=!0,void(a._d=new Date(NaN));for(e=0;e<a._f.length;e++)f=0,b=n({},a),null!=a._useUTC&&(b._useUTC=a._useUTC),b._f=a._f[e],Ba(b),k(b)&&(f+=j(b).charsLeftOver,f+=10*j(b).unusedTokens.length,j(b).score=f,(null==d||d>f)&&(d=f,c=b));g(a,c||b)}function Ea(a){if(!a._d){var b=L(a._i);a._a=e([b.year,b.month,b.day||b.date,b.hour,b.minute,b.second,b.millisecond],function(a){return a&&parseInt(a,10)}),za(a)}}function Fa(a){var b=new o(la(Ga(a)));return b._nextDay&&(b.add(1,"d"),b._nextDay=void 0),b}function Ga(a){var b=a._i,e=a._f;return a._locale=a._locale||H(a._l),null===b||void 0===e&&""===b?l({nullInput:!0}):("string"==typeof b&&(a._i=b=a._locale.preparse(b)),p(b)?new o(la(b)):(c(e)?Da(a):e?Ba(a):d(b)?a._d=b:Ha(a),k(a)||(a._d=null),a))}function Ha(b){var f=b._i;void 0===f?b._d=new Date(a.now()):d(f)?b._d=new Date(+f):"string"==typeof f?na(b):c(f)?(b._a=e(f.slice(0),function(a){return parseInt(a,10)}),za(b)):"object"==typeof f?Ea(b):"number"==typeof f?b._d=new Date(f):a.createFromInputFallback(b)}function Ia(a,b,c,d,e){var f={};return"boolean"==typeof c&&(d=c,c=void 0),f._isAMomentObject=!0,f._useUTC=f._isUTC=e,f._l=c,f._i=a,f._f=b,f._strict=d,Fa(f)}function Ja(a,b,c,d){return Ia(a,b,c,d,!1)}function Ka(a,b){var d,e;if(1===b.length&&c(b[0])&&(b=b[0]),!b.length)return Ja();for(d=b[0],e=1;e<b.length;++e)(!b[e].isValid()||b[e][a](d))&&(d=b[e]);return d}function La(){var a=[].slice.call(arguments,0);return Ka("isBefore",a)}function Ma(){var a=[].slice.call(arguments,0);return Ka("isAfter",a)}function Na(a){var b=L(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+36e5*h,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=H(),this._bubble()}function Oa(a){return a instanceof Na}function Pa(a,b){R(a,0,0,function(){var a=this.utcOffset(),c="+";return 0>a&&(a=-a,c="-"),c+Q(~~(a/60),2)+b+Q(~~a%60,2)})}function Qa(a,b){var c=(b||"").match(a)||[],d=c[c.length-1]||[],e=(d+"").match(Zd)||["-",0,0],f=+(60*e[1])+r(e[2]);return"+"===e[0]?f:-f}function Ra(b,c){var e,f;return c._isUTC?(e=c.clone(),f=(p(b)||d(b)?+b:+Ja(b))-+e,e._d.setTime(+e._d+f),a.updateOffset(e,!1),e):Ja(b).local()}function Sa(a){return 15*-Math.round(a._d.getTimezoneOffset()/15)}function Ta(b,c){var d,e=this._offset||0;return this.isValid()?null!=b?("string"==typeof b?b=Qa(wd,b):Math.abs(b)<16&&(b=60*b),!this._isUTC&&c&&(d=Sa(this)),this._offset=b,this._isUTC=!0,null!=d&&this.add(d,"m"),e!==b&&(!c||this._changeInProgress?ib(this,cb(b-e,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this):this._isUTC?e:Sa(this):null!=b?this:NaN}function Ua(a,b){return null!=a?("string"!=typeof a&&(a=-a),this.utcOffset(a,b),this):-this.utcOffset()}function Va(a){return this.utcOffset(0,a)}function Wa(a){return this._isUTC&&(this.utcOffset(0,a),this._isUTC=!1,a&&this.subtract(Sa(this),"m")),this}function Xa(){return this._tzm?this.utcOffset(this._tzm):"string"==typeof this._i&&this.utcOffset(Qa(vd,this._i)),this}function Ya(a){return this.isValid()?(a=a?Ja(a).utcOffset():0,(this.utcOffset()-a)%60===0):!1}function Za(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function $a(){if(!m(this._isDSTShifted))return this._isDSTShifted;var a={};if(n(a,this),a=Ga(a),a._a){var b=a._isUTC?h(a._a):Ja(a._a);this._isDSTShifted=this.isValid()&&s(a._a,b.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}function _a(){return this.isValid()?!this._isUTC:!1}function ab(){return this.isValid()?this._isUTC:!1}function bb(){return this.isValid()?this._isUTC&&0===this._offset:!1}function cb(a,b){var c,d,e,g=a,h=null;return Oa(a)?g={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(g={},b?g[b]=a:g.milliseconds=a):(h=$d.exec(a))?(c="-"===h[1]?-1:1,g={y:0,d:r(h[Dd])*c,h:r(h[Ed])*c,m:r(h[Fd])*c,s:r(h[Gd])*c,ms:r(h[Hd])*c}):(h=_d.exec(a))?(c="-"===h[1]?-1:1,g={y:db(h[2],c),M:db(h[3],c),w:db(h[4],c),d:db(h[5],c),h:db(h[6],c),m:db(h[7],c),s:db(h[8],c)}):null==g?g={}:"object"==typeof g&&("from"in g||"to"in g)&&(e=fb(Ja(g.from),Ja(g.to)),g={},g.ms=e.milliseconds,g.M=e.months),d=new Na(g),Oa(a)&&f(a,"_locale")&&(d._locale=a._locale),d}function db(a,b){var c=a&&parseFloat(a.replace(",","."));return(isNaN(c)?0:c)*b}function eb(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function fb(a,b){var c;return a.isValid()&&b.isValid()?(b=Ra(b,a),a.isBefore(b)?c=eb(a,b):(c=eb(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c):{milliseconds:0,months:0}}function gb(a){return 0>a?-1*Math.round(-1*a):Math.round(a)}function hb(a,b){return function(c,d){var e,f;return null===d||isNaN(+d)||(v(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=cb(c,d),ib(this,e,a),this}}function ib(b,c,d,e){var f=c._milliseconds,g=gb(c._days),h=gb(c._months);b.isValid()&&(e=null==e?!0:e,f&&b._d.setTime(+b._d+f*d),g&&O(b,"Date",N(b,"Date")+g*d),h&&fa(b,N(b,"Month")+h*d),e&&a.updateOffset(b,g||h))}function jb(a,b){var c=a||Ja(),d=Ra(c,this).startOf("day"),e=this.diff(d,"days",!0),f=-6>e?"sameElse":-1>e?"lastWeek":0>e?"lastDay":1>e?"sameDay":2>e?"nextDay":7>e?"nextWeek":"sameElse",g=b&&(w(b[f])?b[f]():b[f]);return this.format(g||this.localeData().calendar(f,this,Ja(c)))}function kb(){return new o(this)}function lb(a,b){var c=p(a)?a:Ja(a);return this.isValid()&&c.isValid()?(b=K(m(b)?"millisecond":b),"millisecond"===b?+this>+c:+c<+this.clone().startOf(b)):!1}function mb(a,b){var c=p(a)?a:Ja(a);return this.isValid()&&c.isValid()?(b=K(m(b)?"millisecond":b),"millisecond"===b?+c>+this:+this.clone().endOf(b)<+c):!1}function nb(a,b,c){return this.isAfter(a,c)&&this.isBefore(b,c)}function ob(a,b){var c,d=p(a)?a:Ja(a);return this.isValid()&&d.isValid()?(b=K(b||"millisecond"),"millisecond"===b?+this===+d:(c=+d,+this.clone().startOf(b)<=c&&c<=+this.clone().endOf(b))):!1}function pb(a,b){return this.isSame(a,b)||this.isAfter(a,b)}function qb(a,b){return this.isSame(a,b)||this.isBefore(a,b)}function rb(a,b,c){var d,e,f,g;return this.isValid()?(d=Ra(a,this),d.isValid()?(e=6e4*(d.utcOffset()-this.utcOffset()),b=K(b),"year"===b||"month"===b||"quarter"===b?(g=sb(this,d),"quarter"===b?g/=3:"year"===b&&(g/=12)):(f=this-d,g="second"===b?f/1e3:"minute"===b?f/6e4:"hour"===b?f/36e5:"day"===b?(f-e)/864e5:"week"===b?(f-e)/6048e5:f),c?g:q(g)):NaN):NaN}function sb(a,b){var c,d,e=12*(b.year()-a.year())+(b.month()-a.month()),f=a.clone().add(e,"months");return 0>b-f?(c=a.clone().add(e-1,"months"),d=(b-f)/(f-c)):(c=a.clone().add(e+1,"months"),d=(b-f)/(c-f)),-(e+d)}function tb(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")}function ub(){var a=this.clone().utc();return 0<a.year()&&a.year()<=9999?w(Date.prototype.toISOString)?this.toDate().toISOString():U(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):U(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")}function vb(b){var c=U(this,b||a.defaultFormat);return this.localeData().postformat(c)}function wb(a,b){return this.isValid()&&(p(a)&&a.isValid()||Ja(a).isValid())?cb({to:this,from:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function xb(a){return this.from(Ja(),a)}function yb(a,b){return this.isValid()&&(p(a)&&a.isValid()||Ja(a).isValid())?cb({from:this,to:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function zb(a){return this.to(Ja(),a)}function Ab(a){var b;return void 0===a?this._locale._abbr:(b=H(a),null!=b&&(this._locale=b),this)}function Bb(){return this._locale}function Cb(a){switch(a=K(a)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a&&this.weekday(0),"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this}function Db(a){return a=K(a),void 0===a||"millisecond"===a?this:this.startOf(a).add(1,"isoWeek"===a?"week":a).subtract(1,"ms")}function Eb(){return+this._d-6e4*(this._offset||0)}function Fb(){return Math.floor(+this/1e3)}function Gb(){return this._offset?new Date(+this):this._d}function Hb(){var a=this;return[a.year(),a.month(),a.date(),a.hour(),a.minute(),a.second(),a.millisecond()]}function Ib(){var a=this;return{years:a.year(),months:a.month(),date:a.date(),hours:a.hours(),minutes:a.minutes(),seconds:a.seconds(),milliseconds:a.milliseconds()}}function Jb(){return this.isValid()?this.toISOString():null}function Kb(){return k(this)}function Lb(){return g({},j(this))}function Mb(){return j(this).overflow}function Nb(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}}function Ob(a,b){R(0,[a,a.length],0,b)}function Pb(a){return Tb.call(this,a,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)}function Qb(a){return Tb.call(this,a,this.isoWeek(),this.isoWeekday(),1,4)}function Rb(){return wa(this.year(),1,4)}function Sb(){var a=this.localeData()._week;return wa(this.year(),a.dow,a.doy)}function Tb(a,b,c,d,e){var f;return null==a?va(this,d,e).year:(f=wa(a,d,e),b>f&&(b=f),Ub.call(this,a,b,c,d,e))}function Ub(a,b,c,d,e){var f=ua(a,b,c,d,e),g=pa(f.year,0,f.dayOfYear);return this.year(g.getUTCFullYear()),this.month(g.getUTCMonth()),this.date(g.getUTCDate()),this}function Vb(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)}function Wb(a){return va(a,this._week.dow,this._week.doy).week}function Xb(){return this._week.dow}function Yb(){return this._week.doy}function Zb(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")}function $b(a){var b=va(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")}function _b(a,b){return"string"!=typeof a?a:isNaN(a)?(a=b.weekdaysParse(a),"number"==typeof a?a:null):parseInt(a,10)}function ac(a,b){return c(this._weekdays)?this._weekdays[a.day()]:this._weekdays[this._weekdays.isFormat.test(b)?"format":"standalone"][a.day()]}function bc(a){return this._weekdaysShort[a.day()]}function cc(a){return this._weekdaysMin[a.day()]}function dc(a,b,c){var d,e,f;for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),d=0;7>d;d++){if(e=Ja([2e3,1]).day(d),c&&!this._fullWeekdaysParse[d]&&(this._fullWeekdaysParse[d]=new RegExp("^"+this.weekdays(e,"").replace(".",".?")+"$","i"),this._shortWeekdaysParse[d]=new RegExp("^"+this.weekdaysShort(e,"").replace(".",".?")+"$","i"),this._minWeekdaysParse[d]=new RegExp("^"+this.weekdaysMin(e,"").replace(".",".?")+"$","i")),this._weekdaysParse[d]||(f="^"+this.weekdays(e,"")+"|^"+this.weekdaysShort(e,"")+"|^"+this.weekdaysMin(e,""),this._weekdaysParse[d]=new RegExp(f.replace(".",""),"i")),c&&"dddd"===b&&this._fullWeekdaysParse[d].test(a))return d;if(c&&"ddd"===b&&this._shortWeekdaysParse[d].test(a))return d;if(c&&"dd"===b&&this._minWeekdaysParse[d].test(a))return d;if(!c&&this._weekdaysParse[d].test(a))return d}}function ec(a){if(!this.isValid())return null!=a?this:NaN;var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=_b(a,this.localeData()),this.add(a-b,"d")):b}function fc(a){if(!this.isValid())return null!=a?this:NaN;var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")}function gc(a){return this.isValid()?null==a?this.day()||7:this.day(this.day()%7?a:a-7):null!=a?this:NaN}function hc(a){var b=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")}function ic(){return this.hours()%12||12}function jc(a,b){R(a,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),b)})}function kc(a,b){return b._meridiemParse}function lc(a){return"p"===(a+"").toLowerCase().charAt(0)}function mc(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"}function nc(a,b){b[Hd]=r(1e3*("0."+a))}function oc(){return this._isUTC?"UTC":""}function pc(){return this._isUTC?"Coordinated Universal Time":""}function qc(a){return Ja(1e3*a)}function rc(){return Ja.apply(null,arguments).parseZone()}function sc(a,b,c){var d=this._calendar[a];return w(d)?d.call(b,c):d}function tc(a){var b=this._longDateFormat[a],c=this._longDateFormat[a.toUpperCase()];return b||!c?b:(this._longDateFormat[a]=c.replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a])}function uc(){return this._invalidDate}function vc(a){return this._ordinal.replace("%d",a)}function wc(a){return a}function xc(a,b,c,d){var e=this._relativeTime[c];return w(e)?e(a,b,c,d):e.replace(/%d/i,a)}function yc(a,b){var c=this._relativeTime[a>0?"future":"past"];return w(c)?c(b):c.replace(/%s/i,b)}function zc(a,b,c,d){var e=H(),f=h().set(d,b);return e[c](f,a)}function Ac(a,b,c,d,e){if("number"==typeof a&&(b=a,a=void 0),a=a||"",null!=b)return zc(a,b,c,e);var f,g=[];for(f=0;d>f;f++)g[f]=zc(a,f,c,e);return g}function Bc(a,b){return Ac(a,b,"months",12,"month")}function Cc(a,b){return Ac(a,b,"monthsShort",12,"month")}function Dc(a,b){return Ac(a,b,"weekdays",7,"day")}function Ec(a,b){return Ac(a,b,"weekdaysShort",7,"day")}function Fc(a,b){return Ac(a,b,"weekdaysMin",7,"day")}function Gc(){var a=this._data;return this._milliseconds=xe(this._milliseconds),this._days=xe(this._days),this._months=xe(this._months),a.milliseconds=xe(a.milliseconds),a.seconds=xe(a.seconds),a.minutes=xe(a.minutes),a.hours=xe(a.hours),a.months=xe(a.months),a.years=xe(a.years),this}function Hc(a,b,c,d){var e=cb(b,c);return a._milliseconds+=d*e._milliseconds,a._days+=d*e._days,a._months+=d*e._months,a._bubble()}function Ic(a,b){return Hc(this,a,b,1)}function Jc(a,b){return Hc(this,a,b,-1)}function Kc(a){return 0>a?Math.floor(a):Math.ceil(a)}function Lc(){var a,b,c,d,e,f=this._milliseconds,g=this._days,h=this._months,i=this._data;return f>=0&&g>=0&&h>=0||0>=f&&0>=g&&0>=h||(f+=864e5*Kc(Nc(h)+g),g=0,h=0),i.milliseconds=f%1e3,a=q(f/1e3),i.seconds=a%60,b=q(a/60),i.minutes=b%60,c=q(b/60),i.hours=c%24,g+=q(c/24),e=q(Mc(g)),h+=e,g-=Kc(Nc(e)),d=q(h/12),h%=12,i.days=g,i.months=h,i.years=d,this}function Mc(a){return 4800*a/146097}function Nc(a){return 146097*a/4800}function Oc(a){var b,c,d=this._milliseconds;if(a=K(a),"month"===a||"year"===a)return b=this._days+d/864e5,c=this._months+Mc(b),"month"===a?c:c/12;switch(b=this._days+Math.round(Nc(this._months)),a){case"week":return b/7+d/6048e5;case"day":return b+d/864e5;case"hour":return 24*b+d/36e5;case"minute":return 1440*b+d/6e4;case"second":return 86400*b+d/1e3;case"millisecond":return Math.floor(864e5*b)+d;default:throw new Error("Unknown unit "+a)}}function Pc(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*r(this._months/12)}function Qc(a){return function(){return this.as(a)}}function Rc(a){return a=K(a),this[a+"s"]()}function Sc(a){return function(){return this._data[a]}}function Tc(){return q(this.days()/7)}function Uc(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function Vc(a,b,c){var d=cb(a).abs(),e=Ne(d.as("s")),f=Ne(d.as("m")),g=Ne(d.as("h")),h=Ne(d.as("d")),i=Ne(d.as("M")),j=Ne(d.as("y")),k=e<Oe.s&&["s",e]||1>=f&&["m"]||f<Oe.m&&["mm",f]||1>=g&&["h"]||g<Oe.h&&["hh",g]||1>=h&&["d"]||h<Oe.d&&["dd",h]||1>=i&&["M"]||i<Oe.M&&["MM",i]||1>=j&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,Uc.apply(null,k)}function Wc(a,b){return void 0===Oe[a]?!1:void 0===b?Oe[a]:(Oe[a]=b,!0)}function Xc(a){var b=this.localeData(),c=Vc(this,!a,b);return a&&(c=b.pastFuture(+this,c)),b.postformat(c)}function Yc(){var a,b,c,d=Pe(this._milliseconds)/1e3,e=Pe(this._days),f=Pe(this._months);a=q(d/60),b=q(a/60),d%=60,a%=60,c=q(f/12),f%=12;var g=c,h=f,i=e,j=b,k=a,l=d,m=this.asSeconds();return m?(0>m?"-":"")+"P"+(g?g+"Y":"")+(h?h+"M":"")+(i?i+"D":"")+(j||k||l?"T":"")+(j?j+"H":"")+(k?k+"M":"")+(l?l+"S":""):"P0D"}var Zc,$c=a.momentProperties=[],_c=!1,ad={};a.suppressDeprecationWarnings=!1;var bd,cd={},dd={},ed=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,fd=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,gd={},hd={},id=/\d/,jd=/\d\d/,kd=/\d{3}/,ld=/\d{4}/,md=/[+-]?\d{6}/,nd=/\d\d?/,od=/\d\d\d\d?/,pd=/\d\d\d\d\d\d?/,qd=/\d{1,3}/,rd=/\d{1,4}/,sd=/[+-]?\d{1,6}/,td=/\d+/,ud=/[+-]?\d+/,vd=/Z|[+-]\d\d:?\d\d/gi,wd=/Z|[+-]\d\d(?::?\d\d)?/gi,xd=/[+-]?\d+(\.\d{1,3})?/,yd=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,zd={},Ad={},Bd=0,Cd=1,Dd=2,Ed=3,Fd=4,Gd=5,Hd=6,Id=7,Jd=8;R("M",["MM",2],"Mo",function(){return this.month()+1}),R("MMM",0,0,function(a){return this.localeData().monthsShort(this,a)}),R("MMMM",0,0,function(a){return this.localeData().months(this,a)}),J("month","M"),W("M",nd),W("MM",nd,jd),W("MMM",function(a,b){return b.monthsShortRegex(a)}),W("MMMM",function(a,b){return b.monthsRegex(a)}),$(["M","MM"],function(a,b){b[Cd]=r(a)-1}),$(["MMM","MMMM"],function(a,b,c,d){var e=c._locale.monthsParse(a,d,c._strict);null!=e?b[Cd]=e:j(c).invalidMonth=a});var Kd=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/,Ld="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),Md="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),Nd=yd,Od=yd,Pd=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?/,Qd=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?/,Rd=/Z|[+-]\d\d(?::?\d\d)?/,Sd=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],Td=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],Ud=/^\/?Date\((\-?\d+)/i;a.createFromInputFallback=u("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}),R("Y",0,0,function(){var a=this.year();return 9999>=a?""+a:"+"+a}),R(0,["YY",2],0,function(){return this.year()%100}),R(0,["YYYY",4],0,"year"),R(0,["YYYYY",5],0,"year"),R(0,["YYYYYY",6,!0],0,"year"),J("year","y"),W("Y",ud),W("YY",nd,jd),W("YYYY",rd,ld),W("YYYYY",sd,md),W("YYYYYY",sd,md),$(["YYYYY","YYYYYY"],Bd),$("YYYY",function(b,c){c[Bd]=2===b.length?a.parseTwoDigitYear(b):r(b);
-}),$("YY",function(b,c){c[Bd]=a.parseTwoDigitYear(b)}),$("Y",function(a,b){b[Bd]=parseInt(a,10)}),a.parseTwoDigitYear=function(a){return r(a)+(r(a)>68?1900:2e3)};var Vd=M("FullYear",!1);a.ISO_8601=function(){};var Wd=u("moment().min is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(){var a=Ja.apply(null,arguments);return this.isValid()&&a.isValid()?this>a?this:a:l()}),Xd=u("moment().max is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(){var a=Ja.apply(null,arguments);return this.isValid()&&a.isValid()?a>this?this:a:l()}),Yd=function(){return Date.now?Date.now():+new Date};Pa("Z",":"),Pa("ZZ",""),W("Z",wd),W("ZZ",wd),$(["Z","ZZ"],function(a,b,c){c._useUTC=!0,c._tzm=Qa(wd,a)});var Zd=/([\+\-]|\d\d)/gi;a.updateOffset=function(){};var $d=/^(\-)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?\d*)?$/,_d=/^(-)?P(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)W)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?$/;cb.fn=Na.prototype;var ae=hb(1,"add"),be=hb(-1,"subtract");a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ";var ce=u("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(a){return void 0===a?this.localeData():this.locale(a)});R(0,["gg",2],0,function(){return this.weekYear()%100}),R(0,["GG",2],0,function(){return this.isoWeekYear()%100}),Ob("gggg","weekYear"),Ob("ggggg","weekYear"),Ob("GGGG","isoWeekYear"),Ob("GGGGG","isoWeekYear"),J("weekYear","gg"),J("isoWeekYear","GG"),W("G",ud),W("g",ud),W("GG",nd,jd),W("gg",nd,jd),W("GGGG",rd,ld),W("gggg",rd,ld),W("GGGGG",sd,md),W("ggggg",sd,md),_(["gggg","ggggg","GGGG","GGGGG"],function(a,b,c,d){b[d.substr(0,2)]=r(a)}),_(["gg","GG"],function(b,c,d,e){c[e]=a.parseTwoDigitYear(b)}),R("Q",0,"Qo","quarter"),J("quarter","Q"),W("Q",id),$("Q",function(a,b){b[Cd]=3*(r(a)-1)}),R("w",["ww",2],"wo","week"),R("W",["WW",2],"Wo","isoWeek"),J("week","w"),J("isoWeek","W"),W("w",nd),W("ww",nd,jd),W("W",nd),W("WW",nd,jd),_(["w","ww","W","WW"],function(a,b,c,d){b[d.substr(0,1)]=r(a)});var de={dow:0,doy:6};R("D",["DD",2],"Do","date"),J("date","D"),W("D",nd),W("DD",nd,jd),W("Do",function(a,b){return a?b._ordinalParse:b._ordinalParseLenient}),$(["D","DD"],Dd),$("Do",function(a,b){b[Dd]=r(a.match(nd)[0],10)});var ee=M("Date",!0);R("d",0,"do","day"),R("dd",0,0,function(a){return this.localeData().weekdaysMin(this,a)}),R("ddd",0,0,function(a){return this.localeData().weekdaysShort(this,a)}),R("dddd",0,0,function(a){return this.localeData().weekdays(this,a)}),R("e",0,0,"weekday"),R("E",0,0,"isoWeekday"),J("day","d"),J("weekday","e"),J("isoWeekday","E"),W("d",nd),W("e",nd),W("E",nd),W("dd",yd),W("ddd",yd),W("dddd",yd),_(["dd","ddd","dddd"],function(a,b,c,d){var e=c._locale.weekdaysParse(a,d,c._strict);null!=e?b.d=e:j(c).invalidWeekday=a}),_(["d","e","E"],function(a,b,c,d){b[d]=r(a)});var fe="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),ge="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),he="Su_Mo_Tu_We_Th_Fr_Sa".split("_");R("DDD",["DDDD",3],"DDDo","dayOfYear"),J("dayOfYear","DDD"),W("DDD",qd),W("DDDD",kd),$(["DDD","DDDD"],function(a,b,c){c._dayOfYear=r(a)}),R("H",["HH",2],0,"hour"),R("h",["hh",2],0,ic),R("hmm",0,0,function(){return""+ic.apply(this)+Q(this.minutes(),2)}),R("hmmss",0,0,function(){return""+ic.apply(this)+Q(this.minutes(),2)+Q(this.seconds(),2)}),R("Hmm",0,0,function(){return""+this.hours()+Q(this.minutes(),2)}),R("Hmmss",0,0,function(){return""+this.hours()+Q(this.minutes(),2)+Q(this.seconds(),2)}),jc("a",!0),jc("A",!1),J("hour","h"),W("a",kc),W("A",kc),W("H",nd),W("h",nd),W("HH",nd,jd),W("hh",nd,jd),W("hmm",od),W("hmmss",pd),W("Hmm",od),W("Hmmss",pd),$(["H","HH"],Ed),$(["a","A"],function(a,b,c){c._isPm=c._locale.isPM(a),c._meridiem=a}),$(["h","hh"],function(a,b,c){b[Ed]=r(a),j(c).bigHour=!0}),$("hmm",function(a,b,c){var d=a.length-2;b[Ed]=r(a.substr(0,d)),b[Fd]=r(a.substr(d)),j(c).bigHour=!0}),$("hmmss",function(a,b,c){var d=a.length-4,e=a.length-2;b[Ed]=r(a.substr(0,d)),b[Fd]=r(a.substr(d,2)),b[Gd]=r(a.substr(e)),j(c).bigHour=!0}),$("Hmm",function(a,b,c){var d=a.length-2;b[Ed]=r(a.substr(0,d)),b[Fd]=r(a.substr(d))}),$("Hmmss",function(a,b,c){var d=a.length-4,e=a.length-2;b[Ed]=r(a.substr(0,d)),b[Fd]=r(a.substr(d,2)),b[Gd]=r(a.substr(e))});var ie=/[ap]\.?m?\.?/i,je=M("Hours",!0);R("m",["mm",2],0,"minute"),J("minute","m"),W("m",nd),W("mm",nd,jd),$(["m","mm"],Fd);var ke=M("Minutes",!1);R("s",["ss",2],0,"second"),J("second","s"),W("s",nd),W("ss",nd,jd),$(["s","ss"],Gd);var le=M("Seconds",!1);R("S",0,0,function(){return~~(this.millisecond()/100)}),R(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),R(0,["SSS",3],0,"millisecond"),R(0,["SSSS",4],0,function(){return 10*this.millisecond()}),R(0,["SSSSS",5],0,function(){return 100*this.millisecond()}),R(0,["SSSSSS",6],0,function(){return 1e3*this.millisecond()}),R(0,["SSSSSSS",7],0,function(){return 1e4*this.millisecond()}),R(0,["SSSSSSSS",8],0,function(){return 1e5*this.millisecond()}),R(0,["SSSSSSSSS",9],0,function(){return 1e6*this.millisecond()}),J("millisecond","ms"),W("S",qd,id),W("SS",qd,jd),W("SSS",qd,kd);var me;for(me="SSSS";me.length<=9;me+="S")W(me,td);for(me="S";me.length<=9;me+="S")$(me,nc);var ne=M("Milliseconds",!1);R("z",0,0,"zoneAbbr"),R("zz",0,0,"zoneName");var oe=o.prototype;oe.add=ae,oe.calendar=jb,oe.clone=kb,oe.diff=rb,oe.endOf=Db,oe.format=vb,oe.from=wb,oe.fromNow=xb,oe.to=yb,oe.toNow=zb,oe.get=P,oe.invalidAt=Mb,oe.isAfter=lb,oe.isBefore=mb,oe.isBetween=nb,oe.isSame=ob,oe.isSameOrAfter=pb,oe.isSameOrBefore=qb,oe.isValid=Kb,oe.lang=ce,oe.locale=Ab,oe.localeData=Bb,oe.max=Xd,oe.min=Wd,oe.parsingFlags=Lb,oe.set=P,oe.startOf=Cb,oe.subtract=be,oe.toArray=Hb,oe.toObject=Ib,oe.toDate=Gb,oe.toISOString=ub,oe.toJSON=Jb,oe.toString=tb,oe.unix=Fb,oe.valueOf=Eb,oe.creationData=Nb,oe.year=Vd,oe.isLeapYear=sa,oe.weekYear=Pb,oe.isoWeekYear=Qb,oe.quarter=oe.quarters=Vb,oe.month=ga,oe.daysInMonth=ha,oe.week=oe.weeks=Zb,oe.isoWeek=oe.isoWeeks=$b,oe.weeksInYear=Sb,oe.isoWeeksInYear=Rb,oe.date=ee,oe.day=oe.days=ec,oe.weekday=fc,oe.isoWeekday=gc,oe.dayOfYear=hc,oe.hour=oe.hours=je,oe.minute=oe.minutes=ke,oe.second=oe.seconds=le,oe.millisecond=oe.milliseconds=ne,oe.utcOffset=Ta,oe.utc=Va,oe.local=Wa,oe.parseZone=Xa,oe.hasAlignedHourOffset=Ya,oe.isDST=Za,oe.isDSTShifted=$a,oe.isLocal=_a,oe.isUtcOffset=ab,oe.isUtc=bb,oe.isUTC=bb,oe.zoneAbbr=oc,oe.zoneName=pc,oe.dates=u("dates accessor is deprecated. Use date instead.",ee),oe.months=u("months accessor is deprecated. Use month instead",ga),oe.years=u("years accessor is deprecated. Use year instead",Vd),oe.zone=u("moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779",Ua);var pe=oe,qe={sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},re={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},se="Invalid date",te="%d",ue=/\d{1,2}/,ve={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},we=A.prototype;we._calendar=qe,we.calendar=sc,we._longDateFormat=re,we.longDateFormat=tc,we._invalidDate=se,we.invalidDate=uc,we._ordinal=te,we.ordinal=vc,we._ordinalParse=ue,we.preparse=wc,we.postformat=wc,we._relativeTime=ve,we.relativeTime=xc,we.pastFuture=yc,we.set=y,we.months=ca,we._months=Ld,we.monthsShort=da,we._monthsShort=Md,we.monthsParse=ea,we._monthsRegex=Od,we.monthsRegex=ja,we._monthsShortRegex=Nd,we.monthsShortRegex=ia,we.week=Wb,we._week=de,we.firstDayOfYear=Yb,we.firstDayOfWeek=Xb,we.weekdays=ac,we._weekdays=fe,we.weekdaysMin=cc,we._weekdaysMin=he,we.weekdaysShort=bc,we._weekdaysShort=ge,we.weekdaysParse=dc,we.isPM=lc,we._meridiemParse=ie,we.meridiem=mc,E("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===r(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),a.lang=u("moment.lang is deprecated. Use moment.locale instead.",E),a.langData=u("moment.langData is deprecated. Use moment.localeData instead.",H);var xe=Math.abs,ye=Qc("ms"),ze=Qc("s"),Ae=Qc("m"),Be=Qc("h"),Ce=Qc("d"),De=Qc("w"),Ee=Qc("M"),Fe=Qc("y"),Ge=Sc("milliseconds"),He=Sc("seconds"),Ie=Sc("minutes"),Je=Sc("hours"),Ke=Sc("days"),Le=Sc("months"),Me=Sc("years"),Ne=Math.round,Oe={s:45,m:45,h:22,d:26,M:11},Pe=Math.abs,Qe=Na.prototype;Qe.abs=Gc,Qe.add=Ic,Qe.subtract=Jc,Qe.as=Oc,Qe.asMilliseconds=ye,Qe.asSeconds=ze,Qe.asMinutes=Ae,Qe.asHours=Be,Qe.asDays=Ce,Qe.asWeeks=De,Qe.asMonths=Ee,Qe.asYears=Fe,Qe.valueOf=Pc,Qe._bubble=Lc,Qe.get=Rc,Qe.milliseconds=Ge,Qe.seconds=He,Qe.minutes=Ie,Qe.hours=Je,Qe.days=Ke,Qe.weeks=Tc,Qe.months=Le,Qe.years=Me,Qe.humanize=Xc,Qe.toISOString=Yc,Qe.toString=Yc,Qe.toJSON=Yc,Qe.locale=Ab,Qe.localeData=Bb,Qe.toIsoString=u("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",Yc),Qe.lang=ce,R("X",0,0,"unix"),R("x",0,0,"valueOf"),W("x",ud),W("X",xd),$("X",function(a,b,c){c._d=new Date(1e3*parseFloat(a,10))}),$("x",function(a,b,c){c._d=new Date(r(a))}),a.version="2.12.0",b(Ja),a.fn=pe,a.min=La,a.max=Ma,a.now=Yd,a.utc=h,a.unix=qc,a.months=Bc,a.isDate=d,a.locale=E,a.invalid=l,a.duration=cb,a.isMoment=p,a.weekdays=Dc,a.parseZone=rc,a.localeData=H,a.isDuration=Oa,a.monthsShort=Cc,a.weekdaysMin=Fc,a.defineLocale=F,a.updateLocale=G,a.locales=I,a.weekdaysShort=Ec,a.normalizeUnits=K,a.relativeTimeThreshold=Wc,a.prototype=pe;var Re=a;return Re});
\ No newline at end of file
+!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.moment=b()}(this,function(){"use strict";function a(){return fd.apply(null,arguments)}function b(a){fd=a}function c(a){return a instanceof Array||"[object Array]"===Object.prototype.toString.call(a)}function d(a){return a instanceof Date||"[object Date]"===Object.prototype.toString.call(a)}function e(a,b){var c,d=[];for(c=0;c<a.length;++c)d.push(b(a[c],c));return d}function f(a,b){return Object.prototype.hasOwnProperty.call(a,b)}function g(a,b){for(var c in b)f(b,c)&&(a[c]=b[c]);return f(b,"toString")&&(a.toString=b.toString),f(b,"valueOf")&&(a.valueOf=b.valueOf),a}function h(a,b,c,d){return Ja(a,b,c,d,!0).utc()}function i(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],meridiem:null}}function j(a){return null==a._pf&&(a._pf=i()),a._pf}function k(a){if(null==a._isValid){var b=j(a),c=gd.call(b.parsedDateParts,function(a){return null!=a});a._isValid=!isNaN(a._d.getTime())&&b.overflow<0&&!b.empty&&!b.invalidMonth&&!b.invalidWeekday&&!b.nullInput&&!b.invalidFormat&&!b.userInvalidated&&(!b.meridiem||b.meridiem&&c),a._strict&&(a._isValid=a._isValid&&0===b.charsLeftOver&&0===b.unusedTokens.length&&void 0===b.bigHour)}return a._isValid}function l(a){var b=h(NaN);return null!=a?g(j(b),a):j(b).userInvalidated=!0,b}function m(a){return void 0===a}function n(a,b){var c,d,e;if(m(b._isAMomentObject)||(a._isAMomentObject=b._isAMomentObject),m(b._i)||(a._i=b._i),m(b._f)||(a._f=b._f),m(b._l)||(a._l=b._l),m(b._strict)||(a._strict=b._strict),m(b._tzm)||(a._tzm=b._tzm),m(b._isUTC)||(a._isUTC=b._isUTC),m(b._offset)||(a._offset=b._offset),m(b._pf)||(a._pf=j(b)),m(b._locale)||(a._locale=b._locale),hd.length>0)for(c in hd)d=hd[c],e=b[d],m(e)||(a[d]=e);return a}function o(b){n(this,b),this._d=new Date(null!=b._d?b._d.getTime():NaN),id===!1&&(id=!0,a.updateOffset(this),id=!1)}function p(a){return a instanceof o||null!=a&&null!=a._isAMomentObject}function q(a){return 0>a?Math.ceil(a):Math.floor(a)}function r(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=q(b)),c}function s(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&r(a[d])!==r(b[d]))&&g++;return g+f}function t(b){a.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+b)}function u(b,c){var d=!0;return g(function(){return null!=a.deprecationHandler&&a.deprecationHandler(null,b),d&&(t(b+"\nArguments: "+Array.prototype.slice.call(arguments).join(", ")+"\n"+(new Error).stack),d=!1),c.apply(this,arguments)},c)}function v(b,c){null!=a.deprecationHandler&&a.deprecationHandler(b,c),jd[b]||(t(c),jd[b]=!0)}function w(a){return a instanceof Function||"[object Function]"===Object.prototype.toString.call(a)}function x(a){return"[object Object]"===Object.prototype.toString.call(a)}function y(a){var b,c;for(c in a)b=a[c],w(b)?this[c]=b:this["_"+c]=b;this._config=a,this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)}function z(a,b){var c,d=g({},a);for(c in b)f(b,c)&&(x(a[c])&&x(b[c])?(d[c]={},g(d[c],a[c]),g(d[c],b[c])):null!=b[c]?d[c]=b[c]:delete d[c]);return d}function A(a){null!=a&&this.set(a)}function B(a){return a?a.toLowerCase().replace("_","-"):a}function C(a){for(var b,c,d,e,f=0;f<a.length;){for(e=B(a[f]).split("-"),b=e.length,c=B(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=D(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&s(e,c,!0)>=b-1)break;b--}f++}return null}function D(a){var b=null;if(!nd[a]&&"undefined"!=typeof module&&module&&module.exports)try{b=ld._abbr,require("./locale/"+a),E(b)}catch(c){}return nd[a]}function E(a,b){var c;return a&&(c=m(b)?H(a):F(a,b),c&&(ld=c)),ld._abbr}function F(a,b){return null!==b?(b.abbr=a,null!=nd[a]?(v("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale"),b=z(nd[a]._config,b)):null!=b.parentLocale&&(null!=nd[b.parentLocale]?b=z(nd[b.parentLocale]._config,b):v("parentLocaleUndefined","specified parentLocale is not defined yet")),nd[a]=new A(b),E(a),nd[a]):(delete nd[a],null)}function G(a,b){if(null!=b){var c;null!=nd[a]&&(b=z(nd[a]._config,b)),c=new A(b),c.parentLocale=nd[a],nd[a]=c,E(a)}else null!=nd[a]&&(null!=nd[a].parentLocale?nd[a]=nd[a].parentLocale:null!=nd[a]&&delete nd[a]);return nd[a]}function H(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return ld;if(!c(a)){if(b=D(a))return b;a=[a]}return C(a)}function I(){return kd(nd)}function J(a,b){var c=a.toLowerCase();od[c]=od[c+"s"]=od[b]=a}function K(a){return"string"==typeof a?od[a]||od[a.toLowerCase()]:void 0}function L(a){var b,c,d={};for(c in a)f(a,c)&&(b=K(c),b&&(d[b]=a[c]));return d}function M(b,c){return function(d){return null!=d?(O(this,b,d),a.updateOffset(this,c),this):N(this,b)}}function N(a,b){return a.isValid()?a._d["get"+(a._isUTC?"UTC":"")+b]():NaN}function O(a,b,c){a.isValid()&&a._d["set"+(a._isUTC?"UTC":"")+b](c)}function P(a,b){var c;if("object"==typeof a)for(c in a)this.set(c,a[c]);else if(a=K(a),w(this[a]))return this[a](b);return this}function Q(a,b,c){var d=""+Math.abs(a),e=b-d.length,f=a>=0;return(f?c?"+":"":"-")+Math.pow(10,Math.max(0,e)).toString().substr(1)+d}function R(a,b,c,d){var e=d;"string"==typeof d&&(e=function(){return this[d]()}),a&&(sd[a]=e),b&&(sd[b[0]]=function(){return Q(e.apply(this,arguments),b[1],b[2])}),c&&(sd[c]=function(){return this.localeData().ordinal(e.apply(this,arguments),a)})}function S(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function T(a){var b,c,d=a.match(pd);for(b=0,c=d.length;c>b;b++)sd[d[b]]?d[b]=sd[d[b]]:d[b]=S(d[b]);return function(b){var e,f="";for(e=0;c>e;e++)f+=d[e]instanceof Function?d[e].call(b,a):d[e];return f}}function U(a,b){return a.isValid()?(b=V(b,a.localeData()),rd[b]=rd[b]||T(b),rd[b](a)):a.localeData().invalidDate()}function V(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(qd.lastIndex=0;d>=0&&qd.test(a);)a=a.replace(qd,c),qd.lastIndex=0,d-=1;return a}function W(a,b,c){Kd[a]=w(b)?b:function(a,d){return a&&c?c:b}}function X(a,b){return f(Kd,a)?Kd[a](b._strict,b._locale):new RegExp(Y(a))}function Y(a){return Z(a.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e}))}function Z(a){return a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function $(a,b){var c,d=b;for("string"==typeof a&&(a=[a]),"number"==typeof b&&(d=function(a,c){c[b]=r(a)}),c=0;c<a.length;c++)Ld[a[c]]=d}function _(a,b){$(a,function(a,c,d,e){d._w=d._w||{},b(a,d._w,d,e)})}function aa(a,b,c){null!=b&&f(Ld,a)&&Ld[a](b,c._a,c,a)}function ba(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function ca(a,b){return c(this._months)?this._months[a.month()]:this._months[Vd.test(b)?"format":"standalone"][a.month()]}function da(a,b){return c(this._monthsShort)?this._monthsShort[a.month()]:this._monthsShort[Vd.test(b)?"format":"standalone"][a.month()]}function ea(a,b,c){var d,e,f,g=a.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],d=0;12>d;++d)f=h([2e3,d]),this._shortMonthsParse[d]=this.monthsShort(f,"").toLocaleLowerCase(),this._longMonthsParse[d]=this.months(f,"").toLocaleLowerCase();return c?"MMM"===b?(e=md.call(this._shortMonthsParse,g),-1!==e?e:null):(e=md.call(this._longMonthsParse,g),-1!==e?e:null):"MMM"===b?(e=md.call(this._shortMonthsParse,g),-1!==e?e:(e=md.call(this._longMonthsParse,g),-1!==e?e:null)):(e=md.call(this._longMonthsParse,g),-1!==e?e:(e=md.call(this._shortMonthsParse,g),-1!==e?e:null))}function fa(a,b,c){var d,e,f;if(this._monthsParseExact)return ea.call(this,a,b,c);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),d=0;12>d;d++){if(e=h([2e3,d]),c&&!this._longMonthsParse[d]&&(this._longMonthsParse[d]=new RegExp("^"+this.months(e,"").replace(".","")+"$","i"),this._shortMonthsParse[d]=new RegExp("^"+this.monthsShort(e,"").replace(".","")+"$","i")),c||this._monthsParse[d]||(f="^"+this.months(e,"")+"|^"+this.monthsShort(e,""),this._monthsParse[d]=new RegExp(f.replace(".",""),"i")),c&&"MMMM"===b&&this._longMonthsParse[d].test(a))return d;if(c&&"MMM"===b&&this._shortMonthsParse[d].test(a))return d;if(!c&&this._monthsParse[d].test(a))return d}}function ga(a,b){var c;if(!a.isValid())return a;if("string"==typeof b)if(/^\d+$/.test(b))b=r(b);else if(b=a.localeData().monthsParse(b),"number"!=typeof b)return a;return c=Math.min(a.date(),ba(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a}function ha(b){return null!=b?(ga(this,b),a.updateOffset(this,!0),this):N(this,"Month")}function ia(){return ba(this.year(),this.month())}function ja(a){return this._monthsParseExact?(f(this,"_monthsRegex")||la.call(this),a?this._monthsShortStrictRegex:this._monthsShortRegex):this._monthsShortStrictRegex&&a?this._monthsShortStrictRegex:this._monthsShortRegex}function ka(a){return this._monthsParseExact?(f(this,"_monthsRegex")||la.call(this),a?this._monthsStrictRegex:this._monthsRegex):this._monthsStrictRegex&&a?this._monthsStrictRegex:this._monthsRegex}function la(){function a(a,b){return b.length-a.length}var b,c,d=[],e=[],f=[];for(b=0;12>b;b++)c=h([2e3,b]),d.push(this.monthsShort(c,"")),e.push(this.months(c,"")),f.push(this.months(c,"")),f.push(this.monthsShort(c,""));for(d.sort(a),e.sort(a),f.sort(a),b=0;12>b;b++)d[b]=Z(d[b]),e[b]=Z(e[b]),f[b]=Z(f[b]);this._monthsRegex=new RegExp("^("+f.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+e.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+d.join("|")+")","i")}function ma(a){var b,c=a._a;return c&&-2===j(a).overflow&&(b=c[Nd]<0||c[Nd]>11?Nd:c[Od]<1||c[Od]>ba(c[Md],c[Nd])?Od:c[Pd]<0||c[Pd]>24||24===c[Pd]&&(0!==c[Qd]||0!==c[Rd]||0!==c[Sd])?Pd:c[Qd]<0||c[Qd]>59?Qd:c[Rd]<0||c[Rd]>59?Rd:c[Sd]<0||c[Sd]>999?Sd:-1,j(a)._overflowDayOfYear&&(Md>b||b>Od)&&(b=Od),j(a)._overflowWeeks&&-1===b&&(b=Td),j(a)._overflowWeekday&&-1===b&&(b=Ud),j(a).overflow=b),a}function na(a){var b,c,d,e,f,g,h=a._i,i=$d.exec(h)||_d.exec(h);if(i){for(j(a).iso=!0,b=0,c=be.length;c>b;b++)if(be[b][1].exec(i[1])){e=be[b][0],d=be[b][2]!==!1;break}if(null==e)return void(a._isValid=!1);if(i[3]){for(b=0,c=ce.length;c>b;b++)if(ce[b][1].exec(i[3])){f=(i[2]||" ")+ce[b][0];break}if(null==f)return void(a._isValid=!1)}if(!d&&null!=f)return void(a._isValid=!1);if(i[4]){if(!ae.exec(i[4]))return void(a._isValid=!1);g="Z"}a._f=e+(f||"")+(g||""),Ca(a)}else a._isValid=!1}function oa(b){var c=de.exec(b._i);return null!==c?void(b._d=new Date(+c[1])):(na(b),void(b._isValid===!1&&(delete b._isValid,a.createFromInputFallback(b))))}function pa(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 100>a&&a>=0&&isFinite(h.getFullYear())&&h.setFullYear(a),h}function qa(a){var b=new Date(Date.UTC.apply(null,arguments));return 100>a&&a>=0&&isFinite(b.getUTCFullYear())&&b.setUTCFullYear(a),b}function ra(a){return sa(a)?366:365}function sa(a){return a%4===0&&a%100!==0||a%400===0}function ta(){return sa(this.year())}function ua(a,b,c){var d=7+b-c,e=(7+qa(a,0,d).getUTCDay()-b)%7;return-e+d-1}function va(a,b,c,d,e){var f,g,h=(7+c-d)%7,i=ua(a,d,e),j=1+7*(b-1)+h+i;return 0>=j?(f=a-1,g=ra(f)+j):j>ra(a)?(f=a+1,g=j-ra(a)):(f=a,g=j),{year:f,dayOfYear:g}}function wa(a,b,c){var d,e,f=ua(a.year(),b,c),g=Math.floor((a.dayOfYear()-f-1)/7)+1;return 1>g?(e=a.year()-1,d=g+xa(e,b,c)):g>xa(a.year(),b,c)?(d=g-xa(a.year(),b,c),e=a.year()+1):(e=a.year(),d=g),{week:d,year:e}}function xa(a,b,c){var d=ua(a,b,c),e=ua(a+1,b,c);return(ra(a)-d+e)/7}function ya(a,b,c){return null!=a?a:null!=b?b:c}function za(b){var c=new Date(a.now());return b._useUTC?[c.getUTCFullYear(),c.getUTCMonth(),c.getUTCDate()]:[c.getFullYear(),c.getMonth(),c.getDate()]}function Aa(a){var b,c,d,e,f=[];if(!a._d){for(d=za(a),a._w&&null==a._a[Od]&&null==a._a[Nd]&&Ba(a),a._dayOfYear&&(e=ya(a._a[Md],d[Md]),a._dayOfYear>ra(e)&&(j(a)._overflowDayOfYear=!0),c=qa(e,0,a._dayOfYear),a._a[Nd]=c.getUTCMonth(),a._a[Od]=c.getUTCDate()),b=0;3>b&&null==a._a[b];++b)a._a[b]=f[b]=d[b];for(;7>b;b++)a._a[b]=f[b]=null==a._a[b]?2===b?1:0:a._a[b];24===a._a[Pd]&&0===a._a[Qd]&&0===a._a[Rd]&&0===a._a[Sd]&&(a._nextDay=!0,a._a[Pd]=0),a._d=(a._useUTC?qa:pa).apply(null,f),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[Pd]=24)}}function Ba(a){var b,c,d,e,f,g,h,i;b=a._w,null!=b.GG||null!=b.W||null!=b.E?(f=1,g=4,c=ya(b.GG,a._a[Md],wa(Ka(),1,4).year),d=ya(b.W,1),e=ya(b.E,1),(1>e||e>7)&&(i=!0)):(f=a._locale._week.dow,g=a._locale._week.doy,c=ya(b.gg,a._a[Md],wa(Ka(),f,g).year),d=ya(b.w,1),null!=b.d?(e=b.d,(0>e||e>6)&&(i=!0)):null!=b.e?(e=b.e+f,(b.e<0||b.e>6)&&(i=!0)):e=f),1>d||d>xa(c,f,g)?j(a)._overflowWeeks=!0:null!=i?j(a)._overflowWeekday=!0:(h=va(c,d,e,f,g),a._a[Md]=h.year,a._dayOfYear=h.dayOfYear)}function Ca(b){if(b._f===a.ISO_8601)return void na(b);b._a=[],j(b).empty=!0;var c,d,e,f,g,h=""+b._i,i=h.length,k=0;for(e=V(b._f,b._locale).match(pd)||[],c=0;c<e.length;c++)f=e[c],d=(h.match(X(f,b))||[])[0],d&&(g=h.substr(0,h.indexOf(d)),g.length>0&&j(b).unusedInput.push(g),h=h.slice(h.indexOf(d)+d.length),k+=d.length),sd[f]?(d?j(b).empty=!1:j(b).unusedTokens.push(f),aa(f,d,b)):b._strict&&!d&&j(b).unusedTokens.push(f);j(b).charsLeftOver=i-k,h.length>0&&j(b).unusedInput.push(h),j(b).bigHour===!0&&b._a[Pd]<=12&&b._a[Pd]>0&&(j(b).bigHour=void 0),j(b).parsedDateParts=b._a.slice(0),j(b).meridiem=b._meridiem,b._a[Pd]=Da(b._locale,b._a[Pd],b._meridiem),Aa(b),ma(b)}function Da(a,b,c){var d;return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&12>b&&(b+=12),d||12!==b||(b=0),b):b}function Ea(a){var b,c,d,e,f;if(0===a._f.length)return j(a).invalidFormat=!0,void(a._d=new Date(NaN));for(e=0;e<a._f.length;e++)f=0,b=n({},a),null!=a._useUTC&&(b._useUTC=a._useUTC),b._f=a._f[e],Ca(b),k(b)&&(f+=j(b).charsLeftOver,f+=10*j(b).unusedTokens.length,j(b).score=f,(null==d||d>f)&&(d=f,c=b));g(a,c||b)}function Fa(a){if(!a._d){var b=L(a._i);a._a=e([b.year,b.month,b.day||b.date,b.hour,b.minute,b.second,b.millisecond],function(a){return a&&parseInt(a,10)}),Aa(a)}}function Ga(a){var b=new o(ma(Ha(a)));return b._nextDay&&(b.add(1,"d"),b._nextDay=void 0),b}function Ha(a){var b=a._i,e=a._f;return a._locale=a._locale||H(a._l),null===b||void 0===e&&""===b?l({nullInput:!0}):("string"==typeof b&&(a._i=b=a._locale.preparse(b)),p(b)?new o(ma(b)):(c(e)?Ea(a):e?Ca(a):d(b)?a._d=b:Ia(a),k(a)||(a._d=null),a))}function Ia(b){var f=b._i;void 0===f?b._d=new Date(a.now()):d(f)?b._d=new Date(f.valueOf()):"string"==typeof f?oa(b):c(f)?(b._a=e(f.slice(0),function(a){return parseInt(a,10)}),Aa(b)):"object"==typeof f?Fa(b):"number"==typeof f?b._d=new Date(f):a.createFromInputFallback(b)}function Ja(a,b,c,d,e){var f={};return"boolean"==typeof c&&(d=c,c=void 0),f._isAMomentObject=!0,f._useUTC=f._isUTC=e,f._l=c,f._i=a,f._f=b,f._strict=d,Ga(f)}function Ka(a,b,c,d){return Ja(a,b,c,d,!1)}function La(a,b){var d,e;if(1===b.length&&c(b[0])&&(b=b[0]),!b.length)return Ka();for(d=b[0],e=1;e<b.length;++e)(!b[e].isValid()||b[e][a](d))&&(d=b[e]);return d}function Ma(){var a=[].slice.call(arguments,0);return La("isBefore",a)}function Na(){var a=[].slice.call(arguments,0);return La("isAfter",a)}function Oa(a){var b=L(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+1e3*h*60*60,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=H(),this._bubble()}function Pa(a){return a instanceof Oa}function Qa(a,b){R(a,0,0,function(){var a=this.utcOffset(),c="+";return 0>a&&(a=-a,c="-"),c+Q(~~(a/60),2)+b+Q(~~a%60,2)})}function Ra(a,b){var c=(b||"").match(a)||[],d=c[c.length-1]||[],e=(d+"").match(ie)||["-",0,0],f=+(60*e[1])+r(e[2]);return"+"===e[0]?f:-f}function Sa(b,c){var e,f;return c._isUTC?(e=c.clone(),f=(p(b)||d(b)?b.valueOf():Ka(b).valueOf())-e.valueOf(),e._d.setTime(e._d.valueOf()+f),a.updateOffset(e,!1),e):Ka(b).local()}function Ta(a){return 15*-Math.round(a._d.getTimezoneOffset()/15)}function Ua(b,c){var d,e=this._offset||0;return this.isValid()?null!=b?("string"==typeof b?b=Ra(Hd,b):Math.abs(b)<16&&(b=60*b),!this._isUTC&&c&&(d=Ta(this)),this._offset=b,this._isUTC=!0,null!=d&&this.add(d,"m"),e!==b&&(!c||this._changeInProgress?jb(this,db(b-e,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this):this._isUTC?e:Ta(this):null!=b?this:NaN}function Va(a,b){return null!=a?("string"!=typeof a&&(a=-a),this.utcOffset(a,b),this):-this.utcOffset()}function Wa(a){return this.utcOffset(0,a)}function Xa(a){return this._isUTC&&(this.utcOffset(0,a),this._isUTC=!1,a&&this.subtract(Ta(this),"m")),this}function Ya(){return this._tzm?this.utcOffset(this._tzm):"string"==typeof this._i&&this.utcOffset(Ra(Gd,this._i)),this}function Za(a){return this.isValid()?(a=a?Ka(a).utcOffset():0,(this.utcOffset()-a)%60===0):!1}function $a(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function _a(){if(!m(this._isDSTShifted))return this._isDSTShifted;var a={};if(n(a,this),a=Ha(a),a._a){var b=a._isUTC?h(a._a):Ka(a._a);this._isDSTShifted=this.isValid()&&s(a._a,b.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}function ab(){return this.isValid()?!this._isUTC:!1}function bb(){return this.isValid()?this._isUTC:!1}function cb(){return this.isValid()?this._isUTC&&0===this._offset:!1}function db(a,b){var c,d,e,g=a,h=null;return Pa(a)?g={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(g={},b?g[b]=a:g.milliseconds=a):(h=je.exec(a))?(c="-"===h[1]?-1:1,g={y:0,d:r(h[Od])*c,h:r(h[Pd])*c,m:r(h[Qd])*c,s:r(h[Rd])*c,ms:r(h[Sd])*c}):(h=ke.exec(a))?(c="-"===h[1]?-1:1,g={y:eb(h[2],c),M:eb(h[3],c),w:eb(h[4],c),d:eb(h[5],c),h:eb(h[6],c),m:eb(h[7],c),s:eb(h[8],c)}):null==g?g={}:"object"==typeof g&&("from"in g||"to"in g)&&(e=gb(Ka(g.from),Ka(g.to)),g={},g.ms=e.milliseconds,g.M=e.months),d=new Oa(g),Pa(a)&&f(a,"_locale")&&(d._locale=a._locale),d}function eb(a,b){var c=a&&parseFloat(a.replace(",","."));return(isNaN(c)?0:c)*b}function fb(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function gb(a,b){var c;return a.isValid()&&b.isValid()?(b=Sa(b,a),a.isBefore(b)?c=fb(a,b):(c=fb(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c):{milliseconds:0,months:0}}function hb(a){return 0>a?-1*Math.round(-1*a):Math.round(a)}function ib(a,b){return function(c,d){var e,f;return null===d||isNaN(+d)||(v(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=db(c,d),jb(this,e,a),this}}function jb(b,c,d,e){var f=c._milliseconds,g=hb(c._days),h=hb(c._months);b.isValid()&&(e=null==e?!0:e,f&&b._d.setTime(b._d.valueOf()+f*d),g&&O(b,"Date",N(b,"Date")+g*d),h&&ga(b,N(b,"Month")+h*d),e&&a.updateOffset(b,g||h))}function kb(a,b){var c=a||Ka(),d=Sa(c,this).startOf("day"),e=this.diff(d,"days",!0),f=-6>e?"sameElse":-1>e?"lastWeek":0>e?"lastDay":1>e?"sameDay":2>e?"nextDay":7>e?"nextWeek":"sameElse",g=b&&(w(b[f])?b[f]():b[f]);return this.format(g||this.localeData().calendar(f,this,Ka(c)))}function lb(){return new o(this)}function mb(a,b){var c=p(a)?a:Ka(a);return this.isValid()&&c.isValid()?(b=K(m(b)?"millisecond":b),"millisecond"===b?this.valueOf()>c.valueOf():c.valueOf()<this.clone().startOf(b).valueOf()):!1}function nb(a,b){var c=p(a)?a:Ka(a);return this.isValid()&&c.isValid()?(b=K(m(b)?"millisecond":b),"millisecond"===b?this.valueOf()<c.valueOf():this.clone().endOf(b).valueOf()<c.valueOf()):!1}function ob(a,b,c,d){return d=d||"()",("("===d[0]?this.isAfter(a,c):!this.isBefore(a,c))&&(")"===d[1]?this.isBefore(b,c):!this.isAfter(b,c))}function pb(a,b){var c,d=p(a)?a:Ka(a);return this.isValid()&&d.isValid()?(b=K(b||"millisecond"),"millisecond"===b?this.valueOf()===d.valueOf():(c=d.valueOf(),this.clone().startOf(b).valueOf()<=c&&c<=this.clone().endOf(b).valueOf())):!1}function qb(a,b){return this.isSame(a,b)||this.isAfter(a,b)}function rb(a,b){return this.isSame(a,b)||this.isBefore(a,b)}function sb(a,b,c){var d,e,f,g;return this.isValid()?(d=Sa(a,this),d.isValid()?(e=6e4*(d.utcOffset()-this.utcOffset()),b=K(b),"year"===b||"month"===b||"quarter"===b?(g=tb(this,d),"quarter"===b?g/=3:"year"===b&&(g/=12)):(f=this-d,g="second"===b?f/1e3:"minute"===b?f/6e4:"hour"===b?f/36e5:"day"===b?(f-e)/864e5:"week"===b?(f-e)/6048e5:f),c?g:q(g)):NaN):NaN}function tb(a,b){var c,d,e=12*(b.year()-a.year())+(b.month()-a.month()),f=a.clone().add(e,"months");return 0>b-f?(c=a.clone().add(e-1,"months"),d=(b-f)/(f-c)):(c=a.clone().add(e+1,"months"),d=(b-f)/(c-f)),-(e+d)||0}function ub(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")}function vb(){var a=this.clone().utc();return 0<a.year()&&a.year()<=9999?w(Date.prototype.toISOString)?this.toDate().toISOString():U(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):U(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")}function wb(b){b||(b=this.isUtc()?a.defaultFormatUtc:a.defaultFormat);var c=U(this,b);return this.localeData().postformat(c)}function xb(a,b){return this.isValid()&&(p(a)&&a.isValid()||Ka(a).isValid())?db({to:this,from:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function yb(a){return this.from(Ka(),a)}function zb(a,b){return this.isValid()&&(p(a)&&a.isValid()||Ka(a).isValid())?db({from:this,to:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function Ab(a){return this.to(Ka(),a)}function Bb(a){var b;return void 0===a?this._locale._abbr:(b=H(a),null!=b&&(this._locale=b),this)}function Cb(){return this._locale}function Db(a){switch(a=K(a)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":case"date":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a&&this.weekday(0),"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this}function Eb(a){return a=K(a),void 0===a||"millisecond"===a?this:("date"===a&&(a="day"),this.startOf(a).add(1,"isoWeek"===a?"week":a).subtract(1,"ms"))}function Fb(){return this._d.valueOf()-6e4*(this._offset||0)}function Gb(){return Math.floor(this.valueOf()/1e3)}function Hb(){return this._offset?new Date(this.valueOf()):this._d}function Ib(){var a=this;return[a.year(),a.month(),a.date(),a.hour(),a.minute(),a.second(),a.millisecond()]}function Jb(){var a=this;return{years:a.year(),months:a.month(),date:a.date(),hours:a.hours(),minutes:a.minutes(),seconds:a.seconds(),milliseconds:a.milliseconds()}}function Kb(){return this.isValid()?this.toISOString():null}function Lb(){return k(this)}function Mb(){return g({},j(this))}function Nb(){return j(this).overflow}function Ob(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}}function Pb(a,b){R(0,[a,a.length],0,b)}function Qb(a){return Ub.call(this,a,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)}function Rb(a){return Ub.call(this,a,this.isoWeek(),this.isoWeekday(),1,4)}function Sb(){return xa(this.year(),1,4)}function Tb(){var a=this.localeData()._week;return xa(this.year(),a.dow,a.doy)}function Ub(a,b,c,d,e){var f;return null==a?wa(this,d,e).year:(f=xa(a,d,e),b>f&&(b=f),Vb.call(this,a,b,c,d,e))}function Vb(a,b,c,d,e){var f=va(a,b,c,d,e),g=qa(f.year,0,f.dayOfYear);return this.year(g.getUTCFullYear()),this.month(g.getUTCMonth()),this.date(g.getUTCDate()),this}function Wb(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)}function Xb(a){return wa(a,this._week.dow,this._week.doy).week}function Yb(){return this._week.dow}function Zb(){return this._week.doy}function $b(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")}function _b(a){var b=wa(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")}function ac(a,b){return"string"!=typeof a?a:isNaN(a)?(a=b.weekdaysParse(a),"number"==typeof a?a:null):parseInt(a,10)}function bc(a,b){return c(this._weekdays)?this._weekdays[a.day()]:this._weekdays[this._weekdays.isFormat.test(b)?"format":"standalone"][a.day()]}function cc(a){return this._weekdaysShort[a.day()]}function dc(a){return this._weekdaysMin[a.day()]}function ec(a,b,c){var d,e,f,g=a.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],d=0;7>d;++d)f=h([2e3,1]).day(d),this._minWeekdaysParse[d]=this.weekdaysMin(f,"").toLocaleLowerCase(),this._shortWeekdaysParse[d]=this.weekdaysShort(f,"").toLocaleLowerCase(),this._weekdaysParse[d]=this.weekdays(f,"").toLocaleLowerCase();return c?"dddd"===b?(e=md.call(this._weekdaysParse,g),-1!==e?e:null):"ddd"===b?(e=md.call(this._shortWeekdaysParse,g),-1!==e?e:null):(e=md.call(this._minWeekdaysParse,g),-1!==e?e:null):"dddd"===b?(e=md.call(this._weekdaysParse,g),-1!==e?e:(e=md.call(this._shortWeekdaysParse,g),-1!==e?e:(e=md.call(this._minWeekdaysParse,g),-1!==e?e:null))):"ddd"===b?(e=md.call(this._shortWeekdaysParse,g),-1!==e?e:(e=md.call(this._weekdaysParse,g),-1!==e?e:(e=md.call(this._minWeekdaysParse,g),-1!==e?e:null))):(e=md.call(this._minWeekdaysParse,g),-1!==e?e:(e=md.call(this._weekdaysParse,g),-1!==e?e:(e=md.call(this._shortWeekdaysParse,g),-1!==e?e:null)))}function fc(a,b,c){var d,e,f;if(this._weekdaysParseExact)return ec.call(this,a,b,c);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),d=0;7>d;d++){if(e=h([2e3,1]).day(d),c&&!this._fullWeekdaysParse[d]&&(this._fullWeekdaysParse[d]=new RegExp("^"+this.weekdays(e,"").replace(".",".?")+"$","i"),this._shortWeekdaysParse[d]=new RegExp("^"+this.weekdaysShort(e,"").replace(".",".?")+"$","i"),this._minWeekdaysParse[d]=new RegExp("^"+this.weekdaysMin(e,"").replace(".",".?")+"$","i")),this._weekdaysParse[d]||(f="^"+this.weekdays(e,"")+"|^"+this.weekdaysShort(e,"")+"|^"+this.weekdaysMin(e,""),this._weekdaysParse[d]=new RegExp(f.replace(".",""),"i")),c&&"dddd"===b&&this._fullWeekdaysParse[d].test(a))return d;if(c&&"ddd"===b&&this._shortWeekdaysParse[d].test(a))return d;if(c&&"dd"===b&&this._minWeekdaysParse[d].test(a))return d;if(!c&&this._weekdaysParse[d].test(a))return d}}function gc(a){if(!this.isValid())return null!=a?this:NaN;var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=ac(a,this.localeData()),this.add(a-b,"d")):b}function hc(a){if(!this.isValid())return null!=a?this:NaN;var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")}function ic(a){return this.isValid()?null==a?this.day()||7:this.day(this.day()%7?a:a-7):null!=a?this:NaN}function jc(a){return this._weekdaysParseExact?(f(this,"_weekdaysRegex")||mc.call(this),a?this._weekdaysStrictRegex:this._weekdaysRegex):this._weekdaysStrictRegex&&a?this._weekdaysStrictRegex:this._weekdaysRegex}function kc(a){return this._weekdaysParseExact?(f(this,"_weekdaysRegex")||mc.call(this),a?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):this._weekdaysShortStrictRegex&&a?this._weekdaysShortStrictRegex:this._weekdaysShortRegex}function lc(a){return this._weekdaysParseExact?(f(this,"_weekdaysRegex")||mc.call(this),a?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):this._weekdaysMinStrictRegex&&a?this._weekdaysMinStrictRegex:this._weekdaysMinRegex}function mc(){function a(a,b){return b.length-a.length}var b,c,d,e,f,g=[],i=[],j=[],k=[];for(b=0;7>b;b++)c=h([2e3,1]).day(b),d=this.weekdaysMin(c,""),e=this.weekdaysShort(c,""),f=this.weekdays(c,""),g.push(d),i.push(e),j.push(f),k.push(d),k.push(e),k.push(f);for(g.sort(a),i.sort(a),j.sort(a),k.sort(a),b=0;7>b;b++)i[b]=Z(i[b]),j[b]=Z(j[b]),k[b]=Z(k[b]);this._weekdaysRegex=new RegExp("^("+k.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+j.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+i.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+g.join("|")+")","i")}function nc(a){var b=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")}function oc(){return this.hours()%12||12}function pc(){return this.hours()||24}function qc(a,b){R(a,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),b)})}function rc(a,b){return b._meridiemParse}function sc(a){return"p"===(a+"").toLowerCase().charAt(0)}function tc(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"}function uc(a,b){b[Sd]=r(1e3*("0."+a))}function vc(){return this._isUTC?"UTC":""}function wc(){return this._isUTC?"Coordinated Universal Time":""}function xc(a){return Ka(1e3*a)}function yc(){return Ka.apply(null,arguments).parseZone()}function zc(a,b,c){var d=this._calendar[a];return w(d)?d.call(b,c):d}function Ac(a){var b=this._longDateFormat[a],c=this._longDateFormat[a.toUpperCase()];return b||!c?b:(this._longDateFormat[a]=c.replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a])}function Bc(){return this._invalidDate}function Cc(a){return this._ordinal.replace("%d",a)}function Dc(a){return a}function Ec(a,b,c,d){var e=this._relativeTime[c];return w(e)?e(a,b,c,d):e.replace(/%d/i,a)}function Fc(a,b){var c=this._relativeTime[a>0?"future":"past"];return w(c)?c(b):c.replace(/%s/i,b)}function Gc(a,b,c,d){var e=H(),f=h().set(d,b);return e[c](f,a)}function Hc(a,b,c){if("number"==typeof a&&(b=a,a=void 0),a=a||"",null!=b)return Gc(a,b,c,"month");var d,e=[];for(d=0;12>d;d++)e[d]=Gc(a,d,c,"month");return e}function Ic(a,b,c,d){"boolean"==typeof a?("number"==typeof b&&(c=b,b=void 0),b=b||""):(b=a,c=b,a=!1,"number"==typeof b&&(c=b,b=void 0),b=b||"");var e=H(),f=a?e._week.dow:0;if(null!=c)return Gc(b,(c+f)%7,d,"day");var g,h=[];for(g=0;7>g;g++)h[g]=Gc(b,(g+f)%7,d,"day");return h}function Jc(a,b){return Hc(a,b,"months")}function Kc(a,b){return Hc(a,b,"monthsShort")}function Lc(a,b,c){return Ic(a,b,c,"weekdays")}function Mc(a,b,c){return Ic(a,b,c,"weekdaysShort")}function Nc(a,b,c){return Ic(a,b,c,"weekdaysMin")}function Oc(){var a=this._data;return this._milliseconds=Le(this._milliseconds),this._days=Le(this._days),this._months=Le(this._months),a.milliseconds=Le(a.milliseconds),a.seconds=Le(a.seconds),a.minutes=Le(a.minutes),a.hours=Le(a.hours),a.months=Le(a.months),a.years=Le(a.years),this}function Pc(a,b,c,d){var e=db(b,c);return a._milliseconds+=d*e._milliseconds,a._days+=d*e._days,a._months+=d*e._months,a._bubble()}function Qc(a,b){return Pc(this,a,b,1)}function Rc(a,b){return Pc(this,a,b,-1)}function Sc(a){return 0>a?Math.floor(a):Math.ceil(a)}function Tc(){var a,b,c,d,e,f=this._milliseconds,g=this._days,h=this._months,i=this._data;return f>=0&&g>=0&&h>=0||0>=f&&0>=g&&0>=h||(f+=864e5*Sc(Vc(h)+g),g=0,h=0),i.milliseconds=f%1e3,a=q(f/1e3),i.seconds=a%60,b=q(a/60),i.minutes=b%60,c=q(b/60),i.hours=c%24,g+=q(c/24),e=q(Uc(g)),h+=e,g-=Sc(Vc(e)),d=q(h/12),h%=12,i.days=g,i.months=h,i.years=d,this}function Uc(a){return 4800*a/146097}function Vc(a){return 146097*a/4800}function Wc(a){var b,c,d=this._milliseconds;if(a=K(a),"month"===a||"year"===a)return b=this._days+d/864e5,c=this._months+Uc(b),"month"===a?c:c/12;switch(b=this._days+Math.round(Vc(this._months)),a){case"week":return b/7+d/6048e5;case"day":return b+d/864e5;case"hour":return 24*b+d/36e5;case"minute":return 1440*b+d/6e4;case"second":return 86400*b+d/1e3;case"millisecond":return Math.floor(864e5*b)+d;default:throw new Error("Unknown unit "+a)}}function Xc(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*r(this._months/12)}function Yc(a){return function(){return this.as(a)}}function Zc(a){
+return a=K(a),this[a+"s"]()}function $c(a){return function(){return this._data[a]}}function _c(){return q(this.days()/7)}function ad(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function bd(a,b,c){var d=db(a).abs(),e=_e(d.as("s")),f=_e(d.as("m")),g=_e(d.as("h")),h=_e(d.as("d")),i=_e(d.as("M")),j=_e(d.as("y")),k=e<af.s&&["s",e]||1>=f&&["m"]||f<af.m&&["mm",f]||1>=g&&["h"]||g<af.h&&["hh",g]||1>=h&&["d"]||h<af.d&&["dd",h]||1>=i&&["M"]||i<af.M&&["MM",i]||1>=j&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,ad.apply(null,k)}function cd(a,b){return void 0===af[a]?!1:void 0===b?af[a]:(af[a]=b,!0)}function dd(a){var b=this.localeData(),c=bd(this,!a,b);return a&&(c=b.pastFuture(+this,c)),b.postformat(c)}function ed(){var a,b,c,d=bf(this._milliseconds)/1e3,e=bf(this._days),f=bf(this._months);a=q(d/60),b=q(a/60),d%=60,a%=60,c=q(f/12),f%=12;var g=c,h=f,i=e,j=b,k=a,l=d,m=this.asSeconds();return m?(0>m?"-":"")+"P"+(g?g+"Y":"")+(h?h+"M":"")+(i?i+"D":"")+(j||k||l?"T":"")+(j?j+"H":"")+(k?k+"M":"")+(l?l+"S":""):"P0D"}var fd,gd;gd=Array.prototype.some?Array.prototype.some:function(a){for(var b=Object(this),c=b.length>>>0,d=0;c>d;d++)if(d in b&&a.call(this,b[d],d,b))return!0;return!1};var hd=a.momentProperties=[],id=!1,jd={};a.suppressDeprecationWarnings=!1,a.deprecationHandler=null;var kd;kd=Object.keys?Object.keys:function(a){var b,c=[];for(b in a)f(a,b)&&c.push(b);return c};var ld,md,nd={},od={},pd=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,qd=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,rd={},sd={},td=/\d/,ud=/\d\d/,vd=/\d{3}/,wd=/\d{4}/,xd=/[+-]?\d{6}/,yd=/\d\d?/,zd=/\d\d\d\d?/,Ad=/\d\d\d\d\d\d?/,Bd=/\d{1,3}/,Cd=/\d{1,4}/,Dd=/[+-]?\d{1,6}/,Ed=/\d+/,Fd=/[+-]?\d+/,Gd=/Z|[+-]\d\d:?\d\d/gi,Hd=/Z|[+-]\d\d(?::?\d\d)?/gi,Id=/[+-]?\d+(\.\d{1,3})?/,Jd=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,Kd={},Ld={},Md=0,Nd=1,Od=2,Pd=3,Qd=4,Rd=5,Sd=6,Td=7,Ud=8;md=Array.prototype.indexOf?Array.prototype.indexOf:function(a){var b;for(b=0;b<this.length;++b)if(this[b]===a)return b;return-1},R("M",["MM",2],"Mo",function(){return this.month()+1}),R("MMM",0,0,function(a){return this.localeData().monthsShort(this,a)}),R("MMMM",0,0,function(a){return this.localeData().months(this,a)}),J("month","M"),W("M",yd),W("MM",yd,ud),W("MMM",function(a,b){return b.monthsShortRegex(a)}),W("MMMM",function(a,b){return b.monthsRegex(a)}),$(["M","MM"],function(a,b){b[Nd]=r(a)-1}),$(["MMM","MMMM"],function(a,b,c,d){var e=c._locale.monthsParse(a,d,c._strict);null!=e?b[Nd]=e:j(c).invalidMonth=a});var Vd=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/,Wd="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),Xd="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),Yd=Jd,Zd=Jd,$d=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?/,_d=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?/,ae=/Z|[+-]\d\d(?::?\d\d)?/,be=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],ce=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],de=/^\/?Date\((\-?\d+)/i;a.createFromInputFallback=u("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}),R("Y",0,0,function(){var a=this.year();return 9999>=a?""+a:"+"+a}),R(0,["YY",2],0,function(){return this.year()%100}),R(0,["YYYY",4],0,"year"),R(0,["YYYYY",5],0,"year"),R(0,["YYYYYY",6,!0],0,"year"),J("year","y"),W("Y",Fd),W("YY",yd,ud),W("YYYY",Cd,wd),W("YYYYY",Dd,xd),W("YYYYYY",Dd,xd),$(["YYYYY","YYYYYY"],Md),$("YYYY",function(b,c){c[Md]=2===b.length?a.parseTwoDigitYear(b):r(b)}),$("YY",function(b,c){c[Md]=a.parseTwoDigitYear(b)}),$("Y",function(a,b){b[Md]=parseInt(a,10)}),a.parseTwoDigitYear=function(a){return r(a)+(r(a)>68?1900:2e3)};var ee=M("FullYear",!0);a.ISO_8601=function(){};var fe=u("moment().min is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(){var a=Ka.apply(null,arguments);return this.isValid()&&a.isValid()?this>a?this:a:l()}),ge=u("moment().max is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(){var a=Ka.apply(null,arguments);return this.isValid()&&a.isValid()?a>this?this:a:l()}),he=function(){return Date.now?Date.now():+new Date};Qa("Z",":"),Qa("ZZ",""),W("Z",Hd),W("ZZ",Hd),$(["Z","ZZ"],function(a,b,c){c._useUTC=!0,c._tzm=Ra(Hd,a)});var ie=/([\+\-]|\d\d)/gi;a.updateOffset=function(){};var je=/^(\-)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?\d*)?$/,ke=/^(-)?P(?:(-?[0-9,.]*)Y)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)W)?(?:(-?[0-9,.]*)D)?(?:T(?:(-?[0-9,.]*)H)?(?:(-?[0-9,.]*)M)?(?:(-?[0-9,.]*)S)?)?$/;db.fn=Oa.prototype;var le=ib(1,"add"),me=ib(-1,"subtract");a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",a.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var ne=u("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(a){return void 0===a?this.localeData():this.locale(a)});R(0,["gg",2],0,function(){return this.weekYear()%100}),R(0,["GG",2],0,function(){return this.isoWeekYear()%100}),Pb("gggg","weekYear"),Pb("ggggg","weekYear"),Pb("GGGG","isoWeekYear"),Pb("GGGGG","isoWeekYear"),J("weekYear","gg"),J("isoWeekYear","GG"),W("G",Fd),W("g",Fd),W("GG",yd,ud),W("gg",yd,ud),W("GGGG",Cd,wd),W("gggg",Cd,wd),W("GGGGG",Dd,xd),W("ggggg",Dd,xd),_(["gggg","ggggg","GGGG","GGGGG"],function(a,b,c,d){b[d.substr(0,2)]=r(a)}),_(["gg","GG"],function(b,c,d,e){c[e]=a.parseTwoDigitYear(b)}),R("Q",0,"Qo","quarter"),J("quarter","Q"),W("Q",td),$("Q",function(a,b){b[Nd]=3*(r(a)-1)}),R("w",["ww",2],"wo","week"),R("W",["WW",2],"Wo","isoWeek"),J("week","w"),J("isoWeek","W"),W("w",yd),W("ww",yd,ud),W("W",yd),W("WW",yd,ud),_(["w","ww","W","WW"],function(a,b,c,d){b[d.substr(0,1)]=r(a)});var oe={dow:0,doy:6};R("D",["DD",2],"Do","date"),J("date","D"),W("D",yd),W("DD",yd,ud),W("Do",function(a,b){return a?b._ordinalParse:b._ordinalParseLenient}),$(["D","DD"],Od),$("Do",function(a,b){b[Od]=r(a.match(yd)[0],10)});var pe=M("Date",!0);R("d",0,"do","day"),R("dd",0,0,function(a){return this.localeData().weekdaysMin(this,a)}),R("ddd",0,0,function(a){return this.localeData().weekdaysShort(this,a)}),R("dddd",0,0,function(a){return this.localeData().weekdays(this,a)}),R("e",0,0,"weekday"),R("E",0,0,"isoWeekday"),J("day","d"),J("weekday","e"),J("isoWeekday","E"),W("d",yd),W("e",yd),W("E",yd),W("dd",function(a,b){return b.weekdaysMinRegex(a)}),W("ddd",function(a,b){return b.weekdaysShortRegex(a)}),W("dddd",function(a,b){return b.weekdaysRegex(a)}),_(["dd","ddd","dddd"],function(a,b,c,d){var e=c._locale.weekdaysParse(a,d,c._strict);null!=e?b.d=e:j(c).invalidWeekday=a}),_(["d","e","E"],function(a,b,c,d){b[d]=r(a)});var qe="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),re="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),se="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),te=Jd,ue=Jd,ve=Jd;R("DDD",["DDDD",3],"DDDo","dayOfYear"),J("dayOfYear","DDD"),W("DDD",Bd),W("DDDD",vd),$(["DDD","DDDD"],function(a,b,c){c._dayOfYear=r(a)}),R("H",["HH",2],0,"hour"),R("h",["hh",2],0,oc),R("k",["kk",2],0,pc),R("hmm",0,0,function(){return""+oc.apply(this)+Q(this.minutes(),2)}),R("hmmss",0,0,function(){return""+oc.apply(this)+Q(this.minutes(),2)+Q(this.seconds(),2)}),R("Hmm",0,0,function(){return""+this.hours()+Q(this.minutes(),2)}),R("Hmmss",0,0,function(){return""+this.hours()+Q(this.minutes(),2)+Q(this.seconds(),2)}),qc("a",!0),qc("A",!1),J("hour","h"),W("a",rc),W("A",rc),W("H",yd),W("h",yd),W("HH",yd,ud),W("hh",yd,ud),W("hmm",zd),W("hmmss",Ad),W("Hmm",zd),W("Hmmss",Ad),$(["H","HH"],Pd),$(["a","A"],function(a,b,c){c._isPm=c._locale.isPM(a),c._meridiem=a}),$(["h","hh"],function(a,b,c){b[Pd]=r(a),j(c).bigHour=!0}),$("hmm",function(a,b,c){var d=a.length-2;b[Pd]=r(a.substr(0,d)),b[Qd]=r(a.substr(d)),j(c).bigHour=!0}),$("hmmss",function(a,b,c){var d=a.length-4,e=a.length-2;b[Pd]=r(a.substr(0,d)),b[Qd]=r(a.substr(d,2)),b[Rd]=r(a.substr(e)),j(c).bigHour=!0}),$("Hmm",function(a,b,c){var d=a.length-2;b[Pd]=r(a.substr(0,d)),b[Qd]=r(a.substr(d))}),$("Hmmss",function(a,b,c){var d=a.length-4,e=a.length-2;b[Pd]=r(a.substr(0,d)),b[Qd]=r(a.substr(d,2)),b[Rd]=r(a.substr(e))});var we=/[ap]\.?m?\.?/i,xe=M("Hours",!0);R("m",["mm",2],0,"minute"),J("minute","m"),W("m",yd),W("mm",yd,ud),$(["m","mm"],Qd);var ye=M("Minutes",!1);R("s",["ss",2],0,"second"),J("second","s"),W("s",yd),W("ss",yd,ud),$(["s","ss"],Rd);var ze=M("Seconds",!1);R("S",0,0,function(){return~~(this.millisecond()/100)}),R(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),R(0,["SSS",3],0,"millisecond"),R(0,["SSSS",4],0,function(){return 10*this.millisecond()}),R(0,["SSSSS",5],0,function(){return 100*this.millisecond()}),R(0,["SSSSSS",6],0,function(){return 1e3*this.millisecond()}),R(0,["SSSSSSS",7],0,function(){return 1e4*this.millisecond()}),R(0,["SSSSSSSS",8],0,function(){return 1e5*this.millisecond()}),R(0,["SSSSSSSSS",9],0,function(){return 1e6*this.millisecond()}),J("millisecond","ms"),W("S",Bd,td),W("SS",Bd,ud),W("SSS",Bd,vd);var Ae;for(Ae="SSSS";Ae.length<=9;Ae+="S")W(Ae,Ed);for(Ae="S";Ae.length<=9;Ae+="S")$(Ae,uc);var Be=M("Milliseconds",!1);R("z",0,0,"zoneAbbr"),R("zz",0,0,"zoneName");var Ce=o.prototype;Ce.add=le,Ce.calendar=kb,Ce.clone=lb,Ce.diff=sb,Ce.endOf=Eb,Ce.format=wb,Ce.from=xb,Ce.fromNow=yb,Ce.to=zb,Ce.toNow=Ab,Ce.get=P,Ce.invalidAt=Nb,Ce.isAfter=mb,Ce.isBefore=nb,Ce.isBetween=ob,Ce.isSame=pb,Ce.isSameOrAfter=qb,Ce.isSameOrBefore=rb,Ce.isValid=Lb,Ce.lang=ne,Ce.locale=Bb,Ce.localeData=Cb,Ce.max=ge,Ce.min=fe,Ce.parsingFlags=Mb,Ce.set=P,Ce.startOf=Db,Ce.subtract=me,Ce.toArray=Ib,Ce.toObject=Jb,Ce.toDate=Hb,Ce.toISOString=vb,Ce.toJSON=Kb,Ce.toString=ub,Ce.unix=Gb,Ce.valueOf=Fb,Ce.creationData=Ob,Ce.year=ee,Ce.isLeapYear=ta,Ce.weekYear=Qb,Ce.isoWeekYear=Rb,Ce.quarter=Ce.quarters=Wb,Ce.month=ha,Ce.daysInMonth=ia,Ce.week=Ce.weeks=$b,Ce.isoWeek=Ce.isoWeeks=_b,Ce.weeksInYear=Tb,Ce.isoWeeksInYear=Sb,Ce.date=pe,Ce.day=Ce.days=gc,Ce.weekday=hc,Ce.isoWeekday=ic,Ce.dayOfYear=nc,Ce.hour=Ce.hours=xe,Ce.minute=Ce.minutes=ye,Ce.second=Ce.seconds=ze,Ce.millisecond=Ce.milliseconds=Be,Ce.utcOffset=Ua,Ce.utc=Wa,Ce.local=Xa,Ce.parseZone=Ya,Ce.hasAlignedHourOffset=Za,Ce.isDST=$a,Ce.isDSTShifted=_a,Ce.isLocal=ab,Ce.isUtcOffset=bb,Ce.isUtc=cb,Ce.isUTC=cb,Ce.zoneAbbr=vc,Ce.zoneName=wc,Ce.dates=u("dates accessor is deprecated. Use date instead.",pe),Ce.months=u("months accessor is deprecated. Use month instead",ha),Ce.years=u("years accessor is deprecated. Use year instead",ee),Ce.zone=u("moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779",Va);var De=Ce,Ee={sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},Fe={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},Ge="Invalid date",He="%d",Ie=/\d{1,2}/,Je={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},Ke=A.prototype;Ke._calendar=Ee,Ke.calendar=zc,Ke._longDateFormat=Fe,Ke.longDateFormat=Ac,Ke._invalidDate=Ge,Ke.invalidDate=Bc,Ke._ordinal=He,Ke.ordinal=Cc,Ke._ordinalParse=Ie,Ke.preparse=Dc,Ke.postformat=Dc,Ke._relativeTime=Je,Ke.relativeTime=Ec,Ke.pastFuture=Fc,Ke.set=y,Ke.months=ca,Ke._months=Wd,Ke.monthsShort=da,Ke._monthsShort=Xd,Ke.monthsParse=fa,Ke._monthsRegex=Zd,Ke.monthsRegex=ka,Ke._monthsShortRegex=Yd,Ke.monthsShortRegex=ja,Ke.week=Xb,Ke._week=oe,Ke.firstDayOfYear=Zb,Ke.firstDayOfWeek=Yb,Ke.weekdays=bc,Ke._weekdays=qe,Ke.weekdaysMin=dc,Ke._weekdaysMin=se,Ke.weekdaysShort=cc,Ke._weekdaysShort=re,Ke.weekdaysParse=fc,Ke._weekdaysRegex=te,Ke.weekdaysRegex=jc,Ke._weekdaysShortRegex=ue,Ke.weekdaysShortRegex=kc,Ke._weekdaysMinRegex=ve,Ke.weekdaysMinRegex=lc,Ke.isPM=sc,Ke._meridiemParse=we,Ke.meridiem=tc,E("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===r(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),a.lang=u("moment.lang is deprecated. Use moment.locale instead.",E),a.langData=u("moment.langData is deprecated. Use moment.localeData instead.",H);var Le=Math.abs,Me=Yc("ms"),Ne=Yc("s"),Oe=Yc("m"),Pe=Yc("h"),Qe=Yc("d"),Re=Yc("w"),Se=Yc("M"),Te=Yc("y"),Ue=$c("milliseconds"),Ve=$c("seconds"),We=$c("minutes"),Xe=$c("hours"),Ye=$c("days"),Ze=$c("months"),$e=$c("years"),_e=Math.round,af={s:45,m:45,h:22,d:26,M:11},bf=Math.abs,cf=Oa.prototype;cf.abs=Oc,cf.add=Qc,cf.subtract=Rc,cf.as=Wc,cf.asMilliseconds=Me,cf.asSeconds=Ne,cf.asMinutes=Oe,cf.asHours=Pe,cf.asDays=Qe,cf.asWeeks=Re,cf.asMonths=Se,cf.asYears=Te,cf.valueOf=Xc,cf._bubble=Tc,cf.get=Zc,cf.milliseconds=Ue,cf.seconds=Ve,cf.minutes=We,cf.hours=Xe,cf.days=Ye,cf.weeks=_c,cf.months=Ze,cf.years=$e,cf.humanize=dd,cf.toISOString=ed,cf.toString=ed,cf.toJSON=ed,cf.locale=Bb,cf.localeData=Cb,cf.toIsoString=u("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",ed),cf.lang=ne,R("X",0,0,"unix"),R("x",0,0,"valueOf"),W("x",Fd),W("X",Id),$("X",function(a,b,c){c._d=new Date(1e3*parseFloat(a,10))}),$("x",function(a,b,c){c._d=new Date(r(a))}),a.version="2.13.0",b(Ka),a.fn=De,a.min=Ma,a.max=Na,a.now=he,a.utc=h,a.unix=xc,a.months=Jc,a.isDate=d,a.locale=E,a.invalid=l,a.duration=db,a.isMoment=p,a.weekdays=Lc,a.parseZone=yc,a.localeData=H,a.isDuration=Pa,a.monthsShort=Kc,a.weekdaysMin=Nc,a.defineLocale=F,a.updateLocale=G,a.locales=I,a.weekdaysShort=Mc,a.normalizeUnits=K,a.relativeTimeThreshold=cd,a.prototype=De;var df=a;return df});
\ No newline at end of file
diff --git a/util/fresh b/util/fresh
index 9d74ea584..7f57931aa 100755
--- a/util/fresh
+++ b/util/fresh
@@ -82,12 +82,15 @@ function process_command($line) {
 				exec('/bin/stty echo');
 				echo "\n";
 				require_once('include/auth.php');
-				$record = App::$account = account_verify_password(argv(1),trim($x,"\n"));
+				$record = null;
+				$x = account_verify_password(argv(1),trim($x,"\n"));
+				if($x['account'])
+					$record = App::$account = $x['account'];
 
 				if($record) {
 					$_SESSION['account_id'] = App::$account['account_id'];
 					$_SESSION['last_login_date'] = datetime_convert();
-					authenticate_success($record, true, true);
+					authenticate_success($record, $x['channel'], true, true);
 					echo 'logged in';
 					$channel = App::get_channel();
 					if($channel)
diff --git a/util/hmessages.po b/util/hmessages.po
index 2ec494c7c..b076aadf8 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-06-10 00:02-0700\n"
+"POT-Creation-Date: 2016-07-15 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:2620
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2613
 msgid "Collection"
 msgstr ""
 
@@ -45,16 +45,17 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
-#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486
-#: ../../Zotlabs/Lib/Apps.php:561 ../../include/widgets.php:1505
-#: ../../include/conversation.php:1032
+#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:796
+#: ../../Zotlabs/Module/Photos.php:1241
+#: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:490
+#: ../../Zotlabs/Lib/Apps.php:565 ../../include/widgets.php:1594
+#: ../../include/conversation.php:1035
 msgid "Unknown"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93
-#: ../../include/conversation.php:1639
+#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:93
+#: ../../include/conversation.php:1654
 msgid "Files"
 msgstr ""
 
@@ -67,22 +68,23 @@ msgid "Shared"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
-#: ../../Zotlabs/Module/Webpages.php:186
+#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/New_channel.php:142
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Webpages.php:193
 msgid "Create"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1518
+#: ../../Zotlabs/Module/Photos.php:823 ../../Zotlabs/Module/Photos.php:1362
+#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1607
 msgid "Upload"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:247
-#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:592
-#: ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:627
+#: ../../Zotlabs/Module/Settings.php:653
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr ""
@@ -92,7 +94,7 @@ msgid "Type"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1344
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1324
 msgid "Size"
 msgstr ""
 
@@ -101,34 +103,32 @@ msgstr ""
 msgid "Last Modified"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Editpost.php:84
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Editlayout.php:113
-#: ../../Zotlabs/Module/Editwebpage.php:146
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:187
-#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Lib/ThreadItem.php:106
-#: ../../include/channel.php:937 ../../include/channel.php:941
-#: ../../include/menu.php:108 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36
+#: ../../Zotlabs/Module/Editlayout.php:114
+#: ../../Zotlabs/Module/Editwebpage.php:145
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Settings.php:687 ../../Zotlabs/Module/Thing.php:260
+#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/page_widgets.php:9
+#: ../../include/page_widgets.php:39 ../../include/channel.php:961
+#: ../../include/channel.php:965 ../../include/menu.php:108
 msgid "Edit"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Connedit.php:572
-#: ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Connedit.php:578
 #: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Editlayout.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039
+#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Photos.php:1171 ../../Zotlabs/Module/Admin.php:1039
 #: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114
-#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261
-#: ../../Zotlabs/Module/Webpages.php:189 ../../Zotlabs/Lib/Apps.php:338
-#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:657
+#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Module/Settings.php:688 ../../Zotlabs/Module/Thing.php:261
+#: ../../Zotlabs/Module/Webpages.php:196 ../../Zotlabs/Lib/Apps.php:342
+#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660
 msgid "Delete"
 msgstr ""
 
@@ -154,74 +154,73 @@ msgstr ""
 msgid "Upload file"
 msgstr ""
 
-#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:112
+#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:114
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
 #: ../../include/items.php:385
 msgid "Permission denied"
 msgstr ""
 
-#: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Channel.php:105
-#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:65
+#: ../../Zotlabs/Module/Achievements.php:34
+#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Id.php:76
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Events.php:264
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Events.php:265
-#: ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Chat.php:100
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:69
-#: ../../Zotlabs/Module/Editwebpage.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Filestorage.php:24
-#: ../../Zotlabs/Module/Filestorage.php:79
-#: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:210
-#: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070
+#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:104
+#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Pdledit.php:26
+#: ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:93
+#: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
+#: ../../Zotlabs/Module/Item.php:211 ../../Zotlabs/Module/Item.php:219
+#: ../../Zotlabs/Module/Item.php:1067 ../../Zotlabs/Module/Photos.php:73
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:129
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Channel.php:104
+#: ../../Zotlabs/Module/Channel.php:225 ../../Zotlabs/Module/Channel.php:266
 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Notifications.php:70
-#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68
-#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203
-#: ../../Zotlabs/Module/Profiles.php:601
-#: ../../Zotlabs/Module/Profile_photo.php:256
-#: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Appman.php:75
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
+#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Profile_photo.php:265
+#: ../../Zotlabs/Module/Profile_photo.php:278
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Editblock.php:67
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
-#: ../../Zotlabs/Module/Sharedwithme.php:11
+#: ../../Zotlabs/Module/Settings.php:607 ../../Zotlabs/Module/Setup.php:215
+#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Thing.php:274
+#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:331
 #: ../../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:25
-#: ../../Zotlabs/Module/Viewconnections.php:30
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
-#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/items.php:3438
+#: ../../Zotlabs/Module/Webpages.php:73
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Api.php:13
+#: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../include/photos.php:27 ../../include/items.php:3449
 #: ../../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/photos.php:27
+#: ../../include/attach.php:439 ../../include/attach.php:901
+#: ../../include/attach.php:972 ../../include/attach.php:1124
 msgid "Permission denied."
 msgstr ""
 
@@ -229,9 +228,9 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97
-#: ../../Zotlabs/Module/Page.php:93
+#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Display.php:118
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Help.php:97
+#: ../../Zotlabs/Module/Block.php:79
 msgid "Page not found."
 msgstr ""
 
@@ -247,13 +246,13 @@ msgstr ""
 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:31
-#: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../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/channel.php:837
+#: ../../Zotlabs/Module/Achievements.php:15
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Layouts.php:31
+#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:33
+#: ../../include/channel.php:861
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -261,229 +260,6 @@ msgstr ""
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152
-#: ../../Zotlabs/Module/Editblock.php:108
-msgid "Block Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2265
-msgid "Blocks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:153
-msgid "Block Title"
-msgstr ""
-
-#: ../../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: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:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
-#: ../../include/conversation.php:1208
-msgid "Share"
-msgstr ""
-
-#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193
-#: ../../include/page_widgets.php:39
-msgid "View"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Block.php:43
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
-msgid "Channel not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
-msgid "l, F j"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
-#: ../../include/text.php:1732
-msgid "Link to Source"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Edit Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Create Event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
-#: ../../Zotlabs/Module/Photos.php:949
-msgid "Previous"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
-#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
-msgid "Next"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
-#: ../../include/widgets.php:755
-msgid "Export"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
-#: ../../include/widgets.php:756
-msgid "Import"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Import.php:550
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Photos.php:677
-#: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
-#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032
-#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421
-#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733
-#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Appman.php:126
-#: ../../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:312
-#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
-#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:757
-#: ../../include/widgets.php:769 ../../include/js_strings.php:22
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Submit"
-msgstr ""
-
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
-msgid "Today"
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
-msgid "You must be logged in to see this page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:41
-msgid "Posts and comments"
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:42
-msgid "Only posts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:102
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:181
-msgid "Room not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "Leave Room"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "Delete Room"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:199
-msgid "I am away right now"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "I am online"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:202
-msgid "Bookmark this room"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
-#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
-#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
-#: ../../include/conversation.php:1256
-msgid "Encrypt text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143
-msgid "Insert web link"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:218
-msgid "Feature disabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "New Chatroom"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:233
-msgid "Chatroom name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:234
-msgid "Expiration of chats (minutes)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
-#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
-#: ../../include/acl_selectors.php:283
-msgid "Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:246
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:251
-msgid "No chatrooms available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Create New"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:255
-msgid "Expiration"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:256
-msgid "min"
-msgstr ""
-
 #: ../../Zotlabs/Module/Chatsvc.php:117
 msgid "Away"
 msgstr ""
@@ -492,65 +268,6 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40
-msgid "Invalid item."
-msgstr ""
-
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
-msgstr ""
-
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided "
-"on this page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
-msgstr ""
-
 #: ../../Zotlabs/Module/Connedit.php:80
 msgid "Could not access contact record."
 msgstr ""
@@ -571,34 +288,36 @@ msgstr ""
 msgid "is now connected to"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89
-#: ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:459
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:660
+#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:459 ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Module/Api.php:89
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "No"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
-#: ../../Zotlabs/Module/Api.php:88 ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:461
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:461 ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Module/Api.php:88
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "Yes"
 msgstr ""
 
@@ -606,277 +325,308 @@ msgstr ""
 msgid "Could not access address book record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:425
+#: ../../Zotlabs/Module/Connedit.php:431
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:440 ../../Zotlabs/Module/Connedit.php:449
-#: ../../Zotlabs/Module/Connedit.php:458 ../../Zotlabs/Module/Connedit.php:467
-#: ../../Zotlabs/Module/Connedit.php:480
+#: ../../Zotlabs/Module/Connedit.php:446 ../../Zotlabs/Module/Connedit.php:455
+#: ../../Zotlabs/Module/Connedit.php:464 ../../Zotlabs/Module/Connedit.php:473
+#: ../../Zotlabs/Module/Connedit.php:486
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:509
 msgid "Connection has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219
-#: ../../include/nav.php:86 ../../include/conversation.php:954
+#: ../../Zotlabs/Module/Connedit.php:525 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:86 ../../include/conversation.php:957
 msgid "View Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:522
+#: ../../Zotlabs/Module/Connedit.php:528
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:526
+#: ../../Zotlabs/Module/Connedit.php:532
 msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:529
+#: ../../Zotlabs/Module/Connedit.php:535
 msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:533
+#: ../../Zotlabs/Module/Connedit.php:539
 msgid "Recent Activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:536
+#: ../../Zotlabs/Module/Connedit.php:542
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Connedit.php:546 ../../Zotlabs/Module/Admin.php:1041
 msgid "Unblock"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1040
+#: ../../Zotlabs/Module/Connedit.php:546 ../../Zotlabs/Module/Admin.php:1040
 msgid "Block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:543
+#: ../../Zotlabs/Module/Connedit.php:549
 msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:544
+#: ../../Zotlabs/Module/Connedit.php:550
 msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:554
 msgid "Unignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:554
 #: ../../Zotlabs/Module/Connections.php:277
 #: ../../Zotlabs/Module/Notifications.php:55
 msgid "Ignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:551
+#: ../../Zotlabs/Module/Connedit.php:557
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:552
+#: ../../Zotlabs/Module/Connedit.php:558
 msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:562
 msgid "Unarchive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:562
 msgid "Archive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:559
+#: ../../Zotlabs/Module/Connedit.php:565
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:560
+#: ../../Zotlabs/Module/Connedit.php:566
 msgid "This connection is archived!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:570
 msgid "Unhide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:570
 msgid "Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:567
+#: ../../Zotlabs/Module/Connedit.php:573
 msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:568
+#: ../../Zotlabs/Module/Connedit.php:574
 msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:575
+#: ../../Zotlabs/Module/Connedit.php:581
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493
+#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:493
 msgid "Me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494
+#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:494
 msgid "Family"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342
-#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
-#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
-#: ../../include/widgets.php:495 ../../include/selectors.php:123
-#: ../../include/channel.php:389 ../../include/channel.php:390
-#: ../../include/channel.php:397
+#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Module/Settings.php:377
+#: ../../Zotlabs/Module/Settings.php:381 ../../Zotlabs/Module/Settings.php:382
+#: ../../Zotlabs/Module/Settings.php:385 ../../Zotlabs/Module/Settings.php:396
+#: ../../include/widgets.php:495 ../../include/channel.php:389
+#: ../../include/channel.php:390 ../../include/channel.php:397
+#: ../../include/selectors.php:123
 msgid "Friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496
+#: ../../Zotlabs/Module/Connedit.php:599 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:594
+#: ../../Zotlabs/Module/Connedit.php:600
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
 msgid "All"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:660
 msgid "Approve this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:660
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:659
+#: ../../Zotlabs/Module/Connedit.php:665
 msgid "Set Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:668
 msgid "Set Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Zotlabs/Module/Connedit.php:671
 msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:698
+#: ../../Zotlabs/Module/Connedit.php:704
 msgid "none"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614
+#: ../../Zotlabs/Module/Connedit.php:708 ../../include/widgets.php:623
 msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3926
+#: ../../Zotlabs/Module/Connedit.php:708 ../../include/items.php:3936
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:709
 msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:709
 msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Zotlabs/Module/Connedit.php:711
 msgid "This connection's primary address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:712
 msgid "Available locations:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:710
+#: ../../Zotlabs/Module/Connedit.php:716
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:711
+#: ../../Zotlabs/Module/Connedit.php:717
 msgid "Connection Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:713
+#: ../../Zotlabs/Module/Connedit.php:719
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159
+#: ../../Zotlabs/Module/Connedit.php:720 ../../Zotlabs/Module/Rate.php:159
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Zotlabs/Module/Connedit.php:721
 msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:727
 msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Zotlabs/Module/Connedit.php:724
 msgid "Custom Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:719
+#: ../../Zotlabs/Module/Connedit.php:725
 msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:725 ../../Zotlabs/Module/Connedit.php:726
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:726
 msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:728
 msgid "This information is public!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:727
+#: ../../Zotlabs/Module/Connedit.php:733
 msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:730
+#: ../../Zotlabs/Module/Connedit.php:736
 msgid "inherited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Module/Connedit.php:737 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:238
+#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Pdledit.php:66
+#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Import.php:551
+#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771
+#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1211
+#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Admin.php:1648
+#: ../../Zotlabs/Module/Admin.php:1733 ../../Zotlabs/Module/Admin.php:2116
+#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Settings.php:625
+#: ../../Zotlabs/Module/Settings.php:738 ../../Zotlabs/Module/Settings.php:779
+#: ../../Zotlabs/Module/Settings.php:805 ../../Zotlabs/Module/Settings.php:828
+#: ../../Zotlabs/Module/Settings.php:916
+#: ../../Zotlabs/Module/Settings.php:1108 ../../Zotlabs/Module/Setup.php:312
+#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Thing.php:316
+#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:763
+#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:99
+msgid "Submit"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:738
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:734
+#: ../../Zotlabs/Module/Connedit.php:740
 msgid "Their Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:735
+#: ../../Zotlabs/Module/Connedit.php:741
 msgid "My Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:743
 msgid "Individual Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Zotlabs/Module/Connedit.php:744
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
 "individual settings. You can <strong>not</strong> change those settings here."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Zotlabs/Module/Connedit.php:745
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -884,17 +634,121 @@ msgid ""
 "any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Connedit.php:746
 msgid "Last update:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Directory.php:63
+#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:20
+#: ../../Zotlabs/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr ""
 
+#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:32
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
+#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3370
+msgid "Item not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:13
+msgid "First Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:14
+msgid "Last Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:15
+msgid "Nickname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:16
+msgid "Full Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../include/network.php:2203 ../../boot.php:1706
+msgid "Email"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
+#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:238
+msgid "Profile Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:22
+msgid "Profile Photo 16px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:23
+msgid "Profile Photo 32px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:24
+msgid "Profile Photo 48px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:25
+msgid "Profile Photo 64px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:26
+msgid "Profile Photo 80px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:27
+msgid "Profile Photo 128px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:28
+msgid "Timezone"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
+msgid "Homepage URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:236
+msgid "Language"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:31
+msgid "Birth Year"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:32
+msgid "Birth Month"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:33
+msgid "Birth Day"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:34
+msgid "Birthdate"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
+msgid "Gender"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Male"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Female"
+msgstr ""
+
+#: ../../Zotlabs/Module/Follow.php:34
+msgid "Channel added."
+msgstr ""
+
 #: ../../Zotlabs/Module/Directory.php:243
 #, php-format
 msgid "%d rating"
@@ -914,12 +768,12 @@ msgstr ""
 msgid "Homepage: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1208
 msgid "Age:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
-#: ../../include/event.php:84 ../../include/channel.php:1027
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/channel.php:1051
+#: ../../include/event.php:52 ../../include/event.php:84
 #: ../../include/bb2diaspora.php:507
 msgid "Location:"
 msgstr ""
@@ -928,18 +782,18 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1224
 msgid "Hometown:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1232
 msgid "About:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
 #: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147
-#: ../../include/widgets.php:184 ../../include/connections.php:78
-#: ../../include/conversation.php:956 ../../include/channel.php:1012
+#: ../../include/widgets.php:184 ../../include/channel.php:1036
+#: ../../include/conversation.php:959 ../../include/connections.php:78
 msgid "Connect"
 msgstr ""
 
@@ -1015,37 +869,321 @@ msgstr ""
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
-#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3359
-msgid "Item not found."
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:104
+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
+msgid "Unable to generate preview."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:113
+msgid "Event title and start time are required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
+msgid "Event not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:373
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949
+#: ../../include/conversation.php:123 ../../include/text.php:1924
+msgid "event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Edit event title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Event title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
+#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
+#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
+#: ../../include/datetime.php:245
+msgid "Required"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:450
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Edit Category"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Category"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Edit start date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Start date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
+msgid "Finish date and time are not known or not relevant"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Edit finish date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Finish date and time"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+msgid "Adjust for viewer timezone"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:459
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:461
+msgid "Edit Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:461 ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Rbmark.php:101
+msgid "Description"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Profiles.php:477
+#: ../../Zotlabs/Module/Profiles.php:698 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
+msgid "Location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
+msgid "Share this event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1091
+#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Lib/ThreadItem.php:719
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1198
+msgid "Preview"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1247
+msgid "Permission settings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Advanced Options"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:587 ../../Zotlabs/Module/Cal.php:259
+msgid "l, F j"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:609
+msgid "Edit event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:611
+msgid "Delete event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:636 ../../Zotlabs/Module/Cal.php:308
+#: ../../include/text.php:1712
+msgid "Link to Source"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:645
+msgid "calendar"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Edit Event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Create Event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:665 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
+#: ../../Zotlabs/Module/Photos.php:947
+msgid "Previous"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:675
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
+#: ../../Zotlabs/Module/Photos.php:956 ../../Zotlabs/Module/Setup.php:267
+msgid "Next"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Cal.php:334
+msgid "Export"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:670 ../../Zotlabs/Module/Layouts.php:197
+#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Webpages.php:200 ../../include/page_widgets.php:42
+msgid "View"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:671
+msgid "Month"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:672
+msgid "Week"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:673
+msgid "Day"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:341
+msgid "Today"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:707
+msgid "Event removed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:710
+msgid "Failed to remove event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
+msgstr ""
+
+#: ../../Zotlabs/Module/Bookmarks.php:75
+msgid "My Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Bookmarks.php:86
+msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 #: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:81
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 msgid "Item not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228
-msgid "Title (optional)"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:134
+msgid "Edit post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222
+#: ../../include/nav.php:92 ../../include/conversation.php:1647
+msgid "Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:626
+#: ../../Zotlabs/Module/Settings.php:652 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Wiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:202 ../../include/conversation.php:1235
+#: ../../include/conversation.php:1274
+msgid "Cancel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
+msgstr ""
+
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Wall_upload.php:33
+msgid "Channel not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Page.php:131
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
+"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr ""
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "- select -"
+msgstr ""
+
+#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
+#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201
+#: ../../include/text.php:926 ../../include/text.php:938
+msgid "Save"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:56
@@ -1074,7 +1212,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1535
+#: ../../include/conversation.php:1550
 msgid "New"
 msgstr ""
 
@@ -1161,15 +1299,15 @@ msgstr ""
 msgid "Recent activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
-#: ../../include/text.php:875 ../../include/nav.php:186
+#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209
+#: ../../include/nav.php:188 ../../include/text.php:855
 msgid "Connections"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:228 ../../include/text.php:945
-#: ../../include/text.php:957 ../../include/nav.php:165
-#: ../../include/acl_selectors.php:276
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:167
+#: ../../include/acl_selectors.php:274 ../../include/text.php:925
+#: ../../include/text.php:937
 msgid "Search"
 msgstr ""
 
@@ -1182,7 +1320,7 @@ msgid "Connections search"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:79
+#: ../../Zotlabs/Module/Profile_photo.php:61
 msgid "Image uploaded but image cropping failed."
 msgstr ""
 
@@ -1192,66 +1330,66 @@ msgid "Cover Photos"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:133
+#: ../../Zotlabs/Module/Profile_photo.php:135
 msgid "Image resize failed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144
+#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:148
 msgid "Unable to process image"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:217
+#: ../../Zotlabs/Module/Profile_photo.php:223
 msgid "Image upload failed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:236
+#: ../../Zotlabs/Module/Profile_photo.php:242
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4270
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4284
 msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4271
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4285
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4272
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4286
 msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4273
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4287
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4275
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4289
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1661
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1708
 msgid "cover photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:303
 #: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:283
-#: ../../Zotlabs/Module/Profile_photo.php:324
+#: ../../Zotlabs/Module/Profile_photo.php:300
+#: ../../Zotlabs/Module/Profile_photo.php:341
 msgid "Photo not available."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:387
 msgid "Upload File:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:366
+#: ../../Zotlabs/Module/Profile_photo.php:388
 msgid "Select a profile:"
 msgstr ""
 
@@ -1260,199 +1398,68 @@ msgid "Upload Cover Photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:985
+#: ../../Zotlabs/Module/Profile_photo.php:396
+#: ../../Zotlabs/Module/Settings.php:1059
 msgid "or"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "skip this step"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "select a photo from your photo albums"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Profile_photo.php:415
 msgid "Crop Image"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:391
+#: ../../Zotlabs/Module/Profile_photo.php:416
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:393
+#: ../../Zotlabs/Module/Profile_photo.php:418
 msgid "Done Editing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
+msgid "webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
-msgid "Edit post"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
+msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:26
-msgid "Calendar entries imported."
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
+msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:28
-msgid "No calendar entries found."
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
+msgid "menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:105
-msgid "Event can not end before it has started."
+#: ../../Zotlabs/Module/Impel.php:187
+#, php-format
+msgid "%s element installed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116
-#: ../../Zotlabs/Module/Events.php:136
-msgid "Unable to generate preview."
+#: ../../Zotlabs/Module/Impel.php:190
+#, php-format
+msgid "%s element installation failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:114
-msgid "Event title and start time are required."
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
-msgid "Event not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949
-#: ../../include/text.php:1943 ../../include/conversation.php:123
-msgid "event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Edit event title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Event title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
-#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
-#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
-#: ../../include/datetime.php:245
-msgid "Required"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:451
-msgid "Categories (comma-separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Edit Category"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Category"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Edit start date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Start date and time"
-msgstr ""
-
-#: ../../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:458
-msgid "Edit finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Finish date and time"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
-msgid "Adjust for viewer timezone"
-msgstr ""
-
-#: ../../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:462
-msgid "Edit Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117
-#: ../../Zotlabs/Module/Rbmark.php:101
-msgid "Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:464
-msgid "Edit Location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
-#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
-msgid "Location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
-msgid "Share this event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:719
-#: ../../include/conversation.php:1187 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232
-msgid "Permission settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:476
-msgid "Advanced Options"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:610
-msgid "Edit event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:612
-msgid "Delete event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:646
-msgid "calendar"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:706
-msgid "Event removed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:709
-msgid "Failed to remove event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220
-#: ../../include/nav.php:92 ../../include/conversation.php:1632
-msgid "Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591
-#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259
-msgid "Cancel"
+#: ../../Zotlabs/Module/Cal.php:337
+msgid "Import"
 msgstr ""
 
 #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
@@ -1463,112 +1470,184 @@ msgstr ""
 msgid "This directory server requires an access token"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
+#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:28
+#: ../../Zotlabs/Module/Wiki.php:20
+msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
+#: ../../Zotlabs/Module/Chat.php:181
+msgid "Room not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
-#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:946
-#: ../../include/text.php:958 ../../include/widgets.php:201
-msgid "Save"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "Leave Room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:27
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "Delete Room"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:199
+msgid "I am away right now"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "I am online"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:202
+msgid "Bookmark this room"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
+#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1181
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
+#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
+#: ../../include/conversation.php:1271
+msgid "Encrypt text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editwebpage.php:146
+#: ../../Zotlabs/Module/Mail.php:252 ../../Zotlabs/Module/Mail.php:377
+#: ../../Zotlabs/Module/Editblock.php:111 ../../include/conversation.php:1146
+msgid "Insert web link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:218
+msgid "Feature disabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "New Chatroom"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:233
+msgid "Chatroom name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:234
+msgid "Expiration of chats (minutes)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
+#: ../../include/acl_selectors.php:281
+msgid "Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:246
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:251
+msgid "No chatrooms available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create New"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:255
+msgid "Expiration"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:256
+msgid "min"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:44
 msgid "Invalid message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:59
+#: ../../Zotlabs/Module/Dreport.php:76
 msgid "no results"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:64
+#: ../../Zotlabs/Module/Dreport.php:91
+msgid "channel sync processed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:95
+msgid "queued"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:99
+msgid "posted"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:103
+msgid "accepted for delivery"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:107
+msgid "updated"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:110
+msgid "update ignored"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:113
+msgid "permission denied"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:117
+msgid "recipient not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:120
+msgid "mail recalled"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:123
+msgid "duplicate mail received"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:126
+msgid "mail delivered"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:146
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "channel sync processed"
+#: ../../Zotlabs/Module/Dreport.php:149
+msgid "Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:82
-msgid "queued"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:86
-msgid "posted"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:90
-msgid "accepted for delivery"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:94
-msgid "updated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "update ignored"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:100
-msgid "permission denied"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:104
-msgid "recipient not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:107
-msgid "mail recalled"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:110
-msgid "duplicate mail received"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:113
-msgid "mail delivered"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editlayout.php:126
-#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
-msgid "Layout Name"
+#: ../../Zotlabs/Module/Dreport.php:150
+msgid "Redeliver"
 msgstr ""
 
 #: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:130
+#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
+msgid "Layout Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:131
 msgid "Layout Description (Optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:135
+#: ../../Zotlabs/Module/Editlayout.php:136
 msgid "Edit Layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Zotlabs/Module/Editwebpage.php:142
 msgid "Page link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Editwebpage.php:168
 msgid "Edit Webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Follow.php:34
-msgid "Channel added."
-msgstr ""
-
-#: ../../Zotlabs/Module/Acl.php:227
-msgid "network"
-msgstr ""
-
-#: ../../Zotlabs/Module/Acl.php:237
-msgid "RSS"
-msgstr ""
-
 #: ../../Zotlabs/Module/Group.php:24
 msgid "Privacy group created."
 msgstr ""
@@ -1578,7 +1657,7 @@ msgid "Could not create privacy group."
 msgstr ""
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3893
+#: ../../include/items.php:3903
 msgid "Privacy group not found."
 msgstr ""
 
@@ -1622,30 +1701,56 @@ msgstr ""
 msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
-msgid "Share content from Firefox to $Projectname"
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+msgid "App installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
-msgid "Activate the Firefox $Projectname provider"
+#: ../../Zotlabs/Module/Appman.php:46
+msgid "Malformed app."
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
-msgid "Authorize application connection"
+#: ../../Zotlabs/Module/Appman.php:104
+msgid "Embed code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:62
-msgid "Return to your app and insert this Securty Code:"
+#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
+msgid "Edit App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:72
-msgid "Please login to continue."
+#: ../../Zotlabs/Module/Appman.php:110
+msgid "Create App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:87
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: ../../Zotlabs/Module/Appman.php:115
+msgid "Name of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Location (URL) of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Photo icon URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "80 x 80 pixels - optional"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "Categories (optional, comma separated list)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:120
+msgid "Version ID"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Price of app"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Location (URL) to purchase app"
 msgstr ""
 
 #: ../../Zotlabs/Module/Help.php:26
@@ -1658,8 +1763,8 @@ msgid "Help:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223
-#: ../../include/nav.php:159
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/nav.php:161
 msgid "Help"
 msgstr ""
 
@@ -1667,334 +1772,124 @@ msgstr ""
 msgid "$Projectname Documentation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:88
-msgid "Permission Denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:104
-msgid "File not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:147
-msgid "Edit file permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:156
-msgid "Set/edit permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:157
-msgid "Include all files and sub folders"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:158
-msgid "Return to file list"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:160
-msgid "Copy/paste this code to attach file to a post"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Copy/paste this URL to link file from a web page"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Share this file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Show URL to this file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Filestorage.php:165
-msgid "Notify your contacts about this file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
-#: ../../include/nav.php:163
-msgid "Apps"
-msgstr ""
-
 #: ../../Zotlabs/Module/Attach.php:13
 msgid "Item not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:32
-#, php-format
-msgid "Your service plan only allows %d channels."
+#: ../../Zotlabs/Module/Pdledit.php:18
+msgid "Layout updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
+msgid "Edit System Page Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
+#: ../../Zotlabs/Module/Pdledit.php:56
+msgid "Layout not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
+#: ../../Zotlabs/Module/Pdledit.php:62
+msgid "Module Name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:122
-#: ../../Zotlabs/Module/Import_items.php:86
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
+#: ../../Zotlabs/Module/Pdledit.php:63
+msgid "Layout Help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
-msgid "Cloned channel not found. Import failed."
+#: ../../Zotlabs/Module/Ffsapi.php:12
+msgid "Share content from Firefox to $Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:160
-msgid "No channel. Import failed."
+#: ../../Zotlabs/Module/Ffsapi.php:15
+msgid "Activate the Firefox $Projectname provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:510
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
+#: ../../Zotlabs/Module/Acl.php:288
+msgid "network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:532
-msgid "You must be logged in to use this feature."
+#: ../../Zotlabs/Module/Acl.php:298
+msgid "RSS"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:537
-msgid "Import Channel"
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:538
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You "
-"may retrieve the channel identity from the old server/hub via the network or "
-"provide an export file."
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:539
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "File to Upload"
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:540
-msgid "Or provide the old server/hub details"
+#: ../../Zotlabs/Module/Filestorage.php:155
+msgid "Set/edit permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:541
-msgid "Your old identity address (xyz@example.com)"
+#: ../../Zotlabs/Module/Filestorage.php:156
+msgid "Include all files and sub folders"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:542
-msgid "Your old login email address"
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Return to file list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:543
-msgid "Your old login password"
+#: ../../Zotlabs/Module/Filestorage.php:159
+msgid "Copy/paste this code to attach file to a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:544
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be "
-"able to post from either location, but only one can be marked as the primary "
-"location for files, photos, and media."
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:545
-msgid "Make this hub my primary location"
+#: ../../Zotlabs/Module/Filestorage.php:162
+msgid "Share this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:546
-msgid ""
-"Import existing posts if possible (experimental - limited by available memory"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Show URL to this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:547
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Notify your contacts about this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:178
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:427
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:467
-msgid "Executable content type not permitted to this channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:847
-msgid "Duplicate post suppressed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:977
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1241
-msgid "Unable to obtain post information from database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1248
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1255
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr ""
-
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2267
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2248
 msgid "Layouts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:183
+#: ../../Zotlabs/Module/Layouts.php:185
 msgid "Comanche page description language help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:187
+#: ../../Zotlabs/Module/Layouts.php:189
 msgid "Layout Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:114
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Webpages.php:205
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:115
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Webpages.php:206
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1070
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:195
+#: ../../include/conversation.php:1219
+msgid "Share"
+msgstr ""
+
+#: ../../Zotlabs/Module/Layouts.php:194
 msgid "Download PDL file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
-#: ../../Zotlabs/Module/Siteinfo.php:65
-msgid "$Projectname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Home.php:79
-#, php-format
-msgid "Welcome to %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:13
-msgid "First Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:14
-msgid "Last Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:15
-msgid "Nickname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:16
-msgid "Full Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
-#: ../../include/network.php:2151 ../../boot.php:1705
-msgid "Email"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236
-msgid "Profile Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:22
-msgid "Profile Photo 16px"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:23
-msgid "Profile Photo 32px"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:24
-msgid "Profile Photo 48px"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:25
-msgid "Profile Photo 64px"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:26
-msgid "Profile Photo 80px"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:27
-msgid "Profile Photo 128px"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:28
-msgid "Timezone"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
-msgid "Homepage URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234
-msgid "Language"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:31
-msgid "Birth Year"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:32
-msgid "Birth Month"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:33
-msgid "Birth Day"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:34
-msgid "Birthdate"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
-msgid "Gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Male"
-msgstr ""
-
-#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Female"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
-msgid "webpage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
-msgid "block"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
-msgid "layout"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
-msgid "menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:196
-#, php-format
-msgid "%s element installed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Impel.php:199
-#, php-format
-msgid "%s element installation failed"
-msgstr ""
-
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr ""
@@ -2031,13 +1926,13 @@ msgid "Previous action reversed."
 msgstr ""
 
 #: ../../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:1921
 msgid "photo"
 msgstr ""
 
 #: ../../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:1927
 msgid "status"
 msgstr ""
 
@@ -2089,1121 +1984,6 @@ msgstr ""
 msgid "Thank you."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:102
-msgid "Import completed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:117
-msgid "Import Items"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import_items.php:118
-msgid "Use this form to import existing posts and content from an export file."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:63
-msgid "Please join us on $Projectname"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:74
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:79
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:83
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Invite.php:102
-msgid "You have no more invitations available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:133
-msgid "Send invitations"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:134
-msgid "Enter email addresses, one per line:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
-msgid "Your message:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Please join my community on $Projectname."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:138
-msgid "You will need to supply this invitation code:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:139
-msgid "1. Register at any $Projectname location (they are all inter-connected)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "or visit"
-msgstr ""
-
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "3. Click [Connect]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lockview.php:61
-msgid "Remote privacy information not available."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lockview.php:82
-msgid "Visible to:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary "
-"location."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470
-#: ../../Zotlabs/Module/Admin.php:1224
-msgid "Address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
-msgid "Drop"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing "
-"your channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
-msgstr ""
-
-#: ../../Zotlabs/Module/Magic.php:71
-msgid "Hub not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:38
-msgid "Unable to lookup recipient."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:45
-msgid "Unable to communicate with requested channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:52
-msgid "Cannot verify requested channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:78
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:143
-msgid "Messages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:178
-msgid "Message recalled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:191
-msgid "Conversation removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:234
-msgid "Requested channel is not in this network"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:242
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
-msgid "To:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
-msgid "Subject:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
-#: ../../include/conversation.php:1220
-msgid "Attach file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:253
-msgid "Send"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
-#: ../../include/conversation.php:1251
-msgid "Set expiration date"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:340
-msgid "Delete message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:341
-msgid "Delivery report"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:342
-msgid "Recall message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:344
-msgid "Message has been recalled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:361
-msgid "Delete Conversation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:363
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:367
-msgid "Send Reply"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:372
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr ""
-
-#: ../../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:143
-msgid "Create a new channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
-#: ../../include/nav.php:206
-msgid "Channel Manager"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:167
-msgid "Switch to one of your channels by selecting it."
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:168
-msgid "Default Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
-#, php-format
-msgid "Site Member (%s)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:44
-#, php-format
-msgid "Password reset requested at %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:67
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1711
-msgid "Password Reset"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:91
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your new password is"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "click here to login"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:112
-#, php-format
-msgid "Your password has changed at %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:127
-msgid "Forgot your Password?"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:128
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:129
-msgid "Email Address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Reset"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2266
-msgid "Menus"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:136
-msgid "Menu could not be deleted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
-msgid "Menu not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title as seen by others"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:157
-msgid "Allow bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225
-msgid "Mood"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
-msgstr ""
-
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
-msgstr ""
-
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr ""
-
-#: ../../Zotlabs/Module/Match.php:67
-msgid "is interested in:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:153
-msgid "Search Results For:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:217
-msgid "Privacy group is empty"
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:226
-msgid "Privacy group: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Network.php:252
-msgid "Invalid connection."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:98
-msgid "No more system notifications."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:102
-msgid "System Notifications"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:52
-msgid "Unable to create element."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:76
-msgid "Unable to update menu element."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:92
-msgid "Unable to add menu element."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
-msgid "Menu Item Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1068
-msgid "(click to open/close)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
-msgid "Link Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
-msgid "Link or Submenu Target"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:157
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
-msgid "Use magic-auth if available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
-msgid "Open link in new window"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Order in list"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Higher numbers will sink to bottom of listing"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:161
-msgid "Submit and finish"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:162
-msgid "Submit and continue"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:170
-msgid "Menu:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:173
-msgid "Link Target"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:176
-msgid "Edit menu"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:179
-msgid "Edit element"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Drop element"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:181
-msgid "New element"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:182
-msgid "Edit this menu container"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:183
-msgid "Add menu element"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:184
-msgid "Delete this menu item"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:185
-msgid "Edit this menu item"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:202
-msgid "Menu item not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:215
-msgid "Menu item deleted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:217
-msgid "Menu item could not be deleted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:224
-msgid "Edit Menu Element"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mitem.php:230
-msgid "Link text"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Name or caption"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
-"Group\""
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-msgid "Choose a short nickname"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-#, php-format
-msgid ""
-"Your nickname will be used to create an easy to remember channel address e."
-"g. nickname%s"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Channel role and privacy"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Select a channel role with your privacy requirements."
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Read more about roles"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:135
-msgid "Create Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:136
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:137
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notifications.php:30
-msgid "Invalid request identifier."
-msgstr ""
-
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "Discard"
-msgstr ""
-
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
-msgid "Mark all system notifications seen"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:84
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../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
-#: ../../include/photo/photo_driver.php:718
-msgid "Profile Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
-msgid "Album not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:132
-msgid "Delete Album"
-msgstr ""
-
-#: ../../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:210 ../../Zotlabs/Module/Photos.php:1053
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:533
-msgid "No photos selected"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:582
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:621
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:624
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:660
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:664
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:665
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:666
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:667
-msgid "Caption (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:668
-msgid "Description (optional):"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:695
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:743
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:766
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:768
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
-#: ../../include/widgets.php:1499
-msgid "View Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1516
-msgid "Edit Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:870
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:872
-msgid "Photo not available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:930
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:931
-msgid "Use as cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:938
-msgid "Private Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:953
-msgid "View Full Size"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437
-#: ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1032
-msgid "Edit photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1038
-msgid "Enter a new album name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "or select an existing one (doubleclick)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1042
-msgid "Caption"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1048
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1051
-msgid "Flag as adult in album view"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
-msgid "I like this (toggle)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
-msgid "I don't like this (toggle)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
-#: ../../include/conversation.php:740
-msgid "Please wait"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../Zotlabs/Lib/ThreadItem.php:707
-msgid "This is you"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
-msgid "Comment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Agree"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Disagree"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Abstain"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Attending"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Not attending"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Might attend"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
-#: ../../include/conversation.php:1717
-msgid "View all"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1741
-#: ../../include/channel.php:1158
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/conversation.php:1744
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Photos.php:1235
-msgid "Photo Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1244
-msgid "In This Photo:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1249
-msgid "Map"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
-msgctxt "noun"
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
-msgctxt "noun"
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
-#: ../../include/acl_selectors.php:285
-msgid "Close"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1337
-msgid "View Album"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362
-msgid "Recent Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:265
-msgid "sent you a private message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:313
-msgid "added your channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:323
-msgid "g A l F d"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:346
-msgid "[today]"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ping.php:355
-msgid "posted an event"
-msgstr ""
-
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr ""
-
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr ""
-
-#: ../../Zotlabs/Module/Openid.php:30
-msgid "OpenID protocol error. No ID returned."
-msgstr ""
-
-#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
-msgid "Login failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Page.php:133
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
-"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please "
-"leave this page unless you are comfortable with and knowledgeable about how "
-"to correctly use this feature."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:18
-msgid "Layout updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
-msgid "Edit System Page Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:56
-msgid "Layout not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:62
-msgid "Module Name:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pdledit.php:63
-msgid "Layout Help"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226
-#: ../../include/conversation.php:960
-msgid "Poke"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:169
-msgid "Poke somebody"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
-msgstr ""
-
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
-msgstr ""
-
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
-#, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr ""
-
 #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
 #: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
 msgid "Profile not found."
@@ -3273,6 +2053,11 @@ msgstr ""
 msgid "Interests"
 msgstr ""
 
+#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1224
+msgid "Address"
+msgstr ""
+
 #: ../../Zotlabs/Module/Profiles.php:560
 msgid "Profile updated."
 msgstr ""
@@ -3290,7 +2075,7 @@ msgid "View this profile"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
-#: ../../include/channel.php:959
+#: ../../include/channel.php:983
 msgid "Edit visibility"
 msgstr ""
 
@@ -3302,7 +2087,7 @@ msgstr ""
 msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:954
 msgid "Change profile photo"
 msgstr ""
 
@@ -3323,7 +2108,7 @@ msgid "Add profile things"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105
-#: ../../include/conversation.php:1526
+#: ../../include/conversation.php:1541
 msgid "Personal"
 msgstr ""
 
@@ -3463,118 +2248,1093 @@ msgstr ""
 msgid "My other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:979
 msgid "Profile Image"
 msgstr ""
 
 #: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
-#: ../../include/channel.php:937
+#: ../../include/channel.php:961
 msgid "Edit Profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:179
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profile_photo.php:367
-msgid "Upload Profile Photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249
-msgid "Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1270
-msgid "Public Hubs"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:25
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Hub URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Access Type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Registration Policy"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Stats"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Software"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:959
-msgid "Ratings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:38
-msgid "Rate"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Website:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Rate.php:163
+#: ../../Zotlabs/Module/Import.php:32
 #, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
+msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:164
-msgid "Rating (this information is public)"
+#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
+msgid "Nothing to import."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:165
-msgid "Optionally explain your rating (this information is public)"
+#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
+msgid "Unable to download data from old server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:73
-msgid "No ratings"
+#: ../../Zotlabs/Module/Import.php:100
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Imported file is empty."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:104
-msgid "Rating: "
+#: ../../Zotlabs/Module/Import.php:122
+#: ../../Zotlabs/Module/Import_items.php:88
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:105
-msgid "Website: "
+#: ../../Zotlabs/Module/Import.php:152 ../../include/import.php:86
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:107
-msgid "Description: "
+#: ../../Zotlabs/Module/Import.php:162
+msgid "No channel. Import failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:511
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:533
+msgid "You must be logged in to use this feature."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:538
+msgid "Import Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:539
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You "
+"may retrieve the channel identity from the old server/hub via the network or "
+"provide an export file."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:540
+#: ../../Zotlabs/Module/Import_items.php:121
+msgid "File to Upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:541
+msgid "Or provide the old server/hub details"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:542
+msgid "Your old identity address (xyz@example.com)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:543
+msgid "Your old login email address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:544
+msgid "Your old login password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:545
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be "
+"able to post from either location, but only one can be marked as the primary "
+"location for files, photos, and media."
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:546
+msgid "Make this hub my primary location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:547
+msgid ""
+"Import existing posts if possible (experimental - limited by available memory"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import.php:548
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr ""
+
+#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
+#: ../../Zotlabs/Module/Siteinfo.php:48
+msgid "$Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Home.php:79
+#, php-format
+msgid "Welcome to %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:179
+msgid "Unable to locate original post."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:428
+msgid "Empty post discarded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:468
+msgid "Executable content type not permitted to this channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:852
+msgid "Duplicate post suppressed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:985
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1238
+msgid "Unable to obtain post information from database."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1245
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1252
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:82
+msgid "Page owner information could not be retrieved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:741
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:212
+#: ../../Zotlabs/Module/Profile_photo.php:311
+#: ../../include/photo/photo_driver.php:718
+msgid "Profile Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147
+msgid "Album not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:130
+msgid "Delete Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:151
+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:208 ../../Zotlabs/Module/Photos.php:1051
+msgid "Delete Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:531
+msgid "No photos selected"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:580
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:619
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:622
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:658
+msgid "Upload Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:662
+msgid "Enter an album name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:663
+msgid "or select an existing album (doubleclick)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:664
+msgid "Create a status post for this upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:665
+msgid "Caption (optional):"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:666
+msgid "Description (optional):"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:693
+msgid "Album name could not be decoded"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:741
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:764
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:766
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1329
+#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1588
+msgid "View Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:821
+#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1605
+msgid "Edit Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:868
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:870
+msgid "Photo not available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:928
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:929
+msgid "Use as cover photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:936
+msgid "Private Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:951
+msgid "View Full Size"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Admin.php:1437
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1030
+msgid "Edit photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1032
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1033
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1037
+msgid "or select an existing one (doubleclick)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Caption"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1042
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1049
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Lib/ThreadItem.php:261
+msgid "I like this (toggle)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1069 ../../Zotlabs/Lib/ThreadItem.php:262
+msgid "I don't like this (toggle)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:397
+#: ../../include/conversation.php:743
+msgid "Please wait"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1205
+#: ../../Zotlabs/Lib/ThreadItem.php:707
+msgid "This is you"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
+#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1136
+#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../include/conversation.php:1738
+msgid "View all"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../include/taxonomy.php:403 ../../include/channel.php:1183
+#: ../../include/conversation.php:1762
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1133 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/conversation.php:1765
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1233
+msgid "Photo Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1242
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1247
+msgid "Map"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/ThreadItem.php:386
+msgctxt "noun"
+msgid "Likes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1256 ../../Zotlabs/Lib/ThreadItem.php:387
+msgctxt "noun"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1261 ../../Zotlabs/Lib/ThreadItem.php:392
+#: ../../include/acl_selectors.php:283
+msgid "Close"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1335
+msgid "View Album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359
+#: ../../Zotlabs/Module/Photos.php:1360
+msgid "Recent Photos"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lockview.php:61
+msgid "Remote privacy information not available."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lockview.php:82
+msgid "Visible to:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
+msgstr ""
+
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid "Use this form to import existing posts and content from an export file."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:63
+msgid "Please join us on $Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:74
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:79
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:83
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Invite.php:102
+msgid "You have no more invitations available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:133
+msgid "Send invitations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:134
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
+msgid "Your message:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Please join my community on $Projectname."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:138
+msgid "You will need to supply this invitation code:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:139
+msgid "1. Register at any $Projectname location (they are all inter-connected)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "or visit"
+msgstr ""
+
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "3. Click [Connect]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:66
+msgid ""
+"Please select another location to become primary before removing the primary "
+"location."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+msgid "Drop"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:124
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr ""
+
+#: ../../Zotlabs/Module/Magic.php:71
+msgid "Hub not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:38
+msgid "Unable to lookup recipient."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:45
+msgid "Unable to communicate with requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:52
+msgid "Cannot verify requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:78
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:143
+msgid "Messages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:178
+msgid "Message recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:191
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:234
+msgid "Requested channel is not in this network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:242
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
+msgid "To:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
+msgid "Subject:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
+#: ../../include/conversation.php:1231
+msgid "Attach file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:253
+msgid "Send"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
+#: ../../include/conversation.php:1266
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:340
+msgid "Delete message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:341
+msgid "Delivery report"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:342
+msgid "Recall message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:344
+msgid "Message has been recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:361
+msgid "Delete Conversation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:363
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:367
+msgid "Send Reply"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:372
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr ""
+
+#: ../../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:143
+msgid "Create a new channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214
+#: ../../include/nav.php:208
+msgid "Channel Manager"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:167
+msgid "Switch to one of your channels by selecting it."
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:168
+msgid "Default Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:49
+msgid "Unable to update menu."
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:60
+msgid "Unable to create menu."
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+msgid "Menu Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:98
+msgid "Unique name (not visible on webpage) - required"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+msgid "Menu Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:99
+msgid "Visible on webpage - leave empty for no title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:100
+msgid "Allow Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+msgid "Menu may be used to store saved bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+msgid "Submit and proceed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2247
+msgid "Menus"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:117
+msgid "Bookmarks allowed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:119
+msgid "Delete this menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+msgid "Edit menu contents"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:121
+msgid "Edit this menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:136
+msgid "Menu could not be deleted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+msgid "Menu not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:149
+msgid "Edit Menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:153
+msgid "Add or remove entries to this menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Menu name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Must be unique, only seen by you"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title as seen by others"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:157
+msgid "Allow bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
+#: ../../Zotlabs/Module/Xchan.php:41
+msgid "Not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
+#, php-format
+msgid "Site Member (%s)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:44
+#, php-format
+msgid "Password reset requested at %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:67
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1712
+msgid "Password Reset"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:91
+msgid "Your password has been reset as requested."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your new password is"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Save or copy your new password - and then"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "click here to login"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:112
+#, php-format
+msgid "Your password has changed at %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:127
+msgid "Forgot your Password?"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:128
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:129
+msgid "Email Address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Reset"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227
+msgid "Mood"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mood.php:136
+msgid "Set your current mood and tell your friends"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:94
+msgid "No such group"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:134
+msgid "No such channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:139
+msgid "forum"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:151
+msgid "Search Results For:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:215
+msgid "Privacy group is empty"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:224
+msgid "Privacy group: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:250
+msgid "Invalid connection."
+msgstr ""
+
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:98
+msgid "No more system notifications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:102
+msgid "System Notifications"
+msgstr ""
+
+#: ../../Zotlabs/Module/Match.php:26
+msgid "Profile Match"
+msgstr ""
+
+#: ../../Zotlabs/Module/Match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr ""
+
+#: ../../Zotlabs/Module/Match.php:67
+msgid "is interested in:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Match.php:74
+msgid "No matches"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel.php:40
+msgid "Posts and comments"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel.php:41
+msgid "Only posts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel.php:101
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:52
+msgid "Unable to create element."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:76
+msgid "Unable to update menu element."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:92
+msgid "Unable to add menu element."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
+msgid "Menu Item Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
+#: ../../Zotlabs/Module/Settings.php:1142
+msgid "(click to open/close)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
+msgid "Link Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
+msgid "Link or Submenu Target"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:157
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
+msgid "Use magic-auth if available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
+msgid "Open link in new window"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Order in list"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Higher numbers will sink to bottom of listing"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:161
+msgid "Submit and finish"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:162
+msgid "Submit and continue"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:170
+msgid "Menu:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:173
+msgid "Link Target"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:176
+msgid "Edit menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:179
+msgid "Edit element"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Drop element"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:181
+msgid "New element"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:182
+msgid "Edit this menu container"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:183
+msgid "Add menu element"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:184
+msgid "Delete this menu item"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:185
+msgid "Edit this menu item"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:202
+msgid "Menu item not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:215
+msgid "Menu item deleted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:217
+msgid "Menu item could not be deleted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:224
+msgid "Edit Menu Element"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:230
+msgid "Link text"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin.php:77
@@ -3662,11 +3422,11 @@ msgstr ""
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2841
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2837
 msgid "Default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:872
 msgid "mobile"
 msgstr ""
 
@@ -3698,7 +3458,7 @@ msgstr ""
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1382
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1471
 msgid "Site"
 msgstr ""
 
@@ -3985,12 +3745,12 @@ msgid "0 for no expiration of imported content"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:796
 msgid "Off"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:796
 msgid "On"
 msgstr ""
 
@@ -4047,7 +3807,7 @@ msgid ""
 "embedded content from that site is explicitly blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1385
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1474
 msgid "Security"
 msgstr ""
 
@@ -4214,7 +3974,7 @@ msgid "Account '%s' unblocked"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
-#: ../../include/widgets.php:1383
+#: ../../include/widgets.php:1472
 msgid "Accounts"
 msgstr ""
 
@@ -4320,7 +4080,7 @@ msgstr ""
 msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1384
+#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1473
 msgid "Channels"
 msgstr ""
 
@@ -4340,7 +4100,7 @@ msgstr ""
 msgid "Disallow Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1611
+#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626
 msgid "Channel"
 msgstr ""
 
@@ -4379,7 +4139,7 @@ msgid "Enable"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
-#: ../../include/widgets.php:1387
+#: ../../include/widgets.php:1476
 msgid "Plugins"
 msgstr ""
 
@@ -4388,8 +4148,8 @@ msgid "Toggle"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
-#: ../../Zotlabs/Lib/Apps.php:215 ../../include/widgets.php:638
-#: ../../include/nav.php:208
+#: ../../Zotlabs/Lib/Apps.php:216 ../../include/widgets.php:647
+#: ../../include/nav.php:210
 msgid "Settings"
 msgstr ""
 
@@ -4445,7 +4205,7 @@ msgstr ""
 msgid "Install new repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:334
 msgid "Install"
 msgstr ""
 
@@ -4461,8 +4221,8 @@ msgstr ""
 msgid "Install a New Plugin Repository"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:75
+#: ../../Zotlabs/Module/Settings.php:651 ../../Zotlabs/Lib/Apps.php:334
 msgid "Update"
 msgstr ""
 
@@ -4479,7 +4239,7 @@ msgid "Screenshot"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
-#: ../../include/widgets.php:1388
+#: ../../include/widgets.php:1477
 msgid "Themes"
 msgstr ""
 
@@ -4495,8 +4255,8 @@ msgstr ""
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1409
-#: ../../include/widgets.php:1419
+#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1498
+#: ../../include/widgets.php:1508
 msgid "Logs"
 msgstr ""
 
@@ -4562,7 +4322,7 @@ msgstr ""
 msgid "Edit Profile Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1390
+#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1479
 msgid "Profile Fields"
 msgstr ""
 
@@ -4590,56 +4350,384 @@ msgstr ""
 msgid "Create Custom Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
-msgid "App installed."
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Name or caption"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:46
-msgid "Malformed app."
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid ""
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\""
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:104
-msgid "Embed code"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+msgid "Choose a short nickname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
-msgid "Edit App"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+#, php-format
+msgid ""
+"Your nickname will be used to create an easy to remember channel address e."
+"g. nickname%s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:110
-msgid "Create App"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Channel role and privacy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:115
-msgid "Name of app"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Select a channel role with your privacy requirements."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Location (URL) of app"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Read more about roles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "Photo icon URL"
+#: ../../Zotlabs/Module/New_channel.php:135
+msgid "Create Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "80 x 80 pixels - optional"
+#: ../../Zotlabs/Module/New_channel.php:136
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Categories (optional, comma separated list)"
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Version ID"
+#: ../../Zotlabs/Module/Ping.php:265
+msgid "sent you a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Price of app"
+#: ../../Zotlabs/Module/Ping.php:313
+msgid "added your channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Location (URL) to purchase app"
+#: ../../Zotlabs/Module/Ping.php:323
+msgid "g A l F d"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:346
+msgid "[today]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:355
+msgid "posted an event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Notifications.php:30
+msgid "Invalid request identifier."
+msgstr ""
+
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "Discard"
+msgstr ""
+
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:193
+msgid "Mark all system notifications seen"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228
+#: ../../include/conversation.php:963
+msgid "Poke"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
+msgstr ""
+
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
+msgstr ""
+
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr ""
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr ""
+
+#: ../../Zotlabs/Module/Openid.php:30
+msgid "OpenID protocol error. No ID returned."
+msgstr ""
+
+#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:252
+msgid "Login failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1275
+msgid "Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please "
+"leave this page unless you are comfortable with and knowledgeable about how "
+"to correctly use this feature."
+msgstr ""
+
+#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:19
+#, php-format
+msgid "Version %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Installed plugins/addons/apps:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:36
+msgid "No installed plugins/addons/apps"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:49
+msgid ""
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:51
+msgid "Tag: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:53
+msgid "Last background fetch: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:55
+msgid "Current load average: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:58
+msgid "Running at web location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:59
+msgid ""
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:60
+msgid "Bug reports and issues: please visit"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:62
+msgid "$projectname issues"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:63
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
+msgstr ""
+
+#: ../../Zotlabs/Module/Siteinfo.php:65
+msgid "Site Administrators"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr ""
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid "The error message was:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rmagic.php:48
+msgid "Authentication failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Rmagic.php:88
+msgid "Remote Authentication"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rmagic.php:89
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rmagic.php:90
+msgid "Authenticate"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1337
+msgid "Public Hubs"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:25
+msgid ""
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Hub URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Access Type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Registration Policy"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Stats"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Software"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
+#: ../../include/conversation.php:962
+msgid "Ratings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:38
+msgid "Rate"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:186
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:389
+msgid "Upload Profile Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Editblock.php:108
+msgid "Block Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2246
+msgid "Blocks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Website:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:163
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:164
+msgid "Rating (this information is public)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:165
+msgid "Optionally explain your rating (this information is public)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ratings.php:73
+msgid "No ratings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ratings.php:104
+msgid "Rating: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Ratings.php:105
+msgid "Website: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Ratings.php:107
+msgid "Description: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
+#: ../../include/nav.php:165
+msgid "Apps"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243
+msgid "Title (optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
 msgstr ""
 
 #: ../../Zotlabs/Module/Rbmark.php:94
@@ -4744,13 +4832,15 @@ msgstr ""
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
-#: ../../boot.php:1685
+#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:149
+#: ../../boot.php:1686
 msgid "Register"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:262
-msgid "Proceed to create your first channel"
+#: ../../Zotlabs/Module/Register.php:263
+msgid ""
+"This site may require email verification after submitting this form. If you "
+"are returned to a login page, please check your email for instructions."
 msgstr ""
 
 #: ../../Zotlabs/Module/Regmod.php:15
@@ -4801,7 +4891,7 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Removeaccount.php:60
-#: ../../Zotlabs/Module/Settings.php:705
+#: ../../Zotlabs/Module/Settings.php:740
 msgid "Remove Account"
 msgstr ""
 
@@ -4829,34 +4919,66 @@ msgid ""
 "removed from the network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1198
 msgid "Remove Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+msgid "Export Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:57
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:44
-msgid "The error message was:"
+#: ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:48
-msgid "Authentication failed."
+#: ../../Zotlabs/Module/Uexport.php:59
+msgid ""
+"Export your channel information and recent content to a JSON backup that can "
+"be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for "
+"this download to begin."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:88
-msgid "Remote Authentication"
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export your posts from a given year."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:89
-msgid "Enter your channel address (e.g. channel@example.com)"
+#: ../../Zotlabs/Module/Uexport.php:62
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:90
-msgid "Authenticate"
+#: ../../Zotlabs/Module/Uexport.php:63
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
+"\">%2$s</a>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:64
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:65
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a href=\"%1$s\">"
+"%2$s</a> on any site containing your channel. For best results please import "
+"or restore these in date order (oldest first)."
 msgstr ""
 
 #: ../../Zotlabs/Module/Search.php:216
@@ -4873,608 +4995,628 @@ msgstr ""
 msgid "No service class restrictions found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:69
+#: ../../Zotlabs/Module/Settings.php:67
 msgid "Name is required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:73
+#: ../../Zotlabs/Module/Settings.php:71
 msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:225
+#: ../../Zotlabs/Module/Settings.php:154
+msgid "Token saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:260
 msgid "Not valid email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:228
+#: ../../Zotlabs/Module/Settings.php:263
 msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:237
+#: ../../Zotlabs/Module/Settings.php:272
 msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:254
+#: ../../Zotlabs/Module/Settings.php:289
 msgid "Password verification failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:261
+#: ../../Zotlabs/Module/Settings.php:296
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:265
+#: ../../Zotlabs/Module/Settings.php:300
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Zotlabs/Module/Settings.php:314
 msgid "Password changed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:281
+#: ../../Zotlabs/Module/Settings.php:316
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:525
+#: ../../Zotlabs/Module/Settings.php:560
 msgid "Settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
-#: ../../Zotlabs/Module/Settings.php:651
+#: ../../Zotlabs/Module/Settings.php:624 ../../Zotlabs/Module/Settings.php:650
+#: ../../Zotlabs/Module/Settings.php:686
 msgid "Add application"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:627
 msgid "Name of application"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:628 ../../Zotlabs/Module/Settings.php:654
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
+#: ../../Zotlabs/Module/Settings.php:628 ../../Zotlabs/Module/Settings.php:629
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:629 ../../Zotlabs/Module/Settings.php:655
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
+#: ../../Zotlabs/Module/Settings.php:630 ../../Zotlabs/Module/Settings.php:656
 msgid "Redirect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:595
+#: ../../Zotlabs/Module/Settings.php:630
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Settings.php:622
+#: ../../Zotlabs/Module/Settings.php:631 ../../Zotlabs/Module/Settings.php:657
 msgid "Icon url"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Settings.php:631 ../../Zotlabs/Module/Sources.php:112
 #: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:607
+#: ../../Zotlabs/Module/Settings.php:642
 msgid "Application not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:650
+#: ../../Zotlabs/Module/Settings.php:685
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:689
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:655
+#: ../../Zotlabs/Module/Settings.php:690
 msgid "No name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:656
+#: ../../Zotlabs/Module/Settings.php:691
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:704
 msgid "No feature settings configured"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:676
+#: ../../Zotlabs/Module/Settings.php:711
 msgid "Feature/Addon Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:734
 msgid "Account Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:735
 msgid "Current Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:701
+#: ../../Zotlabs/Module/Settings.php:736
 msgid "Enter New Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:737
 msgid "Confirm New Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:737
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:704
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:739
+#: ../../Zotlabs/Module/Settings.php:1115
 msgid "Email Address:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:706
+#: ../../Zotlabs/Module/Settings.php:741
 msgid "Remove this account including all its channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:729
+#: ../../Zotlabs/Module/Settings.php:773 ../../include/widgets.php:614
+msgid "Guest Access Tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:776
+msgid "Login Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:777
+msgid "Login Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:778
+msgid "Expires (yyyy-mm-dd)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:803
 msgid "Additional Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:753
+#: ../../Zotlabs/Module/Settings.php:827
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:792
+#: ../../Zotlabs/Module/Settings.php:866
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:795
+#: ../../Zotlabs/Module/Settings.php:869
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:911
 msgid "Display Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:912
 msgid "Theme Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:839
+#: ../../Zotlabs/Module/Settings.php:913
 msgid "Custom Theme Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:840
+#: ../../Zotlabs/Module/Settings.php:914
 msgid "Content Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:920
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:921
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:922
 msgid "Preload images before rendering the page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:922
 msgid ""
 "The subjective page load time will be longer but the page will be ready when "
 "displayed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:923
 msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:924
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:924
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:925
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:925
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:926
 msgid "Show emoticons (smilies) as images"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:853
+#: ../../Zotlabs/Module/Settings.php:927
 msgid "Link post titles to source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:854
+#: ../../Zotlabs/Module/Settings.php:928
 msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:931
 msgid "Use blog/list mode on channel page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:931 ../../Zotlabs/Module/Settings.php:932
 msgid "(comments displayed separately)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:932
 msgid "Use blog/list mode on grid page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:859
+#: ../../Zotlabs/Module/Settings.php:933
 msgid "Channel page max height of content (in pixels)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:933 ../../Zotlabs/Module/Settings.php:934
 msgid "click to expand content exceeding this height"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:934
 msgid "Grid page max height of content (in pixels)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Zotlabs/Module/Settings.php:968
 msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:969
 msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:970
 msgid "Approved connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:971
 msgid "Any connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:972
 msgid "Anybody on this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:973
 msgid "Anybody in this network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:900
+#: ../../Zotlabs/Module/Settings.php:974
 msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:901
+#: ../../Zotlabs/Module/Settings.php:975
 msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:976
+#: ../../Zotlabs/Module/Settings.php:1050
 msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:981
+#: ../../Zotlabs/Module/Settings.php:1055
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:990
+#: ../../Zotlabs/Module/Settings.php:1064
 msgid "Your channel address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1032
+#: ../../Zotlabs/Module/Settings.php:1106
 msgid "Channel Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:1113
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140
+#: ../../Zotlabs/Module/Settings.php:1114 ../../include/channel.php:1165
 msgid "Full Name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1116
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1117
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1117
 msgid "Geographical location to display on your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1118
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1120
 msgid "Adult Content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1120
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1048
+#: ../../Zotlabs/Module/Settings.php:1122
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1125
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Hide my online presence"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Zotlabs/Module/Settings.php:1129
 msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1130
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Zotlabs/Module/Settings.php:1131
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1058
+#: ../../Zotlabs/Module/Settings.php:1132
 msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1133
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1135
 msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1135
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1137
 msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1139
 msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1139
 msgid "0 or blank to use the website limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1139
 #, php-format
 msgid "This website expires after %d days."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1139
 msgid "This website does not expire imported content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1139
 msgid "The website limit takes precedence if lower than your limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1140
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1140
 msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1067
+#: ../../Zotlabs/Module/Settings.php:1141
 msgid "Default Post and Publish Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1069
+#: ../../Zotlabs/Module/Settings.php:1143
 msgid "Use my default audience setting for the type of object published"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1072
+#: ../../Zotlabs/Module/Settings.php:1146
 msgid "Channel permissions category:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1152
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1152
 msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1155
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1156
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1157
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1158
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1159
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "You receive a connection request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1162
 msgid "Your connections are confirmed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1163
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1164
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1165
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1166
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1093
+#: ../../Zotlabs/Module/Settings.php:1167
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1094
+#: ../../Zotlabs/Module/Settings.php:1168
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1171
 msgid "Show visual notifications including:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Unseen grid activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1174
 msgid "Unseen channel activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1175
 msgid "Unseen private messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1101
-#: ../../Zotlabs/Module/Settings.php:1106
-#: ../../Zotlabs/Module/Settings.php:1107
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1175
+#: ../../Zotlabs/Module/Settings.php:1180
+#: ../../Zotlabs/Module/Settings.php:1181
+#: ../../Zotlabs/Module/Settings.php:1182
 msgid "Recommended"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1176
 msgid "Upcoming events"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1177
 msgid "Events today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1178
 msgid "Upcoming birthdays"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1178
 msgid "Not available in all themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1179
 msgid "System (personal) notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1180
 msgid "System info messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1181
 msgid "System critical alerts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1182
 msgid "New connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1109
+#: ../../Zotlabs/Module/Settings.php:1183
 msgid "System Registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1184
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1186
 msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1186
 msgid "Must be greater than 0"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1114
+#: ../../Zotlabs/Module/Settings.php:1188
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1115
+#: ../../Zotlabs/Module/Settings.php:1189
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1192
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1193
 msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1194
 msgid "Default photo upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1120
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1194
+#: ../../Zotlabs/Module/Settings.php:1195
 msgid "%Y - current year, %m -  current month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1195
 msgid "Default file upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1197
 msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Remove this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1126
+#: ../../Zotlabs/Module/Settings.php:1200
 msgid "Firefox Share $Projectname provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1127
+#: ../../Zotlabs/Module/Settings.php:1201
 msgid "Start calendar week on monday"
 msgstr ""
 
@@ -5507,7 +5649,7 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
-#: ../../Zotlabs/Module/Setup.php:721
+#: ../../Zotlabs/Module/Setup.php:722
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
@@ -5707,198 +5849,199 @@ msgid "mb_string PHP module"
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:496
-msgid "mcrypt PHP module"
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:497
 msgid "xml PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:501 ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:500 ../../Zotlabs/Module/Setup.php:502
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Zotlabs/Module/Setup.php:500
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:506 ../../Zotlabs/Module/Setup.php:509
 msgid "proc_open"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Zotlabs/Module/Setup.php:506
 msgid ""
 "Error: proc_open is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:514
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:518
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:523
+#: ../../Zotlabs/Module/Setup.php:522
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Zotlabs/Module/Setup.php:526
 msgid ""
 "Error: mysqli or postgres PHP module required but neither are installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:531
+#: ../../Zotlabs/Module/Setup.php:530
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:535
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Zotlabs/Module/Setup.php:534
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:557
+#: ../../Zotlabs/Module/Setup.php:552
 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:558
+#: ../../Zotlabs/Module/Setup.php:553
 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:559
+#: ../../Zotlabs/Module/Setup.php:554
 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:560
+#: ../../Zotlabs/Module/Setup.php:555
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation. "
 "Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:563
+#: ../../Zotlabs/Module/Setup.php:558
 msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Zotlabs/Module/Setup.php:572
 msgid ""
 "Red uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:578
+#: ../../Zotlabs/Module/Setup.php:573
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:579 ../../Zotlabs/Module/Setup.php:600
+#: ../../Zotlabs/Module/Setup.php:574 ../../Zotlabs/Module/Setup.php:595
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has "
 "write access to this folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:580
+#: ../../Zotlabs/Module/Setup.php:575
 #, 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:583
+#: ../../Zotlabs/Module/Setup.php:578
 #, php-format
 msgid "%s is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Zotlabs/Module/Setup.php:594
 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"
+"This software 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Zotlabs/Module/Setup.php:598
 msgid "store is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:636
+#: ../../Zotlabs/Module/Setup.php:631
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:637
+#: ../../Zotlabs/Module/Setup.php:632
 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:638
+#: ../../Zotlabs/Module/Setup.php:633
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:639
+#: ../../Zotlabs/Module/Setup.php:634
 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:640
+#: ../../Zotlabs/Module/Setup.php:635
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:641
+#: ../../Zotlabs/Module/Setup.php:636
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:643
+#: ../../Zotlabs/Module/Setup.php:638
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:641
 msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:649
+#: ../../Zotlabs/Module/Setup.php:647
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Zotlabs/Module/Setup.php:650
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:659
 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:685
+#: ../../Zotlabs/Module/Setup.php:683
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:719
+#: ../../Zotlabs/Module/Setup.php:720
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:720
+#: ../../Zotlabs/Module/Setup.php:721
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
@@ -5919,62 +6062,61 @@ msgstr ""
 msgid "Remove this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Zotlabs/Module/Thing.php:114
+msgid "Thing updated"
+msgstr ""
+
+#: ../../Zotlabs/Module/Thing.php:166
+msgid "Object store: failed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Thing.php:170
+msgid "Thing added"
+msgstr ""
+
+#: ../../Zotlabs/Module/Thing.php:196
 #, php-format
-msgid "Version %s"
+msgid "OBJ: %1$s %2$s %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:40
-msgid "Installed plugins/addons/apps:"
+#: ../../Zotlabs/Module/Thing.php:259
+msgid "Show Thing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:53
-msgid "No installed plugins/addons/apps"
+#: ../../Zotlabs/Module/Thing.php:266
+msgid "item not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:66
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
+#: ../../Zotlabs/Module/Thing.php:299
+msgid "Edit Thing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:68
-msgid "Tag: "
+#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
+msgid "Select a profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:70
-msgid "Last background fetch: "
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Post an activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:72
-msgid "Current load average: "
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Only sends to viewers of the applicable profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:75
-msgid "Running at web location"
+#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
+msgid "Name of thing e.g. something"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:76
-msgid ""
-"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
-"about $Projectname."
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
+msgid "URL of thing (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:77
-msgid "Bug reports and issues: please visit"
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
+msgid "URL for photo of thing (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:79
-msgid "$projectname issues"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:80
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:82
-msgid "Site Administrators"
+#: ../../Zotlabs/Module/Thing.php:349
+msgid "Add Thing to your Profile"
 msgstr ""
 
 #: ../../Zotlabs/Module/Sources.php:37
@@ -5993,8 +6135,8 @@ msgstr ""
 msgid "*"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630
-#: ../../include/features.php:71
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:639
+#: ../../include/features.php:72
 msgid "Channel Sources"
 msgstr ""
 
@@ -6070,12 +6212,12 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:263
 msgid "post"
 msgstr ""
 
-#: ../../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:1929
 msgid "comment"
 msgstr ""
 
@@ -6096,131 +6238,110 @@ msgstr ""
 msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:114
-msgid "Thing updated"
+#: ../../Zotlabs/Module/Webpages.php:191 ../../Zotlabs/Lib/Apps.php:218
+#: ../../include/nav.php:106 ../../include/conversation.php:1700
+msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:166
-msgid "Object store: failed"
+#: ../../Zotlabs/Module/Webpages.php:202 ../../include/page_widgets.php:44
+msgid "Actions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:170
-msgid "Thing added"
+#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:45
+msgid "Page Link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:196
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
+#: ../../Zotlabs/Module/Webpages.php:204
+msgid "Page Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:259
-msgid "Show Thing"
+#: ../../Zotlabs/Module/Wiki.php:34
+msgid "Not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:266
-msgid "item not found."
+#: ../../Zotlabs/Module/Wiki.php:92 ../../Zotlabs/Lib/Apps.php:219
+#: ../../include/nav.php:108 ../../include/conversation.php:1710
+#: ../../include/conversation.php:1713 ../../include/features.php:55
+msgid "Wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:299
-msgid "Edit Thing"
+#: ../../Zotlabs/Module/Wiki.php:93
+msgid "Sandbox"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
-msgid "Select a profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Post an activity"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Only sends to viewers of the applicable profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
-msgid "Name of thing e.g. something"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
-msgid "URL of thing (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
-msgid "URL for photo of thing (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:349
-msgid "Add Thing to your Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
-msgid "Export Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Uexport.php:57
+#: ../../Zotlabs/Module/Wiki.php:95
 msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
+"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be "
+"saved*.\""
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Content"
+#: ../../Zotlabs/Module/Wiki.php:164
+msgid "Revision Comparison"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:59
-msgid ""
-"Export your channel information and recent content to a JSON backup that can "
-"be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for "
-"this download to begin."
+#: ../../Zotlabs/Module/Wiki.php:165
+msgid "Revert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export your posts from a given year."
+#: ../../Zotlabs/Module/Wiki.php:192
+msgid "Enter the name of your new wiki:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:62
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
+#: ../../Zotlabs/Module/Wiki.php:193
+msgid "Enter the name of the new page:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:63
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
-"\">%2$s</a>"
+#: ../../Zotlabs/Module/Wiki.php:194
+msgid "Enter the new name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:64
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Wiki.php:200 ../../include/conversation.php:1150
+msgid "Embed image from photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:65
-#, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a href=\"%1$s\">"
-"%2$s</a> on any site containing your channel. For best results please import "
-"or restore these in date order (oldest first)."
+#: ../../Zotlabs/Module/Wiki.php:201 ../../include/conversation.php:1234
+msgid "Embed an image from your albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:62
+#: ../../Zotlabs/Module/Wiki.php:203 ../../include/conversation.php:1236
+#: ../../include/conversation.php:1273
+msgid "OK"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:204 ../../include/conversation.php:1186
+msgid "Choose images to embed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:205 ../../include/conversation.php:1187
+msgid "Choose an album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:206 ../../include/conversation.php:1188
+msgid "Choose a different album..."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:207 ../../include/conversation.php:1189
+msgid "Error getting album list"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:208 ../../include/conversation.php:1190
+msgid "Error getting photo link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1191
+msgid "Error getting album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:75
+#: ../../Zotlabs/Module/Viewconnections.php:78
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:104
+#: ../../Zotlabs/Module/Viewconnections.php:107
 msgid "View Connections"
 msgstr ""
 
@@ -6228,21 +6349,22 @@ msgstr ""
 msgid "Source of Item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217
-#: ../../include/nav.php:106 ../../include/conversation.php:1685
-msgid "Webpages"
+#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
+msgid "Authorize application connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
-msgid "Actions"
+#: ../../Zotlabs/Module/Api.php:62
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
-msgid "Page Link"
+#: ../../Zotlabs/Module/Api.php:72
+msgid "Please login to continue."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:197
-msgid "Page Title"
+#: ../../Zotlabs/Module/Api.php:87
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
 #: ../../Zotlabs/Module/Xchan.php:10
@@ -6253,92 +6375,6 @@ msgstr ""
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:204
-msgid "Site Admin"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:205
-msgid "Bug Report"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:206
-msgid "View Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:207
-msgid "My Chatrooms"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:209
-msgid "Firefox Share"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:210
-msgid "Remote Diagnostics"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
-msgid "Suggest Channels"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
-#: ../../boot.php:1703
-msgid "Login"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
-msgid "Grid"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182
-msgid "Channel Home"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:201
-#: ../../include/conversation.php:1649 ../../include/conversation.php:1652
-msgid "Events"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167
-msgid "Directory"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193
-msgid "Mail"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96
-msgid "Chat"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:229
-msgid "Probe"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:230
-msgid "Suggest"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Random Channel"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:232
-msgid "Invite"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1386
-msgid "Features"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:235
-msgid "Post"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:335
-msgid "Purchase"
-msgstr ""
-
 #: ../../Zotlabs/Lib/Chatroom.php:27
 msgid "Missing room name"
 msgstr ""
@@ -6359,19 +6395,19 @@ msgstr ""
 msgid "Room is full"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1882
 msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1883
 msgid "$projectname"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1885
 msgid "Thank You,"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1887
 #, php-format
 msgid "%s Administrator"
 msgstr ""
@@ -6563,11 +6599,97 @@ msgstr ""
 msgid "commented on %s's post"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:664
+#: ../../Zotlabs/Lib/Apps.php:205
+msgid "Site Admin"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:206
+msgid "Bug Report"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:207
+msgid "View Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:208
+msgid "My Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:210
+msgid "Firefox Share"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:211
+msgid "Remote Diagnostics"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:90
+msgid "Suggest Channels"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:112
+#: ../../boot.php:1704
+msgid "Login"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:181
+msgid "Grid"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:184
+msgid "Channel Home"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:203
+#: ../../include/conversation.php:1664 ../../include/conversation.php:1667
+msgid "Events"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:169
+msgid "Directory"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:195
+msgid "Mail"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:229 ../../include/nav.php:96
+msgid "Chat"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Probe"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:232
+msgid "Suggest"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:233
+msgid "Random Channel"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:234
+msgid "Invite"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1475
+msgid "Features"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:237
+msgid "Post"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:339
+msgid "Purchase"
+msgstr ""
+
+#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:667
 msgid "Private Message"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:656
+#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:659
 msgid "Select"
 msgstr ""
 
@@ -6615,11 +6737,11 @@ msgstr ""
 msgid "starred"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:671
+#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:674
 msgid "Message signature validated"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:672
+#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:675
 msgid "Message signature incorrect"
 msgstr ""
 
@@ -6675,17 +6797,17 @@ msgstr ""
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:719
+#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:722
 #, php-format
 msgid "from %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:722
+#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:725
 #, php-format
 msgid "last edited: %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:723
+#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:726
 #, php-format
 msgid "Expires: %s"
 msgstr ""
@@ -6703,26 +6825,27 @@ msgid "Mark all seen"
 msgstr ""
 
 #: ../../Zotlabs/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
-msgid "[+] show all"
+#, php-format
+msgid "%s show all"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1215
+#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1226
 msgid "Bold"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1216
+#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1227
 msgid "Italic"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1217
+#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1228
 msgid "Underline"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1218
+#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1229
 msgid "Quote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1219
+#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1230
 msgid "Code"
 msgstr ""
 
@@ -6738,6 +6861,69 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
+#: ../../Zotlabs/Lib/PermissionDescription.php:31
+#: ../../include/acl_selectors.php:230
+msgid "Visible to your default audience"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:115
+#: ../../include/acl_selectors.php:266
+msgid "Only me"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:116
+msgid "Public"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:117
+msgid "Anybody in the $Projectname network"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:118
+#, php-format
+msgid "Any account on %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:119
+msgid "Any of my connections"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:120
+msgid "Only connections I specifically allow"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:121
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:122
+msgid "Any connections including those who haven't yet been approved"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:161
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:162
+msgid ""
+"This is your default setting for who can view your default channel profile"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:163
+msgid "This is your default setting for who can view your connections"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:164
+msgid ""
+"This is your default setting for who can view your file storage and photos"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:165
+msgid "This is your default setting for the audience of your webpages"
+msgstr ""
+
 #: ../../include/Import/import_diaspora.php:16
 msgid "No username found in import file."
 msgstr ""
@@ -6751,452 +6937,12 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
 #: ../../include/widgets.php:46 ../../include/widgets.php:429
+#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
 #: ../../include/contact_widgets.php:91
 msgid "Categories"
 msgstr ""
 
-#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
-msgid "Tags"
-msgstr ""
-
-#: ../../include/taxonomy.php:293
-msgid "Keywords"
-msgstr ""
-
-#: ../../include/taxonomy.php:314
-msgid "have"
-msgstr ""
-
-#: ../../include/taxonomy.php:314
-msgid "has"
-msgstr ""
-
-#: ../../include/taxonomy.php:315
-msgid "want"
-msgstr ""
-
-#: ../../include/taxonomy.php:315
-msgid "wants"
-msgstr ""
-
-#: ../../include/taxonomy.php:316
-msgid "likes"
-msgstr ""
-
-#: ../../include/taxonomy.php:317
-msgid "dislikes"
-msgstr ""
-
-#: ../../include/event.php:22 ../../include/event.php:69
-#: ../../include/bb2diaspora.php:485
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: ../../include/event.php:30 ../../include/event.php:73
-#: ../../include/bb2diaspora.php:491
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/event.php:40 ../../include/event.php:77
-#: ../../include/bb2diaspora.php:499
-msgid "Finishes:"
-msgstr ""
-
-#: ../../include/event.php:812
-msgid "This event has been added to your calendar."
-msgstr ""
-
-#: ../../include/event.php:1012
-msgid "Not specified"
-msgstr ""
-
-#: ../../include/event.php:1013
-msgid "Needs Action"
-msgstr ""
-
-#: ../../include/event.php:1014
-msgid "Completed"
-msgstr ""
-
-#: ../../include/event.php:1015
-msgid "In Process"
-msgstr ""
-
-#: ../../include/event.php:1016
-msgid "Cancelled"
-msgstr ""
-
-#: ../../include/import.php:29
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr ""
-
-#: ../../include/import.php:76
-msgid "Channel clone failed. Import failed."
-msgstr ""
-
-#: ../../include/items.php:892 ../../include/items.php:937
-msgid "(Unknown)"
-msgstr ""
-
-#: ../../include/items.php:1136
-msgid "Visible to anybody on the internet."
-msgstr ""
-
-#: ../../include/items.php:1138
-msgid "Visible to you only."
-msgstr ""
-
-#: ../../include/items.php:1140
-msgid "Visible to anybody in this network."
-msgstr ""
-
-#: ../../include/items.php:1142
-msgid "Visible to anybody authenticated."
-msgstr ""
-
-#: ../../include/items.php:1144
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr ""
-
-#: ../../include/items.php:1146
-msgid "Visible to all connections."
-msgstr ""
-
-#: ../../include/items.php:1148
-msgid "Visible to approved connections."
-msgstr ""
-
-#: ../../include/items.php:1150
-msgid "Visible to specific connections."
-msgstr ""
-
-#: ../../include/items.php:3909
-msgid "Privacy group is empty."
-msgstr ""
-
-#: ../../include/items.php:3916
-#, php-format
-msgid "Privacy group: %s"
-msgstr ""
-
-#: ../../include/items.php:3928
-msgid "Connection not found."
-msgstr ""
-
-#: ../../include/items.php:4277
-msgid "profile photo"
-msgstr ""
-
-#: ../../include/message.php:20
-msgid "No recipient provided."
-msgstr ""
-
-#: ../../include/message.php:25
-msgid "[no subject]"
-msgstr ""
-
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr ""
-
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
-msgstr ""
-
-#: ../../include/text.php:428
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:430
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:459
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:462
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:472
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:474
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:863
-msgid "No connections"
-msgstr ""
-
-#: ../../include/text.php:888
-#, php-format
-msgid "View all %s connections"
-msgstr ""
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-#: ../../include/conversation.php:243
-msgid "poked"
-msgstr ""
-
-#: ../../include/text.php:1039
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:1039
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:1040
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:1040
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:1041
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:1041
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:1042
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:1042
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:1043
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:1043
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:1055
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:1056
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:1057
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:1058
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:1059
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:1060
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:1061
-msgid "stupefied"
-msgstr ""
-
-#: ../../include/text.php:1062
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:1063
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:1064
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:1065
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:1066
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:1067
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:1068
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:1069
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:1070
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:1071
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:1072
-msgid "depressed"
-msgstr ""
-
-#: ../../include/text.php:1073
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:1074
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:1075
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:70
-msgid "Monday"
-msgstr ""
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:71
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:72
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:73
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:74
-msgid "Friday"
-msgstr ""
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:75
-msgid "Saturday"
-msgstr ""
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:69
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:45
-msgid "January"
-msgstr ""
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:46
-msgid "February"
-msgstr ""
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:47
-msgid "March"
-msgstr ""
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:48
-msgid "April"
-msgstr ""
-
-#: ../../include/text.php:1261
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:50
-msgid "June"
-msgstr ""
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:51
-msgid "July"
-msgstr ""
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:52
-msgid "August"
-msgstr ""
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:53
-msgid "September"
-msgstr ""
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:54
-msgid "October"
-msgstr ""
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:55
-msgid "November"
-msgstr ""
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:56
-msgid "December"
-msgstr ""
-
-#: ../../include/text.php:1338 ../../include/text.php:1342
-msgid "Unknown Attachment"
-msgstr ""
-
-#: ../../include/text.php:1344
-msgid "unknown"
-msgstr ""
-
-#: ../../include/text.php:1380
-msgid "remove category"
-msgstr ""
-
-#: ../../include/text.php:1457
-msgid "remove from file"
-msgstr ""
-
-#: ../../include/text.php:1753 ../../include/text.php:1824
-msgid "default"
-msgstr ""
-
-#: ../../include/text.php:1761
-msgid "Page layout"
-msgstr ""
-
-#: ../../include/text.php:1761
-msgid "You can create your own with the layouts tool"
-msgstr ""
-
-#: ../../include/text.php:1803
-msgid "Page content type"
-msgstr ""
-
-#: ../../include/text.php:1836
-msgid "Select an alternate language"
-msgstr ""
-
-#: ../../include/text.php:1953
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:2262
-msgid "Design Tools"
-msgstr ""
-
-#: ../../include/text.php:2268
-msgid "Pages"
-msgstr ""
-
 #: ../../include/widgets.php:103
 msgid "System"
 msgstr ""
@@ -7238,7 +6984,7 @@ msgstr ""
 msgid "Remove term"
 msgstr ""
 
-#: ../../include/widgets.php:281 ../../include/features.php:84
+#: ../../include/widgets.php:281 ../../include/features.php:85
 msgid "Saved Searches"
 msgstr ""
 
@@ -7246,8 +6992,8 @@ msgstr ""
 msgid "add"
 msgstr ""
 
-#: ../../include/widgets.php:310 ../../include/contact_widgets.php:53
-#: ../../include/features.php:98
+#: ../../include/widgets.php:310 ../../include/features.php:99
+#: ../../include/contact_widgets.php:53
 msgid "Saved Folders"
 msgstr ""
 
@@ -7296,167 +7042,468 @@ msgstr ""
 msgid "Connected apps"
 msgstr ""
 
-#: ../../include/widgets.php:622
+#: ../../include/widgets.php:631
 msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/widgets.php:651
+#: ../../include/widgets.php:660
 msgid "Private Mail Menu"
 msgstr ""
 
-#: ../../include/widgets.php:653
+#: ../../include/widgets.php:662
 msgid "Combined View"
 msgstr ""
 
-#: ../../include/widgets.php:658 ../../include/nav.php:196
+#: ../../include/widgets.php:667 ../../include/nav.php:198
 msgid "Inbox"
 msgstr ""
 
-#: ../../include/widgets.php:663 ../../include/nav.php:197
+#: ../../include/widgets.php:672 ../../include/nav.php:199
 msgid "Outbox"
 msgstr ""
 
-#: ../../include/widgets.php:668 ../../include/nav.php:198
+#: ../../include/widgets.php:677 ../../include/nav.php:200
 msgid "New Message"
 msgstr ""
 
-#: ../../include/widgets.php:685 ../../include/widgets.php:697
+#: ../../include/widgets.php:694 ../../include/widgets.php:706
 msgid "Conversations"
 msgstr ""
 
-#: ../../include/widgets.php:689
+#: ../../include/widgets.php:698
 msgid "Received Messages"
 msgstr ""
 
-#: ../../include/widgets.php:693
+#: ../../include/widgets.php:702
 msgid "Sent Messages"
 msgstr ""
 
-#: ../../include/widgets.php:707
+#: ../../include/widgets.php:716
 msgid "No messages."
 msgstr ""
 
-#: ../../include/widgets.php:725
+#: ../../include/widgets.php:734
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../include/widgets.php:751
-msgid "Events Menu"
-msgstr ""
-
-#: ../../include/widgets.php:752
-msgid "Day View"
-msgstr ""
-
-#: ../../include/widgets.php:753
-msgid "Week View"
-msgstr ""
-
-#: ../../include/widgets.php:754
-msgid "Month View"
-msgstr ""
-
-#: ../../include/widgets.php:766
+#: ../../include/widgets.php:760
 msgid "Events Tools"
 msgstr ""
 
-#: ../../include/widgets.php:767
+#: ../../include/widgets.php:761
 msgid "Export Calendar"
 msgstr ""
 
-#: ../../include/widgets.php:768
+#: ../../include/widgets.php:762
 msgid "Import Calendar"
 msgstr ""
 
-#: ../../include/widgets.php:842 ../../include/conversation.php:1662
-#: ../../include/conversation.php:1665
+#: ../../include/widgets.php:836 ../../include/conversation.php:1677
+#: ../../include/conversation.php:1680
 msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:846
+#: ../../include/widgets.php:840
 msgid "Overview"
 msgstr ""
 
-#: ../../include/widgets.php:853
+#: ../../include/widgets.php:847
 msgid "Chat Members"
 msgstr ""
 
-#: ../../include/widgets.php:876
+#: ../../include/widgets.php:869
+msgid "Wiki List"
+msgstr ""
+
+#: ../../include/widgets.php:907
+msgid "Wiki Pages"
+msgstr ""
+
+#: ../../include/widgets.php:942
 msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:899
+#: ../../include/widgets.php:965
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:1044 ../../include/widgets.php:1156
+#: ../../include/widgets.php:1111 ../../include/widgets.php:1223
 msgid "photo/image"
 msgstr ""
 
-#: ../../include/widgets.php:1099
+#: ../../include/widgets.php:1166
 msgid "Click to show more"
 msgstr ""
 
-#: ../../include/widgets.php:1250
+#: ../../include/widgets.php:1317
 msgid "Rating Tools"
 msgstr ""
 
-#: ../../include/widgets.php:1254 ../../include/widgets.php:1256
+#: ../../include/widgets.php:1321 ../../include/widgets.php:1323
 msgid "Rate Me"
 msgstr ""
 
-#: ../../include/widgets.php:1259
+#: ../../include/widgets.php:1326
 msgid "View Ratings"
 msgstr ""
 
-#: ../../include/widgets.php:1316
+#: ../../include/widgets.php:1405
 msgid "Forums"
 msgstr ""
 
-#: ../../include/widgets.php:1345
+#: ../../include/widgets.php:1434
 msgid "Tasks"
 msgstr ""
 
-#: ../../include/widgets.php:1354
+#: ../../include/widgets.php:1443
 msgid "Documentation"
 msgstr ""
 
-#: ../../include/widgets.php:1356
+#: ../../include/widgets.php:1445
 msgid "Project/Site Information"
 msgstr ""
 
-#: ../../include/widgets.php:1357
+#: ../../include/widgets.php:1446
 msgid "For Members"
 msgstr ""
 
-#: ../../include/widgets.php:1358
+#: ../../include/widgets.php:1447
 msgid "For Administrators"
 msgstr ""
 
-#: ../../include/widgets.php:1359
+#: ../../include/widgets.php:1448
 msgid "For Developers"
 msgstr ""
 
-#: ../../include/widgets.php:1383 ../../include/widgets.php:1421
+#: ../../include/widgets.php:1472 ../../include/widgets.php:1510
 msgid "Member registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/widgets.php:1389
+#: ../../include/widgets.php:1478
 msgid "Inspect queue"
 msgstr ""
 
-#: ../../include/widgets.php:1391
+#: ../../include/widgets.php:1480
 msgid "DB updates"
 msgstr ""
 
-#: ../../include/widgets.php:1416 ../../include/nav.php:216
+#: ../../include/widgets.php:1505 ../../include/nav.php:218
 msgid "Admin"
 msgstr ""
 
-#: ../../include/widgets.php:1417
+#: ../../include/widgets.php:1506
 msgid "Plugin Features"
 msgstr ""
 
+#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1703
+msgid "Logout"
+msgstr ""
+
+#: ../../include/nav.php:82 ../../include/nav.php:115
+msgid "End this session"
+msgstr ""
+
+#: ../../include/nav.php:85 ../../include/nav.php:146
+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 ../../include/channel.php:965
+msgid "Edit Profile"
+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 ../../include/conversation.php:1690
+msgid "Bookmarks"
+msgstr ""
+
+#: ../../include/nav.php:102
+msgid "Your bookmarks"
+msgstr ""
+
+#: ../../include/nav.php:106
+msgid "Your webpages"
+msgstr ""
+
+#: ../../include/nav.php:108
+msgid "Your wiki"
+msgstr ""
+
+#: ../../include/nav.php:112
+msgid "Sign in"
+msgstr ""
+
+#: ../../include/nav.php:129
+#, php-format
+msgid "%s - click to logout"
+msgstr ""
+
+#: ../../include/nav.php:132
+msgid "Remote authentication"
+msgstr ""
+
+#: ../../include/nav.php:132
+msgid "Click to authenticate to your home hub"
+msgstr ""
+
+#: ../../include/nav.php:146
+msgid "Home Page"
+msgstr ""
+
+#: ../../include/nav.php:149
+msgid "Create an account"
+msgstr ""
+
+#: ../../include/nav.php:161
+msgid "Help and documentation"
+msgstr ""
+
+#: ../../include/nav.php:165
+msgid "Applications, utilities, links, games"
+msgstr ""
+
+#: ../../include/nav.php:167
+msgid "Search site @name, #tag, ?docs, content"
+msgstr ""
+
+#: ../../include/nav.php:169
+msgid "Channel Directory"
+msgstr ""
+
+#: ../../include/nav.php:181
+msgid "Your grid"
+msgstr ""
+
+#: ../../include/nav.php:182
+msgid "Mark all grid notifications seen"
+msgstr ""
+
+#: ../../include/nav.php:184
+msgid "Channel home"
+msgstr ""
+
+#: ../../include/nav.php:185
+msgid "Mark all channel notifications seen"
+msgstr ""
+
+#: ../../include/nav.php:191
+msgid "Notices"
+msgstr ""
+
+#: ../../include/nav.php:191
+msgid "Notifications"
+msgstr ""
+
+#: ../../include/nav.php:192
+msgid "See all notifications"
+msgstr ""
+
+#: ../../include/nav.php:195
+msgid "Private mail"
+msgstr ""
+
+#: ../../include/nav.php:196
+msgid "See all private messages"
+msgstr ""
+
+#: ../../include/nav.php:197
+msgid "Mark all private messages seen"
+msgstr ""
+
+#: ../../include/nav.php:203
+msgid "Event Calendar"
+msgstr ""
+
+#: ../../include/nav.php:204
+msgid "See all events"
+msgstr ""
+
+#: ../../include/nav.php:205
+msgid "Mark all events seen"
+msgstr ""
+
+#: ../../include/nav.php:208
+msgid "Manage Your Channels"
+msgstr ""
+
+#: ../../include/nav.php:210
+msgid "Account/Channel Settings"
+msgstr ""
+
+#: ../../include/nav.php:218
+msgid "Site Setup and Configuration"
+msgstr ""
+
+#: ../../include/nav.php:249 ../../include/conversation.php:854
+msgid "Loading..."
+msgstr ""
+
+#: ../../include/nav.php:254
+msgid "@name, #tag, ?doc, content"
+msgstr ""
+
+#: ../../include/nav.php:255
+msgid "Please wait..."
+msgstr ""
+
+#: ../../include/network.php:704
+msgid "view full size"
+msgstr ""
+
+#: ../../include/network.php:1930 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr ""
+
+#: ../../include/network.php:1944
+msgid "No Subject"
+msgstr ""
+
+#: ../../include/network.php:2198 ../../include/network.php:2199
+msgid "Friendica"
+msgstr ""
+
+#: ../../include/network.php:2200
+msgid "OStatus"
+msgstr ""
+
+#: ../../include/network.php:2201
+msgid "GNU-Social"
+msgstr ""
+
+#: ../../include/network.php:2202
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/network.php:2204
+msgid "Diaspora"
+msgstr ""
+
+#: ../../include/network.php:2205
+msgid "Facebook"
+msgstr ""
+
+#: ../../include/network.php:2206
+msgid "Zot"
+msgstr ""
+
+#: ../../include/network.php:2207
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/network.php:2208
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/network.php:2209
+msgid "MySpace"
+msgstr ""
+
+#: ../../include/oembed.php:325
+msgid "Embedded content"
+msgstr ""
+
+#: ../../include/oembed.php:334
+msgid "Embedding disabled"
+msgstr ""
+
+#: ../../include/page_widgets.php:7
+msgid "New Page"
+msgstr ""
+
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr ""
+
+#: ../../include/photos.php:114
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr ""
+
+#: ../../include/photos.php:121
+msgid "Image file is empty."
+msgstr ""
+
+#: ../../include/photos.php:259
+msgid "Photo storage failed."
+msgstr ""
+
+#: ../../include/photos.php:299
+msgid "a new photo"
+msgstr ""
+
+#: ../../include/photos.php:303
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr ""
+
+#: ../../include/photos.php:506 ../../include/conversation.php:1650
+msgid "Photo Albums"
+msgstr ""
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr ""
+
+#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
+msgid "Tags"
+msgstr ""
+
+#: ../../include/taxonomy.php:293
+msgid "Keywords"
+msgstr ""
+
+#: ../../include/taxonomy.php:314
+msgid "have"
+msgstr ""
+
+#: ../../include/taxonomy.php:314
+msgid "has"
+msgstr ""
+
+#: ../../include/taxonomy.php:315
+msgid "want"
+msgstr ""
+
+#: ../../include/taxonomy.php:315
+msgid "wants"
+msgstr ""
+
+#: ../../include/taxonomy.php:316
+msgid "likes"
+msgstr ""
+
+#: ../../include/taxonomy.php:317
+msgid "dislikes"
+msgstr ""
+
 #: ../../include/follow.php:27
 msgid "Channel is blocked on this site."
 msgstr ""
@@ -7485,578 +7532,160 @@ msgstr ""
 msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
+#: ../../include/channel.php:32
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/api.php:1336
-msgid "Public Timeline"
+#: ../../include/channel.php:66
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:844
-#: ../../include/bbcode.php:847 ../../include/bbcode.php:852
-#: ../../include/bbcode.php:855 ../../include/bbcode.php:858
-#: ../../include/bbcode.php:861 ../../include/bbcode.php:866
-#: ../../include/bbcode.php:869 ../../include/bbcode.php:874
-#: ../../include/bbcode.php:877 ../../include/bbcode.php:880
-#: ../../include/bbcode.php:883
-msgid "Image/photo"
+#: ../../include/channel.php:69
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:894
-msgid "Encrypted content"
+#: ../../include/channel.php:180
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/bbcode.php:178
-#, php-format
-msgid "Install %s element: "
+#: ../../include/channel.php:192
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/bbcode.php:182
-#, php-format
+#: ../../include/channel.php:206
+msgid "Reserved nickname. Please choose another."
+msgstr ""
+
+#: ../../include/channel.php:211
 msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/bbcode.php:254
+#: ../../include/channel.php:287
+msgid "Unable to retrieve created identity"
+msgstr ""
+
+#: ../../include/channel.php:345
+msgid "Default Profile"
+msgstr ""
+
+#: ../../include/channel.php:815
+msgid "Requested channel is not available."
+msgstr ""
+
+#: ../../include/channel.php:962
+msgid "Create New Profile"
+msgstr ""
+
+#: ../../include/channel.php:982
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../include/channel.php:1055 ../../include/channel.php:1167
+msgid "Gender:"
+msgstr ""
+
+#: ../../include/channel.php:1056 ../../include/channel.php:1211
+msgid "Status:"
+msgstr ""
+
+#: ../../include/channel.php:1057 ../../include/channel.php:1222
+msgid "Homepage:"
+msgstr ""
+
+#: ../../include/channel.php:1058
+msgid "Online Now"
+msgstr ""
+
+#: ../../include/channel.php:1172
+msgid "Like this channel"
+msgstr ""
+
+#: ../../include/channel.php:1196
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/channel.php:1197
+msgid "j F"
+msgstr ""
+
+#: ../../include/channel.php:1204
+msgid "Birthday:"
+msgstr ""
+
+#: ../../include/channel.php:1217
 #, php-format
-msgid "%1$s wrote the following %2$s %3$s"
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/bbcode.php:331 ../../include/bbcode.php:339
-msgid "Click to open/close"
+#: ../../include/channel.php:1220
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/bbcode.php:339
-msgid "spoiler"
+#: ../../include/channel.php:1226
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/bbcode.php:585
-msgid "Different viewers will see this text differently"
+#: ../../include/channel.php:1228
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/bbcode.php:832
-msgid "$1 wrote:"
+#: ../../include/channel.php:1230
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
+#: ../../include/channel.php:1234
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
+#: ../../include/channel.php:1236
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
+#: ../../include/channel.php:1238
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
+#: ../../include/channel.php:1240
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/security.php:383
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
+#: ../../include/channel.php:1242
+msgid "My other channels:"
 msgstr ""
 
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1702
-msgid "Logout"
+#: ../../include/channel.php:1244
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
+#: ../../include/channel.php:1246
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
+#: ../../include/channel.php:1248
+msgid "Television:"
 msgstr ""
 
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
+#: ../../include/channel.php:1250
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/nav.php:86
-msgid "Your profile page"
+#: ../../include/channel.php:1252
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
+#: ../../include/channel.php:1254
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/nav.php:90 ../../include/channel.php:941
-msgid "Edit Profile"
+#: ../../include/channel.php:1256
+msgid "School/education:"
 msgstr ""
 
-#: ../../include/nav.php:90
-msgid "Edit your profile"
+#: ../../include/channel.php:1277
+msgid "Like this thing"
 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 ../../include/conversation.php:1675
-msgid "Bookmarks"
-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:247 ../../include/conversation.php:851
-msgid "Loading..."
-msgstr ""
-
-#: ../../include/nav.php:252
-msgid "@name, #tag, ?doc, content"
-msgstr ""
-
-#: ../../include/nav.php:253
-msgid "Please wait..."
-msgstr ""
-
-#: ../../include/connections.php:95
-msgid "New window"
-msgstr ""
-
-#: ../../include/connections.php:96
-msgid "Open the selected location in a different window or browser tab"
-msgstr ""
-
-#: ../../include/connections.php:214
-#, php-format
-msgid "User '%s' deleted"
-msgstr ""
-
-#: ../../include/contact_widgets.php:11
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
-msgstr ""
-
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
-msgstr ""
-
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
-msgstr ""
-
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr ""
-
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
-msgstr ""
-
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
-msgstr ""
-
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
-msgstr ""
-
-#: ../../include/contact_widgets.php:122
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:127
-msgid "show more"
-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:847
-msgid "remove"
-msgstr ""
-
-#: ../../include/conversation.php:852
-msgid "Delete Selected Items"
-msgstr ""
-
-#: ../../include/conversation.php:948
-msgid "View Source"
-msgstr ""
-
-#: ../../include/conversation.php:949
-msgid "Follow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:950
-msgid "Unfollow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:955
-msgid "Activity/Posts"
-msgstr ""
-
-#: ../../include/conversation.php:957
-msgid "Edit Connection"
-msgstr ""
-
-#: ../../include/conversation.php:958
-msgid "Message"
-msgstr ""
-
-#: ../../include/conversation.php:1075
-#, php-format
-msgid "%s likes this."
-msgstr ""
-
-#: ../../include/conversation.php:1075
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1079
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1081
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1087
-msgid "and"
-msgstr ""
-
-#: ../../include/conversation.php:1090
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1091
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: ../../include/conversation.php:1091
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1130
-msgid "Set your location"
-msgstr ""
-
-#: ../../include/conversation.php:1131
-msgid "Clear browser location"
-msgstr ""
-
-#: ../../include/conversation.php:1177
-msgid "Tag term:"
-msgstr ""
-
-#: ../../include/conversation.php:1178
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../include/conversation.php:1210
-msgid "Page link name"
-msgstr ""
-
-#: ../../include/conversation.php:1213
-msgid "Post as"
-msgstr ""
-
-#: ../../include/conversation.php:1223
-msgid "Toggle voting"
-msgstr ""
-
-#: ../../include/conversation.php:1231
-msgid "Categories (optional, comma-separated list)"
-msgstr ""
-
-#: ../../include/conversation.php:1254
-msgid "Set publish date"
-msgstr ""
-
-#: ../../include/conversation.php:1258
-msgid "OK"
-msgstr ""
-
-#: ../../include/conversation.php:1503
-msgid "Discover"
-msgstr ""
-
-#: ../../include/conversation.php:1506
-msgid "Imported public streams"
-msgstr ""
-
-#: ../../include/conversation.php:1511
-msgid "Commented Order"
-msgstr ""
-
-#: ../../include/conversation.php:1514
-msgid "Sort by Comment Date"
-msgstr ""
-
-#: ../../include/conversation.php:1518
-msgid "Posted Order"
-msgstr ""
-
-#: ../../include/conversation.php:1521
-msgid "Sort by Post Date"
-msgstr ""
-
-#: ../../include/conversation.php:1529
-msgid "Posts that mention or involve you"
-msgstr ""
-
-#: ../../include/conversation.php:1538
-msgid "Activity Stream - by date"
-msgstr ""
-
-#: ../../include/conversation.php:1544
-msgid "Starred"
-msgstr ""
-
-#: ../../include/conversation.php:1547
-msgid "Favourite Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1554
-msgid "Spam"
-msgstr ""
-
-#: ../../include/conversation.php:1557
-msgid "Posts flagged as SPAM"
-msgstr ""
-
-#: ../../include/conversation.php:1614
-msgid "Status Messages and Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1623
-msgid "About"
-msgstr ""
-
-#: ../../include/conversation.php:1626
-msgid "Profile Details"
-msgstr ""
-
-#: ../../include/conversation.php:1635 ../../include/photos.php:502
-msgid "Photo Albums"
-msgstr ""
-
-#: ../../include/conversation.php:1642
-msgid "Files and Storage"
-msgstr ""
-
-#: ../../include/conversation.php:1678
-msgid "Saved Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1688
-msgid "Manage Webpages"
-msgstr ""
-
-#: ../../include/conversation.php:1747
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1750
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1753
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1756
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1759
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1762
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
-
 #: ../../include/selectors.php:30
 msgid "Frequently"
 msgstr ""
@@ -8303,692 +7932,48 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:31
-#: ../../include/acl_selectors.php:232
-msgid "Visible to your default audience"
+#: ../../include/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:485
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:115
-#: ../../include/acl_selectors.php:268
-msgid "Only me"
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:491
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:116
-msgid "Public"
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:499
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:117
-msgid "Anybody in the $Projectname network"
+#: ../../include/event.php:812
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/PermissionDescription.php:118
+#: ../../include/event.php:1012
+msgid "Not specified"
+msgstr ""
+
+#: ../../include/event.php:1013
+msgid "Needs Action"
+msgstr ""
+
+#: ../../include/event.php:1014
+msgid "Completed"
+msgstr ""
+
+#: ../../include/event.php:1015
+msgid "In Process"
+msgstr ""
+
+#: ../../include/event.php:1016
+msgid "Cancelled"
+msgstr ""
+
+#: ../../include/bookmarks.php:35
 #, php-format
-msgid "Any account on %s"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:119
-msgid "Any of my connections"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:120
-msgid "Only connections I specifically allow"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:121
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:122
-msgid "Any connections including those who haven't yet been approved"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:161
-msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
-msgstr ""
-
-#: ../../include/PermissionDescription.php:162
-msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:163
-msgid "This is your default setting for who can view your connections"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:164
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:165
-msgid "This is your default setting for the audience of your webpages"
-msgstr ""
-
-#: ../../include/account.php:28
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../../include/account.php:30
-msgid "Your email domain is not among those allowed on this site"
-msgstr ""
-
-#: ../../include/account.php:36
-msgid "Your email address is already registered at this site."
-msgstr ""
-
-#: ../../include/account.php:68
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../include/account.php:72
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../include/account.php:122
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../include/account.php:189
-msgid "Failed to store account information."
-msgstr ""
-
-#: ../../include/account.php:249
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr ""
-
-#: ../../include/account.php:315
-#, php-format
-msgid "Registration request at %s"
-msgstr ""
-
-#: ../../include/account.php:317 ../../include/account.php:344
-#: ../../include/account.php:404 ../../include/network.php:1871
-msgid "Administrator"
-msgstr ""
-
-#: ../../include/account.php:339
-msgid "your registration password"
-msgstr ""
-
-#: ../../include/account.php:342 ../../include/account.php:402
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../include/account.php:414
-msgid "Account approved."
-msgstr ""
-
-#: ../../include/account.php:454
-#, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../include/account.php:506
-msgid "Account verified. Please login."
-msgstr ""
-
-#: ../../include/account.php:723 ../../include/account.php:725
-msgid "Click here to upgrade."
-msgstr ""
-
-#: ../../include/account.php:731
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr ""
-
-#: ../../include/account.php:736
-msgid "This action is not available under your subscription plan."
-msgstr ""
-
-#: ../../include/attach.php:247 ../../include/attach.php:333
-msgid "Item was not found."
-msgstr ""
-
-#: ../../include/attach.php:497
-msgid "No source file."
-msgstr ""
-
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
-msgstr ""
-
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
-msgstr ""
-
-#: ../../include/attach.php:672
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr ""
-
-#: ../../include/attach.php:686
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr ""
-
-#: ../../include/attach.php:842
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr ""
-
-#: ../../include/attach.php:855
-msgid "Stored file could not be verified. Upload failed."
-msgstr ""
-
-#: ../../include/attach.php:909 ../../include/attach.php:925
-msgid "Path not available."
-msgstr ""
-
-#: ../../include/attach.php:971 ../../include/attach.php:1123
-msgid "Empty pathname"
-msgstr ""
-
-#: ../../include/attach.php:997
-msgid "duplicate filename or path"
-msgstr ""
-
-#: ../../include/attach.php:1019
-msgid "Path not found."
-msgstr ""
-
-#: ../../include/attach.php:1077
-msgid "mkdir failed."
-msgstr ""
-
-#: ../../include/attach.php:1081
-msgid "database storage failed."
-msgstr ""
-
-#: ../../include/attach.php:1129
-msgid "Empty path"
-msgstr ""
-
-#: ../../include/channel.php:32
-msgid "Unable to obtain identity information from database"
-msgstr ""
-
-#: ../../include/channel.php:66
-msgid "Empty name"
-msgstr ""
-
-#: ../../include/channel.php:69
-msgid "Name too long"
-msgstr ""
-
-#: ../../include/channel.php:180
-msgid "No account identifier"
-msgstr ""
-
-#: ../../include/channel.php:192
-msgid "Nickname is required."
-msgstr ""
-
-#: ../../include/channel.php:206
-msgid "Reserved nickname. Please choose another."
-msgstr ""
-
-#: ../../include/channel.php:211
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr ""
-
-#: ../../include/channel.php:287
-msgid "Unable to retrieve created identity"
-msgstr ""
-
-#: ../../include/channel.php:345
-msgid "Default Profile"
-msgstr ""
-
-#: ../../include/channel.php:791
-msgid "Requested channel is not available."
-msgstr ""
-
-#: ../../include/channel.php:938
-msgid "Create New Profile"
-msgstr ""
-
-#: ../../include/channel.php:958
-msgid "Visible to everybody"
-msgstr ""
-
-#: ../../include/channel.php:1031 ../../include/channel.php:1142
-msgid "Gender:"
-msgstr ""
-
-#: ../../include/channel.php:1032 ../../include/channel.php:1186
-msgid "Status:"
-msgstr ""
-
-#: ../../include/channel.php:1033 ../../include/channel.php:1197
-msgid "Homepage:"
-msgstr ""
-
-#: ../../include/channel.php:1034
-msgid "Online Now"
-msgstr ""
-
-#: ../../include/channel.php:1147
-msgid "Like this channel"
-msgstr ""
-
-#: ../../include/channel.php:1171
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/channel.php:1172
-msgid "j F"
-msgstr ""
-
-#: ../../include/channel.php:1179
-msgid "Birthday:"
-msgstr ""
-
-#: ../../include/channel.php:1192
-#, php-format
-msgid "for %1$d %2$s"
-msgstr ""
-
-#: ../../include/channel.php:1195
-msgid "Sexual Preference:"
-msgstr ""
-
-#: ../../include/channel.php:1201
-msgid "Tags:"
-msgstr ""
-
-#: ../../include/channel.php:1203
-msgid "Political Views:"
-msgstr ""
-
-#: ../../include/channel.php:1205
-msgid "Religion:"
-msgstr ""
-
-#: ../../include/channel.php:1209
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: ../../include/channel.php:1211
-msgid "Likes:"
-msgstr ""
-
-#: ../../include/channel.php:1213
-msgid "Dislikes:"
-msgstr ""
-
-#: ../../include/channel.php:1215
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: ../../include/channel.php:1217
-msgid "My other channels:"
-msgstr ""
-
-#: ../../include/channel.php:1219
-msgid "Musical interests:"
-msgstr ""
-
-#: ../../include/channel.php:1221
-msgid "Books, literature:"
-msgstr ""
-
-#: ../../include/channel.php:1223
-msgid "Television:"
-msgstr ""
-
-#: ../../include/channel.php:1225
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: ../../include/channel.php:1227
-msgid "Love/Romance:"
-msgstr ""
-
-#: ../../include/channel.php:1229
-msgid "Work/employment:"
-msgstr ""
-
-#: ../../include/channel.php:1231
-msgid "School/education:"
-msgstr ""
-
-#: ../../include/channel.php:1251
-msgid "Like this thing"
-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 "Emoji Reactions"
-msgstr ""
-
-#: ../../include/features.php:97
-msgid "Add emoji reaction ability to posts"
-msgstr ""
-
-#: ../../include/features.php:98
-msgid "Ability to file posts under folders"
-msgstr ""
-
-#: ../../include/features.php:99
-msgid "Dislike Posts"
-msgstr ""
-
-#: ../../include/features.php:99
-msgid "Ability to dislike posts/comments"
-msgstr ""
-
-#: ../../include/features.php:100
-msgid "Star Posts"
-msgstr ""
-
-#: ../../include/features.php:100
-msgid "Ability to mark special posts with a star indicator"
-msgstr ""
-
-#: ../../include/features.php:101
-msgid "Tag Cloud"
-msgstr ""
-
-#: ../../include/features.php:101
-msgid "Provide a personal tag cloud on your channel page"
-msgstr ""
-
-#: ../../include/oembed.php:324
-msgid "Embedded content"
-msgstr ""
-
-#: ../../include/oembed.php:333
-msgid "Embedding disabled"
-msgstr ""
-
-#: ../../include/acl_selectors.php:271
-msgid "Who can see this?"
-msgstr ""
-
-#: ../../include/acl_selectors.php:272
-msgid "Custom selection"
-msgstr ""
-
-#: ../../include/acl_selectors.php:273
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
-"the scope of \"Show\"."
-msgstr ""
-
-#: ../../include/acl_selectors.php:274
-msgid "Show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:275
-msgid "Don't show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:281
-msgid "Other networks and post services"
-msgstr ""
-
-#: ../../include/acl_selectors.php:311
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These "
-"permissions set who is allowed to view the post."
-msgstr ""
-
-#: ../../include/auth.php:105
-msgid "Logged out."
-msgstr ""
-
-#: ../../include/auth.php:212
-msgid "Failed authentication"
+msgid "%1$s's bookmarks"
 msgstr ""
 
 #: ../../include/datetime.php:135
@@ -9003,7 +7988,7 @@ msgstr ""
 msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:272 ../../boot.php:2470
+#: ../../include/datetime.php:272 ../../boot.php:2486
 msgid "never"
 msgstr ""
 
@@ -9076,6 +8061,619 @@ msgstr ""
 msgid "Happy Birthday %1$s"
 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:1013
+#: ../../include/text.php:1018
+msgid "poked"
+msgstr ""
+
+#: ../../include/conversation.php:694
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: ../../include/conversation.php:713
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/conversation.php:714
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:741
+msgid "View in context"
+msgstr ""
+
+#: ../../include/conversation.php:850
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
+msgstr ""
+
+#: ../../include/conversation.php:951
+msgid "View Source"
+msgstr ""
+
+#: ../../include/conversation.php:952
+msgid "Follow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:953
+msgid "Unfollow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:958
+msgid "Activity/Posts"
+msgstr ""
+
+#: ../../include/conversation.php:960
+msgid "Edit Connection"
+msgstr ""
+
+#: ../../include/conversation.php:961
+msgid "Message"
+msgstr ""
+
+#: ../../include/conversation.php:1078
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../include/conversation.php:1078
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1082
+#, 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:1084
+#, 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:1090
+msgid "and"
+msgstr ""
+
+#: ../../include/conversation.php:1093
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1094
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:1094
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1133
+msgid "Set your location"
+msgstr ""
+
+#: ../../include/conversation.php:1134
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../include/conversation.php:1182
+msgid "Tag term:"
+msgstr ""
+
+#: ../../include/conversation.php:1183
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:1221
+msgid "Page link name"
+msgstr ""
+
+#: ../../include/conversation.php:1224
+msgid "Post as"
+msgstr ""
+
+#: ../../include/conversation.php:1238
+msgid "Toggle voting"
+msgstr ""
+
+#: ../../include/conversation.php:1246
+msgid "Categories (optional, comma-separated list)"
+msgstr ""
+
+#: ../../include/conversation.php:1269
+msgid "Set publish date"
+msgstr ""
+
+#: ../../include/conversation.php:1518
+msgid "Discover"
+msgstr ""
+
+#: ../../include/conversation.php:1521
+msgid "Imported public streams"
+msgstr ""
+
+#: ../../include/conversation.php:1526
+msgid "Commented Order"
+msgstr ""
+
+#: ../../include/conversation.php:1529
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../include/conversation.php:1533
+msgid "Posted Order"
+msgstr ""
+
+#: ../../include/conversation.php:1536
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../include/conversation.php:1544
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../include/conversation.php:1553
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../include/conversation.php:1559
+msgid "Starred"
+msgstr ""
+
+#: ../../include/conversation.php:1562
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1569
+msgid "Spam"
+msgstr ""
+
+#: ../../include/conversation.php:1572
+msgid "Posts flagged as SPAM"
+msgstr ""
+
+#: ../../include/conversation.php:1629
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1638
+msgid "About"
+msgstr ""
+
+#: ../../include/conversation.php:1641
+msgid "Profile Details"
+msgstr ""
+
+#: ../../include/conversation.php:1657
+msgid "Files and Storage"
+msgstr ""
+
+#: ../../include/conversation.php:1693
+msgid "Saved Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1703
+msgid "Manage Webpages"
+msgstr ""
+
+#: ../../include/conversation.php:1768
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1771
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1774
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1777
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1780
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1783
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/items.php:898 ../../include/items.php:943
+msgid "(Unknown)"
+msgstr ""
+
+#: ../../include/items.php:1142
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1144
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1146
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1148
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1150
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr ""
+
+#: ../../include/items.php:1152
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1154
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1156
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:3919
+msgid "Privacy group is empty."
+msgstr ""
+
+#: ../../include/items.php:3926
+#, php-format
+msgid "Privacy group: %s"
+msgstr ""
+
+#: ../../include/items.php:3938
+msgid "Connection not found."
+msgstr ""
+
+#: ../../include/items.php:4291
+msgid "profile photo"
+msgstr ""
+
+#: ../../include/connections.php:95
+msgid "New window"
+msgstr ""
+
+#: ../../include/connections.php:96
+msgid "Open the selected location in a different window or browser tab"
+msgstr ""
+
+#: ../../include/connections.php:214
+#, php-format
+msgid "User '%s' deleted"
+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 "Provide a wiki for your channel"
+msgstr ""
+
+#: ../../include/features.php:56
+msgid "Hide Rating"
+msgstr ""
+
+#: ../../include/features.php:56
+msgid ""
+"Hide the rating buttons on your channel and profile pages. Note: People can "
+"still rate you somewhere else."
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Private Notes"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Enables a tool to store notes and reminders (note: not encrypted)"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Navigation Channel Select"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Change channels directly from within the navigation dropdown menu"
+msgstr ""
+
+#: ../../include/features.php:59
+msgid "Photo Location"
+msgstr ""
+
+#: ../../include/features.php:59
+msgid "If location data is available on uploaded photos, link this to a map."
+msgstr ""
+
+#: ../../include/features.php:60
+msgid "Access Controlled Chatrooms"
+msgstr ""
+
+#: ../../include/features.php:60
+msgid "Provide chatrooms and chat services with access control."
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Smart Birthdays"
+msgstr ""
+
+#: ../../include/features.php:61
+msgid ""
+"Make birthday events timezone aware in case your friends are scattered "
+"across the planet."
+msgstr ""
+
+#: ../../include/features.php:62
+msgid "Expert Mode"
+msgstr ""
+
+#: ../../include/features.php:62
+msgid "Enable Expert Mode to provide advanced configuration options"
+msgstr ""
+
+#: ../../include/features.php:63
+msgid "Premium Channel"
+msgstr ""
+
+#: ../../include/features.php:63
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
+msgstr ""
+
+#: ../../include/features.php:68
+msgid "Post Composition Features"
+msgstr ""
+
+#: ../../include/features.php:71
+msgid "Large Photos"
+msgstr ""
+
+#: ../../include/features.php:71
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
+msgstr ""
+
+#: ../../include/features.php:72
+msgid "Automatically import channel content from other channels or feeds"
+msgstr ""
+
+#: ../../include/features.php:73
+msgid "Even More Encryption"
+msgstr ""
+
+#: ../../include/features.php:73
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
+msgstr ""
+
+#: ../../include/features.php:74
+msgid "Enable Voting Tools"
+msgstr ""
+
+#: ../../include/features.php:74
+msgid "Provide a class of post which others can vote on"
+msgstr ""
+
+#: ../../include/features.php:75
+msgid "Delayed Posting"
+msgstr ""
+
+#: ../../include/features.php:75
+msgid "Allow posts to be published at a later date"
+msgstr ""
+
+#: ../../include/features.php:76
+msgid "Suppress Duplicate Posts/Comments"
+msgstr ""
+
+#: ../../include/features.php:76
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
+msgstr ""
+
+#: ../../include/features.php:82
+msgid "Network and Stream Filtering"
+msgstr ""
+
+#: ../../include/features.php:83
+msgid "Search by Date"
+msgstr ""
+
+#: ../../include/features.php:83
+msgid "Ability to select posts by date ranges"
+msgstr ""
+
+#: ../../include/features.php:84 ../../include/group.php:311
+msgid "Privacy Groups"
+msgstr ""
+
+#: ../../include/features.php:84
+msgid "Enable management and selection of privacy groups"
+msgstr ""
+
+#: ../../include/features.php:85
+msgid "Save search terms for re-use"
+msgstr ""
+
+#: ../../include/features.php:86
+msgid "Network Personal Tab"
+msgstr ""
+
+#: ../../include/features.php:86
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr ""
+
+#: ../../include/features.php:87
+msgid "Network New Tab"
+msgstr ""
+
+#: ../../include/features.php:87
+msgid "Enable tab to display all new Network activity"
+msgstr ""
+
+#: ../../include/features.php:88
+msgid "Affinity Tool"
+msgstr ""
+
+#: ../../include/features.php:88
+msgid "Filter stream activity by depth of relationships"
+msgstr ""
+
+#: ../../include/features.php:89
+msgid "Connection Filtering"
+msgstr ""
+
+#: ../../include/features.php:89
+msgid "Filter incoming posts from connections based on keywords/content"
+msgstr ""
+
+#: ../../include/features.php:90
+msgid "Show channel suggestions"
+msgstr ""
+
+#: ../../include/features.php:95
+msgid "Post/Comment Tools"
+msgstr ""
+
+#: ../../include/features.php:96
+msgid "Community Tagging"
+msgstr ""
+
+#: ../../include/features.php:96
+msgid "Ability to tag existing posts"
+msgstr ""
+
+#: ../../include/features.php:97
+msgid "Post Categories"
+msgstr ""
+
+#: ../../include/features.php:97
+msgid "Add categories to your posts"
+msgstr ""
+
+#: ../../include/features.php:98
+msgid "Emoji Reactions"
+msgstr ""
+
+#: ../../include/features.php:98
+msgid "Add emoji reaction ability to posts"
+msgstr ""
+
+#: ../../include/features.php:99
+msgid "Ability to file posts under folders"
+msgstr ""
+
+#: ../../include/features.php:100
+msgid "Dislike Posts"
+msgstr ""
+
+#: ../../include/features.php:100
+msgid "Ability to dislike posts/comments"
+msgstr ""
+
+#: ../../include/features.php:101
+msgid "Star Posts"
+msgstr ""
+
+#: ../../include/features.php:101
+msgid "Ability to mark special posts with a star indicator"
+msgstr ""
+
+#: ../../include/features.php:102
+msgid "Tag Cloud"
+msgstr ""
+
+#: ../../include/features.php:102
+msgid "Provide a personal tag cloud on your channel page"
+msgstr ""
+
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -9103,350 +8701,6 @@ msgstr ""
 msgid "Channels not in any privacy group"
 msgstr ""
 
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
-msgstr ""
-
-#: ../../include/js_strings.php:8
-msgid "[-] show less"
-msgstr ""
-
-#: ../../include/js_strings.php:9
-msgid "[+] expand"
-msgstr ""
-
-#: ../../include/js_strings.php:10
-msgid "[-] collapse"
-msgstr ""
-
-#: ../../include/js_strings.php:11
-msgid "Password too short"
-msgstr ""
-
-#: ../../include/js_strings.php:12
-msgid "Passwords do not match"
-msgstr ""
-
-#: ../../include/js_strings.php:13
-msgid "everybody"
-msgstr ""
-
-#: ../../include/js_strings.php:14
-msgid "Secret Passphrase"
-msgstr ""
-
-#: ../../include/js_strings.php:15
-msgid "Passphrase hint"
-msgstr ""
-
-#: ../../include/js_strings.php:16
-msgid "Notice: Permissions have changed but have not yet been submitted."
-msgstr ""
-
-#: ../../include/js_strings.php:17
-msgid "close all"
-msgstr ""
-
-#: ../../include/js_strings.php:18
-msgid "Nothing new here"
-msgstr ""
-
-#: ../../include/js_strings.php:19
-msgid "Rate This Channel (this is public)"
-msgstr ""
-
-#: ../../include/js_strings.php:21
-msgid "Describe (optional)"
-msgstr ""
-
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
-msgstr ""
-
-#: ../../include/js_strings.php:24
-msgid "Unsaved changes. Are you sure you wish to leave this page?"
-msgstr ""
-
-#: ../../include/js_strings.php:27
-msgid "timeago.prefixAgo"
-msgstr ""
-
-#: ../../include/js_strings.php:28
-msgid "timeago.prefixFromNow"
-msgstr ""
-
-#: ../../include/js_strings.php:29
-msgid "ago"
-msgstr ""
-
-#: ../../include/js_strings.php:30
-msgid "from now"
-msgstr ""
-
-#: ../../include/js_strings.php:31
-msgid "less than a minute"
-msgstr ""
-
-#: ../../include/js_strings.php:32
-msgid "about a minute"
-msgstr ""
-
-#: ../../include/js_strings.php:33
-#, php-format
-msgid "%d minutes"
-msgstr ""
-
-#: ../../include/js_strings.php:34
-msgid "about an hour"
-msgstr ""
-
-#: ../../include/js_strings.php:35
-#, php-format
-msgid "about %d hours"
-msgstr ""
-
-#: ../../include/js_strings.php:36
-msgid "a day"
-msgstr ""
-
-#: ../../include/js_strings.php:37
-#, php-format
-msgid "%d days"
-msgstr ""
-
-#: ../../include/js_strings.php:38
-msgid "about a month"
-msgstr ""
-
-#: ../../include/js_strings.php:39
-#, php-format
-msgid "%d months"
-msgstr ""
-
-#: ../../include/js_strings.php:40
-msgid "about a year"
-msgstr ""
-
-#: ../../include/js_strings.php:41
-#, php-format
-msgid "%d years"
-msgstr ""
-
-#: ../../include/js_strings.php:42
-msgid " "
-msgstr ""
-
-#: ../../include/js_strings.php:43
-msgid "timeago.numbers"
-msgstr ""
-
-#: ../../include/js_strings.php:49
-msgctxt "long"
-msgid "May"
-msgstr ""
-
-#: ../../include/js_strings.php:57
-msgid "Jan"
-msgstr ""
-
-#: ../../include/js_strings.php:58
-msgid "Feb"
-msgstr ""
-
-#: ../../include/js_strings.php:59
-msgid "Mar"
-msgstr ""
-
-#: ../../include/js_strings.php:60
-msgid "Apr"
-msgstr ""
-
-#: ../../include/js_strings.php:61
-msgctxt "short"
-msgid "May"
-msgstr ""
-
-#: ../../include/js_strings.php:62
-msgid "Jun"
-msgstr ""
-
-#: ../../include/js_strings.php:63
-msgid "Jul"
-msgstr ""
-
-#: ../../include/js_strings.php:64
-msgid "Aug"
-msgstr ""
-
-#: ../../include/js_strings.php:65
-msgid "Sep"
-msgstr ""
-
-#: ../../include/js_strings.php:66
-msgid "Oct"
-msgstr ""
-
-#: ../../include/js_strings.php:67
-msgid "Nov"
-msgstr ""
-
-#: ../../include/js_strings.php:68
-msgid "Dec"
-msgstr ""
-
-#: ../../include/js_strings.php:76
-msgid "Sun"
-msgstr ""
-
-#: ../../include/js_strings.php:77
-msgid "Mon"
-msgstr ""
-
-#: ../../include/js_strings.php:78
-msgid "Tue"
-msgstr ""
-
-#: ../../include/js_strings.php:79
-msgid "Wed"
-msgstr ""
-
-#: ../../include/js_strings.php:80
-msgid "Thu"
-msgstr ""
-
-#: ../../include/js_strings.php:81
-msgid "Fri"
-msgstr ""
-
-#: ../../include/js_strings.php:82
-msgid "Sat"
-msgstr ""
-
-#: ../../include/js_strings.php:83
-msgctxt "calendar"
-msgid "today"
-msgstr ""
-
-#: ../../include/js_strings.php:84
-msgctxt "calendar"
-msgid "month"
-msgstr ""
-
-#: ../../include/js_strings.php:85
-msgctxt "calendar"
-msgid "week"
-msgstr ""
-
-#: ../../include/js_strings.php:86
-msgctxt "calendar"
-msgid "day"
-msgstr ""
-
-#: ../../include/js_strings.php:87
-msgctxt "calendar"
-msgid "All day"
-msgstr ""
-
-#: ../../include/network.php:657
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1885
-msgid "No Subject"
-msgstr ""
-
-#: ../../include/network.php:2146 ../../include/network.php:2147
-msgid "Friendica"
-msgstr ""
-
-#: ../../include/network.php:2148
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/network.php:2149
-msgid "GNU-Social"
-msgstr ""
-
-#: ../../include/network.php:2150
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/network.php:2152
-msgid "Diaspora"
-msgstr ""
-
-#: ../../include/network.php:2153
-msgid "Facebook"
-msgstr ""
-
-#: ../../include/network.php:2154
-msgid "Zot"
-msgstr ""
-
-#: ../../include/network.php:2155
-msgid "LinkedIn"
-msgstr ""
-
-#: ../../include/network.php:2156
-msgid "XMPP/IM"
-msgstr ""
-
-#: ../../include/network.php:2157
-msgid "MySpace"
-msgstr ""
-
-#: ../../include/photos.php:110
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr ""
-
-#: ../../include/photos.php:117
-msgid "Image file is empty."
-msgstr ""
-
-#: ../../include/photos.php:255
-msgid "Photo storage failed."
-msgstr ""
-
-#: ../../include/photos.php:295
-msgid "a new photo"
-msgstr ""
-
-#: ../../include/photos.php:299
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr ""
-
-#: ../../include/photos.php:506
-msgid "Upload New Photos"
-msgstr ""
-
-#: ../../include/zot.php:699
-msgid "Invalid data packet"
-msgstr ""
-
-#: ../../include/zot.php:715
-msgid "Unable to verify channel signature"
-msgstr ""
-
-#: ../../include/zot.php:2363
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr ""
-
-#: ../../include/zot.php:3712
-msgid "invalid target signature"
-msgstr ""
-
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr ""
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr ""
-
 #: ../../include/permissions.php:26
 msgid "Can view my normal stream and posts"
 msgstr ""
@@ -9587,6 +8841,204 @@ msgstr ""
 msgid "Custom/Expert Mode"
 msgstr ""
 
+#: ../../include/account.php:28
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../../include/account.php:30
+msgid "Your email domain is not among those allowed on this site"
+msgstr ""
+
+#: ../../include/account.php:36
+msgid "Your email address is already registered at this site."
+msgstr ""
+
+#: ../../include/account.php:68
+msgid "An invitation is required."
+msgstr ""
+
+#: ../../include/account.php:72
+msgid "Invitation could not be verified."
+msgstr ""
+
+#: ../../include/account.php:122
+msgid "Please enter the required information."
+msgstr ""
+
+#: ../../include/account.php:189
+msgid "Failed to store account information."
+msgstr ""
+
+#: ../../include/account.php:249
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr ""
+
+#: ../../include/account.php:315
+#, php-format
+msgid "Registration request at %s"
+msgstr ""
+
+#: ../../include/account.php:339
+msgid "your registration password"
+msgstr ""
+
+#: ../../include/account.php:342 ../../include/account.php:402
+#, php-format
+msgid "Registration details for %s"
+msgstr ""
+
+#: ../../include/account.php:414
+msgid "Account approved."
+msgstr ""
+
+#: ../../include/account.php:454
+#, php-format
+msgid "Registration revoked for %s"
+msgstr ""
+
+#: ../../include/account.php:739 ../../include/account.php:741
+msgid "Click here to upgrade."
+msgstr ""
+
+#: ../../include/account.php:747
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr ""
+
+#: ../../include/account.php:752
+msgid "This action is not available under your subscription plan."
+msgstr ""
+
+#: ../../include/api.php:1326
+msgid "Public Timeline"
+msgstr ""
+
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
+msgstr ""
+
+#: ../../include/attach.php:499
+msgid "No source file."
+msgstr ""
+
+#: ../../include/attach.php:521
+msgid "Cannot locate file to replace"
+msgstr ""
+
+#: ../../include/attach.php:539
+msgid "Cannot locate file to revise/update"
+msgstr ""
+
+#: ../../include/attach.php:674
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr ""
+
+#: ../../include/attach.php:688
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr ""
+
+#: ../../include/attach.php:846
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr ""
+
+#: ../../include/attach.php:859
+msgid "Stored file could not be verified. Upload failed."
+msgstr ""
+
+#: ../../include/attach.php:915 ../../include/attach.php:931
+msgid "Path not available."
+msgstr ""
+
+#: ../../include/attach.php:977 ../../include/attach.php:1129
+msgid "Empty pathname"
+msgstr ""
+
+#: ../../include/attach.php:1003
+msgid "duplicate filename or path"
+msgstr ""
+
+#: ../../include/attach.php:1025
+msgid "Path not found."
+msgstr ""
+
+#: ../../include/attach.php:1083
+msgid "mkdir failed."
+msgstr ""
+
+#: ../../include/attach.php:1087
+msgid "database storage failed."
+msgstr ""
+
+#: ../../include/attach.php:1135
+msgid "Empty path"
+msgstr ""
+
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:878
+#: ../../include/bbcode.php:881 ../../include/bbcode.php:886
+#: ../../include/bbcode.php:889 ../../include/bbcode.php:892
+#: ../../include/bbcode.php:895 ../../include/bbcode.php:900
+#: ../../include/bbcode.php:903 ../../include/bbcode.php:908
+#: ../../include/bbcode.php:911 ../../include/bbcode.php:914
+#: ../../include/bbcode.php:917
+msgid "Image/photo"
+msgstr ""
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:928
+msgid "Encrypted content"
+msgstr ""
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr ""
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr ""
+
+#: ../../include/bbcode.php:261
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr ""
+
+#: ../../include/bbcode.php:338 ../../include/bbcode.php:346
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/bbcode.php:346
+msgid "spoiler"
+msgstr ""
+
+#: ../../include/bbcode.php:619
+msgid "Different viewers will see this text differently"
+msgstr ""
+
+#: ../../include/bbcode.php:866
+msgid "$1 wrote:"
+msgstr ""
+
+#: ../../include/import.php:29
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr ""
+
+#: ../../include/import.php:76
+msgid "Channel clone failed. Import failed."
+msgstr ""
+
+#: ../../include/auth.php:116
+msgid "Logged out."
+msgstr ""
+
+#: ../../include/auth.php:237
+msgid "Failed authentication"
+msgstr ""
+
 #: ../../include/activities.php:41
 msgid " and "
 msgstr ""
@@ -9610,6 +9062,23 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
+#: ../../include/zot.php:709
+msgid "Invalid data packet"
+msgstr ""
+
+#: ../../include/zot.php:725
+msgid "Unable to verify channel signature"
+msgstr ""
+
+#: ../../include/zot.php:2373
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr ""
+
+#: ../../include/zot.php:3723
+msgid "invalid target signature"
+msgstr ""
+
 #: ../../include/bb2diaspora.php:398
 msgid "Attachments:"
 msgstr ""
@@ -9618,6 +9087,659 @@ msgstr ""
 msgid "$Projectname event notification:"
 msgstr ""
 
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
+msgstr ""
+
+#: ../../include/js_strings.php:8
+#, php-format
+msgid "%s show less"
+msgstr ""
+
+#: ../../include/js_strings.php:9
+#, php-format
+msgid "%s expand"
+msgstr ""
+
+#: ../../include/js_strings.php:10
+#, php-format
+msgid "%s collapse"
+msgstr ""
+
+#: ../../include/js_strings.php:11
+msgid "Password too short"
+msgstr ""
+
+#: ../../include/js_strings.php:12
+msgid "Passwords do not match"
+msgstr ""
+
+#: ../../include/js_strings.php:13
+msgid "everybody"
+msgstr ""
+
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
+msgstr ""
+
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
+msgstr ""
+
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
+msgstr ""
+
+#: ../../include/js_strings.php:17
+msgid "close all"
+msgstr ""
+
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
+msgstr ""
+
+#: ../../include/js_strings.php:19
+msgid "Rate This Channel (this is public)"
+msgstr ""
+
+#: ../../include/js_strings.php:21
+msgid "Describe (optional)"
+msgstr ""
+
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
+msgstr ""
+
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
+msgstr ""
+
+#: ../../include/js_strings.php:27
+msgid "timeago.prefixAgo"
+msgstr ""
+
+#: ../../include/js_strings.php:28
+msgid "timeago.prefixFromNow"
+msgstr ""
+
+#: ../../include/js_strings.php:29
+msgid "ago"
+msgstr ""
+
+#: ../../include/js_strings.php:30
+msgid "from now"
+msgstr ""
+
+#: ../../include/js_strings.php:31
+msgid "less than a minute"
+msgstr ""
+
+#: ../../include/js_strings.php:32
+msgid "about a minute"
+msgstr ""
+
+#: ../../include/js_strings.php:33
+#, php-format
+msgid "%d minutes"
+msgstr ""
+
+#: ../../include/js_strings.php:34
+msgid "about an hour"
+msgstr ""
+
+#: ../../include/js_strings.php:35
+#, php-format
+msgid "about %d hours"
+msgstr ""
+
+#: ../../include/js_strings.php:36
+msgid "a day"
+msgstr ""
+
+#: ../../include/js_strings.php:37
+#, php-format
+msgid "%d days"
+msgstr ""
+
+#: ../../include/js_strings.php:38
+msgid "about a month"
+msgstr ""
+
+#: ../../include/js_strings.php:39
+#, php-format
+msgid "%d months"
+msgstr ""
+
+#: ../../include/js_strings.php:40
+msgid "about a year"
+msgstr ""
+
+#: ../../include/js_strings.php:41
+#, php-format
+msgid "%d years"
+msgstr ""
+
+#: ../../include/js_strings.php:42
+msgid " "
+msgstr ""
+
+#: ../../include/js_strings.php:43
+msgid "timeago.numbers"
+msgstr ""
+
+#: ../../include/js_strings.php:45 ../../include/text.php:1241
+msgid "January"
+msgstr ""
+
+#: ../../include/js_strings.php:46 ../../include/text.php:1241
+msgid "February"
+msgstr ""
+
+#: ../../include/js_strings.php:47 ../../include/text.php:1241
+msgid "March"
+msgstr ""
+
+#: ../../include/js_strings.php:48 ../../include/text.php:1241
+msgid "April"
+msgstr ""
+
+#: ../../include/js_strings.php:49
+msgctxt "long"
+msgid "May"
+msgstr ""
+
+#: ../../include/js_strings.php:50 ../../include/text.php:1241
+msgid "June"
+msgstr ""
+
+#: ../../include/js_strings.php:51 ../../include/text.php:1241
+msgid "July"
+msgstr ""
+
+#: ../../include/js_strings.php:52 ../../include/text.php:1241
+msgid "August"
+msgstr ""
+
+#: ../../include/js_strings.php:53 ../../include/text.php:1241
+msgid "September"
+msgstr ""
+
+#: ../../include/js_strings.php:54 ../../include/text.php:1241
+msgid "October"
+msgstr ""
+
+#: ../../include/js_strings.php:55 ../../include/text.php:1241
+msgid "November"
+msgstr ""
+
+#: ../../include/js_strings.php:56 ../../include/text.php:1241
+msgid "December"
+msgstr ""
+
+#: ../../include/js_strings.php:57
+msgid "Jan"
+msgstr ""
+
+#: ../../include/js_strings.php:58
+msgid "Feb"
+msgstr ""
+
+#: ../../include/js_strings.php:59
+msgid "Mar"
+msgstr ""
+
+#: ../../include/js_strings.php:60
+msgid "Apr"
+msgstr ""
+
+#: ../../include/js_strings.php:61
+msgctxt "short"
+msgid "May"
+msgstr ""
+
+#: ../../include/js_strings.php:62
+msgid "Jun"
+msgstr ""
+
+#: ../../include/js_strings.php:63
+msgid "Jul"
+msgstr ""
+
+#: ../../include/js_strings.php:64
+msgid "Aug"
+msgstr ""
+
+#: ../../include/js_strings.php:65
+msgid "Sep"
+msgstr ""
+
+#: ../../include/js_strings.php:66
+msgid "Oct"
+msgstr ""
+
+#: ../../include/js_strings.php:67
+msgid "Nov"
+msgstr ""
+
+#: ../../include/js_strings.php:68
+msgid "Dec"
+msgstr ""
+
+#: ../../include/js_strings.php:69 ../../include/text.php:1237
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/js_strings.php:70 ../../include/text.php:1237
+msgid "Monday"
+msgstr ""
+
+#: ../../include/js_strings.php:71 ../../include/text.php:1237
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/js_strings.php:72 ../../include/text.php:1237
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/js_strings.php:73 ../../include/text.php:1237
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/js_strings.php:74 ../../include/text.php:1237
+msgid "Friday"
+msgstr ""
+
+#: ../../include/js_strings.php:75 ../../include/text.php:1237
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/js_strings.php:76
+msgid "Sun"
+msgstr ""
+
+#: ../../include/js_strings.php:77
+msgid "Mon"
+msgstr ""
+
+#: ../../include/js_strings.php:78
+msgid "Tue"
+msgstr ""
+
+#: ../../include/js_strings.php:79
+msgid "Wed"
+msgstr ""
+
+#: ../../include/js_strings.php:80
+msgid "Thu"
+msgstr ""
+
+#: ../../include/js_strings.php:81
+msgid "Fri"
+msgstr ""
+
+#: ../../include/js_strings.php:82
+msgid "Sat"
+msgstr ""
+
+#: ../../include/js_strings.php:83
+msgctxt "calendar"
+msgid "today"
+msgstr ""
+
+#: ../../include/js_strings.php:84
+msgctxt "calendar"
+msgid "month"
+msgstr ""
+
+#: ../../include/js_strings.php:85
+msgctxt "calendar"
+msgid "week"
+msgstr ""
+
+#: ../../include/js_strings.php:86
+msgctxt "calendar"
+msgid "day"
+msgstr ""
+
+#: ../../include/js_strings.php:87
+msgctxt "calendar"
+msgid "All day"
+msgstr ""
+
+#: ../../include/contact_widgets.php:11
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
+msgstr ""
+
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
+msgstr ""
+
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
+msgstr ""
+
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr ""
+
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
+msgstr ""
+
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
+msgstr ""
+
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
+msgstr ""
+
+#: ../../include/contact_widgets.php:122
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/contact_widgets.php:127
+msgid "show more"
+msgstr ""
+
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr ""
+
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr ""
+
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr ""
+
+#: ../../include/message.php:20
+msgid "No recipient provided."
+msgstr ""
+
+#: ../../include/message.php:25
+msgid "[no subject]"
+msgstr ""
+
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
+msgstr ""
+
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
+msgstr ""
+
+#: ../../include/acl_selectors.php:269
+msgid "Who can see this?"
+msgstr ""
+
+#: ../../include/acl_selectors.php:270
+msgid "Custom selection"
+msgstr ""
+
+#: ../../include/acl_selectors.php:271
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
+"the scope of \"Show\"."
+msgstr ""
+
+#: ../../include/acl_selectors.php:272
+msgid "Show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:273
+msgid "Don't show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:279
+msgid "Other networks and post services"
+msgstr ""
+
+#: ../../include/acl_selectors.php:309
+#, php-format
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These "
+"permissions set who is allowed to view the post."
+msgstr ""
+
+#: ../../include/security.php:108
+msgid "guest:"
+msgstr ""
+
+#: ../../include/security.php:425
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
+#: ../../include/text.php:404
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:406
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:435
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:438
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:448
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:450
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:843
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:868
+#, php-format
+msgid "View all %s connections"
+msgstr ""
+
+#: ../../include/text.php:1013 ../../include/text.php:1018
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:1019
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:1019
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:1020
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:1020
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:1021
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:1022
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:1022
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:1023
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:1023
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:1035
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:1036
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:1037
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:1038
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:1039
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:1040
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:1041
+msgid "stupefied"
+msgstr ""
+
+#: ../../include/text.php:1042
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:1043
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:1044
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:1045
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:1046
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:1047
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:1048
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:1049
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:1050
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:1051
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:1052
+msgid "depressed"
+msgstr ""
+
+#: ../../include/text.php:1053
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:1054
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:1055
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1241
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1318 ../../include/text.php:1322
+msgid "Unknown Attachment"
+msgstr ""
+
+#: ../../include/text.php:1324
+msgid "unknown"
+msgstr ""
+
+#: ../../include/text.php:1360
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1437
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1734 ../../include/text.php:1805
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1742
+msgid "Page layout"
+msgstr ""
+
+#: ../../include/text.php:1742
+msgid "You can create your own with the layouts tool"
+msgstr ""
+
+#: ../../include/text.php:1784
+msgid "Page content type"
+msgstr ""
+
+#: ../../include/text.php:1817
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1934
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:2243
+msgid "Design Tools"
+msgstr ""
+
+#: ../../include/text.php:2249
+msgid "Pages"
+msgstr ""
+
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr ""
@@ -9754,62 +9876,62 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr ""
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr ""
 
-#: ../../boot.php:1480
+#: ../../boot.php:1481
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1483
+#: ../../boot.php:1484
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1684
+#: ../../boot.php:1685
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr ""
 
-#: ../../boot.php:1706
+#: ../../boot.php:1707
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1707
+#: ../../boot.php:1708
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1710
+#: ../../boot.php:1711
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2276
+#: ../../boot.php:2277
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2425
+#: ../../boot.php:2432
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2428
+#: ../../boot.php:2435
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2469
+#: ../../boot.php:2485
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2473
+#: ../../boot.php:2489
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/util/po2php.php b/util/po2php.php
index ab8c495f9..50941c062 100644
--- a/util/po2php.php
+++ b/util/po2php.php
@@ -1,16 +1,22 @@
 <?php
 
-
 function po2php_run($argc,$argv) {
 
-	if ($argc!=2) {
+	if ($argc < 2) {
 		print "Usage: ".$argv[0]." <file.po>\n\n";
 		return;
 	}
-	
+
+	$rtl = false;	
+
 	$pofile = $argv[1];
 	$outfile = dirname($pofile)."/hstrings.php";
 
+	if($argc > 2) {
+		if($argv[2] === 'rtl')
+			$rtl = true;
+	}
+
 	if(strstr($outfile,'util'))
 		$lang = 'en';
 	else
@@ -52,6 +58,8 @@ function po2php_run($argc,$argv) {
 			$out .= 'function string_plural_select_' . $lang . '($n){'."\n";
 			$out .= '	return '.$cond.';'."\n";
 			$out .= '}}'."\n";
+
+			$out .= 'App::$rtl = ' . intval($rtl) ;
 		}
 		
 		if ($k!="" && substr($l,0,7)=="msgstr "){
diff --git a/util/service_class b/util/service_class
index 2b5998615..50f01afff 100755
--- a/util/service_class
+++ b/util/service_class
@@ -56,7 +56,7 @@ if($argc == 3) {
 	echo "service_class             $oclass\t\t\033[1m" . $argv[2] . "\033[0m\n";
 	
 	$new = get_config('service_class', $argv[2]);
-	foreach(array('photo_upload_limit','total_items','total_pages','total_identities','total_channels','total_feeds','attach_upload_limit','minimum_feedcheck_minutes','chatrooms','chatters_inroom') as $prop) {
+	foreach(array('photo_upload_limit','total_items','total_pages','total_identities','total_channels','total_feeds','attach_upload_limit','minimum_feedcheck_minutes','chatrooms','chatters_inroom','access_tokens') as $prop) {
 		echo $prop . str_repeat(' ',26 - strlen($prop)) . (($old && $old[$prop]) ? $old[$prop] : 'unlimited') . "\t\t\033[1m" . (($new && $new[$prop]) ? $new[$prop] : 'unlimited') . "\033[0m\n";
 	}
 	$r = '';
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 568834318..f9e0189d7 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit85a1cefa95be2f464cf7f947cbc4c785::getLoader();
+return ComposerAutoloaderInit02c7a5bb99a87a4c8dbf069d69b1a15c::getLoader();
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index a78cbe6fb..24ffd3718 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -7,10 +7,10 @@ $baseDir = dirname($vendorDir);
 
 return array(
     '383eaff206634a77a1be54e64e6459c7' => $vendorDir . '/sabre/uri/lib/functions.php',
+    '3569eecfeed3bcf0bad3c998a494ecb8' => $vendorDir . '/sabre/xml/lib/Deserializer/functions.php',
+    '93aa591bc4ca510c520999e34229ee79' => $vendorDir . '/sabre/xml/lib/Serializer/functions.php',
     '2b9d0f43f9552984cfa82fee95491826' => $vendorDir . '/sabre/event/lib/coroutine.php',
     'd81bab31d3feb45bfe2f283ea3c8fdf7' => $vendorDir . '/sabre/event/lib/Loop/functions.php',
     'a1cce3d26cc15c00fcd0b3354bd72c88' => $vendorDir . '/sabre/event/lib/Promise/functions.php',
-    '3569eecfeed3bcf0bad3c998a494ecb8' => $vendorDir . '/sabre/xml/lib/Deserializer/functions.php',
-    '93aa591bc4ca510c520999e34229ee79' => $vendorDir . '/sabre/xml/lib/Serializer/functions.php',
     'ebdb698ed4152ae445614b69b5e4bb6a' => $vendorDir . '/sabre/http/lib/functions.php',
 );
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index b7fc0125d..10c9b8207 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -6,4 +6,5 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'Psr\\Log\\' => array($vendorDir . '/psr/log'),
 );
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index f2df43375..16f7dea85 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit85a1cefa95be2f464cf7f947cbc4c785
+class ComposerAutoloaderInit02c7a5bb99a87a4c8dbf069d69b1a15c
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit85a1cefa95be2f464cf7f947cbc4c785
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit85a1cefa95be2f464cf7f947cbc4c785', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit02c7a5bb99a87a4c8dbf069d69b1a15c', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit85a1cefa95be2f464cf7f947cbc4c785', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit02c7a5bb99a87a4c8dbf069d69b1a15c', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit85a1cefa95be2f464cf7f947cbc4c785::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit02c7a5bb99a87a4c8dbf069d69b1a15c::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit85a1cefa95be2f464cf7f947cbc4c785
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit85a1cefa95be2f464cf7f947cbc4c785::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit02c7a5bb99a87a4c8dbf069d69b1a15c::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire85a1cefa95be2f464cf7f947cbc4c785($fileIdentifier, $file);
+            composerRequire02c7a5bb99a87a4c8dbf069d69b1a15c($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire85a1cefa95be2f464cf7f947cbc4c785($fileIdentifier, $file)
+function composerRequire02c7a5bb99a87a4c8dbf069d69b1a15c($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 04dd83351..15dc46f55 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,15 +4,15 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit85a1cefa95be2f464cf7f947cbc4c785
+class ComposerStaticInit02c7a5bb99a87a4c8dbf069d69b1a15c
 {
     public static $files = array (
         '383eaff206634a77a1be54e64e6459c7' => __DIR__ . '/..' . '/sabre/uri/lib/functions.php',
+        '3569eecfeed3bcf0bad3c998a494ecb8' => __DIR__ . '/..' . '/sabre/xml/lib/Deserializer/functions.php',
+        '93aa591bc4ca510c520999e34229ee79' => __DIR__ . '/..' . '/sabre/xml/lib/Serializer/functions.php',
         '2b9d0f43f9552984cfa82fee95491826' => __DIR__ . '/..' . '/sabre/event/lib/coroutine.php',
         'd81bab31d3feb45bfe2f283ea3c8fdf7' => __DIR__ . '/..' . '/sabre/event/lib/Loop/functions.php',
         'a1cce3d26cc15c00fcd0b3354bd72c88' => __DIR__ . '/..' . '/sabre/event/lib/Promise/functions.php',
-        '3569eecfeed3bcf0bad3c998a494ecb8' => __DIR__ . '/..' . '/sabre/xml/lib/Deserializer/functions.php',
-        '93aa591bc4ca510c520999e34229ee79' => __DIR__ . '/..' . '/sabre/xml/lib/Serializer/functions.php',
         'ebdb698ed4152ae445614b69b5e4bb6a' => __DIR__ . '/..' . '/sabre/http/lib/functions.php',
     );
 
@@ -70,11 +70,22 @@ class ComposerStaticInit85a1cefa95be2f464cf7f947cbc4c785
         ),
     );
 
+    public static $prefixesPsr0 = array (
+        'P' => 
+        array (
+            'Psr\\Log\\' => 
+            array (
+                0 => __DIR__ . '/..' . '/psr/log',
+            ),
+        ),
+    );
+
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit85a1cefa95be2f464cf7f947cbc4c785::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit85a1cefa95be2f464cf7f947cbc4c785::$prefixDirsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit02c7a5bb99a87a4c8dbf069d69b1a15c::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit02c7a5bb99a87a4c8dbf069d69b1a15c::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit02c7a5bb99a87a4c8dbf069d69b1a15c::$prefixesPsr0;
 
         }, null, ClassLoader::class);
     }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 5714e1c19..835190d7f 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -52,135 +52,19 @@
             "url"
         ]
     },
-    {
-        "name": "sabre/event",
-        "version": "3.0.0",
-        "version_normalized": "3.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fruux/sabre-event.git",
-            "reference": "831d586f5a442dceacdcf5e9c4c36a4db99a3534"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-event/zipball/831d586f5a442dceacdcf5e9c4c36a4db99a3534",
-            "reference": "831d586f5a442dceacdcf5e9c4c36a4db99a3534",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.5"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "*",
-            "sabre/cs": "~0.0.4"
-        },
-        "time": "2015-11-05 20:14:39",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Sabre\\Event\\": "lib/"
-            },
-            "files": [
-                "lib/coroutine.php",
-                "lib/Loop/functions.php",
-                "lib/Promise/functions.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Evert Pot",
-                "email": "me@evertpot.com",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            }
-        ],
-        "description": "sabre/event is a library for lightweight event-based programming",
-        "homepage": "http://sabre.io/event/",
-        "keywords": [
-            "EventEmitter",
-            "async",
-            "events",
-            "hooks",
-            "plugin",
-            "promise",
-            "signal"
-        ]
-    },
-    {
-        "name": "sabre/http",
-        "version": "4.2.1",
-        "version_normalized": "4.2.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fruux/sabre-http.git",
-            "reference": "2e93bc8321524c67be4ca5b8415daebd4c8bf85e"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-http/zipball/2e93bc8321524c67be4ca5b8415daebd4c8bf85e",
-            "reference": "2e93bc8321524c67be4ca5b8415daebd4c8bf85e",
-            "shasum": ""
-        },
-        "require": {
-            "ext-mbstring": "*",
-            "php": ">=5.4",
-            "sabre/event": ">=1.0.0,<4.0.0",
-            "sabre/uri": "~1.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "~4.3",
-            "sabre/cs": "~0.0.1"
-        },
-        "suggest": {
-            "ext-curl": " to make http requests with the Client class"
-        },
-        "time": "2016-01-06 23:00:08",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "lib/functions.php"
-            ],
-            "psr-4": {
-                "Sabre\\HTTP\\": "lib/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "authors": [
-            {
-                "name": "Evert Pot",
-                "email": "me@evertpot.com",
-                "homepage": "http://evertpot.com/",
-                "role": "Developer"
-            }
-        ],
-        "description": "The sabre/http library provides utilities for dealing with http requests and responses. ",
-        "homepage": "https://github.com/fruux/sabre-http",
-        "keywords": [
-            "http"
-        ]
-    },
     {
         "name": "sabre/xml",
-        "version": "1.4.1",
-        "version_normalized": "1.4.1.0",
+        "version": "1.4.2",
+        "version_normalized": "1.4.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/fruux/sabre-xml.git",
-            "reference": "59998046db252634259a878baf1af18159f508f3"
+            "reference": "f48d98c22a4a4bef76cabb5968ffaddbb2bb593e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-xml/zipball/59998046db252634259a878baf1af18159f508f3",
-            "reference": "59998046db252634259a878baf1af18159f508f3",
+            "url": "https://api.github.com/repos/fruux/sabre-xml/zipball/f48d98c22a4a4bef76cabb5968ffaddbb2bb593e",
+            "reference": "f48d98c22a4a4bef76cabb5968ffaddbb2bb593e",
             "shasum": ""
         },
         "require": {
@@ -195,7 +79,7 @@
             "phpunit/phpunit": "*",
             "sabre/cs": "~0.0.2"
         },
-        "time": "2016-03-12 22:23:16",
+        "time": "2016-05-19 21:56:49",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -331,18 +215,174 @@
         ]
     },
     {
-        "name": "sabre/dav",
-        "version": "3.1.3",
-        "version_normalized": "3.1.3.0",
+        "name": "sabre/event",
+        "version": "3.0.0",
+        "version_normalized": "3.0.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/fruux/sabre-dav.git",
-            "reference": "8a266c7b5e140da79529414b9cde2a2d058b536b"
+            "url": "https://github.com/fruux/sabre-event.git",
+            "reference": "831d586f5a442dceacdcf5e9c4c36a4db99a3534"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/8a266c7b5e140da79529414b9cde2a2d058b536b",
-            "reference": "8a266c7b5e140da79529414b9cde2a2d058b536b",
+            "url": "https://api.github.com/repos/fruux/sabre-event/zipball/831d586f5a442dceacdcf5e9c4c36a4db99a3534",
+            "reference": "831d586f5a442dceacdcf5e9c4c36a4db99a3534",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.5"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "*",
+            "sabre/cs": "~0.0.4"
+        },
+        "time": "2015-11-05 20:14:39",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Sabre\\Event\\": "lib/"
+            },
+            "files": [
+                "lib/coroutine.php",
+                "lib/Loop/functions.php",
+                "lib/Promise/functions.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Evert Pot",
+                "email": "me@evertpot.com",
+                "homepage": "http://evertpot.com/",
+                "role": "Developer"
+            }
+        ],
+        "description": "sabre/event is a library for lightweight event-based programming",
+        "homepage": "http://sabre.io/event/",
+        "keywords": [
+            "EventEmitter",
+            "async",
+            "events",
+            "hooks",
+            "plugin",
+            "promise",
+            "signal"
+        ]
+    },
+    {
+        "name": "sabre/http",
+        "version": "4.2.1",
+        "version_normalized": "4.2.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/fruux/sabre-http.git",
+            "reference": "2e93bc8321524c67be4ca5b8415daebd4c8bf85e"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/fruux/sabre-http/zipball/2e93bc8321524c67be4ca5b8415daebd4c8bf85e",
+            "reference": "2e93bc8321524c67be4ca5b8415daebd4c8bf85e",
+            "shasum": ""
+        },
+        "require": {
+            "ext-mbstring": "*",
+            "php": ">=5.4",
+            "sabre/event": ">=1.0.0,<4.0.0",
+            "sabre/uri": "~1.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.3",
+            "sabre/cs": "~0.0.1"
+        },
+        "suggest": {
+            "ext-curl": " to make http requests with the Client class"
+        },
+        "time": "2016-01-06 23:00:08",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "files": [
+                "lib/functions.php"
+            ],
+            "psr-4": {
+                "Sabre\\HTTP\\": "lib/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Evert Pot",
+                "email": "me@evertpot.com",
+                "homepage": "http://evertpot.com/",
+                "role": "Developer"
+            }
+        ],
+        "description": "The sabre/http library provides utilities for dealing with http requests and responses. ",
+        "homepage": "https://github.com/fruux/sabre-http",
+        "keywords": [
+            "http"
+        ]
+    },
+    {
+        "name": "psr/log",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-fig/log.git",
+            "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+            "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+            "shasum": ""
+        },
+        "time": "2012-12-21 11:40:51",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Psr\\Log\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
+            }
+        ],
+        "description": "Common interface for logging libraries",
+        "keywords": [
+            "log",
+            "psr",
+            "psr-3"
+        ]
+    },
+    {
+        "name": "sabre/dav",
+        "version": "3.2.0",
+        "version_normalized": "3.2.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/fruux/sabre-dav.git",
+            "reference": "5b9737cc2f0182e368d14c80df7f6b2d77dc1457"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/5b9737cc2f0182e368d14c80df7f6b2d77dc1457",
+            "reference": "5b9737cc2f0182e368d14c80df7f6b2d77dc1457",
             "shasum": ""
         },
         "require": {
@@ -356,14 +396,16 @@
             "ext-spl": "*",
             "lib-libxml": ">=2.7.0",
             "php": ">=5.5.0",
+            "psr/log": "^1.0",
             "sabre/event": ">=2.0.0, <4.0.0",
             "sabre/http": "^4.2.1",
-            "sabre/uri": "~1.0",
-            "sabre/vobject": "~4.0",
-            "sabre/xml": "~1.0"
+            "sabre/uri": "^1.0.1",
+            "sabre/vobject": "^4.1.0",
+            "sabre/xml": "^1.4.0"
         },
         "require-dev": {
             "evert/phpdoc-md": "~0.1.0",
+            "monolog/monolog": "^1.18",
             "phpunit/phpunit": "> 4.8, <=6.0.0",
             "sabre/cs": "~0.0.5"
         },
@@ -371,7 +413,7 @@
             "ext-curl": "*",
             "ext-pdo": "*"
         },
-        "time": "2016-04-07 01:02:57",
+        "time": "2016-06-28 02:44:05",
         "bin": [
             "bin/sabredav",
             "bin/naturalselection"
diff --git a/vendor/psr/log/.gitignore b/vendor/psr/log/.gitignore
new file mode 100644
index 000000000..22d0d82f8
--- /dev/null
+++ b/vendor/psr/log/.gitignore
@@ -0,0 +1 @@
+vendor
diff --git a/vendor/psr/log/LICENSE b/vendor/psr/log/LICENSE
new file mode 100644
index 000000000..474c952b4
--- /dev/null
+++ b/vendor/psr/log/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2012 PHP Framework Interoperability Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/psr/log/Psr/Log/AbstractLogger.php b/vendor/psr/log/Psr/Log/AbstractLogger.php
new file mode 100644
index 000000000..00f903452
--- /dev/null
+++ b/vendor/psr/log/Psr/Log/AbstractLogger.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This is a simple Logger implementation that other Loggers can inherit from.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to
+ * reduce boilerplate code that a simple Logger that does the same thing with
+ * messages regardless of the error level has to implement.
+ */
+abstract class AbstractLogger implements LoggerInterface
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function emergency($message, array $context = array())
+    {
+        $this->log(LogLevel::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function alert($message, array $context = array())
+    {
+        $this->log(LogLevel::ALERT, $message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function critical($message, array $context = array())
+    {
+        $this->log(LogLevel::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function error($message, array $context = array())
+    {
+        $this->log(LogLevel::ERROR, $message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function warning($message, array $context = array())
+    {
+        $this->log(LogLevel::WARNING, $message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function notice($message, array $context = array())
+    {
+        $this->log(LogLevel::NOTICE, $message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function info($message, array $context = array())
+    {
+        $this->log(LogLevel::INFO, $message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function debug($message, array $context = array())
+    {
+        $this->log(LogLevel::DEBUG, $message, $context);
+    }
+}
diff --git a/vendor/psr/log/Psr/Log/InvalidArgumentException.php b/vendor/psr/log/Psr/Log/InvalidArgumentException.php
new file mode 100644
index 000000000..67f852d1d
--- /dev/null
+++ b/vendor/psr/log/Psr/Log/InvalidArgumentException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Psr\Log;
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+}
diff --git a/vendor/psr/log/Psr/Log/LogLevel.php b/vendor/psr/log/Psr/Log/LogLevel.php
new file mode 100644
index 000000000..e32c151cb
--- /dev/null
+++ b/vendor/psr/log/Psr/Log/LogLevel.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes log levels
+ */
+class LogLevel
+{
+    const EMERGENCY = 'emergency';
+    const ALERT = 'alert';
+    const CRITICAL = 'critical';
+    const ERROR = 'error';
+    const WARNING = 'warning';
+    const NOTICE = 'notice';
+    const INFO = 'info';
+    const DEBUG = 'debug';
+}
diff --git a/vendor/psr/log/Psr/Log/LoggerAwareInterface.php b/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
new file mode 100644
index 000000000..2eebc4ebd
--- /dev/null
+++ b/vendor/psr/log/Psr/Log/LoggerAwareInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes a logger-aware instance
+ */
+interface LoggerAwareInterface
+{
+    /**
+     * Sets a logger instance on the object
+     *
+     * @param LoggerInterface $logger
+     * @return null
+     */
+    public function setLogger(LoggerInterface $logger);
+}
diff --git a/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
new file mode 100644
index 000000000..f087a3dac
--- /dev/null
+++ b/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Basic Implementation of LoggerAwareInterface.
+ */
+trait LoggerAwareTrait
+{
+    /** @var LoggerInterface */
+    protected $logger;
+
+    /**
+     * Sets a logger.
+     * 
+     * @param LoggerInterface $logger
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+}
diff --git a/vendor/psr/log/Psr/Log/LoggerInterface.php b/vendor/psr/log/Psr/Log/LoggerInterface.php
new file mode 100644
index 000000000..476bb962a
--- /dev/null
+++ b/vendor/psr/log/Psr/Log/LoggerInterface.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * Describes a logger instance
+ *
+ * The message MUST be a string or object implementing __toString().
+ *
+ * The message MAY contain placeholders in the form: {foo} where foo
+ * will be replaced by the context data in key "foo".
+ *
+ * The context array can contain arbitrary data, the only assumption that
+ * can be made by implementors is that if an Exception instance is given
+ * to produce a stack trace, it MUST be in a key named "exception".
+ *
+ * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+ * for the full interface specification.
+ */
+interface LoggerInterface
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function emergency($message, array $context = array());
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function alert($message, array $context = array());
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function critical($message, array $context = array());
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function error($message, array $context = array());
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function warning($message, array $context = array());
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function notice($message, array $context = array());
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function info($message, array $context = array());
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function debug($message, array $context = array());
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed $level
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function log($level, $message, array $context = array());
+}
diff --git a/vendor/psr/log/Psr/Log/LoggerTrait.php b/vendor/psr/log/Psr/Log/LoggerTrait.php
new file mode 100644
index 000000000..591249600
--- /dev/null
+++ b/vendor/psr/log/Psr/Log/LoggerTrait.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This is a simple Logger trait that classes unable to extend AbstractLogger
+ * (because they extend another class, etc) can include.
+ *
+ * It simply delegates all log-level-specific methods to the `log` method to 
+ * reduce boilerplate code that a simple Logger that does the same thing with 
+ * messages regardless of the error level has to implement.
+ */
+trait LoggerTrait
+{
+    /**
+     * System is unusable.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function emergency($message, array $context = array())
+    {
+        $this->log(LogLevel::EMERGENCY, $message, $context);
+    }
+
+    /**
+     * Action must be taken immediately.
+     *
+     * Example: Entire website down, database unavailable, etc. This should
+     * trigger the SMS alerts and wake you up.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function alert($message, array $context = array())
+    {
+        $this->log(LogLevel::ALERT, $message, $context);
+    }
+
+    /**
+     * Critical conditions.
+     *
+     * Example: Application component unavailable, unexpected exception.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function critical($message, array $context = array())
+    {
+        $this->log(LogLevel::CRITICAL, $message, $context);
+    }
+
+    /**
+     * Runtime errors that do not require immediate action but should typically
+     * be logged and monitored.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function error($message, array $context = array())
+    {
+        $this->log(LogLevel::ERROR, $message, $context);
+    }
+
+    /**
+     * Exceptional occurrences that are not errors.
+     *
+     * Example: Use of deprecated APIs, poor use of an API, undesirable things
+     * that are not necessarily wrong.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function warning($message, array $context = array())
+    {
+        $this->log(LogLevel::WARNING, $message, $context);
+    }
+
+    /**
+     * Normal but significant events.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function notice($message, array $context = array())
+    {
+        $this->log(LogLevel::NOTICE, $message, $context);
+    }
+
+    /**
+     * Interesting events.
+     *
+     * Example: User logs in, SQL logs.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function info($message, array $context = array())
+    {
+        $this->log(LogLevel::INFO, $message, $context);
+    }
+
+    /**
+     * Detailed debug information.
+     *
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function debug($message, array $context = array())
+    {
+        $this->log(LogLevel::DEBUG, $message, $context);
+    }
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed $level
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    abstract public function log($level, $message, array $context = array());
+}
diff --git a/vendor/psr/log/Psr/Log/NullLogger.php b/vendor/psr/log/Psr/Log/NullLogger.php
new file mode 100644
index 000000000..553a3c593
--- /dev/null
+++ b/vendor/psr/log/Psr/Log/NullLogger.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Psr\Log;
+
+/**
+ * This Logger can be used to avoid conditional log calls
+ *
+ * Logging should always be optional, and if no logger is provided to your
+ * library creating a NullLogger instance to have something to throw logs at
+ * is a good way to avoid littering your code with `if ($this->logger) { }`
+ * blocks.
+ */
+class NullLogger extends AbstractLogger
+{
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed $level
+     * @param string $message
+     * @param array $context
+     * @return null
+     */
+    public function log($level, $message, array $context = array())
+    {
+        // noop
+    }
+}
diff --git a/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php b/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
new file mode 100644
index 000000000..a93281511
--- /dev/null
+++ b/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace Psr\Log\Test;
+
+use Psr\Log\LogLevel;
+
+/**
+ * Provides a base test class for ensuring compliance with the LoggerInterface
+ *
+ * Implementors can extend the class and implement abstract methods to run this as part of their test suite
+ */
+abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @return LoggerInterface
+     */
+    abstract function getLogger();
+
+    /**
+     * This must return the log messages in order with a simple formatting: "<LOG LEVEL> <MESSAGE>"
+     *
+     * Example ->error('Foo') would yield "error Foo"
+     *
+     * @return string[]
+     */
+    abstract function getLogs();
+
+    public function testImplements()
+    {
+        $this->assertInstanceOf('Psr\Log\LoggerInterface', $this->getLogger());
+    }
+
+    /**
+     * @dataProvider provideLevelsAndMessages
+     */
+    public function testLogsAtAllLevels($level, $message)
+    {
+        $logger = $this->getLogger();
+        $logger->{$level}($message, array('user' => 'Bob'));
+        $logger->log($level, $message, array('user' => 'Bob'));
+
+        $expected = array(
+            $level.' message of level '.$level.' with context: Bob',
+            $level.' message of level '.$level.' with context: Bob',
+        );
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function provideLevelsAndMessages()
+    {
+        return array(
+            LogLevel::EMERGENCY => array(LogLevel::EMERGENCY, 'message of level emergency with context: {user}'),
+            LogLevel::ALERT => array(LogLevel::ALERT, 'message of level alert with context: {user}'),
+            LogLevel::CRITICAL => array(LogLevel::CRITICAL, 'message of level critical with context: {user}'),
+            LogLevel::ERROR => array(LogLevel::ERROR, 'message of level error with context: {user}'),
+            LogLevel::WARNING => array(LogLevel::WARNING, 'message of level warning with context: {user}'),
+            LogLevel::NOTICE => array(LogLevel::NOTICE, 'message of level notice with context: {user}'),
+            LogLevel::INFO => array(LogLevel::INFO, 'message of level info with context: {user}'),
+            LogLevel::DEBUG => array(LogLevel::DEBUG, 'message of level debug with context: {user}'),
+        );
+    }
+
+    /**
+     * @expectedException Psr\Log\InvalidArgumentException
+     */
+    public function testThrowsOnInvalidLevel()
+    {
+        $logger = $this->getLogger();
+        $logger->log('invalid level', 'Foo');
+    }
+
+    public function testContextReplacement()
+    {
+        $logger = $this->getLogger();
+        $logger->info('{Message {nothing} {user} {foo.bar} a}', array('user' => 'Bob', 'foo.bar' => 'Bar'));
+
+        $expected = array('info {Message {nothing} Bob Bar a}');
+        $this->assertEquals($expected, $this->getLogs());
+    }
+
+    public function testObjectCastToString()
+    {
+        $dummy = $this->getMock('Psr\Log\Test\DummyTest', array('__toString'));
+        $dummy->expects($this->once())
+            ->method('__toString')
+            ->will($this->returnValue('DUMMY'));
+
+        $this->getLogger()->warning($dummy);
+    }
+
+    public function testContextCanContainAnything()
+    {
+        $context = array(
+            'bool' => true,
+            'null' => null,
+            'string' => 'Foo',
+            'int' => 0,
+            'float' => 0.5,
+            'nested' => array('with object' => new DummyTest),
+            'object' => new \DateTime,
+            'resource' => fopen('php://memory', 'r'),
+        );
+
+        $this->getLogger()->warning('Crazy context data', $context);
+    }
+
+    public function testContextExceptionKeyCanBeExceptionOrOtherValues()
+    {
+        $this->getLogger()->warning('Random message', array('exception' => 'oops'));
+        $this->getLogger()->critical('Uncaught Exception!', array('exception' => new \LogicException('Fail')));
+    }
+}
+
+class DummyTest
+{
+}
\ No newline at end of file
diff --git a/vendor/psr/log/README.md b/vendor/psr/log/README.md
new file mode 100644
index 000000000..574bc1cb2
--- /dev/null
+++ b/vendor/psr/log/README.md
@@ -0,0 +1,45 @@
+PSR Log
+=======
+
+This repository holds all interfaces/classes/traits related to
+[PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md).
+
+Note that this is not a logger of its own. It is merely an interface that
+describes a logger. See the specification for more details.
+
+Usage
+-----
+
+If you need a logger, you can use the interface like this:
+
+```php
+<?php
+
+use Psr\Log\LoggerInterface;
+
+class Foo
+{
+    private $logger;
+
+    public function __construct(LoggerInterface $logger = null)
+    {
+        $this->logger = $logger;
+    }
+
+    public function doSomething()
+    {
+        if ($this->logger) {
+            $this->logger->info('Doing work');
+        }
+
+        // do something useful
+    }
+}
+```
+
+You can then pick one of the implementations of the interface to get a logger.
+
+If you want to implement the interface, you can require this package and
+implement `Psr\Log\LoggerInterface` in your code. Please read the
+[specification text](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
+for details.
diff --git a/vendor/sabre/dav/.travis.yml b/vendor/sabre/dav/.travis.yml
index 48c88b169..a9189c981 100644
--- a/vendor/sabre/dav/.travis.yml
+++ b/vendor/sabre/dav/.travis.yml
@@ -3,12 +3,6 @@ php:
   - 5.5
   - 5.6
   - 7
-  - hhvm
-
-matrix:
-  fast_finish: true
-  allow_failures:
-      - php: hhvm
 
 env:
   matrix:
@@ -17,17 +11,25 @@ env:
 
 services:
   - mysql
+  - postgresql
 
 sudo: false
 
-cache: vendor
-
 before_script:
-  - mysql -e 'create database sabredav'
+  - mysql -e 'create database sabredav_test'
+  - psql -c "create database sabredav_test" -U postgres
+  - psql -c "create user sabredav with PASSWORD 'sabredav';GRANT ALL PRIVILEGES ON DATABASE sabredav_test TO sabredav" -U postgres
+  - phpenv config-rm xdebug.ini; true
   #  - composer self-update
-  - composer update --prefer-source $LOWEST_DEPS
+  - composer update --prefer-dist $LOWEST_DEPS
+
+# addons:
+#    postgresql: "9.5"
 
 script:
-  - ./bin/phpunit --configuration tests/phpunit.xml $TEST_DEPS
+  - ./bin/phpunit --configuration tests/phpunit.xml.dist $TEST_DEPS
   - ./bin/sabre-cs-fixer fix lib/ --dry-run --diff
 
+cache:
+  directories:
+    - $HOME/.composer/cache
diff --git a/vendor/sabre/dav/CHANGELOG.md b/vendor/sabre/dav/CHANGELOG.md
index f719c8e1a..d8a3898c3 100644
--- a/vendor/sabre/dav/CHANGELOG.md
+++ b/vendor/sabre/dav/CHANGELOG.md
@@ -1,6 +1,106 @@
 ChangeLog
 =========
 
+3.2.0 (2016-06-27)
+------------------
+
+* The default ACL rules allow an unauthenticated user to read information
+  about nodes that don't have their own ACL defined. This was a security
+  problem.
+* The zip release ships with [sabre/vobject 4.1.0][vobj],
+  [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
+  [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.2][xml].
+
+
+3.2.0-beta1 (2016-05-20)
+------------------------
+
+* #833: Calendars throw exceptions when the sharing plugin is not enabled.
+* #834: Return vCards exactly as they were stored if we don't need to convert
+  in between versions.
+* The zip release ships with [sabre/vobject 4.1.0][vobj],
+  [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
+  [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.1][xml].
+
+
+3.2.0-alpha1 (2016-05-09)
+-------------------------
+
+* Database changes for CalDAV. If you are using the CalDAV PDO backends, you
+  must migrate. Run `./bin/migrateto32.php` for more info.
+* Support for WebDAV Resource Sharing, an upcoming standard.
+* Added support for sharing in the CalDAV PDO backend! Users can now invite
+  others to their calendar and give them read/read-write access!
+* #397: Support for PSR-3. You can now log exceptions with your favourite
+  psr3-compatible logging tool.
+* #825: Actual proper, tested support for PostgreSQL. We require version 9.5.
+* Removed database migration script for sabre/dav 1.7. To update from that
+  version you now first need to update to sabre/dav 3.1.
+* Removed deprecated function: `Sabre\DAV\Auth\Plugin::getCurrentUser()`.
+* #774: Fixes for getting free disk space on Windows.
+* #803: Major changes in the sharing API. If you were using an old sabre/dav
+  sharing api, head to the website for more detailed migration notes.
+* #657: Support for optional auth using `{DAV:}unauthorized` and `{DAV:}all`
+  privileges. This allows you to assign a privilege to a resource, allowing
+  non-authenticated users to access it. For instance, this could allow you
+  to create a public read-only collection.
+* #812 #814: ICS/VCF exporter now includes a more useful filename in its
+  `Content-Disposition` header. (@Xenopathic).
+* #801: BC break: If you were using the `Href` object before, it's behavior
+  now changed a bit, and `LocalHref` was added to replace the old, default
+  behavior of `Href`. See the migration doc for more info.
+* Removed `Sabre\DAVACL\Plugin::$allowAccessToNodesWithoutACL` setting.
+  Instead, you can provide a set of default ACL rules with
+  `Sabre\DAVACL\Plugin::setDefaultAcl()`.
+* Introduced `Sabre\DAVACL\ACLTrait` which contains a default implementation
+  of `Sabre\DAV\IACL` with some sane defaults. We're using this trait all over
+  the place now, reducing the amount of boilerplate.
+* Plugins can now control the "Supported Privilege Set".
+* Added Sharing, ICSExport and VCFExport plugins to `groupwareserver.php`
+  example.
+* The `{DAV:}all` privilege is now no longer abstract, so it can be assigned
+  directly. We're using the `{DAV:}all` privilege now in a lot of cases where
+  we before assigned both `{DAV:}read` and `{DAV:}write`.
+* Resources that are not collections no longer support the `{DAV:}bind` and
+  `{DAV:}unbind` privileges.
+* Corrected the CalDAV-scheduling related privileges.
+* Doing an `UNLOCK` no longer requires the `{DAV:}write-content` privilege.
+* Added a new `getPrincipalByUri` plugin event. Allowing plugins to request
+  quickly where a principal lives on a server.
+* Renamed `phpunit.xml` to `phpunit.xml.dist` to make local modifications easy.
+* Functionality from `IShareableCalendar` is merged into `ISharedCalendar`.
+* #751: Fixed XML responses from failing `MKCOL` requests.
+* #600: Support for `principal-match` ACL `REPORT`.
+* #599: Support for `acl-principal-prop-set` ACL `REPORT`.
+* #798: Added an index on `firstoccurence` field in MySQL CalDAV backend. This
+  should speed up common calendar-query requests.
+* #759: DAV\Client is now able to actually correctly resolve relative urls.
+* #671: We are no longer checking the `read-free-busy` privilege on individual
+  calendars during freebusy operations in the scheduling plugin. Instead, we
+  check the `schedule-query-freebusy` privilege on the target users' inbox,
+  which validates access for the entire account, per the spec.
+* The zip release ships with [sabre/vobject 4.1.0][vobj],
+  [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
+  [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.1][xml].
+
+
+3.1.5 (????-??-??)
+------------------
+
+* Fixed: Creating a new calendar on some MySQL configurations caused an error.
+
+
+3.1.4 (2016-05-28)
+------------------
+
+* #834: Backport from `master`: Return vCards exactly as they were stored if
+  we don't need to convert in between versions. This should speed up many
+  large addressbook syncs sometimes up to 50%.
+* The zip release ships with [sabre/vobject 4.1.0][vobj],
+  [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
+  [sabre/uri 1.1.0][uri] and [sabre/xml 1.4.2][xml].
+
+
 3.1.3 (2016-04-06)
 ------------------
 
diff --git a/vendor/sabre/dav/README.md b/vendor/sabre/dav/README.md
index 278187b55..8edcd4073 100644
--- a/vendor/sabre/dav/README.md
+++ b/vendor/sabre/dav/README.md
@@ -1,10 +1,10 @@
-![sabre's logo](http://sabre.io/img/logo.png) SabreDAV
-======================================================
+![sabre's logo](http://sabre.io/img/logo.png) sabre/dav
+=======================================================
 
 Introduction
 ------------
 
-SabreDAV is the most popular WebDAV framework for PHP. Use it to create WebDAV, CalDAV and CardDAV servers.
+sabre/dav is the most popular WebDAV framework for PHP. Use it to create WebDAV, CalDAV and CardDAV servers.
 
 Full documentation can be found on the website:
 
@@ -16,6 +16,7 @@ Build status
 | branch       | status | minimum PHP version |
 | ------------ | ------ | ------------------- |
 | master       | [![Build Status](https://travis-ci.org/fruux/sabre-dav.svg?branch=master)](https://travis-ci.org/fruux/sabre-dav) | PHP 5.5 |
+| 3.1          | [![Build Status](https://travis-ci.org/fruux/sabre-dav.svg?branch=3.0)](https://travis-ci.org/fruux/sabre-dav) | PHP 5.5 |
 | 3.0          | [![Build Status](https://travis-ci.org/fruux/sabre-dav.svg?branch=3.0)](https://travis-ci.org/fruux/sabre-dav) | PHP 5.4 |
 | 2.1          | [![Build Status](https://travis-ci.org/fruux/sabre-dav.svg?branch=2.1)](https://travis-ci.org/fruux/sabre-dav) | PHP 5.4 |
 | 2.0          | [![Build Status](https://travis-ci.org/fruux/sabre-dav.svg?branch=2.0)](https://travis-ci.org/fruux/sabre-dav) | PHP 5.4 |
@@ -23,6 +24,12 @@ Build status
 | 1.7          | [![Build Status](https://travis-ci.org/fruux/sabre-dav.svg?branch=1.7)](https://travis-ci.org/fruux/sabre-dav) | PHP 5.3 |
 | 1.6          | [![Build Status](https://travis-ci.org/fruux/sabre-dav.svg?branch=1.6)](https://travis-ci.org/fruux/sabre-dav) | PHP 5.3 |
 
+Documentation
+-------------
+
+* [Introduction](http://sabre.io/dav/).
+* [Installation](http://sabre.io/dav/install/).
+
 Made at fruux
 -------------
 
diff --git a/vendor/sabre/dav/bin/build.php b/vendor/sabre/dav/bin/build.php
old mode 100755
new mode 100644
index 82b1e7530..c4ba20941
--- a/vendor/sabre/dav/bin/build.php
+++ b/vendor/sabre/dav/bin/build.php
@@ -110,7 +110,7 @@ function test() {
 
     echo "  Running all unittests.\n";
     echo "  This may take a while.\n\n";
-    system(__DIR__ . '/phpunit --configuration ' . $baseDir . '/tests/phpunit.xml --stop-on-failure', $code);
+    system(__DIR__ . '/phpunit --configuration ' . $baseDir . '/tests/phpunit.xml.dist --stop-on-failure', $code);
     if ($code != 0) {
         echo "PHPUnit reported error code $code\n";
         die(1);
diff --git a/vendor/sabre/dav/bin/googlecode_upload.py b/vendor/sabre/dav/bin/googlecode_upload.py
old mode 100755
new mode 100644
diff --git a/vendor/sabre/dav/bin/migrateto17.php b/vendor/sabre/dav/bin/migrateto17.php
deleted file mode 100755
index a1173c584..000000000
--- a/vendor/sabre/dav/bin/migrateto17.php
+++ /dev/null
@@ -1,284 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-echo "SabreDAV migrate script for version 1.7\n";
-
-if ($argc < 2) {
-
-    echo <<<HELLO
-
-This script help you migrate from a pre-1.7 database to 1.7 and later\n
-Both the 'calendarobjects' and 'calendars' tables will be upgraded.
-
-If you do not have this table, or don't use the default PDO CalDAV backend
-it's pointless to run this script.
-
-Keep in mind that some processing will be done on every single record of this
-table and in addition, ALTER TABLE commands will be executed.
-If you have a large calendarobjects table, this may mean that this process
-takes a while.
-
-Usage:
-
-php {$argv[0]} [pdo-dsn] [username] [password]
-
-For example:
-
-php {$argv[0]} "mysql:host=localhost;dbname=sabredav" root password
-php {$argv[0]} sqlite:data/sabredav.db
-
-HELLO;
-
-    exit();
-
-}
-
-// There's a bunch of places where the autoloader could be, so we'll try all of
-// them.
-$paths = [
-    __DIR__ . '/../vendor/autoload.php',
-    __DIR__ . '/../../../autoload.php',
-];
-
-foreach ($paths as $path) {
-    if (file_exists($path)) {
-        include $path;
-        break;
-    }
-}
-
-$dsn = $argv[1];
-$user = isset($argv[2]) ? $argv[2] : null;
-$pass = isset($argv[3]) ? $argv[3] : null;
-
-echo "Connecting to database: " . $dsn . "\n";
-
-$pdo = new PDO($dsn, $user, $pass);
-$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-$pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
-
-echo "Validating existing table layout\n";
-
-// The only cross-db way to do this, is to just fetch a single record.
-$row = $pdo->query("SELECT * FROM calendarobjects LIMIT 1")->fetch();
-
-if (!$row) {
-    echo "Error: This database did not have any records in the calendarobjects table, you should just recreate the table.\n";
-    exit(-1);
-}
-
-$requiredFields = [
-    'id',
-    'calendardata',
-    'uri',
-    'calendarid',
-    'lastmodified',
-];
-
-foreach ($requiredFields as $requiredField) {
-    if (!array_key_exists($requiredField, $row)) {
-        echo "Error: The current 'calendarobjects' table was missing a field we expected to exist.\n";
-        echo "For safety reasons, this process is stopped.\n";
-        exit(-1);
-    }
-}
-
-$fields17 = [
-    'etag',
-    'size',
-    'componenttype',
-    'firstoccurence',
-    'lastoccurence',
-];
-
-$found = 0;
-foreach ($fields17 as $field) {
-    if (array_key_exists($field, $row)) {
-        $found++;
-    }
-}
-
-if ($found === 0) {
-    echo "The database had the 1.6 schema. Table will now be altered.\n";
-    echo "This may take some time for large tables\n";
-
-    switch ($pdo->getAttribute(PDO::ATTR_DRIVER_NAME)) {
-
-        case 'mysql' :
-
-            $pdo->exec(<<<SQL
-ALTER TABLE calendarobjects
-ADD etag VARCHAR(32),
-ADD size INT(11) UNSIGNED,
-ADD componenttype VARCHAR(8),
-ADD firstoccurence INT(11) UNSIGNED,
-ADD lastoccurence INT(11) UNSIGNED
-SQL
-        );
-            break;
-            case 'sqlite' :
-                $pdo->exec('ALTER TABLE calendarobjects ADD etag text');
-                $pdo->exec('ALTER TABLE calendarobjects ADD size integer');
-                $pdo->exec('ALTER TABLE calendarobjects ADD componenttype TEXT');
-                $pdo->exec('ALTER TABLE calendarobjects ADD firstoccurence integer');
-                $pdo->exec('ALTER TABLE calendarobjects ADD lastoccurence integer');
-                break;
-
-        default :
-            die('This upgrade script does not support this driver (' . $pdo->getAttribute(PDO::ATTR_DRIVER_NAME) . ")\n");
-
-    }
-    echo "Database schema upgraded.\n";
-
-} elseif ($found === 5) {
-
-    echo "Database already had the 1.7 schema\n";
-
-} else {
-
-    echo "The database had $found out of 5 from the changes for 1.7. This is scary and unusual, so we have to abort.\n";
-    echo "You can manually try to upgrade the schema, and then run this script again.\n";
-    exit(-1);
-
-}
-
-echo "Now, we need to parse every record and pull out some information.\n";
-
-$result = $pdo->query('SELECT id, calendardata FROM calendarobjects');
-$stmt = $pdo->prepare('UPDATE calendarobjects SET etag = ?, size = ?, componenttype = ?, firstoccurence = ?, lastoccurence = ? WHERE id = ?');
-
-echo "Total records found: " . $result->rowCount() . "\n";
-$done = 0;
-$total = $result->rowCount();
-while ($row = $result->fetch()) {
-
-    try {
-        $newData = getDenormalizedData($row['calendardata']);
-    } catch (Exception $e) {
-        echo "===\nException caught will trying to parser calendarobject.\n";
-        echo "Error message: " . $e->getMessage() . "\n";
-        echo "Record id: " . $row['id'] . "\n";
-        echo "This record is ignored, you should inspect it to see if there's anything wrong.\n===\n";
-        continue;
-    }
-    $stmt->execute([
-        $newData['etag'],
-        $newData['size'],
-        $newData['componentType'],
-        $newData['firstOccurence'],
-        $newData['lastOccurence'],
-        $row['id'],
-    ]);
-    $done++;
-
-    if ($done % 500 === 0) {
-        echo "Completed: $done / $total\n";
-    }
-}
-echo "Completed: $done / $total\n";
-
-echo "Checking the calendars table needs changes.\n";
-$row = $pdo->query("SELECT * FROM calendars LIMIT 1")->fetch();
-
-if (array_key_exists('transparent', $row)) {
-
-    echo "The calendars table is already up to date\n";
-
-} else {
-
-    echo "Adding the 'transparent' field to the calendars table\n";
-
-    switch ($pdo->getAttribute(PDO::ATTR_DRIVER_NAME)) {
-
-        case 'mysql' :
-            $pdo->exec("ALTER TABLE calendars ADD transparent TINYINT(1) NOT NULL DEFAULT '0'");
-            break;
-        case 'sqlite' :
-            $pdo->exec("ALTER TABLE calendars ADD transparent bool");
-            break;
-
-        default :
-            die('This upgrade script does not support this driver (' . $pdo->getAttribute(PDO::ATTR_DRIVER_NAME) . ")\n");
-
-    }
-
-}
-
-echo "Process completed!\n";
-
-/**
- * Parses some information from calendar objects, used for optimized
- * calendar-queries.
- *
- * Blantently copied from Sabre\CalDAV\Backend\PDO
- *
- * Returns an array with the following keys:
- *   * etag
- *   * size
- *   * componentType
- *   * firstOccurence
- *   * lastOccurence
- *
- * @param string $calendarData
- * @return array
- */
-function getDenormalizedData($calendarData) {
-
-    $vObject = \Sabre\VObject\Reader::read($calendarData);
-    $componentType = null;
-    $component = null;
-    $firstOccurence = null;
-    $lastOccurence = null;
-    foreach ($vObject->getComponents() as $component) {
-        if ($component->name !== 'VTIMEZONE') {
-            $componentType = $component->name;
-            break;
-        }
-    }
-    if (!$componentType) {
-        throw new \Sabre\DAV\Exception\BadRequest('Calendar objects must have a VJOURNAL, VEVENT or VTODO component');
-    }
-    if ($componentType === 'VEVENT') {
-        $firstOccurence = $component->DTSTART->getDateTime()->getTimeStamp();
-        // Finding the last occurence is a bit harder
-        if (!isset($component->RRULE)) {
-            if (isset($component->DTEND)) {
-                $lastOccurence = $component->DTEND->getDateTime()->getTimeStamp();
-            } elseif (isset($component->DURATION)) {
-                $endDate = clone $component->DTSTART->getDateTime();
-                $endDate->add(\Sabre\VObject\DateTimeParser::parse($component->DURATION->value));
-                $lastOccurence = $endDate->getTimeStamp();
-            } elseif (!$component->DTSTART->hasTime()) {
-                $endDate = clone $component->DTSTART->getDateTime();
-                $endDate->modify('+1 day');
-                $lastOccurence = $endDate->getTimeStamp();
-            } else {
-                $lastOccurence = $firstOccurence;
-            }
-        } else {
-            $it = new \Sabre\VObject\Recur\EventIterator($vObject, (string)$component->UID);
-            $maxDate = new DateTime(\Sabre\CalDAV\Backend\PDO::MAX_DATE);
-            if ($it->isInfinite()) {
-                $lastOccurence = $maxDate->getTimeStamp();
-            } else {
-                $end = $it->getDtEnd();
-                while ($it->valid() && $end < $maxDate) {
-                    $end = $it->getDtEnd();
-                    $it->next();
-
-                }
-                $lastOccurence = $end->getTimeStamp();
-            }
-
-        }
-    }
-
-    return [
-        'etag'           => md5($calendarData),
-        'size'           => strlen($calendarData),
-        'componentType'  => $componentType,
-        'firstOccurence' => $firstOccurence,
-        'lastOccurence'  => $lastOccurence,
-    ];
-
-}
diff --git a/vendor/sabre/dav/bin/migrateto20.php b/vendor/sabre/dav/bin/migrateto20.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/dav/bin/migrateto21.php b/vendor/sabre/dav/bin/migrateto21.php
old mode 100755
new mode 100644
index f42c4cf88..c81ee5cca
--- a/vendor/sabre/dav/bin/migrateto21.php
+++ b/vendor/sabre/dav/bin/migrateto21.php
@@ -169,10 +169,6 @@ switch ($driver) {
 )
 ');
         break;
-        $pdo->exec('
-            CREATE INDEX principaluri_uri ON calendarsubscriptions (principaluri, uri);
-        ');
-        break;
 }
 
 echo "Done.\n";
diff --git a/vendor/sabre/dav/bin/migrateto30.php b/vendor/sabre/dav/bin/migrateto30.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/dav/bin/migrateto32.php b/vendor/sabre/dav/bin/migrateto32.php
new file mode 100644
index 000000000..7567aeb60
--- /dev/null
+++ b/vendor/sabre/dav/bin/migrateto32.php
@@ -0,0 +1,268 @@
+#!/usr/bin/env php
+<?php
+
+echo "SabreDAV migrate script for version 3.2\n";
+
+if ($argc < 2) {
+
+    echo <<<HELLO
+
+This script help you migrate from a 3.1 database to 3.2 and later
+
+Changes:
+* Created a new calendarinstances table to support calendar sharing.
+* Remove a lot of columns from calendars.
+
+Keep in mind that ALTER TABLE commands will be executed. If you have a large
+dataset this may mean that this process takes a while.
+
+Make a back-up first. This script has been tested, but the amount of
+potential variants are extremely high, so it's impossible to deal with every
+possible situation.
+
+In the worst case, you will lose all your data. This is not an overstatement.
+
+Lastly, if you are upgrading from an older version than 3.1, make sure you run
+the earlier migration script first. Migration scripts must be ran in order.
+
+Usage:
+
+php {$argv[0]} [pdo-dsn] [username] [password]
+
+For example:
+
+php {$argv[0]} "mysql:host=localhost;dbname=sabredav" root password
+php {$argv[0]} sqlite:data/sabredav.db
+
+HELLO;
+
+    exit();
+
+}
+
+// There's a bunch of places where the autoloader could be, so we'll try all of
+// them.
+$paths = [
+    __DIR__ . '/../vendor/autoload.php',
+    __DIR__ . '/../../../autoload.php',
+];
+
+foreach ($paths as $path) {
+    if (file_exists($path)) {
+        include $path;
+        break;
+    }
+}
+
+$dsn = $argv[1];
+$user = isset($argv[2]) ? $argv[2] : null;
+$pass = isset($argv[3]) ? $argv[3] : null;
+
+$backupPostfix = time();
+
+echo "Connecting to database: " . $dsn . "\n";
+
+$pdo = new PDO($dsn, $user, $pass);
+$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+$pdo->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
+
+$driver = $pdo->getAttribute(PDO::ATTR_DRIVER_NAME);
+
+switch ($driver) {
+
+    case 'mysql' :
+        echo "Detected MySQL.\n";
+        break;
+    case 'sqlite' :
+        echo "Detected SQLite.\n";
+        break;
+    default :
+        echo "Error: unsupported driver: " . $driver . "\n";
+        die(-1);
+}
+
+echo "Creating 'calendarinstances'\n";
+$addValueType = false;
+try {
+    $result = $pdo->query('SELECT * FROM calendarinstances LIMIT 1');
+    $result->fetch(\PDO::FETCH_ASSOC);
+    echo "calendarinstances exists. Assuming this part of the migration has already been done.\n";
+} catch (Exception $e) {
+    echo "calendarinstances does not yet exist. Creating table and migrating data.\n";
+
+    switch ($driver) {
+        case 'mysql' :
+            $pdo->exec(<<<SQL
+CREATE TABLE calendarinstances (
+    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    calendarid INTEGER UNSIGNED NOT NULL,
+    principaluri VARBINARY(100),
+    access TINYINT(1) NOT NULL DEFAULT '1' COMMENT '1 = owner, 2 = read, 3 = readwrite',
+    displayname VARCHAR(100),
+    uri VARBINARY(200),
+    description TEXT,
+    calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0',
+    calendarcolor VARBINARY(10),
+    timezone TEXT,
+    transparent TINYINT(1) NOT NULL DEFAULT '0',
+    share_href VARBINARY(100),
+    share_displayname VARCHAR(100),
+    share_invitestatus TINYINT(1) NOT NULL DEFAULT '2' COMMENT '1 = noresponse, 2 = accepted, 3 = declined, 4 = invalid',
+    UNIQUE(principaluri, uri),
+    UNIQUE(calendarid, principaluri),
+    UNIQUE(calendarid, share_href)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+SQL
+        );
+            $pdo->exec("
+INSERT INTO calendarinstances
+    (
+        calendarid,
+        principaluri,
+        access,
+        displayname,
+        uri,
+        description,
+        calendarorder,
+        calendarcolor,
+        transparent
+    )
+SELECT
+    id,
+    principaluri,
+    1,
+    displayname,
+    uri,
+    description,
+    calendarorder,
+    calendarcolor,
+    transparent
+FROM calendars
+");
+            break;
+        case 'sqlite' :
+            $pdo->exec(<<<SQL
+CREATE TABLE calendarinstances (
+    id integer primary key asc NOT NULL,
+    calendarid integer,
+    principaluri text,
+    access integer COMMENT '1 = owner, 2 = read, 3 = readwrite' NOT NULL DEFAULT '1',
+    displayname text,
+    uri text NOT NULL,
+    description text,
+    calendarorder integer,
+    calendarcolor text,
+    timezone text,
+    transparent bool,
+    share_href text,
+    share_displayname text,
+    share_invitestatus integer DEFAULT '2',
+    UNIQUE (principaluri, uri),
+    UNIQUE (calendarid, principaluri),
+    UNIQUE (calendarid, share_href)
+);
+SQL
+        );
+            $pdo->exec("
+INSERT INTO calendarinstances
+    (
+        calendarid,
+        principaluri,
+        access,
+        displayname,
+        uri,
+        description,
+        calendarorder,
+        calendarcolor,
+        transparent
+    )
+SELECT
+    id,
+    principaluri,
+    1,
+    displayname,
+    uri,
+    description,
+    calendarorder,
+    calendarcolor,
+    transparent
+FROM calendars
+");
+            break;
+    }
+
+}
+try {
+    $result = $pdo->query('SELECT * FROM calendars LIMIT 1');
+    $row = $result->fetch(\PDO::FETCH_ASSOC);
+
+    if (!$row) {
+        echo "Source table is empty.\n";
+        $migrateCalendars = true;
+    }
+
+    $columnCount = count($row);
+    if ($columnCount === 3) {
+        echo "The calendars table has 3 columns already. Assuming this part of the migration was already done.\n";
+        $migrateCalendars = false;
+    } else {
+        echo "The calendars table has " . $columnCount . " columns.\n";
+        $migrateCalendars = true;
+    }
+
+} catch (Exception $e) {
+    echo "calendars table does not exist. This is a major problem. Exiting.\n";
+    exit(-1);
+}
+
+if ($migrateCalendars) {
+
+    $calendarBackup = 'calendars_3_1_' . $backupPostfix;
+    echo "Backing up 'calendars' to '", $calendarBackup, "'\n";
+
+    switch ($driver) {
+        case 'mysql' :
+            $pdo->exec('RENAME TABLE calendars TO ' . $calendarBackup);
+            break;
+        case 'sqlite' :
+            $pdo->exec('ALTER TABLE calendars RENAME TO ' . $calendarBackup);
+            break;
+
+    }
+
+    echo "Creating new calendars table.\n";
+    switch ($driver) {
+        case 'mysql' :
+            $pdo->exec(<<<SQL
+CREATE TABLE calendars (
+    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    synctoken INTEGER UNSIGNED NOT NULL DEFAULT '1',
+    components VARBINARY(21)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+SQL
+);
+            break;
+        case 'sqlite' :
+            $pdo->exec(<<<SQL
+CREATE TABLE calendars (
+    id integer primary key asc NOT NULL,
+    synctoken integer DEFAULT 1 NOT NULL,
+    components text NOT NULL
+);
+SQL
+        );
+            break;
+
+    }
+
+    echo "Migrating data from old to new table\n";
+
+    $pdo->exec(<<<SQL
+INSERT INTO calendars (id, synctoken, components) SELECT id, synctoken, COALESCE(components,"VEVENT,VTODO,VJOURNAL") as components FROM $calendarBackup
+SQL
+    );
+
+}
+
+
+echo "Upgrade to 3.2 schema completed.\n";
diff --git a/vendor/sabre/dav/bin/naturalselection b/vendor/sabre/dav/bin/naturalselection
index 52720e31e..7e20439c1 100755
--- a/vendor/sabre/dav/bin/naturalselection
+++ b/vendor/sabre/dav/bin/naturalselection
@@ -107,7 +107,7 @@ def main():
     parser.add_option(
         '-m', '--min-erase',
         help="Minimum number of bytes to erase when the threshold is reached. " +
-            "Setting this option higher will reduce the amount of times the cache directory will need to be scanned. " +
+            "Setting this option higher will reduce the number of times the cache directory will need to be scanned. " +
             "(the default is 1073741824, which is 1GB.)",
         type="int",
         dest="min_erase",
diff --git a/vendor/sabre/dav/bin/sabredav.php b/vendor/sabre/dav/bin/sabredav.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/dav/examples/addressbookserver.php b/vendor/sabre/dav/examples/addressbookserver.php
deleted file mode 100644
index 6d1c9b26c..000000000
--- a/vendor/sabre/dav/examples/addressbookserver.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
-
-Addressbook/CardDAV server example
-
-This server features CardDAV support
-
-*/
-
-// settings
-date_default_timezone_set('Canada/Eastern');
-
-// Make sure this setting is turned on and reflect the root url for your WebDAV server.
-// This can be for example the root / or a complete path to your server script
-$baseUri = '/';
-
-/* Database */
-$pdo = new PDO('sqlite:data/db.sqlite');
-$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-//Mapping PHP errors to exceptions
-function exception_error_handler($errno, $errstr, $errfile, $errline) {
-    throw new ErrorException($errstr, 0, $errno, $errfile, $errline);
-}
-set_error_handler("exception_error_handler");
-
-// Autoloader
-require_once 'vendor/autoload.php';
-
-// Backends
-$authBackend      = new Sabre\DAV\Auth\Backend\PDO($pdo);
-$principalBackend = new Sabre\DAVACL\PrincipalBackend\PDO($pdo);
-$carddavBackend   = new Sabre\CardDAV\Backend\PDO($pdo);
-//$caldavBackend    = new Sabre\CalDAV\Backend\PDO($pdo);
-
-// Setting up the directory tree //
-$nodes = [
-    new Sabre\DAVACL\PrincipalCollection($principalBackend),
-//    new Sabre\CalDAV\CalendarRoot($authBackend, $caldavBackend),
-    new Sabre\CardDAV\AddressBookRoot($principalBackend, $carddavBackend),
-];
-
-// The object tree needs in turn to be passed to the server class
-$server = new Sabre\DAV\Server($nodes);
-$server->setBaseUri($baseUri);
-
-// Plugins
-$server->addPlugin(new Sabre\DAV\Auth\Plugin($authBackend));
-$server->addPlugin(new Sabre\DAV\Browser\Plugin());
-//$server->addPlugin(new Sabre\CalDAV\Plugin());
-$server->addPlugin(new Sabre\CardDAV\Plugin());
-$server->addPlugin(new Sabre\DAVACL\Plugin());
-$server->addPlugin(new Sabre\DAV\Sync\Plugin());
-
-// And off we go!
-$server->exec();
diff --git a/vendor/sabre/dav/examples/sql/mysql.addressbook.sql b/vendor/sabre/dav/examples/sql/mysql.addressbook.sql
deleted file mode 100644
index 9ec88babe..000000000
--- a/vendor/sabre/dav/examples/sql/mysql.addressbook.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-CREATE TABLE addressbooks (
-    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    principaluri VARBINARY(255),
-    displayname VARCHAR(255),
-    uri VARBINARY(200),
-    description TEXT,
-    synctoken INT(11) UNSIGNED NOT NULL DEFAULT '1',
-    UNIQUE(principaluri(100), uri(100))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE cards (
-    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    addressbookid INT(11) UNSIGNED NOT NULL,
-    carddata MEDIUMBLOB,
-    uri VARBINARY(200),
-    lastmodified INT(11) UNSIGNED,
-    etag VARBINARY(32),
-    size INT(11) UNSIGNED NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE addressbookchanges (
-    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    uri VARBINARY(200) NOT NULL,
-    synctoken INT(11) UNSIGNED NOT NULL,
-    addressbookid INT(11) UNSIGNED NOT NULL,
-    operation TINYINT(1) NOT NULL,
-    INDEX addressbookid_synctoken (addressbookid, synctoken)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
diff --git a/vendor/sabre/dav/examples/sql/mysql.calendars.sql b/vendor/sabre/dav/examples/sql/mysql.calendars.sql
deleted file mode 100644
index d41f11076..000000000
--- a/vendor/sabre/dav/examples/sql/mysql.calendars.sql
+++ /dev/null
@@ -1,64 +0,0 @@
-CREATE TABLE calendarobjects (
-    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    calendardata MEDIUMBLOB,
-    uri VARBINARY(200),
-    calendarid INTEGER UNSIGNED NOT NULL,
-    lastmodified INT(11) UNSIGNED,
-    etag VARBINARY(32),
-    size INT(11) UNSIGNED NOT NULL,
-    componenttype VARBINARY(8),
-    firstoccurence INT(11) UNSIGNED,
-    lastoccurence INT(11) UNSIGNED,
-    uid VARBINARY(200),
-    UNIQUE(calendarid, uri)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE calendars (
-    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    principaluri VARBINARY(100),
-    displayname VARCHAR(100),
-    uri VARBINARY(200),
-    synctoken INTEGER UNSIGNED NOT NULL DEFAULT '1',
-    description TEXT,
-    calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0',
-    calendarcolor VARBINARY(10),
-    timezone TEXT,
-    components VARBINARY(21),
-    transparent TINYINT(1) NOT NULL DEFAULT '0',
-    UNIQUE(principaluri, uri)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE calendarchanges (
-    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    uri VARBINARY(200) NOT NULL,
-    synctoken INT(11) UNSIGNED NOT NULL,
-    calendarid INT(11) UNSIGNED NOT NULL,
-    operation TINYINT(1) NOT NULL,
-    INDEX calendarid_synctoken (calendarid, synctoken)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE calendarsubscriptions (
-    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    uri VARBINARY(200) NOT NULL,
-    principaluri VARBINARY(100) NOT NULL,
-    source TEXT,
-    displayname VARCHAR(100),
-    refreshrate VARCHAR(10),
-    calendarorder INT(11) UNSIGNED NOT NULL DEFAULT '0',
-    calendarcolor VARBINARY(10),
-    striptodos TINYINT(1) NULL,
-    stripalarms TINYINT(1) NULL,
-    stripattachments TINYINT(1) NULL,
-    lastmodified INT(11) UNSIGNED,
-    UNIQUE(principaluri, uri)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE schedulingobjects (
-    id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    principaluri VARBINARY(255),
-    calendardata MEDIUMBLOB,
-    uri VARBINARY(200),
-    lastmodified INT(11) UNSIGNED,
-    etag VARBINARY(32),
-    size INT(11) UNSIGNED NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
diff --git a/vendor/sabre/dav/examples/sql/mysql.locks.sql b/vendor/sabre/dav/examples/sql/mysql.locks.sql
deleted file mode 100644
index 96a3a88d9..000000000
--- a/vendor/sabre/dav/examples/sql/mysql.locks.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-CREATE TABLE locks (
-    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    owner VARCHAR(100),
-    timeout INTEGER UNSIGNED,
-    created INTEGER,
-    token VARBINARY(100),
-    scope TINYINT,
-    depth TINYINT,
-    uri VARBINARY(1000),
-    INDEX(token),
-    INDEX(uri(100))
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
diff --git a/vendor/sabre/dav/examples/sql/mysql.principals.sql b/vendor/sabre/dav/examples/sql/mysql.principals.sql
deleted file mode 100644
index ea0d16a27..000000000
--- a/vendor/sabre/dav/examples/sql/mysql.principals.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE TABLE principals (
-    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    uri VARBINARY(200) NOT NULL,
-    email VARBINARY(80),
-    displayname VARCHAR(80),
-    UNIQUE(uri)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-CREATE TABLE groupmembers (
-    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    principal_id INTEGER UNSIGNED NOT NULL,
-    member_id INTEGER UNSIGNED NOT NULL,
-    UNIQUE(principal_id, member_id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-INSERT INTO principals (uri,email,displayname) VALUES
-('principals/admin', 'admin@example.org','Administrator'),
-('principals/admin/calendar-proxy-read', null, null),
-('principals/admin/calendar-proxy-write', null, null);
-
diff --git a/vendor/sabre/dav/examples/sql/mysql.users.sql b/vendor/sabre/dav/examples/sql/mysql.users.sql
deleted file mode 100644
index 22ac312d5..000000000
--- a/vendor/sabre/dav/examples/sql/mysql.users.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE users (
-    id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    username VARBINARY(50),
-    digesta1 VARBINARY(32),
-    UNIQUE(username)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-INSERT INTO users (username,digesta1) VALUES
-('admin',  '87fd274b7b6c01e48d7c2f965da8ddf7');
diff --git a/vendor/sabre/dav/examples/sql/pgsql.addressbook.sql b/vendor/sabre/dav/examples/sql/pgsql.addressbook.sql
deleted file mode 100644
index ef2cc5b9a..000000000
--- a/vendor/sabre/dav/examples/sql/pgsql.addressbook.sql
+++ /dev/null
@@ -1,52 +0,0 @@
-CREATE TABLE addressbooks (
-    id SERIAL NOT NULL,
-    principaluri VARCHAR(255),
-    displayname VARCHAR(255),
-    uri VARCHAR(200),
-    description TEXT,
-    synctoken INTEGER NOT NULL DEFAULT 1
-);
-
-ALTER TABLE ONLY addressbooks
-    ADD CONSTRAINT addressbooks_pkey PRIMARY KEY (id);
-
-CREATE UNIQUE INDEX addressbooks_ukey
-    ON addressbooks USING btree (principaluri, uri);
-
-CREATE TABLE cards (
-    id SERIAL NOT NULL,
-    addressbookid INTEGER NOT NULL,
-    carddata TEXT,
-    uri VARCHAR(200),
-    lastmodified INTEGER,
-    etag VARCHAR(32),
-    size INTEGER NOT NULL
-);
-
-ALTER TABLE ONLY cards
-    ADD CONSTRAINT cards_pkey PRIMARY KEY (id);
-
-CREATE UNIQUE INDEX cards_ukey
-    ON cards USING btree (addressbookid, uri);
-
-ALTER TABLE ONLY cards
-    ADD CONSTRAINT cards_addressbookid_fkey FOREIGN KEY (addressbookid) REFERENCES addressbooks(id)
-        ON DELETE CASCADE;
-
-CREATE TABLE addressbookchanges (
-    id SERIAL NOT NULL,
-    uri VARCHAR(200) NOT NULL,
-    synctoken INTEGER NOT NULL,
-    addressbookid INTEGER NOT NULL,
-    operation SMALLINT NOT NULL
-);
-
-ALTER TABLE ONLY addressbookchanges
-    ADD CONSTRAINT addressbookchanges_pkey PRIMARY KEY (id);
-
-CREATE INDEX addressbookchanges_addressbookid_synctoken_ix
-    ON addressbookchanges USING btree (addressbookid, synctoken);
-
-ALTER TABLE ONLY addressbookchanges
-    ADD CONSTRAINT addressbookchanges_addressbookid_fkey FOREIGN KEY (addressbookid) REFERENCES addressbooks(id)
-        ON DELETE CASCADE;
diff --git a/vendor/sabre/dav/examples/sql/pgsql.calendars.sql b/vendor/sabre/dav/examples/sql/pgsql.calendars.sql
deleted file mode 100644
index d31084b86..000000000
--- a/vendor/sabre/dav/examples/sql/pgsql.calendars.sql
+++ /dev/null
@@ -1,93 +0,0 @@
-CREATE TABLE calendars (
-    id SERIAL NOT NULL,
-    principaluri VARCHAR(100),
-    displayname VARCHAR(100),
-    uri VARCHAR(200),
-    synctoken INTEGER NOT NULL DEFAULT 1,
-    description TEXT,
-    calendarorder INTEGER NOT NULL DEFAULT 0,
-    calendarcolor VARCHAR(10),
-    timezone TEXT,
-    components VARCHAR(20),
-    uid VARCHAR(200),
-    transparent SMALLINT NOT NULL DEFAULT '0'
-);
-
-ALTER TABLE ONLY calendars
-    ADD CONSTRAINT calendars_pkey PRIMARY KEY (id);
-
-CREATE UNIQUE INDEX calendars_ukey
-    ON calendars USING btree (principaluri, uri);
-
-CREATE TABLE calendarobjects (
-    id SERIAL NOT NULL,
-    calendardata TEXT,
-    uri VARCHAR(200),
-    calendarid INTEGER NOT NULL,
-    lastmodified INTEGER,
-    etag VARCHAR(32),
-    size INTEGER NOT NULL,
-    componenttype VARCHAR(8),
-    firstoccurence INTEGER,
-    lastoccurence INTEGER,
-    uid VARCHAR(200)
-);
-
-ALTER TABLE ONLY calendarobjects
-    ADD CONSTRAINT calendarobjects_pkey PRIMARY KEY (id);
-
-CREATE UNIQUE INDEX calendarobjects_ukey
-    ON calendarobjects USING btree (calendarid, uri);
-
-ALTER TABLE ONLY calendarobjects
-    ADD CONSTRAINT calendarobjects_calendarid_fkey FOREIGN KEY (calendarid) REFERENCES calendars(id)
-        ON DELETE CASCADE;
-
-CREATE TABLE calendarsubscriptions (
-    id SERIAL NOT NULL,
-    uri VARCHAR(200) NOT NULL,
-    principaluri VARCHAR(100) NOT NULL,
-    source TEXT,
-    displayname VARCHAR(100),
-    refreshrate VARCHAR(10),
-    calendarorder INTEGER NOT NULL DEFAULT 0,
-    calendarcolor VARCHAR(10),
-    striptodos SMALLINT NULL,
-    stripalarms SMALLINT NULL,
-    stripattachments SMALLINT NULL,
-    lastmodified INTEGER
-);
-
-ALTER TABLE ONLY calendarsubscriptions
-    ADD CONSTRAINT calendarsubscriptions_pkey PRIMARY KEY (id);
-
-CREATE UNIQUE INDEX calendarsubscriptions_ukey
-    ON calendarsubscriptions USING btree (principaluri, uri);
-
-CREATE TABLE calendarchanges (
-    id SERIAL NOT NULL,
-    uri VARCHAR(200) NOT NULL,
-    synctoken INTEGER NOT NULL,
-    calendarid INTEGER NOT NULL,
-    operation SMALLINT NOT NULL DEFAULT 0
-);
-
-ALTER TABLE ONLY calendarchanges
-    ADD CONSTRAINT calendarchanges_pkey PRIMARY KEY (id);
-
-CREATE INDEX calendarchanges_calendarid_synctoken_ix
-    ON calendarchanges USING btree (calendarid, synctoken);
-
-ALTER TABLE ONLY calendarchanges
-    ADD CONSTRAINT calendarchanges_calendar_fk FOREIGN KEY (calendarid) REFERENCES calendars(id)
-        ON DELETE CASCADE;
-
-CREATE TABLE schedulingobjects (
-    id SERIAL NOT NULL,
-    principaluri VARCHAR(255),
-    calendardata BYTEA,
-    uri VARCHAR(200),
-    lastmodified INTEGER,
-    etag VARCHAR(32),
-    size INTEGER NOT NULL
-);
diff --git a/vendor/sabre/dav/examples/sql/pgsql.locks.sql b/vendor/sabre/dav/examples/sql/pgsql.locks.sql
deleted file mode 100644
index 0290528ce..000000000
--- a/vendor/sabre/dav/examples/sql/pgsql.locks.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-CREATE TABLE locks (
-    id SERIAL NOT NULL,
-    owner VARCHAR(100),
-    timeout INTEGER,
-    created INTEGER,
-    token VARCHAR(100),
-    scope SMALLINT,
-    depth SMALLINT,
-    uri TEXT
-);
-
-ALTER TABLE ONLY locks
-    ADD CONSTRAINT locks_pkey PRIMARY KEY (id);
-
-CREATE INDEX locks_token_ix
-    ON locks USING btree (token);
-
-CREATE INDEX locks_uri_ix
-    ON locks USING btree (uri);
diff --git a/vendor/sabre/dav/examples/sql/pgsql.principals.sql b/vendor/sabre/dav/examples/sql/pgsql.principals.sql
deleted file mode 100644
index 9157acde0..000000000
--- a/vendor/sabre/dav/examples/sql/pgsql.principals.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-CREATE TABLE principals (
-    id SERIAL NOT NULL,
-    uri VARCHAR(200) NOT NULL,
-    email VARCHAR(80),
-    displayname VARCHAR(80)
-);
-
-ALTER TABLE ONLY principals
-    ADD CONSTRAINT principals_pkey PRIMARY KEY (id);
-
-CREATE UNIQUE INDEX principals_ukey
-    ON principals USING btree (uri);
-
-CREATE TABLE groupmembers (
-    id SERIAL NOT NULL,
-    principal_id INTEGER NOT NULL,
-    member_id INTEGER NOT NULL
-);
-
-ALTER TABLE ONLY groupmembers
-    ADD CONSTRAINT groupmembers_pkey PRIMARY KEY (id);
-
-CREATE UNIQUE INDEX groupmembers_ukey
-    ON groupmembers USING btree (principal_id, member_id);
-
-ALTER TABLE ONLY groupmembers
-    ADD CONSTRAINT groupmembers_principal_id_fkey FOREIGN KEY (principal_id) REFERENCES principals(id)
-        ON DELETE CASCADE;
-
-ALTER TABLE ONLY groupmembers
-    ADD CONSTRAINT groupmembers_member_id_id_fkey FOREIGN KEY (member_id) REFERENCES principals(id)
-        ON DELETE CASCADE;
-
-INSERT INTO principals (uri,email,displayname) VALUES
-('principals/admin', 'admin@example.org','Administrator'),
-('principals/admin/calendar-proxy-read', null, null),
-('principals/admin/calendar-proxy-write', null, null);
-
diff --git a/vendor/sabre/dav/examples/sql/pgsql.users.sql b/vendor/sabre/dav/examples/sql/pgsql.users.sql
deleted file mode 100644
index 9d6047b8c..000000000
--- a/vendor/sabre/dav/examples/sql/pgsql.users.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-CREATE TABLE users (
-    id SERIAL NOT NULL,
-    username VARCHAR(50),
-    digesta1 VARCHAR(32)
-);
-
-ALTER TABLE ONLY users
-    ADD CONSTRAINT users_pkey PRIMARY KEY (id);
-
-CREATE UNIQUE INDEX users_ukey
-    ON users USING btree (username);
-
-INSERT INTO users (username,digesta1) VALUES
-('admin',  '87fd274b7b6c01e48d7c2f965da8ddf7');
diff --git a/vendor/sabre/dav/examples/sql/sqlite.addressbooks.sql b/vendor/sabre/dav/examples/sql/sqlite.addressbooks.sql
deleted file mode 100644
index 0baed8bfb..000000000
--- a/vendor/sabre/dav/examples/sql/sqlite.addressbooks.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-CREATE TABLE addressbooks (
-    id integer primary key asc NOT NULL,
-    principaluri text NOT NULL,
-    displayname text,
-    uri text NOT NULL,
-    description text,
-    synctoken integer DEFAULT 1 NOT NULL
-);
-
-CREATE TABLE cards (
-    id integer primary key asc NOT NULL,
-    addressbookid integer NOT NULL,
-    carddata blob,
-    uri text NOT NULL,
-    lastmodified integer,
-    etag text,
-    size integer
-);
-
-CREATE TABLE addressbookchanges (
-    id integer primary key asc NOT NULL,
-    uri text,
-    synctoken integer NOT NULL,
-    addressbookid integer NOT NULL,
-    operation integer NOT NULL
-);
-
-CREATE INDEX addressbookid_synctoken ON addressbookchanges (addressbookid, synctoken);
diff --git a/vendor/sabre/dav/examples/sql/sqlite.calendars.sql b/vendor/sabre/dav/examples/sql/sqlite.calendars.sql
deleted file mode 100644
index a8654032d..000000000
--- a/vendor/sabre/dav/examples/sql/sqlite.calendars.sql
+++ /dev/null
@@ -1,64 +0,0 @@
-CREATE TABLE calendarobjects (
-    id integer primary key asc NOT NULL,
-    calendardata blob NOT NULL,
-    uri text NOT NULL,
-    calendarid integer NOT NULL,
-    lastmodified integer NOT NULL,
-    etag text NOT NULL,
-    size integer NOT NULL,
-    componenttype text,
-    firstoccurence integer,
-    lastoccurence integer,
-    uid text
-);
-
-CREATE TABLE calendars (
-    id integer primary key asc NOT NULL,
-    principaluri text NOT NULL,
-    displayname text,
-    uri text NOT NULL,
-    synctoken integer DEFAULT 1 NOT NULL,
-    description text,
-    calendarorder integer,
-    calendarcolor text,
-    timezone text,
-    components text NOT NULL,
-    transparent bool
-);
-
-CREATE TABLE calendarchanges (
-    id integer primary key asc NOT NULL,
-    uri text,
-    synctoken integer NOT NULL,
-    calendarid integer NOT NULL,
-    operation integer NOT NULL
-);
-
-CREATE INDEX calendarid_synctoken ON calendarchanges (calendarid, synctoken);
-
-CREATE TABLE calendarsubscriptions (
-    id integer primary key asc NOT NULL,
-    uri text NOT NULL,
-    principaluri text NOT NULL,
-    source text NOT NULL,
-    displayname text,
-    refreshrate text,
-    calendarorder integer,
-    calendarcolor text,
-    striptodos bool,
-    stripalarms bool,
-    stripattachments bool,
-    lastmodified int
-);
-
-CREATE TABLE schedulingobjects (
-    id integer primary key asc NOT NULL,
-    principaluri text NOT NULL,
-    calendardata blob,
-    uri text NOT NULL,
-    lastmodified integer,
-    etag text NOT NULL,
-    size integer NOT NULL
-);
-
-CREATE INDEX principaluri_uri ON calendarsubscriptions (principaluri, uri);
diff --git a/vendor/sabre/dav/examples/sql/sqlite.locks.sql b/vendor/sabre/dav/examples/sql/sqlite.locks.sql
deleted file mode 100644
index 622baea42..000000000
--- a/vendor/sabre/dav/examples/sql/sqlite.locks.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-BEGIN TRANSACTION;
-CREATE TABLE locks (
-	id integer primary key asc NOT NULL,
-	owner text,
-	timeout integer,
-	created integer,
-	token text,
-	scope integer,
-	depth integer,
-	uri text
-);
-COMMIT;
diff --git a/vendor/sabre/dav/examples/sql/sqlite.principals.sql b/vendor/sabre/dav/examples/sql/sqlite.principals.sql
deleted file mode 100644
index 4105156f8..000000000
--- a/vendor/sabre/dav/examples/sql/sqlite.principals.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-CREATE TABLE principals (
-    id INTEGER PRIMARY KEY ASC NOT NULL,
-    uri TEXT NOT NULL,
-    email TEXT,
-    displayname TEXT,
-    UNIQUE(uri)
-);
-
-CREATE TABLE groupmembers (
-    id INTEGER PRIMARY KEY ASC NOT NULL,
-    principal_id INTEGER NOT NULL,
-    member_id INTEGER NOT NULL,
-    UNIQUE(principal_id, member_id)
-);
-
-
-INSERT INTO principals (uri,email,displayname) VALUES ('principals/admin', 'admin@example.org','Administrator');
-INSERT INTO principals (uri,email,displayname) VALUES ('principals/admin/calendar-proxy-read', null, null);
-INSERT INTO principals (uri,email,displayname) VALUES ('principals/admin/calendar-proxy-write', null, null);
-
diff --git a/vendor/sabre/dav/examples/sql/sqlite.users.sql b/vendor/sabre/dav/examples/sql/sqlite.users.sql
deleted file mode 100644
index 5597b058a..000000000
--- a/vendor/sabre/dav/examples/sql/sqlite.users.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE TABLE users (
-	id integer primary key asc NOT NULL,
-	username TEXT NOT NULL,
-	digesta1 TEXT NOT NULL,
-	UNIQUE(username)
-);
-
-INSERT INTO users (username,digesta1) VALUES
-('admin',  '87fd274b7b6c01e48d7c2f965da8ddf7');
diff --git a/vendor/sabre/dav/examples/webserver/apache2_htaccess.conf b/vendor/sabre/dav/examples/webserver/apache2_htaccess.conf
deleted file mode 100644
index c5f29ba80..000000000
--- a/vendor/sabre/dav/examples/webserver/apache2_htaccess.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-RewriteEngine On
-# This makes every request go to server.php
-RewriteRule (.*) server.php [L]
-
-# Output buffering needs to be off, to prevent high memory usage
-php_flag output_buffering off
-
-# This is also to prevent high memory usage
-php_flag always_populate_raw_post_data off
-
-# This is almost a given, but magic quotes is *still* on on some
-# linux distributions
-php_flag magic_quotes_gpc off
-
-# SabreDAV is not compatible with mbstring function overloading
-php_flag mbstring.func_overload off
diff --git a/vendor/sabre/dav/examples/webserver/apache2_vhost.conf b/vendor/sabre/dav/examples/webserver/apache2_vhost.conf
deleted file mode 100644
index 74289641e..000000000
--- a/vendor/sabre/dav/examples/webserver/apache2_vhost.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# This is a sample configuration to setup a dedicated Apache vhost for WebDAV.
-#
-# The main thing that should be configured is the servername, and the path to
-# your SabreDAV installation (DocumentRoot).
-#
-# This configuration assumed mod_php5 is used, as it sets a few default php
-# settings as well.
-<VirtualHost *:*>
-
-    # Don't forget to change the server name
-    # ServerName dav.example.org
-
-    # The DocumentRoot is also required
-    # DocumentRoot /home/sabredav/
-
-    RewriteEngine On
-    # This makes every request go to server.php
-    RewriteRule ^/(.*)$ /server.php [L]
-
-    # Output buffering needs to be off, to prevent high memory usage
-    php_flag output_buffering off
-
-    # This is also to prevent high memory usage
-    php_flag always_populate_raw_post_data off
-
-    # SabreDAV is not compatible with mbstring function overloading
-    php_flag mbstring.func_overload off
-
-</VirtualHost *:*>
diff --git a/vendor/sabre/dav/examples/webserver/apache2_vhost_cgi.conf b/vendor/sabre/dav/examples/webserver/apache2_vhost_cgi.conf
deleted file mode 100644
index 607254c6e..000000000
--- a/vendor/sabre/dav/examples/webserver/apache2_vhost_cgi.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# This is a sample configuration to setup a dedicated Apache vhost for WebDAV.
-#
-# The main thing that should be configured is the servername, and the path to
-# your SabreDAV installation (DocumentRoot).
-#
-# This configuration assumes CGI or FastCGI is used.
-<VirtualHost *:*>
-
-    # Don't forget to change the server name
-    # ServerName dav.example.org
-
-    # The DocumentRoot is also required
-    # DocumentRoot /home/sabredav/
-
-    # This makes every request go to server.php. This also makes sure
-    # the Authentication information is available. If your server script is
-    # not called server.php, be sure to change it.
-    RewriteEngine On
-    RewriteRule ^/(.*)$ /server.php [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-
-</VirtualHost *:*>
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/BackendInterface.php b/vendor/sabre/dav/lib/CalDAV/Backend/BackendInterface.php
index 7513fb60d..bd8ee7602 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/BackendInterface.php
@@ -44,10 +44,12 @@ interface BackendInterface {
      * If the creation was a success, an id must be returned that can be used to
      * reference this calendar in other methods, such as updateCalendar.
      *
+     * The id can be any type, including ints, strings, objects or array.
+     *
      * @param string $principalUri
      * @param string $calendarUri
      * @param array $properties
-     * @return void
+     * @return mixed
      */
     function createCalendar($principalUri, $calendarUri, array $properties);
 
@@ -63,7 +65,7 @@ interface BackendInterface {
      *
      * Read the PropPatch documentation for more info and examples.
      *
-     * @param string $path
+     * @param mixed $calendarId
      * @param \Sabre\DAV\PropPatch $propPatch
      * @return void
      */
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php b/vendor/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php
index 19b9b22a7..9c00a89ef 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/NotificationSupport.php
@@ -43,4 +43,19 @@ interface NotificationSupport extends BackendInterface {
      */
     function deleteNotification($principalUri, NotificationInterface $notification);
 
+    /**
+     * This method is called when a user replied to a request to share.
+     *
+     * If the user chose to accept the share, this method should return the
+     * newly created calendar url.
+     *
+     * @param string href The sharee who is replying (often a mailto: address)
+     * @param int status One of the SharingPlugin::STATUS_* constants
+     * @param string $calendarUri The url to the calendar thats being shared
+     * @param string $inReplyTo The unique id this message is a response to
+     * @param string $summary A description of the reply
+     * @return null|string
+     */
+    function shareReply($href, $status, $calendarUri, $inReplyTo, $summary = null);
+
 }
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php b/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php
index 76b69dc6e..95f1d49a6 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/PDO.php
@@ -2,10 +2,11 @@
 
 namespace Sabre\CalDAV\Backend;
 
-use Sabre\VObject;
 use Sabre\CalDAV;
 use Sabre\DAV;
 use Sabre\DAV\Exception\Forbidden;
+use Sabre\VObject;
+use Sabre\DAV\Xml\Element\Sharee;
 
 /**
  * PDO CalDAV backend
@@ -17,7 +18,12 @@ use Sabre\DAV\Exception\Forbidden;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, SchedulingSupport {
+class PDO extends AbstractBackend
+    implements
+        SyncSupport,
+        SubscriptionSupport,
+        SchedulingSupport,
+        SharingSupport {
 
     /**
      * We need to specify a max date, because we need to stop *somewhere*
@@ -43,6 +49,16 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
      */
     public $calendarTableName = 'calendars';
 
+    /**
+     * The table name that will be used for calendars instances.
+     *
+     * A single calendar can have multiple instances, if the calendar is
+     * shared.
+     *
+     * @var string
+     */
+    public $calendarInstancesTableName = 'calendarinstances';
+
     /**
      * The table name that will be used for calendar objects
      *
@@ -140,16 +156,23 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
     function getCalendarsForUser($principalUri) {
 
         $fields = array_values($this->propertyMap);
-        $fields[] = 'id';
+        $fields[] = 'calendarid';
         $fields[] = 'uri';
         $fields[] = 'synctoken';
         $fields[] = 'components';
         $fields[] = 'principaluri';
         $fields[] = 'transparent';
+        $fields[] = 'access';
 
         // Making fields a comma-delimited list
         $fields = implode(', ', $fields);
-        $stmt = $this->pdo->prepare("SELECT " . $fields . " FROM " . $this->calendarTableName . " WHERE principaluri = ? ORDER BY calendarorder ASC");
+        $stmt = $this->pdo->prepare(<<<SQL
+SELECT {$this->calendarInstancesTableName}.id as id, $fields FROM {$this->calendarInstancesTableName}
+    LEFT JOIN {$this->calendarTableName} ON
+        {$this->calendarInstancesTableName}.calendarid = {$this->calendarTableName}.id
+WHERE principaluri = ? ORDER BY calendarorder ASC
+SQL
+        );
         $stmt->execute([$principalUri]);
 
         $calendars = [];
@@ -161,15 +184,27 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
             }
 
             $calendar = [
-                'id'                                                                 => $row['id'],
+                'id'                                                                 => [(int)$row['calendarid'], (int)$row['id']],
                 'uri'                                                                => $row['uri'],
                 'principaluri'                                                       => $row['principaluri'],
                 '{' . CalDAV\Plugin::NS_CALENDARSERVER . '}getctag'                  => 'http://sabre.io/ns/sync/' . ($row['synctoken'] ? $row['synctoken'] : '0'),
                 '{http://sabredav.org/ns}sync-token'                                 => $row['synctoken'] ? $row['synctoken'] : '0',
                 '{' . CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet($components),
                 '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp'         => new CalDAV\Xml\Property\ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
+                'share-resource-uri'                                                 => '/ns/share/' . $row['calendarid'],
             ];
 
+            $calendar['share-access'] = (int)$row['access'];
+            // 1 = owner, 2 = readonly, 3 = readwrite
+            if ($row['access'] > 1) {
+                // We need to find more information about the original owner.
+                //$stmt2 = $this->pdo->prepare('SELECT principaluri FROM ' . $this->calendarInstancesTableName . ' WHERE access = 1 AND id = ?');
+                //$stmt2->execute([$row['id']]);
+
+                // read-only is for backwards compatbility. Might go away in
+                // the future.
+                $calendar['read-only'] = (int)$row['access'] === \Sabre\DAV\Sharing\Plugin::ACCESS_READ;
+            }
 
             foreach ($this->propertyMap as $xmlName => $dbName) {
                 $calendar[$xmlName] = $row[$dbName];
@@ -199,31 +234,38 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
         $fieldNames = [
             'principaluri',
             'uri',
-            'synctoken',
             'transparent',
+            'calendarid',
         ];
         $values = [
             ':principaluri' => $principalUri,
             ':uri'          => $calendarUri,
-            ':synctoken'    => 1,
             ':transparent'  => 0,
         ];
 
-        // Default value
+
         $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
-        $fieldNames[] = 'components';
         if (!isset($properties[$sccs])) {
-            $values[':components'] = 'VEVENT,VTODO';
+            // Default value
+            $components = 'VEVENT,VTODO';
         } else {
             if (!($properties[$sccs] instanceof CalDAV\Xml\Property\SupportedCalendarComponentSet)) {
                 throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet');
             }
-            $values[':components'] = implode(',', $properties[$sccs]->getValue());
+            $components = implode(',', $properties[$sccs]->getValue());
         }
         $transp = '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp';
         if (isset($properties[$transp])) {
-            $values[':transparent'] = $properties[$transp]->getValue() === 'transparent';
+            $values[':transparent'] = $properties[$transp]->getValue() === 'transparent' ? 1 : 0;
         }
+        $stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarTableName . " (synctoken, components) VALUES (1, ?)");
+        $stmt->execute([$components]);
+
+        $calendarId = $this->pdo->lastInsertId(
+            $this->calendarTableName . '_id_seq'
+        );
+
+        $values[':calendarid'] = $calendarId;
 
         foreach ($this->propertyMap as $xmlName => $dbName) {
             if (isset($properties[$xmlName])) {
@@ -233,10 +275,14 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
             }
         }
 
-        $stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarTableName . " (" . implode(', ', $fieldNames) . ") VALUES (" . implode(', ', array_keys($values)) . ")");
+        $stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarInstancesTableName . " (" . implode(', ', $fieldNames) . ") VALUES (" . implode(', ', array_keys($values)) . ")");
+
         $stmt->execute($values);
 
-        return $this->pdo->lastInsertId();
+        return [
+            $calendarId,
+            $this->pdo->lastInsertId($this->calendarInstancesTableName . '_id_seq')
+        ];
 
     }
 
@@ -252,16 +298,21 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
      *
      * Read the PropPatch documenation for more info and examples.
      *
-     * @param string $calendarId
+     * @param mixed $calendarId
      * @param \Sabre\DAV\PropPatch $propPatch
      * @return void
      */
     function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch) {
 
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to $calendarId is expected to be an array with a calendarId and an instanceId');
+        }
+        list($calendarId, $instanceId) = $calendarId;
+
         $supportedProperties = array_keys($this->propertyMap);
         $supportedProperties[] = '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-calendar-transp';
 
-        $propPatch->handle($supportedProperties, function($mutations) use ($calendarId) {
+        $propPatch->handle($supportedProperties, function($mutations) use ($calendarId, $instanceId) {
             $newValues = [];
             foreach ($mutations as $propertyName => $propertyValue) {
 
@@ -282,8 +333,8 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
                 $valuesSql[] = $fieldName . ' = ?';
             }
 
-            $stmt = $this->pdo->prepare("UPDATE " . $this->calendarTableName . " SET " . implode(', ', $valuesSql) . " WHERE id = ?");
-            $newValues['id'] = $calendarId;
+            $stmt = $this->pdo->prepare("UPDATE " . $this->calendarInstancesTableName . " SET " . implode(', ', $valuesSql) . " WHERE id = ?");
+            $newValues['id'] = $instanceId;
             $stmt->execute(array_values($newValues));
 
             $this->addChange($calendarId, "", 2);
@@ -297,19 +348,49 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
     /**
      * Delete a calendar and all it's objects
      *
-     * @param string $calendarId
+     * @param mixed $calendarId
      * @return void
      */
     function deleteCalendar($calendarId) {
 
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->calendarObjectTableName . ' WHERE calendarid = ?');
-        $stmt->execute([$calendarId]);
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to $calendarId is expected to be an array with a calendarId and an instanceId');
+        }
+        list($calendarId, $instanceId) = $calendarId;
 
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->calendarTableName . ' WHERE id = ?');
-        $stmt->execute([$calendarId]);
+        $stmt = $this->pdo->prepare('SELECT access FROM ' . $this->calendarInstancesTableName . ' where id = ?');
+        $stmt->execute([$instanceId]);
+        $access = (int)$stmt->fetchColumn();
+
+        if ($access === \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER) {
+
+            /**
+             * If the user is the owner of the calendar, we delete all data and all
+             * instances.
+             **/
+            $stmt = $this->pdo->prepare('DELETE FROM ' . $this->calendarObjectTableName . ' WHERE calendarid = ?');
+            $stmt->execute([$calendarId]);
+
+            $stmt = $this->pdo->prepare('DELETE FROM ' . $this->calendarChangesTableName . ' WHERE calendarid = ?');
+            $stmt->execute([$calendarId]);
+
+            $stmt = $this->pdo->prepare('DELETE FROM ' . $this->calendarInstancesTableName . ' WHERE calendarid = ?');
+            $stmt->execute([$calendarId]);
+
+            $stmt = $this->pdo->prepare('DELETE FROM ' . $this->calendarTableName . ' WHERE id = ?');
+            $stmt->execute([$calendarId]);
+
+        } else {
+
+            /**
+             * If it was an instance of a shared calendar, we only delete that
+             * instance.
+             */
+            $stmt = $this->pdo->prepare('DELETE FROM ' . $this->calendarInstancesTableName . ' WHERE id = ?');
+            $stmt->execute([$instanceId]);
+
+        }
 
-        $stmt = $this->pdo->prepare('DELETE FROM ' . $this->calendarChangesTableName . ' WHERE calendarid = ?');
-        $stmt->execute([$calendarId]);
 
     }
 
@@ -341,11 +422,16 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
      * used/fetched to determine these numbers. If both are specified the
      * amount of times this is needed is reduced by a great degree.
      *
-     * @param string $calendarId
+     * @param mixed $calendarId
      * @return array
      */
     function getCalendarObjects($calendarId) {
 
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to $calendarId is expected to be an array with a calendarId and an instanceId');
+        }
+        list($calendarId, $instanceId) = $calendarId;
+
         $stmt = $this->pdo->prepare('SELECT id, uri, lastmodified, etag, calendarid, size, componenttype FROM ' . $this->calendarObjectTableName . ' WHERE calendarid = ?');
         $stmt->execute([$calendarId]);
 
@@ -354,9 +440,8 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
             $result[] = [
                 'id'           => $row['id'],
                 'uri'          => $row['uri'],
-                'lastmodified' => $row['lastmodified'],
+                'lastmodified' => (int)$row['lastmodified'],
                 'etag'         => '"' . $row['etag'] . '"',
-                'calendarid'   => $row['calendarid'],
                 'size'         => (int)$row['size'],
                 'component'    => strtolower($row['componenttype']),
             ];
@@ -378,12 +463,17 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
      *
      * This method must return null if the object did not exist.
      *
-     * @param string $calendarId
+     * @param mixed $calendarId
      * @param string $objectUri
      * @return array|null
      */
     function getCalendarObject($calendarId, $objectUri) {
 
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to $calendarId is expected to be an array with a calendarId and an instanceId');
+        }
+        list($calendarId, $instanceId) = $calendarId;
+
         $stmt = $this->pdo->prepare('SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM ' . $this->calendarObjectTableName . ' WHERE calendarid = ? AND uri = ?');
         $stmt->execute([$calendarId, $objectUri]);
         $row = $stmt->fetch(\PDO::FETCH_ASSOC);
@@ -393,9 +483,8 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
         return [
             'id'            => $row['id'],
             'uri'           => $row['uri'],
-            'lastmodified'  => $row['lastmodified'],
+            'lastmodified'  => (int)$row['lastmodified'],
             'etag'          => '"' . $row['etag'] . '"',
-            'calendarid'    => $row['calendarid'],
             'size'          => (int)$row['size'],
             'calendardata'  => $row['calendardata'],
             'component'     => strtolower($row['componenttype']),
@@ -417,6 +506,11 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
      */
     function getMultipleCalendarObjects($calendarId, array $uris) {
 
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to $calendarId is expected to be an array with a calendarId and an instanceId');
+        }
+        list($calendarId, $instanceId) = $calendarId;
+
         $query = 'SELECT id, uri, lastmodified, etag, calendarid, size, calendardata, componenttype FROM ' . $this->calendarObjectTableName . ' WHERE calendarid = ? AND uri IN (';
         // Inserting a whole bunch of question marks
         $query .= implode(',', array_fill(0, count($uris), '?'));
@@ -431,9 +525,8 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
             $result[] = [
                 'id'           => $row['id'],
                 'uri'          => $row['uri'],
-                'lastmodified' => $row['lastmodified'],
+                'lastmodified' => (int)$row['lastmodified'],
                 'etag'         => '"' . $row['etag'] . '"',
-                'calendarid'   => $row['calendarid'],
                 'size'         => (int)$row['size'],
                 'calendardata' => $row['calendardata'],
                 'component'    => strtolower($row['componenttype']),
@@ -465,6 +558,11 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
      */
     function createCalendarObject($calendarId, $objectUri, $calendarData) {
 
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to $calendarId is expected to be an array with a calendarId and an instanceId');
+        }
+        list($calendarId, $instanceId) = $calendarId;
+
         $extraData = $this->getDenormalizedData($calendarData);
 
         $stmt = $this->pdo->prepare('INSERT INTO ' . $this->calendarObjectTableName . ' (calendarid, uri, calendardata, lastmodified, etag, size, componenttype, firstoccurence, lastoccurence, uid) VALUES (?,?,?,?,?,?,?,?,?,?)');
@@ -506,6 +604,11 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
      */
     function updateCalendarObject($calendarId, $objectUri, $calendarData) {
 
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to $calendarId is expected to be an array with a calendarId and an instanceId');
+        }
+        list($calendarId, $instanceId) = $calendarId;
+
         $extraData = $this->getDenormalizedData($calendarData);
 
         $stmt = $this->pdo->prepare('UPDATE ' . $this->calendarObjectTableName . ' SET calendardata = ?, lastmodified = ?, etag = ?, size = ?, componenttype = ?, firstoccurence = ?, lastoccurence = ?, uid = ? WHERE calendarid = ? AND uri = ?');
@@ -583,6 +686,10 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
                 }
 
             }
+            
+            // Ensure Occurence values are positive
+            if ($firstOccurence < 0) $firstOccurence = 0;
+            if ($lastOccurence < 0) $lastOccurence = 0;
         }
 
         // Destroy circular references to PHP will GC the object.
@@ -604,12 +711,17 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
      *
      * The object uri is only the basename, or filename and not a full path.
      *
-     * @param string $calendarId
+     * @param mixed $calendarId
      * @param string $objectUri
      * @return void
      */
     function deleteCalendarObject($calendarId, $objectUri) {
 
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to $calendarId is expected to be an array with a calendarId and an instanceId');
+        }
+        list($calendarId, $instanceId) = $calendarId;
+
         $stmt = $this->pdo->prepare('DELETE FROM ' . $this->calendarObjectTableName . ' WHERE calendarid = ? AND uri = ?');
         $stmt->execute([$calendarId, $objectUri]);
 
@@ -665,12 +777,17 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
      * This specific implementation (for the PDO) backend optimizes filters on
      * specific components, and VEVENT time-ranges.
      *
-     * @param string $calendarId
+     * @param mixed $calendarId
      * @param array $filters
      * @return array
      */
     function calendarQuery($calendarId, array $filters) {
 
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to $calendarId is expected to be an array with a calendarId and an instanceId');
+        }
+        list($calendarId, $instanceId) = $calendarId;
+
         $componentType = null;
         $requirePostFilter = true;
         $timeRange = null;
@@ -766,14 +883,14 @@ class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport, S
 
         $query = <<<SQL
 SELECT
-    calendars.uri AS calendaruri, calendarobjects.uri as objecturi
+    calendar_instances.uri AS calendaruri, calendarobjects.uri as objecturi
 FROM
     $this->calendarObjectTableName AS calendarobjects
 LEFT JOIN
-    $this->calendarTableName AS calendars
-    ON calendarobjects.calendarid = calendars.id
+    $this->calendarInstancesTableName AS calendar_instances
+    ON calendarobjects.calendarid = calendar_instances.calendarid
 WHERE
-    calendars.principaluri = ?
+    calendar_instances.principaluri = ?
     AND
     calendarobjects.uid = ?
 SQL;
@@ -837,7 +954,7 @@ SQL;
      *
      * The limit is 'suggestive'. You are free to ignore it.
      *
-     * @param string $calendarId
+     * @param mixed $calendarId
      * @param string $syncToken
      * @param int $syncLevel
      * @param int $limit
@@ -845,6 +962,11 @@ SQL;
      */
     function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null) {
 
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to $calendarId is expected to be an array with a calendarId and an instanceId');
+        }
+        list($calendarId, $instanceId) = $calendarId;
+
         // Current synctoken
         $stmt = $this->pdo->prepare('SELECT synctoken FROM ' . $this->calendarTableName . ' WHERE id = ?');
         $stmt->execute([ $calendarId ]);
@@ -1043,7 +1165,9 @@ SQL;
         $stmt = $this->pdo->prepare("INSERT INTO " . $this->calendarSubscriptionsTableName . " (" . implode(', ', $fieldNames) . ") VALUES (" . implode(', ', array_keys($values)) . ")");
         $stmt->execute($values);
 
-        return $this->pdo->lastInsertId();
+        return $this->pdo->lastInsertId(
+            $this->calendarSubscriptionsTableName . '_id_seq'
+        );
 
     }
 
@@ -1207,4 +1331,179 @@ SQL;
 
     }
 
+    /**
+     * Updates the list of shares.
+     *
+     * @param mixed $calendarId
+     * @param \Sabre\DAV\Xml\Element\Sharee[] $sharees
+     * @return void
+     */
+    function updateInvites($calendarId, array $sharees) {
+
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to $calendarId is expected to be an array with a calendarId and an instanceId');
+        }
+        $currentInvites = $this->getInvites($calendarId);
+        list($calendarId, $instanceId) = $calendarId;
+
+        $removeStmt = $this->pdo->prepare("DELETE FROM " . $this->calendarInstancesTableName . " WHERE calendarid = ? AND share_href = ? AND access IN (2,3)");
+        $updateStmt = $this->pdo->prepare("UPDATE " . $this->calendarInstancesTableName . " SET access = ?, share_displayname = ?, share_invitestatus = ? WHERE calendarid = ? AND share_href = ?");
+
+        $insertStmt = $this->pdo->prepare('
+INSERT INTO ' . $this->calendarInstancesTableName . '
+    (
+        calendarid,
+        principaluri,
+        access,
+        displayname,
+        uri,
+        description,
+        calendarorder,
+        calendarcolor,
+        timezone,
+        transparent,
+        share_href,
+        share_displayname,
+        share_invitestatus
+    )
+    SELECT
+        ?,
+        ?,
+        ?,
+        displayname,
+        ?,
+        description,
+        calendarorder,
+        calendarcolor,
+        timezone,
+        1,
+        ?,
+        ?,
+        ?
+    FROM ' . $this->calendarInstancesTableName . ' WHERE id = ?');
+
+        foreach ($sharees as $sharee) {
+
+            if ($sharee->access === \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS) {
+                // if access was set no NOACCESS, it means access for an
+                // existing sharee was removed.
+                $removeStmt->execute([$calendarId, $sharee->href]);
+                continue;
+            }
+
+            if (is_null($sharee->principal)) {
+                // If the server could not determine the principal automatically,
+                // we will mark the invite status as invalid.
+                $sharee->inviteStatus = \Sabre\DAV\Sharing\Plugin::INVITE_INVALID;
+            } else {
+                // Because sabre/dav does not yet have an invitation system,
+                // every invite is automatically accepted for now.
+                $sharee->inviteStatus = \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED;
+            }
+
+            foreach ($currentInvites as $oldSharee) {
+
+                if ($oldSharee->href === $sharee->href) {
+                    // This is an update
+                    $sharee->properties = array_merge(
+                        $oldSharee->properties,
+                        $sharee->properties
+                    );
+                    $updateStmt->execute([
+                        $sharee->access,
+                        isset($sharee->properties['{DAV:}displayname']) ? $sharee->properties['{DAV:}displayname'] : null,
+                        $sharee->inviteStatus ?: $oldSharee->inviteStatus,
+                        $calendarId,
+                        $sharee->href
+                    ]);
+                    continue 2;
+                }
+
+            }
+            // If we got here, it means it was a new sharee
+            $insertStmt->execute([
+                $calendarId,
+                $sharee->principal,
+                $sharee->access,
+                \Sabre\DAV\UUIDUtil::getUUID(),
+                $sharee->href,
+                isset($sharee->properties['{DAV:}displayname']) ? $sharee->properties['{DAV:}displayname'] : null,
+                $sharee->inviteStatus ?: \Sabre\DAV\Sharing\Plugin::INVITE_NORESPONSE,
+                $instanceId
+            ]);
+
+        }
+
+    }
+
+    /**
+     * Returns the list of people whom a calendar is shared with.
+     *
+     * Every item in the returned list must be a Sharee object with at
+     * least the following properties set:
+     *   $href
+     *   $shareAccess
+     *   $inviteStatus
+     *
+     * and optionally:
+     *   $properties
+     *
+     * @param mixed $calendarId
+     * @return \Sabre\DAV\Xml\Element\Sharee[]
+     */
+    function getInvites($calendarId) {
+
+        if (!is_array($calendarId)) {
+            throw new \InvalidArgumentException('The value passed to getInvites() is expected to be an array with a calendarId and an instanceId');
+        }
+        list($calendarId, $instanceId) = $calendarId;
+
+        $query = <<<SQL
+SELECT
+    principaluri,
+    access,
+    share_href,
+    share_displayname,
+    share_invitestatus
+FROM {$this->calendarInstancesTableName}
+WHERE
+    calendarid = ?
+SQL;
+
+        $stmt = $this->pdo->prepare($query);
+        $stmt->execute([$calendarId]);
+
+        $result = [];
+        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+            $result[] = new Sharee([
+                'href'   => isset($row['share_href']) ? $row['share_href'] : \Sabre\HTTP\encodePath($row['principaluri']),
+                'access' => (int)$row['access'],
+                /// Everyone is always immediately accepted, for now.
+                'inviteStatus' => (int)$row['share_invitestatus'],
+                'properties'   =>
+                    !empty($row['share_displayname'])
+                    ?  [ '{DAV:}displayname' => $row['share_displayname'] ]
+                    : [],
+                'principal' => $row['principaluri'],
+            ]);
+
+        }
+        return $result;
+
+    }
+
+    /**
+     * Publishes a calendar
+     *
+     * @param mixed $calendarId
+     * @param bool $value
+     * @return void
+     */
+    function setPublishStatus($calendarId, $value) {
+
+        throw new \Sabre\DAV\Exception\NotImplemented('Not implemented');
+
+    }
+
 }
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/SharingSupport.php b/vendor/sabre/dav/lib/CalDAV/Backend/SharingSupport.php
index 6a11b0ab1..8b6e074e0 100644
--- a/vendor/sabre/dav/lib/CalDAV/Backend/SharingSupport.php
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/SharingSupport.php
@@ -5,231 +5,48 @@ namespace Sabre\CalDAV\Backend;
 /**
  * Adds support for sharing features to a CalDAV server.
  *
- * Note: This feature is experimental, and may change in between different
- * SabreDAV versions.
+ * CalDAV backends that implement this interface, must make the following
+ * modifications to getCalendarsForUser:
  *
- * Early warning: Currently SabreDAV provides no implementation for this. This
- * is, because in it's current state there is no elegant way to do this.
- * The problem lies in the fact that a real CalDAV server with sharing support
- * would first need email support (with invite notifications), and really also
- * a browser-frontend that allows people to accept or reject these shares.
- *
- * In addition, the CalDAV backends are currently kept as independent as
- * possible, and should not be aware of principals, email addresses or
- * accounts.
- *
- * Adding an implementation for Sharing to standard-sabredav would contradict
- * these goals, so for this reason this is currently not implemented, although
- * it may very well in the future; but probably not before SabreDAV 2.0.
- *
- * The interface works however, so if you implement all this, and do it
- * correctly sharing _will_ work. It's not particularly easy, and I _urge you_
- * to make yourself acquainted with the following document first:
- *
- * https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-sharing.txt
- *
- * An overview
- * ===========
- *
- * Implementing this interface will allow a user to share his or her calendars
- * to other users. Effectively, when a calendar is shared the calendar will
- * show up in both the Sharer's and Sharee's calendar-home root.
- * This interface adds a few methods that ensure that this happens, and there
- * are also a number of new requirements in the base-class you must now follow.
- *
- *
- * How it works
- * ============
- *
- * When a user shares a calendar, the updateShares() method will be called with
- * a list of sharees that are now added, and a list of sharees that have been
- * removed.
- * Removal is instant, but when a sharee is added the sharee first gets a
- * chance to accept or reject the invitation for a share.
- *
- * After a share is accepted, the calendar will be returned from
- * getUserCalendars for both the sharer, and the sharee.
- *
- * If the sharee deletes the calendar, only their share gets deleted. When the
- * owner deletes a calendar, it will be removed for everybody.
- *
- *
- * Notifications
- * =============
- *
- * During all these sharing operations, a lot of notifications are sent back
- * and forward.
- *
- * Whenever the list of sharees for a calendar has been changed (they have been
- * added, removed or modified) all sharees should get a notification for this
- * change.
- * This notification is always represented by:
- *
- * Sabre\CalDAV\Notifications\Notification\Invite
- *
- * In the case of an invite, the sharee may reply with an 'accept' or
- * 'decline'. These are always represented by:
- *
- * Sabre\CalDAV\Notifications\Notification\InviteReply
- *
- *
- * Calendar access by sharees
- * ==========================
- *
- * As mentioned earlier, shared calendars must now also be returned for
- * getCalendarsForUser for sharees. A few things change though.
- *
- * The following properties must be specified:
- *
- * 1. {http://calendarserver.org/ns/}shared-url
- *
- * This property MUST contain the url to the original calendar, that is.. the
- * path to the calendar from the owner.
- *
- * 2. {http://sabredav.org/ns}owner-principal
- *
- * This is a url to to the principal who is sharing the calendar.
- *
- * 3. {http://sabredav.org/ns}read-only
- *
- * This should be either 0 or 1, depending on if the user has read-only or
- * read-write access to the calendar.
- *
- * Only when this is done, the calendar will correctly be marked as a calendar
- * that's shared to him, thus allowing clients to display the correct interface
- * and ACL enforcement.
- *
- * If a sharee deletes their calendar, only their instance of the calendar
- * should be deleted, the original should still exists.
- * Pretty much any 'dead' WebDAV properties on these shared calendars should be
- * specific to a user. This means that if the displayname is changed by a
- * sharee, the original is not affected. This is also true for:
- *   * The description
- *   * The color
- *   * The order
- *   * And any other dead properties.
- *
- * Properties like a ctag should not be different for multiple instances of the
- * calendar.
- *
- * Lastly, objects *within* calendars should also have user-specific data. The
- * two things that are user-specific are:
- *   * VALARM objects
- *   * The TRANSP property
- *
- * This _also_ implies that if a VALARM is deleted by a sharee for some event,
- * this has no effect on the original VALARM.
- *
- * Understandably, the this last requirement is one of the hardest.
- * Realisticly, I can see people ignoring this part of the spec, but that could
- * cause a different set of issues.
- *
- *
- * Publishing
- * ==========
- *
- * When a user publishes a url, the server should generate a 'publish url'.
- * This is a read-only url, anybody can use to consume the calendar feed.
- *
- * Calendars are in one of two states:
- *   * published
- *   * unpublished
- *
- * If a calendar is published, the following property should be returned
- * for each calendar in getCalendarsForUser.
- *
- * {http://calendarserver.org/ns/}publish-url
- *
- * This element should contain a {DAV:}href element, which points to the
- * public url that does not require authentication. Unlike every other href,
- * this url must be absolute.
- *
- * Ideally, the following property is always returned
- *
- * {http://calendarserver.org/ns/}pre-publish-url
- *
- * This property should contain the url that the calendar _would_ have, if it
- * were to be published. iCal uses this to display the url, before the user
- * will actually publish it.
- *
- *
- * Selectively disabling publish or share feature
- * ==============================================
- *
- * If Sabre\CalDAV\Property\AllowedSharingModes is returned from
- * getCalendarsForUser, this allows the server to specify whether either sharing,
- * or publishing is supported.
- *
- * This allows a client to determine in advance which features are available,
- * and update the interface appropriately. If this property is not returned by
- * the backend, the SharingPlugin automatically injects it and assumes both
- * features are available.
+ * 1. Return shared calendars for users.
+ * 2. For every calendar, return calendar-resource-uri. This strings is a URI or
+ *    relative URI reference that must be unique for every calendar, but
+ *    identical for every instance of the same shared calenar.
+ * 3. For every calenar, you must return a share-access element. This element
+ *    should contain one of the Sabre\DAV\Sharing\Plugin:ACCESS_* contants and
+ *    indicates the access level the user has.
  *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-interface SharingSupport extends NotificationSupport {
+interface SharingSupport extends BackendInterface {
 
     /**
      * Updates the list of shares.
      *
-     * The first array is a list of people that are to be added to the
-     * calendar.
-     *
-     * Every element in the add array has the following properties:
-     *   * href - A url. Usually a mailto: address
-     *   * commonName - Usually a first and last name, or false
-     *   * summary - A description of the share, can also be false
-     *   * readOnly - A boolean value
-     *
-     * Every element in the remove array is just the address string.
-     *
-     * Note that if the calendar is currently marked as 'not shared' by and
-     * this method is called, the calendar should be 'upgraded' to a shared
-     * calendar.
-     *
      * @param mixed $calendarId
-     * @param array $add
-     * @param array $remove
+     * @param \Sabre\DAV\Xml\Element\Sharee[] $sharees
      * @return void
      */
-    function updateShares($calendarId, array $add, array $remove);
+    function updateInvites($calendarId, array $sharees);
 
     /**
      * Returns the list of people whom this calendar is shared with.
      *
-     * Every element in this array should have the following properties:
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-     *   * readOnly - boolean
-     *   * summary - Optional, a description for the share
+     * Every item in the returned list must be a Sharee object with at
+     * least the following properties set:
+     *   $href
+     *   $shareAccess
+     *   $inviteStatus
      *
-     * This method may be called by either the original instance of the
-     * calendar, as well as the shared instances. In the case of the shared
-     * instances, it is perfectly acceptable to return an empty array in case
-     * there are privacy concerns.
+     * and optionally:
+     *   $properties
      *
      * @param mixed $calendarId
-     * @return array
+     * @return \Sabre\DAV\Xml\Element\Sharee[]
      */
-    function getShares($calendarId);
-
-    /**
-     * This method is called when a user replied to a request to share.
-     *
-     * If the user chose to accept the share, this method should return the
-     * newly created calendar url.
-     *
-     * @param string href The sharee who is replying (often a mailto: address)
-     * @param int status One of the SharingPlugin::STATUS_* constants
-     * @param string $calendarUri The url to the calendar thats being shared
-     * @param string $inReplyTo The unique id this message is a response to
-     * @param string $summary A description of the reply
-     * @return null|string
-     */
-    function shareReply($href, $status, $calendarUri, $inReplyTo, $summary = null);
+    function getInvites($calendarId);
 
     /**
      * Publishes a calendar
diff --git a/vendor/sabre/dav/lib/CalDAV/Backend/SimplePDO.php b/vendor/sabre/dav/lib/CalDAV/Backend/SimplePDO.php
new file mode 100644
index 000000000..f8238ea9a
--- /dev/null
+++ b/vendor/sabre/dav/lib/CalDAV/Backend/SimplePDO.php
@@ -0,0 +1,296 @@
+<?php
+
+namespace Sabre\CalDAV\Backend;
+
+use Sabre\CalDAV;
+use Sabre\DAV;
+
+/**
+ * Simple PDO CalDAV backend.
+ *
+ * This class is basically the most minmum example to get a caldav backend up
+ * and running. This class uses the following schema (MySQL example):
+ *
+ * CREATE TABLE simple_calendars (
+ *    id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ *    uri VARBINARY(200) NOT NULL,
+ *    principaluri VARBINARY(200) NOT NULL
+ * );
+ *
+ * CREATE TABLE simple_calendarobjects (
+ *    id INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ *    calendarid INT UNSIGNED NOT NULL,
+ *    uri VARBINARY(200) NOT NULL,
+ *    calendardata MEDIUMBLOB
+ * )
+ *
+ * To make this class work, you absolutely need to have the PropertyStorage
+ * plugin enabled.
+ *
+ * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class SimplePDO extends AbstractBackend {
+
+    /**
+     * pdo
+     *
+     * @var \PDO
+     */
+    protected $pdo;
+
+    /**
+     * Creates the backend
+     *
+     * @param \PDO $pdo
+     */
+    function __construct(\PDO $pdo) {
+
+        $this->pdo = $pdo;
+
+    }
+
+    /**
+     * Returns a list of calendars for a principal.
+     *
+     * Every project is an array with the following keys:
+     *  * id, a unique id that will be used by other functions to modify the
+     *    calendar. This can be the same as the uri or a database key.
+     *  * uri. This is just the 'base uri' or 'filename' of the calendar.
+     *  * principaluri. The owner of the calendar. Almost always the same as
+     *    principalUri passed to this method.
+     *
+     * Furthermore it can contain webdav properties in clark notation. A very
+     * common one is '{DAV:}displayname'.
+     *
+     * Many clients also require:
+     * {urn:ietf:params:xml:ns:caldav}supported-calendar-component-set
+     * For this property, you can just return an instance of
+     * Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet.
+     *
+     * If you return {http://sabredav.org/ns}read-only and set the value to 1,
+     * ACL will automatically be put in read-only mode.
+     *
+     * @param string $principalUri
+     * @return array
+     */
+    function getCalendarsForUser($principalUri) {
+
+        // Making fields a comma-delimited list
+        $stmt = $this->pdo->prepare("SELECT id, uri FROM simple_calendars WHERE principaluri = ? ORDER BY id ASC");
+        $stmt->execute([$principalUri]);
+
+        $calendars = [];
+        while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+
+            $calendars[] = [
+                'id'           => $row['id'],
+                'uri'          => $row['uri'],
+                'principaluri' => $principalUri,
+            ];
+
+        }
+
+        return $calendars;
+
+    }
+
+    /**
+     * Creates a new calendar for a principal.
+     *
+     * If the creation was a success, an id must be returned that can be used
+     * to reference this calendar in other methods, such as updateCalendar.
+     *
+     * @param string $principalUri
+     * @param string $calendarUri
+     * @param array $properties
+     * @return string
+     */
+    function createCalendar($principalUri, $calendarUri, array $properties) {
+
+        $stmt = $this->pdo->prepare("INSERT INTO simple_calendars (principaluri, uri) VALUES (?, ?)");
+        $stmt->execute([$principalUri, $calendarUri]);
+
+        return $this->pdo->lastInsertId();
+
+    }
+
+    /**
+     * Delete a calendar and all it's objects
+     *
+     * @param string $calendarId
+     * @return void
+     */
+    function deleteCalendar($calendarId) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM simple_calendarobjects WHERE calendarid = ?');
+        $stmt->execute([$calendarId]);
+
+        $stmt = $this->pdo->prepare('DELETE FROM simple_calendars WHERE id = ?');
+        $stmt->execute([$calendarId]);
+
+    }
+
+    /**
+     * Returns all calendar objects within a calendar.
+     *
+     * Every item contains an array with the following keys:
+     *   * calendardata - The iCalendar-compatible calendar data
+     *   * uri - a unique key which will be used to construct the uri. This can
+     *     be any arbitrary string, but making sure it ends with '.ics' is a
+     *     good idea. This is only the basename, or filename, not the full
+     *     path.
+     *   * lastmodified - a timestamp of the last modification time
+     *   * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
+     *   '  "abcdef"')
+     *   * size - The size of the calendar objects, in bytes.
+     *   * component - optional, a string containing the type of object, such
+     *     as 'vevent' or 'vtodo'. If specified, this will be used to populate
+     *     the Content-Type header.
+     *
+     * Note that the etag is optional, but it's highly encouraged to return for
+     * speed reasons.
+     *
+     * The calendardata is also optional. If it's not returned
+     * 'getCalendarObject' will be called later, which *is* expected to return
+     * calendardata.
+     *
+     * If neither etag or size are specified, the calendardata will be
+     * used/fetched to determine these numbers. If both are specified the
+     * amount of times this is needed is reduced by a great degree.
+     *
+     * @param string $calendarId
+     * @return array
+     */
+    function getCalendarObjects($calendarId) {
+
+        $stmt = $this->pdo->prepare('SELECT id, uri, calendardata FROM simple_calendarobjects WHERE calendarid = ?');
+        $stmt->execute([$calendarId]);
+
+        $result = [];
+        foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
+            $result[] = [
+                'id'           => $row['id'],
+                'uri'          => $row['uri'],
+                'etag'         => '"' . md5($row['calendardata']) . '"',
+                'calendarid'   => $calendarId,
+                'size'         => strlen($row['calendardata']),
+                'calendardata' => $row['calendardata'],
+            ];
+        }
+
+        return $result;
+
+    }
+
+    /**
+     * Returns information from a single calendar object, based on it's object
+     * uri.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * The returned array must have the same keys as getCalendarObjects. The
+     * 'calendardata' object is required here though, while it's not required
+     * for getCalendarObjects.
+     *
+     * This method must return null if the object did not exist.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @return array|null
+     */
+    function getCalendarObject($calendarId, $objectUri) {
+
+        $stmt = $this->pdo->prepare('SELECT id, uri, calendardata FROM simple_calendarobjects WHERE calendarid = ? AND uri = ?');
+        $stmt->execute([$calendarId, $objectUri]);
+        $row = $stmt->fetch(\PDO::FETCH_ASSOC);
+
+        if (!$row) return null;
+
+        return [
+            'id'            => $row['id'],
+            'uri'           => $row['uri'],
+            'etag'          => '"' . md5($row['calendardata']) . '"',
+            'calendarid'    => $calendarId,
+            'size'          => strlen($row['calendardata']),
+            'calendardata'  => $row['calendardata'],
+         ];
+
+    }
+
+    /**
+     * Creates a new calendar object.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * It is possible return an etag from this function, which will be used in
+     * the response to this PUT request. Note that the ETag must be surrounded
+     * by double-quotes.
+     *
+     * However, you should only really return this ETag if you don't mangle the
+     * calendar-data. If the result of a subsequent GET to this object is not
+     * the exact same as this request body, you should omit the ETag.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @return string|null
+     */
+    function createCalendarObject($calendarId, $objectUri, $calendarData) {
+
+        $stmt = $this->pdo->prepare('INSERT INTO simple_calendarobjects (calendarid, uri, calendardata) VALUES (?,?,?)');
+        $stmt->execute([
+            $calendarId,
+            $objectUri,
+            $calendarData
+        ]);
+
+        return '"' . md5($calendarData) . '"';
+
+    }
+
+    /**
+     * Updates an existing calendarobject, based on it's uri.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * It is possible return an etag from this function, which will be used in
+     * the response to this PUT request. Note that the ETag must be surrounded
+     * by double-quotes.
+     *
+     * However, you should only really return this ETag if you don't mangle the
+     * calendar-data. If the result of a subsequent GET to this object is not
+     * the exact same as this request body, you should omit the ETag.
+     *
+     * @param mixed $calendarId
+     * @param string $objectUri
+     * @param string $calendarData
+     * @return string|null
+     */
+    function updateCalendarObject($calendarId, $objectUri, $calendarData) {
+
+        $stmt = $this->pdo->prepare('UPDATE simple_calendarobjects SET calendardata = ? WHERE calendarid = ? AND uri = ?');
+        $stmt->execute([$calendarData, $calendarId, $objectUri]);
+
+        return '"' . md5($calendarData) . '"';
+
+    }
+
+    /**
+     * Deletes an existing calendar object.
+     *
+     * The object uri is only the basename, or filename and not a full path.
+     *
+     * @param string $calendarId
+     * @param string $objectUri
+     * @return void
+     */
+    function deleteCalendarObject($calendarId, $objectUri) {
+
+        $stmt = $this->pdo->prepare('DELETE FROM simple_calendarobjects WHERE calendarid = ? AND uri = ?');
+        $stmt->execute([$calendarId, $objectUri]);
+
+    }
+
+}
diff --git a/vendor/sabre/dav/lib/CalDAV/Calendar.php b/vendor/sabre/dav/lib/CalDAV/Calendar.php
index ff8e19b15..90ace0d21 100644
--- a/vendor/sabre/dav/lib/CalDAV/Calendar.php
+++ b/vendor/sabre/dav/lib/CalDAV/Calendar.php
@@ -18,6 +18,8 @@ use Sabre\DAV\PropPatch;
  */
 class Calendar implements ICalendar, DAV\IProperties, DAV\Sync\ISyncCollection, DAV\IMultiGet {
 
+    use DAVACL\ACLTrait;
+
     /**
      * This is an array with calendar information
      *
@@ -86,7 +88,7 @@ class Calendar implements ICalendar, DAV\IProperties, DAV\Sync\ISyncCollection,
 
         foreach ($this->calendarInfo as $propName => $propValue) {
 
-            if ($propName[0] === '{')
+            if (!is_null($propValue) && $propName[0] === '{')
                 $response[$propName] = $this->calendarInfo[$propName];
 
         }
@@ -227,7 +229,7 @@ class Calendar implements ICalendar, DAV\IProperties, DAV\Sync\ISyncCollection,
     /**
      * Returns the last modification date as a unix timestamp.
      *
-     * @return void
+     * @return null
      */
     function getLastModified() {
 
@@ -248,19 +250,6 @@ class Calendar implements ICalendar, DAV\IProperties, DAV\Sync\ISyncCollection,
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
     /**
      * Returns a list of ACE's for this node.
      *
@@ -360,50 +349,6 @@ class Calendar implements ICalendar, DAV\IProperties, DAV\Sync\ISyncCollection,
 
     }
 
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See \Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        $default = DAVACL\Plugin::getDefaultSupportedPrivilegeSet();
-
-        // We need to inject 'read-free-busy' in the tree, aggregated under
-        // {DAV:}read.
-        foreach ($default['aggregates'] as &$agg) {
-
-            if ($agg['privilege'] !== '{DAV:}read') continue;
-
-            $agg['aggregates'][] = [
-                'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
-            ];
-
-        }
-        return $default;
-
-    }
 
     /**
      * Performs a calendar-query on the contents of this calendar.
diff --git a/vendor/sabre/dav/lib/CalDAV/CalendarHome.php b/vendor/sabre/dav/lib/CalDAV/CalendarHome.php
index a53f829e2..0a4bfb68f 100644
--- a/vendor/sabre/dav/lib/CalDAV/CalendarHome.php
+++ b/vendor/sabre/dav/lib/CalDAV/CalendarHome.php
@@ -22,6 +22,8 @@ use Sabre\HTTP\URLUtil;
  */
 class CalendarHome implements DAV\IExtendedCollection, DAVACL\IACL {
 
+    use DAVACL\ACLTrait;
+
     /**
      * CalDAV backend
      *
@@ -147,11 +149,7 @@ class CalendarHome implements DAV\IExtendedCollection, DAVACL\IACL {
         foreach ($this->caldavBackend->getCalendarsForUser($this->principalInfo['uri']) as $calendar) {
             if ($calendar['uri'] === $name) {
                 if ($this->caldavBackend instanceof Backend\SharingSupport) {
-                    if (isset($calendar['{http://calendarserver.org/ns/}shared-url'])) {
-                        return new SharedCalendar($this->caldavBackend, $calendar);
-                    } else {
-                        return new ShareableCalendar($this->caldavBackend, $calendar);
-                    }
+                    return new SharedCalendar($this->caldavBackend, $calendar);
                 } else {
                     return new Calendar($this->caldavBackend, $calendar);
                 }
@@ -198,11 +196,7 @@ class CalendarHome implements DAV\IExtendedCollection, DAVACL\IACL {
         $objs = [];
         foreach ($calendars as $calendar) {
             if ($this->caldavBackend instanceof Backend\SharingSupport) {
-                if (isset($calendar['{http://calendarserver.org/ns/}shared-url'])) {
-                    $objs[] = new SharedCalendar($this->caldavBackend, $calendar);
-                } else {
-                    $objs[] = new ShareableCalendar($this->caldavBackend, $calendar);
-                }
+                $objs[] = new SharedCalendar($this->caldavBackend, $calendar);
             } else {
                 $objs[] = new Calendar($this->caldavBackend, $calendar);
             }
@@ -278,11 +272,9 @@ class CalendarHome implements DAV\IExtendedCollection, DAVACL\IACL {
     }
 
     /**
-     * Returns the owner principal
+     * Returns the owner of the calendar home.
      *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
+     * @return string
      */
     function getOwner() {
 
@@ -290,19 +282,6 @@ class CalendarHome implements DAV\IExtendedCollection, DAVACL\IACL {
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
     /**
      * Returns a list of ACE's for this node.
      *
@@ -348,37 +327,6 @@ class CalendarHome implements DAV\IExtendedCollection, DAVACL\IACL {
 
     }
 
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
 
     /**
      * This method is called when a user replied to a request to share.
diff --git a/vendor/sabre/dav/lib/CalDAV/CalendarObject.php b/vendor/sabre/dav/lib/CalDAV/CalendarObject.php
index 393ca4cbd..001b35112 100644
--- a/vendor/sabre/dav/lib/CalDAV/CalendarObject.php
+++ b/vendor/sabre/dav/lib/CalDAV/CalendarObject.php
@@ -11,6 +11,8 @@ namespace Sabre\CalDAV;
  */
 class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\DAVACL\IACL {
 
+    use \Sabre\DAVACL\ACLTrait;
+
     /**
      * Sabre\CalDAV\Backend\BackendInterface
      *
@@ -191,19 +193,6 @@ class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
     /**
      * Returns a list of ACE's for this node.
      *
@@ -226,22 +215,12 @@ class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\
         // The default ACL
         return [
             [
-                'privilege' => '{DAV:}read',
+                'privilege' => '{DAV:}all',
                 'principal' => $this->calendarInfo['principaluri'],
                 'protected' => true,
             ],
             [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
+                'privilege' => '{DAV:}all',
                 'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
                 'protected' => true,
             ],
@@ -255,36 +234,4 @@ class CalendarObject extends \Sabre\DAV\File implements ICalendarObject, \Sabre\
 
     }
 
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new \Sabre\DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See \Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/CalDAV/ICSExportPlugin.php b/vendor/sabre/dav/lib/CalDAV/ICSExportPlugin.php
index 8c296d50f..a3a824c71 100644
--- a/vendor/sabre/dav/lib/CalDAV/ICSExportPlugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/ICSExportPlugin.php
@@ -170,13 +170,13 @@ class ICSExportPlugin extends DAV\ServerPlugin {
     protected function generateResponse($path, $start, $end, $expand, $componentType, $format, $properties, ResponseInterface $response) {
 
         $calDataProp = '{' . Plugin::NS_CALDAV . '}calendar-data';
+        $calendarNode = $this->server->tree->getNodeForPath($path);
 
         $blobs = [];
         if ($start || $end || $componentType) {
 
             // If there was a start or end filter, we need to enlist
             // calendarQuery for speed.
-            $calendarNode = $this->server->tree->getNodeForPath($path);
             $queryResult = $calendarNode->calendarQuery([
                 'name'         => 'VCALENDAR',
                 'comp-filters' => [
@@ -246,17 +246,29 @@ class ICSExportPlugin extends DAV\ServerPlugin {
             $mergedCalendar = $mergedCalendar->expand($start, $end, $calendarTimeZone);
         }
 
-        $response->setHeader('Content-Type', $format);
+        $filenameExtension = '.ics';
 
         switch ($format) {
             case 'text/calendar' :
                 $mergedCalendar = $mergedCalendar->serialize();
+                $filenameExtension = '.ics';
                 break;
             case 'application/calendar+json' :
                 $mergedCalendar = json_encode($mergedCalendar->jsonSerialize());
+                $filenameExtension = '.json';
                 break;
         }
 
+        $filename = preg_replace(
+            '/[^a-zA-Z0-9-_ ]/um',
+            '',
+            $calendarNode->getName()
+        );
+        $filename .= '-' . date('Y-m-d') . $filenameExtension;
+
+        $response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+        $response->setHeader('Content-Type', $format);
+
         $response->setStatus(200);
         $response->setBody($mergedCalendar);
 
@@ -272,11 +284,11 @@ class ICSExportPlugin extends DAV\ServerPlugin {
     function mergeObjects(array $properties, array $inputObjects) {
 
         $calendar = new VObject\Component\VCalendar();
-        $calendar->version = '2.0';
+        $calendar->VERSION = '2.0';
         if (DAV\Server::$exposeVersion) {
-            $calendar->prodid = '-//SabreDAV//SabreDAV ' . DAV\Version::VERSION . '//EN';
+            $calendar->PRODID = '-//SabreDAV//SabreDAV ' . DAV\Version::VERSION . '//EN';
         } else {
-            $calendar->prodid = '-//SabreDAV//SabreDAV//EN';
+            $calendar->PRODID = '-//SabreDAV//SabreDAV//EN';
         }
         if (isset($properties['{DAV:}displayname'])) {
             $calendar->{'X-WR-CALNAME'} = $properties['{DAV:}displayname'];
diff --git a/vendor/sabre/dav/lib/CalDAV/IShareableCalendar.php b/vendor/sabre/dav/lib/CalDAV/IShareableCalendar.php
deleted file mode 100644
index cfda91a55..000000000
--- a/vendor/sabre/dav/lib/CalDAV/IShareableCalendar.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-/**
- * This interface represents a Calendar that can be shared with other users.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-interface IShareableCalendar extends ICalendar {
-
-    /**
-     * Updates the list of shares.
-     *
-     * The first array is a list of people that are to be added to the
-     * calendar.
-     *
-     * Every element in the add array has the following properties:
-     *   * href - A url. Usually a mailto: address
-     *   * commonName - Usually a first and last name, or false
-     *   * summary - A description of the share, can also be false
-     *   * readOnly - A boolean value
-     *
-     * Every element in the remove array is just the address string.
-     *
-     * @param array $add
-     * @param array $remove
-     * @return void
-     */
-    function updateShares(array $add, array $remove);
-
-    /**
-     * Returns the list of people whom this calendar is shared with.
-     *
-     * Every element in this array should have the following properties:
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-     *   * readOnly - boolean
-     *   * summary - Optional, a description for the share
-     *
-     * @return array
-     */
-    function getShares();
-
-}
diff --git a/vendor/sabre/dav/lib/CalDAV/ISharedCalendar.php b/vendor/sabre/dav/lib/CalDAV/ISharedCalendar.php
index 84442ac21..15f3b5335 100644
--- a/vendor/sabre/dav/lib/CalDAV/ISharedCalendar.php
+++ b/vendor/sabre/dav/lib/CalDAV/ISharedCalendar.php
@@ -2,6 +2,8 @@
 
 namespace Sabre\CalDAV;
 
+use Sabre\DAV\Sharing\ISharedNode;
+
 /**
  * This interface represents a Calendar that is shared by a different user.
  *
@@ -9,28 +11,16 @@ namespace Sabre\CalDAV;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-interface ISharedCalendar extends ICalendar {
+interface ISharedCalendar extends ISharedNode {
 
     /**
-     * This method should return the url of the owners' copy of the shared
-     * calendar.
+     * Marks this calendar as published.
      *
-     * @return string
+     * Publishing a calendar should automatically create a read-only, public,
+     * subscribable calendar.
+     *
+     * @param bool $value
+     * @return void
      */
-    function getSharedUrl();
-
-    /**
-     * Returns the list of people whom this calendar is shared with.
-     *
-     * Every element in this array should have the following properties:
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-     *   * readOnly - boolean
-     *   * summary - Optional, a description for the share
-     *
-     * @return array
-     */
-    function getShares();
-
+    function setPublishStatus($value);
 }
diff --git a/vendor/sabre/dav/lib/CalDAV/Notifications/Collection.php b/vendor/sabre/dav/lib/CalDAV/Notifications/Collection.php
index 1fcc1171c..5fda61dfa 100644
--- a/vendor/sabre/dav/lib/CalDAV/Notifications/Collection.php
+++ b/vendor/sabre/dav/lib/CalDAV/Notifications/Collection.php
@@ -22,6 +22,8 @@ use Sabre\DAVACL;
  */
 class Collection extends DAV\Collection implements ICollection, DAVACL\IACL {
 
+    use DAVACL\ACLTrait;
+
     /**
      * The notification backend
      *
@@ -96,78 +98,4 @@ class Collection extends DAV\Collection implements ICollection, DAVACL\IACL {
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    function getACL() {
-
-        return [
-            [
-                'principal' => $this->getOwner(),
-                'privilege' => '{DAV:}read',
-                'protected' => true,
-            ],
-            [
-                'principal' => $this->getOwner(),
-                'privilege' => '{DAV:}write',
-                'protected' => true,
-            ]
-        ];
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new DAV\Exception\NotImplemented('Updating ACLs is not implemented here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/CalDAV/Notifications/Node.php b/vendor/sabre/dav/lib/CalDAV/Notifications/Node.php
index 47e78d5de..11df0c94b 100644
--- a/vendor/sabre/dav/lib/CalDAV/Notifications/Node.php
+++ b/vendor/sabre/dav/lib/CalDAV/Notifications/Node.php
@@ -20,6 +20,8 @@ use Sabre\DAVACL;
  */
 class Node extends DAV\File implements INode, DAVACL\IACL {
 
+    use DAVACL\ACLTrait;
+
     /**
      * The notification backend
      *
@@ -116,78 +118,4 @@ class Node extends DAV\File implements INode, DAVACL\IACL {
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    function getACL() {
-
-        return [
-            [
-                'principal' => $this->getOwner(),
-                'privilege' => '{DAV:}read',
-                'protected' => true,
-            ],
-            [
-                'principal' => $this->getOwner(),
-                'privilege' => '{DAV:}write',
-                'protected' => true,
-            ]
-        ];
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new DAV\Exception\NotImplemented('Updating ACLs is not implemented here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/CalDAV/Plugin.php b/vendor/sabre/dav/lib/CalDAV/Plugin.php
index 663490023..71ba75206 100644
--- a/vendor/sabre/dav/lib/CalDAV/Plugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/Plugin.php
@@ -5,8 +5,9 @@ namespace Sabre\CalDAV;
 use DateTimeZone;
 use Sabre\DAV;
 use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\INode;
 use Sabre\DAV\MkCol;
-use Sabre\DAV\Xml\Property\Href;
+use Sabre\DAV\Xml\Property\LocalHref;
 use Sabre\DAVACL;
 use Sabre\VObject;
 use Sabre\HTTP;
@@ -186,6 +187,7 @@ class Plugin extends DAV\ServerPlugin {
         $server->on('beforeCreateFile',    [$this, 'beforeCreateFile']);
         $server->on('beforeWriteContent',  [$this, 'beforeWriteContent']);
         $server->on('afterMethod:GET',     [$this, 'httpAfterGET']);
+        $server->on('getSupportedPrivilegeSet', [$this, 'getSupportedPrivilegeSet']);
 
         $server->xml->namespaceMap[self::NS_CALDAV] = 'cal';
         $server->xml->namespaceMap[self::NS_CALENDARSERVER] = 'cs';
@@ -233,9 +235,10 @@ class Plugin extends DAV\ServerPlugin {
      *
      * @param string $reportName
      * @param mixed $report
+     * @param mixed $path
      * @return bool
      */
-    function report($reportName, $report) {
+    function report($reportName, $report, $path) {
 
         switch ($reportName) {
             case '{' . self::NS_CALDAV . '}calendar-multiget' :
@@ -341,7 +344,7 @@ class Plugin extends DAV\ServerPlugin {
 
                 $calendarHomePath = $this->getCalendarHomeForPrincipal($principalUrl);
                 if (is_null($calendarHomePath)) return null;
-                return new Href($calendarHomePath . '/');
+                return new LocalHref($calendarHomePath . '/');
 
             });
             // The calendar-user-address-set property is basically mapped to
@@ -349,7 +352,7 @@ class Plugin extends DAV\ServerPlugin {
             $propFind->handle('{' . self::NS_CALDAV . '}calendar-user-address-set', function() use ($node) {
                 $addresses = $node->getAlternateUriSet();
                 $addresses[] = $this->server->getBaseUri() . $node->getPrincipalUrl() . '/';
-                return new Href($addresses, false);
+                return new LocalHref($addresses);
             });
             // For some reason somebody thought it was a good idea to add
             // another one of these properties. We're supporting it too.
@@ -394,8 +397,8 @@ class Plugin extends DAV\ServerPlugin {
 
                 }
 
-                $propFind->set($propRead, new Href($readList));
-                $propFind->set($propWrite, new Href($writeList));
+                $propFind->set($propRead, new LocalHref($readList));
+                $propFind->set($propWrite, new LocalHref($writeList));
 
             }
 
@@ -821,11 +824,7 @@ class Plugin extends DAV\ServerPlugin {
             $data = stream_get_contents($data);
         }
 
-        $before = md5($data);
-        // Converting the data to unicode, if needed.
-        $data = DAV\StringUtil::ensureUTF8($data);
-
-        if ($before !== md5($data)) $modified = true;
+        $before = $data;
 
         try {
 
@@ -865,7 +864,7 @@ class Plugin extends DAV\ServerPlugin {
         }
 
         $foundType = null;
-        $foundUID = null;
+
         foreach ($vobj->getComponents() as $component) {
             switch ($component->name) {
                 case 'VTIMEZONE' :
@@ -873,31 +872,59 @@ class Plugin extends DAV\ServerPlugin {
                 case 'VEVENT' :
                 case 'VTODO' :
                 case 'VJOURNAL' :
-                    if (is_null($foundType)) {
-                        $foundType = $component->name;
-                        if (!in_array($foundType, $supportedComponents)) {
-                            throw new Exception\InvalidComponentType('This calendar only supports ' . implode(', ', $supportedComponents) . '. We found a ' . $foundType);
-                        }
-                        if (!isset($component->UID)) {
-                            throw new DAV\Exception\BadRequest('Every ' . $component->name . ' component must have an UID');
-                        }
-                        $foundUID = (string)$component->UID;
-                    } else {
-                        if ($foundType !== $component->name) {
-                            throw new DAV\Exception\BadRequest('A calendar object must only contain 1 component. We found a ' . $component->name . ' as well as a ' . $foundType);
-                        }
-                        if ($foundUID !== (string)$component->UID) {
-                            throw new DAV\Exception\BadRequest('Every ' . $component->name . ' in this object must have identical UIDs');
-                        }
-                    }
+                    $foundType = $component->name;
                     break;
-                default :
-                    throw new DAV\Exception\BadRequest('You are not allowed to create components of type: ' . $component->name . ' here');
+            }
+
+        }
+
+        if (!$foundType || !in_array($foundType, $supportedComponents)) {
+            throw new Exception\InvalidComponentType('iCalendar objects must at least have a component of type ' . implode(', ', $supportedComponents));
+        }
+
+        $options = VObject\Node::PROFILE_CALDAV;
+        $prefer = $this->server->getHTTPPrefer();
+
+        if ($prefer['handling'] !== 'strict') {
+            $options |= VObject\Node::REPAIR;
+        }
+
+        $messages = $vobj->validate($options);
+
+        $highestLevel = 0;
+        $warningMessage = null;
+
+        // $messages contains a list of problems with the vcard, along with
+        // their severity.
+        foreach ($messages as $message) {
+
+            if ($message['level'] > $highestLevel) {
+                // Recording the highest reported error level.
+                $highestLevel = $message['level'];
+                $warningMessage = $message['message'];
+            }
+            switch ($message['level']) {
+
+                case 1 :
+                    // Level 1 means that there was a problem, but it was repaired.
+                    $modified = true;
+                    break;
+                case 2 :
+                    // Level 2 means a warning, but not critical
+                    break;
+                case 3 :
+                    // Level 3 means a critical error
+                    throw new DAV\Exception\UnsupportedMediaType('Validation error in iCalendar: ' . $message['message']);
 
             }
+
+        }
+        if ($warningMessage) {
+            $response->setHeader(
+                'X-Sabre-Ew-Gross',
+                'iCalendar validation warning: ' . $warningMessage
+            );
         }
-        if (!$foundType)
-            throw new DAV\Exception\BadRequest('iCalendar object must contain at least 1 of VEVENT, VTODO or VJOURNAL');
 
         // We use an extra variable to allow event handles to tell us wether
         // the object was modified or not.
@@ -917,12 +944,12 @@ class Plugin extends DAV\ServerPlugin {
             ]
         );
 
-        if ($subModified) {
+        if ($modified || $subModified) {
             // An event handler told us that it modified the object.
             $data = $vobj->serialize();
 
             // Using md5 to figure out if there was an *actual* change.
-            if (!$modified && $before !== md5($data)) {
+            if (!$modified && strcmp($data, $before) !== 0) {
                 $modified = true;
             }
 
@@ -933,6 +960,22 @@ class Plugin extends DAV\ServerPlugin {
 
     }
 
+    /**
+     * This method is triggered whenever a subsystem reqeuests the privileges
+     * that are supported on a particular node.
+     *
+     * @param INode $node
+     * @param array $supportedPrivilegeSet
+     */
+    function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilegeSet) {
+
+        if ($node instanceof ICalendar) {
+            $supportedPrivilegeSet['{DAV:}read']['aggregates']['{' . self::NS_CALDAV . '}read-free-busy'] = [
+                'abstract'   => false,
+                'aggregates' => [],
+            ];
+        }
+    }
 
     /**
      * This method is used to generate HTML output for the
diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/Inbox.php b/vendor/sabre/dav/lib/CalDAV/Schedule/Inbox.php
index 13212565e..6b374ea3f 100644
--- a/vendor/sabre/dav/lib/CalDAV/Schedule/Inbox.php
+++ b/vendor/sabre/dav/lib/CalDAV/Schedule/Inbox.php
@@ -17,6 +17,8 @@ use Sabre\VObject;
  */
 class Inbox extends DAV\Collection implements IInbox {
 
+    use DAVACL\ACLTrait;
+
     /**
      * CalDAV backend
      *
@@ -118,19 +120,6 @@ class Inbox extends DAV\Collection implements IInbox {
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
     /**
      * Returns a list of ACE's for this node.
      *
@@ -167,12 +156,7 @@ class Inbox extends DAV\Collection implements IInbox {
                 'protected' => true,
             ],
             [
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-deliver-invite',
-                'principal' => '{DAV:}authenticated',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-deliver-reply',
+                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-deliver',
                 'principal' => '{DAV:}authenticated',
                 'protected' => true,
             ],
@@ -180,48 +164,6 @@ class Inbox extends DAV\Collection implements IInbox {
 
     }
 
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('You\'re not allowed to update the ACL');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        $ns = '{' . CalDAV\Plugin::NS_CALDAV . '}';
-
-        $default = DAVACL\Plugin::getDefaultSupportedPrivilegeSet();
-        $default['aggregates'][] = [
-            'privilege'  => $ns . 'schedule-deliver',
-            'aggregates' => [
-               ['privilege' => $ns . 'schedule-deliver-invite'],
-               ['privilege' => $ns . 'schedule-deliver-reply'],
-            ],
-        ];
-        return $default;
-
-    }
-
     /**
      * Performs a calendar-query on the contents of this calendar.
      *
diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/Outbox.php b/vendor/sabre/dav/lib/CalDAV/Schedule/Outbox.php
index dabaee2ca..29eefa744 100644
--- a/vendor/sabre/dav/lib/CalDAV/Schedule/Outbox.php
+++ b/vendor/sabre/dav/lib/CalDAV/Schedule/Outbox.php
@@ -19,6 +19,8 @@ use Sabre\DAVACL;
  */
 class Outbox extends DAV\Collection implements IOutbox {
 
+    use DAVACL\ACLTrait;
+
     /**
      * The principal Uri
      *
@@ -74,19 +76,6 @@ class Outbox extends DAV\Collection implements IOutbox {
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
     /**
      * Returns a list of ACE's for this node.
      *
@@ -103,12 +92,7 @@ class Outbox extends DAV\Collection implements IOutbox {
 
         return [
             [
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
+                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-send',
                 'principal' => $this->getOwner(),
                 'protected' => true,
             ],
@@ -118,12 +102,7 @@ class Outbox extends DAV\Collection implements IOutbox {
                 'protected' => true,
             ],
             [
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
-                'principal' => $this->getOwner() . '/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
+                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-send',
                 'principal' => $this->getOwner() . '/calendar-proxy-write',
                 'protected' => true,
             ],
@@ -141,44 +120,4 @@ class Outbox extends DAV\Collection implements IOutbox {
 
     }
 
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('You\'re not allowed to update the ACL');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        $default = DAVACL\Plugin::getDefaultSupportedPrivilegeSet();
-        $default['aggregates'][] = [
-            'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
-        ];
-        $default['aggregates'][] = [
-            'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
-        ];
-
-        return $default;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php b/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php
index 827d6209b..47511140f 100644
--- a/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/Schedule/Plugin.php
@@ -5,10 +5,12 @@ namespace Sabre\CalDAV\Schedule;
 use DateTimeZone;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
+use Sabre\DAV\Sharing;
 use Sabre\DAV\PropFind;
 use Sabre\DAV\PropPatch;
 use Sabre\DAV\INode;
 use Sabre\DAV\Xml\Property\Href;
+use Sabre\DAV\Xml\Property\LocalHref;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 use Sabre\VObject;
@@ -100,12 +102,13 @@ class Plugin extends ServerPlugin {
     function initialize(Server $server) {
 
         $this->server = $server;
-        $server->on('method:POST',          [$this, 'httpPost']);
-        $server->on('propFind',             [$this, 'propFind']);
-        $server->on('propPatch',            [$this, 'propPatch']);
-        $server->on('calendarObjectChange', [$this, 'calendarObjectChange']);
-        $server->on('beforeUnbind',         [$this, 'beforeUnbind']);
-        $server->on('schedule',             [$this, 'scheduleLocalDelivery']);
+        $server->on('method:POST',              [$this, 'httpPost']);
+        $server->on('propFind',                 [$this, 'propFind']);
+        $server->on('propPatch',                [$this, 'propPatch']);
+        $server->on('calendarObjectChange',     [$this, 'calendarObjectChange']);
+        $server->on('beforeUnbind',             [$this, 'beforeUnbind']);
+        $server->on('schedule',                 [$this, 'scheduleLocalDelivery']);
+        $server->on('getSupportedPrivilegeSet', [$this, 'getSupportedPrivilegeSet']);
 
         $ns = '{' . self::NS_CALDAV . '}';
 
@@ -215,7 +218,7 @@ class Plugin extends ServerPlugin {
                 }
                 $outboxPath = $calendarHomePath . '/outbox/';
 
-                return new Href($outboxPath);
+                return new LocalHref($outboxPath);
 
             });
             // schedule-inbox-URL property
@@ -227,7 +230,7 @@ class Plugin extends ServerPlugin {
                 }
                 $inboxPath = $calendarHomePath . '/inbox/';
 
-                return new Href($inboxPath);
+                return new LocalHref($inboxPath);
 
             });
 
@@ -245,18 +248,28 @@ class Plugin extends ServerPlugin {
 
                 $result = $this->server->getPropertiesForPath($calendarHomePath, [
                     '{DAV:}resourcetype',
+                    '{DAV:}share-access',
                     $sccs,
                 ], 1);
 
                 foreach ($result as $child) {
-                    if (!isset($child[200]['{DAV:}resourcetype']) || !$child[200]['{DAV:}resourcetype']->is('{' . self::NS_CALDAV . '}calendar') || $child[200]['{DAV:}resourcetype']->is('{http://calendarserver.org/ns/}shared')) {
-                        // Node is either not a calendar or a shared instance.
+                    if (!isset($child[200]['{DAV:}resourcetype']) || !$child[200]['{DAV:}resourcetype']->is('{' . self::NS_CALDAV . '}calendar')) {
+                        // Node is either not a calendar
                         continue;
                     }
+                    if (isset($child[200]['{DAV:}share-access'])) {
+                        $shareAccess = $child[200]['{DAV:}share-access']->getValue();
+                        if ($shareAccess !== Sharing\Plugin::ACCESS_NOTSHARED && $shareAccess !== Sharing\Plugin::ACCESS_SHAREDOWNER) {
+                            // Node is a shared node, not owned by the relevant
+                            // user.
+                            continue;
+                        }
+
+                    }
                     if (!isset($child[200][$sccs]) || in_array('VEVENT', $child[200][$sccs]->getValue())) {
                         // Either there is no supported-calendar-component-set
                         // (which is fine) or we found one that supports VEVENT.
-                        return new Href($child['href']);
+                        return new LocalHref($child['href']);
                     }
                 }
 
@@ -492,7 +505,7 @@ class Plugin extends ServerPlugin {
         }
 
         if (!$aclPlugin->checkPrivileges($inboxPath, $caldavNS . $privilege, DAVACL\Plugin::R_PARENT, false)) {
-            $iTipMessage->scheduleStatus = '3.8;organizer did not have the ' . $privilege . ' privilege on the attendees inbox';
+            $iTipMessage->scheduleStatus = '3.8;insufficient privileges: ' . $privilege . ' is required on the recipient schedule inbox.';
             return;
         }
 
@@ -560,6 +573,65 @@ class Plugin extends ServerPlugin {
 
     }
 
+    /**
+     * This method is triggered whenever a subsystem requests the privileges
+     * that are supported on a particular node.
+     *
+     * We need to add a number of privileges for scheduling purposes.
+     *
+     * @param INode $node
+     * @param array $supportedPrivilegeSet
+     */
+    function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilegeSet) {
+
+        $ns = '{' . self::NS_CALDAV . '}';
+        if ($node instanceof IOutbox) {
+            $supportedPrivilegeSet[$ns . 'schedule-send'] = [
+                'abstract'   => false,
+                'aggregates' => [
+                    $ns . 'schedule-send-invite' => [
+                        'abstract'   => false,
+                        'aggregates' => [],
+                    ],
+                    $ns . 'schedule-send-reply' => [
+                        'abstract'   => false,
+                        'aggregates' => [],
+                    ],
+                    $ns . 'schedule-send-freebusy' => [
+                        'abstract'   => false,
+                        'aggregates' => [],
+                    ],
+                    // Privilege from an earlier scheduling draft, but still
+                    // used by some clients.
+                    $ns . 'schedule-post-vevent' => [
+                        'abstract'   => false,
+                        'aggregates' => [],
+                    ],
+                ]
+            ];
+        }
+        if ($node instanceof IInbox) {
+            $supportedPrivilegeSet[$ns . 'schedule-deliver'] = [
+                'abstract'   => false,
+                'aggregates' => [
+                    $ns . 'schedule-deliver-invite' => [
+                        'abstract'   => false,
+                        'aggregates' => [],
+                    ],
+                    $ns . 'schedule-deliver-reply' => [
+                        'abstract'   => false,
+                        'aggregates' => [],
+                    ],
+                    $ns . 'schedule-query-freebusy' => [
+                        'abstract'   => false,
+                        'aggregates' => [],
+                    ],
+                ]
+            ];
+        }
+
+    }
+
     /**
      * This method looks at an old iCalendar object, a new iCalendar object and
      * starts sending scheduling messages based on the changes.
@@ -647,7 +719,7 @@ class Plugin extends ServerPlugin {
     /**
      * This method handles POST requests to the schedule-outbox.
      *
-     * Currently, two types of requests are support:
+     * Currently, two types of requests are supported:
      *   * FREEBUSY requests from RFC 6638
      *   * Simple iTIP messages from draft-desruisseaux-caldav-sched-04
      *
@@ -699,7 +771,7 @@ class Plugin extends ServerPlugin {
 
         if ($componentType === 'VFREEBUSY' && $method === 'REQUEST') {
 
-            $acl && $acl->checkPrivileges($outboxPath, '{' . self::NS_CALDAV . '}schedule-query-freebusy');
+            $acl && $acl->checkPrivileges($outboxPath, '{' . self::NS_CALDAV . '}schedule-send-freebusy');
             $this->handleFreeBusyRequest($outboxNode, $vObject, $request, $response);
 
             // Destroy circular references so PHP can GC the object.
@@ -727,7 +799,7 @@ class Plugin extends ServerPlugin {
     protected function handleFreeBusyRequest(IOutbox $outbox, VObject\Component $vObject, RequestInterface $request, ResponseInterface $response) {
 
         $vFreeBusy = $vObject->VFREEBUSY;
-        $organizer = $vFreeBusy->organizer;
+        $organizer = $vFreeBusy->ORGANIZER;
 
         $organizer = (string)$organizer;
 
@@ -863,6 +935,9 @@ class Plugin extends ServerPlugin {
         $homeSet = $result[0][200][$caldavNS . 'calendar-home-set']->getHref();
         $inboxUrl = $result[0][200][$caldavNS . 'schedule-inbox-URL']->getHref();
 
+        // Do we have permission?
+        $aclPlugin->checkPrivileges($inboxUrl, $caldavNS . 'schedule-query-freebusy');
+
         // Grabbing the calendar list
         $objects = [];
         $calendarTimeZone = new DateTimeZone('UTC');
@@ -882,8 +957,6 @@ class Plugin extends ServerPlugin {
                 continue;
             }
 
-            $aclPlugin->checkPrivileges($homeSet . $node->getName(), $caldavNS . 'read-free-busy');
-
             if (isset($props[$ctz])) {
                 $vtimezoneObj = VObject\Reader::read($props[$ctz]);
                 $calendarTimeZone = $vtimezoneObj->VTIMEZONE->getTimeZone();
diff --git a/vendor/sabre/dav/lib/CalDAV/Schedule/SchedulingObject.php b/vendor/sabre/dav/lib/CalDAV/Schedule/SchedulingObject.php
index a36646e6c..6d9d3d5ec 100644
--- a/vendor/sabre/dav/lib/CalDAV/Schedule/SchedulingObject.php
+++ b/vendor/sabre/dav/lib/CalDAV/Schedule/SchedulingObject.php
@@ -134,22 +134,12 @@ class SchedulingObject extends \Sabre\CalDAV\CalendarObject implements IScheduli
         // The default ACL
         return [
             [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->objectData['principaluri'],
+                'privilege' => '{DAV:}all',
+                'principal' => '{DAV:}owner',
                 'protected' => true,
             ],
             [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->objectData['principaluri'],
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->objectData['principaluri'] . '/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
+                'privilege' => '{DAV:}all',
                 'principal' => $this->objectData['principaluri'] . '/calendar-proxy-write',
                 'protected' => true,
             ],
diff --git a/vendor/sabre/dav/lib/CalDAV/ShareableCalendar.php b/vendor/sabre/dav/lib/CalDAV/ShareableCalendar.php
deleted file mode 100644
index c11695d5f..000000000
--- a/vendor/sabre/dav/lib/CalDAV/ShareableCalendar.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-/**
- * This object represents a CalDAV calendar that can be shared with other
- * users.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ShareableCalendar extends Calendar implements IShareableCalendar {
-
-    /**
-     * Updates the list of shares.
-     *
-     * The first array is a list of people that are to be added to the
-     * calendar.
-     *
-     * Every element in the add array has the following properties:
-     *   * href - A url. Usually a mailto: address
-     *   * commonName - Usually a first and last name, or false
-     *   * summary - A description of the share, can also be false
-     *   * readOnly - A boolean value
-     *
-     * Every element in the remove array is just the address string.
-     *
-     * @param array $add
-     * @param array $remove
-     * @return void
-     */
-    function updateShares(array $add, array $remove) {
-
-        $this->caldavBackend->updateShares($this->calendarInfo['id'], $add, $remove);
-
-    }
-
-    /**
-     * Returns the list of people whom this calendar is shared with.
-     *
-     * Every element in this array should have the following properties:
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-     *   * readOnly - boolean
-     *   * summary - Optional, a description for the share
-     *
-     * @return array
-     */
-    function getShares() {
-
-        return $this->caldavBackend->getShares($this->calendarInfo['id']);
-
-    }
-
-    /**
-     * Marks this calendar as published.
-     *
-     * Publishing a calendar should automatically create a read-only, public,
-     * subscribable calendar.
-     *
-     * @param bool $value
-     * @return void
-     */
-    function setPublishStatus($value) {
-
-        $this->caldavBackend->setPublishStatus($this->calendarInfo['id'], $value);
-
-    }
-
-}
diff --git a/vendor/sabre/dav/lib/CalDAV/SharedCalendar.php b/vendor/sabre/dav/lib/CalDAV/SharedCalendar.php
index 7973eff9c..7a77616e3 100644
--- a/vendor/sabre/dav/lib/CalDAV/SharedCalendar.php
+++ b/vendor/sabre/dav/lib/CalDAV/SharedCalendar.php
@@ -2,6 +2,8 @@
 
 namespace Sabre\CalDAV;
 
+use Sabre\DAV\Sharing\Plugin as SPlugin;
+
 /**
  * This object represents a CalDAV calendar that is shared by a different user.
  *
@@ -12,50 +14,84 @@ namespace Sabre\CalDAV;
 class SharedCalendar extends Calendar implements ISharedCalendar {
 
     /**
-     * Constructor
+     * Returns the 'access level' for the instance of this shared resource.
      *
-     * @param Backend\BackendInterface $caldavBackend
-     * @param array $calendarInfo
+     * The value should be one of the Sabre\DAV\Sharing\Plugin::ACCESS_
+     * constants.
+     *
+     * @return int
      */
-    function __construct(Backend\BackendInterface $caldavBackend, $calendarInfo) {
+    function getShareAccess() {
 
-        $required = [
-            '{http://calendarserver.org/ns/}shared-url',
-            '{http://sabredav.org/ns}owner-principal',
-            '{http://sabredav.org/ns}read-only',
-        ];
-        foreach ($required as $r) {
-            if (!isset($calendarInfo[$r])) {
-                throw new \InvalidArgumentException('The ' . $r . ' property must be specified for SharedCalendar(s)');
-            }
-        }
-
-        parent::__construct($caldavBackend, $calendarInfo);
+        return isset($this->calendarInfo['share-access']) ? $this->calendarInfo['share-access'] : SPlugin::ACCESS_NOTSHARED;
 
     }
 
     /**
-     * This method should return the url of the owners' copy of the shared
-     * calendar.
+     * This function must return a URI that uniquely identifies the shared
+     * resource. This URI should be identical across instances, and is
+     * also used in several other XML bodies to connect invites to
+     * resources.
+     *
+     * This may simply be a relative reference to the original shared instance,
+     * but it could also be a urn. As long as it's a valid URI and unique.
      *
      * @return string
      */
-    function getSharedUrl() {
+    function getShareResourceUri() {
 
-        return $this->calendarInfo['{http://calendarserver.org/ns/}shared-url'];
+        return $this->calendarInfo['share-resource-uri'];
 
     }
 
     /**
-     * Returns the owner principal
+     * Updates the list of sharees.
      *
-     * This must be a url to a principal, or null if there's no owner
+     * Every item must be a Sharee object.
      *
-     * @return string|null
+     * @param \Sabre\DAV\Xml\Element\Sharee[] $sharees
+     * @return void
      */
-    function getOwner() {
+    function updateInvites(array $sharees) {
 
-        return $this->calendarInfo['{http://sabredav.org/ns}owner-principal'];
+        $this->caldavBackend->updateInvites($this->calendarInfo['id'], $sharees);
+
+    }
+
+    /**
+     * Returns the list of people whom this resource is shared with.
+     *
+     * Every item in the returned array must be a Sharee object with
+     * at least the following properties set:
+     *
+     * * $href
+     * * $shareAccess
+     * * $inviteStatus
+     *
+     * and optionally:
+     *
+     * * $properties
+     *
+     * @return \Sabre\DAV\Xml\Element\Sharee[]
+     */
+    function getInvites() {
+
+        return $this->caldavBackend->getInvites($this->calendarInfo['id']);
+
+    }
+
+    /**
+     * Marks this calendar as published.
+     *
+     * Publishing a calendar should automatically create a read-only, public,
+     * subscribable calendar.
+     *
+     * @param bool $value
+     * @return void
+     */
+    function setPublishStatus($value) {
+
+        $this->caldavBackend->setPublishStatus($this->calendarInfo['id'], $value);
 
     }
 
@@ -73,32 +109,72 @@ class SharedCalendar extends Calendar implements ISharedCalendar {
      */
     function getACL() {
 
-        // The top-level ACL only contains access information for the true
-        // owner of the calendar, so we need to add the information for the
-        // sharee.
-        $acl = parent::getACL();
-        $acl[] = [
-            'privilege' => '{DAV:}read',
-            'principal' => $this->calendarInfo['principaluri'],
-            'protected' => true,
-        ];
-        if ($this->calendarInfo['{http://sabredav.org/ns}read-only']) {
-            $acl[] = [
-                'privilege' => '{DAV:}write-properties',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ];
-        } else {
-            $acl[] = [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ];
+        $acl = [];
+
+        switch ($this->getShareAccess()) {
+            case SPlugin::ACCESS_NOTSHARED :
+            case SPlugin::ACCESS_SHAREDOWNER :
+                $acl[] = [
+                    'privilege' => '{DAV:}share',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}share',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                // No break intentional!
+            case SPlugin::ACCESS_READWRITE :
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                // No break intentional!
+            case SPlugin::ACCESS_READ :
+                $acl[] = [
+                    'privilege' => '{DAV:}write-properties',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}write-properties',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
+                    'principal' => '{DAV:}authenticated',
+                    'protected' => true,
+                ];
+                break;
         }
         return $acl;
 
     }
 
+
     /**
      * This method returns the ACL's for calendar objects in this calendar.
      * The result of this method automatically gets passed to the
@@ -108,41 +184,46 @@ class SharedCalendar extends Calendar implements ISharedCalendar {
      */
     function getChildACL() {
 
-        $acl = parent::getChildACL();
-        $acl[] = [
-            'privilege' => '{DAV:}read',
-            'principal' => $this->calendarInfo['principaluri'],
-            'protected' => true,
-        ];
+        $acl = [];
 
-        if (!$this->calendarInfo['{http://sabredav.org/ns}read-only']) {
-            $acl[] = [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->calendarInfo['principaluri'],
-                'protected' => true,
-            ];
+        switch ($this->getShareAccess()) {
+            case SPlugin::ACCESS_NOTSHARED :
+                // No break intentional
+            case SPlugin::ACCESS_SHAREDOWNER :
+                // No break intentional
+            case SPlugin::ACCESS_READWRITE:
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}write',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                // No break intentional
+            case SPlugin::ACCESS_READ:
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'],
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-write',
+                    'protected' => true,
+                ];
+                $acl[] = [
+                    'privilege' => '{DAV:}read',
+                    'principal' => $this->calendarInfo['principaluri'] . '/calendar-proxy-read',
+                    'protected' => true,
+                ];
+                break;
         }
+
         return $acl;
 
     }
 
-
-    /**
-     * Returns the list of people whom this calendar is shared with.
-     *
-     * Every element in this array should have the following properties:
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first + last name
-     *   * status - See the Sabre\CalDAV\SharingPlugin::STATUS_ constants.
-     *   * readOnly - boolean
-     *   * summary - Optional, a description for the share
-     *
-     * @return array
-     */
-    function getShares() {
-
-        return $this->caldavBackend->getShares($this->calendarInfo['id']);
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/CalDAV/SharingPlugin.php b/vendor/sabre/dav/lib/CalDAV/SharingPlugin.php
index 5154fb1de..6f7df02bc 100644
--- a/vendor/sabre/dav/lib/CalDAV/SharingPlugin.php
+++ b/vendor/sabre/dav/lib/CalDAV/SharingPlugin.php
@@ -4,6 +4,7 @@ namespace Sabre\CalDAV;
 
 use Sabre\DAV;
 use Sabre\DAV\Xml\Property\Href;
+use Sabre\DAV\Xml\Property\LocalHref;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 
@@ -25,15 +26,6 @@ use Sabre\HTTP\ResponseInterface;
  */
 class SharingPlugin extends DAV\ServerPlugin {
 
-    /**
-     * These are the various status constants used by sharing-messages.
-     */
-    const STATUS_ACCEPTED = 1;
-    const STATUS_DECLINED = 2;
-    const STATUS_DELETED = 3;
-    const STATUS_NORESPONSE = 4;
-    const STATUS_INVALID = 5;
-
     /**
      * Reference to SabreDAV server object.
      *
@@ -83,7 +75,10 @@ class SharingPlugin extends DAV\ServerPlugin {
     function initialize(DAV\Server $server) {
 
         $this->server = $server;
-        $server->resourceTypeMapping['Sabre\\CalDAV\\ISharedCalendar'] = '{' . Plugin::NS_CALENDARSERVER . '}shared';
+
+        if (is_null($this->server->getPlugin('sharing'))) {
+            throw new \LogicException('The generic "sharing" plugin must be loaded before the caldav sharing plugin. Call $server->addPlugin(new \Sabre\DAV\Sharing\Plugin()); before this one.');
+        }
 
         array_push(
             $this->server->protectedProperties,
@@ -114,24 +109,8 @@ class SharingPlugin extends DAV\ServerPlugin {
      */
     function propFindEarly(DAV\PropFind $propFind, DAV\INode $node) {
 
-        if ($node instanceof IShareableCalendar) {
-
-            $propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}invite', function() use ($node) {
-                return new Xml\Property\Invite(
-                    $node->getShares()
-                );
-            });
-
-        }
-
         if ($node instanceof ISharedCalendar) {
 
-            $propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}shared-url', function() use ($node) {
-                return new Href(
-                    $node->getSharedUrl()
-                );
-            });
-
             $propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}invite', function() use ($node) {
 
                 // Fetching owner information
@@ -158,7 +137,7 @@ class SharingPlugin extends DAV\ServerPlugin {
                 }
 
                 return new Xml\Property\Invite(
-                    $node->getShares(),
+                    $node->getInvites(),
                     $ownerInfo
                 );
 
@@ -179,10 +158,18 @@ class SharingPlugin extends DAV\ServerPlugin {
      */
     function propFindLate(DAV\PropFind $propFind, DAV\INode $node) {
 
-        if ($node instanceof IShareableCalendar) {
+        if ($node instanceof ISharedCalendar) {
+            $shareAccess = $node->getShareAccess();
             if ($rt = $propFind->get('{DAV:}resourcetype')) {
-                if (count($node->getShares()) > 0) {
-                    $rt->add('{' . Plugin::NS_CALENDARSERVER . '}shared-owner');
+                switch ($shareAccess) {
+                    case \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER :
+                        $rt->add('{' . Plugin::NS_CALENDARSERVER . '}shared-owner');
+                        break;
+                    case \Sabre\DAV\Sharing\Plugin::ACCESS_READ :
+                    case \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE :
+                        $rt->add('{' . Plugin::NS_CALENDARSERVER . '}shared');
+                        break;
+
                 }
             }
             $propFind->handle('{' . Plugin::NS_CALENDARSERVER . '}allowed-sharing-modes', function() {
@@ -211,21 +198,24 @@ class SharingPlugin extends DAV\ServerPlugin {
     function propPatch($path, DAV\PropPatch $propPatch) {
 
         $node = $this->server->tree->getNodeForPath($path);
-        if (!$node instanceof IShareableCalendar)
+        if (!$node instanceof ISharedCalendar)
             return;
 
-        $propPatch->handle('{DAV:}resourcetype', function($value) use ($node) {
-            if ($value->is('{' . Plugin::NS_CALENDARSERVER . '}shared-owner')) return false;
-            $shares = $node->getShares();
-            $remove = [];
-            foreach ($shares as $share) {
-                $remove[] = $share['href'];
-            }
-            $node->updateShares([], $remove);
+        if ($node->getShareAccess() === \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER || $node->getShareAccess() === \Sabre\DAV\Sharing\Plugin::ACCESS_NOTSHARED) {
 
-            return true;
+            $propPatch->handle('{DAV:}resourcetype', function($value) use ($node) {
+                if ($value->is('{' . Plugin::NS_CALENDARSERVER . '}shared-owner')) return false;
+                $shares = $node->getInvites();
+                foreach ($shares as $share) {
+                    $share->access = DAV\Sharing\Plugin::ACCESS_NOACCESS;
+                }
+                $node->updateInvites($shares);
 
-        });
+                return true;
+
+            });
+
+        }
 
     }
 
@@ -267,26 +257,12 @@ class SharingPlugin extends DAV\ServerPlugin {
 
         switch ($documentType) {
 
-            // Dealing with the 'share' document, which modified invitees on a
-            // calendar.
+            // Both the DAV:share-resource and CALENDARSERVER:share requests
+            // behave identically.
             case '{' . Plugin::NS_CALENDARSERVER . '}share' :
 
-                // We can only deal with IShareableCalendar objects
-                if (!$node instanceof IShareableCalendar) {
-                    return;
-                }
-
-                $this->server->transactionType = 'post-calendar-share';
-
-                // Getting ACL info
-                $acl = $this->server->getPlugin('acl');
-
-                // If there's no ACL support, we allow everything
-                if ($acl) {
-                    $acl->checkPrivileges($path, '{DAV:}write');
-                }
-
-                $node->updateShares($message->set, $message->remove);
+                $sharingPlugin = $this->server->getPlugin('sharing');
+                $sharingPlugin->shareResource($path, $message->sharees);
 
                 $response->setStatus(200);
                 // Adding this because sending a response body may cause issues,
@@ -328,11 +304,11 @@ class SharingPlugin extends DAV\ServerPlugin {
                 $response->setHeader('X-Sabre-Status', 'everything-went-well');
 
                 if ($url) {
-                    $writer = $this->server->xml->getWriter($this->server->getBaseUri());
+                    $writer = $this->server->xml->getWriter();
                     $writer->openMemory();
                     $writer->startDocument();
                     $writer->startElement('{' . Plugin::NS_CALENDARSERVER . '}shared-as');
-                    $writer->write(new Href($url));
+                    $writer->write(new LocalHref($url));
                     $writer->endElement();
                     $response->setHeader('Content-Type', 'application/xml');
                     $response->setBody($writer->outputMemory());
@@ -345,7 +321,7 @@ class SharingPlugin extends DAV\ServerPlugin {
             case '{' . Plugin::NS_CALENDARSERVER . '}publish-calendar' :
 
                 // We can only deal with IShareableCalendar objects
-                if (!$node instanceof IShareableCalendar) {
+                if (!$node instanceof ISharedCalendar) {
                     return;
                 }
                 $this->server->transactionType = 'post-publish-calendar';
@@ -355,7 +331,7 @@ class SharingPlugin extends DAV\ServerPlugin {
 
                 // If there's no ACL support, we allow everything
                 if ($acl) {
-                    $acl->checkPrivileges($path, '{DAV:}write');
+                    $acl->checkPrivileges($path, '{DAV:}share');
                 }
 
                 $node->setPublishStatus(true);
@@ -373,7 +349,7 @@ class SharingPlugin extends DAV\ServerPlugin {
             case '{' . Plugin::NS_CALENDARSERVER . '}unpublish-calendar' :
 
                 // We can only deal with IShareableCalendar objects
-                if (!$node instanceof IShareableCalendar) {
+                if (!$node instanceof ISharedCalendar) {
                     return;
                 }
                 $this->server->transactionType = 'post-unpublish-calendar';
@@ -383,7 +359,7 @@ class SharingPlugin extends DAV\ServerPlugin {
 
                 // If there's no ACL support, we allow everything
                 if ($acl) {
-                    $acl->checkPrivileges($path, '{DAV:}write');
+                    $acl->checkPrivileges($path, '{DAV:}share');
                 }
 
                 $node->setPublishStatus(false);
diff --git a/vendor/sabre/dav/lib/CalDAV/Subscriptions/Subscription.php b/vendor/sabre/dav/lib/CalDAV/Subscriptions/Subscription.php
index ee53da2c6..3bb3451f3 100644
--- a/vendor/sabre/dav/lib/CalDAV/Subscriptions/Subscription.php
+++ b/vendor/sabre/dav/lib/CalDAV/Subscriptions/Subscription.php
@@ -5,8 +5,8 @@ namespace Sabre\CalDAV\Subscriptions;
 use Sabre\DAV\Collection;
 use Sabre\DAV\Xml\Property\Href;
 use Sabre\DAV\PropPatch;
-use Sabre\DAV\Exception\MethodNotAllowed;
 use Sabre\DAVACL\IACL;
+use Sabre\DAVACL\ACLTrait;
 use Sabre\CalDAV\Backend\SubscriptionSupport;
 
 /**
@@ -20,6 +20,8 @@ use Sabre\CalDAV\Backend\SubscriptionSupport;
  */
 class Subscription extends Collection implements ISubscription, IACL {
 
+    use ACLTrait;
+
     /**
      * caldavBackend
      *
@@ -144,7 +146,7 @@ class Subscription extends Collection implements ISubscription, IACL {
      * The Server class will filter out the extra.
      *
      * @param array $properties
-     * @return void
+     * @return array
      */
     function getProperties($properties) {
 
@@ -154,7 +156,7 @@ class Subscription extends Collection implements ISubscription, IACL {
 
             switch ($prop) {
                 case '{http://calendarserver.org/ns/}source' :
-                    $r[$prop] = new Href($this->subscriptionInfo['source'], false);
+                    $r[$prop] = new Href($this->subscriptionInfo['source']);
                     break;
                 default :
                     if (array_key_exists($prop, $this->subscriptionInfo)) {
@@ -182,19 +184,6 @@ class Subscription extends Collection implements ISubscription, IACL {
 
     }
 
-    /**
-     * Returns a group principal.
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
     /**
      * Returns a list of ACE's for this node.
      *
@@ -211,22 +200,12 @@ class Subscription extends Collection implements ISubscription, IACL {
 
         return [
             [
-                'privilege' => '{DAV:}read',
+                'privilege' => '{DAV:}all',
                 'principal' => $this->getOwner(),
                 'protected' => true,
             ],
             [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner() . '/calendar-proxy-write',
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
+                'privilege' => '{DAV:}all',
                 'principal' => $this->getOwner() . '/calendar-proxy-write',
                 'protected' => true,
             ],
@@ -239,36 +218,4 @@ class Subscription extends Collection implements ISubscription, IACL {
 
     }
 
-    /**
-     * Updates the ACL.
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See \Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php
index 7fb022e33..1ca64f3e8 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/Invite.php
@@ -5,6 +5,7 @@ namespace Sabre\CalDAV\Xml\Notification;
 use Sabre\Xml\Writer;
 use Sabre\CalDAV\SharingPlugin as SharingPlugin;
 use Sabre\CalDAV;
+use Sabre\DAV;
 
 /**
  * This class represents the cs:invite-notification notification element.
@@ -210,16 +211,10 @@ class Invite implements NotificationInterface {
 
         switch ($this->type) {
 
-            case SharingPlugin::STATUS_ACCEPTED :
+            case DAV\Sharing\Plugin::INVITE_ACCEPTED :
                 $writer->writeElement($cs . 'invite-accepted');
                 break;
-            case SharingPlugin::STATUS_DECLINED :
-                $writer->writeElement($cs . 'invite-declined');
-                break;
-            case SharingPlugin::STATUS_DELETED :
-                $writer->writeElement($cs . 'invite-deleted');
-                break;
-            case SharingPlugin::STATUS_NORESPONSE :
+            case DAV\Sharing\Plugin::INVITE_NORESPONSE :
                 $writer->writeElement($cs . 'invite-noresponse');
                 break;
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php
index 945323fed..51bfc178a 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Notification/InviteReply.php
@@ -5,6 +5,7 @@ namespace Sabre\CalDAV\Xml\Notification;
 use Sabre\Xml\Writer;
 use Sabre\CalDAV;
 use Sabre\CalDAV\SharingPlugin;
+use Sabre\DAV;
 
 /**
  * This class represents the cs:invite-reply notification element.
@@ -162,10 +163,10 @@ class InviteReply implements NotificationInterface {
 
         switch ($this->type) {
 
-            case SharingPlugin::STATUS_ACCEPTED :
+            case DAV\Sharing\Plugin::INVITE_ACCEPTED :
                 $writer->writeElement($cs . 'invite-accepted');
                 break;
-            case SharingPlugin::STATUS_DECLINED :
+            case DAV\Sharing\Plugin::INVITE_DECLINED :
                 $writer->writeElement($cs . 'invite-declined');
                 break;
 
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php b/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php
index 3ee053214..40ff6b936 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Property/Invite.php
@@ -2,11 +2,10 @@
 
 namespace Sabre\CalDAV\Xml\Property;
 
-use Sabre\Xml\Element;
-use Sabre\Xml\Reader;
+use Sabre\Xml\XmlSerializable;
 use Sabre\Xml\Writer;
 use Sabre\CalDAV\Plugin;
-use Sabre\CalDAV\SharingPlugin;
+use Sabre\DAV;
 
 /**
  * Invite property
@@ -20,53 +19,23 @@ use Sabre\CalDAV\SharingPlugin;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Invite implements Element {
+class Invite implements XmlSerializable {
 
     /**
      * The list of users a calendar has been shared to.
      *
-     * @var array
+     * @var Sharee[]
      */
-    protected $users;
-
-    /**
-     * The organizer contains information about the person who shared the
-     * object.
-     *
-     * @var array
-     */
-    protected $organizer;
+    protected $sharees;
 
     /**
      * Creates the property.
      *
-     * Users is an array. Each element of the array has the following
-     * properties:
-     *
-     *   * href - Often a mailto: address
-     *   * commonName - Optional, for example a first and lastname for a user.
-     *   * status - One of the SharingPlugin::STATUS_* constants.
-     *   * readOnly - true or false
-     *   * summary - Optional, description of the share
-     *
-     * The organizer key is optional to specify. It's only useful when a
-     * 'sharee' requests the sharing information.
-     *
-     * The organizer may have the following properties:
-     *   * href - Often a mailto: address.
-     *   * commonName - Optional human-readable name.
-     *   * firstName - Optional first name.
-     *   * lastName - Optional last name.
-     *
-     * If you wonder why these two structures are so different, I guess a
-     * valid answer is that the current spec is still a draft.
-     *
-     * @param array $users
+     * @param Sharee[] $sharees
      */
-    function __construct(array $users, array $organizer = null) {
+    function __construct(array $sharees) {
 
-        $this->users = $users;
-        $this->organizer = $organizer;
+        $this->sharees = $sharees;
 
     }
 
@@ -77,7 +46,7 @@ class Invite implements Element {
      */
     function getValue() {
 
-        return $this->users;
+        return $this->sharees;
 
     }
 
@@ -104,149 +73,55 @@ class Invite implements Element {
 
         $cs = '{' . Plugin::NS_CALENDARSERVER . '}';
 
-        if (!is_null($this->organizer)) {
+        foreach ($this->sharees as $sharee) {
 
-            $writer->startElement($cs . 'organizer');
-            $writer->writeElement('{DAV:}href', $this->organizer['href']);
-
-            if (isset($this->organizer['commonName']) && $this->organizer['commonName']) {
-                $writer->writeElement($cs . 'common-name', $this->organizer['commonName']);
-            }
-            if (isset($this->organizer['firstName']) && $this->organizer['firstName']) {
-                $writer->writeElement($cs . 'first-name', $this->organizer['firstName']);
-            }
-            if (isset($this->organizer['lastName']) && $this->organizer['lastName']) {
-                $writer->writeElement($cs . 'last-name', $this->organizer['lastName']);
-            }
-            $writer->endElement(); // organizer
-
-        }
-
-        foreach ($this->users as $user) {
-
-            $writer->startElement($cs . 'user');
-            $writer->writeElement('{DAV:}href', $user['href']);
-            if (isset($user['commonName']) && $user['commonName']) {
-                $writer->writeElement($cs . 'common-name', $user['commonName']);
-            }
-            switch ($user['status']) {
-
-                case SharingPlugin::STATUS_ACCEPTED :
-                    $writer->writeElement($cs . 'invite-accepted');
-                    break;
-                case SharingPlugin::STATUS_DECLINED :
-                    $writer->writeElement($cs . 'invite-declined');
-                    break;
-                case SharingPlugin::STATUS_NORESPONSE :
-                    $writer->writeElement($cs . 'invite-noresponse');
-                    break;
-                case SharingPlugin::STATUS_INVALID :
-                    $writer->writeElement($cs . 'invite-invalid');
-                    break;
-            }
-
-            $writer->startElement($cs . 'access');
-            if ($user['readOnly']) {
-                $writer->writeElement($cs . 'read');
+            if ($sharee->access === \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER) {
+                $writer->startElement($cs . 'organizer');
             } else {
-                $writer->writeElement($cs . 'read-write');
-            }
-            $writer->endElement(); // access
+                $writer->startElement($cs . 'user');
 
-            if (isset($user['summary']) && $user['summary']) {
-                $writer->writeElement($cs . 'summary', $user['summary']);
-            }
-
-            $writer->endElement(); //user
-
-        }
-
-    }
-
-    /**
-     * The deserialize method is called during xml parsing.
-     *
-     * This method is called statictly, this is because in theory this method
-     * may be used as a type of constructor, or factory method.
-     *
-     * Often you want to return an instance of the current class, but you are
-     * free to return other data as well.
-     *
-     * You are responsible for advancing the reader to the next element. Not
-     * doing anything will result in a never-ending loop.
-     *
-     * If you just want to skip parsing for this element altogether, you can
-     * just call $reader->next();
-     *
-     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
-     * the next element.
-     *
-     * @param Reader $reader
-     * @return mixed
-     */
-    static function xmlDeserialize(Reader $reader) {
-
-        $cs = '{' . Plugin::NS_CALENDARSERVER . '}';
-
-        $users = [];
-
-        foreach ($reader->parseInnerTree() as $elem) {
-
-            if ($elem['name'] !== $cs . 'user')
-                continue;
-
-            $user = [
-                'href'       => null,
-                'commonName' => null,
-                'readOnly'   => null,
-                'summary'    => null,
-                'status'     => null,
-            ];
-
-            foreach ($elem['value'] as $userElem) {
-
-                switch ($userElem['name']) {
-                    case $cs . 'invite-accepted' :
-                        $user['status'] = SharingPlugin::STATUS_ACCEPTED;
+                switch ($sharee->inviteStatus) {
+                    case DAV\Sharing\Plugin::INVITE_ACCEPTED :
+                        $writer->writeElement($cs . 'invite-accepted');
                         break;
-                    case $cs . 'invite-declined' :
-                        $user['status'] = SharingPlugin::STATUS_DECLINED;
+                    case DAV\Sharing\Plugin::INVITE_DECLINED :
+                        $writer->writeElement($cs . 'invite-declined');
                         break;
-                    case $cs . 'invite-noresponse' :
-                        $user['status'] = SharingPlugin::STATUS_NORESPONSE;
+                    case DAV\Sharing\Plugin::INVITE_NORESPONSE :
+                        $writer->writeElement($cs . 'invite-noresponse');
                         break;
-                    case $cs . 'invite-invalid' :
-                        $user['status'] = SharingPlugin::STATUS_INVALID;
+                    case DAV\Sharing\Plugin::INVITE_INVALID :
+                        $writer->writeElement($cs . 'invite-invalid');
                         break;
-                    case '{DAV:}href' :
-                        $user['href'] = $userElem['value'];
+                }
+
+                $writer->startElement($cs . 'access');
+                switch ($sharee->access) {
+                    case DAV\Sharing\Plugin::ACCESS_READWRITE :
+                        $writer->writeElement($cs . 'read-write');
                         break;
-                    case $cs . 'common-name' :
-                        $user['commonName'] = $userElem['value'];
-                        break;
-                    case $cs . 'access' :
-                        foreach ($userElem['value'] as $accessHref) {
-                            if ($accessHref['name'] === $cs . 'read') {
-                                $user['readOnly'] = true;
-                            }
-                        }
-                        break;
-                    case $cs . 'summary' :
-                        $user['summary'] = $userElem['value'];
+                    case DAV\Sharing\Plugin::ACCESS_READ :
+                        $writer->writeElement($cs . 'read');
                         break;
 
                 }
+                $writer->endElement(); // access
 
             }
-            if (!$user['status']) {
-                throw new \InvalidArgumentException('Every user must have one of cs:invite-accepted, cs:invite-declined, cs:invite-noresponse or cs:invite-invalid');
-            }
 
-            $users[] = $user;
+            $href = new \Sabre\DAV\Xml\Property\Href($sharee->href);
+            $href->xmlSerialize($writer);
+
+            if (isset($sharee->properties['{DAV:}displayname'])) {
+                $writer->writeElement($cs . 'common-name', $sharee->properties['{DAV:}displayname']);
+            }
+            if ($sharee->comment) {
+                $writer->writeElement($cs . 'summary', $sharee->comment);
+            }
+            $writer->endElement(); // organizer or user
 
         }
 
-        return new self($users);
-
     }
+
 }
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php b/vendor/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php
index 4a253e008..a82b8eff7 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Property/ScheduleCalendarTransp.php
@@ -4,8 +4,8 @@ namespace Sabre\CalDAV\Xml\Property;
 
 use Sabre\Xml\Element;
 use Sabre\Xml\Reader;
+use Sabre\Xml\Deserializer;
 use Sabre\Xml\Writer;
-use Sabre\Xml\Element\Elements;
 use Sabre\CalDAV\Plugin;
 
 /**
@@ -116,23 +116,13 @@ class ScheduleCalendarTransp implements Element {
      */
     static function xmlDeserialize(Reader $reader) {
 
-        $elems = Elements::xmlDeserialize($reader);
+        $elems = Deserializer\enum($reader, Plugin::NS_CALDAV);
 
-        $value = null;
-
-        foreach ($elems as $elem) {
-            switch ($elem) {
-                case '{' . Plugin::NS_CALDAV . '}opaque' :
-                    $value = self::OPAQUE;
-                    break;
-                case '{' . Plugin::NS_CALDAV . '}transparent' :
-                    $value = self::TRANSPARENT;
-                    break;
-            }
+        if (in_array('transparent', $elems)) {
+            $value = self::TRANSPARENT;
+        } else {
+            $value = self::OPAQUE;
         }
-        if (is_null($value))
-           return null;
-
         return new self($value);
 
     }
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php b/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php
index ec627156f..2ecf6c2bb 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Request/InviteReply.php
@@ -2,12 +2,13 @@
 
 namespace Sabre\CalDAV\Xml\Request;
 
+use Sabre\CalDAV\Plugin;
+use Sabre\CalDAV\SharingPlugin;
+use Sabre\DAV;
+use Sabre\DAV\Exception\BadRequest;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
 use Sabre\Xml\Element\KeyValue;
-use Sabre\DAV\Exception\BadRequest;
-use Sabre\CalDAV\Plugin;
-use Sabre\CalDAV\SharingPlugin;
 
 /**
  * Invite-reply POST request parser
@@ -121,10 +122,10 @@ class InviteReply implements XmlDeserializable {
                     }
                     break;
                 case '{' . Plugin::NS_CALENDARSERVER . '}invite-accepted' :
-                    $status = SharingPlugin::STATUS_ACCEPTED;
+                    $status = DAV\Sharing\Plugin::INVITE_ACCEPTED;
                     break;
                 case '{' . Plugin::NS_CALENDARSERVER . '}invite-declined' :
-                    $status = SharingPlugin::STATUS_DECLINED;
+                    $status = DAV\Sharing\Plugin::INVITE_DECLINED;
                     break;
                 case '{' . Plugin::NS_CALENDARSERVER . '}in-reply-to' :
                     $inReplyTo = $value;
diff --git a/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php b/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php
index dacc5dc94..b5d9a133c 100644
--- a/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php
+++ b/vendor/sabre/dav/lib/CalDAV/Xml/Request/Share.php
@@ -2,9 +2,10 @@
 
 namespace Sabre\CalDAV\Xml\Request;
 
+use Sabre\CalDAV\Plugin;
+use Sabre\DAV\Xml\Element\Sharee;
 use Sabre\Xml\Reader;
 use Sabre\Xml\XmlDeserializable;
-use Sabre\CalDAV\Plugin;
 
 /**
  * Share POST request parser
@@ -20,37 +21,20 @@ use Sabre\CalDAV\Plugin;
 class Share implements XmlDeserializable {
 
     /**
-     * The list of new people added or updated.
+     * The list of new people added or updated or removed from the share.
      *
-     * Every element has the following keys:
-     * 1. href - An email address
-     * 2. commonName - Some name
-     * 3. summary - An optional description of the share
-     * 4. readOnly - true or false
-     *
-     * @var array
+     * @var Sharee[]
      */
-    public $set = [];
-
-    /**
-     * List of people removed from the share list.
-     *
-     * The list is a flat list of email addresses (including mailto:).
-     *
-     * @var array
-     */
-    public $remove = [];
+    public $sharees = [];
 
     /**
      * Constructor
      *
-     * @param array $set
-     * @param array $remove
+     * @param Sharee[] $sharees
      */
-    function __construct(array $set, array $remove) {
+    function __construct(array $sharees) {
 
-        $this->set = $set;
-        $this->remove = $remove;
+        $this->sharees = $sharees;
 
     }
 
@@ -77,13 +61,12 @@ class Share implements XmlDeserializable {
      */
     static function xmlDeserialize(Reader $reader) {
 
-        $elems = $reader->parseInnerTree([
+        $elems = $reader->parseGetElements([
             '{' . Plugin::NS_CALENDARSERVER . '}set'    => 'Sabre\\Xml\\Element\\KeyValue',
             '{' . Plugin::NS_CALENDARSERVER . '}remove' => 'Sabre\\Xml\\Element\\KeyValue',
         ]);
 
-        $set = [];
-        $remove = [];
+        $sharees = [];
 
         foreach ($elems as $elem) {
             switch ($elem['name']) {
@@ -94,22 +77,34 @@ class Share implements XmlDeserializable {
                     $sumElem = '{' . Plugin::NS_CALENDARSERVER . '}summary';
                     $commonName = '{' . Plugin::NS_CALENDARSERVER . '}common-name';
 
-                    $set[] = [
+                    $properties = [];
+                    if (isset($sharee[$commonName])) {
+                        $properties['{DAV:}displayname'] = $sharee[$commonName];
+                    }
+
+                    $access = array_key_exists('{' . Plugin::NS_CALENDARSERVER . '}read-write', $sharee)
+                        ? \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE
+                        : \Sabre\DAV\Sharing\Plugin::ACCESS_READ;
+
+                    $sharees[] = new Sharee([
                         'href'       => $sharee['{DAV:}href'],
-                        'commonName' => isset($sharee[$commonName]) ? $sharee[$commonName] : null,
-                        'summary'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null,
-                        'readOnly'   => !array_key_exists('{' . Plugin::NS_CALENDARSERVER . '}read-write', $sharee),
-                    ];
+                        'properties' => $properties,
+                        'access'     => $access,
+                        'comment'    => isset($sharee[$sumElem]) ? $sharee[$sumElem] : null
+                    ]);
                     break;
 
                 case '{' . Plugin::NS_CALENDARSERVER . '}remove' :
-                    $remove[] = $elem['value']['{DAV:}href'];
+                    $sharees[] = new Sharee([
+                        'href'   => $elem['value']['{DAV:}href'],
+                        'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS
+                    ]);
                     break;
 
             }
         }
 
-        return new self($set, $remove);
+        return new self($sharees);
 
     }
 
diff --git a/vendor/sabre/dav/lib/CardDAV/AddressBook.php b/vendor/sabre/dav/lib/CardDAV/AddressBook.php
index 70bec8760..6dd098618 100644
--- a/vendor/sabre/dav/lib/CardDAV/AddressBook.php
+++ b/vendor/sabre/dav/lib/CardDAV/AddressBook.php
@@ -16,6 +16,8 @@ use Sabre\DAVACL;
  */
 class AddressBook extends DAV\Collection implements IAddressBook, DAV\IProperties, DAVACL\IACL, DAV\Sync\ISyncCollection, DAV\IMultiGet {
 
+    use DAVACL\ACLTrait;
+
     /**
      * This is an array with addressbook information
      *
@@ -236,48 +238,6 @@ class AddressBook extends DAV\Collection implements IAddressBook, DAV\IPropertie
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    function getACL() {
-
-        return [
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-
-        ];
-
-    }
 
     /**
      * This method returns the ACL's for card nodes in this address book.
@@ -290,12 +250,7 @@ class AddressBook extends DAV\Collection implements IAddressBook, DAV\IPropertie
 
         return [
             [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->getOwner(),
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
+                'privilege' => '{DAV:}all',
                 'principal' => $this->getOwner(),
                 'protected' => true,
             ],
@@ -303,37 +258,6 @@ class AddressBook extends DAV\Collection implements IAddressBook, DAV\IPropertie
 
     }
 
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
 
     /**
      * This method returns the current sync-token for this collection.
diff --git a/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php b/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
index ebc251832..888a44a40 100644
--- a/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
+++ b/vendor/sabre/dav/lib/CardDAV/AddressBookHome.php
@@ -18,6 +18,8 @@ use Sabre\Uri;
  */
 class AddressBookHome extends DAV\Collection implements DAV\IExtendedCollection, DAVACL\IACL {
 
+    use DAVACL\ACLTrait;
+
     /**
      * Principal uri
      *
@@ -186,78 +188,4 @@ class AddressBookHome extends DAV\Collection implements DAV\IExtendedCollection,
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    function getACL() {
-
-        return [
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ],
-        ];
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php b/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
index b9691b906..54e42b899 100644
--- a/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/CardDAV/Backend/BackendInterface.php
@@ -55,12 +55,15 @@ interface BackendInterface {
     function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch);
 
     /**
-     * Creates a new address book
+     * Creates a new address book.
+     *
+     * This method should return the id of the new address book. The id can be
+     * in any format, including ints, strings, arrays or objects.
      *
      * @param string $principalUri
      * @param string $url Just the 'basename' of the url.
      * @param array $properties
-     * @return void
+     * @return mixed
      */
     function createAddressBook($principalUri, $url, array $properties);
 
diff --git a/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php b/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
index 5509ddc02..7c3feff93 100644
--- a/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/CardDAV/Backend/PDO.php
@@ -128,7 +128,7 @@ class PDO extends AbstractBackend implements SyncSupport {
                 } else {
                     $query .= ', ';
                 }
-                $query .= ' `' . $key . '` = :' . $key . ' ';
+                $query .= ' ' . $key . ' = :' . $key . ' ';
             }
             $query .= ' WHERE id = :addressbookid';
 
@@ -180,7 +180,9 @@ class PDO extends AbstractBackend implements SyncSupport {
         $query = 'INSERT INTO ' . $this->addressBooksTableName . ' (uri, displayname, description, principaluri, synctoken) VALUES (:uri, :displayname, :description, :principaluri, 1)';
         $stmt = $this->pdo->prepare($query);
         $stmt->execute($values);
-        return $this->pdo->lastInsertId();
+        return $this->pdo->lastInsertId(
+            $this->addressBooksTableName . '_id_seq'
+        );
 
     }
 
@@ -230,6 +232,7 @@ class PDO extends AbstractBackend implements SyncSupport {
         $result = [];
         while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
             $row['etag'] = '"' . $row['etag'] . '"';
+            $row['lastmodified'] = (int)$row['lastmodified'];
             $result[] = $row;
         }
         return $result;
@@ -258,6 +261,7 @@ class PDO extends AbstractBackend implements SyncSupport {
         if (!$result) return false;
 
         $result['etag'] = '"' . $result['etag'] . '"';
+        $result['lastmodified'] = (int)$result['lastmodified'];
         return $result;
 
     }
@@ -286,6 +290,7 @@ class PDO extends AbstractBackend implements SyncSupport {
         $result = [];
         while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
             $row['etag'] = '"' . $row['etag'] . '"';
+            $row['lastmodified'] = (int)$row['lastmodified'];
             $result[] = $row;
         }
         return $result;
diff --git a/vendor/sabre/dav/lib/CardDAV/Card.php b/vendor/sabre/dav/lib/CardDAV/Card.php
index 8da672502..0a040be6b 100644
--- a/vendor/sabre/dav/lib/CardDAV/Card.php
+++ b/vendor/sabre/dav/lib/CardDAV/Card.php
@@ -14,6 +14,8 @@ use Sabre\DAV;
  */
 class Card extends DAV\File implements ICard, DAVACL\IACL {
 
+    use DAVACL\ACLTrait;
+
     /**
      * CardDAV backend
      *
@@ -181,18 +183,6 @@ class Card extends DAV\File implements ICard, DAVACL\IACL {
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
 
     /**
      * Returns a list of ACE's for this node.
@@ -215,12 +205,7 @@ class Card extends DAV\File implements ICard, DAVACL\IACL {
 
         return [
             [
-                'privilege' => '{DAV:}read',
-                'principal' => $this->addressBookInfo['principaluri'],
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
+                'privilege' => '{DAV:}all',
                 'principal' => $this->addressBookInfo['principaluri'],
                 'protected' => true,
             ],
@@ -228,36 +213,4 @@ class Card extends DAV\File implements ICard, DAVACL\IACL {
 
     }
 
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Changing ACL is not yet supported');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/CardDAV/Plugin.php b/vendor/sabre/dav/lib/CardDAV/Plugin.php
index b8bded098..0507df100 100644
--- a/vendor/sabre/dav/lib/CardDAV/Plugin.php
+++ b/vendor/sabre/dav/lib/CardDAV/Plugin.php
@@ -4,7 +4,7 @@ namespace Sabre\CardDAV;
 
 use Sabre\DAV;
 use Sabre\DAV\Exception\ReportNotSupported;
-use Sabre\DAV\Xml\Property\Href;
+use Sabre\DAV\Xml\Property\LocalHref;
 use Sabre\DAVACL;
 use Sabre\HTTP;
 use Sabre\HTTP\RequestInterface;
@@ -156,11 +156,11 @@ class Plugin extends DAV\ServerPlugin {
             $path = $propFind->getPath();
 
             $propFind->handle('{' . self::NS_CARDDAV . '}addressbook-home-set', function() use ($path) {
-                return new Href($this->getAddressBookHomeForPrincipal($path) . '/');
+                return new LocalHref($this->getAddressBookHomeForPrincipal($path) . '/');
             });
 
             if ($this->directories) $propFind->handle('{' . self::NS_CARDDAV . '}directory-gateway', function() {
-                return new Href($this->directories);
+                return new LocalHref($this->directories);
             });
 
         }
@@ -334,12 +334,7 @@ class Plugin extends DAV\ServerPlugin {
             $data = stream_get_contents($data);
         }
 
-        $before = md5($data);
-
-        // Converting the data to unicode, if needed.
-        $data = DAV\StringUtil::ensureUTF8($data);
-
-        if (md5($data) !== $before) $modified = true;
+        $before = $data;
 
         try {
 
@@ -366,11 +361,56 @@ class Plugin extends DAV\ServerPlugin {
             throw new DAV\Exception\UnsupportedMediaType('This collection can only support vcard objects.');
         }
 
-        if (!isset($vobj->UID)) {
-            // No UID in vcards is invalid, but we'll just add it in anyway.
-            $vobj->add('UID', DAV\UUIDUtil::getUUID());
+        $options = VObject\Node::PROFILE_CARDDAV;
+        $prefer = $this->server->getHTTPPrefer();
+
+        if ($prefer['handling'] !== 'strict') {
+            $options |= VObject\Node::REPAIR;
+        }
+
+        $messages = $vobj->validate($options);
+
+        $highestLevel = 0;
+        $warningMessage = null;
+
+        // $messages contains a list of problems with the vcard, along with
+        // their severity.
+        foreach ($messages as $message) {
+
+            if ($message['level'] > $highestLevel) {
+                // Recording the highest reported error level.
+                $highestLevel = $message['level'];
+                $warningMessage = $message['message'];
+            }
+
+            switch ($message['level']) {
+
+                case 1 :
+                    // Level 1 means that there was a problem, but it was repaired.
+                    $modified = true;
+                    break;
+                case 2 :
+                    // Level 2 means a warning, but not critical
+                    break;
+                case 3 :
+                    // Level 3 means a critical error
+                    throw new DAV\Exception\UnsupportedMediaType('Validation error in vCard: ' . $message['message']);
+
+            }
+
+        }
+        if ($warningMessage) {
+            $this->server->httpResponse->setHeader(
+                'X-Sabre-Ew-Gross',
+                'vCard validation warning: ' . $warningMessage
+            );
+
+            // Re-serializing object.
             $data = $vobj->serialize();
-            $modified = true;
+            if (!$modified && strcmp($data, $before) !== 0) {
+                // This ensures that the system does not send an ETag back.
+                $modified = true;
+            }
         }
 
         // Destroy circular references to PHP will GC the object.
@@ -803,33 +843,49 @@ class Plugin extends DAV\ServerPlugin {
     /**
      * Converts a vcard blob to a different version, or jcard.
      *
-     * @param string $data
+     * @param string|resource $data
      * @param string $target
      * @return string
      */
     protected function convertVCard($data, $target) {
 
-        $data = VObject\Reader::read($data);
-        switch ($target) {
-            default :
-            case 'vcard3' :
-                $data = $data->convert(VObject\Document::VCARD30);
-                $newResult = $data->serialize();
-                break;
-            case 'vcard4' :
-                $data = $data->convert(VObject\Document::VCARD40);
-                $newResult = $data->serialize();
-                break;
-            case 'jcard' :
-                $data = $data->convert(VObject\Document::VCARD40);
-                $newResult = json_encode($data->jsonSerialize());
-                break;
-
+        if (is_resource($data)) {
+            $data = stream_get_contents($data);
         }
-        // Destroy circular references to PHP will GC the object.
-        $data->destroy();
+        $input = VObject\Reader::read($data);
+        $output = null;
+        try {
 
-        return $newResult;
+            switch ($target) {
+                default :
+                case 'vcard3' :
+                    if ($input->getDocumentType() === VObject\Document::VCARD30) {
+                        // Do nothing
+                        return $data;
+                    }
+                    $output = $input->convert(VObject\Document::VCARD30);
+                    return $output->serialize();
+                case 'vcard4' :
+                    if ($input->getDocumentType() === VObject\Document::VCARD40) {
+                        // Do nothing
+                        return $data;
+                    }
+                    $output = $input->convert(VObject\Document::VCARD40);
+                    return $output->serialize();
+                case 'jcard' :
+                    $output = $input->convert(VObject\Document::VCARD40);
+                    return json_encode($output);
+
+            }
+
+        } finally {
+
+            // Destroy circular references to PHP will GC the object.
+            $input->destroy();
+            if (!is_null($output)) {
+                $output->destroy();
+            }
+        }
 
     }
 
diff --git a/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php b/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php
index de8b3bb84..d015589ad 100644
--- a/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php
+++ b/vendor/sabre/dav/lib/CardDAV/VCFExportPlugin.php
@@ -70,14 +70,34 @@ class VCFExportPlugin extends DAV\ServerPlugin {
             $aclPlugin->checkPrivileges($path, '{DAV:}read');
         }
 
-        $response->setHeader('Content-Type', 'text/directory');
-        $response->setStatus(200);
-
         $nodes = $this->server->getPropertiesForPath($path, [
             '{' . Plugin::NS_CARDDAV . '}address-data',
         ], 1);
 
-        $response->setBody($this->generateVCF($nodes));
+        $format = 'text/directory';
+
+        $output = null;
+        $filenameExtension = null;
+
+        switch ($format) {
+            case 'text/directory':
+                $output = $this->generateVCF($nodes);
+                $filenameExtension = '.vcf';
+                break;
+        }
+
+        $filename = preg_replace(
+            '/[^a-zA-Z0-9-_ ]/um',
+            '',
+            $node->getName()
+        );
+        $filename .= '-' . date('Y-m-d') . $filenameExtension;
+
+        $response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+        $response->setHeader('Content-Type', $format);
+
+        $response->setStatus(200);
+        $response->setBody($output);
 
         // Returning false to break the event chain
         return false;
diff --git a/vendor/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php b/vendor/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php
index 0251decc1..85c5f30d5 100644
--- a/vendor/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php
+++ b/vendor/sabre/dav/lib/DAV/Auth/Backend/AbstractDigest.php
@@ -155,8 +155,14 @@ abstract class AbstractDigest implements BackendInterface {
             $response
         );
         $auth->init();
+
+        $oldStatus = $response->getStatus() ?: 200;
         $auth->requireLogin();
 
+        // Preventing the digest utility from modifying the http status code,
+        // this should be handled by the main plugin.
+        $response->setStatus($oldStatus);
+
     }
 
 }
diff --git a/vendor/sabre/dav/lib/DAV/Auth/Backend/File.php b/vendor/sabre/dav/lib/DAV/Auth/Backend/File.php
index 6756e68df..3a687d747 100644
--- a/vendor/sabre/dav/lib/DAV/Auth/Backend/File.php
+++ b/vendor/sabre/dav/lib/DAV/Auth/Backend/File.php
@@ -25,7 +25,7 @@ class File extends AbstractDigest {
     /**
      * Creates the backend object.
      *
-     * If the filename argument is passed in, it will parse out the specified file fist.
+     * If the filename argument is passed in, it will parse out the specified file first.
      *
      * @param string|null $filename
      */
diff --git a/vendor/sabre/dav/lib/DAV/Auth/Plugin.php b/vendor/sabre/dav/lib/DAV/Auth/Plugin.php
index 818d8a4ad..4b5f35ac3 100644
--- a/vendor/sabre/dav/lib/DAV/Auth/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Auth/Plugin.php
@@ -4,7 +4,6 @@ namespace Sabre\DAV\Auth;
 
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
-use Sabre\HTTP\URLUtil;
 use Sabre\DAV\Exception\NotAuthenticated;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
@@ -25,6 +24,20 @@ use Sabre\DAV\ServerPlugin;
  */
 class Plugin extends ServerPlugin {
 
+    /**
+     * By default this plugin will require that the user is authenticated,
+     * and refuse any access if the user is not authenticated.
+     *
+     * If this setting is set to false, we let the user through, whether they
+     * are authenticated or not.
+     *
+     * This is useful if you want to allow both authenticated and
+     * unauthenticated access to your server.
+     *
+     * @param bool
+     */
+    public $autoRequireLogin = true;
+
     /**
      * authentication backends
      */
@@ -107,27 +120,6 @@ class Plugin extends ServerPlugin {
 
     }
 
-    /**
-     * Returns the current username.
-     *
-     * This method is deprecated and is only kept for backwards compatibility
-     * purposes. Please switch to getCurrentPrincipal().
-     *
-     * @deprecated Will be removed in a future version!
-     * @return string|null
-     */
-    function getCurrentUser() {
-
-        // We just do a 'basename' on the principal to give back a sane value
-        // here.
-        list(, $userName) = URLUtil::splitPath(
-            $this->getCurrentPrincipal()
-        );
-
-        return $userName;
-
-    }
-
     /**
      * This method is called before any HTTP method and forces users to be authenticated
      *
@@ -154,6 +146,50 @@ class Plugin extends ServerPlugin {
             return;
 
         }
+
+        $authResult = $this->check($request, $response);
+
+        if ($authResult[0]) {
+            // Auth was successful
+            $this->currentPrincipal = $authResult[1];
+            $this->loginFailedReasons = null;
+            return;
+        }
+
+
+
+        // If we got here, it means that no authentication backend was
+        // successful in authenticating the user.
+        $this->currentPrincipal = null;
+        $this->loginFailedReasons = $authResult[1];
+
+        if ($this->autoRequireLogin) {
+            $this->challenge($request, $response);
+            throw new NotAuthenticated(implode(', ', $authResult[1]));
+        }
+
+    }
+
+    /**
+     * Checks authentication credentials, and logs the user in if possible.
+     *
+     * This method returns an array. The first item in the array is a boolean
+     * indicating if login was successful.
+     *
+     * If login was successful, the second item in the array will contain the
+     * current principal url/path of the logged in user.
+     *
+     * If login was not successful, the second item in the array will contain a
+     * an array with strings. The strings are a list of reasons why login was
+     * unsuccesful. For every auth backend there will be one reason, so usually
+     * there's just one.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return array
+     */
+    function check(RequestInterface $request, ResponseInterface $response) {
+
         if (!$this->backends) {
             throw new \Sabre\DAV\Exception('No authentication backends were configured on this server.');
         }
@@ -172,20 +208,56 @@ class Plugin extends ServerPlugin {
             if ($result[0]) {
                 $this->currentPrincipal = $result[1];
                 // Exit early
-                return;
+                return [true, $result[1]];
             }
             $reasons[] = $result[1];
 
         }
 
-        // If we got here, it means that no authentication backend was
-        // successful in authenticating the user.
-        $this->currentPrincipal = null;
+        return [false, $reasons];
+
+    }
+
+    /**
+     * This method sends authentication challenges to the user.
+     *
+     * This method will for example cause a HTTP Basic backend to set a
+     * WWW-Authorization header, indicating to the client that it should
+     * authenticate.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return array
+     */
+    function challenge(RequestInterface $request, ResponseInterface $response) {
 
         foreach ($this->backends as $backend) {
             $backend->challenge($request, $response);
         }
-        throw new NotAuthenticated(implode(', ', $reasons));
+
+    }
+
+    /**
+     * List of reasons why login failed for the last login operation.
+     *
+     * @var string[]|null
+     */
+    protected $loginFailedReasons;
+
+    /**
+     * Returns a list of reasons why login was unsuccessful.
+     *
+     * This method will return the login failed reasons for the last login
+     * operation. One for each auth backend.
+     *
+     * This method returns null if the last authentication attempt was
+     * successful, or if there was no authentication attempt yet.
+     *
+     * @return string[]|null
+     */
+    function getLoginFailedReasons() {
+
+        return $this->loginFailedReasons;
 
     }
 
diff --git a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
index 07ca6c3e5..49359a045 100644
--- a/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Browser/Plugin.php
@@ -48,7 +48,7 @@ class Plugin extends DAV\ServerPlugin {
     public $uninterestingProperties = [
         '{DAV:}supportedlock',
         '{DAV:}acl-restrictions',
-        '{DAV:}supported-privilege-set',
+//        '{DAV:}supported-privilege-set',
         '{DAV:}supported-method-set',
     ];
 
@@ -112,7 +112,7 @@ class Plugin extends DAV\ServerPlugin {
         $getVars = $request->getQueryParameters();
 
         // CSP headers
-        $this->server->httpResponse->setHeader('Content-Security-Policy', "img-src 'self'; style-src 'self';");
+        $this->server->httpResponse->setHeader('Content-Security-Policy', "default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';");
 
         $sabreAction = isset($getVars['sabreAction']) ? $getVars['sabreAction'] : null;
 
@@ -354,7 +354,7 @@ class Plugin extends DAV\ServerPlugin {
 
         $output = '';
         if ($this->enablePost) {
-            $this->server->emit('onHTMLActionsPanel', [$node, &$output]);
+            $this->server->emit('onHTMLActionsPanel', [$node, &$output, $path]);
         }
 
         if ($output) {
@@ -368,7 +368,7 @@ class Plugin extends DAV\ServerPlugin {
 
         $html .= $this->generateFooter();
 
-        $this->server->httpResponse->setHeader('Content-Security-Policy', "img-src 'self'; style-src 'self';");
+        $this->server->httpResponse->setHeader('Content-Security-Policy', "default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';");
 
         return $html;
 
@@ -477,7 +477,7 @@ HTML;
 
         $version = DAV\Version::VERSION;
         return <<<HTML
-<footer>Generated by SabreDAV $version (c)2007-2015 <a href="http://sabre.io/">http://sabre.io/</a></footer>
+<footer>Generated by SabreDAV $version (c)2007-2016 <a href="http://sabre.io/">http://sabre.io/</a></footer>
 </body>
 </html>
 HTML;
@@ -493,9 +493,10 @@ HTML;
      *
      * @param DAV\INode $node
      * @param mixed $output
+     * @param string $path
      * @return void
      */
-    function htmlActionsPanel(DAV\INode $node, &$output) {
+    function htmlActionsPanel(DAV\INode $node, &$output, $path) {
 
         if (!$node instanceof DAV\ICollection)
             return;
diff --git a/vendor/sabre/dav/lib/DAV/Browser/assets/sabredav.css b/vendor/sabre/dav/lib/DAV/Browser/assets/sabredav.css
index c9ab2c74f..8869597f0 100644
--- a/vendor/sabre/dav/lib/DAV/Browser/assets/sabredav.css
+++ b/vendor/sabre/dav/lib/DAV/Browser/assets/sabredav.css
@@ -96,12 +96,12 @@ header a {
   vertical-align: middle;
   border: 0;
 }
-input, button {
+input, button, select {
     font: inherit;
     color: inherit;
 }
 
-input[type=text] {
+input[type=text], select {
   border: 1px solid #bbbbbb;
   line-height: 22px;
   padding: 5px 10px;
@@ -200,7 +200,7 @@ section table {
     line-height: 40px;
 }
 
-.actions input[type=text] {
+.actions input[type=text], select {
     width: 450px;
 }
 
diff --git a/vendor/sabre/dav/lib/DAV/Client.php b/vendor/sabre/dav/lib/DAV/Client.php
index d46b397b6..08d5d4702 100644
--- a/vendor/sabre/dav/lib/DAV/Client.php
+++ b/vendor/sabre/dav/lib/DAV/Client.php
@@ -3,6 +3,7 @@
 namespace Sabre\DAV;
 
 use Sabre\HTTP;
+use Sabre\Uri;
 
 /**
  * SabreDAV DAV client
@@ -387,20 +388,10 @@ class Client extends HTTP\Client {
      */
     function getAbsoluteUrl($url) {
 
-        // If the url starts with http:// or https://, the url is already absolute.
-        if (preg_match('/^http(s?):\/\//', $url)) {
-            return $url;
-        }
-
-        // If the url starts with a slash, we must calculate the url based off
-        // the root of the base url.
-        if (strpos($url, '/') === 0) {
-            $parts = parse_url($this->baseUri);
-            return $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port']) ? ':' . $parts['port'] : '') . $url;
-        }
-
-        // Otherwise...
-        return $this->baseUri . $url;
+        return Uri\resolve(
+            $this->baseUri,
+            $url
+        );
 
     }
 
diff --git a/vendor/sabre/dav/lib/DAV/CorePlugin.php b/vendor/sabre/dav/lib/DAV/CorePlugin.php
index 3a70b2a7e..a1b052915 100644
--- a/vendor/sabre/dav/lib/DAV/CorePlugin.php
+++ b/vendor/sabre/dav/lib/DAV/CorePlugin.php
@@ -50,6 +50,8 @@ class CorePlugin extends ServerPlugin {
         $server->on('propFind',         [$this, 'propFindNode'], 120);
         $server->on('propFind',         [$this, 'propFindLate'], 200);
 
+        $server->on('exception',        [$this, 'exception']);
+
     }
 
     /**
@@ -844,10 +846,8 @@ class CorePlugin extends ServerPlugin {
         if ($node instanceof IProperties && $propertyNames = $propFind->get404Properties()) {
 
             $nodeProperties = $node->getProperties($propertyNames);
-            foreach ($propertyNames as $propertyName) {
-                if (array_key_exists($propertyName, $nodeProperties)) {
-                    $propFind->set($propertyName, $nodeProperties[$propertyName], 200);
-                }
+            foreach ($nodeProperties as $propertyName => $propertyValue) {
+                $propFind->set($propertyName, $propertyValue, 200);
             }
 
         }
@@ -904,6 +904,38 @@ class CorePlugin extends ServerPlugin {
 
     }
 
+    /**
+     * Listens for exception events, and automatically logs them.
+     *
+     * @param Exception $e
+     */
+    function exception($e) {
+
+        $logLevel = \Psr\Log\LogLevel::CRITICAL;
+        if ($e instanceof \Sabre\DAV\Exception) {
+            // If it's a standard sabre/dav exception, it means we have a http
+            // status code available.
+            $code = $e->getHTTPCode();
+
+            if ($code >= 400 && $code < 500) {
+                // user error
+                $logLevel = \Psr\Log\LogLevel::INFO;
+            } else {
+                // Server-side error. We mark it's as an error, but it's not
+                // critical.
+                $logLevel = \Psr\Log\LogLevel::ERROR;
+            }
+        }
+
+        $this->server->getLogger()->log(
+            $logLevel,
+            'Uncaught exception',
+            [
+                'exception' => $e,
+            ]
+        );
+    }
+
     /**
      * Returns a bunch of meta-data about the plugin.
      *
diff --git a/vendor/sabre/dav/lib/DAV/FS/Directory.php b/vendor/sabre/dav/lib/DAV/FS/Directory.php
index 963e5554c..362f7a411 100644
--- a/vendor/sabre/dav/lib/DAV/FS/Directory.php
+++ b/vendor/sabre/dav/lib/DAV/FS/Directory.php
@@ -140,10 +140,10 @@ class Directory extends Node implements DAV\ICollection, DAV\IQuota {
      * @return array
      */
     function getQuotaInfo() {
-
+        $absolute = realpath($this->path);
         return [
-            disk_total_space($this->path) - disk_free_space($this->path),
-            disk_free_space($this->path)
+            disk_total_space($absolute) - disk_free_space($absolute),
+            disk_free_space($absolute)
         ];
 
     }
diff --git a/vendor/sabre/dav/lib/DAV/FSExt/Directory.php b/vendor/sabre/dav/lib/DAV/FSExt/Directory.php
index 648079e26..dd5f992db 100644
--- a/vendor/sabre/dav/lib/DAV/FSExt/Directory.php
+++ b/vendor/sabre/dav/lib/DAV/FSExt/Directory.php
@@ -131,12 +131,7 @@ class Directory extends Node implements DAV\ICollection, DAV\IQuota, DAV\IMoveTa
 
         foreach ($iterator as $entry) {
 
-            $node = $entry->getFilename();
-
-            if ($node === '.sabredav')
-                continue;
-
-            $nodes[] = $this->getChild($node);
+            $nodes[] = $this->getChild($entry->getFilename());
 
         }
         return $nodes;
@@ -153,9 +148,6 @@ class Directory extends Node implements DAV\ICollection, DAV\IQuota, DAV\IMoveTa
         // Deleting all children
         foreach ($this->getChildren() as $child) $child->delete();
 
-        // Removing resource info, if its still around
-        if (file_exists($this->path . '/.sabredav')) unlink($this->path . '/.sabredav');
-
         // Removing the directory itself
         rmdir($this->path);
 
diff --git a/vendor/sabre/dav/lib/DAV/File.php b/vendor/sabre/dav/lib/DAV/File.php
index e0a0391db..675956b22 100644
--- a/vendor/sabre/dav/lib/DAV/File.php
+++ b/vendor/sabre/dav/lib/DAV/File.php
@@ -15,12 +15,24 @@ namespace Sabre\DAV;
 abstract class File extends Node implements IFile {
 
     /**
-     * Updates the data
+     * Replaces the contents of the file.
      *
-     * data is a readable stream resource.
+     * The data argument is a readable stream resource.
      *
-     * @param resource $data
-     * @return void
+     * After a succesful put operation, you may choose to return an ETag. The
+     * etag must always be surrounded by double-quotes. These quotes must
+     * appear in the actual string you're returning.
+     *
+     * Clients may use the ETag from a PUT request to later on make sure that
+     * when they update the file, the contents haven't changed in the mean
+     * time.
+     *
+     * If you don't plan to store the file byte-by-byte, and you return a
+     * different object on a subsequent GET you are strongly recommended to not
+     * return an ETag, and just return null.
+     *
+     * @param string|resource $data
+     * @return string|null
      */
     function put($data) {
 
diff --git a/vendor/sabre/dav/lib/DAV/ICollection.php b/vendor/sabre/dav/lib/DAV/ICollection.php
index 390d9b741..7793070d3 100644
--- a/vendor/sabre/dav/lib/DAV/ICollection.php
+++ b/vendor/sabre/dav/lib/DAV/ICollection.php
@@ -54,14 +54,14 @@ interface ICollection extends INode {
      * exist.
      *
      * @param string $name
-     * @return DAV\INode
+     * @return INode
      */
     function getChild($name);
 
     /**
      * Returns an array with all the child nodes
      *
-     * @return DAV\INode[]
+     * @return INode[]
      */
     function getChildren();
 
diff --git a/vendor/sabre/dav/lib/DAV/IFile.php b/vendor/sabre/dav/lib/DAV/IFile.php
index e16a3a58a..37e7cd33c 100644
--- a/vendor/sabre/dav/lib/DAV/IFile.php
+++ b/vendor/sabre/dav/lib/DAV/IFile.php
@@ -32,7 +32,7 @@ interface IFile extends INode {
      * different object on a subsequent GET you are strongly recommended to not
      * return an ETag, and just return null.
      *
-     * @param resource $data
+     * @param resource|data $data
      * @return string|null
      */
     function put($data);
diff --git a/vendor/sabre/dav/lib/DAV/INode.php b/vendor/sabre/dav/lib/DAV/INode.php
index b5e6cb9ef..bb884934d 100644
--- a/vendor/sabre/dav/lib/DAV/INode.php
+++ b/vendor/sabre/dav/lib/DAV/INode.php
@@ -36,9 +36,10 @@ interface INode {
     function setName($name);
 
     /**
-     * Returns the last modification time, as a unix timestamp
+     * Returns the last modification time, as a unix timestamp. Return null
+     * if the information is not available.
      *
-     * @return int
+     * @return int|null
      */
     function getLastModified();
 
diff --git a/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/PDO.php b/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/PDO.php
index 910e4979d..2fe843884 100644
--- a/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/DAV/PropertyStorage/Backend/PDO.php
@@ -88,6 +88,9 @@ class PDO implements BackendInterface {
         $stmt->execute([$path]);
 
         while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            if (gettype($row['value']) === 'resource') {
+                $row['value'] = stream_get_contents($row['value']);
+            }
             switch ($row['valuetype']) {
                 case null :
                 case self::VT_STRING :
@@ -121,7 +124,26 @@ class PDO implements BackendInterface {
 
         $propPatch->handleRemaining(function($properties) use ($path) {
 
-            $updateStmt = $this->pdo->prepare("REPLACE INTO " . $this->tableName . " (path, name, valuetype, value) VALUES (?, ?, ?, ?)");
+
+            if ($this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME) === 'pgsql') {
+
+                $updateSql = <<<SQL
+INSERT INTO {$this->tableName} (path, name, valuetype, value)
+VALUES (:path, :name, :valuetype, :value)
+ON CONFLICT (path, name)
+DO UPDATE SET valuetype = :valuetype, value = :value
+SQL;
+
+
+            } else {
+                $updateSql = <<<SQL
+REPLACE INTO {$this->tableName} (path, name, valuetype, value)
+VALUES (:path, :name, :valuetype, :value)
+SQL;
+
+            }
+
+            $updateStmt = $this->pdo->prepare($updateSql);
             $deleteStmt = $this->pdo->prepare("DELETE FROM " . $this->tableName . " WHERE path = ? AND name = ?");
 
             foreach ($properties as $name => $value) {
@@ -136,7 +158,14 @@ class PDO implements BackendInterface {
                         $valueType = self::VT_OBJECT;
                         $value = serialize($value);
                     }
-                    $updateStmt->execute([$path, $name, $valueType, $value]);
+
+                    $updateStmt->bindParam('path', $path, \PDO::PARAM_STR);
+                    $updateStmt->bindParam('name', $name, \PDO::PARAM_STR);
+                    $updateStmt->bindParam('valuetype', $valueType, \PDO::PARAM_INT);
+                    $updateStmt->bindParam('value', $value, \PDO::PARAM_LOB);
+
+                    $updateStmt->execute();
+
                 } else {
                     $deleteStmt->execute([$path, $name]);
                 }
diff --git a/vendor/sabre/dav/lib/DAV/Server.php b/vendor/sabre/dav/lib/DAV/Server.php
index b37652812..024b7a557 100644
--- a/vendor/sabre/dav/lib/DAV/Server.php
+++ b/vendor/sabre/dav/lib/DAV/Server.php
@@ -8,6 +8,10 @@ use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 use Sabre\HTTP\URLUtil;
 use Sabre\Uri;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
+use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 
 /**
  * Main DAV server class
@@ -16,7 +20,9 @@ use Sabre\Uri;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Server extends EventEmitter {
+class Server extends EventEmitter implements LoggerAwareInterface {
+
+    use LoggerAwareTrait;
 
     /**
      * Infinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
@@ -430,6 +436,20 @@ class Server extends EventEmitter {
 
     }
 
+    /**
+     * Returns the PSR-3 logger objcet.
+     *
+     * @return LoggerInterface
+     */
+    function getLogger() {
+
+        if (!$this->logger) {
+            $this->logger = new NullLogger();
+        }
+        return $this->logger;
+
+    }
+
     /**
      * Handles a http request, and execute a method based on its name
      *
@@ -1177,9 +1197,20 @@ class Server extends EventEmitter {
 
         if (!$success) {
             $result = $mkCol->getResult();
-            // generateMkCol needs the href key to exist.
-            $result['href'] = $uri;
-            return $result;
+
+            $formattedResult = [
+                'href' => $uri,
+            ];
+
+            foreach ($result as $propertyName => $status) {
+
+                if (!isset($formattedResult[$status])) {
+                    $formattedResult[$status] = [];
+                }
+                $formattedResult[$status][$propertyName] = null;
+
+            }
+            return $formattedResult;
         }
 
         $this->tree->markDirty($parentUri);
diff --git a/vendor/sabre/dav/lib/DAV/Sharing/ISharedNode.php b/vendor/sabre/dav/lib/DAV/Sharing/ISharedNode.php
new file mode 100644
index 000000000..034aefbdc
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAV/Sharing/ISharedNode.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Sabre\DAV\Sharing;
+
+use Sabre\DAV\INode;
+
+/**
+ * This interface represents a resource that has sharing capabilities, either
+ * because it's possible for an owner to share the resource, or because this is
+ * an instance of a shared resource.
+ *
+ * @copyright Copyright (C) fruux GmbH. (https://fruux.com/)
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+interface ISharedNode extends INode {
+
+    /**
+     * Returns the 'access level' for the instance of this shared resource.
+     *
+     * The value should be one of the Sabre\DAV\Sharing\Plugin::ACCESS_
+     * constants.
+     *
+     * @return int
+     */
+    function getShareAccess();
+
+    /**
+     * This function must return a URI that uniquely identifies the shared
+     * resource. This URI should be identical across instances, and is
+     * also used in several other XML bodies to connect invites to
+     * resources.
+     *
+     * This may simply be a relative reference to the original shared instance,
+     * but it could also be a urn. As long as it's a valid URI and unique.
+     *
+     * @return string
+     */
+    function getShareResourceUri();
+
+    /**
+     * Updates the list of sharees.
+     *
+     * Every item must be a Sharee object.
+     *
+     * @param \Sabre\DAV\Xml\Element\Sharee[] $sharees
+     * @return void
+     */
+    function updateInvites(array $sharees);
+
+    /**
+     * Returns the list of people whom this resource is shared with.
+     *
+     * Every item in the returned array must be a Sharee object with
+     * at least the following properties set:
+     *
+     * * $href
+     * * $shareAccess
+     * * $inviteStatus
+     *
+     * and optionally:
+     *
+     * * $properties
+     *
+     * @return \Sabre\DAV\Xml\Element\Sharee[]
+     */
+    function getInvites();
+
+}
diff --git a/vendor/sabre/dav/lib/DAV/Sharing/Plugin.php b/vendor/sabre/dav/lib/DAV/Sharing/Plugin.php
new file mode 100644
index 000000000..354d06a56
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAV/Sharing/Plugin.php
@@ -0,0 +1,342 @@
+<?php
+
+namespace Sabre\DAV\Sharing;
+
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\INode;
+use Sabre\DAV\PropFind;
+use Sabre\DAV\Server;
+use Sabre\DAV\ServerPlugin;
+use Sabre\DAV\Xml\Property;
+use Sabre\DAV\Xml\Element\Sharee;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
+
+/**
+ * This plugin implements HTTP requests and properties related to:
+ *
+ * draft-pot-webdav-resource-sharing
+ *
+ * This specification allows people to share webdav resources with others.
+ *
+ * @copyright Copyright (C) 2007-2015 fruux GmbH. (https://fruux.com/)
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class Plugin extends ServerPlugin {
+
+    const ACCESS_NOTSHARED = 0;
+    const ACCESS_SHAREDOWNER = 1;
+    const ACCESS_READ = 2;
+    const ACCESS_READWRITE = 3;
+    const ACCESS_NOACCESS = 4;
+
+    const INVITE_NORESPONSE = 1;
+    const INVITE_ACCEPTED = 2;
+    const INVITE_DECLINED = 3;
+    const INVITE_INVALID = 4;
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return array
+     */
+    function getFeatures() {
+
+        return ['resource-sharing'];
+
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using \Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    function getPluginName() {
+
+        return 'sharing';
+
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     * @return void
+     */
+    function initialize(Server $server) {
+
+        $this->server = $server;
+
+        $server->xml->elementMap['{DAV:}share-resource'] = 'Sabre\\DAV\\Xml\\Request\\ShareResource';
+
+        array_push(
+            $server->protectedProperties,
+            '{DAV:}share-mode'
+        );
+
+        $server->on('method:POST',              [$this, 'httpPost']);
+        $server->on('propFind',                 [$this, 'propFind']);
+        $server->on('getSupportedPrivilegeSet', [$this, 'getSupportedPrivilegeSet']);
+        $server->on('onHTMLActionsPanel',       [$this, 'htmlActionsPanel']);
+        $server->on('onBrowserPostAction',      [$this, 'browserPostAction']);
+
+    }
+
+    /**
+     * Updates the list of sharees on a shared resource.
+     *
+     * The sharees  array is a list of people that are to be added modified
+     * or removed in the list of shares.
+     *
+     * @param string $path
+     * @param Sharee[] $sharees
+     * @return void
+     */
+    function shareResource($path, array $sharees) {
+
+        $node = $this->server->tree->getNodeForPath($path);
+
+        if (!$node instanceof ISharedNode) {
+
+            throw new Forbidden('Sharing is not allowed on this node');
+
+        }
+
+        // Getting ACL info
+        $acl = $this->server->getPlugin('acl');
+
+        // If there's no ACL support, we allow everything
+        if ($acl) {
+            $acl->checkPrivileges($path, '{DAV:}share');
+        }
+
+        foreach ($sharees as $sharee) {
+            // We're going to attempt to get a local principal uri for a share
+            // href by emitting the getPrincipalByUri event.
+            $principal = null;
+            $this->server->emit('getPrincipalByUri', [$sharee->href, &$principal]);
+            $sharee->principal = $principal;
+        }
+        $node->updateInvites($sharees);
+
+    }
+
+    /**
+     * This event is triggered when properties are requested for nodes.
+     *
+     * This allows us to inject any sharings-specific properties.
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFind(PropFind $propFind, INode $node) {
+
+        if ($node instanceof ISharedNode) {
+
+            $propFind->handle('{DAV:}share-access', function() use ($node) {
+
+                return new Property\ShareAccess($node->getShareAccess());
+
+            });
+            $propFind->handle('{DAV:}invite', function() use ($node) {
+
+                return new Property\Invite($node->getInvites());
+
+            });
+            $propFind->handle('{DAV:}share-resource-uri', function() use ($node) {
+
+                return new Property\Href($node->getShareResourceUri());
+
+            });
+
+        }
+
+    }
+
+    /**
+     * We intercept this to handle POST requests on shared resources
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return null|bool
+     */
+    function httpPost(RequestInterface $request, ResponseInterface $response) {
+
+        $path = $request->getPath();
+        $contentType = $request->getHeader('Content-Type');
+
+        // We're only interested in the davsharing content type.
+        if (strpos($contentType, 'application/davsharing+xml') === false) {
+            return;
+        }
+
+        $message = $this->server->xml->parse(
+            $request->getBody(),
+            $request->getUrl(),
+            $documentType
+        );
+
+        switch ($documentType) {
+
+            case '{DAV:}share-resource':
+
+                $this->shareResource($path, $message->sharees);
+                $response->setStatus(200);
+                // Adding this because sending a response body may cause issues,
+                // and I wanted some type of indicator the response was handled.
+                $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+                // Breaking the event chain
+                return false;
+
+            default :
+                throw new BadRequest('Unexpected document type: ' . $documentType . ' for this Content-Type');
+
+        }
+
+    }
+
+    /**
+     * This method is triggered whenever a subsystem reqeuests the privileges
+     * hat are supported on a particular node.
+     *
+     * We need to add a number of privileges for scheduling purposes.
+     *
+     * @param INode $node
+     * @param array $supportedPrivilegeSet
+     */
+    function getSupportedPrivilegeSet(INode $node, array &$supportedPrivilegeSet) {
+
+        if ($node instanceof ISharedNode) {
+            $supportedPrivilegeSet['{DAV:}share'] = [
+                'abstract'   => false,
+                'aggregates' => [],
+            ];
+        }
+    }
+
+    /**
+     * Returns a bunch of meta-data about the plugin.
+     *
+     * Providing this information is optional, and is mainly displayed by the
+     * Browser plugin.
+     *
+     * The description key in the returned array may contain html and will not
+     * be sanitized.
+     *
+     * @return array
+     */
+    function getPluginInfo() {
+
+        return [
+            'name'        => $this->getPluginName(),
+            'description' => 'This plugin implements WebDAV resource sharing',
+            'link'        => 'https://github.com/evert/webdav-sharing'
+        ];
+
+    }
+
+    /**
+     * This method is used to generate HTML output for the
+     * DAV\Browser\Plugin.
+     *
+     * @param INode $node
+     * @param string $output
+     * @param string $path
+     * @return bool|null
+     */
+    function htmlActionsPanel(INode $node, &$output, $path) {
+
+        if (!$node instanceof ISharedNode) {
+            return;
+        }
+
+        $aclPlugin = $this->server->getPlugin('acl');
+        if ($aclPlugin) {
+            if (!$aclPlugin->checkPrivileges($path, '{DAV:}share', \Sabre\DAVACL\Plugin::R_PARENT, false)) {
+                // Sharing is not permitted, we will not draw this interface.
+                return;
+            }
+        }
+
+        $output .= '<tr><td colspan="2"><form method="post" action="">
+            <h3>Share this resource</h3>
+            <input type="hidden" name="sabreAction" value="share" />
+            <label>Share with (uri):</label> <input type="text" name="href" placeholder="mailto:user@example.org"/><br />
+            <label>Access</label>
+                <select name="access">
+                    <option value="readwrite">Read-write</option>
+                    <option value="read">Read-only</option>
+                    <option value="no-access">Revoke access</option>
+                </select><br />
+             <input type="submit" value="share" />
+            </form>
+            </td></tr>';
+
+    }
+
+    /**
+     * This method is triggered for POST actions generated by the browser
+     * plugin.
+     *
+     * @param string $path
+     * @param string $action
+     * @param array $postVars
+     */
+    function browserPostAction($path, $action, $postVars) {
+
+        if ($action !== 'share') {
+            return;
+        }
+
+        if (empty($postVars['href'])) {
+            throw new BadRequest('The "href" POST parameter is required');
+        }
+        if (empty($postVars['access'])) {
+            throw new BadRequest('The "access" POST parameter is required');
+        }
+
+        $accessMap = [
+            'readwrite' => self::ACCESS_READWRITE,
+            'read'      => self::ACCESS_READ,
+            'no-access' => self::ACCESS_NOACCESS,
+        ];
+
+        if (!isset($accessMap[$postVars['access']])) {
+            throw new BadRequest('The "access" POST must be readwrite, read or no-access');
+        }
+        $sharee = new Sharee([
+            'href'   => $postVars['href'],
+            'access' => $accessMap[$postVars['access']],
+        ]);
+
+        $this->shareResource(
+            $path,
+            [$sharee]
+        );
+        return false;
+
+    }
+
+}
diff --git a/vendor/sabre/dav/lib/DAV/Tree.php b/vendor/sabre/dav/lib/DAV/Tree.php
index 4563f7c72..5d2792503 100644
--- a/vendor/sabre/dav/lib/DAV/Tree.php
+++ b/vendor/sabre/dav/lib/DAV/Tree.php
@@ -229,7 +229,7 @@ class Tree {
         // flushing the entire cache
         $path = trim($path, '/');
         foreach ($this->cache as $nodePath => $node) {
-            if ($nodePath == $path || strpos($nodePath, $path . '/') === 0)
+            if ($path === '' || $nodePath == $path || strpos($nodePath, $path . '/') === 0)
                 unset($this->cache[$nodePath]);
 
         }
diff --git a/vendor/sabre/dav/lib/DAV/Version.php b/vendor/sabre/dav/lib/DAV/Version.php
index f9331943a..2fda85db8 100644
--- a/vendor/sabre/dav/lib/DAV/Version.php
+++ b/vendor/sabre/dav/lib/DAV/Version.php
@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '3.1.3';
+    const VERSION = '3.2.0';
 
 }
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Element/Sharee.php b/vendor/sabre/dav/lib/DAV/Xml/Element/Sharee.php
new file mode 100644
index 000000000..dcfd7bd2e
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAV/Xml/Element/Sharee.php
@@ -0,0 +1,199 @@
+<?php
+
+namespace Sabre\DAV\Xml\Element;
+
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\Sharing\Plugin;
+use Sabre\DAV\Xml\Property\Href;
+use Sabre\DAV\Xml\Property\ShareAccess;
+use Sabre\Xml\Deserializer;
+use Sabre\Xml\Element;
+use Sabre\Xml\Reader;
+use Sabre\Xml\Writer;
+
+/**
+ * This class represents the {DAV:}sharee element.
+ *
+ * @copyright Copyright (C) fruux GmbH. (https://fruux.com/)
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class Sharee implements Element {
+
+    /**
+     * A URL. Usually a mailto: address, could also be a principal url.
+     * This uniquely identifies the sharee.
+     *
+     * @var string
+     */
+    public $href;
+
+    /**
+     * A local principal path. The server will do its best to locate the
+     * principal uri based on the given uri. If we could find a local matching
+     * principal uri, this property will contain the value.
+     *
+     * @var string|null
+     */
+    public $principal;
+
+    /**
+     * A list of WebDAV properties that describe the sharee. This might for
+     * example contain a {DAV:}displayname with the real name of the user.
+     *
+     * @var array
+     */
+    public $properties = [];
+
+    /**
+     * Share access level. One of the Sabre\DAV\Sharing\Plugin::ACCESS
+     * constants.
+     *
+     * Can be one of:
+     *
+     * ACCESS_READ
+     * ACCESS_READWRITE
+     * ACCESS_SHAREDOWNER
+     * ACCESS_NOACCESS
+     *
+     * depending on context.
+     *
+     * @var int
+     */
+    public $access;
+
+    /**
+     * When a sharee is originally invited to a share, the sharer may add
+     * a comment. This will be placed in this property.
+     *
+     * @var string
+     */
+    public $comment;
+
+    /**
+     * The status of the invite, should be one of the
+     * Sabre\DAV\Sharing\Plugin::INVITE constants.
+     *
+     * @var int
+     */
+    public $inviteStatus;
+
+    /**
+     * Creates the object
+     *
+     * $properties will be used to populate all internal properties.
+     *
+     * @param array $properties
+     */
+    function __construct(array $properties = []) {
+
+        foreach ($properties as $k => $v) {
+
+            if (property_exists($this, $k)) {
+                $this->$k = $v;
+            } else {
+                throw new \InvalidArgumentException('Unknown property: ' . $k);
+            }
+
+        }
+
+    }
+
+    /**
+     * The xmlSerialize method is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    function xmlSerialize(Writer $writer) {
+
+
+        $writer->write([
+            new Href($this->href),
+            '{DAV:}prop'         => $this->properties,
+            '{DAV:}share-access' => new ShareAccess($this->access),
+        ]);
+        switch ($this->inviteStatus) {
+            case Plugin::INVITE_NORESPONSE :
+                $writer->writeElement('{DAV:}invite-noresponse');
+                break;
+            case Plugin::INVITE_ACCEPTED :
+                $writer->writeElement('{DAV:}invite-accepted');
+                break;
+            case Plugin::INVITE_DECLINED :
+                $writer->writeElement('{DAV:}invite-declined');
+                break;
+            case Plugin::INVITE_INVALID :
+                $writer->writeElement('{DAV:}invite-invalid');
+                break;
+        }
+
+    }
+
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statictly, this is because in theory this method
+     * may be used as a type of constructor, or factory method.
+     *
+     * Often you want to return an instance of the current class, but you are
+     * free to return other data as well.
+     *
+     * You are responsible for advancing the reader to the next element. Not
+     * doing anything will result in a never-ending loop.
+     *
+     * If you just want to skip parsing for this element altogether, you can
+     * just call $reader->next();
+     *
+     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+     * the next element.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    static function xmlDeserialize(Reader $reader) {
+
+        // Temporarily override configuration
+        $reader->pushContext();
+        $reader->elementMap['{DAV:}share-access'] = 'Sabre\DAV\Xml\Property\ShareAccess';
+        $reader->elementMap['{DAV:}prop'] = 'Sabre\Xml\Deserializer\keyValue';
+
+        $elems = Deserializer\keyValue($reader, 'DAV:');
+
+        // Restore previous configuration
+        $reader->popContext();
+
+        $sharee = new self();
+        if (!isset($elems['href'])) {
+            throw new BadRequest('Every {DAV:}sharee must have a {DAV:}href child-element');
+        }
+        $sharee->href = $elems['href'];
+
+        if (isset($elems['prop'])) {
+            $sharee->properties = $elems['prop'];
+        }
+        if (isset($elems['comment'])) {
+            $sharee->comment = $elems['comment'];
+        }
+        if (!isset($elems['share-access'])) {
+            throw new BadRequest('Every {DAV:}sharee must have a {DAV:}share-access child element');
+        }
+        $sharee->access = $elems['share-access']->getValue();
+        return $sharee;
+
+    }
+
+}
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php b/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php
index 538e98d0f..0027f72e1 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/Href.php
@@ -7,6 +7,7 @@ use Sabre\DAV\Browser\HtmlOutputHelper;
 use Sabre\Xml\Element;
 use Sabre\Xml\Reader;
 use Sabre\Xml\Writer;
+use Sabre\Uri;
 
 /**
  * Href property
@@ -31,13 +32,6 @@ class Href implements Element, HtmlOutput {
      */
     protected $hrefs;
 
-    /**
-     * Automatically prefix the url with the server base directory
-     *
-     * @var bool
-     */
-    protected $autoPrefix = true;
-
     /**
      * Constructor
      *
@@ -47,16 +41,13 @@ class Href implements Element, HtmlOutput {
      * and not relative to the servers base uri.
      *
      * @param string|string[] $href
-     * @param bool $autoPrefix
      */
-    function __construct($hrefs, $autoPrefix = true) {
+    function __construct($hrefs) {
 
         if (is_string($hrefs)) {
             $hrefs = [$hrefs];
         }
         $this->hrefs = $hrefs;
-        $this->autoPrefix = $autoPrefix;
-
 
     }
 
@@ -104,9 +95,7 @@ class Href implements Element, HtmlOutput {
     function xmlSerialize(Writer $writer) {
 
         foreach ($this->getHrefs() as $href) {
-            if ($this->autoPrefix) {
-                $href = $writer->contextUri . \Sabre\HTTP\encodePath($href);
-            }
+            $href = Uri\resolve($writer->contextUri, $href);
             $writer->writeElement('{DAV:}href', $href);
         }
 
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/Invite.php b/vendor/sabre/dav/lib/DAV/Xml/Property/Invite.php
new file mode 100644
index 000000000..0616ff113
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/Invite.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Sabre\DAV\Xml\Property;
+
+use Sabre\DAV\Sharing\Sharee;
+use Sabre\Xml\XmlSerializable;
+use Sabre\Xml\Writer;
+
+/**
+ * This class represents the {DAV:}invite property.
+ *
+ * This property is defined here:
+ * https://tools.ietf.org/html/draft-pot-webdav-resource-sharing-03#section-4.4.2
+ *
+ * This property is used by clients to determine who currently has access to
+ * a shared resource, what their access level is and what their invite status
+ * is.
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class Invite implements XmlSerializable {
+
+    /**
+     * A list of sharees
+     *
+     * @var Sharee[]
+     */
+    public $sharees = [];
+
+    /**
+     * Creates the property.
+     *
+     * @param Sharee[] $sharees
+     */
+    function __construct(array $sharees) {
+
+        $this->sharees = $sharees;
+
+    }
+
+    /**
+     * The xmlSerialize method is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    function xmlSerialize(Writer $writer) {
+
+        foreach ($this->sharees as $sharee) {
+            $writer->writeElement('{DAV:}sharee', $sharee);
+        }
+
+    }
+
+}
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/LocalHref.php b/vendor/sabre/dav/lib/DAV/Xml/Property/LocalHref.php
new file mode 100644
index 000000000..76a27b95d
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/LocalHref.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Sabre\DAV\Xml\Property;
+
+use Sabre\HTTP;
+
+/**
+ * LocalHref property
+ *
+ * Like the Href property, this element represents {DAV:}href. The difference
+ * is that this is used stricly for paths on the server. The LocalHref property
+ * will prepare the path so it's a valid URI.
+ *
+ * These two objects behave identically:
+ *    new LocalHref($path)
+ *    new Href(\Sabre\HTTP\encodePath($path))
+ *
+ * LocalPath basically ensures that your spaces are %20, and everything that
+ * needs to be is uri encoded.
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class LocalHref extends Href {
+
+    /**
+     * Constructor
+     *
+     * You must either pass a string for a single href, or an array of hrefs.
+     *
+     * If auto-prefix is set to false, the hrefs will be treated as absolute
+     * and not relative to the servers base uri.
+     *
+     * @param string|string[] $href
+     */
+    function __construct($hrefs) {
+
+        parent::__construct(array_map(
+            function($href) {
+                return \Sabre\HTTP\encodePath($href);
+            },
+            (array)$hrefs
+        ));
+
+    }
+
+}
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/ShareAccess.php b/vendor/sabre/dav/lib/DAV/Xml/Property/ShareAccess.php
new file mode 100644
index 000000000..a3fc6b0e1
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/ShareAccess.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace Sabre\DAV\Xml\Property;
+
+use Sabre\DAV\Sharing\Plugin as SharingPlugin;
+use Sabre\DAV\Exception\BadRequest;
+use Sabre\Xml\Element;
+use Sabre\Xml\Reader;
+use Sabre\Xml\Writer;
+
+/**
+ * This class represents the {DAV:}share-access property.
+ *
+ * This property is defined here:
+ * https://tools.ietf.org/html/draft-pot-webdav-resource-sharing-03#section-4.4.1
+ *
+ * This property is used to indicate if a resource is a shared resource, and
+ * whether the instance of the shared resource is the original instance, or
+ * an instance belonging to a sharee.
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class ShareAccess implements Element {
+
+    /**
+     * Either SHARED or SHAREDOWNER
+     *
+     * @var int
+     */
+    protected $value;
+
+    /**
+     * Creates the property.
+     *
+     * The constructor value must be one of the
+     * \Sabre\DAV\Sharing\Plugin::ACCESS_ constants.
+     *
+     * @param int $shareAccess
+     */
+    function __construct($shareAccess) {
+
+        $this->value = $shareAccess;
+
+    }
+
+    /**
+     * Returns the current value.
+     *
+     * @return int
+     */
+    function getValue() {
+
+        return $this->value;
+
+    }
+
+    /**
+     * The xmlSerialize method is called during xml writing.
+     *
+     * Use the $writer argument to write its own xml serialization.
+     *
+     * An important note: do _not_ create a parent element. Any element
+     * implementing XmlSerializble should only ever write what's considered
+     * its 'inner xml'.
+     *
+     * The parent of the current element is responsible for writing a
+     * containing element.
+     *
+     * This allows serializers to be re-used for different element names.
+     *
+     * If you are opening new elements, you must also close them again.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    function xmlSerialize(Writer $writer) {
+
+        switch ($this->value) {
+
+            case SharingPlugin::ACCESS_NOTSHARED :
+                $writer->writeElement('{DAV:}not-shared');
+                break;
+            case SharingPlugin::ACCESS_SHAREDOWNER :
+                $writer->writeElement('{DAV:}shared-owner');
+                break;
+            case SharingPlugin::ACCESS_READ :
+                $writer->writeElement('{DAV:}read');
+                break;
+            case SharingPlugin::ACCESS_READWRITE :
+                $writer->writeElement('{DAV:}read-write');
+                break;
+            case SharingPlugin::ACCESS_NOACCESS :
+                $writer->writeElement('{DAV:}no-access');
+                break;
+
+        }
+
+    }
+
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statictly, this is because in theory this method
+     * may be used as a type of constructor, or factory method.
+     *
+     * Often you want to return an instance of the current class, but you are
+     * free to return other data as well.
+     *
+     * You are responsible for advancing the reader to the next element. Not
+     * doing anything will result in a never-ending loop.
+     *
+     * If you just want to skip parsing for this element altogether, you can
+     * just call $reader->next();
+     *
+     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+     * the next element.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    static function xmlDeserialize(Reader $reader) {
+
+        $elems = $reader->parseInnerTree();
+        foreach ($elems as $elem) {
+            switch ($elem['name']) {
+                case '{DAV:}not-shared' :
+                    return new self(SharingPlugin::ACCESS_NOTSHARED);
+                case '{DAV:}shared-owner' :
+                    return new self(SharingPlugin::ACCESS_SHAREDOWNER);
+                case '{DAV:}read' :
+                    return new self(SharingPlugin::ACCESS_READ);
+                case '{DAV:}read-write' :
+                    return new self(SharingPlugin::ACCESS_READWRITE);
+                case '{DAV:}no-access' :
+                    return new self(SharingPlugin::ACCESS_NOACCESS);
+            }
+        }
+        throw new BadRequest('Invalid value for {DAV:}share-access element');
+
+    }
+}
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedMethodSet.php b/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedMethodSet.php
index 56b418db6..7641f3739 100644
--- a/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedMethodSet.php
+++ b/vendor/sabre/dav/lib/DAV/Xml/Property/SupportedMethodSet.php
@@ -32,16 +32,11 @@ class SupportedMethodSet implements XmlSerializable, HtmlOutput {
     /**
      * Creates the property
      *
-     * Any reports passed in the constructor
-     * should be valid report-types in clark-notation.
-     *
-     * Either a string or an array of strings must be passed.
-     *
-     * @param string|string[] $methods
+     * @param string[] $methods
      */
-    function __construct($methods = null) {
+    function __construct(array $methods) {
 
-        $this->methods = (array)$methods;
+        $this->methods = $methods;
 
     }
 
diff --git a/vendor/sabre/dav/lib/DAV/Xml/Request/ShareResource.php b/vendor/sabre/dav/lib/DAV/Xml/Request/ShareResource.php
new file mode 100644
index 000000000..965e5857c
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAV/Xml/Request/ShareResource.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace Sabre\DAV\Xml\Request;
+
+use Sabre\Xml\Reader;
+use Sabre\Xml\XmlDeserializable;
+use Sabre\DAV\Xml\Element\Sharee;
+
+/**
+ * ShareResource request parser.
+ *
+ * This class parses the {DAV:}share-resource POST request as defined in:
+ *
+ * https://tools.ietf.org/html/draft-pot-webdav-resource-sharing-01#section-5.3.2.1
+ *
+ * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class ShareResource implements XmlDeserializable {
+
+    /**
+     * The list of new people added or updated or removed from the share.
+     *
+     * @var Sharee[]
+     */
+    public $sharees = [];
+
+    /**
+     * Constructor
+     *
+     * @param Sharee[] $sharees
+     */
+    function __construct(array $sharees) {
+
+        $this->sharees = $sharees;
+
+    }
+
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statictly, this is because in theory this method
+     * may be used as a type of constructor, or factory method.
+     *
+     * Often you want to return an instance of the current class, but you are
+     * free to return other data as well.
+     *
+     * You are responsible for advancing the reader to the next element. Not
+     * doing anything will result in a never-ending loop.
+     *
+     * If you just want to skip parsing for this element altogether, you can
+     * just call $reader->next();
+     *
+     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+     * the next element.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    static function xmlDeserialize(Reader $reader) {
+
+        $elems = $reader->parseInnerTree([
+            '{DAV:}sharee'       => 'Sabre\DAV\Xml\Element\Sharee',
+            '{DAV:}share-access' => 'Sabre\DAV\Xml\Property\ShareAccess',
+            '{DAV:}prop'         => 'Sabre\Xml\Deserializer\keyValue',
+        ]);
+
+        $sharees = [];
+
+        foreach ($elems as $elem) {
+            if ($elem['name'] !== '{DAV:}sharee') continue;
+            $sharees[] = $elem['value'];
+
+        }
+
+        return new self($sharees);
+
+    }
+
+}
diff --git a/vendor/sabre/dav/lib/DAVACL/ACLTrait.php b/vendor/sabre/dav/lib/DAVACL/ACLTrait.php
new file mode 100644
index 000000000..602654a2e
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAVACL/ACLTrait.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Sabre\DAVACL;
+
+/**
+ * This trait is a default implementation of the IACL interface.
+ *
+ * In many cases you only want to implement 1 or to of the IACL functions,
+ * this trait allows you to be a bit lazier.
+ *
+ * By default this trait grants all privileges to the owner of the resource.
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @author Evert Pot (https://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+trait ACLTrait {
+
+    /**
+     * Returns the owner principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    function getOwner() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a group principal
+     *
+     * This must be a url to a principal, or null if there's no owner
+     *
+     * @return string|null
+     */
+    function getGroup() {
+
+        return null;
+
+    }
+
+    /**
+     * Returns a list of ACE's for this node.
+     *
+     * Each ACE has the following properties:
+     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
+     *     currently the only supported privileges
+     *   * 'principal', a url to the principal who owns the node
+     *   * 'protected' (optional), indicating that this ACE is not allowed to
+     *      be updated.
+     *
+     * @return array
+     */
+    function getACL() {
+
+        return [
+            [
+                'privilege' => '{DAV:}all',
+                'principal' => '{DAV:}owner',
+                'protected' => true,
+            ]
+        ];
+
+    }
+
+    /**
+     * Updates the ACL
+     *
+     * This method will receive a list of new ACE's as an array argument.
+     *
+     * @param array $acl
+     * @return void
+     */
+    function setACL(array $acl) {
+
+        throw new \Sabre\DAV\Exception\Forbidden('Setting ACL is not supported on this node');
+    }
+
+    /**
+     * Returns the list of supported privileges for this node.
+     *
+     * The returned data structure is a list of nested privileges.
+     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
+     * standard structure.
+     *
+     * If null is returned from this method, the default privilege set is used,
+     * which is fine for most common usecases.
+     *
+     * @return array|null
+     */
+    function getSupportedPrivilegeSet() {
+
+        return null;
+
+    }
+
+}
diff --git a/vendor/sabre/dav/lib/DAVACL/AbstractPrincipalCollection.php b/vendor/sabre/dav/lib/DAVACL/AbstractPrincipalCollection.php
index 460f78981..9d2026380 100644
--- a/vendor/sabre/dav/lib/DAVACL/AbstractPrincipalCollection.php
+++ b/vendor/sabre/dav/lib/DAVACL/AbstractPrincipalCollection.php
@@ -110,7 +110,7 @@ abstract class AbstractPrincipalCollection extends DAV\Collection implements IPr
      *
      * @param string $name
      * @throws DAV\Exception\NotFound
-     * @return IPrincipal
+     * @return DAV\INode
      */
     function getChild($name) {
 
diff --git a/vendor/sabre/dav/lib/DAVACL/FS/Collection.php b/vendor/sabre/dav/lib/DAVACL/FS/Collection.php
index 5fab4768c..1c08b43b1 100644
--- a/vendor/sabre/dav/lib/DAVACL/FS/Collection.php
+++ b/vendor/sabre/dav/lib/DAVACL/FS/Collection.php
@@ -3,6 +3,7 @@
 namespace Sabre\DAVACL\FS;
 
 use Sabre\DAV\FSExt\Directory as BaseCollection;
+use Sabre\DAVACL\ACLTrait;
 use Sabre\DAVACL\IACL;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\NotFound;
@@ -16,6 +17,8 @@ use Sabre\DAV\Exception\NotFound;
  */
 class Collection extends BaseCollection implements IACL {
 
+    use ACLTrait;
+
     /**
      * A list of ACL rules.
      *
@@ -52,8 +55,8 @@ class Collection extends BaseCollection implements IACL {
      * exist.
      *
      * @param string $name
-     * @throws DAV\Exception\NotFound
-     * @return DAV\INode
+     * @throws NotFound
+     * @return \Sabre\DAV\INode
      */
     function getChild($name) {
 
@@ -87,19 +90,6 @@ class Collection extends BaseCollection implements IACL {
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
     /**
      * Returns a list of ACE's for this node.
      *
@@ -118,36 +108,4 @@ class Collection extends BaseCollection implements IACL {
 
     }
 
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new Forbidden('Setting ACL is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/DAVACL/FS/File.php b/vendor/sabre/dav/lib/DAVACL/FS/File.php
index 0d549528b..387597bf7 100644
--- a/vendor/sabre/dav/lib/DAVACL/FS/File.php
+++ b/vendor/sabre/dav/lib/DAVACL/FS/File.php
@@ -4,7 +4,7 @@ namespace Sabre\DAVACL\FS;
 
 use Sabre\DAV\FSExt\File as BaseFile;
 use Sabre\DAVACL\IACL;
-use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAVACL\ACLTrait;
 
 /**
  * This is an ACL-enabled file node.
@@ -15,6 +15,8 @@ use Sabre\DAV\Exception\Forbidden;
  */
 class File extends BaseFile implements IACL {
 
+    use ACLTrait;
+
     /**
      * A list of ACL rules.
      *
@@ -57,19 +59,6 @@ class File extends BaseFile implements IACL {
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
     /**
      * Returns a list of ACE's for this node.
      *
@@ -88,36 +77,4 @@ class File extends BaseFile implements IACL {
 
     }
 
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new Forbidden('Setting ACL is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php b/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php
index c27616770..9e21353ea 100644
--- a/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php
+++ b/vendor/sabre/dav/lib/DAVACL/FS/HomeCollection.php
@@ -2,8 +2,8 @@
 
 namespace Sabre\DAVACL\FS;
 
-use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAVACL\AbstractPrincipalCollection;
+use Sabre\DAVACL\ACLTrait;
 use Sabre\DAVACL\IACL;
 use Sabre\DAVACL\PrincipalBackend\BackendInterface;
 use Sabre\Uri;
@@ -21,6 +21,8 @@ use Sabre\Uri;
  */
 class HomeCollection extends AbstractPrincipalCollection implements IACL {
 
+    use ACLTrait;
+
     /**
      * Name of this collection.
      *
@@ -70,20 +72,15 @@ class HomeCollection extends AbstractPrincipalCollection implements IACL {
      * supplied by the authentication backend.
      *
      * @param array $principalInfo
-     * @return void
+     * @return \Sabre\DAVACL\INode
      */
     function getChildForPrincipal(array $principalInfo) {
 
         $owner = $principalInfo['uri'];
         $acl = [
             [
-                'privilege' => '{DAV:}read',
-                'principal' => $owner,
-                'protected' => true,
-            ],
-            [
-                'privilege' => '{DAV:}write',
-                'principal' => $owner,
+                'privilege' => '{DAV:}all',
+                'principal' => '{DAV:}owner',
                 'protected' => true,
             ],
         ];
@@ -103,31 +100,6 @@ class HomeCollection extends AbstractPrincipalCollection implements IACL {
 
     }
 
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getOwner() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
 
     /**
      * Returns a list of ACE's for this node.
@@ -153,36 +125,4 @@ class HomeCollection extends AbstractPrincipalCollection implements IACL {
 
     }
 
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new Forbidden('Setting ACL is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/DAVACL/IACL.php b/vendor/sabre/dav/lib/DAVACL/IACL.php
index 81908d08f..f7a138665 100644
--- a/vendor/sabre/dav/lib/DAVACL/IACL.php
+++ b/vendor/sabre/dav/lib/DAVACL/IACL.php
@@ -71,5 +71,4 @@ interface IACL extends DAV\INode {
      */
     function getSupportedPrivilegeSet();
 
-
 }
diff --git a/vendor/sabre/dav/lib/DAVACL/Plugin.php b/vendor/sabre/dav/lib/DAVACL/Plugin.php
index 601dffecc..8e912309e 100644
--- a/vendor/sabre/dav/lib/DAVACL/Plugin.php
+++ b/vendor/sabre/dav/lib/DAVACL/Plugin.php
@@ -4,7 +4,11 @@ namespace Sabre\DAVACL;
 
 use Sabre\DAV;
 use Sabre\DAV\INode;
+use Sabre\DAV\Xml\Property\Href;
 use Sabre\DAV\Exception\BadRequest;
+use Sabre\DAV\Exception\NotFound;
+use Sabre\DAV\Exception\NotAuthenticated;
+use Sabre\DAVACL\Exception\NeedPrivileges;
 use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 use Sabre\Uri;
@@ -63,18 +67,6 @@ class Plugin extends DAV\ServerPlugin {
         'principals',
     ];
 
-    /**
-     * By default ACL is only enforced for nodes that have ACL support (the
-     * ones that implement IACL). For any other node, access is
-     * always granted.
-     *
-     * To override this behaviour you can turn this setting off. This is useful
-     * if you plan to fully support ACL in the entire tree.
-     *
-     * @var bool
-     */
-    public $allowAccessToNodesWithoutACL = true;
-
     /**
      * By default nodes that are inaccessible by the user, can still be seen
      * in directory listings (PROPFIND on parent with Depth: 1)
@@ -108,6 +100,18 @@ class Plugin extends DAV\ServerPlugin {
      */
     public $adminPrincipals = [];
 
+    /**
+     * The ACL plugin allows privileges to be assigned to users that are not
+     * logged in. To facilitate that, it modifies the auth plugin's behavior
+     * to only require login when a privileged operation was denied.
+     *
+     * Unauthenticated access can be considered a security concern, so it's
+     * possible to turn this feature off to harden the server's security.
+     *
+     * @var bool
+     */
+    public $allowUnauthenticatedAccess = true;
+
     /**
      * Returns a list of features added by this plugin.
      *
@@ -161,6 +165,7 @@ class Plugin extends DAV\ServerPlugin {
 
         return [
             '{DAV:}expand-property',
+            '{DAV:}principal-match',
             '{DAV:}principal-property-search',
             '{DAV:}principal-search-property-set',
         ];
@@ -179,7 +184,8 @@ class Plugin extends DAV\ServerPlugin {
      * @param array|string $privileges
      * @param int $recursion
      * @param bool $throwExceptions if set to false, this method won't throw exceptions.
-     * @throws Sabre\DAVACL\Exception\NeedPrivileges
+     * @throws NeedPrivileges
+     * @throws NotAuthenticated
      * @return bool
      */
     function checkPrivileges($uri, $privileges, $recursion = self::R_PARENT, $throwExceptions = true) {
@@ -188,18 +194,6 @@ class Plugin extends DAV\ServerPlugin {
 
         $acl = $this->getCurrentUserPrivilegeSet($uri);
 
-        if (is_null($acl)) {
-            if ($this->allowAccessToNodesWithoutACL) {
-                return true;
-            } else {
-                if ($throwExceptions)
-                    throw new Exception\NeedPrivileges($uri, $privileges);
-                else
-                    return false;
-
-            }
-        }
-
         $failed = [];
         foreach ($privileges as $priv) {
 
@@ -210,10 +204,22 @@ class Plugin extends DAV\ServerPlugin {
         }
 
         if ($failed) {
-            if ($throwExceptions)
-                throw new Exception\NeedPrivileges($uri, $failed);
-            else
+            if ($this->allowUnauthenticatedAccess && is_null($this->getCurrentUserPrincipal())) {
+                // We are not authenticated. Kicking in the Auth plugin.
+                $authPlugin = $this->server->getPlugin('auth');
+                $reasons = $authPlugin->getLoginFailedReasons();
+                $authPlugin->challenge(
+                    $this->server->httpRequest,
+                    $this->server->httpResponse
+                );
+                throw new notAuthenticated(implode(', ', $reasons) . '. Login was needed for privilege: ' . implode(', ', $failed) . ' on ' . $uri);
+            }
+            if ($throwExceptions) {
+
+                throw new NeedPrivileges($uri, $failed);
+            } else {
                 return false;
+            }
         }
         return true;
 
@@ -229,10 +235,11 @@ class Plugin extends DAV\ServerPlugin {
      */
     function getCurrentUserPrincipal() {
 
-        $authPlugin = $this->server->getPlugin('auth');
-        if (is_null($authPlugin)) return null;
         /** @var $authPlugin Sabre\DAV\Auth\Plugin */
-
+        $authPlugin = $this->server->getPlugin('auth');
+        if (!$authPlugin) {
+            return null;
+        }
         return $authPlugin->getCurrentPrincipal();
 
     }
@@ -257,6 +264,51 @@ class Plugin extends DAV\ServerPlugin {
 
     }
 
+    /**
+     * Sets the default ACL rules.
+     *
+     * These rules are used for all nodes that don't implement the IACL interface.
+     *
+     * @param array $acl
+     * @return void
+     */
+    function setDefaultAcl(array $acl) {
+
+        $this->defaultAcl = $acl;
+
+    }
+
+    /**
+     * Returns the default ACL rules.
+     *
+     * These rules are used for all nodes that don't implement the IACL interface.
+     *
+     * @param array $acl
+     * @return void
+     */
+    function getDefaultAcl() {
+
+        return $this->defaultAcl;
+
+    }
+
+    /**
+     * The default ACL rules.
+     *
+     * These rules are used for nodes that don't implement IACL. These default
+     * set of rules allow anyone to do anything, as long as they are
+     * authenticated.
+     *
+     * var array
+     */
+    protected $defaultAcl = [
+        [
+            'principal' => '{DAV:}authenticated',
+            'protected' => true,
+            'privilege' => '{DAV:}all',
+        ],
+    ];
+
     /**
      * This array holds a cache for all the principals that are associated with
      * a single principal.
@@ -311,13 +363,77 @@ class Plugin extends DAV\ServerPlugin {
     }
 
     /**
-     * Returns the supported privilege structure for this ACL plugin.
+     * Find out of a principal equals another principal.
      *
-     * See RFC3744 for more details. Currently we default on a simple,
-     * standard structure.
+     * This is a quick way to find out wether a principal URI is part of a
+     * group, or any subgroups.
      *
-     * You can either get the list of privileges by a uri (path) or by
-     * specifying a Node.
+     * The first argument is the principal URI you want to check against. For
+     * example the principal group, and the second argument is the principal of
+     * which you want to find out of it is the same as the first principal, or
+     * in a member of the first principal's group or subgroups.
+     *
+     * So the arguments are not interchangable. If principal A is in group B,
+     * passing 'B', 'A' will yield true, but 'A', 'B' is false.
+     *
+     * If the sceond argument is not passed, we will use the current user
+     * principal.
+     *
+     * @param string $checkPrincipal
+     * @param string $currentPrincipal
+     * @return bool
+     */
+    function principalMatchesPrincipal($checkPrincipal, $currentPrincipal = null) {
+
+        if (is_null($currentPrincipal)) {
+            $currentPrincipal = $this->getCurrentUserPrincipal();
+        }
+        if ($currentPrincipal === $checkPrincipal) {
+            return true;
+        }
+        return in_array(
+            $checkPrincipal,
+            $this->getPrincipalMembership($currentPrincipal)
+        );
+
+    }
+
+
+    /**
+     * Returns a tree of supported privileges for a resource.
+     *
+     * The returned array structure should be in this form:
+     *
+     * [
+     *    [
+     *       'privilege' => '{DAV:}read',
+     *       'abstract'  => false,
+     *       'aggregates' => []
+     *    ]
+     * ]
+     *
+     * Privileges can be nested using "aggregrates". Doing so means that
+     * if you assign someone the aggregrating privilege, all the
+     * sub-privileges will automatically be granted.
+     *
+     * Marking a privilege as abstract means that the privilege cannot be
+     * directly assigned, but must be assigned via the parent privilege.
+     *
+     * So a more complex version might look like this:
+     *
+     * [
+     *    [
+     *       'privilege' => '{DAV:}read',
+     *       'abstract'  => false,
+     *       'aggregates' => [
+     *          [
+     *              'privilege'  => '{DAV:}read-acl',
+     *              'abstract'   => false,
+     *              'aggregates' => [],
+     *          ]
+     *       ]
+     *    ]
+     * ]
      *
      * @param string|INode $node
      * @return array
@@ -328,73 +444,71 @@ class Plugin extends DAV\ServerPlugin {
             $node = $this->server->tree->getNodeForPath($node);
         }
 
+        $supportedPrivileges = null;
         if ($node instanceof IACL) {
-            $result = $node->getSupportedPrivilegeSet();
-
-            if ($result)
-                return $result;
+            $supportedPrivileges = $node->getSupportedPrivilegeSet();
         }
 
-        return self::getDefaultSupportedPrivilegeSet();
+        if (is_null($supportedPrivileges)) {
 
-    }
-
-    /**
-     * Returns a fairly standard set of privileges, which may be useful for
-     * other systems to use as a basis.
-     *
-     * @return array
-     */
-    static function getDefaultSupportedPrivilegeSet() {
-
-        return [
-            'privilege'  => '{DAV:}all',
-            'abstract'   => true,
-            'aggregates' => [
-                [
-                    'privilege'  => '{DAV:}read',
+            // Default
+            $supportedPrivileges = [
+                '{DAV:}read' => [
+                    'abstract'   => false,
                     'aggregates' => [
-                        [
-                            'privilege' => '{DAV:}read-acl',
-                            'abstract'  => false,
+                        '{DAV:}read-acl' => [
+                            'abstract'   => false,
+                            'aggregates' => [],
                         ],
-                        [
-                            'privilege' => '{DAV:}read-current-user-privilege-set',
-                            'abstract'  => false,
+                        '{DAV:}read-current-user-privilege-set' => [
+                            'abstract'   => false,
+                            'aggregates' => [],
                         ],
                     ],
-                ], // {DAV:}read
-                [
-                    'privilege'  => '{DAV:}write',
+                ],
+                '{DAV:}write' => [
+                    'abstract'   => false,
                     'aggregates' => [
-                        [
-                            'privilege' => '{DAV:}write-acl',
-                            'abstract'  => false,
+                        '{DAV:}write-properties' => [
+                            'abstract'   => false,
+                            'aggregates' => [],
                         ],
-                        [
-                            'privilege' => '{DAV:}write-properties',
-                            'abstract'  => false,
+                        '{DAV:}write-content' => [
+                            'abstract'   => false,
+                            'aggregates' => [],
                         ],
-                        [
-                            'privilege' => '{DAV:}write-content',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}bind',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}unbind',
-                            'abstract'  => false,
-                        ],
-                        [
-                            'privilege' => '{DAV:}unlock',
-                            'abstract'  => false,
+                        '{DAV:}unlock' => [
+                            'abstract'   => false,
+                            'aggregates' => [],
                         ],
                     ],
-                ], // {DAV:}write
-            ],
-        ]; // {DAV:}all
+                ],
+            ];
+            if ($node instanceof \Sabre\DAV\ICollection) {
+                $supportedPrivileges['{DAV:}write']['aggregates']['{DAV:}bind'] = [
+                    'abstract'   => false,
+                    'aggregates' => [],
+                ];
+                $supportedPrivileges['{DAV:}write']['aggregates']['{DAV:}unbind'] = [
+                    'abstract'   => false,
+                    'aggregates' => [],
+                ];
+            }
+            if ($node instanceof \Sabre\DAVACL\IACL) {
+                $supportedPrivileges['{DAV:}write']['aggregates']['{DAV:}write-acl'] = [
+                    'abstract'   => false,
+                    'aggregates' => [],
+                ];
+            }
+
+        }
+
+        $this->server->emit(
+            'getSupportedPrivilegeSet',
+            [$node, &$supportedPrivileges]
+        );
+
+        return $supportedPrivileges;
 
     }
 
@@ -414,35 +528,38 @@ class Plugin extends DAV\ServerPlugin {
      */
     final function getFlatPrivilegeSet($node) {
 
-        $privs = $this->getSupportedPrivilegeSet($node);
+        $privs = [
+            'abstract'   => false,
+            'aggregates' => $this->getSupportedPrivilegeSet($node)
+        ];
 
         $fpsTraverse = null;
-        $fpsTraverse = function($priv, $concrete, &$flat) use (&$fpsTraverse) {
+        $fpsTraverse = function($privName, $privInfo, $concrete, &$flat) use (&$fpsTraverse) {
 
             $myPriv = [
-                'privilege'  => $priv['privilege'],
-                'abstract'   => isset($priv['abstract']) && $priv['abstract'],
+                'privilege'  => $privName,
+                'abstract'   => isset($privInfo['abstract']) && $privInfo['abstract'],
                 'aggregates' => [],
-                'concrete'   => isset($priv['abstract']) && $priv['abstract'] ? $concrete : $priv['privilege'],
+                'concrete'   => isset($privInfo['abstract']) && $privInfo['abstract'] ? $concrete : $privName,
             ];
 
-            if (isset($priv['aggregates'])) {
+            if (isset($privInfo['aggregates'])) {
 
-                foreach ($priv['aggregates'] as $subPriv) {
+                foreach ($privInfo['aggregates'] as $subPrivName => $subPrivInfo) {
 
-                    $myPriv['aggregates'][] = $subPriv['privilege'];
+                    $myPriv['aggregates'][] = $subPrivName;
 
                 }
 
             }
 
-            $flat[$priv['privilege']] = $myPriv;
+            $flat[$privName] = $myPriv;
 
-            if (isset($priv['aggregates'])) {
+            if (isset($privInfo['aggregates'])) {
 
-                foreach ($priv['aggregates'] as $subPriv) {
+                foreach ($privInfo['aggregates'] as $subPrivName => $subPrivInfo) {
 
-                    $fpsTraverse($subPriv, $myPriv['concrete'], $flat);
+                    $fpsTraverse($subPrivName, $subPrivInfo, $myPriv['concrete'], $flat);
 
                 }
 
@@ -451,7 +568,7 @@ class Plugin extends DAV\ServerPlugin {
         };
 
         $flat = [];
-        $fpsTraverse($privs, null, $flat);
+        $fpsTraverse('{DAV:}all', $privs, null, $flat);
 
         return $flat;
 
@@ -467,13 +584,13 @@ class Plugin extends DAV\ServerPlugin {
      * @param string|DAV\INode $node
      * @return array
      */
-    function getACL($node) {
+    function getAcl($node) {
 
         if (is_string($node)) {
             $node = $this->server->tree->getNodeForPath($node);
         }
         if (!$node instanceof IACL) {
-            return null;
+            return $this->getDefaultAcl();
         }
         $acl = $node->getACL();
         foreach ($this->adminPrincipals as $adminPrincipal) {
@@ -506,12 +623,10 @@ class Plugin extends DAV\ServerPlugin {
 
         $acl = $this->getACL($node);
 
-        if (is_null($acl)) return null;
-
-        $principals = $this->getCurrentUserPrincipals();
-
         $collected = [];
 
+        $isAuthenticated = $this->getCurrentUserPrincipal() !== null;
+
         foreach ($acl as $ace) {
 
             $principal = $ace['principal'];
@@ -520,7 +635,7 @@ class Plugin extends DAV\ServerPlugin {
 
                 case '{DAV:}owner' :
                     $owner = $node->getOwner();
-                    if ($owner && in_array($owner, $principals)) {
+                    if ($owner && $this->principalMatchesPrincipal($owner)) {
                         $collected[] = $ace;
                     }
                     break;
@@ -528,21 +643,25 @@ class Plugin extends DAV\ServerPlugin {
 
                 // 'all' matches for every user
                 case '{DAV:}all' :
-
-                // 'authenticated' matched for every user that's logged in.
-                // Since it's not possible to use ACL while not being logged
-                // in, this is also always true.
-                case '{DAV:}authenticated' :
                     $collected[] = $ace;
                     break;
 
-                // 'unauthenticated' can never occur either, so we simply
-                // ignore these.
+                case '{DAV:}authenticated' :
+                    // Authenticated users only
+                    if ($isAuthenticated) {
+                        $collected[] = $ace;
+                    }
+                    break;
+
                 case '{DAV:}unauthenticated' :
+                    // Unauthenticated users only
+                    if (!$isAuthenticated) {
+                        $collected[] = $ace;
+                    }
                     break;
 
                 default :
-                    if (in_array($ace['principal'], $principals)) {
+                    if ($this->principalMatchesPrincipal($ace['principal'])) {
                         $collected[] = $ace;
                     }
                     break;
@@ -561,6 +680,11 @@ class Plugin extends DAV\ServerPlugin {
             $current = array_pop($collected);
             $collected2[] = $current['privilege'];
 
+            if (!isset($flat[$current['privilege']])) {
+                // Ignoring privileges that are not in the supported-privileges list.
+                $this->server->getLogger()->debug('A node has the "' . $current['privilege'] . '" in its ACL list, but this privilege was not reported in the supportedPrivilegeSet list. This will be ignored.');
+                continue;
+            }
             foreach ($flat[$current['privilege']]['aggregates'] as $subPriv) {
                 $collected2[] = $subPriv;
                 $collected[] = $flat[$subPriv];
@@ -587,7 +711,13 @@ class Plugin extends DAV\ServerPlugin {
         $collections = $this->principalCollectionSet;
         foreach ($collections as $collection) {
 
-            $principalCollection = $this->server->tree->getNodeForPath($collection);
+            try {
+                $principalCollection = $this->server->tree->getNodeForPath($collection);
+            } catch (NotFound $e) {
+                // Ignore and move on
+                continue;
+            }
+
             if (!$principalCollection instanceof IPrincipalCollection) {
                 // Not a principal collection, we're simply going to ignore
                 // this.
@@ -673,6 +803,14 @@ class Plugin extends DAV\ServerPlugin {
      */
     function initialize(DAV\Server $server) {
 
+        if ($this->allowUnauthenticatedAccess) {
+            $authPlugin = $server->getPlugin('auth');
+            if (!$authPlugin) {
+                throw new \Exception('The Auth plugin must be loaded before the ACL plugin if you want to allow unauthenticated access.');
+            }
+            $authPlugin->autoRequireLogin = false;
+        }
+
         $this->server = $server;
         $server->on('propFind',            [$this, 'propFind'], 20);
         $server->on('beforeMethod',        [$this, 'beforeMethod'], 20);
@@ -683,6 +821,14 @@ class Plugin extends DAV\ServerPlugin {
         $server->on('report',              [$this, 'report']);
         $server->on('method:ACL',          [$this, 'httpAcl']);
         $server->on('onHTMLActionsPanel',  [$this, 'htmlActionsPanel']);
+        $server->on('getPrincipalByUri',  function($principal, &$uri) {
+
+            $uri = $this->getPrincipalByUri($principal);
+
+            // Break event chain
+            if ($uri) return false;
+
+        });
 
         array_push($server->protectedProperties,
             '{DAV:}alternate-URI-set',
@@ -707,9 +853,11 @@ class Plugin extends DAV\ServerPlugin {
         // class.
         $server->xml->elementMap['{DAV:}group-member-set'] = 'Sabre\\DAV\\Xml\\Property\\Href';
         $server->xml->elementMap['{DAV:}acl'] = 'Sabre\\DAVACL\\Xml\\Property\\Acl';
+        $server->xml->elementMap['{DAV:}acl-principal-prop-set'] = 'Sabre\\DAVACL\\Xml\\Request\\AclPrincipalPropSetReport';
         $server->xml->elementMap['{DAV:}expand-property'] = 'Sabre\\DAVACL\\Xml\\Request\\ExpandPropertyReport';
         $server->xml->elementMap['{DAV:}principal-property-search'] = 'Sabre\\DAVACL\\Xml\\Request\\PrincipalPropertySearchReport';
         $server->xml->elementMap['{DAV:}principal-search-property-set'] = 'Sabre\\DAVACL\\Xml\\Request\\PrincipalSearchPropertySetReport';
+        $server->xml->elementMap['{DAV:}principal-match'] = 'Sabre\\DAVACL\\Xml\\Request\\PrincipalMatchReport';
 
     }
 
@@ -743,7 +891,6 @@ class Plugin extends DAV\ServerPlugin {
 
             case 'PUT' :
             case 'LOCK' :
-            case 'UNLOCK' :
                 // This method requires the write-content priv if the node
                 // already exists, and bind on the parent if the node is being
                 // created.
@@ -751,6 +898,9 @@ class Plugin extends DAV\ServerPlugin {
                 $this->checkPrivileges($path, '{DAV:}write-content');
                 break;
 
+            case 'UNLOCK' :
+                // Unlock is always allowed at the moment.
+                break;
 
             case 'PROPPATCH' :
                 $this->checkPrivileges($path, '{DAV:}write-properties');
@@ -774,7 +924,6 @@ class Plugin extends DAV\ServerPlugin {
                 // If MOVE is used beforeUnbind will also be used to check if
                 // the sourcenode can be deleted.
                 $this->checkPrivileges($path, '{DAV:}read', self::R_RECURSIVE);
-
                 break;
 
         }
@@ -864,24 +1013,24 @@ class Plugin extends DAV\ServerPlugin {
         if ($node instanceof IPrincipal) {
 
             $propFind->handle('{DAV:}alternate-URI-set', function() use ($node) {
-                return new DAV\Xml\Property\Href($node->getAlternateUriSet());
+                return new Href($node->getAlternateUriSet());
             });
             $propFind->handle('{DAV:}principal-URL', function() use ($node) {
-                return new DAV\Xml\Property\Href($node->getPrincipalUrl() . '/');
+                return new Href($node->getPrincipalUrl() . '/');
             });
             $propFind->handle('{DAV:}group-member-set', function() use ($node) {
                 $members = $node->getGroupMemberSet();
                 foreach ($members as $k => $member) {
                     $members[$k] = rtrim($member, '/') . '/';
                 }
-                return new DAV\Xml\Property\Href($members);
+                return new Href($members);
             });
             $propFind->handle('{DAV:}group-membership', function() use ($node) {
                 $members = $node->getGroupMembership();
                 foreach ($members as $k => $member) {
                     $members[$k] = rtrim($member, '/') . '/';
                 }
-                return new DAV\Xml\Property\Href($members);
+                return new Href($members);
             });
             $propFind->handle('{DAV:}displayname', [$node, 'getDisplayName']);
 
@@ -892,7 +1041,7 @@ class Plugin extends DAV\ServerPlugin {
             $val = $this->principalCollectionSet;
             // Ensuring all collections end with a slash
             foreach ($val as $k => $v) $val[$k] = $v . '/';
-            return new DAV\Xml\Property\Href($val);
+            return new Href($val);
 
         });
         $propFind->handle('{DAV:}current-user-principal', function() {
@@ -910,9 +1059,7 @@ class Plugin extends DAV\ServerPlugin {
                 $propFind->set('{DAV:}current-user-privilege-set', null, 403);
             } else {
                 $val = $this->getCurrentUserPrivilegeSet($node);
-                if (!is_null($val)) {
-                    return new Xml\Property\CurrentUserPrivilegeSet($val);
-                }
+                return new Xml\Property\CurrentUserPrivilegeSet($val);
             }
         });
         $propFind->handle('{DAV:}acl', function() use ($node, $propFind, $path) {
@@ -921,9 +1068,7 @@ class Plugin extends DAV\ServerPlugin {
                 $propFind->set('{DAV:}acl', null, 403);
             } else {
                 $acl = $this->getACL($node);
-                if (!is_null($acl)) {
-                    return new Xml\Property\Acl($this->getACL($node));
-                }
+                return new Xml\Property\Acl($this->getACL($node));
             }
         });
         $propFind->handle('{DAV:}acl-restrictions', function() {
@@ -933,7 +1078,7 @@ class Plugin extends DAV\ServerPlugin {
         /* Adding ACL properties */
         if ($node instanceof IACL) {
             $propFind->handle('{DAV:}owner', function() use ($node) {
-                return new DAV\Xml\Property\Href($node->getOwner() . '/');
+                return new Href($node->getOwner() . '/');
             });
         }
 
@@ -952,7 +1097,7 @@ class Plugin extends DAV\ServerPlugin {
         $propPatch->handle('{DAV:}group-member-set', function($value) use ($path) {
             if (is_null($value)) {
                 $memberSet = [];
-            } elseif ($value instanceof DAV\Xml\Property\Href) {
+            } elseif ($value instanceof Href) {
                 $memberSet = array_map(
                     [$this->server, 'calculateUri'],
                     $value->getHrefs()
@@ -990,15 +1135,23 @@ class Plugin extends DAV\ServerPlugin {
 
             case '{DAV:}principal-property-search' :
                 $this->server->transactionType = 'report-principal-property-search';
-                $this->principalPropertySearchReport($report);
+                $this->principalPropertySearchReport($path, $report);
                 return false;
             case '{DAV:}principal-search-property-set' :
                 $this->server->transactionType = 'report-principal-search-property-set';
-                $this->principalSearchPropertySetReport($report);
+                $this->principalSearchPropertySetReport($path, $report);
                 return false;
             case '{DAV:}expand-property' :
                 $this->server->transactionType = 'report-expand-property';
-                $this->expandPropertyReport($report);
+                $this->expandPropertyReport($path, $report);
+                return false;
+            case '{DAV:}principal-match' :
+                $this->server->transactionType = 'report-principal-match';
+                $this->principalMatchReport($path, $report);
+                return false;
+            case '{DAV:}acl-principal-prop-set' :
+                $this->server->transactionType = 'acl-principal-prop-set';
+                $this->aclPrincipalPropSetReport($path, $report);
                 return false;
 
         }
@@ -1073,7 +1226,7 @@ class Plugin extends DAV\ServerPlugin {
             // Looking up the principal
             try {
                 $principal = $this->server->tree->getNodeForPath($newAce['principal']);
-            } catch (DAV\Exception\NotFound $e) {
+            } catch (NotFound $e) {
                 throw new Exception\NotRecognizedPrincipal('The specified principal (' . $newAce['principal'] . ') does not exist');
             }
             if (!($principal instanceof IPrincipal)) {
@@ -1095,7 +1248,110 @@ class Plugin extends DAV\ServerPlugin {
     /* Reports {{{ */
 
     /**
-     * The expand-property report is defined in RFC3253 section 3-8.
+     * The principal-match report is defined in RFC3744, section 9.3.
+     *
+     * This report allows a client to figure out based on the current user,
+     * or a principal URL, the principal URL and principal URLs of groups that
+     * principal belongs to.
+     *
+     * @param string $path
+     * @param Xml\Request\PrincipalMatchReport $report
+     * @return void
+     */
+    protected function principalMatchReport($path, Xml\Request\PrincipalMatchReport $report) {
+
+        $depth = $this->server->getHTTPDepth(0);
+        if ($depth !== 0) {
+            throw new BadRequest('The principal-match report is only defined on Depth: 0');
+        }
+
+        $currentPrincipals = $this->getCurrentUserPrincipals();
+
+        $result = [];
+
+        if ($report->type === Xml\Request\PrincipalMatchReport::SELF) {
+
+            // Finding all principals under the request uri that match the
+            // current principal.
+            foreach ($currentPrincipals as $currentPrincipal) {
+
+                if ($currentPrincipal === $path || strpos($currentPrincipal, $path . '/') === 0) {
+                    $result[] = $currentPrincipal;
+                }
+
+            }
+
+        } else {
+
+            // We need to find all resources that have a property that matches
+            // one of the current principals.
+            $candidates = $this->server->getPropertiesForPath(
+                $path,
+                [$report->principalProperty],
+                1
+            );
+
+            foreach ($candidates as $candidate) {
+
+                if (!isset($candidate[200][$report->principalProperty])) {
+                    continue;
+                }
+
+                $hrefs = $candidate[200][$report->principalProperty];
+
+                if (!$hrefs instanceof Href) {
+                    continue;
+                }
+
+                foreach ($hrefs->getHrefs() as $href) {
+                    if (in_array(trim($href, '/'), $currentPrincipals)) {
+                        $result[] = $candidate['href'];
+                        continue 2;
+                    }
+                }
+            }
+
+        }
+
+        $responses = [];
+
+        foreach ($result as $item) {
+
+            $properties = [];
+
+            if ($report->properties) {
+
+                $foo = $this->server->getPropertiesForPath($item, $report->properties);
+                $foo = $foo[0];
+                $item = $foo['href'];
+                unset($foo['href']);
+                $properties = $foo;
+
+            }
+
+            $responses[] = new DAV\Xml\Element\Response(
+                $item,
+                $properties,
+                '200'
+            );
+
+        }
+
+        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setBody(
+            $this->server->xml->write(
+                '{DAV:}multistatus',
+                $responses,
+                $this->server->getBaseUri()
+            )
+        );
+
+
+    }
+
+    /**
+     * The expand-property report is defined in RFC3253 section 3.8.
      *
      * This report is very similar to a standard PROPFIND. The difference is
      * that it has the additional ability to look at properties containing a
@@ -1105,15 +1361,15 @@ class Plugin extends DAV\ServerPlugin {
      * Other rfc's, such as ACL rely on this report, so it made sense to put
      * it in this plugin.
      *
+     * @param string $path
      * @param Xml\Request\ExpandPropertyReport $report
      * @return void
      */
-    protected function expandPropertyReport($report) {
+    protected function expandPropertyReport($path, $report) {
 
         $depth = $this->server->getHTTPDepth(0);
-        $requestUri = $this->server->getRequestUri();
 
-        $result = $this->expandProperties($requestUri, $report->properties, $depth);
+        $result = $this->expandProperties($path, $report->properties, $depth);
 
         $xml = $this->server->xml->write(
             '{DAV:}multistatus',
@@ -1187,10 +1443,11 @@ class Plugin extends DAV\ServerPlugin {
      * of properties the client may search on, using the
      * {DAV:}principal-property-search report.
      *
+     * @param string $path
      * @param Xml\Request\PrincipalSearchPropertySetReport $report
      * @return void
      */
-    protected function principalSearchPropertySetReport($report) {
+    protected function principalSearchPropertySetReport($path, $report) {
 
         $httpDepth = $this->server->getHTTPDepth(0);
         if ($httpDepth !== 0) {
@@ -1241,14 +1498,14 @@ class Plugin extends DAV\ServerPlugin {
      * clients to search for groups of principals, based on the value of one
      * or more properties.
      *
+     * @param string $path
      * @param Xml\Request\PrincipalPropertySearchReport $report
      * @return void
      */
-    protected function principalPropertySearchReport($report) {
+    protected function principalPropertySearchReport($path, Xml\Request\PrincipalPropertySearchReport $report) {
 
-        $uri = null;
-        if (!$report->applyToPrincipalCollectionSet) {
-            $uri = $this->server->httpRequest->getPath();
+        if ($report->applyToPrincipalCollectionSet) {
+            $path = null;
         }
         if ($this->server->getHttpDepth('0') !== 0) {
             throw new BadRequest('Depth must be 0');
@@ -1256,7 +1513,7 @@ class Plugin extends DAV\ServerPlugin {
         $result = $this->principalSearch(
             $report->searchProperties,
             $report->properties,
-            $uri,
+            $path,
             $report->test
         );
 
@@ -1269,6 +1526,64 @@ class Plugin extends DAV\ServerPlugin {
 
     }
 
+    /**
+     * aclPrincipalPropSet REPORT
+     *
+     * This method is responsible for handling the {DAV:}acl-principal-prop-set
+     * REPORT, as defined in:
+     *
+     * https://tools.ietf.org/html/rfc3744#section-9.2
+     *
+     * This REPORT allows a user to quickly fetch information about all
+     * principals specified in the access control list. Most commonly this
+     * is used to for example generate a UI with ACL rules, allowing you
+     * to show names for principals for every entry.
+     *
+     * @param string $path
+     * @param Xml\Request\AclPrincipalPropSetReport $report
+     * @return void
+     */
+    protected function aclPrincipalPropSetReport($path, Xml\Request\AclPrincipalPropSetReport $report) {
+
+        if ($this->server->getHTTPDepth(0) !== 0) {
+            throw new BadRequest('The {DAV:}acl-principal-prop-set REPORT only supports Depth 0');
+        }
+
+        // Fetching ACL rules for the given path. We're using the property
+        // API and not the local getACL, because it will ensure that all
+        // business rules and restrictions are applied.
+        $acl = $this->server->getProperties($path, '{DAV:}acl');
+
+        if (!$acl || !isset($acl['{DAV:}acl'])) {
+            throw new Forbidden('Could not fetch ACL rules for this path');
+        }
+
+        $principals = [];
+        foreach ($acl['{DAV:}acl']->getPrivileges() as $ace) {
+
+            if ($ace['principal'][0] === '{') {
+                // It's not a principal, it's one of the special rules such as {DAV:}authenticated
+                continue;
+            }
+
+            $principals[] = $ace['principal'];
+
+        }
+
+        $properties = $this->server->getPropertiesForMultiplePaths(
+            $principals,
+            $report->properties
+        );
+
+        $this->server->httpResponse->setStatus(207);
+        $this->server->httpResponse->setHeader('Content-Type', 'application/xml; charset=utf-8');
+        $this->server->httpResponse->setBody(
+            $this->server->generateMultiStatus($properties)
+        );
+
+    }
+
+
     /* }}} */
 
     /**
diff --git a/vendor/sabre/dav/lib/DAVACL/Principal.php b/vendor/sabre/dav/lib/DAVACL/Principal.php
index 16375d3fc..6ebb30907 100644
--- a/vendor/sabre/dav/lib/DAVACL/Principal.php
+++ b/vendor/sabre/dav/lib/DAVACL/Principal.php
@@ -22,6 +22,8 @@ use Sabre\HTTP\URLUtil;
  */
 class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
 
+    use ACLTrait;
+
     /**
      * Struct with principal information.
      *
@@ -216,73 +218,4 @@ class Principal extends DAV\Node implements IPrincipal, DAV\IProperties, IACL {
 
     }
 
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-
-        return null;
-
-    }
-
-    /**
-     * Returns a list of ACE's for this node.
-     *
-     * Each ACE has the following properties:
-     *   * 'privilege', a string such as {DAV:}read or {DAV:}write. These are
-     *     currently the only supported privileges
-     *   * 'principal', a url to the principal who owns the node
-     *   * 'protected' (optional), indicating that this ACE is not allowed to
-     *      be updated.
-     *
-     * @return array
-     */
-    function getACL() {
-
-        return [
-            [
-                'privilege' => '{DAV:}read',
-                'principal' => '{DAV:}authenticated',
-                'protected' => true,
-            ],
-        ];
-
-    }
-
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new DAV\Exception\MethodNotAllowed('Updating ACLs is not allowed here');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/PDO.php b/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/PDO.php
index 01b7a175c..a491dc88f 100644
--- a/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/PDO.php
+++ b/vendor/sabre/dav/lib/DAVACL/PrincipalBackend/PDO.php
@@ -300,7 +300,7 @@ class PDO extends AbstractBackend implements CreatePrincipalSupport {
         $value = null;
         $scheme = null;
         list($scheme, $value) = explode(":", $uri, 2);
-        if ($value == null) return null;
+        if (empty($value)) return null;
 
         $uri = null;
         switch ($scheme){
diff --git a/vendor/sabre/dav/lib/DAVACL/PrincipalCollection.php b/vendor/sabre/dav/lib/DAVACL/PrincipalCollection.php
index 54911e7b5..d8a90153a 100644
--- a/vendor/sabre/dav/lib/DAVACL/PrincipalCollection.php
+++ b/vendor/sabre/dav/lib/DAVACL/PrincipalCollection.php
@@ -3,7 +3,6 @@
 namespace Sabre\DAVACL;
 
 use Sabre\DAV\Exception\InvalidResourceType;
-use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\IExtendedCollection;
 use Sabre\DAV\MkCol;
 
@@ -19,6 +18,8 @@ use Sabre\DAV\MkCol;
  */
 class PrincipalCollection extends AbstractPrincipalCollection implements IExtendedCollection, IACL {
 
+    use ACLTrait;
+
     /**
      * This method returns a node for a principal.
      *
@@ -72,28 +73,6 @@ class PrincipalCollection extends AbstractPrincipalCollection implements IExtend
 
     }
 
-    /**
-     * Returns the owner principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getOwner() {
-        return null;
-    }
-
-    /**
-     * Returns a group principal
-     *
-     * This must be a url to a principal, or null if there's no owner
-     *
-     * @return string|null
-     */
-    function getGroup() {
-        return null;
-    }
-
     /**
      * Returns a list of ACE's for this node.
      *
@@ -116,36 +95,4 @@ class PrincipalCollection extends AbstractPrincipalCollection implements IExtend
         ];
     }
 
-    /**
-     * Updates the ACL
-     *
-     * This method will receive a list of new ACE's as an array argument.
-     *
-     * @param array $acl
-     * @return void
-     */
-    function setACL(array $acl) {
-
-        throw new Forbidden('Updating ACLs is not allowed on this node');
-
-    }
-
-    /**
-     * Returns the list of supported privileges for this node.
-     *
-     * The returned data structure is a list of nested privileges.
-     * See Sabre\DAVACL\Plugin::getDefaultSupportedPrivilegeSet for a simple
-     * standard structure.
-     *
-     * If null is returned from this method, the default privilege set is used,
-     * which is fine for most common usecases.
-     *
-     * @return array|null
-     */
-    function getSupportedPrivilegeSet() {
-
-        return null;
-
-    }
-
 }
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php b/vendor/sabre/dav/lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php
index 572bed4dd..55e7783ae 100644
--- a/vendor/sabre/dav/lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Property/SupportedPrivilegeSet.php
@@ -73,7 +73,7 @@ class SupportedPrivilegeSet implements XmlSerializable, HtmlOutput {
      */
     function xmlSerialize(Writer $writer) {
 
-        $this->serializePriv($writer, $this->privileges);
+        $this->serializePriv($writer, '{DAV:}all', [ 'aggregates' => $this->privileges]);
 
     }
 
@@ -93,9 +93,9 @@ class SupportedPrivilegeSet implements XmlSerializable, HtmlOutput {
      */
     function toHtml(HtmlOutputHelper $html) {
 
-        $traverse = function($priv) use (&$traverse, $html) {
+        $traverse = function($privName, $priv) use (&$traverse, $html) {
             echo "<li>";
-            echo $html->xmlName($priv['privilege']);
+            echo $html->xmlName($privName);
             if (isset($priv['abstract']) && $priv['abstract']) {
                 echo " <i>(abstract)</i>";
             }
@@ -104,8 +104,8 @@ class SupportedPrivilegeSet implements XmlSerializable, HtmlOutput {
             }
             if (isset($priv['aggregates'])) {
                 echo "\n<ul>\n";
-                foreach ($priv['aggregates'] as $subPriv) {
-                    $traverse($subPriv);
+                foreach ($priv['aggregates'] as $subPrivName => $subPriv) {
+                    $traverse($subPrivName, $subPriv);
                 }
                 echo "</ul>";
             }
@@ -114,7 +114,7 @@ class SupportedPrivilegeSet implements XmlSerializable, HtmlOutput {
 
         ob_start();
         echo "<ul class=\"tree\">";
-        $traverse($this->getValue());
+        $traverse('{DAV:}all', [ 'aggregates' => $this->getValue() ]);
         echo "</ul>\n";
 
         return ob_get_clean();
@@ -132,12 +132,12 @@ class SupportedPrivilegeSet implements XmlSerializable, HtmlOutput {
      * @param array $privilege
      * @return void
      */
-    private function serializePriv(Writer $writer, $privilege) {
+    private function serializePriv(Writer $writer, $privName, $privilege) {
 
         $writer->startElement('{DAV:}supported-privilege');
 
         $writer->startElement('{DAV:}privilege');
-        $writer->writeElement($privilege['privilege']);
+        $writer->writeElement($privName);
         $writer->endElement(); // privilege
 
         if (!empty($privilege['abstract'])) {
@@ -147,8 +147,8 @@ class SupportedPrivilegeSet implements XmlSerializable, HtmlOutput {
             $writer->writeElement('{DAV:}description', $privilege['description']);
         }
         if (isset($privilege['aggregates'])) {
-            foreach ($privilege['aggregates'] as $subPrivilege) {
-                $this->serializePriv($writer, $subPrivilege);
+            foreach ($privilege['aggregates'] as $subPrivName => $subPrivilege) {
+                $this->serializePriv($writer, $subPrivName, $subPrivilege);
             }
         }
 
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Request/AclPrincipalPropSetReport.php b/vendor/sabre/dav/lib/DAVACL/Xml/Request/AclPrincipalPropSetReport.php
new file mode 100644
index 000000000..f01c1e6ab
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Request/AclPrincipalPropSetReport.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Sabre\DAVACL\Xml\Request;
+
+use Sabre\Xml\XmlDeserializable;
+use Sabre\Xml\Reader;
+use Sabre\Xml\Deserializer;
+
+/**
+ * AclPrincipalPropSet request parser.
+ *
+ * This class parses the {DAV:}acl-principal-prop-set REPORT, as defined in:
+ *
+ * https://tools.ietf.org/html/rfc3744#section-9.2
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @author Evert Pot (https://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class AclPrincipalPropSetReport implements XmlDeserializable {
+
+    public $properties = [];
+
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statictly, this is because in theory this method
+     * may be used as a type of constructor, or factory method.
+     *
+     * Often you want to return an instance of the current class, but you are
+     * free to return other data as well.
+     *
+     * You are responsible for advancing the reader to the next element. Not
+     * doing anything will result in a never-ending loop.
+     *
+     * If you just want to skip parsing for this element altogether, you can
+     * just call $reader->next();
+     *
+     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+     * the next element.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    static function xmlDeserialize(Reader $reader) {
+       
+        $reader->pushContext();
+        $reader->elementMap['{DAV:}prop'] = 'Sabre\Xml\Deserializer\enum';
+
+        $elems = Deserializer\keyValue(
+            $reader,
+            'DAV:'
+        );
+
+        $reader->popContext();
+
+        $report = new self();
+
+        if (!empty($elems['prop'])) {
+            $report->properties = $elems['prop'];
+        }
+
+        return $report;
+
+    }
+
+}
diff --git a/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalMatchReport.php b/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalMatchReport.php
new file mode 100644
index 000000000..5c4e88189
--- /dev/null
+++ b/vendor/sabre/dav/lib/DAVACL/Xml/Request/PrincipalMatchReport.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Sabre\DAVACL\Xml\Request;
+
+use Sabre\Xml\XmlDeserializable;
+use Sabre\Xml\Reader;
+use Sabre\Xml\Deserializer;
+
+/**
+ * PrincipalMatchReport request parser.
+ *
+ * This class parses the {DAV:}principal-match REPORT, as defined
+ * in:
+ *
+ * https://tools.ietf.org/html/rfc3744#section-9.3
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class PrincipalMatchReport implements XmlDeserializable {
+
+    /**
+     * Report on a list of principals that match the current principal.
+     */
+    const SELF = 1;
+
+    /**
+     * Report on a property on resources, such as {DAV:}owner, that match the current principal.
+     */
+    const PRINCIPAL_PROPERTY = 2;
+
+    /**
+     * Must be SELF or PRINCIPAL_PROPERTY
+     *
+     * @var int
+     */
+    public $type;
+
+    /**
+     * List of properties that are being requested for matching resources.
+     *
+     * @var string[]
+     */
+    public $properties = [];
+
+    /**
+     * If $type = PRINCIPAL_PROPERTY, which WebDAV property we should compare
+     * to the current principal.
+     *
+     * @var string
+     */
+    public $principalProperty;
+
+    /**
+     * The deserialize method is called during xml parsing.
+     *
+     * This method is called statictly, this is because in theory this method
+     * may be used as a type of constructor, or factory method.
+     *
+     * Often you want to return an instance of the current class, but you are
+     * free to return other data as well.
+     *
+     * You are responsible for advancing the reader to the next element. Not
+     * doing anything will result in a never-ending loop.
+     *
+     * If you just want to skip parsing for this element altogether, you can
+     * just call $reader->next();
+     *
+     * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
+     * the next element.
+     *
+     * @param Reader $reader
+     * @return mixed
+     */
+    static function xmlDeserialize(Reader $reader) {
+
+        $reader->pushContext();
+        $reader->elementMap['{DAV:}prop'] = 'Sabre\Xml\Deserializer\enum';
+
+        $elems = Deserializer\keyValue(
+            $reader,
+            'DAV:'
+        );
+
+        $reader->popContext();
+
+        $principalMatch = new self();
+
+        if (array_key_exists('self', $elems)) {
+            $principalMatch->type = self::SELF;
+        }
+
+        if (array_key_exists('principal-property', $elems)) {
+            $principalMatch->type = self::PRINCIPAL_PROPERTY;
+            $principalMatch->principalProperty = $elems['principal-property'][0]['name'];
+        }
+
+        if (!empty($elems['prop'])) {
+            $principalMatch->properties = $elems['prop'];
+        }
+
+        return $principalMatch;
+
+    }
+
+}
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
index 25f8b1794..2a00f7925 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
@@ -5,11 +5,30 @@ namespace Sabre\CalDAV\Backend;
 use Sabre\CalDAV;
 use Sabre\DAV;
 use Sabre\DAV\PropPatch;
+use Sabre\DAV\Xml\Element\Sharee;
 
 abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
+    use DAV\DbTestHelperTrait;
+
     protected $pdo;
 
+    function setUp() {
+
+        $this->dropTables([
+            'calendarobjects',
+            'calendars',
+            'calendarinstances',
+            'calendarchanges',
+            'calendarsubscriptions',
+            'schedulingobjects',
+        ]);
+        $this->createSchema('calendars');
+
+        $this->pdo = $this->getDb();
+
+    }
+
     function testConstruct() {
 
         $backend = new PDO($this->pdo);
@@ -42,11 +61,11 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         $calendars = $backend->getCalendarsForUser('principals/user2');
 
         $elementCheck = [
-            'id'                                                      => $returnedId,
             'uri'                                                     => 'somerandomid',
             '{DAV:}displayname'                                       => 'Hello!',
             '{urn:ietf:params:xml:ns:caldav}calendar-description'     => '',
             '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'),
+            'share-access'                                            => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
         ];
 
         $this->assertInternalType('array', $calendars);
@@ -109,6 +128,27 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
     }
 
+    /**
+     * @depends testConstruct
+     * @expectedException \InvalidArgumentException
+     */
+    function testUpdateCalendarBadId() {
+
+        $backend = new PDO($this->pdo);
+
+        //Creating a new calendar
+        $newId = $backend->createCalendar('principals/user2', 'somerandomid', []);
+
+        $propPatch = new PropPatch([
+            '{DAV:}displayname'                                       => 'myCalendar',
+            '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'),
+        ]);
+
+        // Updating the calendar
+        $backend->updateCalendar('raaaa', $propPatch);
+
+    }
+
     /**
      * @depends testUpdateCalendarAndFetch
      */
@@ -154,6 +194,22 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
     }
 
+    /**
+     * @depends testCreateCalendarAndFetch
+     * @expectedException \InvalidArgumentException
+     */
+    function testDeleteCalendarBadID() {
+
+        $backend = new PDO($this->pdo);
+        $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', [
+            '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(['VEVENT']),
+            '{DAV:}displayname'                                               => 'Hello!',
+        ]);
+
+        $backend->deleteCalendar('bad-id');
+
+    }
+
     /**
      * @depends testCreateCalendarAndFetch
      * @expectedException \Sabre\DAV\Exception
@@ -178,7 +234,13 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $backend->createCalendarObject($returnedId, 'random-id', $object);
 
-        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
+        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = \'random-id\'');
+
+        $row = $result->fetch(\PDO::FETCH_ASSOC);
+        if (is_resource($row['calendardata'])) {
+            $row['calendardata'] = stream_get_contents($row['calendardata']);
+        }
+
         $this->assertEquals([
             'etag'           => md5($object),
             'size'           => strlen($object),
@@ -186,7 +248,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             'firstoccurence' => strtotime('20120101'),
             'lastoccurence'  => strtotime('20120101') + (3600 * 24),
             'componenttype'  => 'VEVENT',
-        ], $result->fetch(\PDO::FETCH_ASSOC));
+        ], $row);
 
     }
     function testGetMultipleObjects() {
@@ -207,7 +269,6 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
                 'size'         => strlen($object),
                 'calendardata' => $object,
                 'lastmodified' => null,
-                'calendarid'   => $returnedId,
             ],
             [
                 'id'           => 2,
@@ -216,7 +277,6 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
                 'size'         => strlen($object),
                 'calendardata' => $object,
                 'lastmodified' => null,
-                'calendarid'   => $returnedId,
             ],
         ];
 
@@ -224,12 +284,22 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         foreach ($check as $index => $props) {
 
-            foreach ($props as $key => $value) {
+            foreach ($props as $key => $expected) {
+
+                $actual = $result[$index][$key];
+
+                switch ($key) {
+                    case 'lastmodified' :
+                        $this->assertInternalType('int', $actual);
+                        break;
+                    case 'calendardata' :
+                        if (is_resource($actual)) {
+                            $actual = stream_get_contents($actual);
+                        }
+                        // no break intentional
+                    default :
+                        $this->assertEquals($expected, $actual);
 
-                if ($key !== 'lastmodified') {
-                    $this->assertEquals($value, $result[$index][$key]);
-                } else {
-                    $this->assertTrue(isset($result[$index][$key]));
                 }
 
             }
@@ -238,6 +308,17 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
     }
 
+    /**
+     * @depends testGetMultipleObjects
+     * @expectedException \InvalidArgumentException
+     */
+    function testGetMultipleObjectsBadId() {
+
+        $backend = new PDO($this->pdo);
+        $backend->getMultipleCalendarObjects('bad-id', ['foo-bar']);
+
+    }
+
     /**
      * @expectedException Sabre\DAV\Exception\BadRequest
      * @depends testCreateCalendarObject
@@ -265,7 +346,13 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $backend->createCalendarObject($returnedId, 'random-id', $object);
 
-        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
+        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = \'random-id\'');
+
+        $row = $result->fetch(\PDO::FETCH_ASSOC);
+        if (is_resource($row['calendardata'])) {
+            $row['calendardata'] = stream_get_contents($row['calendardata']);
+        }
+
         $this->assertEquals([
             'etag'           => md5($object),
             'size'           => strlen($object),
@@ -273,10 +360,26 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             'firstoccurence' => strtotime('20120101'),
             'lastoccurence'  => strtotime('20120101') + (3600 * 48),
             'componenttype'  => 'VEVENT',
-        ], $result->fetch(\PDO::FETCH_ASSOC));
+        ], $row);
 
     }
 
+    /**
+     * @depends testCreateCalendarObject
+     * @expectedException \InvalidArgumentException
+     */
+    function testCreateCalendarObjectBadId() {
+
+        $backend = new PDO($this->pdo);
+        $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
+
+        $object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nDURATION:P2D\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
+
+        $backend->createCalendarObject('bad-id', 'random-id', $object);
+
+    }
+
+
     /**
      * @depends testCreateCalendarObject
      */
@@ -289,7 +392,12 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $backend->createCalendarObject($returnedId, 'random-id', $object);
 
-        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
+        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = \'random-id\'');
+        $row = $result->fetch(\PDO::FETCH_ASSOC);
+        if (is_resource($row['calendardata'])) {
+            $row['calendardata'] = stream_get_contents($row['calendardata']);
+        }
+
         $this->assertEquals([
             'etag'           => md5($object),
             'size'           => strlen($object),
@@ -297,7 +405,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             'firstoccurence' => strtotime('2012-01-01 10:00:00'),
             'lastoccurence'  => strtotime('2012-01-01 10:00:00'),
             'componenttype'  => 'VEVENT',
-        ], $result->fetch(\PDO::FETCH_ASSOC));
+        ], $row);
 
     }
 
@@ -313,7 +421,12 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $backend->createCalendarObject($returnedId, 'random-id', $object);
 
-        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
+        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = \'random-id\'');
+        $row = $result->fetch(\PDO::FETCH_ASSOC);
+        if (is_resource($row['calendardata'])) {
+            $row['calendardata'] = stream_get_contents($row['calendardata']);
+        }
+
         $this->assertEquals([
             'etag'           => md5($object),
             'size'           => strlen($object),
@@ -321,7 +434,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             'firstoccurence' => strtotime('2012-01-01 10:00:00'),
             'lastoccurence'  => strtotime('2012-01-01 11:00:00'),
             'componenttype'  => 'VEVENT',
-        ], $result->fetch(\PDO::FETCH_ASSOC));
+        ], $row);
 
     }
 
@@ -337,7 +450,12 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $backend->createCalendarObject($returnedId, 'random-id', $object);
 
-        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
+        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = \'random-id\'');
+        $row = $result->fetch(\PDO::FETCH_ASSOC);
+        if (is_resource($row['calendardata'])) {
+            $row['calendardata'] = stream_get_contents($row['calendardata']);
+        }
+
         $this->assertEquals([
             'etag'           => md5($object),
             'size'           => strlen($object),
@@ -345,7 +463,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             'firstoccurence' => strtotime('2012-01-01 10:00:00'),
             'lastoccurence'  => strtotime(PDO::MAX_DATE),
             'componenttype'  => 'VEVENT',
-        ], $result->fetch(\PDO::FETCH_ASSOC));
+        ], $row);
 
     }
 
@@ -361,7 +479,12 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $backend->createCalendarObject($returnedId, 'random-id', $object);
 
-        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
+        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = \'random-id\'');
+        $row = $result->fetch(\PDO::FETCH_ASSOC);
+        if (is_resource($row['calendardata'])) {
+            $row['calendardata'] = stream_get_contents($row['calendardata']);
+        }
+
         $this->assertEquals([
             'etag'           => md5($object),
             'size'           => strlen($object),
@@ -369,7 +492,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             'firstoccurence' => strtotime('2012-01-01 10:00:00'),
             'lastoccurence'  => strtotime('2012-01-01 11:00:00') + (3600 * 24 * 999),
             'componenttype'  => 'VEVENT',
-        ], $result->fetch(\PDO::FETCH_ASSOC));
+        ], $row);
 
     }
 
@@ -385,7 +508,12 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $backend->createCalendarObject($returnedId, 'random-id', $object);
 
-        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = "random-id"');
+        $result = $this->pdo->query('SELECT etag, size, calendardata, firstoccurence, lastoccurence, componenttype FROM calendarobjects WHERE uri = \'random-id\'');
+        $row = $result->fetch(\PDO::FETCH_ASSOC);
+        if (is_resource($row['calendardata'])) {
+            $row['calendardata'] = stream_get_contents($row['calendardata']);
+        }
+
         $this->assertEquals([
             'etag'           => md5($object),
             'size'           => strlen($object),
@@ -393,7 +521,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             'firstoccurence' => null,
             'lastoccurence'  => null,
             'componenttype'  => 'VTODO',
-        ], $result->fetch(\PDO::FETCH_ASSOC));
+        ], $row);
 
     }
 
@@ -408,17 +536,38 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         $object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
         $backend->createCalendarObject($returnedId, 'random-id', $object);
 
-        $data = $backend->getCalendarObjects($returnedId, 'random-id');
+        $data = $backend->getCalendarObjects($returnedId);
 
         $this->assertEquals(1, count($data));
         $data = $data[0];
 
-        $this->assertEquals($returnedId, $data['calendarid']);
         $this->assertEquals('random-id', $data['uri']);
         $this->assertEquals(strlen($object), $data['size']);
 
+    }
+
+    /**
+     * @depends testGetCalendarObjects
+     * @expectedException \InvalidArgumentException
+     */
+    function testGetCalendarObjectsBadId() {
+
+        $backend = new PDO($this->pdo);
+        $backend->getCalendarObjects('bad-id');
 
     }
+
+    /**
+     * @depends testGetCalendarObjects
+     * @expectedException \InvalidArgumentException
+     */
+    function testGetCalendarObjectBadId() {
+
+        $backend = new PDO($this->pdo);
+        $backend->getCalendarObject('bad-id', 'foo-bar');
+
+    }
+
     /**
      * @depends testCreateCalendarObject
      */
@@ -455,13 +604,27 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $data = $backend->getCalendarObject($returnedId, 'random-id');
 
+        if (is_resource($data['calendardata'])) {
+            $data['calendardata'] = stream_get_contents($data['calendardata']);
+        }
+
         $this->assertEquals($object2, $data['calendardata']);
-        $this->assertEquals($returnedId, $data['calendarid']);
         $this->assertEquals('random-id', $data['uri']);
 
 
     }
 
+    /**
+     * @depends testUpdateCalendarObject
+     * @expectedException \InvalidArgumentException
+     */
+    function testUpdateCalendarObjectBadId() {
+
+        $backend = new PDO($this->pdo);
+        $backend->updateCalendarObject('bad-id', 'object-id', 'objectdata');
+
+    }
+
     /**
      * @depends testCreateCalendarObject
      */
@@ -479,6 +642,21 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
     }
 
+    /**
+     * @depends testDeleteCalendarObject
+     * @expectedException \InvalidArgumentException
+     */
+    function testDeleteCalendarObjectBadId() {
+
+        $backend = new PDO($this->pdo);
+        $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
+
+        $object = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
+        $backend->createCalendarObject($returnedId, 'random-id', $object);
+        $backend->deleteCalendarObject('bad-id', 'random-id');
+
+    }
+
     function testCalendarQueryNoResult() {
 
         $abstract = new PDO($this->pdo);
@@ -499,15 +677,42 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         ];
 
         $this->assertEquals([
-        ], $abstract->calendarQuery(1, $filters));
+        ], $abstract->calendarQuery([1, 1], $filters));
+
+    }
+
+    /**
+     * @expectedException \InvalidArgumentException
+     * @depends testCalendarQueryNoResult
+     */
+    function testCalendarQueryBadId() {
+
+        $abstract = new PDO($this->pdo);
+        $filters = [
+            'name'         => 'VCALENDAR',
+            'comp-filters' => [
+                [
+                    'name'           => 'VJOURNAL',
+                    'comp-filters'   => [],
+                    'prop-filters'   => [],
+                    'is-not-defined' => false,
+                    'time-range'     => null,
+                ],
+            ],
+            'prop-filters'   => [],
+            'is-not-defined' => false,
+            'time-range'     => null,
+        ];
+
+        $abstract->calendarQuery('bad-id', $filters);
 
     }
 
     function testCalendarQueryTodo() {
 
         $backend = new PDO($this->pdo);
-        $backend->createCalendarObject(1, "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
-        $backend->createCalendarObject(1, "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
 
         $filters = [
             'name'         => 'VCALENDAR',
@@ -527,14 +732,14 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $this->assertEquals([
             "todo",
-        ], $backend->calendarQuery(1, $filters));
+        ], $backend->calendarQuery([1, 1], $filters));
 
     }
     function testCalendarQueryTodoNotMatch() {
 
         $backend = new PDO($this->pdo);
-        $backend->createCalendarObject(1, "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
-        $backend->createCalendarObject(1, "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
 
         $filters = [
             'name'         => 'VCALENDAR',
@@ -561,15 +766,15 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         ];
 
         $this->assertEquals([
-        ], $backend->calendarQuery(1, $filters));
+        ], $backend->calendarQuery([1, 1], $filters));
 
     }
 
     function testCalendarQueryNoFilter() {
 
         $backend = new PDO($this->pdo);
-        $backend->createCalendarObject(1, "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
-        $backend->createCalendarObject(1, "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
 
         $filters = [
             'name'           => 'VCALENDAR',
@@ -579,7 +784,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
             'time-range'     => null,
         ];
 
-        $result = $backend->calendarQuery(1, $filters);
+        $result = $backend->calendarQuery([1, 1], $filters);
         $this->assertTrue(in_array('todo', $result));
         $this->assertTrue(in_array('event', $result));
 
@@ -588,9 +793,9 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
     function testCalendarQueryTimeRange() {
 
         $backend = new PDO($this->pdo);
-        $backend->createCalendarObject(1, "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
-        $backend->createCalendarObject(1, "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
-        $backend->createCalendarObject(1, "event2", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120103\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "event2", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120103\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
 
         $filters = [
             'name'         => 'VCALENDAR',
@@ -613,15 +818,15 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $this->assertEquals([
             "event2",
-        ], $backend->calendarQuery(1, $filters));
+        ], $backend->calendarQuery([1, 1], $filters));
 
     }
     function testCalendarQueryTimeRangeNoEnd() {
 
         $backend = new PDO($this->pdo);
-        $backend->createCalendarObject(1, "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
-        $backend->createCalendarObject(1, "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
-        $backend->createCalendarObject(1, "event2", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120103\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+        $backend->createCalendarObject([1, 1], "event2", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120103\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
 
         $filters = [
             'name'         => 'VCALENDAR',
@@ -644,7 +849,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $this->assertEquals([
             "event2",
-        ], $backend->calendarQuery(1, $filters));
+        ], $backend->calendarQuery([1, 1], $filters));
 
     }
 
@@ -694,6 +899,22 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         ], $result);
     }
 
+    /**
+     * @depends testGetChanges
+     * @expectedException \InvalidArgumentException
+     */
+    function testGetChangesBadId() {
+
+        $backend = new PDO($this->pdo);
+        $id = $backend->createCalendar(
+            'principals/user1',
+            'bla',
+            []
+        );
+        $backend->getChangesForCalendar('bad-id', null, 1);
+
+    }
+
     function testCreateSubscriptions() {
 
         $props = [
@@ -862,6 +1083,9 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         $result = $backend->getSchedulingObject('principals/user1', 'schedule1.ics');
         foreach ($expected as $k => $v) {
             $this->assertArrayHasKey($k, $result);
+            if (is_resource($result[$k])) {
+                $result[$k] = stream_get_contents($result[$k]);
+            }
             $this->assertEquals($v, $result[$k]);
         }
 
@@ -870,6 +1094,9 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         $this->assertEquals(1, count($results));
         $result = $results[0];
         foreach ($expected as $k => $v) {
+            if (is_resource($result[$k])) {
+                $result[$k] = stream_get_contents($result[$k]);
+            }
             $this->assertEquals($v, $result[$k]);
         }
 
@@ -880,4 +1107,325 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
     }
 
+    function testGetInvites() {
+
+        $backend = new PDO($this->pdo);
+
+        // creating a new calendar
+        $backend->createCalendar('principals/user1', 'somerandomid', []);
+        $calendar = $backend->getCalendarsForUser('principals/user1')[0];
+
+        $result = $backend->getInvites($calendar['id']);
+        $expected = [
+            new Sharee([
+                'href'         => 'principals/user1',
+                'principal'    => 'principals/user1',
+                'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
+                'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+            ])
+        ];
+
+        $this->assertEquals($expected, $result);
+
+    }
+
+    /**
+     * @depends testGetInvites
+     * @expectedException \InvalidArgumentException
+     */
+    function testGetInvitesBadId() {
+
+        $backend = new PDO($this->pdo);
+
+        // creating a new calendar
+        $backend->createCalendar('principals/user1', 'somerandomid', []);
+        $calendar = $backend->getCalendarsForUser('principals/user1')[0];
+
+        $backend->getInvites('bad-id');
+
+    }
+
+    /**
+     * @depends testCreateCalendarAndFetch
+     */
+    function testUpdateInvites() {
+
+        $backend = new PDO($this->pdo);
+
+        // creating a new calendar
+        $backend->createCalendar('principals/user1', 'somerandomid', []);
+        $calendar = $backend->getCalendarsForUser('principals/user1')[0];
+
+        $ownerSharee = new Sharee([
+            'href'         => 'principals/user1',
+            'principal'    => 'principals/user1',
+            'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
+            'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+        ]);
+
+        // Add a new invite
+        $backend->updateInvites(
+            $calendar['id'],
+            [
+                new Sharee([
+                    'href'         => 'mailto:user@example.org',
+                    'principal'    => 'principals/user2',
+                    'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
+                    'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+                    'properties'   => ['{DAV:}displayname' => 'User 2'],
+                ])
+            ]
+        );
+
+        $result = $backend->getInvites($calendar['id']);
+        $expected = [
+            $ownerSharee,
+            new Sharee([
+                'href'         => 'mailto:user@example.org',
+                'principal'    => 'principals/user2',
+                'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
+                'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+                'properties'   => [
+                    '{DAV:}displayname' => 'User 2',
+                ],
+            ])
+        ];
+        $this->assertEquals($expected, $result);
+
+        // Checking calendar_instances too
+        $expectedCalendar = [
+            'id'                                     => [1,2],
+            'principaluri'                           => 'principals/user2',
+            '{http://calendarserver.org/ns/}getctag' => 'http://sabre.io/ns/sync/1',
+            '{http://sabredav.org/ns}sync-token'     => '1',
+            'share-access'                           => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
+            'read-only'                              => true,
+            'share-resource-uri'                     => '/ns/share/1',
+        ];
+        $calendars = $backend->getCalendarsForUser('principals/user2');
+
+        foreach ($expectedCalendar as $k => $v) {
+            $this->assertEquals(
+                $v,
+                $calendars[0][$k],
+                "Key " . $k . " in calendars array did not have the expected value."
+            );
+        }
+
+
+        // Updating an invite
+        $backend->updateInvites(
+            $calendar['id'],
+            [
+                new Sharee([
+                    'href'         => 'mailto:user@example.org',
+                    'principal'    => 'principals/user2',
+                    'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE,
+                    'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+                ])
+            ]
+        );
+
+        $result = $backend->getInvites($calendar['id']);
+        $expected = [
+            $ownerSharee,
+            new Sharee([
+                'href'         => 'mailto:user@example.org',
+                'principal'    => 'principals/user2',
+                'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE,
+                'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+                'properties'   => [
+                    '{DAV:}displayname' => 'User 2',
+                ],
+            ])
+        ];
+        $this->assertEquals($expected, $result);
+
+        // Removing an invite
+        $backend->updateInvites(
+            $calendar['id'],
+            [
+                new Sharee([
+                    'href'         => 'mailto:user@example.org',
+                    'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS,
+                ])
+            ]
+        );
+
+        $result = $backend->getInvites($calendar['id']);
+        $expected = [
+            $ownerSharee
+        ];
+        $this->assertEquals($expected, $result);
+
+        // Preventing the owner share from being removed
+        $backend->updateInvites(
+            $calendar['id'],
+            [
+                new Sharee([
+                    'href'         => 'principals/user2',
+                    'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS,
+                ])
+            ]
+        );
+
+        $result = $backend->getInvites($calendar['id']);
+        $expected = [
+            new Sharee([
+                'href'         => 'principals/user1',
+                'principal'    => 'principals/user1',
+                'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
+                'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+            ]),
+        ];
+        $this->assertEquals($expected, $result);
+
+    }
+
+    /**
+     * @depends testUpdateInvites
+     * @expectedException \InvalidArgumentException
+     */
+    function testUpdateInvitesBadId() {
+
+        $backend = new PDO($this->pdo);
+        // Add a new invite
+        $backend->updateInvites(
+            'bad-id',
+            []
+        );
+
+    }
+
+    /**
+     * @depends testUpdateInvites
+     */
+    function testUpdateInvitesNoPrincipal() {
+
+        $backend = new PDO($this->pdo);
+
+        // creating a new calendar
+        $backend->createCalendar('principals/user1', 'somerandomid', []);
+        $calendar = $backend->getCalendarsForUser('principals/user1')[0];
+
+        $ownerSharee = new Sharee([
+            'href'         => 'principals/user1',
+            'principal'    => 'principals/user1',
+            'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
+            'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+        ]);
+
+        // Add a new invite
+        $backend->updateInvites(
+            $calendar['id'],
+            [
+                new Sharee([
+                    'href'         => 'mailto:user@example.org',
+                    'principal'    => null,
+                    'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
+                    'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+                    'properties'   => ['{DAV:}displayname' => 'User 2'],
+                ])
+            ]
+        );
+
+        $result = $backend->getInvites($calendar['id']);
+        $expected = [
+            $ownerSharee,
+            new Sharee([
+                'href'         => 'mailto:user@example.org',
+                'principal'    => null,
+                'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
+                'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_INVALID,
+                'properties'   => [
+                    '{DAV:}displayname' => 'User 2',
+                ],
+            ])
+        ];
+        $this->assertEquals($expected, $result, null, 0.0, 10, true); // Last argument is $canonicalize = true, which allows us to compare, ignoring the order, because it's different between MySQL and Sqlite.
+
+    }
+
+    /**
+     * @depends testUpdateInvites
+     */
+    function testDeleteSharedCalendar() {
+
+        $backend = new PDO($this->pdo);
+
+        // creating a new calendar
+        $backend->createCalendar('principals/user1', 'somerandomid', []);
+        $calendar = $backend->getCalendarsForUser('principals/user1')[0];
+
+        $ownerSharee = new Sharee([
+            'href'         => 'principals/user1',
+            'principal'    => 'principals/user1',
+            'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
+            'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+        ]);
+
+        // Add a new invite
+        $backend->updateInvites(
+            $calendar['id'],
+            [
+                new Sharee([
+                    'href'         => 'mailto:user@example.org',
+                    'principal'    => 'principals/user2',
+                    'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
+                    'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+                    'properties'   => ['{DAV:}displayname' => 'User 2'],
+                ])
+            ]
+        );
+
+        $expectedCalendar = [
+            'id'                                     => [1,2],
+            'principaluri'                           => 'principals/user2',
+            '{http://calendarserver.org/ns/}getctag' => 'http://sabre.io/ns/sync/1',
+            '{http://sabredav.org/ns}sync-token'     => '1',
+            'share-access'                           => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
+            'read-only'                              => true,
+            'share-resource-uri'                     => '/ns/share/1',
+        ];
+        $calendars = $backend->getCalendarsForUser('principals/user2');
+
+        foreach ($expectedCalendar as $k => $v) {
+            $this->assertEquals(
+                $v,
+                $calendars[0][$k],
+                "Key " . $k . " in calendars array did not have the expected value."
+            );
+        }
+
+        // Removing the shared calendar.
+        $backend->deleteCalendar($calendars[0]['id']);
+
+        $this->assertEquals(
+            [],
+            $backend->getCalendarsForUser('principals/user2')
+        );
+
+        $result = $backend->getInvites($calendar['id']);
+        $expected = [
+            new Sharee([
+                'href'         => 'principals/user1',
+                'principal'    => 'principals/user1',
+                'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
+                'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
+            ]),
+        ];
+        $this->assertEquals($expected, $result);
+
+    }
+
+    /**
+     * @expectedException \Sabre\DAV\Exception\NotImplemented
+     */
+    function testSetPublishStatus() {
+
+        $backend = new PDO($this->pdo);
+        $backend->setPublishStatus([1, 1], true);
+
+    }
+
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php
index 4412e5531..d4dcc07dc 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php
@@ -81,6 +81,46 @@ class Mock extends AbstractBackend {
 
     }
 
+    /**
+     * Updates properties for a calendar.
+     *
+     * The list of mutations is stored in a Sabre\DAV\PropPatch object.
+     * To do the actual updates, you must tell this object which properties
+     * you're going to process with the handle() method.
+     *
+     * Calling the handle method is like telling the PropPatch object "I
+     * promise I can handle updating this property".
+     *
+     * Read the PropPatch documentation for more info and examples.
+     *
+     * @param mixed $calendarId
+     * @param \Sabre\DAV\PropPatch $propPatch
+     * @return void
+     */
+    function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch) {
+
+        $propPatch->handleRemaining(function($props) use ($calendarId) {
+
+            foreach ($this->calendars as $k => $calendar) {
+
+                if ($calendar['id'] === $calendarId) {
+                    foreach ($props as $propName => $propValue) {
+                        if (is_null($propValue)) {
+                            unset($this->calendars[$k][$propName]);
+                        } else {
+                            $this->calendars[$k][$propName] = $propValue;
+                        }
+                    }
+                    return true;
+
+                }
+
+            }
+
+        });
+
+    }
+
     /**
      * Delete a calendar and all it's objects
      *
@@ -139,18 +179,22 @@ class Mock extends AbstractBackend {
      * Returns information from a single calendar object, based on it's object
      * uri.
      *
+     * The object uri is only the basename, or filename and not a full path.
+     *
      * The returned array must have the same keys as getCalendarObjects. The
      * 'calendardata' object is required here though, while it's not required
      * for getCalendarObjects.
      *
-     * @param string $calendarId
+     * This method must return null if the object did not exist.
+     *
+     * @param mixed $calendarId
      * @param string $objectUri
-     * @return array
+     * @return array|null
      */
     function getCalendarObject($calendarId, $objectUri) {
 
         if (!isset($this->calendarData[$calendarId][$objectUri])) {
-            throw new DAV\Exception\NotFound('Object could not be found');
+            return null;
         }
         $object = $this->calendarData[$calendarId][$objectUri];
         $object['calendarid'] = $calendarId;
@@ -207,8 +251,7 @@ class Mock extends AbstractBackend {
      */
     function deleteCalendarObject($calendarId, $objectUri) {
 
-        throw new Exception('Not implemented');
-
+        unset($this->calendarData[$calendarId][$objectUri]);
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php
index c215ca171..e068ff1e7 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php
@@ -2,38 +2,8 @@
 
 namespace Sabre\CalDAV\Backend;
 
-require_once 'Sabre/TestUtil.php';
-require_once 'Sabre/CalDAV/TestUtil.php';
-require_once 'Sabre/CalDAV/Backend/AbstractPDOTest.php';
-
 class PDOMySQLTest extends AbstractPDOTest {
 
-    function setup() {
-
-        if (!SABRE_HASMYSQL) $this->markTestSkipped('MySQL driver is not available, or not properly configured');
-        $pdo = \Sabre\TestUtil::getMySQLDB();
-        if (!$pdo) $this->markTestSkipped('Could not connect to mysql database');
-
-        $pdo->query('DROP TABLE IF EXISTS calendarobjects, calendars, calendarchanges, calendarsubscriptions, schedulingobjects');
-
-        $queries = explode(
-            ';',
-            file_get_contents(__DIR__ . '/../../../../examples/sql/mysql.calendars.sql')
-        );
-
-        foreach ($queries as $query) {
-            $query = trim($query, " \r\n\t");
-            if ($query)
-                $pdo->exec($query);
-        }
-        $this->pdo = $pdo;
-
-    }
-
-    function teardown() {
-
-        $this->pdo = null;
-
-    }
+    public $driver = 'mysql';
 
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php
index 4074259f2..90ad5a171 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Backend/PDOSqliteTest.php
@@ -2,36 +2,8 @@
 
 namespace Sabre\CalDAV\Backend;
 
-use Sabre\CalDAV;
-
-require_once 'Sabre/CalDAV/Backend/AbstractPDOTest.php';
-
 class PDOSqliteTest extends AbstractPDOTest {
 
-    function setup() {
-
-        if (!SABRE_HASSQLITE) $this->markTestSkipped('SQLite driver is not available');
-
-        if (file_exists(SABRE_TEMPDIR . '/testdb.sqlite'))
-            unlink(SABRE_TEMPDIR . '/testdb.sqlite');
-
-        $pdo = new \PDO('sqlite:' . SABRE_TEMPDIR . '/testdb.sqlite');
-        $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-
-        // Yup this is definitely not 'fool proof', but good enough for now.
-        $queries = explode(';', file_get_contents(__DIR__ . '/../../../../examples/sql/sqlite.calendars.sql'));
-        foreach ($queries as $query) {
-            $pdo->exec($query);
-        }
-        $this->pdo = $pdo;
-
-    }
-
-    function teardown() {
-
-        $this->pdo = null;
-        unlink(SABRE_TEMPDIR . '/testdb.sqlite');
-
-    }
+    public $driver = 'sqlite';
 
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php
index 9fc1eee4c..0d98922ff 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php
@@ -1,7 +1,6 @@
 <?php
 
 namespace Sabre\CalDAV;
-use Sabre\DAVACL;
 
 require_once 'Sabre/CalDAV/TestUtil.php';
 
@@ -19,11 +18,10 @@ class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
 
     function setup() {
 
-        if (!SABRE_HASSQLITE) $this->markTestSkipped('SQLite driver is not available');
         $this->backend = TestUtil::getBackend();
 
         $calendars = $this->backend->getCalendarsForUser('principals/user1');
-        $this->assertEquals(2,count($calendars));
+        $this->assertEquals(2, count($calendars));
         $this->calendar = new Calendar($this->backend, $calendars[0]);
 
     }
@@ -40,10 +38,10 @@ class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
         $children = $this->calendar->getChildren();
         $this->assertTrue($children[0] instanceof CalendarObject);
 
-        $this->assertInternalType('string',$children[0]->getName());
-        $this->assertInternalType('string',$children[0]->get());
-        $this->assertInternalType('string',$children[0]->getETag());
-        $this->assertEquals('text/calendar; charset=utf-8; component=vevent', $children[0]->getContentType());
+        $this->assertInternalType('string', $children[0]->getName());
+        $this->assertInternalType('string', $children[0]->get());
+        $this->assertInternalType('string', $children[0]->getETag());
+        $this->assertEquals('text/calendar; charset=utf-8', $children[0]->getContentType());
 
     }
 
@@ -53,9 +51,9 @@ class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
     function testInvalidArg1() {
 
         $obj = new CalendarObject(
-            new Backend\Mock(array(),array()),
-            array(),
-            array()
+            new Backend\Mock([], []),
+            [],
+            []
         );
 
     }
@@ -66,9 +64,9 @@ class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
     function testInvalidArg2() {
 
         $obj = new CalendarObject(
-            new Backend\Mock(array(),array()),
-            array(),
-            array('calendarid' => '1')
+            new Backend\Mock([], []),
+            [],
+            ['calendarid' => '1']
         );
 
     }
@@ -96,7 +94,7 @@ class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
         $this->assertTrue($children[0] instanceof CalendarObject);
         $newData = TestUtil::getTestCalendarData();
 
-        $stream = fopen('php://temp','r+');
+        $stream = fopen('php://temp', 'r+');
         fwrite($stream, $newData);
         rewind($stream);
         $children[0]->put($stream);
@@ -117,7 +115,7 @@ class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
         $obj->delete();
 
         $children2 =  $this->calendar->getChildren();
-        $this->assertEquals(count($children)-1, count($children2));
+        $this->assertEquals(count($children) - 1, count($children2));
 
     }
 
@@ -132,7 +130,7 @@ class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
         $obj = $children[0];
 
         $lastMod = $obj->getLastModified();
-        $this->assertTrue(is_int($lastMod) || ctype_digit($lastMod));
+        $this->assertTrue(is_int($lastMod) || ctype_digit($lastMod) || is_null($lastMod));
 
     }
 
@@ -173,33 +171,33 @@ class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
 
     function testGetACL() {
 
-        $expected = array(
-            array(
+        $expected = [
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user1',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user1/calendar-proxy-write',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user1/calendar-proxy-read',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}write',
                 'principal' => 'principals/user1',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}write',
                 'principal' => 'principals/user1/calendar-proxy-write',
                 'protected' => true,
-            ),
-        );
+            ],
+        ];
 
         $children = $this->calendar->getChildren();
         $this->assertTrue($children[0] instanceof CalendarObject);
@@ -213,40 +211,30 @@ class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
 
         $backend = new Backend\Mock([], []);
         $calendarObject = new CalendarObject($backend, ['principaluri' => 'principals/user1'], ['calendarid' => 1, 'uri' => 'foo']);
-        $expected = array(
-            array(
-                'privilege' => '{DAV:}read',
+        $expected = [
+            [
+                'privilege' => '{DAV:}all',
                 'principal' => 'principals/user1',
                 'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => 'principals/user1',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
+            ],
+            [
+                'privilege' => '{DAV:}all',
                 'principal' => 'principals/user1/calendar-proxy-write',
                 'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => 'principals/user1/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user1/calendar-proxy-read',
                 'protected' => true,
-            ),
-        );
+            ],
+        ];
         $this->assertEquals($expected, $calendarObject->getACL());
 
 
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\MethodNotAllowed
+     * @expectedException \Sabre\DAV\Exception\Forbidden
      */
     function testSetACL() {
 
@@ -254,7 +242,7 @@ class CalendarObjectTest extends \PHPUnit_Framework_TestCase {
         $this->assertTrue($children[0] instanceof CalendarObject);
 
         $obj = $children[0];
-        $obj->setACL(array());
+        $obj->setACL([]);
 
     }
 
@@ -306,15 +294,15 @@ END:VCALENDAR";
 
     function testGetRefetch() {
 
-        $backend = new Backend\Mock(array(), array(
-            1 => array(
-                'foo' => array(
+        $backend = new Backend\Mock([], [
+            1 => [
+                'foo' => [
                     'calendardata' => 'foo',
-                    'uri' => 'foo'
-                ),
-            )
-        ));
-        $obj = new CalendarObject($backend, array('id' => 1), array('uri' => 'foo'));
+                    'uri'          => 'foo'
+                ],
+            ]
+        ]);
+        $obj = new CalendarObject($backend, ['id' => 1], ['uri' => 'foo']);
 
         $this->assertEquals('foo', $obj->get());
 
@@ -322,15 +310,15 @@ END:VCALENDAR";
 
     function testGetEtag1() {
 
-        $objectInfo = array(
+        $objectInfo = [
             'calendardata' => 'foo',
-            'uri' => 'foo',
-            'etag' => 'bar',
-            'calendarid' => 1
-        );
+            'uri'          => 'foo',
+            'etag'         => 'bar',
+            'calendarid'   => 1
+        ];
 
-        $backend = new Backend\Mock(array(), array());
-        $obj = new CalendarObject($backend, array(), $objectInfo);
+        $backend = new Backend\Mock([], []);
+        $obj = new CalendarObject($backend, [], $objectInfo);
 
         $this->assertEquals('bar', $obj->getETag());
 
@@ -338,14 +326,14 @@ END:VCALENDAR";
 
     function testGetEtag2() {
 
-        $objectInfo = array(
+        $objectInfo = [
             'calendardata' => 'foo',
-            'uri' => 'foo',
-            'calendarid' => 1
-        );
+            'uri'          => 'foo',
+            'calendarid'   => 1
+        ];
 
-        $backend = new Backend\Mock(array(), array());
-        $obj = new CalendarObject($backend, array(), $objectInfo);
+        $backend = new Backend\Mock([], []);
+        $obj = new CalendarObject($backend, [], $objectInfo);
 
         $this->assertEquals('"' . md5('foo') . '"', $obj->getETag());
 
@@ -353,42 +341,42 @@ END:VCALENDAR";
 
     function testGetSupportedPrivilegesSet() {
 
-        $objectInfo = array(
+        $objectInfo = [
             'calendardata' => 'foo',
-            'uri' => 'foo',
-            'calendarid' => 1
-        );
+            'uri'          => 'foo',
+            'calendarid'   => 1
+        ];
 
-        $backend = new Backend\Mock(array(), array());
-        $obj = new CalendarObject($backend, array(), $objectInfo);
+        $backend = new Backend\Mock([], []);
+        $obj = new CalendarObject($backend, [], $objectInfo);
         $this->assertNull($obj->getSupportedPrivilegeSet());
 
     }
 
     function testGetSize1() {
 
-        $objectInfo = array(
+        $objectInfo = [
             'calendardata' => 'foo',
-            'uri' => 'foo',
-            'calendarid' => 1
-        );
+            'uri'          => 'foo',
+            'calendarid'   => 1
+        ];
 
-        $backend = new Backend\Mock(array(), array());
-        $obj = new CalendarObject($backend, array(), $objectInfo);
+        $backend = new Backend\Mock([], []);
+        $obj = new CalendarObject($backend, [], $objectInfo);
         $this->assertEquals(3, $obj->getSize());
 
     }
 
     function testGetSize2() {
 
-        $objectInfo = array(
-            'uri' => 'foo',
+        $objectInfo = [
+            'uri'        => 'foo',
             'calendarid' => 1,
-            'size' => 4,
-        );
+            'size'       => 4,
+        ];
 
-        $backend = new Backend\Mock(array(), array());
-        $obj = new CalendarObject($backend, array(), $objectInfo);
+        $backend = new Backend\Mock([], []);
+        $obj = new CalendarObject($backend, [], $objectInfo);
         $this->assertEquals(4, $obj->getSize());
 
     }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
index 9de24d3aa..ca06d8ffa 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
@@ -26,32 +26,32 @@ class CalendarQueryVAlarmTest extends \PHPUnit_Framework_TestCase {
 
         $vcalendar->add($vevent);
 
-        $filter = array(
-            'name' => 'VCALENDAR',
+        $filter = [
+            'name'           => 'VCALENDAR',
             'is-not-defined' => false,
-            'time-range' => null,
-            'prop-filters' => array(),
-            'comp-filters' => array(
-                array(
-                    'name' => 'VEVENT',
+            'time-range'     => null,
+            'prop-filters'   => [],
+            'comp-filters'   => [
+                [
+                    'name'           => 'VEVENT',
                     'is-not-defined' => false,
-                    'time-range' => null,
-                    'prop-filters' => array(),
-                    'comp-filters' => array(
-                        array(
-                            'name' => 'VALARM',
+                    'time-range'     => null,
+                    'prop-filters'   => [],
+                    'comp-filters'   => [
+                        [
+                            'name'           => 'VALARM',
                             'is-not-defined' => false,
-                            'prop-filters' => array(),
-                            'comp-filters' => array(),
-                            'time-range' => array(
+                            'prop-filters'   => [],
+                            'comp-filters'   => [],
+                            'time-range'     => [
                                 'start' => new \DateTime('2012-05-10'),
-                                'end' => new \DateTime('2012-05-20'),
-                            ),
-                        ),
-                    ),
-                ),
-            ),
-        );
+                                'end'   => new \DateTime('2012-05-20'),
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
 
         $validator = new CalendarQueryValidator();
         $this->assertTrue($validator->validate($vcalendar, $filter));
@@ -87,32 +87,32 @@ class CalendarQueryVAlarmTest extends \PHPUnit_Framework_TestCase {
 
         $vcalendar->add($vevent);
 
-        $filter = array(
-            'name' => 'VCALENDAR',
+        $filter = [
+            'name'           => 'VCALENDAR',
             'is-not-defined' => false,
-            'time-range' => null,
-            'prop-filters' => array(),
-            'comp-filters' => array(
-                array(
-                    'name' => 'VEVENT',
+            'time-range'     => null,
+            'prop-filters'   => [],
+            'comp-filters'   => [
+                [
+                    'name'           => 'VEVENT',
                     'is-not-defined' => false,
-                    'time-range' => null,
-                    'prop-filters' => array(),
-                    'comp-filters' => array(
-                        array(
-                            'name' => 'VALARM',
+                    'time-range'     => null,
+                    'prop-filters'   => [],
+                    'comp-filters'   => [
+                        [
+                            'name'           => 'VALARM',
                             'is-not-defined' => false,
-                            'prop-filters' => array(),
-                            'comp-filters' => array(),
-                            'time-range' => array(
+                            'prop-filters'   => [],
+                            'comp-filters'   => [],
+                            'time-range'     => [
                                 'start' => new \DateTime('2011-12-10'),
-                                'end' => new \DateTime('2011-12-20'),
-                            ),
-                        ),
-                    ),
-                ),
-            ),
-        );
+                                'end'   => new \DateTime('2011-12-20'),
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
 
         $validator = new CalendarQueryValidator();
         $this->assertTrue($validator->validate($vcalendar, $filter));
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
index 9822e82e2..4c2558a9b 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
@@ -1,8 +1,8 @@
 <?php
 
 namespace Sabre\CalDAV;
+
 use Sabre\VObject;
-use Sabre\DAV;
 
 class CalendarQueryValidatorTest extends \PHPUnit_Framework_TestCase {
 
@@ -29,17 +29,17 @@ ICS;
 
         // Wrapping filter in a VCALENDAR component filter, as this is always
         // there anyway.
-        $filters = array(
-            'name' => 'VCALENDAR',
-            'comp-filters' => array($filters),
-            'prop-filters' => array(),
+        $filters = [
+            'name'           => 'VCALENDAR',
+            'comp-filters'   => [$filters],
+            'prop-filters'   => [],
             'is-not-defined' => false,
-            'time-range' => null,
-        );
+            'time-range'     => null,
+        ];
 
         $vObject = VObject\Reader::read($icalObject);
 
-        switch($outcome) {
+        switch ($outcome) {
             case 0 :
                 $this->assertFalse($validator->validate($vObject, $filters));
                 break;
@@ -392,13 +392,13 @@ END:VEVENT
 END:VCALENDAR
 yow;
 
-        $filter1 = array(
-            'name' => 'VEVENT',
-            'comp-filters' => array(),
-            'prop-filters' => array(),
+        $filter1 = [
+            'name'           => 'VEVENT',
+            'comp-filters'   => [],
+            'prop-filters'   => [],
             'is-not-defined' => false,
-            'time-range' => null,
-        );
+            'time-range'     => null,
+        ];
         $filter2 = $filter1;
         $filter2['name'] = 'VTODO';
 
@@ -410,25 +410,25 @@ yow;
         $filter4['is-not-defined'] = true;
 
         $filter5 = $filter1;
-        $filter5['comp-filters'] = array(
-            array(
-                'name' => 'VALARM',
+        $filter5['comp-filters'] = [
+            [
+                'name'           => 'VALARM',
                 'is-not-defined' => false,
-                'comp-filters' => array(),
-                'prop-filters' => array(),
-                'time-range' => null,
-            ),
-        );
+                'comp-filters'   => [],
+                'prop-filters'   => [],
+                'time-range'     => null,
+            ],
+        ];
         $filter6 = $filter1;
-        $filter6['prop-filters'] = array(
-            array(
-                'name' => 'SUMMARY',
+        $filter6['prop-filters'] = [
+            [
+                'name'           => 'SUMMARY',
                 'is-not-defined' => false,
-                'param-filters' => array(),
-                'time-range' => null,
-                'text-match' => null,
-            ),
-        );
+                'param-filters'  => [],
+                'time-range'     => null,
+                'text-match'     => null,
+            ],
+        ];
         $filter7 = $filter6;
         $filter7['prop-filters'][0]['name'] = 'DESCRIPTION';
 
@@ -443,21 +443,21 @@ yow;
 
         // Param filters
         $filter11 = $filter1;
-        $filter11['prop-filters'] = array(
-            array(
-                'name' => 'DTSTART',
+        $filter11['prop-filters'] = [
+            [
+                'name'           => 'DTSTART',
                 'is-not-defined' => false,
-                'param-filters' => array(
-                    array(
-                        'name' => 'VALUE',
+                'param-filters'  => [
+                    [
+                        'name'           => 'VALUE',
                         'is-not-defined' => false,
-                        'text-match' => null,
-                    ),
-                ),
+                        'text-match'     => null,
+                    ],
+                ],
                 'time-range' => null,
                 'text-match' => null,
-            ),
-        );
+            ],
+        ];
 
         $filter12 = $filter11;
         $filter12['prop-filters'][0]['param-filters'][0]['name'] = 'TZID';
@@ -470,11 +470,11 @@ yow;
 
         // Param text filter
         $filter15 = $filter11;
-        $filter15['prop-filters'][0]['param-filters'][0]['text-match'] = array(
-            'collation' => 'i;ascii-casemap',
-            'value' => 'dAtE',
+        $filter15['prop-filters'][0]['param-filters'][0]['text-match'] = [
+            'collation'        => 'i;ascii-casemap',
+            'value'            => 'dAtE',
             'negate-condition' => false,
-        );
+        ];
         $filter16 = $filter15;
         $filter16['prop-filters'][0]['param-filters'][0]['text-match']['collation'] = 'i;octet';
 
@@ -487,31 +487,31 @@ yow;
 
         // prop + text
         $filter19 = $filter5;
-        $filter19['comp-filters'][0]['prop-filters'] = array(
-            array(
-                'name' => 'action',
+        $filter19['comp-filters'][0]['prop-filters'] = [
+            [
+                'name'           => 'action',
                 'is-not-defined' => false,
-                'time-range' => null,
-                'param-filters' => array(),
-                'text-match' => array(
-                    'collation' => 'i;ascii-casemap',
-                    'value' => 'display',
+                'time-range'     => null,
+                'param-filters'  => [],
+                'text-match'     => [
+                    'collation'        => 'i;ascii-casemap',
+                    'value'            => 'display',
                     'negate-condition' => false,
-                ),
-            ),
-        );
+                ],
+            ],
+        ];
 
         // Time range
-        $filter20 = array(
-            'name' => 'VEVENT',
-            'comp-filters' => array(),
-            'prop-filters' => array(),
+        $filter20 = [
+            'name'           => 'VEVENT',
+            'comp-filters'   => [],
+            'prop-filters'   => [],
             'is-not-defined' => false,
-            'time-range' => array(
+            'time-range'     => [
                'start' => new \DateTime('2011-01-01 10:00:00', new \DateTimeZone('GMT')),
-               'end' => new \DateTime('2011-01-01 13:00:00', new \DateTimeZone('GMT')),
-            ),
-        );
+               'end'   => new \DateTime('2011-01-01 13:00:00', new \DateTimeZone('GMT')),
+            ],
+        ];
         // Time range, no end date
         $filter21 = $filter20;
         $filter21['time-range']['end'] = null;
@@ -522,105 +522,105 @@ yow;
 
         // Time range, other dates
         $filter23 = $filter20;
-        $filter23['time-range'] = array(
+        $filter23['time-range'] = [
            'start' => new \DateTime('2011-02-01 10:00:00', new \DateTimeZone('GMT')),
-           'end' => new \DateTime('2011-02-01 13:00:00', new \DateTimeZone('GMT')),
-        );
+           'end'   => new \DateTime('2011-02-01 13:00:00', new \DateTimeZone('GMT')),
+        ];
         // Time range
-        $filter24 = array(
-            'name' => 'VTODO',
-            'comp-filters' => array(),
-            'prop-filters' => array(),
+        $filter24 = [
+            'name'           => 'VTODO',
+            'comp-filters'   => [],
+            'prop-filters'   => [],
             'is-not-defined' => false,
-            'time-range' => array(
+            'time-range'     => [
                'start' => new \DateTime('2011-01-01 12:45:00', new \DateTimeZone('GMT')),
-               'end' => new \DateTime('2011-01-01 13:15:00', new \DateTimeZone('GMT')),
-            ),
-        );
+               'end'   => new \DateTime('2011-01-01 13:15:00', new \DateTimeZone('GMT')),
+            ],
+        ];
         // Time range, other dates (1 month in the future)
         $filter25 = $filter24;
-        $filter25['time-range'] = array(
+        $filter25['time-range'] = [
            'start' => new \DateTime('2011-02-01 10:00:00', new \DateTimeZone('GMT')),
-           'end' => new \DateTime('2011-02-01 13:00:00', new \DateTimeZone('GMT')),
-        );
+           'end'   => new \DateTime('2011-02-01 13:00:00', new \DateTimeZone('GMT')),
+        ];
         $filter26 = $filter24;
-        $filter26['time-range'] = array(
+        $filter26['time-range'] = [
            'start' => new \DateTime('2011-01-01 11:45:00', new \DateTimeZone('GMT')),
-           'end' => new \DateTime('2011-01-01 12:15:00', new \DateTimeZone('GMT')),
-       );
+           'end'   => new \DateTime('2011-01-01 12:15:00', new \DateTimeZone('GMT')),
+       ];
 
         // Time range for VJOURNAL
-        $filter27 = array(
-            'name' => 'VJOURNAL',
-            'comp-filters' => array(),
-            'prop-filters' => array(),
+        $filter27 = [
+            'name'           => 'VJOURNAL',
+            'comp-filters'   => [],
+            'prop-filters'   => [],
             'is-not-defined' => false,
-            'time-range' => array(
+            'time-range'     => [
                'start' => new \DateTime('2011-01-01 12:45:00', new \DateTimeZone('GMT')),
-               'end' => new \DateTime('2011-01-01 13:15:00', new \DateTimeZone('GMT')),
-            ),
-        );
+               'end'   => new \DateTime('2011-01-01 13:15:00', new \DateTimeZone('GMT')),
+            ],
+        ];
         $filter28 = $filter27;
-        $filter28['time-range'] = array(
+        $filter28['time-range'] = [
            'start' => new \DateTime('2011-01-01 11:45:00', new \DateTimeZone('GMT')),
-           'end' => new \DateTime('2011-01-01 12:15:00', new \DateTimeZone('GMT')),
-        );
+           'end'   => new \DateTime('2011-01-01 12:15:00', new \DateTimeZone('GMT')),
+        ];
         // Time range for VFREEBUSY
-        $filter29 = array(
-            'name' => 'VFREEBUSY',
-            'comp-filters' => array(),
-            'prop-filters' => array(),
+        $filter29 = [
+            'name'           => 'VFREEBUSY',
+            'comp-filters'   => [],
+            'prop-filters'   => [],
             'is-not-defined' => false,
-            'time-range' => array(
+            'time-range'     => [
                'start' => new \DateTime('2011-01-01 12:45:00', new \DateTimeZone('GMT')),
-               'end' => new \DateTime('2011-01-01 13:15:00', new \DateTimeZone('GMT')),
-            ),
-        );
+               'end'   => new \DateTime('2011-01-01 13:15:00', new \DateTimeZone('GMT')),
+            ],
+        ];
         // Time range filter on property
-        $filter30 = array(
-            'name' => 'VEVENT',
-            'comp-filters' => array(),
-            'prop-filters' => array(
-                array(
-                    'name' => 'DTSTART',
+        $filter30 = [
+            'name'         => 'VEVENT',
+            'comp-filters' => [],
+            'prop-filters' => [
+                [
+                    'name'           => 'DTSTART',
                     'is-not-defined' => false,
-                    'param-filters' => array(),
-                    'time-range' => array(
+                    'param-filters'  => [],
+                    'time-range'     => [
                        'start' => new \DateTime('2011-01-01 10:00:00', new \DateTimeZone('GMT')),
-                       'end' => new \DateTime('2011-01-01 13:00:00', new \DateTimeZone('GMT')),
-                   ),
+                       'end'   => new \DateTime('2011-01-01 13:00:00', new \DateTimeZone('GMT')),
+                   ],
                     'text-match' => null,
-               ),
-            ),
+               ],
+            ],
             'is-not-defined' => false,
-            'time-range' => null,
-        );
+            'time-range'     => null,
+        ];
 
         // Time range for alarm
-        $filter31 = array(
-            'name' => 'VEVENT',
-            'prop-filters' => array(),
-            'comp-filters' => array(
-                array(
-                    'name' => 'VALARM',
+        $filter31 = [
+            'name'         => 'VEVENT',
+            'prop-filters' => [],
+            'comp-filters' => [
+                [
+                    'name'           => 'VALARM',
                     'is-not-defined' => false,
-                    'comp-filters' => array(),
-                    'prop-filters' => array(),
-                    'time-range' => array(
+                    'comp-filters'   => [],
+                    'prop-filters'   => [],
+                    'time-range'     => [
                        'start' => new \DateTime('2011-01-01 10:45:00', new \DateTimeZone('GMT')),
-                       'end' => new \DateTime('2011-01-01 11:15:00', new \DateTimeZone('GMT')),
-                    ),
+                       'end'   => new \DateTime('2011-01-01 11:15:00', new \DateTimeZone('GMT')),
+                    ],
                     'text-match' => null,
-               ),
-            ),
+               ],
+            ],
             'is-not-defined' => false,
-            'time-range' => null,
-        );
+            'time-range'     => null,
+        ];
         $filter32 = $filter31;
-        $filter32['comp-filters'][0]['time-range'] = array(
+        $filter32['comp-filters'][0]['time-range'] = [
            'start' => new \DateTime('2011-01-01 11:45:00', new \DateTimeZone('GMT')),
-           'end' => new \DateTime('2011-01-01 12:15:00', new \DateTimeZone('GMT')),
-       );
+           'end'   => new \DateTime('2011-01-01 12:15:00', new \DateTimeZone('GMT')),
+       ];
 
         $filter33 = $filter31;
         $filter33['name'] = 'VTODO';
@@ -632,194 +632,194 @@ yow;
         $filter36['name'] = 'VJOURNAL';
 
         // Time range filter on non-datetime property
-        $filter37 = array(
-            'name' => 'VEVENT',
-            'comp-filters' => array(),
-            'prop-filters' => array(
-                array(
-                    'name' => 'SUMMARY',
+        $filter37 = [
+            'name'         => 'VEVENT',
+            'comp-filters' => [],
+            'prop-filters' => [
+                [
+                    'name'           => 'SUMMARY',
                     'is-not-defined' => false,
-                    'param-filters' => array(),
-                    'time-range' => array(
+                    'param-filters'  => [],
+                    'time-range'     => [
                        'start' => new \DateTime('2011-01-01 10:00:00', new \DateTimeZone('GMT')),
-                       'end' => new \DateTime('2011-01-01 13:00:00', new \DateTimeZone('GMT')),
-                   ),
+                       'end'   => new \DateTime('2011-01-01 13:00:00', new \DateTimeZone('GMT')),
+                   ],
                     'text-match' => null,
-               ),
-            ),
+               ],
+            ],
             'is-not-defined' => false,
-            'time-range' => null,
-        );
+            'time-range'     => null,
+        ];
 
-        $filter38 = array(
-            'name' => 'VEVENT',
-            'comp-filters' => array(),
-            'prop-filters' => array(),
+        $filter38 = [
+            'name'           => 'VEVENT',
+            'comp-filters'   => [],
+            'prop-filters'   => [],
             'is-not-defined' => false,
-            'time-range' => array(
+            'time-range'     => [
                 'start' => new \DateTime('2012-07-01 00:00:00', new \DateTimeZone('UTC')),
-                'end' => new \DateTime('2012-08-01 00:00:00', new \DateTimeZone('UTC')),
-            )
-        );
-        $filter39 = array(
-            'name' => 'VEVENT',
-            'comp-filters' => array(
-                array(
-                    'name' => 'VALARM',
-                    'comp-filters' => array(),
-                    'prop-filters' => array(),
+                'end'   => new \DateTime('2012-08-01 00:00:00', new \DateTimeZone('UTC')),
+            ]
+        ];
+        $filter39 = [
+            'name'         => 'VEVENT',
+            'comp-filters' => [
+                [
+                    'name'           => 'VALARM',
+                    'comp-filters'   => [],
+                    'prop-filters'   => [],
                     'is-not-defined' => false,
-                    'time-range' => array(
+                    'time-range'     => [
                         'start' => new \DateTime('2012-09-01 00:00:00', new \DateTimeZone('UTC')),
-                        'end' => new \DateTime('2012-10-01 00:00:00', new \DateTimeZone('UTC')),
-                    )
-                ),
-            ),
-            'prop-filters' => array(),
+                        'end'   => new \DateTime('2012-10-01 00:00:00', new \DateTimeZone('UTC')),
+                    ]
+                ],
+            ],
+            'prop-filters'   => [],
             'is-not-defined' => false,
-            'time-range' => null,
-        );
+            'time-range'     => null,
+        ];
 
-        return array(
+        return [
 
             // Component check
 
-            array($blob1, $filter1, 1),
-            array($blob1, $filter2, 0),
-            array($blob1, $filter3, 0),
-            array($blob1, $filter4, 1),
+            [$blob1, $filter1, 1],
+            [$blob1, $filter2, 0],
+            [$blob1, $filter3, 0],
+            [$blob1, $filter4, 1],
 
             // Subcomponent check (4)
-            array($blob1, $filter5, 0),
-            array($blob2, $filter5, 1),
+            [$blob1, $filter5, 0],
+            [$blob2, $filter5, 1],
 
             // Property checki (6)
-            array($blob1, $filter6, 1),
-            array($blob1, $filter7, 0),
-            array($blob1, $filter8, 0),
-            array($blob1, $filter9, 1),
+            [$blob1, $filter6, 1],
+            [$blob1, $filter7, 0],
+            [$blob1, $filter8, 0],
+            [$blob1, $filter9, 1],
 
             // Subcomponent + property (10)
-            array($blob2, $filter10, 1),
+            [$blob2, $filter10, 1],
 
             // Param filter (11)
-            array($blob3, $filter11, 1),
-            array($blob3, $filter12, 0),
-            array($blob3, $filter13, 0),
-            array($blob3, $filter14, 1),
+            [$blob3, $filter11, 1],
+            [$blob3, $filter12, 0],
+            [$blob3, $filter13, 0],
+            [$blob3, $filter14, 1],
 
             // Param + text (15)
-            array($blob3, $filter15, 1),
-            array($blob3, $filter16, 0),
-            array($blob3, $filter17, 0),
-            array($blob3, $filter18, 1),
+            [$blob3, $filter15, 1],
+            [$blob3, $filter16, 0],
+            [$blob3, $filter17, 0],
+            [$blob3, $filter18, 1],
 
             // Prop + text (19)
-            array($blob2, $filter19, 1),
+            [$blob2, $filter19, 1],
 
             // Incorrect object (vcard) (20)
-            array($blob4, $filter1, -1),
+            [$blob4, $filter1, -1],
 
             // Time-range for event (21)
-            array($blob5, $filter20, 1),
-            array($blob6, $filter20, 1),
-            array($blob7, $filter20, 1),
-            array($blob8, $filter20, 1),
+            [$blob5, $filter20, 1],
+            [$blob6, $filter20, 1],
+            [$blob7, $filter20, 1],
+            [$blob8, $filter20, 1],
 
-            array($blob5, $filter21, 1),
-            array($blob5, $filter22, 1),
+            [$blob5, $filter21, 1],
+            [$blob5, $filter22, 1],
 
-            array($blob5, $filter23, 0),
-            array($blob6, $filter23, 0),
-            array($blob7, $filter23, 0),
-            array($blob8, $filter23, 0),
+            [$blob5, $filter23, 0],
+            [$blob6, $filter23, 0],
+            [$blob7, $filter23, 0],
+            [$blob8, $filter23, 0],
 
             // Time-range for todo (31)
-            array($blob9, $filter24, 1),
-            array($blob9, $filter25, 0),
-            array($blob9, $filter26, 1),
-            array($blob10, $filter24, 1),
-            array($blob10, $filter25, 0),
-            array($blob10, $filter26, 1),
+            [$blob9, $filter24, 1],
+            [$blob9, $filter25, 0],
+            [$blob9, $filter26, 1],
+            [$blob10, $filter24, 1],
+            [$blob10, $filter25, 0],
+            [$blob10, $filter26, 1],
 
-            array($blob11, $filter24, 0),
-            array($blob11, $filter25, 0),
-            array($blob11, $filter26, 1),
+            [$blob11, $filter24, 0],
+            [$blob11, $filter25, 0],
+            [$blob11, $filter26, 1],
 
-            array($blob12, $filter24, 1),
-            array($blob12, $filter25, 0),
-            array($blob12, $filter26, 0),
+            [$blob12, $filter24, 1],
+            [$blob12, $filter25, 0],
+            [$blob12, $filter26, 0],
 
-            array($blob13, $filter24, 1),
-            array($blob13, $filter25, 0),
-            array($blob13, $filter26, 1),
+            [$blob13, $filter24, 1],
+            [$blob13, $filter25, 0],
+            [$blob13, $filter26, 1],
 
-            array($blob14, $filter24, 1),
-            array($blob14, $filter25, 0),
-            array($blob14, $filter26, 0),
+            [$blob14, $filter24, 1],
+            [$blob14, $filter25, 0],
+            [$blob14, $filter26, 0],
 
-            array($blob15, $filter24, 1),
-            array($blob15, $filter25, 1),
-            array($blob15, $filter26, 1),
+            [$blob15, $filter24, 1],
+            [$blob15, $filter25, 1],
+            [$blob15, $filter26, 1],
 
-            array($blob16, $filter24, 1),
-            array($blob16, $filter25, 1),
-            array($blob16, $filter26, 1),
+            [$blob16, $filter24, 1],
+            [$blob16, $filter25, 1],
+            [$blob16, $filter26, 1],
 
             // Time-range for journals (55)
-            array($blob17, $filter27, 0),
-            array($blob17, $filter28, 0),
-            array($blob18, $filter27, 0),
-            array($blob18, $filter28, 1),
-            array($blob19, $filter27, 1),
-            array($blob19, $filter28, 1),
+            [$blob17, $filter27, 0],
+            [$blob17, $filter28, 0],
+            [$blob18, $filter27, 0],
+            [$blob18, $filter28, 1],
+            [$blob19, $filter27, 1],
+            [$blob19, $filter28, 1],
 
             // Time-range for free-busy (61)
-            array($blob20, $filter29, -1),
+            [$blob20, $filter29, -1],
 
             // Time-range on property (62)
-            array($blob5, $filter30, 1),
-            array($blob3, $filter37, -1),
-            array($blob3, $filter30, 0),
+            [$blob5, $filter30, 1],
+            [$blob3, $filter37, -1],
+            [$blob3, $filter30, 0],
 
             // Time-range on alarm in vevent (65)
-            array($blob21, $filter31, 1),
-            array($blob21, $filter32, 0),
-            array($blob22, $filter31, 1),
-            array($blob22, $filter32, 0),
-            array($blob23, $filter31, 1),
-            array($blob23, $filter32, 0),
-            array($blob24, $filter31, 1),
-            array($blob24, $filter32, 0),
-            array($blob25, $filter31, 1),
-            array($blob25, $filter32, 0),
-            array($blob26, $filter31, 1),
-            array($blob26, $filter32, 0),
+            [$blob21, $filter31, 1],
+            [$blob21, $filter32, 0],
+            [$blob22, $filter31, 1],
+            [$blob22, $filter32, 0],
+            [$blob23, $filter31, 1],
+            [$blob23, $filter32, 0],
+            [$blob24, $filter31, 1],
+            [$blob24, $filter32, 0],
+            [$blob25, $filter31, 1],
+            [$blob25, $filter32, 0],
+            [$blob26, $filter31, 1],
+            [$blob26, $filter32, 0],
 
             // Time-range on alarm for vtodo (77)
-            array($blob27, $filter33, 1),
-            array($blob27, $filter34, 0),
+            [$blob27, $filter33, 1],
+            [$blob27, $filter34, 0],
 
             // Time-range on alarm for vjournal (79)
-            array($blob28, $filter35, -1),
-            array($blob28, $filter36, -1),
+            [$blob28, $filter35, -1],
+            [$blob28, $filter36, -1],
 
             // Time-range on alarm with duration (81)
-            array($blob29, $filter31, 1),
-            array($blob29, $filter32, 0),
-            array($blob30, $filter31, 0),
-            array($blob30, $filter32, 0),
+            [$blob29, $filter31, 1],
+            [$blob29, $filter32, 0],
+            [$blob30, $filter31, 0],
+            [$blob30, $filter32, 0],
 
             // Time-range with RRULE (85)
-            array($blob31, $filter20, 1),
-            array($blob32, $filter20, 0),
+            [$blob31, $filter20, 1],
+            [$blob32, $filter20, 0],
 
             // Bug reported on mailing list, related to all-day events (87)
             //array($blob33, $filter38, 1),
 
             // Event in timerange, but filtered alarm is in the far future (88).
-            array($blob34, $filter39, 0),
-        );
+            [$blob34, $filter39, 0],
+        ];
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php
index ea744d2cf..df85b6ded 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php
@@ -3,7 +3,6 @@
 namespace Sabre\CalDAV;
 
 use Sabre\DAV\PropPatch;
-use Sabre\DAVACL;
 
 require_once 'Sabre/CalDAV/TestUtil.php';
 
@@ -25,8 +24,6 @@ class CalendarTest extends \PHPUnit_Framework_TestCase {
 
     function setup() {
 
-        if (!SABRE_HASSQLITE) $this->markTestSkipped('SQLite driver is not available');
-
         $this->backend = TestUtil::getBackend();
 
         $this->calendars = $this->backend->getCalendarsForUser('principals/user1');
@@ -63,7 +60,7 @@ class CalendarTest extends \PHPUnit_Framework_TestCase {
         $this->assertEquals(true, $result);
 
         $calendars2 = $this->backend->getCalendarsForUser('principals/user1');
-        $this->assertEquals('NewName',$calendars2[0]['{DAV:}displayname']);
+        $this->assertEquals('NewName', $calendars2[0]['{DAV:}displayname']);
 
     }
 
@@ -72,15 +69,15 @@ class CalendarTest extends \PHPUnit_Framework_TestCase {
      */
     function testGetProperties() {
 
-        $question = array(
+        $question = [
             '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set',
-        );
+        ];
 
         $result = $this->calendar->getProperties($question);
 
-        foreach($question as $q) $this->assertArrayHasKey($q,$result);
+        foreach ($question as $q) $this->assertArrayHasKey($q, $result);
 
-        $this->assertEquals(array('VEVENT','VTODO'), $result['{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set']->getValue());
+        $this->assertEquals(['VEVENT', 'VTODO'], $result['{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set']->getValue());
 
     }
 
@@ -100,7 +97,7 @@ class CalendarTest extends \PHPUnit_Framework_TestCase {
     function testGetChildren() {
 
         $children = $this->calendar->getChildren();
-        $this->assertEquals(1,count($children));
+        $this->assertEquals(1, count($children));
 
         $this->assertTrue($children[0] instanceof CalendarObject);
 
@@ -145,11 +142,11 @@ class CalendarTest extends \PHPUnit_Framework_TestCase {
 
     function testCreateFile() {
 
-        $file = fopen('php://memory','r+');
-        fwrite($file,TestUtil::getTestCalendarData());
+        $file = fopen('php://memory', 'r+');
+        fwrite($file, TestUtil::getTestCalendarData());
         rewind($file);
 
-        $this->calendar->createFile('hello',$file);
+        $this->calendar->createFile('hello', $file);
 
         $file = $this->calendar->getChild('hello');
         $this->assertTrue($file instanceof CalendarObject);
@@ -158,12 +155,12 @@ class CalendarTest extends \PHPUnit_Framework_TestCase {
 
     function testCreateFileNoSupportedComponents() {
 
-        $file = fopen('php://memory','r+');
-        fwrite($file,TestUtil::getTestCalendarData());
+        $file = fopen('php://memory', 'r+');
+        fwrite($file, TestUtil::getTestCalendarData());
         rewind($file);
 
         $calendar = new Calendar($this->backend, $this->calendars[1]);
-        $calendar->createFile('hello',$file);
+        $calendar->createFile('hello', $file);
 
         $file = $calendar->getChild('hello');
         $this->assertTrue($file instanceof CalendarObject);
@@ -180,7 +177,7 @@ class CalendarTest extends \PHPUnit_Framework_TestCase {
 
     function testGetOwner() {
 
-        $this->assertEquals('principals/user1',$this->calendar->getOwner());
+        $this->assertEquals('principals/user1', $this->calendar->getOwner());
 
     }
 
@@ -192,98 +189,68 @@ class CalendarTest extends \PHPUnit_Framework_TestCase {
 
     function testGetACL() {
 
-        $expected = array(
-            array(
+        $expected = [
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user1',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user1/calendar-proxy-write',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user1/calendar-proxy-read',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
                 'principal' => '{DAV:}authenticated',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}write',
                 'principal' => 'principals/user1',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}write',
                 'principal' => 'principals/user1/calendar-proxy-write',
                 'protected' => true,
-            ),
-        );
+            ],
+        ];
         $this->assertEquals($expected, $this->calendar->getACL());
 
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\MethodNotAllowed
+     * @expectedException \Sabre\DAV\Exception\Forbidden
      */
     function testSetACL() {
 
-        $this->calendar->setACL(array());
-
-    }
-
-    function testGetSupportedPrivilegesSet() {
-
-        $result = $this->calendar->getSupportedPrivilegeSet();
-
-        $this->assertEquals(
-            '{' . Plugin::NS_CALDAV . '}read-free-busy',
-            $result['aggregates'][0]['aggregates'][2]['privilege']
-        );
+        $this->calendar->setACL([]);
 
     }
 
     function testGetSyncToken() {
 
-        $this->assertEquals(2, $this->calendar->getSyncToken());
-
-    }
-    function testGetSyncToken2() {
-
-        $calendar = new Calendar(new Backend\Mock([],[]), [
-            '{DAV:}sync-token' => 2
-        ]);
-        $this->assertEquals(2, $this->calendar->getSyncToken());
+        $this->assertNull($this->calendar->getSyncToken());
 
     }
 
     function testGetSyncTokenNoSyncSupport() {
 
-        $calendar = new Calendar(new Backend\Mock([],[]), []);
+        $calendar = new Calendar(new Backend\Mock([], []), []);
         $this->assertNull($calendar->getSyncToken());
 
     }
 
     function testGetChanges() {
 
-        $this->assertEquals([
-            'syncToken' => 2,
-            'modified'  => [],
-            'deleted'   => [],
-            'added'     => ['UUID-2345'],
-        ], $this->calendar->getChanges(1, 1));
+        $this->assertNull($this->calendar->getChanges(1, 1));
 
     }
 
-    function testGetChangesNoSyncSupport() {
-
-        $calendar = new Calendar(new Backend\Mock([],[]), []);
-        $this->assertNull($calendar->getChanges(1,null));
-
-    }
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
index b64fb122a..3a22e03d4 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
@@ -19,18 +19,18 @@ class ExpandEventsDoubleEventsTest extends \Sabre\DAVServerTest {
 
     protected $setupCalDAV = true;
 
-    protected $caldavCalendars = array(
-        array(
-            'id' => 1,
-            'name' => 'Calendar',
+    protected $caldavCalendars = [
+        [
+            'id'           => 1,
+            'name'         => 'Calendar',
             'principaluri' => 'principals/user1',
-            'uri' => 'calendar1',
-        )
-    );
+            'uri'          => 'calendar1',
+        ]
+    ];
 
-    protected $caldavCalendarObjects = array(
-        1 => array(
-           'event.ics' => array(
+    protected $caldavCalendarObjects = [
+        1 => [
+           'event.ics' => [
                 'calendardata' => 'BEGIN:VCALENDAR
 VERSION:2.0
 BEGIN:VEVENT
@@ -50,17 +50,17 @@ RECURRENCE-ID;TZID=Europe/Berlin:20120208T181500
 END:VEVENT
 END:VCALENDAR
 ',
-            ),
-        ),
-    );
+            ],
+        ],
+    ];
 
     function testExpand() {
 
         $request = HTTP\Sapi::createFromServerArray([
-            'REQUEST_METHOD' => 'REPORT',
+            'REQUEST_METHOD'    => 'REPORT',
             'HTTP_CONTENT_TYPE' => 'application/xml',
-            'REQUEST_URI' => '/calendars/user1/calendar1',
-            'HTTP_DEPTH' => '1',
+            'REQUEST_URI'       => '/calendars/user1/calendar1',
+            'HTTP_DEPTH'        => '1',
         ]);
 
         $request->setBody('<?xml version="1.0" encoding="utf-8" ?>
@@ -88,12 +88,12 @@ END:VCALENDAR
             $start = strpos($response->body, 'BEGIN:VCALENDAR'),
             strpos($response->body, 'END:VCALENDAR') - $start + 13
         );
-        $body = str_replace('&#13;','',$body);
+        $body = str_replace('&#13;', '', $body);
 
         $vObject = VObject\Reader::read($body);
 
         // We only expect 3 events
-        $this->assertEquals(3, count($vObject->VEVENT),'We got 6 events instead of 3. Output: ' . $body);
+        $this->assertEquals(3, count($vObject->VEVENT), 'We got 6 events instead of 3. Output: ' . $body);
 
         // TZID should be gone
         $this->assertFalse(isset($vObject->VEVENT->DTSTART['TZID']));
@@ -101,4 +101,3 @@ END:VCALENDAR
     }
 
 }
-
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php
index 84f05f3c0..7a756774f 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php
@@ -3,7 +3,6 @@
 namespace Sabre\CalDAV;
 
 use Sabre\DAV;
-use Sabre\DAVACL;
 use Sabre\HTTP;
 
 require_once 'Sabre/CalDAV/Backend/Mock.php';
@@ -31,8 +30,8 @@ END:VEVENT
 END:VCALENDAR
 ics;
 
-        $obj2 = fopen('php://memory','r+');
-        fwrite($obj2,<<<ics
+        $obj2 = fopen('php://memory', 'r+');
+        fwrite($obj2, <<<ics
 BEGIN:VCALENDAR
 BEGIN:VEVENT
 DTSTART:20121005T120000Z
@@ -55,18 +54,18 @@ ics;
         $calendarData = [
             1 => [
                 'obj1' => [
-                    'calendarid' => 1,
-                    'uri' => 'event1.ics',
+                    'calendarid'   => 1,
+                    'uri'          => 'event1.ics',
                     'calendardata' => $obj1,
                 ],
                 'obj2' => [
-                    'calendarid' => 1,
-                    'uri' => 'event2.ics',
+                    'calendarid'   => 1,
+                    'uri'          => 'event2.ics',
                     'calendardata' => $obj2
                 ],
                 'obj3' => [
-                    'calendarid' => 1,
-                    'uri' => 'event3.ics',
+                    'calendarid'   => 1,
+                    'uri'          => 'event3.ics',
                     'calendardata' => $obj3
                 ]
             ],
@@ -76,9 +75,9 @@ ics;
         $caldavBackend = new Backend\Mock([], $calendarData);
 
         $calendar = new Calendar($caldavBackend, [
-            'id' => 1,
-            'uri' => 'calendar',
-            'principaluri' => 'principals/user1',
+            'id'                                           => 1,
+            'uri'                                          => 'calendar',
+            'principaluri'                                 => 'principals/user1',
             '{' . Plugin::NS_CALDAV . '}calendar-timezone' => "BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nEND:VTIMEZONE\r\nEND:VCALENDAR",
         ]);
 
@@ -105,13 +104,13 @@ ics;
 XML;
 
         $report = $this->server->xml->parse($reportXML, null, $rootElem);
-        $this->plugin->report($rootElem, $report);
+        $this->plugin->report($rootElem, $report, null);
 
         $this->assertEquals(200, $this->server->httpResponse->status);
         $this->assertEquals('text/calendar', $this->server->httpResponse->getHeader('Content-Type'));
-        $this->assertTrue(strpos($this->server->httpResponse->body, 'BEGIN:VFREEBUSY')!==false);
-        $this->assertTrue(strpos($this->server->httpResponse->body, '20111005T120000Z/20111005T130000Z')!==false);
-        $this->assertTrue(strpos($this->server->httpResponse->body, '20111006T100000Z/20111006T110000Z')!==false);
+        $this->assertTrue(strpos($this->server->httpResponse->body, 'BEGIN:VFREEBUSY') !== false);
+        $this->assertTrue(strpos($this->server->httpResponse->body, '20111005T120000Z/20111005T130000Z') !== false);
+        $this->assertTrue(strpos($this->server->httpResponse->body, '20111006T100000Z/20111006T110000Z') !== false);
 
     }
 
@@ -127,7 +126,6 @@ XML;
 XML;
 
         $report = $this->server->xml->parse($reportXML, null, $rootElem);
-        $this->plugin->report($rootElem, $report);
 
     }
 
@@ -136,9 +134,9 @@ XML;
      */
     function testFreeBusyReportWrongNode() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_URI' => '/',
-        ));
+        ]);
         $this->server->httpRequest = $request;
 
         $reportXML = <<<XML
@@ -149,7 +147,7 @@ XML;
 XML;
 
         $report = $this->server->xml->parse($reportXML, null, $rootElem);
-        $this->plugin->report($rootElem, $report);
+        $this->plugin->report($rootElem, $report, null);
 
     }
 
@@ -170,7 +168,7 @@ XML;
 XML;
 
         $report = $this->server->xml->parse($reportXML, null, $rootElem);
-        $this->plugin->report($rootElem, $report);
+        $this->plugin->report($rootElem, $report, null);
 
     }
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
index c3c97e8f6..5fd8d29a1 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
@@ -75,7 +75,7 @@ END:VCALENDAR
 
         $response = $this->request($request);
 
-        $this->assertTrue(strpos($response->body, 'BEGIN:VCALENDAR')!==false);
+        $this->assertTrue(strpos($response->body, 'BEGIN:VCALENDAR') !== false);
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php
index c123bd0c1..9719529fb 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php
@@ -7,657 +7,380 @@ use Sabre\HTTP;
 use Sabre\VObject;
 use Sabre\DAVACL;
 
-require_once 'Sabre/CalDAV/TestUtil.php';
-require_once 'Sabre/HTTP/ResponseMock.php';
+class ICSExportPluginTest extends \Sabre\DAVServerTest {
 
-class ICSExportPluginTest extends \PHPUnit_Framework_TestCase {
+    protected $setupCalDAV = true;
+
+    protected $icsExportPlugin;
 
     function setUp() {
 
-        if (!SABRE_HASSQLITE) $this->markTestSkipped('SQLite driver is not available');
+        parent::setUp();
+        $this->icsExportPlugin = new ICSExportPlugin();
+        $this->server->addPlugin(
+            $this->icsExportPlugin
+        );
+
+        $id = $this->caldavBackend->createCalendar(
+            'principals/admin',
+            'UUID-123467',
+            [
+                '{DAV:}displayname'                         => 'Hello!',
+                '{http://apple.com/ns/ical/}calendar-color' => '#AA0000FF',
+            ]
+        );
+
+        $this->caldavBackend->createCalendarObject(
+            $id,
+            'event-1',
+            <<<ICS
+BEGIN:VCALENDAR
+BEGIN:VTIMEZONE
+TZID:Europe/Amsterdam
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:event-1
+DTSTART;TZID=Europe/Amsterdam:20151020T000000
+END:VEVENT
+END:VCALENDAR
+ICS
+        );
+        $this->caldavBackend->createCalendarObject(
+            $id,
+            'todo-1',
+            <<<ICS
+BEGIN:VCALENDAR
+BEGIN:VTODO
+UID:todo-1
+END:VTODO
+END:VCALENDAR
+ICS
+        );
+
 
     }
 
     function testInit() {
 
-        $p = new ICSExportPlugin();
-        $s = new DAV\Server();
-        $s->addPlugin($p);
-        $this->assertEquals($p, $s->getPlugin('ics-export'));
-        $this->assertEquals('ics-export', $p->getPluginInfo()['name']);
+        $this->assertEquals(
+            $this->icsExportPlugin,
+            $this->server->getPlugin('ics-export')
+        );
+        $this->assertEquals($this->icsExportPlugin, $this->server->getPlugin('ics-export'));
+        $this->assertEquals('ics-export', $this->icsExportPlugin->getPluginInfo()['name']);
 
     }
 
     function testBeforeMethod() {
 
-        $cbackend = TestUtil::getBackend();
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export'
+        );
 
-        $props = [
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
-            '{DAV:}displayname' => 'Hello!',
-            '{http://apple.com/ns/ical/}calendar-color' => '#AA0000FF',
-        ];
-        $tree = [
-            new Calendar($cbackend,$props),
-        ];
+        $response = $this->request($request);
 
-        $p = new ICSExportPlugin();
+        $this->assertEquals(200, $response->getStatus());
+        $this->assertEquals('text/calendar', $response->getHeader('Content-Type'));
 
-        $s = new DAV\Server($tree);
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
+        $obj = VObject\Reader::read($response->body);
 
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $this->assertFalse($p->httpGet($h, $s->httpResponse));
-
-        $this->assertEquals(200, $s->httpResponse->status);
-        $this->assertEquals([
-            'Content-Type' => ['text/calendar'],
-        ], $s->httpResponse->getHeaders());
-
-        $obj = VObject\Reader::read($s->httpResponse->body);
-
-        $this->assertEquals(7,count($obj->children()));
-        $this->assertEquals(1,count($obj->VERSION));
-        $this->assertEquals(1,count($obj->CALSCALE));
-        $this->assertEquals(1,count($obj->PRODID));
-        $this->assertTrue(strpos((string)$obj->PRODID, DAV\Version::VERSION)!==false);
-        $this->assertEquals(1,count($obj->VTIMEZONE));
-        $this->assertEquals(1,count($obj->VEVENT));
+        $this->assertEquals(8, count($obj->children()));
+        $this->assertEquals(1, count($obj->VERSION));
+        $this->assertEquals(1, count($obj->CALSCALE));
+        $this->assertEquals(1, count($obj->PRODID));
+        $this->assertTrue(strpos((string)$obj->PRODID, DAV\Version::VERSION) !== false);
+        $this->assertEquals(1, count($obj->VTIMEZONE));
+        $this->assertEquals(1, count($obj->VEVENT));
         $this->assertEquals("Hello!", $obj->{"X-WR-CALNAME"});
         $this->assertEquals("#AA0000FF", $obj->{"X-APPLE-CALENDAR-COLOR"});
 
     }
     function testBeforeMethodNoVersion() {
 
-        if (!SABRE_HASSQLITE) $this->markTestSkipped('SQLite driver is not available');
-        $cbackend = TestUtil::getBackend();
-
-        $props = [
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
-        ];
-        $tree = [
-            new Calendar($cbackend,$props),
-        ];
-
-        $p = new ICSExportPlugin();
-
-        $s = new DAV\Server($tree);
-
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export'
+        );
         DAV\Server::$exposeVersion = false;
-        $this->assertFalse($p->httpGet($h, $s->httpResponse));
+        $response = $this->request($request);
         DAV\Server::$exposeVersion = true;
 
-        $this->assertEquals(200, $s->httpResponse->status);
-        $this->assertEquals([
-            'Content-Type' => ['text/calendar'],
-        ], $s->httpResponse->getHeaders());
+        $this->assertEquals(200, $response->getStatus());
+        $this->assertEquals('text/calendar', $response->getHeader('Content-Type'));
 
-        $obj = VObject\Reader::read($s->httpResponse->body);
+        $obj = VObject\Reader::read($response->body);
 
-        $this->assertEquals(5,count($obj->children()));
-        $this->assertEquals(1,count($obj->VERSION));
-        $this->assertEquals(1,count($obj->CALSCALE));
-        $this->assertEquals(1,count($obj->PRODID));
-        $this->assertFalse(strpos((string)$obj->PRODID, DAV\Version::VERSION)!==false);
-        $this->assertEquals(1,count($obj->VTIMEZONE));
-        $this->assertEquals(1,count($obj->VEVENT));
+        $this->assertEquals(8, count($obj->children()));
+        $this->assertEquals(1, count($obj->VERSION));
+        $this->assertEquals(1, count($obj->CALSCALE));
+        $this->assertEquals(1, count($obj->PRODID));
+        $this->assertFalse(strpos((string)$obj->PRODID, DAV\Version::VERSION) !== false);
+        $this->assertEquals(1, count($obj->VTIMEZONE));
+        $this->assertEquals(1, count($obj->VEVENT));
 
     }
 
     function testBeforeMethodNoExport() {
 
-        $p = new ICSExportPlugin();
-
-        $s = new DAV\Server();
-        $s->addPlugin($p);
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-        $this->assertNull($p->httpGet($h, $s->httpResponse));
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467'
+        );
+        $response = new HTTP\Response();
+        $this->assertNull($this->icsExportPlugin->httpGet($request, $response));
 
     }
 
     function testACLIntegrationBlocked() {
 
-        $cbackend = TestUtil::getBackend();
-
-        $props = array(
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
-        );
-        $tree = array(
-            new Calendar($cbackend,$props),
+        $aclPlugin = new DAVACL\Plugin();
+        $aclPlugin->allowUnauthenticatedAccess = false;
+        $this->server->addPlugin(
+            $aclPlugin
         );
 
-        $p = new ICSExportPlugin();
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export'
+        );
 
-        $s = new DAV\Server($tree);
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-        $s->addPlugin(new DAVACL\Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $p->httpGet($h, $s->httpResponse);
-
-        // If the ACL system blocked this request, the effect will be that
-        // there's no response, because the calendar information could not be
-        // fetched.
-        $this->assertNull($s->httpResponse->getStatus());
+        $this->request($request, 403);
 
     }
 
     function testACLIntegrationNotBlocked() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
-
-        $props = array(
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
+        $aclPlugin = new DAVACL\Plugin();
+        $aclPlugin->allowUnauthenticatedAccess = false;
+        $this->server->addPlugin(
+            $aclPlugin
         );
-        $tree = array(
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
+        $this->server->addPlugin(
+            new Plugin()
         );
 
-        $p = new ICSExportPlugin();
+        $this->autoLogin('admin');
 
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-        $s->addPlugin(new DAVACL\Plugin());
-        $s->addPlugin(new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock(),'SabreDAV'));
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export'
+        );
 
-        // Forcing login
-        $s->getPlugin('acl')->adminPrincipals = array('principals/admin');
+        $response = $this->request($request, 200);
+        $this->assertEquals('text/calendar', $response->getHeader('Content-Type'));
 
+        $obj = VObject\Reader::read($response->body);
 
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
-        $this->assertEquals(array(
-            'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['text/calendar'],
-        ), $s->httpResponse->getHeaders());
-
-        $obj = VObject\Reader::read($s->httpResponse->body);
-
-        $this->assertEquals(5,count($obj->children()));
-        $this->assertEquals(1,count($obj->VERSION));
-        $this->assertEquals(1,count($obj->CALSCALE));
-        $this->assertEquals(1,count($obj->PRODID));
-        $this->assertEquals(1,count($obj->VTIMEZONE));
-        $this->assertEquals(1,count($obj->VEVENT));
+        $this->assertEquals(8, count($obj->children()));
+        $this->assertEquals(1, count($obj->VERSION));
+        $this->assertEquals(1, count($obj->CALSCALE));
+        $this->assertEquals(1, count($obj->PRODID));
+        $this->assertTrue(strpos((string)$obj->PRODID, DAV\Version::VERSION) !== false);
+        $this->assertEquals(1, count($obj->VTIMEZONE));
+        $this->assertEquals(1, count($obj->VEVENT));
 
     }
 
     function testBadStartParam() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
-
-        $props = array(
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export&start=foo'
         );
-        $tree = array(
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
-        );
-
-        $p = new ICSExportPlugin();
-
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export&start=foo',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(400, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+        $this->request($request, 400);
 
     }
 
     function testBadEndParam() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
-
-        $props = array(
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export&end=foo'
         );
-        $tree = array(
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
-        );
-
-        $p = new ICSExportPlugin();
-
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export&end=foo',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(400, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+        $this->request($request, 400);
 
     }
 
     function testFilterStartEnd() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
-
-        $props = array(
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
-        );
-        $tree = array(
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export&start=1&end=2'
         );
+        $response = $this->request($request, 200);
 
-        $p = new ICSExportPlugin();
+        $obj = VObject\Reader::read($response->getBody());
 
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export&start=1&end=2',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
-        $obj = VObject\Reader::read($s->httpResponse->body);
-
-        $this->assertEquals(0,count($obj->VTIMEZONE));
-        $this->assertEquals(0,count($obj->VEVENT));
+        $this->assertEquals(0, count($obj->VTIMEZONE));
+        $this->assertEquals(0, count($obj->VEVENT));
 
     }
 
     function testExpandNoStart() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
-
-        $props = array(
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export&expand=1&end=2'
         );
-        $tree = array(
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
-        );
-
-        $p = new ICSExportPlugin();
-
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export&expand=1&end=1',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(400, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+        $this->request($request, 400);
 
     }
 
     function testExpand() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
-
-        $props = array(
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
-        );
-        $tree = array(
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export&start=1&end=2000000000&expand=1'
         );
+        $response = $this->request($request, 200);
 
-        $p = new ICSExportPlugin();
+        $obj = VObject\Reader::read($response->getBody());
 
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export&start=1&end=2000000000&expand=1',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
-        $obj = VObject\Reader::read($s->httpResponse->body);
-
-        $this->assertEquals(0,count($obj->VTIMEZONE));
-        $this->assertEquals(1,count($obj->VEVENT));
+        $this->assertEquals(0, count($obj->VTIMEZONE));
+        $this->assertEquals(1, count($obj->VEVENT));
 
     }
 
     function testJCal() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
-
-        $props = array(
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
-        );
-        $tree = array(
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export',
+            ['Accept' => 'application/calendar+json']
         );
 
-        $p = new ICSExportPlugin();
-
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export',
-            'REQUEST_METHOD' => 'GET',
-            'HTTP_ACCEPT' => 'application/calendar+json',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
-        $this->assertEquals('application/calendar+json', $s->httpResponse->getHeader('Content-Type'));
+        $response = $this->request($request, 200);
+        $this->assertEquals('application/calendar+json', $response->getHeader('Content-Type'));
 
     }
 
     function testJCalInUrl() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
-
-        $props = array(
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
-        );
-        $tree = array(
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export&accept=jcal'
         );
 
-        $p = new ICSExportPlugin();
-
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export&accept=jcal',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
-        $this->assertEquals('application/calendar+json', $s->httpResponse->getHeader('Content-Type'));
+        $response = $this->request($request, 200);
+        $this->assertEquals('application/calendar+json', $response->getHeader('Content-Type'));
 
     }
 
     function testNegotiateDefault() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
-
-        $props = array(
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
-        );
-        $tree = array(
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export',
+            ['Accept' => 'text/plain']
         );
 
-        $p = new ICSExportPlugin();
-
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export',
-            'REQUEST_METHOD' => 'GET',
-            'HTTP_ACCEPT' => 'text/plain',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
-        $this->assertEquals('text/calendar', $s->httpResponse->getHeader('Content-Type'));
+        $response = $this->request($request, 200);
+        $this->assertEquals('text/calendar', $response->getHeader('Content-Type'));
 
     }
 
     function testFilterComponentVEVENT() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
-
-        $props = array(
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
-        );
-        // add a todo to the calendar (see /tests/Sabre/TestUtil)
-        $cbackend->createCalendarObject(1, 'UUID-3456', TestUtil::getTestTODO());
-
-        $tree = array(
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export&componentType=VEVENT'
         );
 
-        $p = new ICSExportPlugin();
+        $response = $this->request($request, 200);
 
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export&componentType=VEVENT',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
-        $obj = VObject\Reader::read($s->httpResponse->body);
-
-        $this->assertEquals(1,count($obj->VTIMEZONE));
-        $this->assertEquals(1,count($obj->VEVENT));
-        $this->assertEquals(0,count($obj->VTODO));
+        $obj = VObject\Reader::read($response->body);
+        $this->assertEquals(1, count($obj->VTIMEZONE));
+        $this->assertEquals(1, count($obj->VEVENT));
+        $this->assertEquals(0, count($obj->VTODO));
 
     }
 
     function testFilterComponentVTODO() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export&componentType=VTODO'
+        );
 
-        $props = [
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
-        ];
-        // add a todo to the calendar (see /tests/Sabre/TestUtil)
-        $cbackend->createCalendarObject(1, 'UUID-3456', TestUtil::getTestTODO());
+        $response = $this->request($request, 200);
 
-        $tree = [
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
-        ];
+        $obj = VObject\Reader::read($response->body);
 
-        $p = new ICSExportPlugin();
-
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export&componentType=VTODO',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(200, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
-        $obj = VObject\Reader::read($s->httpResponse->body);
-
-        $this->assertEquals(0,count($obj->VTIMEZONE));
-        $this->assertEquals(0,count($obj->VEVENT));
-        $this->assertEquals(1,count($obj->VTODO));
+        $this->assertEquals(0, count($obj->VTIMEZONE));
+        $this->assertEquals(0, count($obj->VEVENT));
+        $this->assertEquals(1, count($obj->VTODO));
 
     }
 
     function testFilterComponentBadComponent() {
 
-        $cbackend = TestUtil::getBackend();
-        $pbackend = new DAVACL\PrincipalBackend\Mock();
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export&componentType=VVOODOO'
+        );
 
-        $props = [
-            'uri'=>'UUID-123467',
-            'principaluri' => 'admin',
-            'id' => 1,
-        ];
-        // add a todo to the calendar (see /tests/Sabre/TestUtil)
-        $cbackend->createCalendarObject(1, 'UUID-3456', TestUtil::getTestTODO());
-
-        $tree = [
-            new Calendar($cbackend,$props),
-            new DAVACL\PrincipalCollection($pbackend),
-        ];
-
-        $p = new ICSExportPlugin();
-
-        $s = new DAV\Server($tree);
-        $s->sapi = new HTTP\SapiMock();
-        $s->addPlugin($p);
-        $s->addPlugin(new Plugin());
-
-        $h = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/UUID-123467?export&componentType=VVOODOO',
-            'REQUEST_METHOD' => 'GET',
-        ]);
-
-        $s->httpRequest = $h;
-        $s->httpResponse = new HTTP\ResponseMock();
-
-        $s->exec();
-
-        $this->assertEquals(400, $s->httpResponse->status,'Invalid status received. Response body: '. $s->httpResponse->body);
+        $response = $this->request($request, 400);
 
     }
+
+    function testContentDisposition() {
+
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export'
+        );
+
+        $response = $this->request($request, 200);
+        $this->assertEquals('text/calendar', $response->getHeader('Content-Type'));
+        $this->assertEquals(
+            'attachment; filename="UUID-123467-' . date('Y-m-d') . '.ics"',
+            $response->getHeader('Content-Disposition')
+        );
+
+    }
+
+    function testContentDispositionJson() {
+
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-123467?export',
+            ['Accept' => 'application/calendar+json']
+        );
+
+        $response = $this->request($request, 200);
+        $this->assertEquals('application/calendar+json', $response->getHeader('Content-Type'));
+        $this->assertEquals(
+            'attachment; filename="UUID-123467-' . date('Y-m-d') . '.json"',
+            $response->getHeader('Content-Disposition')
+        );
+
+    }
+
+    function testContentDispositionBadChars() {
+
+        $this->caldavBackend->createCalendar(
+            'principals/admin',
+            'UUID-b_ad"(ch)ars',
+            [
+                '{DAV:}displayname'                         => 'Test bad characters',
+                '{http://apple.com/ns/ical/}calendar-color' => '#AA0000FF',
+            ]
+        );
+
+        $request = new HTTP\Request(
+            'GET',
+            '/calendars/admin/UUID-b_ad"(ch)ars?export',
+            ['Accept' => 'application/calendar+json']
+        );
+
+        $response = $this->request($request, 200);
+        $this->assertEquals('application/calendar+json', $response->getHeader('Content-Type'));
+        $this->assertEquals(
+            'attachment; filename="UUID-b_adchars-' . date('Y-m-d') . '.json"',
+            $response->getHeader('Content-Disposition')
+        );
+
+    }
+
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue166Test.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue166Test.php
index f925224f2..a1a9b7c04 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue166Test.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue166Test.php
@@ -1,8 +1,8 @@
 <?php
 
 namespace Sabre\CalDAV;
+
 use Sabre\VObject;
-use Sabre\DAV;
 
 class Issue166Test extends \PHPUnit_Framework_TestCase {
 
@@ -37,26 +37,26 @@ HI;
 
         $validator = new CalendarQueryValidator();
 
-        $filters = array(
-            'name' => 'VCALENDAR',
-            'comp-filters' => array(
-                array(
-                    'name' => 'VEVENT',
-                    'comp-filters' => array(),
-                    'prop-filters' => array(),
+        $filters = [
+            'name'         => 'VCALENDAR',
+            'comp-filters' => [
+                [
+                    'name'           => 'VEVENT',
+                    'comp-filters'   => [],
+                    'prop-filters'   => [],
                     'is-not-defined' => false,
-                    'time-range' => array(
+                    'time-range'     => [
                         'start' => new \DateTime('2011-12-01'),
                         'end'   => new \DateTime('2012-02-01'),
-                    ),
-                ),
-            ),
-            'prop-filters' => array(),
+                    ],
+                ],
+            ],
+            'prop-filters'   => [],
             'is-not-defined' => false,
-            'time-range' => null,
-        );
+            'time-range'     => null,
+        ];
         $input = VObject\Reader::read($input);
-        $this->assertTrue($validator->validate($input,$filters));
+        $this->assertTrue($validator->validate($input, $filters));
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue172Test.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue172Test.php
index ce6d364f6..e2b85c2bc 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue172Test.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue172Test.php
@@ -1,8 +1,8 @@
 <?php
 
 namespace Sabre\CalDAV;
+
 use Sabre\VObject;
-use Sabre\DAV;
 
 class Issue172Test extends \PHPUnit_Framework_TestCase {
 
@@ -18,24 +18,24 @@ END:VEVENT
 END:VCALENDAR
 HI;
         $validator = new CalendarQueryValidator();
-        $filters = array(
-            'name' => 'VCALENDAR',
-            'comp-filters' => array(
-                array(
-                    'name' => 'VEVENT',
-                    'comp-filters' => array(),
-                    'prop-filters' => array(),
+        $filters = [
+            'name'         => 'VCALENDAR',
+            'comp-filters' => [
+                [
+                    'name'           => 'VEVENT',
+                    'comp-filters'   => [],
+                    'prop-filters'   => [],
                     'is-not-defined' => false,
-                    'time-range' => array(
+                    'time-range'     => [
                         'start' => new \DateTime('2012-01-18 21:00:00 GMT-08:00'),
                         'end'   => new \DateTime('2012-01-18 21:00:00 GMT-08:00'),
-                    ),
-                ),
-            ),
-            'prop-filters' => array(),
-        );
+                    ],
+                ],
+            ],
+            'prop-filters' => [],
+        ];
         $input = VObject\Reader::read($input);
-        $this->assertTrue($validator->validate($input,$filters));
+        $this->assertTrue($validator->validate($input, $filters));
     }
 
     // Pacific Standard Time, translates to America/Los_Angeles (GMT-8 in January)
@@ -65,24 +65,24 @@ END:VEVENT
 END:VCALENDAR
 HI;
         $validator = new CalendarQueryValidator();
-        $filters = array(
-            'name' => 'VCALENDAR',
-            'comp-filters' => array(
-                array(
-                    'name' => 'VEVENT',
-                    'comp-filters' => array(),
-                    'prop-filters' => array(),
+        $filters = [
+            'name'         => 'VCALENDAR',
+            'comp-filters' => [
+                [
+                    'name'           => 'VEVENT',
+                    'comp-filters'   => [],
+                    'prop-filters'   => [],
                     'is-not-defined' => false,
-                    'time-range' => array(
+                    'time-range'     => [
                         'start' => new \DateTime('2012-01-13 10:30:00 GMT-08:00'),
                         'end'   => new \DateTime('2012-01-13 10:30:00 GMT-08:00'),
-                    ),
-                ),
-            ),
-            'prop-filters' => array(),
-        );
+                    ],
+                ],
+            ],
+            'prop-filters' => [],
+        ];
         $input = VObject\Reader::read($input);
-        $this->assertTrue($validator->validate($input,$filters));
+        $this->assertTrue($validator->validate($input, $filters));
     }
 
     // X-LIC-LOCATION, translates to America/Los_Angeles (GMT-8 in January)
@@ -113,23 +113,23 @@ END:VEVENT
 END:VCALENDAR
 HI;
         $validator = new CalendarQueryValidator();
-        $filters = array(
-            'name' => 'VCALENDAR',
-            'comp-filters' => array(
-                array(
-                    'name' => 'VEVENT',
-                    'comp-filters' => array(),
-                    'prop-filters' => array(),
+        $filters = [
+            'name'         => 'VCALENDAR',
+            'comp-filters' => [
+                [
+                    'name'           => 'VEVENT',
+                    'comp-filters'   => [],
+                    'prop-filters'   => [],
                     'is-not-defined' => false,
-                    'time-range' => array(
+                    'time-range'     => [
                         'start' => new \DateTime('2012-01-13 10:30:00 GMT-08:00'),
                         'end'   => new \DateTime('2012-01-13 10:30:00 GMT-08:00'),
-                    ),
-                ),
-            ),
-            'prop-filters' => array(),
-        );
+                    ],
+                ],
+            ],
+            'prop-filters' => [],
+        ];
         $input = VObject\Reader::read($input);
-        $this->assertTrue($validator->validate($input,$filters));
+        $this->assertTrue($validator->validate($input, $filters));
     }
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php
index 4a53fcbe2..ce40a90b0 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\CalDAV;
+
 use Sabre\HTTP;
 use Sabre\VObject;
 
@@ -15,18 +16,18 @@ class Issue205Test extends \Sabre\DAVServerTest {
 
     protected $setupCalDAV = true;
 
-    protected $caldavCalendars = array(
-        array(
-            'id' => 1,
-            'name' => 'Calendar',
+    protected $caldavCalendars = [
+        [
+            'id'           => 1,
+            'name'         => 'Calendar',
             'principaluri' => 'principals/user1',
-            'uri' => 'calendar1',
-        )
-    );
+            'uri'          => 'calendar1',
+        ]
+    ];
 
-    protected $caldavCalendarObjects = array(
-        1 => array(
-            'event.ics' => array(
+    protected $caldavCalendarObjects = [
+        1 => [
+            'event.ics' => [
                 'calendardata' => 'BEGIN:VCALENDAR
 VERSION:2.0
 BEGIN:VEVENT
@@ -44,18 +45,18 @@ END:VALARM
 END:VEVENT
 END:VCALENDAR
 ',
-            ),
-        ),
-    );
+            ],
+        ],
+    ];
 
     function testIssue205() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'REPORT',
+        $request = HTTP\Sapi::createFromServerArray([
+            'REQUEST_METHOD'    => 'REPORT',
             'HTTP_CONTENT_TYPE' => 'application/xml',
-            'REQUEST_URI' => '/calendars/user1/calendar1',
-            'HTTP_DEPTH' => '1',
-        ));
+            'REQUEST_URI'       => '/calendars/user1/calendar1',
+            'HTTP_DEPTH'        => '1',
+        ]);
 
         $request->setBody('<?xml version="1.0" encoding="utf-8" ?>
 <C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
@@ -87,7 +88,7 @@ END:VCALENDAR
             $start = strpos($response->body, 'BEGIN:VCALENDAR'),
             strpos($response->body, 'END:VCALENDAR') - $start + 13
         );
-        $body = str_replace('&#13;','',$body);
+        $body = str_replace('&#13;', '', $body);
 
         $vObject = VObject\Reader::read($body);
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php
index f291e5e57..950629fd8 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php
@@ -1,8 +1,8 @@
 <?php
 
 namespace Sabre\CalDAV;
+
 use Sabre\HTTP;
-use Sabre\VObject;
 
 /**
  * This unittest is created to check for an endless loop in Sabre\CalDAV\CalendarQueryValidator
@@ -15,18 +15,18 @@ class Issue211Test extends \Sabre\DAVServerTest {
 
     protected $setupCalDAV = true;
 
-    protected $caldavCalendars = array(
-        array(
-            'id' => 1,
-            'name' => 'Calendar',
+    protected $caldavCalendars = [
+        [
+            'id'           => 1,
+            'name'         => 'Calendar',
             'principaluri' => 'principals/user1',
-            'uri' => 'calendar1',
-        )
-    );
+            'uri'          => 'calendar1',
+        ]
+    ];
 
-    protected $caldavCalendarObjects = array(
-        1 => array(
-            'event.ics' => array(
+    protected $caldavCalendarObjects = [
+        1 => [
+            'event.ics' => [
                 'calendardata' => 'BEGIN:VCALENDAR
 VERSION:2.0
 BEGIN:VEVENT
@@ -49,18 +49,18 @@ END:VALARM
 END:VEVENT
 END:VCALENDAR
 ',
-            ),
-        ),
-    );
+            ],
+        ],
+    ];
 
     function testIssue211() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'REPORT',
+        $request = HTTP\Sapi::createFromServerArray([
+            'REQUEST_METHOD'    => 'REPORT',
             'HTTP_CONTENT_TYPE' => 'application/xml',
-            'REQUEST_URI' => '/calendars/user1/calendar1',
-            'HTTP_DEPTH' => '1',
-        ));
+            'REQUEST_URI'       => '/calendars/user1/calendar1',
+            'HTTP_DEPTH'        => '1',
+        ]);
 
         $request->setBody('<?xml version="1.0" encoding="utf-8" ?>
 <C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php
index 7b5dbfe63..c3c0b5b48 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php
@@ -15,18 +15,18 @@ class Issue220Test extends \Sabre\DAVServerTest {
 
     protected $setupCalDAV = true;
 
-    protected $caldavCalendars = array(
-        array(
-            'id' => 1,
-            'name' => 'Calendar',
+    protected $caldavCalendars = [
+        [
+            'id'           => 1,
+            'name'         => 'Calendar',
             'principaluri' => 'principals/user1',
-            'uri' => 'calendar1',
-        )
-    );
+            'uri'          => 'calendar1',
+        ]
+    ];
 
-    protected $caldavCalendarObjects = array(
-        1 => array(
-            'event.ics' => array(
+    protected $caldavCalendarObjects = [
+        1 => [
+            'event.ics' => [
                 'calendardata' => 'BEGIN:VCALENDAR
 VERSION:2.0
 BEGIN:VEVENT
@@ -59,18 +59,18 @@ UID:b64f14c5-dccc-4eda-947f-bdb1f763fbcd
 END:VEVENT
 END:VCALENDAR
 ',
-            ),
-        ),
-    );
+            ],
+        ],
+    ];
 
     function testIssue220() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'REPORT',
+        $request = HTTP\Sapi::createFromServerArray([
+            'REQUEST_METHOD'    => 'REPORT',
             'HTTP_CONTENT_TYPE' => 'application/xml',
-            'REQUEST_URI' => '/calendars/user1/calendar1',
-            'HTTP_DEPTH' => '1',
-        ));
+            'REQUEST_URI'       => '/calendars/user1/calendar1',
+            'HTTP_DEPTH'        => '1',
+        ]);
 
         $request->setBody('<?xml version="1.0" encoding="utf-8" ?>
 <C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php
index ccc6b303a..d0783701d 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\CalDAV;
+
 use Sabre\HTTP;
 
 /**
@@ -14,18 +15,18 @@ class Issue228Test extends \Sabre\DAVServerTest {
 
     protected $setupCalDAV = true;
 
-    protected $caldavCalendars = array(
-        array(
-            'id' => 1,
-            'name' => 'Calendar',
+    protected $caldavCalendars = [
+        [
+            'id'           => 1,
+            'name'         => 'Calendar',
             'principaluri' => 'principals/user1',
-            'uri' => 'calendar1',
-        )
-    );
+            'uri'          => 'calendar1',
+        ]
+    ];
 
-    protected $caldavCalendarObjects = array(
-        1 => array(
-            'event.ics' => array(
+    protected $caldavCalendarObjects = [
+        1 => [
+            'event.ics' => [
                 'calendardata' => 'BEGIN:VCALENDAR
 VERSION:2.0
 BEGIN:VEVENT
@@ -38,18 +39,18 @@ TRANSP:TRANSPARENT
 END:VEVENT
 END:VCALENDAR
 ',
-            ),
-        ),
-    );
+            ],
+        ],
+    ];
 
     function testIssue228() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'REPORT',
+        $request = HTTP\Sapi::createFromServerArray([
+            'REQUEST_METHOD'    => 'REPORT',
             'HTTP_CONTENT_TYPE' => 'application/xml',
-            'REQUEST_URI' => '/calendars/user1/calendar1',
-            'HTTP_DEPTH' => '1',
-        ));
+            'REQUEST_URI'       => '/calendars/user1/calendar1',
+            'HTTP_DEPTH'        => '1',
+        ]);
 
         $request->setBody('<?xml version="1.0" encoding="utf-8" ?>
 <C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/CollectionTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
index 68035184f..6585f85c3 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
@@ -14,13 +14,13 @@ class CollectionTest extends \PHPUnit_Framework_TestCase {
 
         $this->principalUri = 'principals/user1';
 
-        $this->notification = new CalDAV\Xml\Notification\SystemStatus(1,'"1"');
+        $this->notification = new CalDAV\Xml\Notification\SystemStatus(1, '"1"');
 
-        $this->caldavBackend = new CalDAV\Backend\MockSharing(array(),array(), array(
-            'principals/user1' => array(
+        $this->caldavBackend = new CalDAV\Backend\MockSharing([], [], [
+            'principals/user1' => [
                 $this->notification
-            )
-        )); 
+            ]
+        ]);
 
         return new Collection($this->caldavBackend, $this->principalUri);
 
@@ -31,9 +31,9 @@ class CollectionTest extends \PHPUnit_Framework_TestCase {
         $col = $this->getInstance();
         $this->assertEquals('notifications', $col->getName());
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             new Node($this->caldavBackend, $this->principalUri, $this->notification)
-        ), $col->getChildren()); 
+        ], $col->getChildren());
 
     }
 
@@ -54,30 +54,25 @@ class CollectionTest extends \PHPUnit_Framework_TestCase {
     function testGetACL() {
 
         $col = $this->getInstance();
-        $expected = array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => $this->principalUri,
+        $expected = [
+            [
+                'privilege' => '{DAV:}all',
+                'principal' => '{DAV:}owner',
                 'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => $this->principalUri,
-                'protected' => true,
-            ),
-        );
+            ],
+        ];
 
         $this->assertEquals($expected, $col->getACL());
 
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\NotImplemented
+     * @expectedException \Sabre\DAV\Exception\Forbidden
      */
     function testSetACL() {
 
         $col = $this->getInstance();
-        $col->setACL(array());
+        $col->setACL([]);
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/NodeTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/NodeTest.php
index d546116fc..6c6e02da8 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/NodeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Notifications/NodeTest.php
@@ -13,7 +13,7 @@ class NodeTest extends \PHPUnit_Framework_TestCase {
 
         $principalUri = 'principals/user1';
 
-        $this->systemStatus = new CalDAV\Xml\Notification\SystemStatus(1,'"1"');
+        $this->systemStatus = new CalDAV\Xml\Notification\SystemStatus(1, '"1"');
 
         $this->caldavBackend = new CalDAV\Backend\MockSharing([], [], [
             'principals/user1' => [
@@ -51,7 +51,7 @@ class NodeTest extends \PHPUnit_Framework_TestCase {
 
         $node = $this->getInstance();
         $node->delete();
-        $this->assertEquals(array(), $this->caldavBackend->getNotificationsForPrincipal('principals/user1'));
+        $this->assertEquals([], $this->caldavBackend->getNotificationsForPrincipal('principals/user1'));
 
     }
 
@@ -65,30 +65,25 @@ class NodeTest extends \PHPUnit_Framework_TestCase {
     function testGetACL() {
 
         $node = $this->getInstance();
-        $expected = array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/user1',
+        $expected = [
+            [
+                'privilege' => '{DAV:}all',
+                'principal' => '{DAV:}owner',
                 'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => 'principals/user1',
-                'protected' => true,
-            ),
-        );
+            ],
+        ];
 
         $this->assertEquals($expected, $node->getACL());
 
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\NotImplemented
+     * @expectedException \Sabre\DAV\Exception\Forbidden
      */
     function testSetACL() {
 
         $node = $this->getInstance();
-        $node->setACL(array());
+        $node->setACL([]);
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php
index 138012ffa..8d538dee5 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/PluginTest.php
@@ -81,12 +81,14 @@ class PluginTest extends \PHPUnit_Framework_TestCase {
         $this->server->addPlugin($this->plugin);
 
         // Adding ACL plugin
-        $this->server->addPlugin(new DAVACL\Plugin());
+        $aclPlugin = new DAVACL\Plugin();
+        $aclPlugin->allowUnauthenticatedAccess = false;
+        $this->server->addPlugin($aclPlugin);
 
         // Adding Auth plugin, and ensuring that we are logged in.
         $authBackend = new DAV\Auth\Backend\Mock();
         $authBackend->setPrincipal('principals/user1');
-        $authPlugin = new DAV\Auth\Plugin($authBackend, 'SabreDAV');
+        $authPlugin = new DAV\Auth\Plugin($authBackend);
         $authPlugin->beforeMethod(new \Sabre\HTTP\Request(), new \Sabre\HTTP\Response());
         $this->server->addPlugin($authPlugin);
 
@@ -480,8 +482,9 @@ END:VCALENDAR';
         $this->assertInstanceOf('\\Sabre\\DAV\\Xml\\Property\\SupportedReportSet', $prop);
         $value = [
             '{DAV:}expand-property',
+            '{DAV:}principal-match',
             '{DAV:}principal-property-search',
-            '{DAV:}principal-search-property-set'
+            '{DAV:}principal-search-property-set',
         ];
         $this->assertEquals($value, $prop->getValue());
 
@@ -508,6 +511,7 @@ END:VCALENDAR';
             '{urn:ietf:params:xml:ns:caldav}calendar-query',
             '{urn:ietf:params:xml:ns:caldav}free-busy-query',
             '{DAV:}expand-property',
+            '{DAV:}principal-match',
             '{DAV:}principal-property-search',
             '{DAV:}principal-search-property-set'
         ];
@@ -533,6 +537,7 @@ END:VCALENDAR';
         $value = [
             '{DAV:}sync-collection',
             '{DAV:}expand-property',
+            '{DAV:}principal-match',
             '{DAV:}principal-property-search',
             '{DAV:}principal-search-property-set',
         ];
@@ -719,7 +724,7 @@ XML;
             '</c:calendar-query>';
 
         $request = new HTTP\Request('REPORT', '/calendars/user1/UUID-123467', [
-            'Depth' => '0',
+            'Depth'      => '0',
             'User-Agent' => 'MSFT-WP/8.10.14219 (gzip)',
         ]);
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php
index 625f64211..23c248825 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\CalDAV\Principal;
+
 use Sabre\DAVACL;
 
 class CollectionTest extends \PHPUnit_Framework_TestCase {
@@ -9,9 +10,9 @@ class CollectionTest extends \PHPUnit_Framework_TestCase {
 
         $back = new DAVACL\PrincipalBackend\Mock();
         $col = new Collection($back);
-        $r = $col->getChildForPrincipal(array(
+        $r = $col->getChildForPrincipal([
             'uri' => 'principals/admin',
-        ));
+        ]);
         $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\User', $r);
 
     }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
index 1ee999a92..fe07f0131 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\CalDAV\Principal;
+
 use Sabre\DAVACL;
 
 class ProxyReadTest extends \PHPUnit_Framework_TestCase {
@@ -10,9 +11,9 @@ class ProxyReadTest extends \PHPUnit_Framework_TestCase {
     function getInstance() {
 
         $backend = new DAVACL\PrincipalBackend\Mock();
-        $principal = new ProxyRead($backend, array(
+        $principal = new ProxyRead($backend, [
             'uri' => 'principal/user',
-        ));
+        ]);
         $this->backend = $backend;
         return $principal;
 
@@ -61,7 +62,7 @@ class ProxyReadTest extends \PHPUnit_Framework_TestCase {
     function testGetAlternateUriSet() {
 
         $i = $this->getInstance();
-        $this->assertEquals(array(), $i->getAlternateUriSet());
+        $this->assertEquals([], $i->getAlternateUriSet());
 
     }
 
@@ -75,25 +76,25 @@ class ProxyReadTest extends \PHPUnit_Framework_TestCase {
     function testGetGroupMemberSet() {
 
         $i = $this->getInstance();
-        $this->assertEquals(array(), $i->getGroupMemberSet());
+        $this->assertEquals([], $i->getGroupMemberSet());
 
     }
 
     function testGetGroupMembership() {
 
         $i = $this->getInstance();
-        $this->assertEquals(array(), $i->getGroupMembership());
+        $this->assertEquals([], $i->getGroupMembership());
 
     }
 
     function testSetGroupMemberSet() {
 
         $i = $this->getInstance();
-        $i->setGroupMemberSet(array('principals/foo'));
+        $i->setGroupMemberSet(['principals/foo']);
 
-        $expected = array(
-            $i->getPrincipalUrl() => array('principals/foo')
-        );
+        $expected = [
+            $i->getPrincipalUrl() => ['principals/foo']
+        ];
 
         $this->assertEquals($expected, $this->backend->groupMembers);
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
index c0186ff0d..6cdb9b30e 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\CalDAV\Principal;
+
 use Sabre\DAVACL;
 
 class ProxyWriteTest extends ProxyReadTest {
@@ -8,9 +9,9 @@ class ProxyWriteTest extends ProxyReadTest {
     function getInstance() {
 
         $backend = new DAVACL\PrincipalBackend\Mock();
-        $principal = new ProxyWrite($backend, array(
+        $principal = new ProxyWrite($backend, [
             'uri' => 'principal/user',
-        ));
+        ]);
         $this->backend = $backend;
         return $principal;
 
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
index 37b5eae97..420bb3b1a 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\CalDAV\Principal;
+
 use Sabre\DAVACL;
 
 class UserTest extends \PHPUnit_Framework_TestCase {
@@ -8,18 +9,18 @@ class UserTest extends \PHPUnit_Framework_TestCase {
     function getInstance() {
 
         $backend = new DAVACL\PrincipalBackend\Mock();
-        $backend->addPrincipal(array(
+        $backend->addPrincipal([
             'uri' => 'principals/user/calendar-proxy-read',
-        ));
-        $backend->addPrincipal(array(
+        ]);
+        $backend->addPrincipal([
             'uri' => 'principals/user/calendar-proxy-write',
-        ));
-        $backend->addPrincipal(array(
+        ]);
+        $backend->addPrincipal([
             'uri' => 'principals/user/random',
-        ));
-        return new User($backend, array(
+        ]);
+        return new User($backend, [
             'uri' => 'principals/user',
-        ));
+        ]);
 
     }
 
@@ -100,23 +101,23 @@ class UserTest extends \PHPUnit_Framework_TestCase {
 
     function testGetACL() {
 
-        $expected = array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => '{DAV:}authenticated',
+        $expected = [
+            [
+                'privilege' => '{DAV:}all',
+                'principal' => '{DAV:}owner',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user/calendar-proxy-read',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user/calendar-proxy-write',
                 'protected' => true,
-            ),
-        );
+            ],
+        ];
 
         $u = $this->getInstance();
         $this->assertEquals($expected, $u->getACL());
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule/OutboxTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule/OutboxTest.php
index 933c7157b..04d4b1237 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule/OutboxTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule/OutboxTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\CalDAV\Schedule;
+
 use Sabre\CalDAV;
 use Sabre\DAV;
 
@@ -10,80 +11,38 @@ class OutboxTest extends \PHPUnit_Framework_TestCase {
 
         $outbox = new Outbox('principals/user1');
         $this->assertEquals('outbox', $outbox->getName());
-        $this->assertEquals(array(), $outbox->getChildren());
+        $this->assertEquals([], $outbox->getChildren());
         $this->assertEquals('principals/user1', $outbox->getOwner());
         $this->assertEquals(null, $outbox->getGroup());
 
-        $this->assertEquals(array(
-            array(
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
+        $this->assertEquals([
+            [
+                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-send',
                 'principal' => 'principals/user1',
                 'protected' => true,
-            ),
-
-            array(
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
-                'principal' => 'principals/user1',
-                'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user1',
                 'protected' => true,
-            ),
-            array(
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy',
+            ],
+            [
+                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-send',
                 'principal' => 'principals/user1/calendar-proxy-write',
                 'protected' => true,
-            ),
-            array(
-                'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent',
-                'principal' => 'principals/user1/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user1/calendar-proxy-read',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user1/calendar-proxy-write',
                 'protected' => true,
-            ),
-        ), $outbox->getACL());
-
-        $ok = false;
-        try {
-            $outbox->setACL(array());
-        } catch (DAV\Exception\MethodNotAllowed $e) {
-            $ok = true;
-        }
-        if (!$ok) {
-            $this->fail('Exception was not emitted');
-        }
+            ],
+        ], $outbox->getACL());
 
     }
 
-    function testGetSupportedPrivilegeSet() {
-
-        $outbox = new Outbox('principals/user1');
-        $r = $outbox->getSupportedPrivilegeSet();
-
-        $ok = 0;
-        foreach($r['aggregates'] as $priv) {
-
-            if ($priv['privilege'] == '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-query-freebusy') {
-                $ok++;
-            }
-            if ($priv['privilege'] == '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-post-vevent') {
-                $ok++;
-            }
-        }
-
-        $this->assertEquals(2, $ok, "We're missing one or more privileges");
-
-    }
-
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/ShareableCalendarTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/ShareableCalendarTest.php
deleted file mode 100644
index 15b869d50..000000000
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/ShareableCalendarTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace Sabre\CalDAV;
-
-use Sabre\DAVACL;
-
-class ShareableCalendarTest extends \PHPUnit_Framework_TestCase {
-
-    protected $backend;
-    protected $instance;
-
-    function setUp() {
-
-        $props = array(
-            'id' => 1,
-        );
-
-        $this->backend = new Backend\MockSharing(
-            array($props)
-        );
-        $this->backend->updateShares(1, array(
-            array(
-                'href' => 'mailto:removeme@example.org',
-                'commonName' => 'To be removed',
-                'readOnly' => true,
-            ),
-        ), array());
-
-        $this->instance = new ShareableCalendar($this->backend, $props);
-
-    }
-
-    function testUpdateShares() {
-
-        $this->instance->updateShares(array(
-            array(
-                'href' => 'mailto:test@example.org',
-                'commonName' => 'Foo Bar',
-                'summary' => 'Booh',
-                'readOnly' => false,
-            ),
-        ), array('mailto:removeme@example.org'));
-
-        $this->assertEquals(array(array(
-            'href' => 'mailto:test@example.org',
-            'commonName' => 'Foo Bar',
-            'summary' => 'Booh',
-            'readOnly' => false,
-            'status' => SharingPlugin::STATUS_NORESPONSE,
-        )), $this->instance->getShares());
-
-    }
-
-    function testPublish() {
-
-        $this->assertNull($this->instance->setPublishStatus(true));
-        $this->assertNull($this->instance->setPublishStatus(false));
-
-    }
-}
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/SharedCalendarTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/SharedCalendarTest.php
index 337b658f4..f71c19523 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/SharedCalendarTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/SharedCalendarTest.php
@@ -2,7 +2,8 @@
 
 namespace Sabre\CalDAV;
 
-use Sabre\DAVACL;
+use Sabre\DAV\Sharing;
+use Sabre\DAV\Xml\Element\Sharee;
 
 class SharedCalendarTest extends \PHPUnit_Framework_TestCase {
 
@@ -11,96 +12,95 @@ class SharedCalendarTest extends \PHPUnit_Framework_TestCase {
     function getInstance(array $props = null) {
 
         if (is_null($props)) {
-            $props = array(
-                'id' => 1,
+            $props = [
+                'id'                                        => 1,
                 '{http://calendarserver.org/ns/}shared-url' => 'calendars/owner/original',
-                '{http://sabredav.org/ns}owner-principal' => 'principals/owner',
-                '{http://sabredav.org/ns}read-only' => false,
-                'principaluri' => 'principals/sharee',
-            );
+                '{http://sabredav.org/ns}owner-principal'   => 'principals/owner',
+                '{http://sabredav.org/ns}read-only'         => false,
+                'share-access'                              => Sharing\Plugin::ACCESS_READWRITE,
+                'principaluri'                              => 'principals/sharee',
+            ];
         }
 
         $this->backend = new Backend\MockSharing(
-            array($props),
-            array(),
-            array()
+            [$props],
+            [],
+            []
         );
-        $this->backend->updateShares(1, array(
-            array(
-                'href' => 'mailto:removeme@example.org',
-                'commonName' => 'To be removed',
-                'readOnly' => true,
-            ),
-        ), array());
+
+        $sharee = new Sharee();
+        $sharee->href = 'mailto:removeme@example.org';
+        $sharee->properties['{DAV:}displayname'] = 'To be removed';
+        $sharee->access = Sharing\Plugin::ACCESS_READ;
+        $this->backend->updateInvites(1, [$sharee]);
 
         return new SharedCalendar($this->backend, $props);
 
     }
 
-    function testGetSharedUrl() {
-        $this->assertEquals('calendars/owner/original', $this->getInstance()->getSharedUrl());
-    }
+    function testGetInvites() {
 
-    function testGetShares() {
+        $sharee = new Sharee();
+        $sharee->href = 'mailto:removeme@example.org';
+        $sharee->properties['{DAV:}displayname'] = 'To be removed';
+        $sharee->access = Sharing\Plugin::ACCESS_READ;
+        $sharee->inviteStatus = Sharing\Plugin::INVITE_NORESPONSE;
 
-        $this->assertEquals(array(array(
-            'href' => 'mailto:removeme@example.org',
-            'commonName' => 'To be removed',
-            'readOnly' => true,
-            'status' => SharingPlugin::STATUS_NORESPONSE,
-        )), $this->getInstance()->getShares());
+        $this->assertEquals(
+            [$sharee],
+            $this->getInstance()->getInvites()
+        );
 
     }
 
     function testGetOwner() {
-        $this->assertEquals('principals/owner', $this->getInstance()->getOwner());
+        $this->assertEquals('principals/sharee', $this->getInstance()->getOwner());
     }
 
     function testGetACL() {
 
-        $expected = array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/owner',
+        $expected = [
+            [
+                'privilege' => '{DAV:}write',
+                'principal' => 'principals/sharee',
                 'protected' => true,
-            ),
-
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/owner/calendar-proxy-write',
+            ],
+            [
+                'privilege' => '{DAV:}write',
+                'principal' => 'principals/sharee/calendar-proxy-write',
                 'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/owner/calendar-proxy-read',
+            ],
+            [
+                'privilege' => '{DAV:}write-properties',
+                'principal' => 'principals/sharee',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
+                'privilege' => '{DAV:}write-properties',
+                'principal' => 'principals/sharee/calendar-proxy-write',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => 'principals/sharee',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => 'principals/sharee/calendar-proxy-read',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => 'principals/sharee/calendar-proxy-write',
+                'protected' => true,
+            ],
+            [
                 'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
                 'principal' => '{DAV:}authenticated',
                 'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => 'principals/owner',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => 'principals/owner/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/sharee',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => 'principals/sharee',
-                'protected' => true,
-            ),
-        );
+            ],
+        ];
 
         $this->assertEquals($expected, $this->getInstance()->getACL());
 
@@ -108,96 +108,69 @@ class SharedCalendarTest extends \PHPUnit_Framework_TestCase {
 
     function testGetChildACL() {
 
-        $expected = array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/owner',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/owner/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/owner/calendar-proxy-read',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => 'principals/owner',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => 'principals/owner/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/sharee',
-                'protected' => true,
-            ),
-            array(
+        $expected = [
+            [
                 'privilege' => '{DAV:}write',
                 'principal' => 'principals/sharee',
                 'protected' => true,
-            ),
-        );
+            ],
+            [
+                'privilege' => '{DAV:}write',
+                'principal' => 'principals/sharee/calendar-proxy-write',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => 'principals/sharee',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => 'principals/sharee/calendar-proxy-write',
+                'protected' => true,
+            ],
+            [
+                'privilege' => '{DAV:}read',
+                'principal' => 'principals/sharee/calendar-proxy-read',
+                'protected' => true,
+            ],
+
+        ];
 
         $this->assertEquals($expected, $this->getInstance()->getChildACL());
 
     }
 
-    function testGetChildACLReadOnly() {
+    function testUpdateInvites() {
 
-        $expected = array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/owner',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/owner/calendar-proxy-write',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/owner/calendar-proxy-read',
-                'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/sharee',
-                'protected' => true,
-            ),
-        );
+        $instance = $this->getInstance();
+        $newSharees = [
+            new Sharee(),
+            new Sharee()
+        ];
+        $newSharees[0]->href = 'mailto:test@example.org';
+        $newSharees[0]->properties['{DAV:}displayname'] = 'Foo Bar';
+        $newSharees[0]->comment = 'Booh';
+        $newSharees[0]->access = Sharing\Plugin::ACCESS_READWRITE;
 
-        $props = array(
-            'id' => 1,
-            '{http://calendarserver.org/ns/}shared-url' => 'calendars/owner/original',
-            '{http://sabredav.org/ns}owner-principal' => 'principals/owner',
-            '{http://sabredav.org/ns}read-only' => true,
-            'principaluri' => 'principals/sharee',
-        );
-        $this->assertEquals($expected, $this->getInstance($props)->getChildACL());
+        $newSharees[1]->href = 'mailto:removeme@example.org';
+        $newSharees[1]->access = Sharing\Plugin::ACCESS_NOACCESS;
+
+        $instance->updateInvites($newSharees);
+
+        $expected = [
+            clone $newSharees[0]
+        ];
+        $expected[0]->inviteStatus = Sharing\Plugin::INVITE_NORESPONSE;
+        $this->assertEquals($expected, $instance->getInvites());
 
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testCreateInstanceMissingArg() {
+    function testPublish() {
 
-        $this->getInstance(array(
-            'id' => 1,
-            '{http://calendarserver.org/ns/}shared-url' => 'calendars/owner/original',
-            '{http://sabredav.org/ns}read-only' => false,
-            'principaluri' => 'principals/sharee',
-        ));
+        $instance = $this->getInstance();
+        $this->assertNull($instance->setPublishStatus(true));
+        $this->assertNull($instance->setPublishStatus(false));
 
     }
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php
index b4270da7d..6e9e88419 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php
@@ -3,6 +3,7 @@
 namespace Sabre\CalDAV;
 
 use Sabre\DAV;
+use Sabre\DAV\Xml\Element\Sharee;
 use Sabre\HTTP;
 
 class SharingPluginTest extends \Sabre\DAVServerTest {
@@ -14,31 +15,28 @@ class SharingPluginTest extends \Sabre\DAVServerTest {
 
     function setUp() {
 
-        $this->caldavCalendars = array(
-            array(
+        $this->caldavCalendars = [
+            [
                 'principaluri' => 'principals/user1',
-                'id' => 1,
-                'uri' => 'cal1',
-            ),
-            array(
+                'id'           => 1,
+                'uri'          => 'cal1',
+            ],
+            [
                 'principaluri' => 'principals/user1',
-                'id' => 2,
-                'uri' => 'cal2',
-                '{' . Plugin::NS_CALENDARSERVER . '}shared-url' => 'calendars/user1/cal2',
-                '{http://sabredav.org/ns}owner-principal' => 'principals/user2',
-                '{http://sabredav.org/ns}read-only' => 'true',
-            ),
-            array(
+                'id'           => 2,
+                'uri'          => 'cal2',
+                'share-access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE,
+            ],
+            [
                 'principaluri' => 'principals/user1',
-                'id' => 3,
-                'uri' => 'cal3',
-            ),
-        );
+                'id'           => 3,
+                'uri'          => 'cal3',
+            ],
+        ];
 
         parent::setUp();
 
         // Making the logged in user an admin, for full access:
-        $this->aclPlugin->adminPrincipals[] = 'principals/user1';
         $this->aclPlugin->adminPrincipals[] = 'principals/user2';
 
     }
@@ -53,9 +51,21 @@ class SharingPluginTest extends \Sabre\DAVServerTest {
 
     }
 
+    /**
+     * @expectedException \LogicException
+     */
+    function testSetupWithoutCoreSharingPlugin() {
+
+        $server = new DAV\Server();
+        $server->addPlugin(
+            new SharingPlugin()
+        );
+
+    }
+
     function testGetFeatures() {
 
-        $this->assertEquals(array('calendarserver-sharing'), $this->caldavSharingPlugin->getFeatures());
+        $this->assertEquals(['calendarserver-sharing'], $this->caldavSharingPlugin->getFeatures());
 
     }
 
@@ -63,10 +73,10 @@ class SharingPluginTest extends \Sabre\DAVServerTest {
 
         // Forcing the server to authenticate:
         $this->authPlugin->beforeMethod(new HTTP\Request(), new HTTP\Response());
-        $props = $this->server->getProperties('calendars/user1/cal1', array(
+        $props = $this->server->getProperties('calendars/user1/cal1', [
             '{' . Plugin::NS_CALENDARSERVER . '}invite',
             '{' . Plugin::NS_CALENDARSERVER . '}allowed-sharing-modes',
-        ));
+        ]);
 
         $this->assertInstanceOf('Sabre\\CalDAV\\Xml\\Property\\Invite', $props['{' . Plugin::NS_CALENDARSERVER . '}invite']);
         $this->assertInstanceOf('Sabre\\CalDAV\\Xml\\Property\\AllowedSharingModes', $props['{' . Plugin::NS_CALENDARSERVER . '}allowed-sharing-modes']);
@@ -75,56 +85,55 @@ class SharingPluginTest extends \Sabre\DAVServerTest {
 
     function testBeforeGetSharedCalendar() {
 
-        $props = $this->server->getProperties('calendars/user1/cal2', array(
+        $props = $this->server->getProperties('calendars/user1/cal2', [
             '{' . Plugin::NS_CALENDARSERVER . '}shared-url',
             '{' . Plugin::NS_CALENDARSERVER . '}invite',
-        ));
+        ]);
 
         $this->assertInstanceOf('Sabre\\CalDAV\\Xml\\Property\\Invite', $props['{' . Plugin::NS_CALENDARSERVER . '}invite']);
-        $this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $props['{' . Plugin::NS_CALENDARSERVER . '}shared-url']);
+        //$this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $props['{' . Plugin::NS_CALENDARSERVER . '}shared-url']);
 
     }
 
-    function testUpdateProperties() {
+    function testUpdateResourceType() {
 
-        $this->caldavBackend->updateShares(1,
-            array(
-                array(
+        $this->caldavBackend->updateInvites(1,
+            [
+                new Sharee([
                     'href' => 'mailto:joe@example.org',
-                ),
-            ),
-            array()
+                ])
+            ]
         );
-        $result = $this->server->updateProperties('calendars/user1/cal1', array(
+        $result = $this->server->updateProperties('calendars/user1/cal1', [
             '{DAV:}resourcetype' => new DAV\Xml\Property\ResourceType(['{DAV:}collection'])
-        ));
+        ]);
 
         $this->assertEquals([
             '{DAV:}resourcetype' => 200
         ], $result);
 
-        $this->assertEquals(0, count($this->caldavBackend->getShares(1)));
+        $this->assertEquals(0, count($this->caldavBackend->getInvites(1)));
 
     }
 
     function testUpdatePropertiesPassThru() {
 
-        $result = $this->server->updateProperties('calendars/user1/cal3', array(
+        $result = $this->server->updateProperties('calendars/user1/cal3', [
             '{DAV:}foo' => 'bar',
-        ));
+        ]);
 
-        $this->assertEquals(array(
-            '{DAV:}foo' => 403,
-        ), $result);
+        $this->assertEquals([
+            '{DAV:}foo' => 200,
+        ], $result);
 
     }
 
     function testUnknownMethodNoPOST() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PATCH',
             'REQUEST_URI'    => '/',
-        ));
+        ]);
 
         $response = $this->request($request);
 
@@ -134,11 +143,11 @@ class SharingPluginTest extends \Sabre\DAVServerTest {
 
     function testUnknownMethodNoXML() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'POST',
             'REQUEST_URI'    => '/',
             'CONTENT_TYPE'   => 'text/plain',
-        ));
+        ]);
 
         $response = $this->request($request);
 
@@ -148,11 +157,11 @@ class SharingPluginTest extends \Sabre\DAVServerTest {
 
     function testUnknownMethodNoNode() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'POST',
             'REQUEST_URI'    => '/foo',
             'CONTENT_TYPE'   => 'text/xml',
-        ));
+        ]);
 
         $response = $this->request($request);
 
@@ -162,11 +171,7 @@ class SharingPluginTest extends \Sabre\DAVServerTest {
 
     function testShareRequest() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'POST',
-            'REQUEST_URI'    => '/calendars/user1/cal1',
-            'CONTENT_TYPE'   => 'text/xml',
-        ));
+        $request = new HTTP\Request('POST', '/calendars/user1/cal1', ['Content-Type' => 'text/xml']);
 
         $xml = <<<RRR
 <?xml version="1.0"?>
@@ -184,19 +189,28 @@ RRR;
 
         $request->setBody($xml);
 
-        $response = $this->request($request);
-        $this->assertEquals(200, $response->status, $response->body);
+        $response = $this->request($request, 200);
 
-        $this->assertEquals(array(array(
-            'href' => 'mailto:joe@example.org',
-            'commonName' => 'Joe Shmoe',
-            'readOnly' => false,
-            'status' => SharingPlugin::STATUS_NORESPONSE,
-            'summary' => '',
-        )), $this->caldavBackend->getShares(1));
+        $this->assertEquals(
+            [
+                new Sharee([
+                    'href'         => 'mailto:joe@example.org',
+                    'properties'   => [
+                        '{DAV:}displayname' => 'Joe Shmoe',
+                    ],
+                    'access'       => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE,
+                    'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_NORESPONSE,
+                    'comment'      => '',
+                ]),
+            ],
+            $this->caldavBackend->getInvites(1)
+        );
+
+        // Wiping out tree cache
+        $this->server->tree->markDirty('');
 
         // Verifying that the calendar is now marked shared.
-        $props = $this->server->getProperties('calendars/user1/cal1', array('{DAV:}resourcetype'));
+        $props = $this->server->getProperties('calendars/user1/cal1', ['{DAV:}resourcetype']);
         $this->assertTrue(
             $props['{DAV:}resourcetype']->is('{http://calendarserver.org/ns/}shared-owner')
         );
@@ -205,11 +219,11 @@ RRR;
 
     function testShareRequestNoShareableCalendar() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'POST',
-            'REQUEST_URI'    => '/calendars/user1/cal2',
-            'CONTENT_TYPE'   => 'text/xml',
-        ));
+        $request = new HTTP\Request(
+            'POST',
+            '/calendars/user1/cal2',
+            ['Content-Type' => 'text/xml']
+        );
 
         $xml = '<?xml version="1.0"?>
 <cs:share xmlns:cs="' . Plugin::NS_CALENDARSERVER . '" xmlns:d="DAV:">
@@ -226,18 +240,17 @@ RRR;
 
         $request->setBody($xml);
 
-        $response = $this->request($request);
-        $this->assertEquals(501, $response->status, $response->body);
+        $response = $this->request($request, 403);
 
     }
 
     function testInviteReply() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'POST',
             'REQUEST_URI'    => '/calendars/user1',
             'CONTENT_TYPE'   => 'text/xml',
-        ));
+        ]);
 
         $xml = '<?xml version="1.0"?>
 <cs:invite-reply xmlns:cs="' . Plugin::NS_CALENDARSERVER . '" xmlns:d="DAV:">
@@ -254,11 +267,11 @@ RRR;
 
     function testInviteBadXML() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'POST',
             'REQUEST_URI'    => '/calendars/user1',
             'CONTENT_TYPE'   => 'text/xml',
-        ));
+        ]);
 
         $xml = '<?xml version="1.0"?>
 <cs:invite-reply xmlns:cs="' . Plugin::NS_CALENDARSERVER . '" xmlns:d="DAV:">
@@ -272,11 +285,11 @@ RRR;
 
     function testInviteWrongUrl() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'POST',
             'REQUEST_URI'    => '/calendars/user1/cal1',
             'CONTENT_TYPE'   => 'text/xml',
-        ));
+        ]);
 
         $xml = '<?xml version="1.0"?>
 <cs:invite-reply xmlns:cs="' . Plugin::NS_CALENDARSERVER . '" xmlns:d="DAV:">
@@ -295,11 +308,7 @@ RRR;
 
     function testPublish() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'POST',
-            'REQUEST_URI'    => '/calendars/user1/cal1',
-            'CONTENT_TYPE'   => 'text/xml',
-        ));
+        $request = new HTTP\Request('POST', '/calendars/user1/cal1', ['Content-Type' => 'text/xml']);
 
         $xml = '<?xml version="1.0"?>
 <cs:publish-calendar xmlns:cs="' . Plugin::NS_CALENDARSERVER . '" xmlns:d="DAV:" />
@@ -312,13 +321,14 @@ RRR;
 
     }
 
+
     function testUnpublish() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'POST',
-            'REQUEST_URI'    => '/calendars/user1/cal1',
-            'CONTENT_TYPE'   => 'text/xml',
-        ));
+        $request = new HTTP\Request(
+            'POST',
+            '/calendars/user1/cal1',
+            ['Content-Type' => 'text/xml']
+        );
 
         $xml = '<?xml version="1.0"?>
 <cs:unpublish-calendar xmlns:cs="' . Plugin::NS_CALENDARSERVER . '" xmlns:d="DAV:" />
@@ -333,49 +343,46 @@ RRR;
 
     function testPublishWrongUrl() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'POST',
-            'REQUEST_URI'    => '/calendars/user1/cal2',
-            'CONTENT_TYPE'   => 'text/xml',
-        ));
+        $request = new HTTP\Request(
+            'POST',
+            '/calendars/user1',
+            ['Content-Type' => 'text/xml']
+        );
 
         $xml = '<?xml version="1.0"?>
 <cs:publish-calendar xmlns:cs="' . Plugin::NS_CALENDARSERVER . '" xmlns:d="DAV:" />
 ';
 
         $request->setBody($xml);
-
-        $response = $this->request($request);
-        $this->assertEquals(501, $response->status, $response->body);
+        $this->request($request, 501);
 
     }
 
     function testUnpublishWrongUrl() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'POST',
-            'REQUEST_URI'    => '/calendars/user1/cal2',
-            'CONTENT_TYPE'   => 'text/xml',
-        ));
-
+        $request = new HTTP\Request(
+            'POST',
+            '/calendars/user1',
+            ['Content-Type' => 'text/xml']
+        );
         $xml = '<?xml version="1.0"?>
 <cs:unpublish-calendar xmlns:cs="' . Plugin::NS_CALENDARSERVER . '" xmlns:d="DAV:" />
 ';
 
         $request->setBody($xml);
 
-        $response = $this->request($request);
-        $this->assertEquals(501, $response->status, $response->body);
+        $this->request($request, 501);
 
     }
 
     function testUnknownXmlDoc() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'POST',
-            'REQUEST_URI'    => '/calendars/user1/cal2',
-            'CONTENT_TYPE'   => 'text/xml',
-        ));
+
+        $request = new HTTP\Request(
+            'POST',
+            '/calendars/user1/cal2',
+            ['Content-Type' => 'text/xml']
+        );
 
         $xml = '<?xml version="1.0"?>
 <cs:foo-bar xmlns:cs="' . Plugin::NS_CALENDARSERVER . '" xmlns:d="DAV:" />';
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/TestUtil.php b/vendor/sabre/dav/tests/Sabre/CalDAV/TestUtil.php
index 19acea200..673d39c0a 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/TestUtil.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/TestUtil.php
@@ -6,48 +6,29 @@ class TestUtil {
 
     static function getBackend() {
 
-        $backend = new Backend\PDO(self::getSQLiteDB());
-        return $backend;
-
-    }
-
-    static function getSQLiteDB() {
-
-        if (file_exists(SABRE_TEMPDIR . '/testdb.sqlite'))
-            unlink(SABRE_TEMPDIR . '/testdb.sqlite');
-
-        $pdo = new \PDO('sqlite:' . SABRE_TEMPDIR . '/testdb.sqlite');
-        $pdo->setAttribute(\PDO::ATTR_ERRMODE,\PDO::ERRMODE_EXCEPTION);
-
-        // Yup this is definitely not 'fool proof', but good enough for now.
-        $queries = explode(';', file_get_contents(__DIR__ . '/../../../examples/sql/sqlite.calendars.sql'));
-        foreach($queries as $query) {
-            $pdo->exec($query);
-        }
-        // Inserting events through a backend class.
-        $backend = new Backend\PDO($pdo);
+        $backend = new Backend\Mock();
         $calendarId = $backend->createCalendar(
             'principals/user1',
             'UUID-123467',
-            array(
-                '{DAV:}displayname' => 'user1 calendar',
+            [
+                '{DAV:}displayname'                                   => 'user1 calendar',
                 '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'Calendar description',
-                '{http://apple.com/ns/ical/}calendar-order' => '1',
-                '{http://apple.com/ns/ical/}calendar-color' => '#FF0000',
-            )
+                '{http://apple.com/ns/ical/}calendar-order'           => '1',
+                '{http://apple.com/ns/ical/}calendar-color'           => '#FF0000',
+            ]
         );
         $backend->createCalendar(
             'principals/user1',
             'UUID-123468',
-            array(
-                '{DAV:}displayname' => 'user1 calendar2',
+            [
+                '{DAV:}displayname'                                   => 'user1 calendar2',
                 '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'Calendar description',
-                '{http://apple.com/ns/ical/}calendar-order' => '1',
-                '{http://apple.com/ns/ical/}calendar-color' => '#FF0000',
-            )
+                '{http://apple.com/ns/ical/}calendar-order'           => '1',
+                '{http://apple.com/ns/ical/}calendar-color'           => '#FF0000',
+            ]
         );
         $backend->createCalendarObject($calendarId, 'UUID-2345', self::getTestCalendarData());
-        return $pdo;
+        return $backend;
 
     }
 
@@ -80,37 +61,37 @@ TRANSP:TRANSPARENT
 SUMMARY:Something here
 DTSTAMP:20100228T130202Z';
 
-        switch($type) {
+        switch ($type) {
             case 1 :
-                $calendarData.="\nDTSTART;TZID=Asia/Seoul:20100223T060000\nDTEND;TZID=Asia/Seoul:20100223T070000\n";
+                $calendarData .= "\nDTSTART;TZID=Asia/Seoul:20100223T060000\nDTEND;TZID=Asia/Seoul:20100223T070000\n";
                 break;
             case 2 :
-                $calendarData.="\nDTSTART:20100223T060000\nDTEND:20100223T070000\n";
+                $calendarData .= "\nDTSTART:20100223T060000\nDTEND:20100223T070000\n";
                 break;
             case 3 :
-                $calendarData.="\nDTSTART;VALUE=DATE:20100223\nDTEND;VALUE=DATE:20100223\n";
+                $calendarData .= "\nDTSTART;VALUE=DATE:20100223\nDTEND;VALUE=DATE:20100223\n";
                 break;
             case 4 :
-                $calendarData.="\nDTSTART;TZID=Asia/Seoul:20100223T060000\nDURATION:PT1H\n";
+                $calendarData .= "\nDTSTART;TZID=Asia/Seoul:20100223T060000\nDURATION:PT1H\n";
                 break;
             case 5 :
-                $calendarData.="\nDTSTART;TZID=Asia/Seoul:20100223T060000\nDURATION:-P5D\n";
+                $calendarData .= "\nDTSTART;TZID=Asia/Seoul:20100223T060000\nDURATION:-P5D\n";
                 break;
             case 6 :
-                $calendarData.="\nDTSTART;VALUE=DATE:20100223\n";
+                $calendarData .= "\nDTSTART;VALUE=DATE:20100223\n";
                 break;
             case 7 :
-                $calendarData.="\nDTSTART;VALUE=DATETIME:20100223T060000\n";
+                $calendarData .= "\nDTSTART;VALUE=DATETIME:20100223T060000\n";
                 break;
 
             // No DTSTART, so intentionally broken
             case 'X' :
-                $calendarData.="\n";
+                $calendarData .= "\n";
                 break;
         }
 
 
-        $calendarData.='ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
+        $calendarData .= 'ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
 SEQUENCE:2
 END:VEVENT
 END:VCALENDAR';
@@ -121,7 +102,7 @@ END:VCALENDAR';
 
     static function getTestTODO($type = 'due') {
 
-        switch($type) {
+        switch ($type) {
 
             case 'due' :
                 $extra = "DUE:20100104T000000Z";
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/ValidateICalTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/ValidateICalTest.php
index be166d9e6..629df90c1 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/ValidateICalTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/ValidateICalTest.php
@@ -21,20 +21,20 @@ class ValidateICalTest extends \PHPUnit_Framework_TestCase {
 
     function setUp() {
 
-        $calendars = array(
-            array(
-                'id' => 'calendar1',
-                'principaluri' => 'principals/admin',
-                'uri' => 'calendar1',
-                '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new Xml\Property\SupportedCalendarComponentSet( ['VEVENT','VTODO','VJOURNAL'] ),
-            ),
-            array(
-                'id' => 'calendar2',
-                'principaluri' => 'principals/admin',
-                'uri' => 'calendar2',
-                '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new Xml\Property\SupportedCalendarComponentSet( ['VTODO','VJOURNAL'] ),
-            )
-        );
+        $calendars = [
+            [
+                'id'                                                              => 'calendar1',
+                'principaluri'                                                    => 'principals/admin',
+                'uri'                                                             => 'calendar1',
+                '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new Xml\Property\SupportedCalendarComponentSet(['VEVENT', 'VTODO', 'VJOURNAL']),
+            ],
+            [
+                'id'                                                              => 'calendar2',
+                'principaluri'                                                    => 'principals/admin',
+                'uri'                                                             => 'calendar2',
+                '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new Xml\Property\SupportedCalendarComponentSet(['VTODO', 'VJOURNAL']),
+            ]
+        ];
 
         $this->calBackend = new Backend\Mock($calendars, []);
         $principalBackend = new DAVACL\PrincipalBackend\Mock();
@@ -66,10 +66,10 @@ class ValidateICalTest extends \PHPUnit_Framework_TestCase {
 
     function testCreateFile() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
-        ));
+            'REQUEST_URI'    => '/calendars/admin/calendar1/blabla.ics',
+        ]);
 
         $response = $this->request($request);
 
@@ -79,66 +79,168 @@ class ValidateICalTest extends \PHPUnit_Framework_TestCase {
 
     function testCreateFileValid() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
-        ));
-        $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+        $request = new HTTP\Request(
+            'PUT',
+            '/calendars/admin/calendar1/blabla.ics',
+            ['Prefer' => 'handling=strict']
+        );
+
+        $ics = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:foo
+BEGIN:VEVENT
+UID:foo
+DTSTAMP:20160406T052348Z
+DTSTART:20160706T140000Z
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $request->setBody($ics);
 
         $response = $this->request($request);
 
         $this->assertEquals(201, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Length' => ['0'],
-            'ETag' => ['"' . md5("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n") . '"'],
-        ), $response->getHeaders());
+            'Content-Length'  => ['0'],
+            'ETag'            => ['"' . md5($ics) . '"'],
+        ], $response->getHeaders());
 
-        $expected = array(
+        $expected = [
             'uri'          => 'blabla.ics',
-            'calendardata' => "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n",
+            'calendardata' => $ics,
             'calendarid'   => 'calendar1',
             'lastmodified' => null,
+        ];
+
+        $this->assertEquals($expected, $this->calBackend->getCalendarObject('calendar1', 'blabla.ics'));
+
+    }
+
+    function testCreateFileNoVersion() {
+
+        $request = new HTTP\Request(
+            'PUT',
+            '/calendars/admin/calendar1/blabla.ics',
+            ['Prefer' => 'handling=strict']
         );
 
-        $this->assertEquals($expected, $this->calBackend->getCalendarObject('calendar1','blabla.ics'));
+        $ics = <<<ICS
+BEGIN:VCALENDAR
+PRODID:foo
+BEGIN:VEVENT
+UID:foo
+DTSTAMP:20160406T052348Z
+DTSTART:20160706T140000Z
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $request->setBody($ics);
+
+        $response = $this->request($request);
+
+        $this->assertEquals(415, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
+
+    }
+
+    function testCreateFileNoVersionFixed() {
+
+        $request = new HTTP\Request(
+            'PUT',
+            '/calendars/admin/calendar1/blabla.ics',
+            ['Prefer' => 'handling=lenient']
+        );
+
+        $ics = <<<ICS
+BEGIN:VCALENDAR
+PRODID:foo
+BEGIN:VEVENT
+UID:foo
+DTSTAMP:20160406T052348Z
+DTSTART:20160706T140000Z
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $request->setBody($ics);
+
+        $response = $this->request($request);
+
+        $this->assertEquals(201, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
+        $this->assertEquals([
+            'X-Sabre-Version'  => [DAV\Version::VERSION],
+            'Content-Length'   => ['0'],
+            'X-Sabre-Ew-Gross' => ['iCalendar validation warning: VERSION MUST appear exactly once in a VCALENDAR component'],
+        ], $response->getHeaders());
+
+        $ics = <<<ICS
+BEGIN:VCALENDAR\r
+VERSION:2.0\r
+PRODID:foo\r
+BEGIN:VEVENT\r
+UID:foo\r
+DTSTAMP:20160406T052348Z\r
+DTSTART:20160706T140000Z\r
+END:VEVENT\r
+END:VCALENDAR\r
+
+ICS;
+
+        $expected = [
+            'uri'          => 'blabla.ics',
+            'calendardata' => $ics,
+            'calendarid'   => 'calendar1',
+            'lastmodified' => null,
+        ];
+
+        $this->assertEquals($expected, $this->calBackend->getCalendarObject('calendar1', 'blabla.ics'));
 
     }
 
     function testCreateFileNoComponents() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
-        ));
-        $request->setBody("BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n");
+        $request = new HTTP\Request(
+            'PUT',
+            '/calendars/admin/calendar1/blabla.ics',
+            ['Prefer' => 'handling=strict']
+        );
+        $ics = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:foo
+END:VCALENDAR
+ICS;
+
+        $request->setBody($ics);
 
         $response = $this->request($request);
-
-        $this->assertEquals(400, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
+        $this->assertEquals(403, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
 
     }
 
     function testCreateFileNoUID() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
-        ));
+            'REQUEST_URI'    => '/calendars/admin/calendar1/blabla.ics',
+        ]);
         $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
 
         $response = $this->request($request);
 
-        $this->assertEquals(400, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
+        $this->assertEquals(415, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
 
     }
 
     function testCreateFileVCard() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
-        ));
+            'REQUEST_URI'    => '/calendars/admin/calendar1/blabla.ics',
+        ]);
         $request->setBody("BEGIN:VCARD\r\nEND:VCARD\r\n");
 
         $response = $this->request($request);
@@ -149,53 +251,53 @@ class ValidateICalTest extends \PHPUnit_Framework_TestCase {
 
     function testCreateFile2Components() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
-        ));
+            'REQUEST_URI'    => '/calendars/admin/calendar1/blabla.ics',
+        ]);
         $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nBEGIN:VJOURNAL\r\nUID:foo\r\nEND:VJOURNAL\r\nEND:VCALENDAR\r\n");
 
         $response = $this->request($request);
 
-        $this->assertEquals(400, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
+        $this->assertEquals(415, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
 
     }
 
     function testCreateFile2UIDS() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
-        ));
+            'REQUEST_URI'    => '/calendars/admin/calendar1/blabla.ics',
+        ]);
         $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nBEGIN:VEVENT\r\nUID:bar\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
 
         $response = $this->request($request);
 
-        $this->assertEquals(400, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
+        $this->assertEquals(415, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
 
     }
 
     function testCreateFileWrongComponent() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
-        ));
+            'REQUEST_URI'    => '/calendars/admin/calendar1/blabla.ics',
+        ]);
         $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nBEGIN:VFREEBUSY\r\nUID:foo\r\nEND:VFREEBUSY\r\nEND:VCALENDAR\r\n");
 
         $response = $this->request($request);
 
-        $this->assertEquals(400, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
+        $this->assertEquals(403, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
 
     }
 
     function testUpdateFile() {
 
-        $this->calBackend->createCalendarObject('calendar1','blabla.ics','foo');
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $this->calBackend->createCalendarObject('calendar1', 'blabla.ics', 'foo');
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
-        ));
+            'REQUEST_URI'    => '/calendars/admin/calendar1/blabla.ics',
+        ]);
 
         $response = $this->request($request);
 
@@ -205,35 +307,45 @@ class ValidateICalTest extends \PHPUnit_Framework_TestCase {
 
     function testUpdateFileParsableBody() {
 
-        $this->calBackend->createCalendarObject('calendar1','blabla.ics','foo');
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
-        ));
-        $body = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n";
-        $request->setBody($body);
+        $this->calBackend->createCalendarObject('calendar1', 'blabla.ics', 'foo');
+        $request = new HTTP\Request(
+            'PUT',
+            '/calendars/admin/calendar1/blabla.ics'
+        );
+        $ics = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:foo
+BEGIN:VEVENT
+UID:foo
+DTSTAMP:20160406T052348Z
+DTSTART:20160706T140000Z
+END:VEVENT
+END:VCALENDAR
+ICS;
 
+        $request->setBody($ics);
         $response = $this->request($request);
 
         $this->assertEquals(204, $response->status);
 
-        $expected = array(
+        $expected = [
             'uri'          => 'blabla.ics',
-            'calendardata' => $body,
+            'calendardata' => $ics,
             'calendarid'   => 'calendar1',
             'lastmodified' => null,
-        );
+        ];
 
-        $this->assertEquals($expected, $this->calBackend->getCalendarObject('calendar1','blabla.ics'));
+        $this->assertEquals($expected, $this->calBackend->getCalendarObject('calendar1', 'blabla.ics'));
 
     }
 
     function testCreateFileInvalidComponent() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar2/blabla.ics',
-        ));
+            'REQUEST_URI'    => '/calendars/admin/calendar2/blabla.ics',
+        ]);
         $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
 
         $response = $this->request($request);
@@ -244,11 +356,11 @@ class ValidateICalTest extends \PHPUnit_Framework_TestCase {
 
     function testUpdateFileInvalidComponent() {
 
-        $this->calBackend->createCalendarObject('calendar2','blabla.ics','foo');
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $this->calBackend->createCalendarObject('calendar2', 'blabla.ics', 'foo');
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar2/blabla.ics',
-        ));
+            'REQUEST_URI'    => '/calendars/admin/calendar2/blabla.ics',
+        ]);
         $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
 
         $response = $this->request($request);
@@ -266,11 +378,24 @@ class ValidateICalTest extends \PHPUnit_Framework_TestCase {
      */
     function testCreateFileModified() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
-        ));
-        $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:foo\r\nSUMMARY:Meeting in M\xfcnster\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
+        $request = new HTTP\Request(
+            'PUT',
+            '/calendars/admin/calendar1/blabla.ics'
+        );
+        $ics = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:foo
+BEGIN:VEVENT
+UID:foo
+SUMMARY:Meeting in M\xfcnster
+DTSTAMP:20160406T052348Z
+DTSTART:20160706T140000Z
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $request->setBody($ics);
 
         $response = $this->request($request);
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php
index a123099a0..552e2ba77 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php
@@ -26,13 +26,13 @@ abstract class AbstractPluginTest extends \PHPUnit_Framework_TestCase {
         $this->backend = new Backend\Mock();
         $principalBackend = new DAVACL\PrincipalBackend\Mock();
 
-        $tree = array(
+        $tree = [
             new AddressBookRoot($principalBackend, $this->backend),
             new DAVACL\PrincipalCollection($principalBackend)
-        );
+        ];
 
         $this->plugin = new Plugin();
-        $this->plugin->directories = array('directory');
+        $this->plugin->directories = ['directory'];
         $this->server = new DAV\Server($tree);
         $this->server->sapi = new HTTP\SapiMock();
         $this->server->addPlugin($this->plugin);
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php
index 478f6beb5..2c3171bf3 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php
@@ -12,11 +12,11 @@ class AddressBookQueryTest extends AbstractPluginTest {
 
     function testQuery() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_URI' => '/addressbooks/user1/book1',
-            'HTTP_DEPTH' => '1',
-        ));
+        $request = new HTTP\Request(
+            'REPORT',
+            '/addressbooks/user1/book1',
+            ['Depth' => '1']
+        );
 
         $request->setBody(
 '<?xml version="1.0"?>
@@ -40,33 +40,33 @@ class AddressBookQueryTest extends AbstractPluginTest {
         $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
 
         // using the client for parsing
-        $client = new DAV\Client(array('baseUri'=>'/'));
+        $client = new DAV\Client(['baseUri' => '/']);
 
         $result = $client->parseMultiStatus($response->body);
 
-        $this->assertEquals(array(
-            '/addressbooks/user1/book1/card1' => array(
-                200 => array(
+        $this->assertEquals([
+            '/addressbooks/user1/book1/card1' => [
+                200 => [
                     '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
-                ),
-             ),
-            '/addressbooks/user1/book1/card2' => array(
-                404 => array(
+                ],
+             ],
+            '/addressbooks/user1/book1/card2' => [
+                404 => [
                     '{DAV:}getetag' => null,
-                ),
-            )
-        ), $result);
+                ],
+            ]
+        ], $result);
 
 
     }
 
     function testQueryDepth0() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_URI' => '/addressbooks/user1/book1/card1',
-            'HTTP_DEPTH' => '0',
-        ));
+        $request = new HTTP\Request(
+            'REPORT',
+            '/addressbooks/user1/book1/card1',
+            ['Depth' => '0']
+        );
 
         $request->setBody(
 '<?xml version="1.0"?>
@@ -90,28 +90,28 @@ class AddressBookQueryTest extends AbstractPluginTest {
         $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
 
         // using the client for parsing
-        $client = new DAV\Client(array('baseUri'=>'/'));
+        $client = new DAV\Client(['baseUri' => '/']);
 
         $result = $client->parseMultiStatus($response->body);
 
-        $this->assertEquals(array(
-            '/addressbooks/user1/book1/card1' => array(
-                200 => array(
+        $this->assertEquals([
+            '/addressbooks/user1/book1/card1' => [
+                200 => [
                     '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
-                ),
-             ),
-        ), $result);
+                ],
+             ],
+        ], $result);
 
 
     }
 
     function testQueryNoMatch() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_URI' => '/addressbooks/user1/book1',
-            'HTTP_DEPTH' => '1',
-        ));
+        $request = new HTTP\Request(
+            'REPORT',
+            '/addressbooks/user1/book1',
+            ['Depth' => '1']
+        );
 
         $request->setBody(
 '<?xml version="1.0"?>
@@ -135,21 +135,21 @@ class AddressBookQueryTest extends AbstractPluginTest {
         $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
 
         // using the client for parsing
-        $client = new DAV\Client(array('baseUri'=>'/'));
+        $client = new DAV\Client(['baseUri' => '/']);
 
         $result = $client->parseMultiStatus($response->body);
 
-        $this->assertEquals(array(), $result);
+        $this->assertEquals([], $result);
 
     }
 
     function testQueryLimit() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_URI' => '/addressbooks/user1/book1',
-            'HTTP_DEPTH' => '1',
-        ));
+            'REQUEST_URI'    => '/addressbooks/user1/book1',
+            'HTTP_DEPTH'     => '1',
+        ]);
 
         $request->setBody(
 '<?xml version="1.0"?>
@@ -174,17 +174,17 @@ class AddressBookQueryTest extends AbstractPluginTest {
         $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
 
         // using the client for parsing
-        $client = new DAV\Client(array('baseUri'=>'/'));
+        $client = new DAV\Client(['baseUri' => '/']);
 
         $result = $client->parseMultiStatus($response->body);
 
-        $this->assertEquals(array(
-            '/addressbooks/user1/book1/card1' => array(
-                200 => array(
-                    '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD"). '"',
-                ),
-             ),
-        ), $result);
+        $this->assertEquals([
+            '/addressbooks/user1/book1/card1' => [
+                200 => [
+                    '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
+                ],
+             ],
+        ], $result);
 
 
     }
@@ -217,20 +217,20 @@ class AddressBookQueryTest extends AbstractPluginTest {
         $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
 
         // using the client for parsing
-        $client = new DAV\Client(array('baseUri'=>'/'));
+        $client = new DAV\Client(['baseUri' => '/']);
 
         $result = $client->parseMultiStatus($response->body);
 
         $vobjVersion = \Sabre\VObject\Version::VERSION;
 
-        $this->assertEquals(array(
-            '/addressbooks/user1/book1/card1' => array(
-                200 => array(
-                    '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD"). '"',
+        $this->assertEquals([
+            '/addressbooks/user1/book1/card1' => [
+                200 => [
+                    '{DAV:}getetag'                                => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
                     '{urn:ietf:params:xml:ns:carddav}address-data' => '["vcard",[["version",{},"text","4.0"],["prodid",{},"text","-\/\/Sabre\/\/Sabre VObject ' . $vobjVersion . '\/\/EN"],["uid",{},"text","12345"]]]',
-                ),
-             ),
-        ), $result);
+                ],
+             ],
+        ], $result);
 
     }
 
@@ -262,20 +262,20 @@ class AddressBookQueryTest extends AbstractPluginTest {
         $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
 
         // using the client for parsing
-        $client = new DAV\Client(array('baseUri'=>'/'));
+        $client = new DAV\Client(['baseUri' => '/']);
 
         $result = $client->parseMultiStatus($response->body);
 
         $vobjVersion = \Sabre\VObject\Version::VERSION;
 
-        $this->assertEquals(array(
-            '/addressbooks/user1/book1/card1' => array(
-                200 => array(
-                    '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD"). '"',
+        $this->assertEquals([
+            '/addressbooks/user1/book1/card1' => [
+                200 => [
+                    '{DAV:}getetag'                                => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
                     '{urn:ietf:params:xml:ns:carddav}address-data' => "BEGIN:VCARD\r\nVERSION:4.0\r\nPRODID:-//Sabre//Sabre VObject $vobjVersion//EN\r\nUID:12345\r\nEND:VCARD\r\n",
-                ),
-             ),
-        ), $result);
+                ],
+             ],
+        ], $result);
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php
index fe8ba9025..1a36fd10c 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php
@@ -4,10 +4,10 @@ namespace Sabre\CardDAV;
 
 use Sabre\DAV\PropPatch;
 
-require_once 'Sabre/CardDAV/Backend/Mock.php';
-
 class AddressBookTest extends \PHPUnit_Framework_TestCase {
 
+    use \Sabre\DAV\DbTestHelperTrait;
+
     /**
      * @var Sabre\CardDAV\AddressBook
      */
@@ -19,12 +19,12 @@ class AddressBookTest extends \PHPUnit_Framework_TestCase {
         $this->backend = new Backend\Mock();
         $this->ab = new AddressBook(
             $this->backend,
-            array(
-                'uri' => 'book1',
-                'id' => 'foo',
+            [
+                'uri'               => 'book1',
+                'id'                => 'foo',
                 '{DAV:}displayname' => 'd-name',
-                'principaluri' => 'principals/user1',
-            )
+                'principaluri'      => 'principals/user1',
+            ]
         );
 
     }
@@ -73,10 +73,10 @@ class AddressBookTest extends \PHPUnit_Framework_TestCase {
 
     function testCreateFile() {
 
-        $file = fopen('php://memory','r+');
-        fwrite($file,'foo');
+        $file = fopen('php://memory', 'r+');
+        fwrite($file, 'foo');
         rewind($file);
-        $this->ab->createFile('card2',$file);
+        $this->ab->createFile('card2', $file);
 
         $this->assertEquals('foo', $this->backend->cards['foo']['card2']);
 
@@ -85,7 +85,7 @@ class AddressBookTest extends \PHPUnit_Framework_TestCase {
     function testDelete() {
 
         $this->ab->delete();
-        $this->assertEquals(array(), $this->backend->addressBooks);
+        $this->assertEquals([], $this->backend->addressBooks);
 
     }
 
@@ -118,10 +118,10 @@ class AddressBookTest extends \PHPUnit_Framework_TestCase {
 
     function testGetProperties() {
 
-        $props = $this->ab->getProperties(array('{DAV:}displayname'));
-        $this->assertEquals(array(
+        $props = $this->ab->getProperties(['{DAV:}displayname']);
+        $this->assertEquals([
             '{DAV:}displayname' => 'd-name',
-        ), $props);
+        ], $props);
 
     }
 
@@ -129,27 +129,22 @@ class AddressBookTest extends \PHPUnit_Framework_TestCase {
 
         $this->assertEquals('principals/user1', $this->ab->getOwner());
         $this->assertNull($this->ab->getGroup());
-        $this->assertEquals(array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => 'principals/user1',
+        $this->assertEquals([
+            [
+                'privilege' => '{DAV:}all',
+                'principal' => '{DAV:}owner',
                 'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => 'principals/user1',
-                'protected' => true,
-            ),
-        ), $this->ab->getACL());
+            ],
+        ], $this->ab->getACL());
 
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\MethodNotAllowed
+     * @expectedException Sabre\DAV\Exception\Forbidden
      */
     function testSetACL() {
 
-       $this->ab->setACL(array());
+       $this->ab->setACL([]);
 
     }
 
@@ -168,45 +163,32 @@ class AddressBookTest extends \PHPUnit_Framework_TestCase {
     }
     function testGetChangesNoSyncSupport() {
 
-        $this->assertNull($this->ab->getChanges(1,null));
+        $this->assertNull($this->ab->getChanges(1, null));
 
     }
 
     function testGetSyncToken() {
 
-        if (!SABRE_HASSQLITE) {
-            $this->markTestSkipped('Sqlite is required for this test to run');
-        }
-        $ab = new AddressBook(TestUtil::getBackend(), [ 'id' => 1, '{DAV:}sync-token' => 2]);
+        $this->driver = 'sqlite';
+        $this->dropTables(['addressbooks', 'cards', 'addressbookchanges']);
+        $this->createSchema('addressbooks');
+        $backend = new Backend\PDO(
+            $this->getPDO()
+        );
+        $ab = new AddressBook($backend, [ 'id' => 1, '{DAV:}sync-token' => 2]);
         $this->assertEquals(2, $ab->getSyncToken());
-        TestUtil::deleteSQLiteDB();
     }
 
     function testGetSyncToken2() {
 
-        if (!SABRE_HASSQLITE) {
-            $this->markTestSkipped('Sqlite is required for this test to run');
-        }
-        $ab = new AddressBook(TestUtil::getBackend(), [ 'id' => 1, '{http://sabredav.org/ns}sync-token' => 2]);
+        $this->driver = 'sqlite';
+        $this->dropTables(['addressbooks', 'cards', 'addressbookchanges']);
+        $this->createSchema('addressbooks');
+        $backend = new Backend\PDO(
+            $this->getPDO()
+        );
+        $ab = new AddressBook($backend, [ 'id' => 1, '{http://sabredav.org/ns}sync-token' => 2]);
         $this->assertEquals(2, $ab->getSyncToken());
-        TestUtil::deleteSQLiteDB();
     }
 
-    function testGetChanges() {
-
-        if (!SABRE_HASSQLITE) {
-            $this->markTestSkipped('Sqlite is required for this test to run');
-        }
-        $ab = new AddressBook(TestUtil::getBackend(), [ 'id' => 1, '{DAV:}sync-token' => 2]);
-        $this->assertEquals([
-            'syncToken' => 2,
-            'modified' => [],
-            'deleted' => [],
-            'added' => ['UUID-2345'],
-        ], $ab->getChanges(1, 1));
-        TestUtil::deleteSQLiteDB();
-
-    }
-
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
index d2ec278be..f62bfb1ae 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
@@ -7,52 +7,55 @@ use Sabre\DAV\PropPatch;
 
 abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
+    use \Sabre\DAV\DbTestHelperTrait;
+
     /**
      * @var CardDAV\Backend\PDO
      */
     protected $backend;
 
-    /**
-     * @abstract
-     * @return PDO
-     */
-    abstract function getPDO();
-
-    public function setUp() {
+    function setUp() {
 
+        $this->dropTables([
+            'addressbooks',
+            'cards',
+            'addressbookchanges',
+        ]);
+        $this->createSchema('addressbooks');
         $pdo = $this->getPDO();
+
         $this->backend = new PDO($pdo);
-        $pdo->exec('INSERT INTO addressbooks (principaluri, displayname, uri, description, synctoken) VALUES ("principals/user1", "book1", "book1", "addressbook 1", 1)');
-        $pdo->exec('INSERT INTO cards (addressbookid, carddata, uri, lastmodified, etag, size) VALUES (1, "card1", "card1", 0, "' . md5('card1') . '", 5)');
+        $pdo->exec("INSERT INTO addressbooks (principaluri, displayname, uri, description, synctoken) VALUES ('principals/user1', 'book1', 'book1', 'addressbook 1', 1)");
+        $pdo->exec("INSERT INTO cards (addressbookid, carddata, uri, lastmodified, etag, size) VALUES (1, 'card1', 'card1', 0, '" . md5('card1') . "', 5)");
 
     }
 
-    public function testGetAddressBooksForUser() {
+    function testGetAddressBooksForUser() {
 
         $result = $this->backend->getAddressBooksForUser('principals/user1');
 
-        $expected = array(
-            array(
-                'id' => 1,
-                'uri' => 'book1',
-                'principaluri' => 'principals/user1',
-                '{DAV:}displayname' => 'book1',
+        $expected = [
+            [
+                'id'                                                          => 1,
+                'uri'                                                         => 'book1',
+                'principaluri'                                                => 'principals/user1',
+                '{DAV:}displayname'                                           => 'book1',
                 '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 1',
-                '{http://calendarserver.org/ns/}getctag' => 1,
-                '{http://sabredav.org/ns}sync-token' => 1
-            )
-        );
+                '{http://calendarserver.org/ns/}getctag'                      => 1,
+                '{http://sabredav.org/ns}sync-token'                          => 1
+            ]
+        ];
 
         $this->assertEquals($expected, $result);
 
     }
 
-    public function testUpdateAddressBookInvalidProp() {
+    function testUpdateAddressBookInvalidProp() {
 
         $propPatch = new PropPatch([
-            '{DAV:}displayname' => 'updated',
+            '{DAV:}displayname'                                           => 'updated',
             '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'updated',
-            '{DAV:}foo' => 'bar',
+            '{DAV:}foo'                                                   => 'bar',
         ]);
 
         $this->backend->updateAddressBook(1, $propPatch);
@@ -62,23 +65,23 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $result = $this->backend->getAddressBooksForUser('principals/user1');
 
-        $expected = array(
-            array(
-                'id' => 1,
-                'uri' => 'book1',
-                'principaluri' => 'principals/user1',
-                '{DAV:}displayname' => 'book1',
+        $expected = [
+            [
+                'id'                                                          => 1,
+                'uri'                                                         => 'book1',
+                'principaluri'                                                => 'principals/user1',
+                '{DAV:}displayname'                                           => 'book1',
                 '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 1',
-                '{http://calendarserver.org/ns/}getctag' => 1,
-                '{http://sabredav.org/ns}sync-token' => 1
-            )
-        );
+                '{http://calendarserver.org/ns/}getctag'                      => 1,
+                '{http://sabredav.org/ns}sync-token'                          => 1
+            ]
+        ];
 
         $this->assertEquals($expected, $result);
 
     }
 
-    public function testUpdateAddressBookNoProps() {
+    function testUpdateAddressBookNoProps() {
 
         $propPatch = new PropPatch([
         ]);
@@ -89,27 +92,27 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $result = $this->backend->getAddressBooksForUser('principals/user1');
 
-        $expected = array(
-            array(
-                'id' => 1,
-                'uri' => 'book1',
-                'principaluri' => 'principals/user1',
-                '{DAV:}displayname' => 'book1',
+        $expected = [
+            [
+                'id'                                                          => 1,
+                'uri'                                                         => 'book1',
+                'principaluri'                                                => 'principals/user1',
+                '{DAV:}displayname'                                           => 'book1',
                 '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 1',
-                '{http://calendarserver.org/ns/}getctag' => 1,
-                '{http://sabredav.org/ns}sync-token' => 1
-            )
-        );
+                '{http://calendarserver.org/ns/}getctag'                      => 1,
+                '{http://sabredav.org/ns}sync-token'                          => 1
+            ]
+        ];
 
         $this->assertEquals($expected, $result);
 
 
     }
 
-    public function testUpdateAddressBookSuccess() {
+    function testUpdateAddressBookSuccess() {
 
         $propPatch = new PropPatch([
-            '{DAV:}displayname' => 'updated',
+            '{DAV:}displayname'                                           => 'updated',
             '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'updated',
         ]);
 
@@ -120,104 +123,108 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $result = $this->backend->getAddressBooksForUser('principals/user1');
 
-        $expected = array(
-            array(
-                'id' => 1,
-                'uri' => 'book1',
-                'principaluri' => 'principals/user1',
-                '{DAV:}displayname' => 'updated',
+        $expected = [
+            [
+                'id'                                                          => 1,
+                'uri'                                                         => 'book1',
+                'principaluri'                                                => 'principals/user1',
+                '{DAV:}displayname'                                           => 'updated',
                 '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'updated',
-                '{http://calendarserver.org/ns/}getctag' => 2,
-                '{http://sabredav.org/ns}sync-token' => 2
-            )
-        );
+                '{http://calendarserver.org/ns/}getctag'                      => 2,
+                '{http://sabredav.org/ns}sync-token'                          => 2
+            ]
+        ];
 
         $this->assertEquals($expected, $result);
 
 
     }
 
-    public function testDeleteAddressBook() {
+    function testDeleteAddressBook() {
 
         $this->backend->deleteAddressBook(1);
 
-        $this->assertEquals(array(), $this->backend->getAddressBooksForUser('principals/user1'));
+        $this->assertEquals([], $this->backend->getAddressBooksForUser('principals/user1'));
 
     }
 
     /**
      * @expectedException Sabre\DAV\Exception\BadRequest
      */
-    public function testCreateAddressBookUnsupportedProp() {
+    function testCreateAddressBookUnsupportedProp() {
 
-        $this->backend->createAddressBook('principals/user1','book2', array(
+        $this->backend->createAddressBook('principals/user1', 'book2', [
             '{DAV:}foo' => 'bar',
-        ));
+        ]);
 
     }
 
-    public function testCreateAddressBookSuccess() {
+    function testCreateAddressBookSuccess() {
 
-        $this->backend->createAddressBook('principals/user1','book2', array(
-            '{DAV:}displayname' => 'book2',
+        $this->backend->createAddressBook('principals/user1', 'book2', [
+            '{DAV:}displayname'                                           => 'book2',
             '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 2',
-        ));
+        ]);
 
-        $expected = array(
-            array(
-                'id' => 1,
-                'uri' => 'book1',
-                'principaluri' => 'principals/user1',
-                '{DAV:}displayname' => 'book1',
+        $expected = [
+            [
+                'id'                                                          => 1,
+                'uri'                                                         => 'book1',
+                'principaluri'                                                => 'principals/user1',
+                '{DAV:}displayname'                                           => 'book1',
                 '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 1',
-                '{http://calendarserver.org/ns/}getctag' => 1,
-                '{http://sabredav.org/ns}sync-token' => 1,
-            ),
-            array(
-                'id' => 2,
-                'uri' => 'book2',
-                'principaluri' => 'principals/user1',
-                '{DAV:}displayname' => 'book2',
+                '{http://calendarserver.org/ns/}getctag'                      => 1,
+                '{http://sabredav.org/ns}sync-token'                          => 1,
+            ],
+            [
+                'id'                                                          => 2,
+                'uri'                                                         => 'book2',
+                'principaluri'                                                => 'principals/user1',
+                '{DAV:}displayname'                                           => 'book2',
                 '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 2',
-                '{http://calendarserver.org/ns/}getctag' => 1,
-                '{http://sabredav.org/ns}sync-token' => 1,
-            )
-        );
+                '{http://calendarserver.org/ns/}getctag'                      => 1,
+                '{http://sabredav.org/ns}sync-token'                          => 1,
+            ]
+        ];
         $result = $this->backend->getAddressBooksForUser('principals/user1');
         $this->assertEquals($expected, $result);
 
     }
 
-    public function testGetCards() {
+    function testGetCards() {
 
         $result = $this->backend->getCards(1);
 
-        $expected = array(
-            array(
-                'id' => 1,
-                'uri' => 'card1',
+        $expected = [
+            [
+                'id'           => 1,
+                'uri'          => 'card1',
                 'lastmodified' => 0,
-                'etag' => '"' . md5('card1') . '"',
-                'size' => 5
-            )
-        );
+                'etag'         => '"' . md5('card1') . '"',
+                'size'         => 5
+            ]
+        ];
 
         $this->assertEquals($expected, $result);
 
     }
 
-    public function testGetCard() {
+    function testGetCard() {
 
-        $result = $this->backend->getCard(1,'card1');
+        $result = $this->backend->getCard(1, 'card1');
 
-        $expected = array(
-            'id' => 1,
-            'uri' => 'card1',
-            'carddata' => 'card1',
+        $expected = [
+            'id'           => 1,
+            'uri'          => 'card1',
+            'carddata'     => 'card1',
             'lastmodified' => 0,
-            'etag' => '"' . md5('card1') . '"',
-            'size' => 5
-        );
+            'etag'         => '"' . md5('card1') . '"',
+            'size'         => 5
+        ];
+
+        if (is_resource($result['carddata'])) {
+            $result['carddata'] = stream_get_contents($result['carddata']);
+        }
 
         $this->assertEquals($expected, $result);
 
@@ -226,13 +233,16 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
     /**
      * @depends testGetCard
      */
-    public function testCreateCard() {
+    function testCreateCard() {
 
         $result = $this->backend->createCard(1, 'card2', 'data2');
         $this->assertEquals('"' . md5('data2') . '"', $result);
-        $result = $this->backend->getCard(1,'card2');
+        $result = $this->backend->getCard(1, 'card2');
         $this->assertEquals(2, $result['id']);
         $this->assertEquals('card2', $result['uri']);
+        if (is_resource($result['carddata'])) {
+            $result['carddata'] = stream_get_contents($result['carddata']);
+        }
         $this->assertEquals('data2', $result['carddata']);
 
     }
@@ -240,41 +250,52 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
     /**
      * @depends testCreateCard
      */
-    public function testGetMultiple() {
+    function testGetMultiple() {
 
         $result = $this->backend->createCard(1, 'card2', 'data2');
         $result = $this->backend->createCard(1, 'card3', 'data3');
         $check = [
             [
-                'id' => 1,
-                'uri' => 'card1',
-                'carddata' => 'card1',
+                'id'           => 1,
+                'uri'          => 'card1',
+                'carddata'     => 'card1',
                 'lastmodified' => 0,
             ],
             [
-                'id' => 2,
-                'uri' => 'card2',
-                'carddata' => 'data2',
+                'id'           => 2,
+                'uri'          => 'card2',
+                'carddata'     => 'data2',
                 'lastmodified' => time(),
             ],
             [
-                'id' => 3,
-                'uri' => 'card3',
-                'carddata' => 'data3',
+                'id'           => 3,
+                'uri'          => 'card3',
+                'carddata'     => 'data3',
                 'lastmodified' => time(),
             ],
         ];
 
-        $result = $this->backend->getMultipleCards(1, ['card1','card2','card3']);
+        $result = $this->backend->getMultipleCards(1, ['card1', 'card2', 'card3']);
 
-        foreach($check as $index=>$node) {
+        foreach ($check as $index => $node) {
 
-            foreach($node as $k=>$v) {
+            foreach ($node as $k => $v) {
 
-                if ($k!=='lastmodified') {
-                    $this->assertEquals($v, $result[$index][$k]);
-                } else {
-                    $this->assertTrue(isset($result[$index][$k]));
+                $expected = $v;
+                $actual = $result[$index][$k];
+
+                switch ($k) {
+                    case 'lastmodified' :
+                        $this->assertInternalType('int', $actual);
+                        break;
+                    case 'carddata' :
+                        if (is_resource($actual)) {
+                            $actual = stream_get_contents($actual);
+                        }
+                        // No break intended.
+                    default :
+                        $this->assertEquals($expected, $actual);
+                        break;
                 }
 
             }
@@ -287,13 +308,16 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
     /**
      * @depends testGetCard
      */
-    public function testUpdateCard() {
+    function testUpdateCard() {
 
         $result = $this->backend->updateCard(1, 'card1', 'newdata');
         $this->assertEquals('"' . md5('newdata') . '"', $result);
 
-        $result = $this->backend->getCard(1,'card1');
+        $result = $this->backend->getCard(1, 'card1');
         $this->assertEquals(1, $result['id']);
+        if (is_resource($result['carddata'])) {
+            $result['carddata'] = stream_get_contents($result['carddata']);
+        }
         $this->assertEquals('newdata', $result['carddata']);
 
     }
@@ -301,10 +325,10 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
     /**
      * @depends testGetCard
      */
-    public function testDeleteCard() {
+    function testDeleteCard() {
 
         $this->backend->deleteCard(1, 'card1');
-        $result = $this->backend->getCard(1,'card1');
+        $result = $this->backend->getCard(1, 'card1');
         $this->assertFalse($result);
 
     }
@@ -347,4 +371,3 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
     }
 }
-
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php
index 3f96d3c5d..840b898e8 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php
@@ -13,24 +13,24 @@ class Mock extends AbstractBackend {
         $this->cards = $cards;
 
         if (is_null($this->addressBooks)) {
-            $this->addressBooks = array(
-                array(
-                    'id' => 'foo',
-                    'uri' => 'book1',
-                    'principaluri' => 'principals/user1',
+            $this->addressBooks = [
+                [
+                    'id'                => 'foo',
+                    'uri'               => 'book1',
+                    'principaluri'      => 'principals/user1',
                     '{DAV:}displayname' => 'd-name',
-                ),
-            );
+                ],
+            ];
 
-            $card2 = fopen('php://memory','r+');
-            fwrite($card2,"BEGIN:VCARD\nVERSION:3.0\nUID:45678\nEND:VCARD");
+            $card2 = fopen('php://memory', 'r+');
+            fwrite($card2, "BEGIN:VCARD\nVERSION:3.0\nUID:45678\nEND:VCARD");
             rewind($card2);
-            $this->cards = array(
-                'foo' => array(
+            $this->cards = [
+                'foo' => [
                     'card1' => "BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD",
                     'card2' => $card2,
-                ),
-            );
+                ],
+            ];
         }
 
     }
@@ -38,8 +38,8 @@ class Mock extends AbstractBackend {
 
     function getAddressBooksForUser($principalUri) {
 
-        $books = array();
-        foreach($this->addressBooks as $book) {
+        $books = [];
+        foreach ($this->addressBooks as $book) {
             if ($book['principaluri'] === $principalUri) {
                 $books[] = $book;
             }
@@ -64,14 +64,14 @@ class Mock extends AbstractBackend {
      * @param \Sabre\DAV\PropPatch $propPatch
      * @return void
      */
-    public function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
+    function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
 
-        foreach($this->addressBooks as &$book) {
+        foreach ($this->addressBooks as &$book) {
             if ($book['id'] !== $addressBookId)
                 continue;
 
             $propPatch->handleRemaining(function($mutations) use (&$book) {
-                foreach($mutations as $key=>$value) {
+                foreach ($mutations as $key => $value) {
                     $book[$key] = $value;
                 }
                 return true;
@@ -83,17 +83,17 @@ class Mock extends AbstractBackend {
 
     function createAddressBook($principalUri, $url, array $properties) {
 
-        $this->addressBooks[] = array_merge($properties, array(
-            'id' => $url,
-            'uri' => $url,
+        $this->addressBooks[] = array_merge($properties, [
+            'id'           => $url,
+            'uri'          => $url,
             'principaluri' => $principalUri,
-        ));
+        ]);
 
     }
 
     function deleteAddressBook($addressBookId) {
 
-        foreach($this->addressBooks as $key=>$value) {
+        foreach ($this->addressBooks as $key => $value) {
             if ($value['id'] === $addressBookId)
                 unset($this->addressBooks[$key]);
         }
@@ -101,41 +101,142 @@ class Mock extends AbstractBackend {
 
     }
 
+    /**
+     * Returns all cards for a specific addressbook id.
+     *
+     * This method should return the following properties for each card:
+     *   * carddata - raw vcard data
+     *   * uri - Some unique url
+     *   * lastmodified - A unix timestamp
+     *
+     * It's recommended to also return the following properties:
+     *   * etag - A unique etag. This must change every time the card changes.
+     *   * size - The size of the card in bytes.
+     *
+     * If these last two properties are provided, less time will be spent
+     * calculating them. If they are specified, you can also ommit carddata.
+     * This may speed up certain requests, especially with large cards.
+     *
+     * @param mixed $addressbookId
+     * @return array
+     */
     function getCards($addressBookId) {
 
-        $cards = array();
-        foreach($this->cards[$addressBookId] as $uri=>$data) {
-            $cards[] = array(
-                'uri' => $uri,
-                'carddata' => $data,
-            );
+        $cards = [];
+        foreach ($this->cards[$addressBookId] as $uri => $data) {
+            if (is_resource($data)) {
+                $cards[] = [
+                    'uri'      => $uri,
+                    'carddata' => $data,
+                ];
+            } else {
+                $cards[] = [
+                    'uri'      => $uri,
+                    'carddata' => $data,
+                    'etag'     => '"' . md5($data) . '"',
+                    'size'     => strlen($data)
+                ];
+            }
         }
         return $cards;
 
     }
 
+    /**
+     * Returns a specfic card.
+     *
+     * The same set of properties must be returned as with getCards. The only
+     * exception is that 'carddata' is absolutely required.
+     *
+     * If the card does not exist, you must return false.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @return array
+     */
     function getCard($addressBookId, $cardUri) {
 
         if (!isset($this->cards[$addressBookId][$cardUri])) {
             return false;
         }
 
-        return array(
-            'uri' => $cardUri,
-            'carddata' => $this->cards[$addressBookId][$cardUri],
-        );
+        $data = $this->cards[$addressBookId][$cardUri];
+        return [
+            'uri'      => $cardUri,
+            'carddata' => $data,
+            'etag'     => '"' . md5($data) . '"',
+            'size'     => strlen($data)
+        ];
 
     }
 
+    /**
+     * Creates a new card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressBooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag is for the
+     * newly created resource, and must be enclosed with double quotes (that
+     * is, the string itself must contain the double quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string|null
+     */
     function createCard($addressBookId, $cardUri, $cardData) {
 
+        if (is_resource($cardData)) {
+            $cardData = stream_get_contents($cardData);
+        }
         $this->cards[$addressBookId][$cardUri] = $cardData;
+        return '"' . md5($cardData) . '"';
 
     }
 
+    /**
+     * Updates a card.
+     *
+     * The addressbook id will be passed as the first argument. This is the
+     * same id as it is returned from the getAddressBooksForUser method.
+     *
+     * The cardUri is a base uri, and doesn't include the full path. The
+     * cardData argument is the vcard body, and is passed as a string.
+     *
+     * It is possible to return an ETag from this method. This ETag should
+     * match that of the updated resource, and must be enclosed with double
+     * quotes (that is: the string itself must contain the actual quotes).
+     *
+     * You should only return the ETag if you store the carddata as-is. If a
+     * subsequent GET request on the same card does not have the same body,
+     * byte-by-byte and you did return an ETag here, clients tend to get
+     * confused.
+     *
+     * If you don't return an ETag, you can just return null.
+     *
+     * @param mixed $addressBookId
+     * @param string $cardUri
+     * @param string $cardData
+     * @return string|null
+     */
     function updateCard($addressBookId, $cardUri, $cardData) {
 
+        if (is_resource($cardData)) {
+            $cardData = stream_get_contents($cardData);
+        }
         $this->cards[$addressBookId][$cardUri] = $cardData;
+        return '"' . md5($cardData) . '"';
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php
index 38cb655d0..c1b0e274e 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php
@@ -2,35 +2,8 @@
 
 namespace Sabre\CardDAV\Backend;
 
-require_once 'Sabre/TestUtil.php';
-
 class PDOMySQLTest extends AbstractPDOTest {
 
-    /**
-     * @return PDO
-     */
-    public function getPDO() {
-
-        if (!SABRE_HASMYSQL) $this->markTestSkipped('MySQL driver is not available, or not properly configured');
-
-        $pdo = \Sabre\TestUtil::getMySQLDB();
-        if (!$pdo) $this->markTestSkipped('Could not connect to MySQL database');
-
-        $pdo->query("DROP TABLE IF EXISTS addressbooks, cards, addressbookchanges");
-
-        $queries = explode(
-            ';',
-            file_get_contents(__DIR__ . '/../../../../examples/sql/mysql.addressbook.sql')
-        );
-
-        foreach($queries as $query) {
-            $query = trim($query," \r\n\t");
-            if ($query)
-                $pdo->exec($query);
-        }
-        return $pdo;
-
-    }
+    public $driver = 'mysql';
 
 }
-
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php
index 5a4a7a327..b187c4d78 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/Backend/PDOSqliteTest.php
@@ -2,53 +2,8 @@
 
 namespace Sabre\CardDAV\Backend;
 
-require_once 'Sabre/TestUtil.php';
-
 class PDOSqliteTest extends AbstractPDOTest {
 
-    function tearDown() {
-
-        if (file_exists(SABRE_TEMPDIR . '/pdobackend')) unlink(SABRE_TEMPDIR . '/pdobackend');
-        if (file_exists(SABRE_TEMPDIR . '/pdobackend2')) unlink(SABRE_TEMPDIR . '/pdobackend2');
-
-    }
-
-    /**
-     * @return PDO
-     */
-    function getPDO() {
-
-        return self::getSQLite();
-
-    }
-
-    /**
-     * @return PDO
-     */
-    static function getSQLite() {
-
-        if (!SABRE_HASSQLITE) $this->markTestSkipped('SQLite driver is not available');
-        $pdo = new \PDO('sqlite:'.SABRE_TEMPDIR.'/pdobackend');
-        $pdo->setAttribute(\PDO::ATTR_ERRMODE,\PDO::ERRMODE_EXCEPTION);
-
-        $pdo->query("DROP TABLE IF EXISTS addressbooks");
-        $pdo->query("DROP TABLE IF EXISTS addressbookchanges");
-        $pdo->query("DROP TABLE IF EXISTS cards");
-
-        $queries = explode(
-            ';',
-            file_get_contents(__DIR__ . '/../../../../examples/sql/sqlite.addressbooks.sql')
-        );
-
-        foreach($queries as $query) {
-            $query = trim($query," \r\n\t");
-            if ($query)
-                $pdo->exec($query);
-        }
-
-        return $pdo;
-
-    }
+    public $driver = 'sqlite';
 
 }
-
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/CardTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/CardTest.php
index cf8dbab0c..cb7d152c3 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/CardTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/CardTest.php
@@ -18,16 +18,16 @@ class CardTest extends \PHPUnit_Framework_TestCase {
         $this->backend = new Backend\Mock();
         $this->card = new Card(
             $this->backend,
-            array(
-                'uri' => 'book1',
-                'id' => 'foo',
+            [
+                'uri'          => 'book1',
+                'id'           => 'foo',
                 'principaluri' => 'principals/user1',
-            ),
-            array(
-                'uri' => 'card1',
+            ],
+            [
+                'uri'           => 'card1',
                 'addressbookid' => 'foo',
-                'carddata' => 'card',
-            )
+                'carddata'      => 'card',
+            ]
         );
 
     }
@@ -42,15 +42,15 @@ class CardTest extends \PHPUnit_Framework_TestCase {
 
         $this->card = new Card(
             $this->backend,
-            array(
-                'uri' => 'book1',
-                'id' => 'foo',
+            [
+                'uri'          => 'book1',
+                'id'           => 'foo',
                 'principaluri' => 'principals/user1',
-            ),
-            array(
-                'uri' => 'card1',
+            ],
+            [
+                'uri'           => 'card1',
                 'addressbookid' => 'foo',
-            )
+            ]
         );
         $result = $this->card->get();
         $this->assertEquals("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD", $result);
@@ -63,7 +63,7 @@ class CardTest extends \PHPUnit_Framework_TestCase {
      */
     function testPut() {
 
-        $file = fopen('php://memory','r+');
+        $file = fopen('php://memory', 'r+');
         fwrite($file, 'newdata');
         rewind($file);
         $this->card->put($file);
@@ -88,7 +88,7 @@ class CardTest extends \PHPUnit_Framework_TestCase {
 
     function testGetETag() {
 
-        $this->assertEquals('"' . md5('card') . '"' , $this->card->getETag());
+        $this->assertEquals('"' . md5('card') . '"', $this->card->getETag());
 
     }
 
@@ -96,19 +96,19 @@ class CardTest extends \PHPUnit_Framework_TestCase {
 
         $card = new Card(
             $this->backend,
-            array(
-                'uri' => 'book1',
-                'id' => 'foo',
+            [
+                'uri'          => 'book1',
+                'id'           => 'foo',
                 'principaluri' => 'principals/user1',
-            ),
-            array(
-                'uri' => 'card1',
+            ],
+            [
+                'uri'           => 'card1',
                 'addressbookid' => 'foo',
-                'carddata' => 'card',
-                'etag' => '"blabla"',
-            )
+                'carddata'      => 'card',
+                'etag'          => '"blabla"',
+            ]
         );
-        $this->assertEquals('"blabla"' , $card->getETag());
+        $this->assertEquals('"blabla"', $card->getETag());
 
     }
 
@@ -129,17 +129,17 @@ class CardTest extends \PHPUnit_Framework_TestCase {
 
         $card = new Card(
             $this->backend,
-            array(
-                'uri' => 'book1',
-                'id' => 'foo',
+            [
+                'uri'          => 'book1',
+                'id'           => 'foo',
                 'principaluri' => 'principals/user1',
-            ),
-            array(
-                'uri' => 'card1',
+            ],
+            [
+                'uri'           => 'card1',
                 'addressbookid' => 'foo',
-                'etag' => '"blabla"',
-                'size' => 4,
-            )
+                'etag'          => '"blabla"',
+                'size'          => 4,
+            ]
         );
         $this->assertEquals(4, $card->getSize());
 
@@ -149,58 +149,53 @@ class CardTest extends \PHPUnit_Framework_TestCase {
 
         $this->assertEquals('principals/user1', $this->card->getOwner());
         $this->assertNull($this->card->getGroup());
-        $this->assertEquals(array(
-            array(
-                'privilege' => '{DAV:}read',
+        $this->assertEquals([
+            [
+                'privilege' => '{DAV:}all',
                 'principal' => 'principals/user1',
                 'protected' => true,
-            ),
-            array(
-                'privilege' => '{DAV:}write',
-                'principal' => 'principals/user1',
-                'protected' => true,
-            ),
-        ), $this->card->getACL());
+            ],
+        ], $this->card->getACL());
 
     }
     function testOverrideACL() {
 
         $card = new Card(
             $this->backend,
-            array(
-                'uri' => 'book1',
-                'id' => 'foo',
+            [
+                'uri'          => 'book1',
+                'id'           => 'foo',
                 'principaluri' => 'principals/user1',
-            ),
-            array(
-                'uri' => 'card1',
+            ],
+            [
+                'uri'           => 'card1',
                 'addressbookid' => 'foo',
-                'carddata' => 'card',
-                'acl' => array(
-                    array(
+                'carddata'      => 'card',
+                'acl'           => [
+                    [
                         'privilege' => '{DAV:}read',
                         'principal' => 'principals/user1',
                         'protected' => true,
-                    ),
-                ),
-            )
+                    ],
+                ],
+            ]
         );
-        $this->assertEquals(array(
-            array(
+        $this->assertEquals([
+            [
                 'privilege' => '{DAV:}read',
                 'principal' => 'principals/user1',
                 'protected' => true,
-            ),
-        ), $card->getACL());
+            ],
+        ], $card->getACL());
 
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\MethodNotAllowed
+     * @expectedException Sabre\DAV\Exception\Forbidden
      */
     function testSetACL() {
 
-       $this->card->setACL(array());
+       $this->card->setACL([]);
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/IDirectoryTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/IDirectoryTest.php
index 431cd2524..4796a131f 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/IDirectoryTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/IDirectoryTest.php
@@ -8,15 +8,15 @@ class IDirectoryTest extends \PHPUnit_Framework_TestCase {
 
     function testResourceType() {
 
-        $tree = array(
+        $tree = [
             new DirectoryMock('directory')
-        );
+        ];
 
         $server = new DAV\Server($tree);
         $plugin = new Plugin();
         $server->addPlugin($plugin);
 
-        $props = $server->getProperties('directory', array('{DAV:}resourcetype'));
+        $props = $server->getProperties('directory', ['{DAV:}resourcetype']);
         $this->assertTrue($props['{DAV:}resourcetype']->is('{' . Plugin::NS_CARDDAV . '}directory'));
 
     }
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php
index b0ee45880..d79239d0f 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php
@@ -11,10 +11,10 @@ class MultiGetTest extends AbstractPluginTest {
 
     function testMultiGet() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_URI' => '/addressbooks/user1/book1',
-        ));
+            'REQUEST_URI'    => '/addressbooks/user1/book1',
+        ]);
 
         $request->setBody(
 '<?xml version="1.0"?>
@@ -37,27 +37,27 @@ class MultiGetTest extends AbstractPluginTest {
         $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
 
         // using the client for parsing
-        $client = new DAV\Client(array('baseUri'=>'/'));
+        $client = new DAV\Client(['baseUri' => '/']);
 
         $result = $client->parseMultiStatus($response->body);
 
-        $this->assertEquals(array(
-            '/addressbooks/user1/book1/card1' => array(
-                200 => array(
-                    '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
-                    '{urn:ietf:params:xml:ns:carddav}address-data' => "BEGIN:VCARD\r\nVERSION:3.0\r\nUID:12345\r\nEND:VCARD\r\n",
-                )
-            )
-        ), $result);
+        $this->assertEquals([
+            '/addressbooks/user1/book1/card1' => [
+                200 => [
+                    '{DAV:}getetag'                                => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
+                    '{urn:ietf:params:xml:ns:carddav}address-data' => "BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD",
+                ]
+            ]
+        ], $result);
 
     }
 
     function testMultiGetVCard4() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'REPORT',
-            'REQUEST_URI' => '/addressbooks/user1/book1',
-        ));
+            'REQUEST_URI'    => '/addressbooks/user1/book1',
+        ]);
 
         $request->setBody(
 '<?xml version="1.0"?>
@@ -80,20 +80,20 @@ class MultiGetTest extends AbstractPluginTest {
         $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
 
         // using the client for parsing
-        $client = new DAV\Client(array('baseUri'=>'/'));
+        $client = new DAV\Client(['baseUri' => '/']);
 
         $result = $client->parseMultiStatus($response->body);
 
         $prodId = "PRODID:-//Sabre//Sabre VObject " . \Sabre\VObject\Version::VERSION . "//EN";
 
-        $this->assertEquals(array(
-            '/addressbooks/user1/book1/card1' => array(
-                200 => array(
-                    '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
+        $this->assertEquals([
+            '/addressbooks/user1/book1/card1' => [
+                200 => [
+                    '{DAV:}getetag'                                => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
                     '{urn:ietf:params:xml:ns:carddav}address-data' => "BEGIN:VCARD\r\nVERSION:4.0\r\n$prodId\r\nUID:12345\r\nEND:VCARD\r\n",
-                )
-            )
-        ), $result);
+                ]
+            ]
+        ], $result);
 
     }
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/PluginTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/PluginTest.php
index 9c916350e..6962e7830 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/PluginTest.php
@@ -3,7 +3,6 @@
 namespace Sabre\CardDAV;
 
 use Sabre\DAV;
-use Sabre\DAV\Xml\Property\Href;
 
 class PluginTest extends AbstractPluginTest {
 
@@ -18,23 +17,23 @@ class PluginTest extends AbstractPluginTest {
 
     function testSupportedReportSet() {
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             '{' . Plugin::NS_CARDDAV . '}addressbook-multiget',
             '{' . Plugin::NS_CARDDAV . '}addressbook-query',
-        ), $this->plugin->getSupportedReportSet('addressbooks/user1/book1'));
+        ], $this->plugin->getSupportedReportSet('addressbooks/user1/book1'));
 
     }
 
     function testSupportedReportSetEmpty() {
 
-        $this->assertEquals(array(
-        ), $this->plugin->getSupportedReportSet(''));
+        $this->assertEquals([
+        ], $this->plugin->getSupportedReportSet(''));
 
     }
 
     function testAddressBookHomeSet() {
 
-        $result = $this->server->getProperties('principals/user1', array('{' . Plugin::NS_CARDDAV . '}addressbook-home-set'));
+        $result = $this->server->getProperties('principals/user1', ['{' . Plugin::NS_CARDDAV . '}addressbook-home-set']);
 
         $this->assertEquals(1, count($result));
         $this->assertTrue(isset($result['{' . Plugin::NS_CARDDAV . '}addressbook-home-set']));
@@ -44,11 +43,11 @@ class PluginTest extends AbstractPluginTest {
 
     function testDirectoryGateway() {
 
-        $result = $this->server->getProperties('principals/user1', array('{' . Plugin::NS_CARDDAV . '}directory-gateway'));
+        $result = $this->server->getProperties('principals/user1', ['{' . Plugin::NS_CARDDAV . '}directory-gateway']);
 
         $this->assertEquals(1, count($result));
         $this->assertTrue(isset($result['{' . Plugin::NS_CARDDAV . '}directory-gateway']));
-        $this->assertEquals(array('directory'), $result['{' . Plugin::NS_CARDDAV . '}directory-gateway']->getHrefs());
+        $this->assertEquals(['directory'], $result['{' . Plugin::NS_CARDDAV . '}directory-gateway']->getHrefs());
 
     }
 
@@ -64,7 +63,7 @@ class PluginTest extends AbstractPluginTest {
         $r = $this->server->emit('onHTMLActionsPanel', [$this->server->tree->getNodeForPath('addressbooks/user1'), &$output]);
         $this->assertFalse($r);
 
-        $this->assertTrue(!!strpos($output,'Display name'));
+        $this->assertTrue(!!strpos($output, 'Display name'));
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
index f828cc25b..0ba4fd669 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
@@ -5,44 +5,44 @@ namespace Sabre\CardDAV;
 use Sabre\HTTP;
 use Sabre\DAV\PropFind;
 
-class SogoStripContentType extends \Sabre\DAVServerTest {
+class SogoStripContentTypeTest extends \Sabre\DAVServerTest {
 
     protected $setupCardDAV = true;
-    protected $carddavAddressBooks = array(
-        array(
-            'id'  => 1,
-            'uri' => 'book1',
+    protected $carddavAddressBooks = [
+        [
+            'id'           => 1,
+            'uri'          => 'book1',
             'principaluri' => 'principals/user1',
-        ),
-    );
-    protected $carddavCards = array(
-        1 => array(
+        ],
+    ];
+    protected $carddavCards = [
+        1 => [
             'card1.vcf' => "BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD",
-        ),
-    );
+        ],
+    ];
 
     function testDontStrip() {
 
-        $result = $this->server->getProperties('addressbooks/user1/book1/card1.vcf',array('{DAV:}getcontenttype'));
-        $this->assertEquals(array(
+        $result = $this->server->getProperties('addressbooks/user1/book1/card1.vcf', ['{DAV:}getcontenttype']);
+        $this->assertEquals([
             '{DAV:}getcontenttype' => 'text/vcard; charset=utf-8'
-        ), $result);
+        ], $result);
 
     }
     function testStrip() {
 
-        $this->server->httpRequest = HTTP\Sapi::createFromServerArray(array(
+        $this->server->httpRequest = HTTP\Sapi::createFromServerArray([
             'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 Lightning/1.2.1',
-        ));
-        $result = $this->server->getProperties('addressbooks/user1/book1/card1.vcf',array('{DAV:}getcontenttype'));
-        $this->assertEquals(array(
+        ]);
+        $result = $this->server->getProperties('addressbooks/user1/book1/card1.vcf', ['{DAV:}getcontenttype']);
+        $this->assertEquals([
             '{DAV:}getcontenttype' => 'text/x-vcard'
-        ), $result);
+        ], $result);
 
     }
     function testDontTouchOtherMimeTypes() {
 
-        $this->server->httpRequest = new HTTP\Request('GET','/addressbooks/user1/book1/card1.vcf', [
+        $this->server->httpRequest = new HTTP\Request('GET', '/addressbooks/user1/book1/card1.vcf', [
             'User-Agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 Lightning/1.2.1',
         ]);
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/TestUtil.php b/vendor/sabre/dav/tests/Sabre/CardDAV/TestUtil.php
index c9cc10d35..ec8a3501e 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/TestUtil.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/TestUtil.php
@@ -2,8 +2,6 @@
 
 namespace Sabre\CardDAV;
 
-use PDO;
-
 class TestUtil {
 
     static function getBackend() {
@@ -22,18 +20,18 @@ class TestUtil {
         $addressbookId = $backend->createAddressBook(
             'principals/user1',
             'UUID-123467',
-            array(
-                '{DAV:}displayname' => 'user1 addressbook',
+            [
+                '{DAV:}displayname'                                       => 'user1 addressbook',
                 '{urn:ietf:params:xml:ns:carddav}addressbook-description' => 'AddressBook description',
-            )
+            ]
         );
         $backend->createAddressBook(
             'principals/user1',
             'UUID-123468',
-            array(
-                '{DAV:}displayname' => 'user1 addressbook2',
+            [
+                '{DAV:}displayname'                                       => 'user1 addressbook2',
                 '{urn:ietf:params:xml:ns:carddav}addressbook-description' => 'AddressBook description',
-            )
+            ]
         );
         $backend->createCard($addressbookId, 'UUID-2345', self::getTestCardData());
         return $pdo;
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/VCFExportTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/VCFExportTest.php
index 71fde719d..82d82fadd 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/VCFExportTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/VCFExportTest.php
@@ -10,21 +10,21 @@ class VCFExportTest extends \Sabre\DAVServerTest {
     protected $autoLogin = 'user1';
     protected $setupACL = true;
 
-    protected $carddavAddressBooks = array(
-        array(
-            'id' => 'book1',
-            'uri' => 'book1',
+    protected $carddavAddressBooks = [
+        [
+            'id'           => 'book1',
+            'uri'          => 'book1',
             'principaluri' => 'principals/user1',
-        )
-    );
-    protected $carddavCards = array(
-        'book1' => array(
+        ]
+    ];
+    protected $carddavCards = [
+        'book1' => [
             "card1" => "BEGIN:VCARD\r\nFN:Person1\r\nEND:VCARD\r\n",
             "card2" => "BEGIN:VCARD\r\nFN:Person2\r\nEND:VCARD",
             "card3" => "BEGIN:VCARD\r\nFN:Person3\r\nEND:VCARD\r\n",
             "card4" => "BEGIN:VCARD\nFN:Person4\nEND:VCARD\n",
-        )
-    );
+        ]
+    ];
 
     function setUp() {
 
@@ -50,11 +50,11 @@ class VCFExportTest extends \Sabre\DAVServerTest {
 
     function testExport() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_URI' => '/addressbooks/user1/book1?export',
-            'QUERY_STRING' => 'export',
+        $request = HTTP\Sapi::createFromServerArray([
+            'REQUEST_URI'    => '/addressbooks/user1/book1?export',
+            'QUERY_STRING'   => 'export',
             'REQUEST_METHOD' => 'GET',
-        ));
+        ]);
 
         $response = $this->request($request);
         $this->assertEquals(200, $response->status, $response->body);
@@ -73,7 +73,7 @@ FN:Person4
 END:VCARD
 ";
         // We actually expected windows line endings
-        $expected = str_replace("\n","\r\n", $expected);
+        $expected = str_replace("\n", "\r\n", $expected);
 
         $this->assertEquals($expected, $response->body);
 
@@ -89,4 +89,47 @@ END:VCARD
 
     }
 
+    function testContentDisposition() {
+
+        $request = new HTTP\Request(
+            'GET',
+            '/addressbooks/user1/book1?export'
+        );
+
+        $response = $this->request($request, 200);
+        $this->assertEquals('text/directory', $response->getHeader('Content-Type'));
+        $this->assertEquals(
+            'attachment; filename="book1-' . date('Y-m-d') . '.vcf"',
+            $response->getHeader('Content-Disposition')
+        );
+
+    }
+
+    function testContentDispositionBadChars() {
+
+        $this->carddavBackend->createAddressBook(
+            'principals/user1',
+            'book-b_ad"(ch)ars',
+            []
+        );
+        $this->carddavBackend->createCard(
+            'book-b_ad"(ch)ars',
+            'card1',
+            "BEGIN:VCARD\r\nFN:Person1\r\nEND:VCARD\r\n"
+        );
+
+        $request = new HTTP\Request(
+            'GET',
+            '/addressbooks/user1/book-b_ad"(ch)ars?export'
+        );
+
+        $response = $this->request($request, 200);
+        $this->assertEquals('text/directory', $response->getHeader('Content-Type'));
+        $this->assertEquals(
+            'attachment; filename="book-b_adchars-' . date('Y-m-d') . '.vcf"',
+            $response->getHeader('Content-Disposition')
+        );
+
+    }
+
 }
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php
index c87716c10..57ac21b4a 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php
@@ -48,35 +48,35 @@ HELLO;
 
         // Check if TITLE is defined
         $filter1 =
-            array('name' => 'title', 'is-not-defined' => false, 'param-filters' => array(), 'text-matches' => array());
+            ['name' => 'title', 'is-not-defined' => false, 'param-filters' => [], 'text-matches' => []];
 
         // Check if FOO is defined
         $filter2 =
-            array('name' => 'foo', 'is-not-defined' => false, 'param-filters' => array(), 'text-matches' => array());
+            ['name' => 'foo', 'is-not-defined' => false, 'param-filters' => [], 'text-matches' => []];
 
         // Check if TITLE is not defined
         $filter3 =
-            array('name' => 'title', 'is-not-defined' => true, 'param-filters' => array(), 'text-matches' => array());
+            ['name' => 'title', 'is-not-defined' => true, 'param-filters' => [], 'text-matches' => []];
 
         // Check if FOO is not defined
         $filter4 =
-            array('name' => 'foo', 'is-not-defined' => true, 'param-filters' => array(), 'text-matches' => array());
+            ['name' => 'foo', 'is-not-defined' => true, 'param-filters' => [], 'text-matches' => []];
 
         // Check if TEL[TYPE] is defined
         $filter5 =
-            array(
-                'name' => 'tel',
+            [
+                'name'           => 'tel',
                 'is-not-defined' => false,
-                'test' => 'anyof',
-                'param-filters' => array(
-                    array(
-                        'name' => 'type',
+                'test'           => 'anyof',
+                'param-filters'  => [
+                    [
+                        'name'           => 'type',
                         'is-not-defined' => false,
-                        'text-match' => null
-                    ),
-                ),
-                'text-matches' => array(),
-            );
+                        'text-match'     => null
+                    ],
+                ],
+                'text-matches' => [],
+            ];
 
         // Check if TEL[FOO] is defined
         $filter6 = $filter5;
@@ -101,20 +101,20 @@ HELLO;
 
         // Check if URL contains 'google'
         $filter11 =
-            array(
-                'name' => 'url',
+            [
+                'name'           => 'url',
                 'is-not-defined' => false,
-                'test' => 'anyof',
-                'param-filters' => array(),
-                'text-matches' => array(
-                    array(
-                        'match-type' => 'contains',
-                        'value' => 'google',
+                'test'           => 'anyof',
+                'param-filters'  => [],
+                'text-matches'   => [
+                    [
+                        'match-type'       => 'contains',
+                        'value'            => 'google',
                         'negate-condition' => false,
-                        'collation' => 'i;octet',
-                    ),
-                ),
-            );
+                        'collation'        => 'i;octet',
+                    ],
+                ],
+            ];
 
         // Check if URL contains 'bing'
         $filter12 = $filter11;
@@ -131,12 +131,12 @@ HELLO;
 
         // Param filter with text
         $filter15 = $filter5;
-        $filter15['param-filters'][0]['text-match'] = array(
-            'match-type' => 'contains',
-            'value' => 'WORK',
-            'collation' => 'i;octet',
+        $filter15['param-filters'][0]['text-match'] = [
+            'match-type'       => 'contains',
+            'value'            => 'WORK',
+            'collation'        => 'i;octet',
             'negate-condition' => false,
-        );
+        ];
         $filter16 = $filter15;
         $filter16['param-filters'][0]['text-match']['negate-condition'] = true;
 
@@ -144,60 +144,60 @@ HELLO;
         // Param filter + text filter
         $filter17 = $filter5;
         $filter17['test'] = 'anyof';
-        $filter17['text-matches'][] = array(
-            'match-type' => 'contains',
-            'value' => '444',
-            'collation' => 'i;octet',
+        $filter17['text-matches'][] = [
+            'match-type'       => 'contains',
+            'value'            => '444',
+            'collation'        => 'i;octet',
             'negate-condition' => false,
-        );
+        ];
 
         $filter18 = $filter17;
         $filter18['text-matches'][0]['negate-condition'] = true;
 
         $filter18['test'] = 'allof';
 
-        return array(
+        return [
 
             // Basic filters
-            array($body1, array($filter1), 'anyof',true),
-            array($body1, array($filter2), 'anyof',false),
-            array($body1, array($filter3), 'anyof',false),
-            array($body1, array($filter4), 'anyof',true),
+            [$body1, [$filter1], 'anyof',true],
+            [$body1, [$filter2], 'anyof',false],
+            [$body1, [$filter3], 'anyof',false],
+            [$body1, [$filter4], 'anyof',true],
 
             // Combinations
-            array($body1, array($filter1, $filter2), 'anyof',true),
-            array($body1, array($filter1, $filter2), 'allof',false),
-            array($body1, array($filter1, $filter4), 'anyof',true),
-            array($body1, array($filter1, $filter4), 'allof',true),
-            array($body1, array($filter2, $filter3), 'anyof',false),
-            array($body1, array($filter2, $filter3), 'allof',false),
+            [$body1, [$filter1, $filter2], 'anyof',true],
+            [$body1, [$filter1, $filter2], 'allof',false],
+            [$body1, [$filter1, $filter4], 'anyof',true],
+            [$body1, [$filter1, $filter4], 'allof',true],
+            [$body1, [$filter2, $filter3], 'anyof',false],
+            [$body1, [$filter2, $filter3], 'allof',false],
 
             // Basic parameters
-            array($body1, array($filter5), 'anyof', true, 'TEL;TYPE is defined, so this should return true'),
-            array($body1, array($filter6), 'anyof', false, 'TEL;FOO is not defined, so this should return false'),
+            [$body1, [$filter5], 'anyof', true, 'TEL;TYPE is defined, so this should return true'],
+            [$body1, [$filter6], 'anyof', false, 'TEL;FOO is not defined, so this should return false'],
 
-            array($body1, array($filter7), 'anyof', false, 'TEL;TYPE is defined, so this should return false'),
-            array($body1, array($filter8), 'anyof', true, 'TEL;TYPE is not defined, so this should return true'),
+            [$body1, [$filter7], 'anyof', false, 'TEL;TYPE is defined, so this should return false'],
+            [$body1, [$filter8], 'anyof', true, 'TEL;TYPE is not defined, so this should return true'],
 
             // Combined parameters
-            array($body1, array($filter9), 'anyof', true),
-            array($body1, array($filter10), 'anyof', false),
+            [$body1, [$filter9], 'anyof', true],
+            [$body1, [$filter10], 'anyof', false],
 
             // Text-filters
-            array($body1, array($filter11), 'anyof', true),
-            array($body1, array($filter12), 'anyof', false),
-            array($body1, array($filter13), 'anyof', false),
-            array($body1, array($filter14), 'anyof', true),
+            [$body1, [$filter11], 'anyof', true],
+            [$body1, [$filter12], 'anyof', false],
+            [$body1, [$filter13], 'anyof', false],
+            [$body1, [$filter14], 'anyof', true],
 
             // Param filter with text-match
-            array($body1, array($filter15), 'anyof', true),
-            array($body1, array($filter16), 'anyof', false),
+            [$body1, [$filter15], 'anyof', true],
+            [$body1, [$filter16], 'anyof', false],
 
             // Param filter + text filter
-            array($body1, array($filter17), 'anyof', true),
-            array($body1, array($filter18), 'anyof', false),
-            array($body1, array($filter18), 'anyof', false),
-        );
+            [$body1, [$filter17], 'anyof', true],
+            [$body1, [$filter18], 'anyof', false],
+            [$body1, [$filter18], 'anyof', false],
+        ];
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php
index ad8495c13..dda8a0c37 100644
--- a/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php
@@ -15,20 +15,20 @@ class ValidateVCardTest extends \PHPUnit_Framework_TestCase {
 
     function setUp() {
 
-        $addressbooks = array(
-            array(
-                'id' => 'addressbook1',
+        $addressbooks = [
+            [
+                'id'           => 'addressbook1',
                 'principaluri' => 'principals/admin',
-                'uri' => 'addressbook1',
-            )
-        );
+                'uri'          => 'addressbook1',
+            ]
+        ];
 
-        $this->cardBackend = new Backend\Mock($addressbooks,array());
+        $this->cardBackend = new Backend\Mock($addressbooks, []);
         $principalBackend = new DAVACL\PrincipalBackend\Mock();
 
-        $tree = array(
+        $tree = [
             new AddressBookRoot($principalBackend, $this->cardBackend),
-        );
+        ];
 
         $this->server = new DAV\Server($tree);
         $this->server->sapi = new HTTP\SapiMock();
@@ -42,21 +42,36 @@ class ValidateVCardTest extends \PHPUnit_Framework_TestCase {
 
     }
 
-    function request(HTTP\Request $request) {
+    function request(HTTP\Request $request, $expectedStatus = null) {
 
         $this->server->httpRequest = $request;
         $this->server->exec();
 
+        if ($expectedStatus) {
+
+            $realStatus = $this->server->httpResponse->getStatus();
+
+            $msg = '';
+            if ($realStatus !== $expectedStatus) {
+                $msg = 'Response body: ' . $this->server->httpResponse->getBodyAsString();
+            }
+            $this->assertEquals(
+                $expectedStatus,
+                $realStatus,
+                $msg
+            );
+        }
+
         return $this->server->httpResponse;
 
     }
 
     function testCreateFile() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/addressbooks/admin/addressbook1/blabla.vcf',
-        ));
+            'REQUEST_URI'    => '/addressbooks/admin/addressbook1/blabla.vcf',
+        ]);
 
         $response = $this->request($request);
 
@@ -66,21 +81,134 @@ class ValidateVCardTest extends \PHPUnit_Framework_TestCase {
 
     function testCreateFileValid() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/addressbooks/admin/addressbook1/blabla.vcf',
-        ));
-        $request->setBody("BEGIN:VCARD\r\nUID:foo\r\nEND:VCARD\r\n");
-
-        $response = $this->request($request);
-
-        $this->assertEquals(201, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-        $expected = array(
-            'uri'          => 'blabla.vcf',
-            'carddata' => "BEGIN:VCARD\r\nUID:foo\r\nEND:VCARD\r\n",
+        $request = new HTTP\Request(
+            'PUT',
+            '/addressbooks/admin/addressbook1/blabla.vcf'
         );
 
-        $this->assertEquals($expected, $this->cardBackend->getCard('addressbook1','blabla.vcf'));
+        $vcard = <<<VCF
+BEGIN:VCARD
+VERSION:4.0
+UID:foo
+FN:Firstname LastName
+N:LastName;FirstName;;;
+END:VCARD
+VCF;
+        $request->setBody($vcard);
+
+        $response = $this->request($request, 201);
+
+        // The custom Ew header should not be set
+        $this->assertNull(
+            $response->getHeader('X-Sabre-Ew-Gross')
+        );
+        // Valid, non-auto-fixed responses should contain an ETag.
+        $this->assertTrue(
+            $response->getHeader('ETag') !== null,
+            'We did not receive an etag'
+        );
+
+
+        $expected = [
+            'uri'      => 'blabla.vcf',
+            'carddata' => $vcard,
+            'size'     => strlen($vcard),
+            'etag'     => '"' . md5($vcard) . '"',
+        ];
+
+        $this->assertEquals($expected, $this->cardBackend->getCard('addressbook1', 'blabla.vcf'));
+
+    }
+
+    /**
+     * This test creates an intentionally broken vCard that vobject is able
+     * to automatically repair.
+     *
+     * @depends testCreateFileValid
+     */
+    function testCreateVCardAutoFix() {
+
+        $request = new HTTP\Request(
+            'PUT',
+            '/addressbooks/admin/addressbook1/blabla.vcf'
+        );
+
+        // The error in this vcard is that there's not enough semi-colons in N
+        $vcard = <<<VCF
+BEGIN:VCARD
+VERSION:4.0
+UID:foo
+FN:Firstname LastName
+N:LastName;FirstName;;
+END:VCARD
+VCF;
+
+        $request->setBody($vcard);
+
+        $response = $this->request($request, 201);
+
+        // Auto-fixed vcards should NOT return an etag
+        $this->assertNull(
+            $response->getHeader('ETag')
+        );
+
+        // We should have gotten an Ew header
+        $this->assertNotNull(
+            $response->getHeader('X-Sabre-Ew-Gross')
+        );
+
+        $expectedVCard = <<<VCF
+BEGIN:VCARD\r
+VERSION:4.0\r
+UID:foo\r
+FN:Firstname LastName\r
+N:LastName;FirstName;;;\r
+END:VCARD\r
+
+VCF;
+
+        $expected = [
+            'uri'      => 'blabla.vcf',
+            'carddata' => $expectedVCard,
+            'size'     => strlen($expectedVCard),
+            'etag'     => '"' . md5($expectedVCard) . '"',
+        ];
+
+        $this->assertEquals($expected, $this->cardBackend->getCard('addressbook1', 'blabla.vcf'));
+
+    }
+
+    /**
+     * This test creates an intentionally broken vCard that vobject is able
+     * to automatically repair.
+     *
+     * However, we're supplying a heading asking the server to treat the
+     * request as strict, so the server should still let the request fail.
+     *
+     * @depends testCreateFileValid
+     */
+    function testCreateVCardStrictFail() {
+
+        $request = new HTTP\Request(
+            'PUT',
+            '/addressbooks/admin/addressbook1/blabla.vcf',
+            [
+                'Prefer' => 'handling=strict',
+            ]
+        );
+
+        // The error in this vcard is that there's not enough semi-colons in N
+        $vcard = <<<VCF
+BEGIN:VCARD
+VERSION:4.0
+UID:foo
+FN:Firstname LastName
+N:LastName;FirstName;;
+END:VCARD
+VCF;
+
+        $request->setBody($vcard);
+        $this->request($request, 415);
 
     }
 
@@ -90,14 +218,22 @@ class ValidateVCardTest extends \PHPUnit_Framework_TestCase {
             'PUT',
             '/addressbooks/admin/addressbook1/blabla.vcf'
         );
-        $request->setBody("BEGIN:VCARD\r\nEND:VCARD\r\n");
+        $vcard = <<<VCF
+BEGIN:VCARD
+VERSION:4.0
+FN:Firstname LastName
+N:LastName;FirstName;;;
+END:VCARD
+VCF;
+        $request->setBody($vcard);
 
-        $response = $this->request($request);
+        $response = $this->request($request, 201);
 
-        $this->assertEquals(201, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
-        $foo = $this->cardBackend->getCard('addressbook1','blabla.vcf');
-        $this->assertTrue(strpos($foo['carddata'],'UID')!==false);
+        $foo = $this->cardBackend->getCard('addressbook1', 'blabla.vcf');
+        $this->assertTrue(
+            strpos($foo['carddata'], 'UID') !== false,
+            print_r($foo, true)
+        );
     }
 
     function testCreateFileJson() {
@@ -106,23 +242,23 @@ class ValidateVCardTest extends \PHPUnit_Framework_TestCase {
             'PUT',
             '/addressbooks/admin/addressbook1/blabla.vcf'
         );
-        $request->setBody('[ "vcard" , [ [ "UID" , {}, "text", "foo" ] ] ]');
+        $request->setBody('[ "vcard" , [ [ "VERSION", {}, "text", "4.0"], [ "UID" , {}, "text", "foo" ], [ "FN", {}, "text", "FirstName LastName"] ] ]');
 
         $response = $this->request($request);
 
         $this->assertEquals(201, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
 
-        $foo = $this->cardBackend->getCard('addressbook1','blabla.vcf');
-        $this->assertEquals("BEGIN:VCARD\r\nUID:foo\r\nEND:VCARD\r\n", $foo['carddata']);
+        $foo = $this->cardBackend->getCard('addressbook1', 'blabla.vcf');
+        $this->assertEquals("BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nFN:FirstName LastName\r\nEND:VCARD\r\n", $foo['carddata']);
 
     }
 
     function testCreateFileVCalendar() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/addressbooks/admin/addressbook1/blabla.vcf',
-        ));
+            'REQUEST_URI'    => '/addressbooks/admin/addressbook1/blabla.vcf',
+        ]);
         $request->setBody("BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n");
 
         $response = $this->request($request);
@@ -133,40 +269,37 @@ class ValidateVCardTest extends \PHPUnit_Framework_TestCase {
 
     function testUpdateFile() {
 
-        $this->cardBackend->createCard('addressbook1','blabla.vcf','foo');
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/addressbooks/admin/addressbook1/blabla.vcf',
-        ));
+        $this->cardBackend->createCard('addressbook1', 'blabla.vcf', 'foo');
+        $request = new HTTP\Request(
+            'PUT',
+            '/addressbooks/admin/addressbook1/blabla.vcf'
+        );
 
-        $response = $this->request($request);
-
-        $this->assertEquals(415, $response->status);
+        $response = $this->request($request, 415);
 
     }
 
     function testUpdateFileParsableBody() {
 
-        $this->cardBackend->createCard('addressbook1','blabla.vcf','foo');
-        $request = HTTP\Sapi::createFromServerArray(array(
-            'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI' => '/addressbooks/admin/addressbook1/blabla.vcf',
-        ));
-        $body = "BEGIN:VCARD\r\nUID:foo\r\nEND:VCARD\r\n";
-        $request->setBody($body);
-
-        $response = $this->request($request);
-
-        $this->assertEquals(204, $response->status);
-
-        $expected = array(
-            'uri'          => 'blabla.vcf',
-            'carddata' => $body,
+        $this->cardBackend->createCard('addressbook1', 'blabla.vcf', 'foo');
+        $request = new HTTP\Request(
+            'PUT',
+            '/addressbooks/admin/addressbook1/blabla.vcf'
         );
 
-        $this->assertEquals($expected, $this->cardBackend->getCard('addressbook1','blabla.vcf'));
+        $body = "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nFN:FirstName LastName\r\nEND:VCARD\r\n";
+        $request->setBody($body);
+
+        $response = $this->request($request, 204);
+
+        $expected = [
+            'uri'          => 'blabla.vcf',
+            'carddata'     => $body,
+            'size'         => strlen($body),
+            'etag'         => '"' . md5($body) . '"',
+        ];
+
+        $this->assertEquals($expected, $this->cardBackend->getCard('addressbook1', 'blabla.vcf'));
 
     }
 }
-
-?>
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/AbstractServer.php b/vendor/sabre/dav/tests/Sabre/DAV/AbstractServer.php
index b5b8d64ee..6a8d389a0 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/AbstractServer.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/AbstractServer.php
@@ -24,7 +24,7 @@ abstract class AbstractServer extends \PHPUnit_Framework_TestCase {
         $this->server->sapi = new HTTP\SapiMock();
         $this->server->httpResponse = $this->response;
         $this->server->debugExceptions = true;
-        $this->deleteTree(SABRE_TEMPDIR,false);
+        $this->deleteTree(SABRE_TEMPDIR, false);
         file_put_contents(SABRE_TEMPDIR . '/test.txt', 'Test contents');
         mkdir(SABRE_TEMPDIR . '/dir');
         file_put_contents(SABRE_TEMPDIR . '/dir/child.txt', 'Child contents');
@@ -34,7 +34,7 @@ abstract class AbstractServer extends \PHPUnit_Framework_TestCase {
 
     function tearDown() {
 
-        $this->deleteTree(SABRE_TEMPDIR,false);
+        $this->deleteTree(SABRE_TEMPDIR, false);
 
     }
 
@@ -44,12 +44,12 @@ abstract class AbstractServer extends \PHPUnit_Framework_TestCase {
 
     }
 
-    private function deleteTree($path,$deleteRoot = true) {
+    private function deleteTree($path, $deleteRoot = true) {
 
-        foreach(scandir($path) as $node) {
+        foreach (scandir($path) as $node) {
 
-            if ($node=='.' || $node=='.svn' || $node=='..') continue;
-            $myPath = $path.'/'. $node;
+            if ($node == '.' || $node == '.svn' || $node == '..') continue;
+            $myPath = $path . '/' . $node;
             if (is_file($myPath)) {
                 unlink($myPath);
             } else {
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
index 7d7a59898..455403aff 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
@@ -2,7 +2,6 @@
 
 namespace Sabre\DAV\Auth\Backend;
 
-use Sabre\DAV;
 use Sabre\HTTP;
 
 class AbstractBasicTest extends \PHPUnit_Framework_TestCase {
@@ -22,10 +21,10 @@ class AbstractBasicTest extends \PHPUnit_Framework_TestCase {
 
     function testCheckUnknownUser() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'PHP_AUTH_USER' => 'username',
-            'PHP_AUTH_PW' => 'wrongpassword',
-        ));
+            'PHP_AUTH_PW'   => 'wrongpassword',
+        ]);
         $response = new HTTP\Response();
 
         $backend = new AbstractBasicMock();
@@ -38,10 +37,10 @@ class AbstractBasicTest extends \PHPUnit_Framework_TestCase {
 
     function testCheckSuccess() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'PHP_AUTH_USER' => 'username',
-            'PHP_AUTH_PW' => 'password',
-        ));
+            'PHP_AUTH_PW'   => 'password',
+        ]);
         $response = new HTTP\Response();
 
         $backend = new AbstractBasicMock();
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
index 8ef416c37..14c72aaa0 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
@@ -2,7 +2,6 @@
 
 namespace Sabre\DAV\Auth\Backend;
 
-use Sabre\DAV;
 use Sabre\HTTP;
 
 class AbstractDigestTest extends \PHPUnit_Framework_TestCase {
@@ -87,12 +86,12 @@ class AbstractDigestTest extends \PHPUnit_Framework_TestCase {
     function testCheck() {
 
         $digestHash = md5('HELLO:12345:1:1:auth:' . md5('GET:/'));
-        $header = 'username=user, realm=myRealm, nonce=12345, uri=/, response='.$digestHash.', opaque=1, qop=auth, nc=1, cnonce=1';
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $header = 'username=user, realm=myRealm, nonce=12345, uri=/, response=' . $digestHash . ', opaque=1, qop=auth, nc=1, cnonce=1';
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD'  => 'GET',
             'PHP_AUTH_DIGEST' => $header,
             'REQUEST_URI'     => '/',
-        ));
+        ]);
 
         $response = new HTTP\Response();
 
@@ -127,10 +126,10 @@ class AbstractDigestMock extends AbstractDigest {
 
     function getDigestHash($realm, $userName) {
 
-        switch($userName) {
+        switch ($userName) {
             case 'null' : return null;
             case 'false' : return false;
-            case 'array' : return array();
+            case 'array' : return [];
             case 'user'  : return 'HELLO';
         }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
index d22923d51..b14e9fa2e 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
@@ -2,11 +2,21 @@
 
 namespace Sabre\DAV\Auth\Backend;
 
-use Sabre\DAV;
-
 abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
-    abstract function getPDO();
+    use \Sabre\DAV\DbTestHelperTrait;
+
+    function setUp() {
+
+        $this->dropTables('users');
+        $this->createSchema('users');
+
+        $this->getPDO()->query(
+            "INSERT INTO users (username,digesta1) VALUES ('user','hash')"
+
+        );
+
+    }
 
     function testConstruct() {
 
@@ -24,11 +34,11 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
 
-        $this->assertNull($backend->getDigestHash('realm','blabla'));
+        $this->assertNull($backend->getDigestHash('realm', 'blabla'));
 
         $expected = 'hash';
 
-        $this->assertEquals($expected, $backend->getDigestHash('realm','user'));
+        $this->assertEquals($expected, $backend->getDigestHash('realm', 'user'));
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
index 697b593db..29cbc2162 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
@@ -2,7 +2,6 @@
 
 namespace Sabre\DAV\Auth\Backend;
 
-use Sabre\DAV;
 use Sabre\HTTP;
 
 class ApacheTest extends \PHPUnit_Framework_TestCase {
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php
index d2e5fe49b..f694f4806 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php
@@ -6,7 +6,7 @@ class FileTest extends \PHPUnit_Framework_TestCase {
 
     function tearDown() {
 
-        if (file_exists(SABRE_TEMPDIR . '/filebackend')) unlink(SABRE_TEMPDIR .'/filebackend');
+        if (file_exists(SABRE_TEMPDIR . '/filebackend')) unlink(SABRE_TEMPDIR . '/filebackend');
 
     }
 
@@ -22,20 +22,19 @@ class FileTest extends \PHPUnit_Framework_TestCase {
      */
     function testLoadFileBroken() {
 
-        file_put_contents(SABRE_TEMPDIR . '/backend','user:realm:hash');
-        $file = new File();
-        $file->loadFile(SABRE_TEMPDIR .'/backend');
+        file_put_contents(SABRE_TEMPDIR . '/backend', 'user:realm:hash');
+        $file = new File(SABRE_TEMPDIR . '/backend');
 
     }
 
     function testLoadFile() {
 
-        file_put_contents(SABRE_TEMPDIR . '/backend','user:realm:' . md5('user:realm:password'));
+        file_put_contents(SABRE_TEMPDIR . '/backend', 'user:realm:' . md5('user:realm:password'));
         $file = new File();
         $file->loadFile(SABRE_TEMPDIR . '/backend');
 
-        $this->assertFalse($file->getDigestHash('realm','blabla'));
-        $this->assertEquals(md5('user:realm:password'), $file->getDigestHash('realm','user'));
+        $this->assertFalse($file->getDigestHash('realm', 'blabla'));
+        $this->assertEquals(md5('user:realm:password'), $file->getDigestHash('realm', 'user'));
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
index a782cb74d..b30b3f143 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
@@ -2,10 +2,8 @@
 
 namespace Sabre\DAV\Auth\Backend;
 
-use
-    Sabre\DAV,
-    Sabre\HTTP\RequestInterface,
-    Sabre\HTTP\ResponseInterface;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
 
 class Mock implements BackendInterface {
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php
index 8de2be667..18f59793a 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php
@@ -2,32 +2,8 @@
 
 namespace Sabre\DAV\Auth\Backend;
 
-require_once 'Sabre/TestUtil.php';
-
 class PDOMySQLTest extends AbstractPDOTest {
 
-    function getPDO() {
-
-        if (!SABRE_HASMYSQL) $this->markTestSkipped('MySQL driver is not available, or not properly configured');
-        $pdo = \Sabre\TestUtil::getMySQLDB();
-        if (!$pdo) $this->markTestSkipped('Could not connect to MySQL database');
-        $pdo->query("DROP TABLE IF EXISTS users");
-        $pdo->query(<<<SQL
-create table users (
-  id integer unsigned not null primary key auto_increment,
-  username varchar(50),
-  digesta1 varchar(32),
-  email varchar(80),
-  displayname varchar(80),
-  unique(username)
-)
-SQL
-        );
-
-        $pdo->query("INSERT INTO users (username,digesta1,email,displayname) VALUES ('user','hash','user@example.org','User')");
-
-        return $pdo;
-
-    }
+    public $driver = 'mysql';
 
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php
index abfb031bb..b1f382237 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/PDOSqliteTest.php
@@ -2,27 +2,8 @@
 
 namespace Sabre\DAV\Auth\Backend;
 
-require_once 'Sabre/DAV/Auth/Backend/AbstractPDOTest.php';
+class PDOSqliteTest extends AbstractPDOTest {
 
-class PDOSQLiteTest extends AbstractPDOTest {
-
-    function tearDown() {
-
-        if (file_exists(SABRE_TEMPDIR . '/pdobackend')) unlink(SABRE_TEMPDIR . '/pdobackend');
-        if (file_exists(SABRE_TEMPDIR . '/pdobackend2')) unlink(SABRE_TEMPDIR . '/pdobackend2');
-
-    }
-
-    function getPDO() {
-
-        if (!SABRE_HASSQLITE) $this->markTestSkipped('SQLite driver is not available');
-        $pdo = new \PDO('sqlite:'.SABRE_TEMPDIR.'/pdobackend');
-        $pdo->setAttribute(\PDO::ATTR_ERRMODE,\PDO::ERRMODE_EXCEPTION);
-        $pdo->query('CREATE TABLE users (username TEXT, digesta1 TEXT, email VARCHAR(80), displayname VARCHAR(80))');
-        $pdo->query('INSERT INTO users VALUES ("user","hash","user@example.org","User")');
-
-        return $pdo;
-
-    }
+    public $driver = 'sqlite';
 
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
index 0ac9e0613..b566dd757 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
@@ -5,13 +5,11 @@ namespace Sabre\DAV\Auth;
 use Sabre\HTTP;
 use Sabre\DAV;
 
-require_once 'Sabre/HTTP/ResponseMock.php';
-
 class PluginTest extends \PHPUnit_Framework_TestCase {
 
     function testInit() {
 
-        $fakeServer = new DAV\Server( new DAV\SimpleCollection('bla'));
+        $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
         $plugin = new Plugin(new Backend\Mock());
         $this->assertTrue($plugin instanceof Plugin);
         $fakeServer->addPlugin($plugin);
@@ -25,7 +23,7 @@ class PluginTest extends \PHPUnit_Framework_TestCase {
      */
     function testAuthenticate() {
 
-        $fakeServer = new DAV\Server( new DAV\SimpleCollection('bla'));
+        $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
         $plugin = new Plugin(new Backend\Mock());
         $fakeServer->addPlugin($plugin);
         $this->assertTrue(
@@ -40,7 +38,7 @@ class PluginTest extends \PHPUnit_Framework_TestCase {
      */
     function testAuthenticateFail() {
 
-        $fakeServer = new DAV\Server( new DAV\SimpleCollection('bla'));
+        $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
         $backend = new Backend\Mock();
         $backend->fail = true;
 
@@ -50,12 +48,31 @@ class PluginTest extends \PHPUnit_Framework_TestCase {
 
     }
 
+    /**
+     * @depends testAuthenticateFail
+     */
+    function testAuthenticateFailDontAutoRequire() {
+
+        $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
+        $backend = new Backend\Mock();
+        $backend->fail = true;
+
+        $plugin = new Plugin($backend);
+        $plugin->autoRequireLogin = false;
+        $fakeServer->addPlugin($plugin);
+        $this->assertTrue(
+            $fakeServer->emit('beforeMethod', [new HTTP\Request(), new HTTP\Response()])
+        );
+        $this->assertEquals(1, count($plugin->getLoginFailedReasons()));
+
+    }
+
     /**
      * @depends testAuthenticate
      */
     function testMultipleBackend() {
 
-        $fakeServer = new DAV\Server( new DAV\SimpleCollection('bla'));
+        $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
         $backend1 = new Backend\Mock();
         $backend2 = new Backend\Mock();
         $backend2->fail = true;
@@ -77,7 +94,7 @@ class PluginTest extends \PHPUnit_Framework_TestCase {
      */
     function testNoAuthBackend() {
 
-        $fakeServer = new DAV\Server( new DAV\SimpleCollection('bla'));
+        $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
 
         $plugin = new Plugin();
         $fakeServer->addPlugin($plugin);
@@ -90,7 +107,7 @@ class PluginTest extends \PHPUnit_Framework_TestCase {
      */
     function testInvalidCheckResponse() {
 
-        $fakeServer = new DAV\Server( new DAV\SimpleCollection('bla'));
+        $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
         $backend = new Backend\Mock();
         $backend->invalidCheckResponse = true;
 
@@ -105,7 +122,7 @@ class PluginTest extends \PHPUnit_Framework_TestCase {
      */
     function testGetCurrentPrincipal() {
 
-        $fakeServer = new DAV\Server( new DAV\SimpleCollection('bla'));
+        $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
         $plugin = new Plugin(new Backend\Mock());
         $fakeServer->addPlugin($plugin);
         $fakeServer->emit('beforeMethod', [new HTTP\Request(), new HTTP\Response()]);
@@ -113,18 +130,4 @@ class PluginTest extends \PHPUnit_Framework_TestCase {
 
     }
 
-    /**
-     * @depends testAuthenticate
-     */
-    function testGetCurrentUser() {
-
-        $fakeServer = new DAV\Server( new DAV\SimpleCollection('bla'));
-        $plugin = new Plugin(new Backend\Mock());
-        $fakeServer->addPlugin($plugin);
-        $fakeServer->emit('beforeMethod', [new HTTP\Request(), new HTTP\Response()]);
-        $this->assertEquals('admin', $plugin->getCurrentUser());
-
-    }
-
 }
-
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/BasicNodeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/BasicNodeTest.php
index 155c785f8..ec104ec80 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/BasicNodeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/BasicNodeTest.php
@@ -7,7 +7,7 @@ class BasicNodeTest extends \PHPUnit_Framework_TestCase {
     /**
      * @expectedException Sabre\DAV\Exception\Forbidden
      */
-    public function testPut() {
+    function testPut() {
 
         $file = new FileMock();
         $file->put('hi');
@@ -17,29 +17,29 @@ class BasicNodeTest extends \PHPUnit_Framework_TestCase {
     /**
      * @expectedException Sabre\DAV\Exception\Forbidden
      */
-    public function testGet() {
+    function testGet() {
 
         $file = new FileMock();
         $file->get();
 
     }
 
-    public function testGetSize() {
+    function testGetSize() {
 
         $file = new FileMock();
-        $this->assertEquals(0,$file->getSize());
+        $this->assertEquals(0, $file->getSize());
 
     }
 
 
-    public function testGetETag() {
+    function testGetETag() {
 
         $file = new FileMock();
         $this->assertNull($file->getETag());
 
     }
 
-    public function testGetContentType() {
+    function testGetContentType() {
 
         $file = new FileMock();
         $this->assertNull($file->getContentType());
@@ -49,7 +49,7 @@ class BasicNodeTest extends \PHPUnit_Framework_TestCase {
     /**
      * @expectedException Sabre\DAV\Exception\Forbidden
      */
-    public function testDelete() {
+    function testDelete() {
 
         $file = new FileMock();
         $file->delete();
@@ -59,24 +59,24 @@ class BasicNodeTest extends \PHPUnit_Framework_TestCase {
     /**
      * @expectedException Sabre\DAV\Exception\Forbidden
      */
-    public function testSetName() {
+    function testSetName() {
 
         $file = new FileMock();
         $file->setName('hi');
 
     }
 
-    public function testGetLastModified() {
+    function testGetLastModified() {
 
         $file = new FileMock();
         // checking if lastmod is within the range of a few seconds
         $lastMod = $file->getLastModified();
-        $compareTime = ($lastMod + 1)-time();
+        $compareTime = ($lastMod + 1) - time();
         $this->assertTrue($compareTime < 3);
 
     }
 
-    public function testGetChild() {
+    function testGetChild() {
 
         $dir = new DirectoryMock();
         $file = $dir->getChild('mockfile');
@@ -84,14 +84,14 @@ class BasicNodeTest extends \PHPUnit_Framework_TestCase {
 
     }
 
-    public function testChildExists() {
+    function testChildExists() {
 
         $dir = new DirectoryMock();
         $this->assertTrue($dir->childExists('mockfile'));
 
     }
 
-    public function testChildExistsFalse() {
+    function testChildExistsFalse() {
 
         $dir = new DirectoryMock();
         $this->assertFalse($dir->childExists('mockfile2'));
@@ -101,7 +101,7 @@ class BasicNodeTest extends \PHPUnit_Framework_TestCase {
     /**
      * @expectedException Sabre\DAV\Exception\NotFound
      */
-    public function testGetChild404() {
+    function testGetChild404() {
 
         $dir = new DirectoryMock();
         $file = $dir->getChild('blabla');
@@ -111,26 +111,26 @@ class BasicNodeTest extends \PHPUnit_Framework_TestCase {
     /**
      * @expectedException Sabre\DAV\Exception\Forbidden
      */
-    public function testCreateFile() {
+    function testCreateFile() {
 
         $dir = new DirectoryMock();
-        $dir->createFile('hello','data');
+        $dir->createFile('hello', 'data');
 
     }
 
     /**
      * @expectedException Sabre\DAV\Exception\Forbidden
      */
-    public function testCreateDirectory() {
+    function testCreateDirectory() {
 
         $dir = new DirectoryMock();
         $dir->createDirectory('hello');
 
     }
 
-    public function testSimpleDirectoryConstruct() {
+    function testSimpleDirectoryConstruct() {
 
-        $dir = new SimpleCollection('simpledir',array());
+        $dir = new SimpleCollection('simpledir', []);
         $this->assertInstanceOf('Sabre\DAV\SimpleCollection', $dir);
 
     }
@@ -138,13 +138,13 @@ class BasicNodeTest extends \PHPUnit_Framework_TestCase {
     /**
      * @depends testSimpleDirectoryConstruct
      */
-    public function testSimpleDirectoryConstructChild() {
+    function testSimpleDirectoryConstructChild() {
 
         $file = new FileMock();
-        $dir = new SimpleCollection('simpledir',array($file));
+        $dir = new SimpleCollection('simpledir', [$file]);
         $file2 = $dir->getChild('mockfile');
 
-        $this->assertEquals($file,$file2);
+        $this->assertEquals($file, $file2);
 
     }
 
@@ -152,23 +152,23 @@ class BasicNodeTest extends \PHPUnit_Framework_TestCase {
      * @expectedException Sabre\DAV\Exception
      * @depends testSimpleDirectoryConstruct
      */
-    public function testSimpleDirectoryBadParam() {
+    function testSimpleDirectoryBadParam() {
 
-        $dir = new SimpleCollection('simpledir',array('string shouldn\'t be here'));
+        $dir = new SimpleCollection('simpledir', ['string shouldn\'t be here']);
 
     }
 
     /**
      * @depends testSimpleDirectoryConstruct
      */
-    public function testSimpleDirectoryAddChild() {
+    function testSimpleDirectoryAddChild() {
 
         $file = new FileMock();
         $dir = new SimpleCollection('simpledir');
         $dir->addChild($file);
         $file2 = $dir->getChild('mockfile');
 
-        $this->assertEquals($file,$file2);
+        $this->assertEquals($file, $file2);
 
     }
 
@@ -176,23 +176,23 @@ class BasicNodeTest extends \PHPUnit_Framework_TestCase {
      * @depends testSimpleDirectoryConstruct
      * @depends testSimpleDirectoryAddChild
      */
-    public function testSimpleDirectoryGetChildren() {
+    function testSimpleDirectoryGetChildren() {
 
         $file = new FileMock();
         $dir = new SimpleCollection('simpledir');
         $dir->addChild($file);
 
-        $this->assertEquals(array($file),$dir->getChildren());
+        $this->assertEquals([$file], $dir->getChildren());
 
     }
 
     /*
      * @depends testSimpleDirectoryConstruct
      */
-    public function testSimpleDirectoryGetName() {
+    function testSimpleDirectoryGetName() {
 
         $dir = new SimpleCollection('simpledir');
-        $this->assertEquals('simpledir',$dir->getName());
+        $this->assertEquals('simpledir', $dir->getName());
 
     }
 
@@ -200,7 +200,7 @@ class BasicNodeTest extends \PHPUnit_Framework_TestCase {
      * @depends testSimpleDirectoryConstruct
      * @expectedException Sabre\DAV\Exception\NotFound
      */
-    public function testSimpleDirectoryGetChild404() {
+    function testSimpleDirectoryGetChild404() {
 
         $dir = new SimpleCollection('simpledir');
         $dir->getChild('blabla');
@@ -218,7 +218,7 @@ class DirectoryMock extends Collection {
 
     function getChildren() {
 
-        return array(new FileMock());
+        return [new FileMock()];
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
index 157c2170a..54a3053ec 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
@@ -11,8 +11,8 @@ class GuessContentTypeTest extends DAV\AbstractServer {
 
         parent::setUp();
         \Sabre\TestUtil::clearTempDir();
-        file_put_contents(SABRE_TEMPDIR . '/somefile.jpg','blabla');
-        file_put_contents(SABRE_TEMPDIR . '/somefile.hoi','blabla');
+        file_put_contents(SABRE_TEMPDIR . '/somefile.jpg', 'blabla');
+        file_put_contents(SABRE_TEMPDIR . '/somefile.hoi', 'blabla');
 
     }
 
@@ -24,13 +24,13 @@ class GuessContentTypeTest extends DAV\AbstractServer {
 
     function testGetProperties() {
 
-        $properties = array(
+        $properties = [
             '{DAV:}getcontenttype',
-        );
-        $result = $this->server->getPropertiesForPath('/somefile.jpg',$properties);
-        $this->assertArrayHasKey(0,$result);
-        $this->assertArrayHasKey(404,$result[0]);
-        $this->assertArrayHasKey('{DAV:}getcontenttype',$result[0][404]);
+        ];
+        $result = $this->server->getPropertiesForPath('/somefile.jpg', $properties);
+        $this->assertArrayHasKey(0, $result);
+        $this->assertArrayHasKey(404, $result[0]);
+        $this->assertArrayHasKey('{DAV:}getcontenttype', $result[0][404]);
 
     }
 
@@ -40,14 +40,14 @@ class GuessContentTypeTest extends DAV\AbstractServer {
     function testGetPropertiesPluginEnabled() {
 
         $this->server->addPlugin(new GuessContentType());
-        $properties = array(
+        $properties = [
             '{DAV:}getcontenttype',
-        );
-        $result = $this->server->getPropertiesForPath('/somefile.jpg',$properties);
-        $this->assertArrayHasKey(0,$result);
-        $this->assertArrayHasKey(200,$result[0], 'We received: ' . print_r($result,true));
-        $this->assertArrayHasKey('{DAV:}getcontenttype',$result[0][200]);
-        $this->assertEquals('image/jpeg',$result[0][200]['{DAV:}getcontenttype']);
+        ];
+        $result = $this->server->getPropertiesForPath('/somefile.jpg', $properties);
+        $this->assertArrayHasKey(0, $result);
+        $this->assertArrayHasKey(200, $result[0], 'We received: ' . print_r($result, true));
+        $this->assertArrayHasKey('{DAV:}getcontenttype', $result[0][200]);
+        $this->assertEquals('image/jpeg', $result[0][200]['{DAV:}getcontenttype']);
 
     }
 
@@ -57,14 +57,14 @@ class GuessContentTypeTest extends DAV\AbstractServer {
     function testGetPropertiesUnknown() {
 
         $this->server->addPlugin(new GuessContentType());
-        $properties = array(
+        $properties = [
             '{DAV:}getcontenttype',
-        );
-        $result = $this->server->getPropertiesForPath('/somefile.hoi',$properties);
-        $this->assertArrayHasKey(0,$result);
-        $this->assertArrayHasKey(200,$result[0]);
-        $this->assertArrayHasKey('{DAV:}getcontenttype',$result[0][200]);
-        $this->assertEquals('application/octet-stream',$result[0][200]['{DAV:}getcontenttype']);
+        ];
+        $result = $this->server->getPropertiesForPath('/somefile.hoi', $properties);
+        $this->assertArrayHasKey(0, $result);
+        $this->assertArrayHasKey(200, $result[0]);
+        $this->assertArrayHasKey('{DAV:}getcontenttype', $result[0][200]);
+        $this->assertEquals('application/octet-stream', $result[0][200]['{DAV:}getcontenttype']);
 
     }
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
index 9d9fbb319..33c4ede96 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
@@ -18,23 +18,23 @@ class MapGetToPropFindTest extends DAV\AbstractServer {
 
     function testCollectionGet() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/',
             'REQUEST_METHOD' => 'GET',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('');
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(207, $this->response->status,'Incorrect status response received. Full response body: ' . $this->response->body);
-        $this->assertEquals(array(
+        $this->assertEquals(207, $this->response->status, 'Incorrect status response received. Full response body: ' . $this->response->body);
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-            'DAV' => ['1, 3, extended-mkcol'],
-            'Vary' => ['Brief,Prefer'],
-            ),
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+            'DAV'             => ['1, 3, extended-mkcol'],
+            'Vary'            => ['Brief,Prefer'],
+            ],
             $this->response->getHeaders()
          );
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Browser/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Browser/PluginTest.php
index 00beea9f2..f20c50f86 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Browser/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Browser/PluginTest.php
@@ -28,16 +28,16 @@ class PluginTest extends DAV\AbstractServer{
         $this->assertEquals(200, $this->response->getStatus(), "Incorrect status received. Full response body: " . $this->response->getBodyAsString());
         $this->assertEquals(
             [
-                'X-Sabre-Version' => [DAV\Version::VERSION],
-                'Content-Type' => ['text/html; charset=utf-8'],
-                'Content-Security-Policy' => ["img-src 'self'; style-src 'self';"]
+                'X-Sabre-Version'         => [DAV\Version::VERSION],
+                'Content-Type'            => ['text/html; charset=utf-8'],
+                'Content-Security-Policy' => ["default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';"]
             ],
             $this->response->getHeaders()
         );
 
         $body = $this->response->getBodyAsString();
         $this->assertTrue(strpos($body, '<title>dir') !== false, $body);
-        $this->assertTrue(strpos($body, '<a href="/dir/child.txt">')!==false);
+        $this->assertTrue(strpos($body, '<a href="/dir/child.txt">') !== false);
 
     }
 
@@ -54,16 +54,16 @@ class PluginTest extends DAV\AbstractServer{
         $this->assertEquals(200, $this->response->getStatus(), "Incorrect status received. Full response body: " . $this->response->getBodyAsString());
         $this->assertEquals(
             [
-                'X-Sabre-Version' => [DAV\Version::VERSION],
-                'Content-Type' => ['text/html; charset=utf-8'],
-                'Content-Security-Policy' => ["img-src 'self'; style-src 'self';"]
+                'X-Sabre-Version'         => [DAV\Version::VERSION],
+                'Content-Type'            => ['text/html; charset=utf-8'],
+                'Content-Security-Policy' => ["default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';"]
             ],
             $this->response->getHeaders()
         );
 
         $body = $this->response->getBodyAsString();
         $this->assertTrue(strpos($body, '<title>dir') !== false, $body);
-        $this->assertTrue(strpos($body, '<a href="/dir/child.txt">')!==false);
+        $this->assertTrue(strpos($body, '<a href="/dir/child.txt">') !== false);
 
     }
     function testCollectionGetRoot() {
@@ -75,17 +75,17 @@ class PluginTest extends DAV\AbstractServer{
         $this->assertEquals(200, $this->response->status, "Incorrect status received. Full response body: " . $this->response->getBodyAsString());
         $this->assertEquals(
             [
-                'X-Sabre-Version' => [DAV\Version::VERSION],
-                'Content-Type' => ['text/html; charset=utf-8'],
-                'Content-Security-Policy' => ["img-src 'self'; style-src 'self';"]
+                'X-Sabre-Version'         => [DAV\Version::VERSION],
+                'Content-Type'            => ['text/html; charset=utf-8'],
+                'Content-Security-Policy' => ["default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';"]
             ],
             $this->response->getHeaders()
         );
 
         $body = $this->response->getBodyAsString();
         $this->assertTrue(strpos($body, '<title>/') !== false, $body);
-        $this->assertTrue(strpos($body, '<a href="/dir/">')!==false);
-        $this->assertTrue(strpos($body, '<span class="btn disabled">')!==false);
+        $this->assertTrue(strpos($body, '<a href="/dir/">') !== false);
+        $this->assertTrue(strpos($body, '<span class="btn disabled">') !== false);
 
     }
 
@@ -122,15 +122,15 @@ class PluginTest extends DAV\AbstractServer{
 
     function testPostMkCol() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/',
             'REQUEST_METHOD' => 'POST',
-            'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
-        );
-        $postVars = array(
+            'CONTENT_TYPE'   => 'application/x-www-form-urlencoded',
+        ];
+        $postVars = [
             'sabreAction' => 'mkcol',
-            'name' => 'new_collection',
-        );
+            'name'        => 'new_collection',
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setPostData($postVars);
@@ -138,10 +138,10 @@ class PluginTest extends DAV\AbstractServer{
         $this->server->exec();
 
         $this->assertEquals(302, $this->response->status);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Location' => ['/'],
-        ), $this->response->getHeaders());
+            'Location'        => ['/'],
+        ], $this->response->getHeaders());
 
         $this->assertTrue(is_dir(SABRE_TEMPDIR . '/new_collection'));
 
@@ -155,11 +155,11 @@ class PluginTest extends DAV\AbstractServer{
 
         $this->assertEquals(200, $this->response->getStatus(), 'Error: ' . $this->response->body);
         $this->assertEquals([
-            'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['image/vnd.microsoft.icon'],
-            'Content-Length' => ['4286'],
-            'Cache-Control' => ['public, max-age=1209600'],
-            'Content-Security-Policy' => ["img-src 'self'; style-src 'self';"]
+            'X-Sabre-Version'         => [DAV\Version::VERSION],
+            'Content-Type'            => ['image/vnd.microsoft.icon'],
+            'Content-Length'          => ['4286'],
+            'Cache-Control'           => ['public, max-age=1209600'],
+            'Content-Security-Policy' => ["default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';"]
         ], $this->response->getHeaders());
 
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ClientMock.php b/vendor/sabre/dav/tests/Sabre/DAV/ClientMock.php
index d8b53a5a1..5a48b063c 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ClientMock.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ClientMock.php
@@ -18,13 +18,13 @@ class ClientMock extends Client {
      * @param string $url
      * @return string
      */
-    public function getAbsoluteUrl($url) {
+    function getAbsoluteUrl($url) {
 
         return parent::getAbsoluteUrl($url);
 
     }
 
-    public function doRequest(RequestInterface $request) {
+    function doRequest(RequestInterface $request) {
 
         $this->request = $request;
         return $this->response;
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Exception/LockedTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Exception/LockedTest.php
index c06d6aa1f..8788475cb 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Exception/LockedTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Exception/LockedTest.php
@@ -2,9 +2,8 @@
 
 namespace Sabre\DAV\Exception;
 
-use
-    Sabre\DAV,
-    DOMDocument;
+use Sabre\DAV;
+use DOMDocument;
 
 class LockedTest extends \PHPUnit_Framework_TestCase {
 
@@ -15,7 +14,7 @@ class LockedTest extends \PHPUnit_Framework_TestCase {
         $root = $dom->createElement('d:root');
 
         $dom->appendChild($root);
-        $root->setAttribute('xmlns:d','DAV:');
+        $root->setAttribute('xmlns:d', 'DAV:');
 
         $lockInfo = new DAV\Locks\LockInfo();
         $lockInfo->uri = '/foo';
@@ -44,7 +43,7 @@ class LockedTest extends \PHPUnit_Framework_TestCase {
         $root = $dom->createElement('d:root');
 
         $dom->appendChild($root);
-        $root->setAttribute('xmlns:d','DAV:');
+        $root->setAttribute('xmlns:d', 'DAV:');
 
         $lockInfo = new DAV\Locks\LockInfo();
         $lockInfo->uri = '/foo&bar';
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ExceptionTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ExceptionTest.php
index 6d6bf5668..0eb4f3dd8 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ExceptionTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ExceptionTest.php
@@ -7,18 +7,18 @@ class ExceptionTest extends \PHPUnit_Framework_TestCase {
     function testStatus() {
 
         $e = new Exception();
-        $this->assertEquals(500,$e->getHTTPCode());
+        $this->assertEquals(500, $e->getHTTPCode());
 
     }
 
     function testExceptionStatuses() {
 
-        $c = array(
+        $c = [
             'Sabre\\DAV\\Exception\\NotAuthenticated'    => 401,
             'Sabre\\DAV\\Exception\\InsufficientStorage' => 507,
-        );
+        ];
 
-        foreach($c as $class=>$status) {
+        foreach ($c as $class => $status) {
 
             $obj = new $class();
             $this->assertEquals($status, $obj->getHTTPCode());
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/FSExt/FileTest.php b/vendor/sabre/dav/tests/Sabre/DAV/FSExt/FileTest.php
index 3708594e0..f5d65a44f 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/FSExt/FileTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/FSExt/FileTest.php
@@ -2,8 +2,6 @@
 
 namespace Sabre\DAV\FSExt;
 
-use Sabre\DAV;
-
 require_once 'Sabre/TestUtil.php';
 
 class FileTest extends \PHPUnit_Framework_TestCase {
@@ -26,12 +24,12 @@ class FileTest extends \PHPUnit_Framework_TestCase {
         $file = new File($filename);
         $result = $file->put('New contents');
 
-        $this->assertEquals('New contents',file_get_contents(SABRE_TEMPDIR . '/file.txt'));
+        $this->assertEquals('New contents', file_get_contents(SABRE_TEMPDIR . '/file.txt'));
         $this->assertEquals(
             '"' .
             sha1(
                 fileinode($filename) .
-                filesize($filename ) .
+                filesize($filename) .
                 filemtime($filename)
             ) . '"',
             $result
@@ -45,13 +43,13 @@ class FileTest extends \PHPUnit_Framework_TestCase {
         $file->put('0000000');
         $file->patch('111', 2, 3);
 
-        $this->assertEquals('0001110',file_get_contents(SABRE_TEMPDIR . '/file.txt'));
+        $this->assertEquals('0001110', file_get_contents(SABRE_TEMPDIR . '/file.txt'));
 
     }
 
     function testRangeStream() {
 
-        $stream = fopen('php://memory','r+');
+        $stream = fopen('php://memory', 'r+');
         fwrite($stream, "222");
         rewind($stream);
 
@@ -59,7 +57,7 @@ class FileTest extends \PHPUnit_Framework_TestCase {
         $file->put('0000000');
         $file->patch($stream, 2, 3);
 
-        $this->assertEquals('0002220',file_get_contents(SABRE_TEMPDIR . '/file.txt'));
+        $this->assertEquals('0002220', file_get_contents(SABRE_TEMPDIR . '/file.txt'));
 
     }
 
@@ -67,7 +65,7 @@ class FileTest extends \PHPUnit_Framework_TestCase {
     function testGet() {
 
         $file = new File(SABRE_TEMPDIR . '/file.txt');
-        $this->assertEquals('Contents',stream_get_contents($file->get()));
+        $this->assertEquals('Contents', stream_get_contents($file->get()));
 
     }
 
@@ -88,7 +86,7 @@ class FileTest extends \PHPUnit_Framework_TestCase {
             '"' .
             sha1(
                 fileinode($filename) .
-                filesize($filename ) .
+                filesize($filename) .
                 filemtime($filename)
             ) . '"',
             $file->getETag()
@@ -105,7 +103,7 @@ class FileTest extends \PHPUnit_Framework_TestCase {
     function testGetSize() {
 
         $file = new File(SABRE_TEMPDIR . '/file.txt');
-        $this->assertEquals(8,$file->getSize());
+        $this->assertEquals(8, $file->getSize());
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php b/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php
index 63d858de1..20fca490a 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php
@@ -28,7 +28,7 @@ class ServerTest extends DAV\AbstractServer{
             'Content-Type'    => ['application/octet-stream'],
             'Content-Length'  => [13],
             'Last-Modified'   => [HTTP\Util::toHTTPDate(new \DateTime('@' . filemtime($filename)))],
-            'ETag'            => ['"' . sha1(fileinode($filename ) . filesize($filename) . filemtime($filename)) . '"'],
+            'ETag'            => ['"' . sha1(fileinode($filename) . filesize($filename) . filemtime($filename)) . '"'],
             ],
             $this->response->getHeaders()
          );
@@ -50,12 +50,12 @@ class ServerTest extends DAV\AbstractServer{
             'Content-Type'    => ['application/octet-stream'],
             'Content-Length'  => [13],
             'Last-Modified'   => [HTTP\Util::toHTTPDate(new \DateTime('@' . filemtime($this->tempDir . '/test.txt')))],
-            'ETag'            => ['"' . sha1(fileinode($filename ) . filesize($filename) . filemtime($filename)) . '"'],
+            'ETag'            => ['"' . sha1(fileinode($filename) . filesize($filename) . filemtime($filename)) . '"'],
             ],
             $this->response->getHeaders()
          );
 
-        $this->assertEquals(200,$this->response->status);
+        $this->assertEquals(200, $this->response->status);
         $this->assertEquals('', $this->response->body);
 
     }
@@ -71,12 +71,12 @@ class ServerTest extends DAV\AbstractServer{
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
             'Content-Length'  => ['0'],
-            'ETag'            => ['"' . sha1(fileinode($filename ) . filesize($filename) . filemtime($filename)) . '"'],
+            'ETag'            => ['"' . sha1(fileinode($filename) . filesize($filename) . filemtime($filename)) . '"'],
         ], $this->response->getHeaders());
 
         $this->assertEquals(201, $this->response->status);
         $this->assertEquals('', $this->response->body);
-        $this->assertEquals('Testing new file',file_get_contents($filename));
+        $this->assertEquals('Testing new file', file_get_contents($filename));
 
     }
 
@@ -89,11 +89,11 @@ class ServerTest extends DAV\AbstractServer{
 
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ],$this->response->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $this->response->getHeaders());
 
         $this->assertEquals(412, $this->response->status);
-        $this->assertNotEquals('Testing new file',file_get_contents($this->tempDir . '/test.txt'));
+        $this->assertNotEquals('Testing new file', file_get_contents($this->tempDir . '/test.txt'));
 
     }
 
@@ -105,8 +105,8 @@ class ServerTest extends DAV\AbstractServer{
 
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Length' => ['0'],
-        ],$this->response->getHeaders());
+            'Content-Length'  => ['0'],
+        ], $this->response->getHeaders());
 
         $this->assertEquals(201, $this->response->status);
         $this->assertEquals('', $this->response->body);
@@ -125,7 +125,7 @@ class ServerTest extends DAV\AbstractServer{
 
         $this->assertEquals(204, $this->response->status);
         $this->assertEquals('', $this->response->body);
-        $this->assertEquals('Testing updated file',file_get_contents($this->tempDir . '/test.txt'));
+        $this->assertEquals('Testing updated file', file_get_contents($this->tempDir . '/test.txt'));
 
     }
 
@@ -137,8 +137,8 @@ class ServerTest extends DAV\AbstractServer{
 
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Length' => ['0'],
-        ],$this->response->getHeaders());
+            'Content-Length'  => ['0'],
+        ], $this->response->getHeaders());
 
         $this->assertEquals(204, $this->response->status);
         $this->assertEquals('', $this->response->body);
@@ -148,8 +148,8 @@ class ServerTest extends DAV\AbstractServer{
 
     function testDeleteDirectory() {
 
-        mkdir($this->tempDir.'/testcol');
-        file_put_contents($this->tempDir.'/testcol/test.txt','Hi! I\'m a file with a short lifespan');
+        mkdir($this->tempDir . '/testcol');
+        file_put_contents($this->tempDir . '/testcol/test.txt', 'Hi! I\'m a file with a short lifespan');
 
         $request = new HTTP\Request('DELETE', '/testcol');
         $this->server->httpRequest = ($request);
@@ -157,8 +157,8 @@ class ServerTest extends DAV\AbstractServer{
 
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Length' => ['0'],
-        ],$this->response->getHeaders());
+            'Content-Length'  => ['0'],
+        ], $this->response->getHeaders());
         $this->assertEquals(204, $this->response->status);
         $this->assertEquals('', $this->response->body);
         $this->assertFalse(file_exists($this->tempDir . '/testcol'));
@@ -172,12 +172,12 @@ class ServerTest extends DAV\AbstractServer{
         $this->server->exec();
 
         $this->assertEquals([
-            'DAV'            => ['1, 3, extended-mkcol'],
-            'MS-Author-Via'  => ['DAV'],
-            'Allow'          => ['OPTIONS, GET, HEAD, DELETE, PROPFIND, PUT, PROPPATCH, COPY, MOVE, REPORT'],
-            'Accept-Ranges'  => ['bytes'],
-            'Content-Length' => ['0'],
-            'X-Sabre-Version'=> [DAV\Version::VERSION],
+            'DAV'             => ['1, 3, extended-mkcol'],
+            'MS-Author-Via'   => ['DAV'],
+            'Allow'           => ['OPTIONS, GET, HEAD, DELETE, PROPFIND, PUT, PROPPATCH, COPY, MOVE, REPORT'],
+            'Accept-Ranges'   => ['bytes'],
+            'Content-Length'  => ['0'],
+            'X-Sabre-Version' => [DAV\Version::VERSION],
         ], $this->response->getHeaders());
 
         $this->assertEquals(200, $this->response->status);
@@ -187,7 +187,7 @@ class ServerTest extends DAV\AbstractServer{
 
     function testMove() {
 
-        mkdir($this->tempDir.'/testcol');
+        mkdir($this->tempDir . '/testcol');
 
         $request = new HTTP\Request('MOVE', '/test.txt', ['Destination' => '/testcol/test2.txt']);
         $this->server->httpRequest = ($request);
@@ -197,9 +197,9 @@ class ServerTest extends DAV\AbstractServer{
         $this->assertEquals('', $this->response->body);
 
         $this->assertEquals([
-            'Content-Length' => ['0'],
-            'X-Sabre-Version'=> [DAV\Version::VERSION],
-        ],$this->response->getHeaders());
+            'Content-Length'  => ['0'],
+            'X-Sabre-Version' => [DAV\Version::VERSION],
+        ], $this->response->getHeaders());
 
         $this->assertTrue(
             is_file($this->tempDir . '/testcol/test2.txt')
@@ -217,8 +217,8 @@ class ServerTest extends DAV\AbstractServer{
      */
     function testMoveOtherObject() {
 
-        mkdir($this->tempDir.'/tree1');
-        mkdir($this->tempDir.'/tree2');
+        mkdir($this->tempDir . '/tree1');
+        mkdir($this->tempDir . '/tree2');
 
         $tree = new DAV\Tree(new DAV\SimpleCollection('root', [
             new DAV\FS\Directory($this->tempDir . '/tree1'),
@@ -234,9 +234,9 @@ class ServerTest extends DAV\AbstractServer{
         $this->assertEquals('', $this->response->body);
 
         $this->assertEquals([
-            'Content-Length' => ['0'],
-            'X-Sabre-Version'=> [DAV\Version::VERSION],
-        ],$this->response->getHeaders());
+            'Content-Length'  => ['0'],
+            'X-Sabre-Version' => [DAV\Version::VERSION],
+        ], $this->response->getHeaders());
 
         $this->assertTrue(
             is_dir($this->tempDir . '/tree2/tree1')
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/HttpDeleteTest.php b/vendor/sabre/dav/tests/Sabre/DAV/HttpDeleteTest.php
index 6c10afa9f..bd1b33150 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/HttpDeleteTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/HttpDeleteTest.php
@@ -19,12 +19,12 @@ class HttpDeleteTest extends DAVServerTest {
      *
      * @return void
      */
-    public function setUpTree() {
+    function setUpTree() {
 
         $this->tree = new Mock\Collection('root', [
             'file1' => 'foo',
-            'dir' => [
-                'subfile' => 'bar',
+            'dir'   => [
+                'subfile'  => 'bar',
                 'subfile2' => 'baz',
             ],
         ]);
@@ -34,7 +34,7 @@ class HttpDeleteTest extends DAVServerTest {
     /**
      * A successful DELETE
      */
-    public function testDelete() {
+    function testDelete() {
 
         $request = new HTTP\Request('DELETE', '/file1');
 
@@ -49,7 +49,7 @@ class HttpDeleteTest extends DAVServerTest {
         $this->assertEquals(
             [
                 'X-Sabre-Version' => [Version::VERSION],
-                'Content-Length' => ['0'],
+                'Content-Length'  => ['0'],
             ],
             $response->getHeaders()
         );
@@ -59,7 +59,7 @@ class HttpDeleteTest extends DAVServerTest {
     /**
      * Deleting a Directory
      */
-    public function testDeleteDirectory() {
+    function testDeleteDirectory() {
 
         $request = new HTTP\Request('DELETE', '/dir');
 
@@ -74,7 +74,7 @@ class HttpDeleteTest extends DAVServerTest {
         $this->assertEquals(
             [
                 'X-Sabre-Version' => [Version::VERSION],
-                'Content-Length' => ['0'],
+                'Content-Length'  => ['0'],
             ],
             $response->getHeaders()
         );
@@ -84,7 +84,7 @@ class HttpDeleteTest extends DAVServerTest {
     /**
      * DELETE on a node that does not exist
      */
-    public function testDeleteNotFound() {
+    function testDeleteNotFound() {
 
         $request = new HTTP\Request('DELETE', '/file2');
         $response = $this->request($request);
@@ -100,7 +100,7 @@ class HttpDeleteTest extends DAVServerTest {
     /**
      * DELETE with preconditions
      */
-    public function testDeletePreconditions() {
+    function testDeletePreconditions() {
 
         $request = new HTTP\Request('DELETE', '/file1', [
             'If-Match' => '"' . md5('foo') . '"',
@@ -119,7 +119,7 @@ class HttpDeleteTest extends DAVServerTest {
     /**
      * DELETE with incorrect preconditions
      */
-    public function testDeletePreconditionsFailed() {
+    function testDeletePreconditionsFailed() {
 
         $request = new HTTP\Request('DELETE', '/file1', [
             'If-Match' => '"' . md5('bar') . '"',
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/HttpPutTest.php b/vendor/sabre/dav/tests/Sabre/DAV/HttpPutTest.php
index eddaf3f22..86480b1c2 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/HttpPutTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/HttpPutTest.php
@@ -46,8 +46,8 @@ class HttpPutTest extends DAVServerTest {
         $this->assertEquals(
             [
                 'X-Sabre-Version' => [Version::VERSION],
-                'Content-Length' => ['0'],
-                'ETag' => ['"' . md5('hello') . '"']
+                'Content-Length'  => ['0'],
+                'ETag'            => ['"' . md5('hello') . '"']
             ],
             $response->getHeaders()
         );
@@ -75,8 +75,8 @@ class HttpPutTest extends DAVServerTest {
         $this->assertEquals(
             [
                 'X-Sabre-Version' => [Version::VERSION],
-                'Content-Length' => ['0'],
-                'ETag' => ['"' . md5('bar') . '"']
+                'Content-Length'  => ['0'],
+                'ETag'            => ['"' . md5('bar') . '"']
             ],
             $response->getHeaders()
         );
@@ -109,8 +109,8 @@ class HttpPutTest extends DAVServerTest {
         $this->assertEquals(
             [
                 'X-Sabre-Version' => [Version::VERSION],
-                'Content-Length' => ['0'],
-                'ETag' => ['"' . md5('hello') . '"']
+                'Content-Length'  => ['0'],
+                'ETag'            => ['"' . md5('hello') . '"']
             ],
             $response->getHeaders()
         );
@@ -143,8 +143,8 @@ class HttpPutTest extends DAVServerTest {
         $this->assertEquals(
             [
                 'X-Sabre-Version' => [Version::VERSION],
-                'Content-Length' => ['0'],
-                'ETag' => ['"' . md5('hello') . '"'],
+                'Content-Length'  => ['0'],
+                'ETag'            => ['"' . md5('hello') . '"'],
             ],
             $response->getHeaders()
         );
@@ -196,8 +196,8 @@ class HttpPutTest extends DAVServerTest {
         $this->assertEquals(
             [
                 'X-Sabre-Version' => [Version::VERSION],
-                'Content-Length' => ['0'],
-                'ETag' => ['"' . md5('hello') . '"']
+                'Content-Length'  => ['0'],
+                'ETag'            => ['"' . md5('hello') . '"']
             ],
             $response->getHeaders()
         );
@@ -291,8 +291,8 @@ class HttpPutTest extends DAVServerTest {
         $this->assertEquals(
             [
                 'X-Sabre-Version' => [Version::VERSION],
-                'Content-Length' => ['0'],
-                'ETag' => ['"' . md5('hello') . '"'],
+                'Content-Length'  => ['0'],
+                'ETag'            => ['"' . md5('hello') . '"'],
             ],
             $response->getHeaders()
         );
@@ -334,7 +334,7 @@ class HttpPutTest extends DAVServerTest {
         $request = new HTTP\Request('PUT', '/file2', [], 'hello');
         $response = $this->request($request);
 
-        $this->assertEquals(418, $response->getStatus(), 'Incorrect status code received. Full response body: ' .$response->getBodyAsString());
+        $this->assertEquals(418, $response->getStatus(), 'Incorrect status code received. Full response body: ' . $response->getBodyAsString());
 
         $this->assertFalse(
             $this->server->tree->nodeExists('file2')
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php b/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php
index 4ccb42fbb..edd09e634 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Issue33Test.php
@@ -17,16 +17,16 @@ class Issue33Test extends \PHPUnit_Framework_TestCase {
     function testCopyMoveInfo() {
 
         $bar = new SimpleCollection('bar');
-        $root = new SimpleCollection('webdav',array($bar));
+        $root = new SimpleCollection('webdav', [$bar]);
 
         $server = new Server($root);
         $server->setBaseUri('/webdav/');
 
-        $serverVars = array(
-            'REQUEST_URI' => '/webdav/bar',
+        $serverVars = [
+            'REQUEST_URI'      => '/webdav/bar',
             'HTTP_DESTINATION' => 'http://dev2.tribalos.com/webdav/%C3%A0fo%C3%B3',
-            'HTTP_OVERWRITE' => 'F',
-        );
+            'HTTP_OVERWRITE'   => 'F',
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
 
@@ -48,19 +48,19 @@ class Issue33Test extends \PHPUnit_Framework_TestCase {
         $dir->createDirectory('bar');
 
         $tree = new Tree($dir);
-        $tree->move('bar',urldecode('%C3%A0fo%C3%B3'));
+        $tree->move('bar', urldecode('%C3%A0fo%C3%B3'));
 
         $node = $tree->getNodeForPath(urldecode('%C3%A0fo%C3%B3'));
-        $this->assertEquals(urldecode('%C3%A0fo%C3%B3'),$node->getName());
+        $this->assertEquals(urldecode('%C3%A0fo%C3%B3'), $node->getName());
 
     }
 
     function testDirName() {
 
         $dirname1 = 'bar';
-        $dirname2 = urlencode('%C3%A0fo%C3%B3');;
+        $dirname2 = urlencode('%C3%A0fo%C3%B3');
 
-        $this->assertTrue(dirname($dirname1)==dirname($dirname2));
+        $this->assertTrue(dirname($dirname1) == dirname($dirname2));
 
     }
 
@@ -71,12 +71,12 @@ class Issue33Test extends \PHPUnit_Framework_TestCase {
     function testEverything() {
 
         // Request object
-        $serverVars = array(
-            'REQUEST_METHOD' => 'MOVE',
-            'REQUEST_URI' => '/webdav/bar',
+        $serverVars = [
+            'REQUEST_METHOD'   => 'MOVE',
+            'REQUEST_URI'      => '/webdav/bar',
             'HTTP_DESTINATION' => 'http://dev2.tribalos.com/webdav/%C3%A0fo%C3%B3',
-            'HTTP_OVERWRITE' => 'F',
-        );
+            'HTTP_OVERWRITE'   => 'F',
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('');
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
index f39e9a036..bbde69097 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
@@ -31,15 +31,15 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
         $lock->timeout = 60;
         $lock->created = time();
         $lock->token = 'MY-UNIQUE-TOKEN';
-        $lock->uri ='someuri';
+        $lock->uri = 'someuri';
 
         $this->assertTrue($backend->lock('someuri', $lock));
 
         $locks = $backend->getLocks('someuri', false);
 
-        $this->assertEquals(1,count($locks));
-        $this->assertEquals('Sinterklaas',$locks[0]->owner);
-        $this->assertEquals('someuri',$locks[0]->uri);
+        $this->assertEquals(1, count($locks));
+        $this->assertEquals('Sinterklaas', $locks[0]->owner);
+        $this->assertEquals('someuri', $locks[0]->uri);
 
     }
 
@@ -61,9 +61,9 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
 
         $locks = $backend->getLocks('someuri/child', false);
 
-        $this->assertEquals(1,count($locks));
-        $this->assertEquals('Sinterklaas',$locks[0]->owner);
-        $this->assertEquals('someuri',$locks[0]->uri);
+        $this->assertEquals(1, count($locks));
+        $this->assertEquals('Sinterklaas', $locks[0]->owner);
+        $this->assertEquals('someuri', $locks[0]->uri);
 
     }
 
@@ -86,7 +86,7 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
 
         $locks = $backend->getLocks('someuri/child', false);
 
-        $this->assertEquals(0,count($locks));
+        $this->assertEquals(0, count($locks));
 
     }
 
@@ -104,13 +104,13 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
         $this->assertTrue($backend->lock('someuri/child', $lock));
 
         $locks = $backend->getLocks('someuri/child', false);
-        $this->assertEquals(1,count($locks));
+        $this->assertEquals(1, count($locks));
 
         $locks = $backend->getLocks('someuri', false);
-        $this->assertEquals(0,count($locks));
+        $this->assertEquals(0, count($locks));
 
         $locks = $backend->getLocks('someuri', true);
-        $this->assertEquals(1,count($locks));
+        $this->assertEquals(1, count($locks));
 
     }
 
@@ -135,10 +135,10 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
 
         $locks = $backend->getLocks('someuri', false);
 
-        $this->assertEquals(1,count($locks));
+        $this->assertEquals(1, count($locks));
 
-        $this->assertEquals('Santa Clause',$locks[0]->owner);
-        $this->assertEquals('someuri',$locks[0]->uri);
+        $this->assertEquals('Santa Clause', $locks[0]->owner);
+        $this->assertEquals('someuri', $locks[0]->uri);
 
     }
 
@@ -158,12 +158,12 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
         $this->assertTrue($backend->lock('someuri', $lock));
 
         $locks = $backend->getLocks('someuri', false);
-        $this->assertEquals(1,count($locks));
+        $this->assertEquals(1, count($locks));
 
-        $this->assertTrue($backend->unlock('someuri',$lock));
+        $this->assertTrue($backend->unlock('someuri', $lock));
 
         $locks = $backend->getLocks('someuri', false);
-        $this->assertEquals(0,count($locks));
+        $this->assertEquals(0, count($locks));
 
     }
 
@@ -183,13 +183,13 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
         $this->assertTrue($backend->lock('someuri', $lock));
 
         $locks = $backend->getLocks('someuri', false);
-        $this->assertEquals(1,count($locks));
+        $this->assertEquals(1, count($locks));
 
         $lock->token = 'SOME-OTHER-TOKEN';
-        $this->assertFalse($backend->unlock('someuri',$lock));
+        $this->assertFalse($backend->unlock('someuri', $lock));
 
         $locks = $backend->getLocks('someuri', false);
-        $this->assertEquals(1,count($locks));
+        $this->assertEquals(1, count($locks));
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
index b6f06224c..0ba02fc8b 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
@@ -2,31 +2,8 @@
 
 namespace Sabre\DAV\Locks\Backend;
 
-require_once 'Sabre/TestUtil.php';
+class PDOMySQLTest extends PDOTest {
 
-class PDOMySQLTest extends AbstractTest {
-
-    function getBackend() {
-
-        if (!SABRE_HASMYSQL) $this->markTestSkipped('MySQL driver is not available, or it was not properly configured');
-        $pdo = \Sabre\TestUtil::getMySQLDB();
-        if (!$pdo) $this->markTestSkipped('Could not connect to MySQL database');
-        $pdo->query('DROP TABLE IF EXISTS locks;');
-        $pdo->query("
-CREATE TABLE locks (
-	id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-	owner VARCHAR(100),
-	timeout INTEGER UNSIGNED,
-	created INTEGER,
-	token VARCHAR(100),
-	scope TINYINT,
-	depth TINYINT,
-	uri text
-);");
-
-        $backend = new PDO($pdo);
-        return $backend;
-
-    }
+    public $driver = 'mysql';
 
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
index d6336c7b2..a27eae93c 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
@@ -2,27 +2,18 @@
 
 namespace Sabre\DAV\Locks\Backend;
 
-require_once 'Sabre/TestUtil.php';
-require_once 'Sabre/DAV/Locks/Backend/AbstractTest.php';
+abstract class PDOTest extends AbstractTest {
 
-class PDOTest extends AbstractTest {
+    use \Sabre\DAV\DbTestHelperTrait;
 
     function getBackend() {
 
-        if (!SABRE_HASSQLITE) $this->markTestSkipped('SQLite driver is not available');
-        \Sabre\TestUtil::clearTempDir();
-        mkdir(SABRE_TEMPDIR . '/pdolocks');
-        $pdo = new \PDO('sqlite:' . SABRE_TEMPDIR . '/pdolocks/db.sqlite');
-        $pdo->setAttribute(\PDO::ATTR_ERRMODE,\PDO::ERRMODE_EXCEPTION);
-        $pdo->query('CREATE TABLE locks ( id integer primary key asc, owner text, timeout text, created integer, token text, scope integer, depth integer, uri text)');
-        $backend = new PDO($pdo);
-        return $backend;
+        $this->dropTables('locks');
+        $this->createSchema('locks');
 
-    }
+        $pdo = $this->getPDO();
 
-    function tearDown() {
-
-        \Sabre\TestUtil::clearTempDir();
+        return new PDO($pdo);
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php
index 23f283796..f08f19da5 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php
@@ -62,12 +62,12 @@ class MSWordTest extends \PHPUnit_Framework_TestCase {
 
     function getLockRequest() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
            'REQUEST_METHOD'    => 'LOCK',
            'HTTP_CONTENT_TYPE' => 'application/xml',
            'HTTP_TIMEOUT'      => 'Second-3600',
            'REQUEST_URI'       => '/Nouveau%20Microsoft%20Office%20Excel%20Worksheet.xlsx',
-        ));
+        ]);
 
         $request->setBody('<D:lockinfo xmlns:D="DAV:">
     <D:lockscope>
@@ -86,12 +86,12 @@ class MSWordTest extends \PHPUnit_Framework_TestCase {
     }
     function getLockRequest2() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
            'REQUEST_METHOD'    => 'LOCK',
            'HTTP_CONTENT_TYPE' => 'application/xml',
            'HTTP_TIMEOUT'      => 'Second-3600',
            'REQUEST_URI'       => '/~$Nouveau%20Microsoft%20Office%20Excel%20Worksheet.xlsx',
-        ));
+        ]);
 
         $request->setBody('<D:lockinfo xmlns:D="DAV:">
     <D:lockscope>
@@ -111,11 +111,11 @@ class MSWordTest extends \PHPUnit_Framework_TestCase {
 
     function getPutRequest($lockToken) {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
            'REQUEST_METHOD'    => 'PUT',
            'REQUEST_URI'       => '/Nouveau%20Microsoft%20Office%20Excel%20Worksheet.xlsx',
-           'HTTP_IF'           => 'If: ('.$lockToken.')',
-        ));
+           'HTTP_IF'           => 'If: (' . $lockToken . ')',
+        ]);
         $request->setBody('FAKE BODY');
         return $request;
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php
index ef0e473ae..6511d4e7d 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php
@@ -35,13 +35,13 @@ class PluginTest extends DAV\AbstractServer {
 
     function testGetFeatures() {
 
-        $this->assertEquals(array(2),$this->locksPlugin->getFeatures());
+        $this->assertEquals([2], $this->locksPlugin->getFeatures());
 
     }
 
     function testGetHTTPMethods() {
 
-        $this->assertEquals(array('LOCK','UNLOCK'),$this->locksPlugin->getHTTPMethods(''));
+        $this->assertEquals(['LOCK', 'UNLOCK'], $this->locksPlugin->getHTTPMethods(''));
 
     }
 
@@ -51,10 +51,10 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-            ),
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+            ],
             $this->response->getHeaders()
          );
 
@@ -77,16 +77,16 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
-        $this->assertEquals(200, $this->response->status,'Got an incorrect status back. Response body: ' . $this->response->body);
+        $this->assertEquals(200, $this->response->status, 'Got an incorrect status back. Response body: ' . $this->response->body);
 
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
         $xml = simplexml_load_string($body);
-        $xml->registerXPathNamespace('d','urn:DAV');
+        $xml->registerXPathNamespace('d', 'urn:DAV');
 
-        $elements = array(
+        $elements = [
             '/d:prop',
             '/d:prop/d:lockdiscovery',
             '/d:prop/d:lockdiscovery/d:activelock',
@@ -101,18 +101,18 @@ class PluginTest extends DAV\AbstractServer {
             '/d:prop/d:lockdiscovery/d:activelock/d:timeout',
             '/d:prop/d:lockdiscovery/d:activelock/d:locktoken',
             '/d:prop/d:lockdiscovery/d:activelock/d:locktoken/d:href',
-        );
+        ];
 
-        foreach($elements as $elem) {
+        foreach ($elements as $elem) {
             $data = $xml->xpath($elem);
-            $this->assertEquals(1,count($data),'We expected 1 match for the xpath expression "' . $elem . '". ' . count($data) . ' were found. Full response body: ' . $this->response->body);
+            $this->assertEquals(1, count($data), 'We expected 1 match for the xpath expression "' . $elem . '". ' . count($data) . ' were found. Full response body: ' . $this->response->body);
         }
 
         $depth = $xml->xpath('/d:prop/d:lockdiscovery/d:activelock/d:depth');
-        $this->assertEquals('infinity',(string)$depth[0]);
+        $this->assertEquals('infinity', (string)$depth[0]);
 
         $token = $xml->xpath('/d:prop/d:lockdiscovery/d:activelock/d:locktoken/d:href');
-        $this->assertEquals($this->response->getHeader('Lock-Token'),'<' . (string)$token[0] . '>','Token in response body didn\'t match token in response header.');
+        $this->assertEquals($this->response->getHeader('Lock-Token'), '<' . (string)$token[0] . '>', 'Token in response body didn\'t match token in response header.');
 
     }
 
@@ -139,7 +139,7 @@ class PluginTest extends DAV\AbstractServer {
 
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
 
         $this->assertEquals(423, $this->response->status, 'Full response: ' . $this->response->body);
 
@@ -174,9 +174,9 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
 
-        $this->assertEquals(200, $this->response->status,'We received an incorrect status code. Full response body: ' . $this->response->getBody());
+        $this->assertEquals(200, $this->response->status, 'We received an incorrect status code. Full response body: ' . $this->response->getBody());
 
     }
 
@@ -209,9 +209,9 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
 
-        $this->assertEquals(423, $this->response->getStatus(),'We received an incorrect status code. Full response body: ' . $this->response->getBody());
+        $this->assertEquals(423, $this->response->getStatus(), 'We received an incorrect status code. Full response body: ' . $this->response->getBody());
 
     }
 
@@ -233,8 +233,8 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(201, $this->response->status);
 
@@ -251,7 +251,7 @@ class PluginTest extends DAV\AbstractServer {
 
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
+            'Content-Type'    => ['application/xml; charset=utf-8'],
             ],
             $this->response->getHeaders()
          );
@@ -271,7 +271,7 @@ class PluginTest extends DAV\AbstractServer {
 
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
+            'Content-Type'    => ['application/xml; charset=utf-8'],
             ],
             $this->response->getHeaders()
          );
@@ -298,8 +298,8 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(200, $this->response->status);
 
@@ -308,8 +308,8 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(423, $this->response->status);
 
@@ -340,10 +340,10 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpResponse = new HTTP\ResponseMock();
         $this->server->invokeMethod($request, $this->server->httpResponse);
 
-        $this->assertEquals(204,$this->server->httpResponse->status,'Got an incorrect status code. Full response body: ' . $this->response->body);
+        $this->assertEquals(204, $this->server->httpResponse->status, 'Got an incorrect status code. Full response body: ' . $this->response->body);
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Length' => ['0'],
+            'Content-Length'  => ['0'],
             ],
             $this->server->httpResponse->getHeaders()
          );
@@ -372,17 +372,17 @@ class PluginTest extends DAV\AbstractServer {
         $lockToken = $this->server->httpResponse->getHeader('Lock-Token');
 
         // See Issue 123
-        $lockToken = trim($lockToken,'<>');
+        $lockToken = trim($lockToken, '<>');
 
         $request = new HTTP\Request('UNLOCK', '/test.txt', ['Lock-Token' => $lockToken]);
         $this->server->httpRequest = $request;
         $this->server->httpResponse = new HTTP\ResponseMock();
         $this->server->invokeMethod($request, $this->server->httpResponse);
 
-        $this->assertEquals(204, $this->server->httpResponse->status,'Got an incorrect status code. Full response body: ' . $this->response->body);
+        $this->assertEquals(204, $this->server->httpResponse->status, 'Got an incorrect status code. Full response body: ' . $this->response->body);
         $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Length' => ['0'],
+            'Content-Length'  => ['0'],
             ],
             $this->server->httpResponse->getHeaders()
          );
@@ -396,7 +396,7 @@ class PluginTest extends DAV\AbstractServer {
     function testLockRetainOwner() {
 
         $request = HTTP\Sapi::createFromServerArray([
-            'REQUEST_URI' => '/test.txt',
+            'REQUEST_URI'    => '/test.txt',
             'REQUEST_METHOD' => 'LOCK',
         ]);
         $this->server->httpRequest = $request;
@@ -412,8 +412,8 @@ class PluginTest extends DAV\AbstractServer {
         $lockToken = $this->server->httpResponse->getHeader('Lock-Token');
 
         $locks = $this->locksPlugin->getLocks('test.txt');
-        $this->assertEquals(1,count($locks));
-        $this->assertEquals('Evert',$locks[0]->owner);
+        $this->assertEquals(1, count($locks));
+        $this->assertEquals('Evert', $locks[0]->owner);
 
 
     }
@@ -423,10 +423,10 @@ class PluginTest extends DAV\AbstractServer {
      */
     function testLockPutBadToken() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/test.txt',
             'REQUEST_METHOD' => 'LOCK',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -441,24 +441,24 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(200, $this->response->status);
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/test.txt',
             'REQUEST_METHOD' => 'PUT',
-            'HTTP_IF' => '(<opaquelocktoken:token1>)',
-        );
+            'HTTP_IF'        => '(<opaquelocktoken:token1>)',
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('newbody');
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         // $this->assertEquals('412 Precondition failed',$this->response->status);
         $this->assertEquals(423, $this->response->status);
@@ -470,10 +470,10 @@ class PluginTest extends DAV\AbstractServer {
      */
     function testLockDeleteParent() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/dir/child.txt',
             'REQUEST_METHOD' => 'LOCK',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -488,22 +488,22 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(200, $this->response->status);
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/dir',
             'REQUEST_METHOD' => 'DELETE',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $this->server->httpRequest = $request;
         $this->server->exec();
 
         $this->assertEquals(423, $this->response->status);
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
 
     }
     /**
@@ -511,10 +511,10 @@ class PluginTest extends DAV\AbstractServer {
      */
     function testLockDeleteSucceed() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/dir/child.txt',
             'REQUEST_METHOD' => 'LOCK',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -529,23 +529,23 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(200, $this->response->status);
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/dir/child.txt',
             'REQUEST_METHOD' => 'DELETE',
-            'HTTP_IF' => '(' . $this->response->getHeader('Lock-Token') . ')',
-        );
+            'HTTP_IF'        => '(' . $this->response->getHeader('Lock-Token') . ')',
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $this->server->httpRequest = $request;
         $this->server->exec();
 
         $this->assertEquals(204, $this->response->status);
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
 
     }
 
@@ -554,10 +554,10 @@ class PluginTest extends DAV\AbstractServer {
      */
     function testLockCopyLockSource() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/dir/child.txt',
             'REQUEST_METHOD' => 'LOCK',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -572,23 +572,23 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(200, $this->response->status);
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/dir/child.txt',
-            'REQUEST_METHOD' => 'COPY',
+        $serverVars = [
+            'REQUEST_URI'      => '/dir/child.txt',
+            'REQUEST_METHOD'   => 'COPY',
             'HTTP_DESTINATION' => '/dir/child2.txt',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals(201, $this->response->status,'Copy must succeed if only the source is locked, but not the destination');
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
+        $this->assertEquals(201, $this->response->status, 'Copy must succeed if only the source is locked, but not the destination');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
 
     }
     /**
@@ -596,10 +596,10 @@ class PluginTest extends DAV\AbstractServer {
      */
     function testLockCopyLockDestination() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/dir/child2.txt',
             'REQUEST_METHOD' => 'LOCK',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -614,23 +614,23 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(201, $this->response->status);
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/dir/child.txt',
-            'REQUEST_METHOD' => 'COPY',
+        $serverVars = [
+            'REQUEST_URI'      => '/dir/child.txt',
+            'REQUEST_METHOD'   => 'COPY',
             'HTTP_DESTINATION' => '/dir/child2.txt',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals(423, $this->response->status,'Copy must succeed if only the source is locked, but not the destination');
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
+        $this->assertEquals(423, $this->response->status, 'Copy must succeed if only the source is locked, but not the destination');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
 
     }
 
@@ -639,10 +639,10 @@ class PluginTest extends DAV\AbstractServer {
      */
     function testLockMoveLockSourceLocked() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/dir/child.txt',
             'REQUEST_METHOD' => 'LOCK',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -657,23 +657,23 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(200, $this->response->status);
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/dir/child.txt',
-            'REQUEST_METHOD' => 'MOVE',
+        $serverVars = [
+            'REQUEST_URI'      => '/dir/child.txt',
+            'REQUEST_METHOD'   => 'MOVE',
             'HTTP_DESTINATION' => '/dir/child2.txt',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals(423, $this->response->status,'Copy must succeed if only the source is locked, but not the destination');
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
+        $this->assertEquals(423, $this->response->status, 'Copy must succeed if only the source is locked, but not the destination');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
 
     }
 
@@ -682,10 +682,10 @@ class PluginTest extends DAV\AbstractServer {
      */
     function testLockMoveLockSourceSucceed() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/dir/child.txt',
             'REQUEST_METHOD' => 'LOCK',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -700,23 +700,23 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(200, $this->response->status);
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/dir/child.txt',
-            'REQUEST_METHOD' => 'MOVE',
+        $serverVars = [
+            'REQUEST_URI'      => '/dir/child.txt',
+            'REQUEST_METHOD'   => 'MOVE',
             'HTTP_DESTINATION' => '/dir/child2.txt',
-            'HTTP_IF' => '(' . $this->response->getHeader('Lock-Token') . ')',
-        );
+            'HTTP_IF'          => '(' . $this->response->getHeader('Lock-Token') . ')',
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals(201, $this->response->status,'A valid lock-token was provided for the source, so this MOVE operation must succeed. Full response body: ' . $this->response->body);
+        $this->assertEquals(201, $this->response->status, 'A valid lock-token was provided for the source, so this MOVE operation must succeed. Full response body: ' . $this->response->body);
 
     }
 
@@ -725,10 +725,10 @@ class PluginTest extends DAV\AbstractServer {
      */
     function testLockMoveLockDestination() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/dir/child2.txt',
             'REQUEST_METHOD' => 'LOCK',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -743,23 +743,23 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(201, $this->response->status);
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/dir/child.txt',
-            'REQUEST_METHOD' => 'MOVE',
+        $serverVars = [
+            'REQUEST_URI'      => '/dir/child.txt',
+            'REQUEST_METHOD'   => 'MOVE',
             'HTTP_DESTINATION' => '/dir/child2.txt',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals(423, $this->response->status,'Copy must succeed if only the source is locked, but not the destination');
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
+        $this->assertEquals(423, $this->response->status, 'Copy must succeed if only the source is locked, but not the destination');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
 
     }
     /**
@@ -767,11 +767,11 @@ class PluginTest extends DAV\AbstractServer {
      */
     function testLockMoveLockParent() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/dir',
             'REQUEST_METHOD' => 'LOCK',
-            'HTTP_DEPTH' => 'infinite',
-        );
+            'HTTP_DEPTH'     => 'infinite',
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -786,24 +786,24 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
-        $this->assertEquals(200,$this->response->status);
+        $this->assertEquals(200, $this->response->status);
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/dir/child.txt',
-            'REQUEST_METHOD' => 'MOVE',
+        $serverVars = [
+            'REQUEST_URI'      => '/dir/child.txt',
+            'REQUEST_METHOD'   => 'MOVE',
             'HTTP_DESTINATION' => '/dir/child2.txt',
-            'HTTP_IF' => '</dir> (' . $this->response->getHeader('Lock-Token') . ')',
-        );
+            'HTTP_IF'          => '</dir> (' . $this->response->getHeader('Lock-Token') . ')',
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals(201, $this->response->status,'We locked the parent of both the source and destination, but the move didn\'t succeed.');
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
+        $this->assertEquals(201, $this->response->status, 'We locked the parent of both the source and destination, but the move didn\'t succeed.');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
 
     }
 
@@ -812,10 +812,10 @@ class PluginTest extends DAV\AbstractServer {
      */
     function testLockPutGoodToken() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/test.txt',
             'REQUEST_METHOD' => 'LOCK',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -830,24 +830,24 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(200, $this->response->status);
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/test.txt',
             'REQUEST_METHOD' => 'PUT',
-            'HTTP_IF' => '('.$this->response->getHeader('Lock-Token').')',
-        );
+            'HTTP_IF'        => '(' . $this->response->getHeader('Lock-Token') . ')',
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('newbody');
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(204, $this->response->status);
 
@@ -871,22 +871,22 @@ class PluginTest extends DAV\AbstractServer {
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(201, $this->response->getStatus());
 
         $request = new HTTP\Request(
             'PUT',
             '/test.txt',
-            ['If' => '</unrelated.txt> ('.$this->response->getHeader('Lock-Token').')']
+            ['If' => '</unrelated.txt> (' . $this->response->getHeader('Lock-Token') . ')']
         );
         $request->setBody('newbody');
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
 
         $this->assertEquals(204, $this->response->status);
 
@@ -894,11 +894,11 @@ class PluginTest extends DAV\AbstractServer {
 
     function testPutWithIncorrectETag() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/test.txt',
             'REQUEST_METHOD' => 'PUT',
-            'HTTP_IF' => '(["etag1"])',
-        );
+            'HTTP_IF'        => '(["etag1"])',
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('newbody');
@@ -920,14 +920,14 @@ class PluginTest extends DAV\AbstractServer {
         $filename = SABRE_TEMPDIR . '/test.txt';
         $etag = sha1(
             fileinode($filename) .
-            filesize($filename ) .
+            filesize($filename) .
             filemtime($filename)
         );
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/test.txt',
             'REQUEST_METHOD' => 'PUT',
-            'HTTP_IF' => '(["'.$etag.'"])',
-        );
+            'HTTP_IF'        => '(["' . $etag . '"])',
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('newbody');
@@ -939,11 +939,11 @@ class PluginTest extends DAV\AbstractServer {
 
     function testDeleteWithETagOnCollection() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/dir',
             'REQUEST_METHOD' => 'DELETE',
-            'HTTP_IF' => '(["etag1"])',
-        );
+            'HTTP_IF'        => '(["etag1"])',
+        ];
         $request = HTTP\Sapi::createFromServerArray($serverVars);
 
         $this->server->httpRequest = $request;
@@ -954,9 +954,9 @@ class PluginTest extends DAV\AbstractServer {
 
     function testGetTimeoutHeader() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'HTTP_TIMEOUT' => 'second-100',
-        ));
+        ]);
 
         $this->server->httpRequest = $request;
         $this->assertEquals(100, $this->locksPlugin->getTimeoutHeader());
@@ -965,9 +965,9 @@ class PluginTest extends DAV\AbstractServer {
 
     function testGetTimeoutHeaderTwoItems() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'HTTP_TIMEOUT' => 'second-5, infinite',
-        ));
+        ]);
 
         $this->server->httpRequest = $request;
         $this->assertEquals(5, $this->locksPlugin->getTimeoutHeader());
@@ -976,9 +976,9 @@ class PluginTest extends DAV\AbstractServer {
 
     function testGetTimeoutHeaderInfinite() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'HTTP_TIMEOUT' => 'infinite, second-5',
-        ));
+        ]);
 
         $this->server->httpRequest = $request;
         $this->assertEquals(LockInfo::TIMEOUT_INFINITE, $this->locksPlugin->getTimeoutHeader());
@@ -990,9 +990,9 @@ class PluginTest extends DAV\AbstractServer {
      */
     function testGetTimeoutHeaderInvalid() {
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'HTTP_TIMEOUT' => 'yourmom',
-        ));
+        ]);
 
         $this->server->httpRequest = $request;
         $this->locksPlugin->getTimeoutHeader();
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Mount/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Mount/PluginTest.php
index e6415792c..3213fcb1b 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Mount/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Mount/PluginTest.php
@@ -18,27 +18,27 @@ class PluginTest extends DAV\AbstractServer {
 
     function testPassThrough() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/',
             'REQUEST_METHOD' => 'GET',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(501, $this->response->status,'We expected GET to not be implemented for Directories. Response body: ' . $this->response->body);
+        $this->assertEquals(501, $this->response->status, 'We expected GET to not be implemented for Directories. Response body: ' . $this->response->body);
 
     }
 
     function testMountResponse() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/?mount',
             'REQUEST_METHOD' => 'GET',
             'QUERY_STRING'   => 'mount',
             'HTTP_HOST'      => 'example.org',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $this->server->httpRequest = ($request);
@@ -47,11 +47,11 @@ class PluginTest extends DAV\AbstractServer {
         $this->assertEquals(200, $this->response->status);
 
         $xml = simplexml_load_string($this->response->body);
-        $this->assertInstanceOf('SimpleXMLElement',$xml, 'Response was not a valid xml document. The list of errors:' . print_r(libxml_get_errors(),true) . '. xml body: ' . $this->response->body . '. What type we got: ' . gettype($xml) . ' class, if object: ' . get_class($xml));
+        $this->assertInstanceOf('SimpleXMLElement', $xml, 'Response was not a valid xml document. The list of errors:' . print_r(libxml_get_errors(), true) . '. xml body: ' . $this->response->body . '. What type we got: ' . gettype($xml) . ' class, if object: ' . get_class($xml));
 
-        $xml->registerXPathNamespace('dm','http://purl.org/NET/webdav/mount');
+        $xml->registerXPathNamespace('dm', 'http://purl.org/NET/webdav/mount');
         $url = $xml->xpath('//dm:url');
-        $this->assertEquals('http://example.org/',(string)$url[0]);
+        $this->assertEquals('http://example.org/', (string)$url[0]);
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php
index 9b7eeb90c..15289ce52 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php
@@ -13,8 +13,8 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
         \Sabre\TestUtil::clearTempDir();
         mkdir(SABRE_TEMPDIR . '/root');
         mkdir(SABRE_TEMPDIR . '/root/subdir');
-        file_put_contents(SABRE_TEMPDIR . '/root/file.txt','contents');
-        file_put_contents(SABRE_TEMPDIR . '/root/subdir/subfile.txt','subcontents');
+        file_put_contents(SABRE_TEMPDIR . '/root/file.txt', 'contents');
+        file_put_contents(SABRE_TEMPDIR . '/root/subdir/subfile.txt', 'subcontents');
         $rootNode = new FSExt\Directory(SABRE_TEMPDIR . '/root');
         $this->tree = new Tree($rootNode);
 
@@ -29,22 +29,22 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
     function testGetRootNode() {
 
         $root = $this->tree->getNodeForPath('');
-        $this->assertInstanceOf('Sabre\\DAV\\FSExt\\Directory',$root);
+        $this->assertInstanceOf('Sabre\\DAV\\FSExt\\Directory', $root);
 
     }
 
     function testGetSubDir() {
 
         $root = $this->tree->getNodeForPath('subdir');
-        $this->assertInstanceOf('Sabre\\DAV\\FSExt\\Directory',$root);
+        $this->assertInstanceOf('Sabre\\DAV\\FSExt\\Directory', $root);
 
     }
 
     function testCopyFile() {
 
-       $this->tree->copy('file.txt','file2.txt');
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/file2.txt'));
-       $this->assertEquals('contents',file_get_contents(SABRE_TEMPDIR.'/root/file2.txt'));
+       $this->tree->copy('file.txt', 'file2.txt');
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/file2.txt'));
+       $this->assertEquals('contents', file_get_contents(SABRE_TEMPDIR . '/root/file2.txt'));
 
     }
 
@@ -53,10 +53,10 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
      */
     function testCopyDirectory() {
 
-       $this->tree->copy('subdir','subdir2');
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/subdir2'));
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/subdir2/subfile.txt'));
-       $this->assertEquals('subcontents',file_get_contents(SABRE_TEMPDIR.'/root/subdir2/subfile.txt'));
+       $this->tree->copy('subdir', 'subdir2');
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2'));
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
+       $this->assertEquals('subcontents', file_get_contents(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
 
     }
 
@@ -65,10 +65,10 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
      */
     function testMoveFile() {
 
-       $this->tree->move('file.txt','file2.txt');
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/file2.txt'));
-       $this->assertFalse(file_exists(SABRE_TEMPDIR.'/root/file.txt'));
-       $this->assertEquals('contents',file_get_contents(SABRE_TEMPDIR.'/root/file2.txt'));
+       $this->tree->move('file.txt', 'file2.txt');
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/file2.txt'));
+       $this->assertFalse(file_exists(SABRE_TEMPDIR . '/root/file.txt'));
+       $this->assertEquals('contents', file_get_contents(SABRE_TEMPDIR . '/root/file2.txt'));
 
     }
 
@@ -77,10 +77,10 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
      */
     function testMoveFileNewParent() {
 
-       $this->tree->move('file.txt','subdir/file2.txt');
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/subdir/file2.txt'));
-       $this->assertFalse(file_exists(SABRE_TEMPDIR.'/root/file.txt'));
-       $this->assertEquals('contents',file_get_contents(SABRE_TEMPDIR.'/root/subdir/file2.txt'));
+       $this->tree->move('file.txt', 'subdir/file2.txt');
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir/file2.txt'));
+       $this->assertFalse(file_exists(SABRE_TEMPDIR . '/root/file.txt'));
+       $this->assertEquals('contents', file_get_contents(SABRE_TEMPDIR . '/root/subdir/file2.txt'));
 
     }
 
@@ -89,11 +89,11 @@ class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
      */
     function testMoveDirectory() {
 
-       $this->tree->move('subdir','subdir2');
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/subdir2'));
-       $this->assertTrue(file_exists(SABRE_TEMPDIR.'/root/subdir2/subfile.txt'));
-       $this->assertFalse(file_exists(SABRE_TEMPDIR.'/root/subdir'));
-       $this->assertEquals('subcontents',file_get_contents(SABRE_TEMPDIR.'/root/subdir2/subfile.txt'));
+       $this->tree->move('subdir', 'subdir2');
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2'));
+       $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
+       $this->assertFalse(file_exists(SABRE_TEMPDIR . '/root/subdir'));
+       $this->assertEquals('subcontents', file_get_contents(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/FileMock.php b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/FileMock.php
index d6cc406be..eff1e7d67 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/FileMock.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/FileMock.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\DAV\PartialUpdate;
+
 use Sabre\DAV;
 
 class FileMock implements IPatchSupport {
@@ -49,10 +50,10 @@ class FileMock implements IPatchSupport {
             $data = stream_get_contents($data);
         }
 
-        switch($rangeType) {
+        switch ($rangeType) {
 
             case 1 :
-                $this->data.=$data;
+                $this->data .= $data;
                 break;
             case 3 :
                 // Turn the offset into an offset-offset.
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
index 31be2a1b1..ca8ca3f6e 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
@@ -16,11 +16,11 @@ class SpecificationTest extends \PHPUnit_Framework_TestCase {
 
     protected $server;
 
-    public function setUp() {
+    function setUp() {
 
-        $tree = array(
+        $tree = [
             new File(SABRE_TEMPDIR . '/foobar.txt')
-        );
+        ];
         $server = new Server($tree);
         $server->debugExceptions = true;
         $server->addPlugin(new Plugin());
@@ -31,7 +31,7 @@ class SpecificationTest extends \PHPUnit_Framework_TestCase {
 
     }
 
-    public function tearDown() {
+    function tearDown() {
 
         \Sabre\TestUtil::clearTempDir();
 
@@ -40,10 +40,10 @@ class SpecificationTest extends \PHPUnit_Framework_TestCase {
     /**
      * @dataProvider data
      */
-    public function testUpdateRange($headerValue, $httpStatus, $endResult, $contentLength = 4) {
+    function testUpdateRange($headerValue, $httpStatus, $endResult, $contentLength = 4) {
 
         $headers = [
-            'Content-Type' => 'application/x-sabredav-partialupdate',
+            'Content-Type'   => 'application/x-sabredav-partialupdate',
             'X-Update-Range' => $headerValue,
         ];
 
@@ -64,25 +64,25 @@ class SpecificationTest extends \PHPUnit_Framework_TestCase {
             $this->assertEquals($endResult, file_get_contents(SABRE_TEMPDIR . '/foobar.txt'));
         }
 
-    } 
+    }
 
-    public function data() {
+    function data() {
 
-        return array(
+        return [
             // Problems
-            array('foo',       400, null),
-            array('bytes=0-3', 411, null, 0),
-            array('bytes=4-1', 416, null),
+            ['foo',       400, null],
+            ['bytes=0-3', 411, null, 0],
+            ['bytes=4-1', 416, null],
 
-            array('bytes=0-3', 204, '----567890'),
-            array('bytes=1-4', 204, '1----67890'),
-            array('bytes=0-',  204, '----567890'),
-            array('bytes=-4',  204, '123456----'),
-            array('bytes=-2',  204, '12345678----'),
-            array('bytes=2-',  204, '12----7890'),
-            array('append',    204, '1234567890----'),
+            ['bytes=0-3', 204, '----567890'],
+            ['bytes=1-4', 204, '1----67890'],
+            ['bytes=0-',  204, '----567890'],
+            ['bytes=-4',  204, '123456----'],
+            ['bytes=-2',  204, '12345678----'],
+            ['bytes=2-',  204, '12----7890'],
+            ['append',    204, '1234567890----'],
 
-        );
+        ];
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
index 6ac20d2da..4c576f108 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
@@ -31,7 +31,9 @@ class ServerEventsTest extends AbstractServer {
 
     function testAfterResponse() {
 
-        $mock = $this->getMock('stdClass', ['afterResponseCallback']);
+        $mock = $this->getMockBuilder('stdClass')
+            ->setMethods(['afterResponseCallback'])
+            ->getMock();
         $mock->expects($this->once())->method('afterResponseCallback');
 
         $this->server->on('afterResponse', [$mock, 'afterResponseCallback']);
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerMKCOLTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerMKCOLTest.php
index e35189ec3..557eddbbc 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerMKCOLTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerMKCOLTest.php
@@ -8,20 +8,20 @@ class ServerMKCOLTest extends AbstractServer {
 
     function testMkcol() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/testcol',
             'REQUEST_METHOD' => 'MKCOL',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody("");
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Length' => ['0'],
-        ),$this->response->getHeaders());
+            'Content-Length'  => ['0'],
+        ], $this->response->getHeaders());
 
         $this->assertEquals(201, $this->response->status);
         $this->assertEquals('', $this->response->body);
@@ -34,20 +34,20 @@ class ServerMKCOLTest extends AbstractServer {
      */
     function testMKCOLUnknownBody() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/testcol',
             'REQUEST_METHOD' => 'MKCOL',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody("Hello");
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ),$this->response->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $this->response->getHeaders());
 
         $this->assertEquals(415, $this->response->status);
 
@@ -58,23 +58,23 @@ class ServerMKCOLTest extends AbstractServer {
      */
     function testMKCOLBrokenXML() {
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/testcol',
-            'REQUEST_METHOD' => 'MKCOL',
+        $serverVars = [
+            'REQUEST_URI'       => '/testcol',
+            'REQUEST_METHOD'    => 'MKCOL',
             'HTTP_CONTENT_TYPE' => 'application/xml',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody("Hello");
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ),$this->response->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $this->response->getHeaders());
 
-        $this->assertEquals(400, $this->response->getStatus(), $this->response->getBodyAsString() );
+        $this->assertEquals(400, $this->response->getStatus(), $this->response->getBodyAsString());
 
     }
 
@@ -83,21 +83,21 @@ class ServerMKCOLTest extends AbstractServer {
      */
     function testMKCOLUnknownXML() {
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/testcol',
-            'REQUEST_METHOD' => 'MKCOL',
+        $serverVars = [
+            'REQUEST_URI'       => '/testcol',
+            'REQUEST_METHOD'    => 'MKCOL',
             'HTTP_CONTENT_TYPE' => 'application/xml',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?><html></html>');
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ),$this->response->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $this->response->getHeaders());
 
         $this->assertEquals(400, $this->response->getStatus());
 
@@ -108,11 +108,11 @@ class ServerMKCOLTest extends AbstractServer {
      */
     function testMKCOLNoResourceType() {
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/testcol',
-            'REQUEST_METHOD' => 'MKCOL',
+        $serverVars = [
+            'REQUEST_URI'       => '/testcol',
+            'REQUEST_METHOD'    => 'MKCOL',
             'HTTP_CONTENT_TYPE' => 'application/xml',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -126,12 +126,12 @@ class ServerMKCOLTest extends AbstractServer {
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ),$this->response->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $this->response->getHeaders());
 
-        $this->assertEquals(400, $this->response->status, 'Wrong statuscode received. Full response body: ' .$this->response->body);
+        $this->assertEquals(400, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
 
     }
 
@@ -140,11 +140,11 @@ class ServerMKCOLTest extends AbstractServer {
      */
     function testMKCOLIncorrectResourceType() {
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/testcol',
-            'REQUEST_METHOD' => 'MKCOL',
+        $serverVars = [
+            'REQUEST_URI'       => '/testcol',
+            'REQUEST_METHOD'    => 'MKCOL',
             'HTTP_CONTENT_TYPE' => 'application/xml',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -158,12 +158,12 @@ class ServerMKCOLTest extends AbstractServer {
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ),$this->response->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $this->response->getHeaders());
 
-        $this->assertEquals(403, $this->response->status, 'Wrong statuscode received. Full response body: ' .$this->response->body);
+        $this->assertEquals(403, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
 
     }
 
@@ -172,11 +172,11 @@ class ServerMKCOLTest extends AbstractServer {
      */
     function testMKCOLSuccess() {
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/testcol',
-            'REQUEST_METHOD' => 'MKCOL',
+        $serverVars = [
+            'REQUEST_URI'       => '/testcol',
+            'REQUEST_METHOD'    => 'MKCOL',
             'HTTP_CONTENT_TYPE' => 'application/xml',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -190,12 +190,12 @@ class ServerMKCOLTest extends AbstractServer {
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Length' => ['0'],
-        ),$this->response->getHeaders());
+            'Content-Length'  => ['0'],
+        ], $this->response->getHeaders());
 
-        $this->assertEquals(201, $this->response->status, 'Wrong statuscode received. Full response body: ' .$this->response->body);
+        $this->assertEquals(201, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
 
     }
 
@@ -204,11 +204,11 @@ class ServerMKCOLTest extends AbstractServer {
      */
     function testMKCOLWhiteSpaceResourceType() {
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/testcol',
-            'REQUEST_METHOD' => 'MKCOL',
+        $serverVars = [
+            'REQUEST_URI'       => '/testcol',
+            'REQUEST_METHOD'    => 'MKCOL',
             'HTTP_CONTENT_TYPE' => 'application/xml',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
@@ -224,12 +224,12 @@ class ServerMKCOLTest extends AbstractServer {
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Length' => ['0'],
-        ),$this->response->getHeaders());
+            'Content-Length'  => ['0'],
+        ], $this->response->getHeaders());
 
-        $this->assertEquals(201, $this->response->status, 'Wrong statuscode received. Full response body: ' .$this->response->body);
+        $this->assertEquals(201, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
 
     }
 
@@ -238,10 +238,10 @@ class ServerMKCOLTest extends AbstractServer {
      */
     function testMKCOLNoParent() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/testnoparent/409me',
             'REQUEST_METHOD' => 'MKCOL',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('');
@@ -249,12 +249,12 @@ class ServerMKCOLTest extends AbstractServer {
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ),$this->response->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $this->response->getHeaders());
 
-        $this->assertEquals(409, $this->response->status, 'Wrong statuscode received. Full response body: ' .$this->response->body);
+        $this->assertEquals(409, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
 
     }
 
@@ -263,10 +263,10 @@ class ServerMKCOLTest extends AbstractServer {
      */
     function testMKCOLParentIsNoCollection() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/test.txt/409me',
             'REQUEST_METHOD' => 'MKCOL',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('');
@@ -274,12 +274,12 @@ class ServerMKCOLTest extends AbstractServer {
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ),$this->response->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $this->response->getHeaders());
 
-        $this->assertEquals(409, $this->response->status, 'Wrong statuscode received. Full response body: ' .$this->response->body);
+        $this->assertEquals(409, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
 
     }
 
@@ -288,10 +288,10 @@ class ServerMKCOLTest extends AbstractServer {
      */
     function testMKCOLAlreadyExists() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/test.txt',
             'REQUEST_METHOD' => 'MKCOL',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('');
@@ -299,13 +299,13 @@ class ServerMKCOLTest extends AbstractServer {
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-            'Allow'        => ['OPTIONS, GET, HEAD, DELETE, PROPFIND, PUT, PROPPATCH, COPY, MOVE, REPORT'],
-        ),$this->response->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+            'Allow'           => ['OPTIONS, GET, HEAD, DELETE, PROPFIND, PUT, PROPPATCH, COPY, MOVE, REPORT'],
+        ], $this->response->getHeaders());
 
-        $this->assertEquals(405, $this->response->status, 'Wrong statuscode received. Full response body: ' .$this->response->body);
+        $this->assertEquals(405, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
 
     }
 
@@ -315,13 +315,11 @@ class ServerMKCOLTest extends AbstractServer {
      */
     function testMKCOLAndProps() {
 
-        $serverVars = array(
-            'REQUEST_URI'    => '/testcol',
-            'REQUEST_METHOD' => 'MKCOL',
-            'HTTP_CONTENT_TYPE' => 'application/xml',
+        $request = new HTTP\Request(
+            'MKCOL',
+            '/testcol',
+            ['Content-Type' => 'application/xml']
         );
-
-        $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody('<?xml version="1.0"?>
 <mkcol xmlns="DAV:">
   <set>
@@ -334,12 +332,34 @@ class ServerMKCOLTest extends AbstractServer {
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(207, $this->response->status, 'Wrong statuscode received. Full response body: ' .$this->response->body);
+        $this->assertEquals(207, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ),$this->response->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $this->response->getHeaders());
+
+        $responseBody = $this->response->getBodyAsString();
+
+        $expected = <<<XML
+<?xml version="1.0"?>
+<d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
+ <d:response>
+  <d:href>/testcol</d:href>
+  <d:propstat>
+   <d:prop>
+    <d:displayname />
+   </d:prop>
+   <d:status>HTTP/1.1 403 Forbidden</d:status>
+  </d:propstat>
+ </d:response>
+</d:multistatus>
+XML;
+
+        $this->assertXmlStringEqualsXmlString(
+            $expected,
+            $responseBody
+        );
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerPluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerPluginTest.php
index ab0ad295e..fa67102cc 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerPluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerPluginTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Sabre\DAV;
+
 use Sabre\HTTP;
 
 require_once 'Sabre/DAV/AbstractServer.php';
@@ -28,13 +29,13 @@ class ServerPluginTest extends AbstractServer {
     function testBaseClass() {
 
         $p = new ServerPluginMock();
-        $this->assertEquals([],$p->getFeatures());
-        $this->assertEquals([],$p->getHTTPMethods(''));
+        $this->assertEquals([], $p->getFeatures());
+        $this->assertEquals([], $p->getHTTPMethods(''));
         $this->assertEquals(
             [
-                'name' => 'Sabre\DAV\ServerPluginMock',
+                'name'        => 'Sabre\DAV\ServerPluginMock',
                 'description' => null,
-                'link' => null
+                'link'        => null
             ], $p->getPluginInfo()
         );
 
@@ -42,34 +43,34 @@ class ServerPluginTest extends AbstractServer {
 
     function testOptions() {
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_URI'    => '/',
             'REQUEST_METHOD' => 'OPTIONS',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             'DAV'             => ['1, 3, extended-mkcol, drinking'],
             'MS-Author-Via'   => ['DAV'],
             'Allow'           => ['OPTIONS, GET, HEAD, DELETE, PROPFIND, PUT, PROPPATCH, COPY, MOVE, REPORT, BEER, WINE'],
             'Accept-Ranges'   => ['bytes'],
             'Content-Length'  => ['0'],
             'X-Sabre-Version' => [Version::VERSION],
-        ),$this->response->getHeaders());
+        ], $this->response->getHeaders());
 
         $this->assertEquals(200, $this->response->status);
         $this->assertEquals('', $this->response->body);
-        $this->assertEquals('OPTIONS',$this->testPlugin->beforeMethod);
+        $this->assertEquals('OPTIONS', $this->testPlugin->beforeMethod);
 
 
     }
 
     function testGetPlugin() {
 
-        $this->assertEquals($this->testPlugin,$this->server->getPlugin(get_class($this->testPlugin)));
+        $this->assertEquals($this->testPlugin, $this->server->getPlugin(get_class($this->testPlugin)));
 
     }
 
@@ -81,17 +82,17 @@ class ServerPluginTest extends AbstractServer {
 
     function testGetSupportedReportSet() {
 
-        $this->assertEquals(array(), $this->testPlugin->getSupportedReportSet('/'));
+        $this->assertEquals([], $this->testPlugin->getSupportedReportSet('/'));
 
     }
 
     function testGetPlugins() {
 
         $this->assertEquals(
-            array(
+            [
                 get_class($this->testPlugin) => $this->testPlugin,
-                'core' => $this->server->getPlugin('core'),
-            ),
+                'core'                       => $this->server->getPlugin('core'),
+            ],
             $this->server->getPlugins()
         );
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerPreconditionTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerPreconditionTest.php
index 1dc8d8a37..203cf26d9 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerPreconditionTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerPreconditionTest.php
@@ -13,7 +13,7 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
      */
     function testIfMatchNoNode() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('GET', '/bar', ['If-Match' => '*']);
         $httpResponse = new HTTP\Response();
@@ -25,7 +25,7 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
      */
     function testIfMatchHasNode() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '*']);
         $httpResponse = new HTTP\Response();
@@ -38,7 +38,7 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
      */
     function testIfMatchWrongEtag() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '1234']);
         $httpResponse = new HTTP\Response();
@@ -50,7 +50,7 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
      */
     function testIfMatchCorrectEtag() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '"abc123"']);
         $httpResponse = new HTTP\Response();
@@ -65,7 +65,7 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
      */
     function testIfMatchEvolutionEtag() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '\\"abc123\\"']);
         $httpResponse = new HTTP\Response();
@@ -77,7 +77,7 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
      */
     function testIfMatchMultiple() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '"hellothere", "abc123"']);
         $httpResponse = new HTTP\Response();
@@ -89,7 +89,7 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
      */
     function testIfNoneMatchNoNode() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('GET', '/bar', ['If-None-Match' => '*']);
         $httpResponse = new HTTP\Response();
@@ -102,7 +102,7 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
      */
     function testIfNoneMatchHasNode() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '*']);
         $httpResponse = new HTTP\Response();
@@ -114,7 +114,7 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
      */
     function testIfNoneMatchWrongEtag() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"1234"']);
         $httpResponse = new HTTP\Response();
@@ -126,7 +126,7 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
      */
     function testIfNoneMatchWrongEtagMultiple() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"1234", "5678"']);
         $httpResponse = new HTTP\Response();
@@ -137,9 +137,9 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
     /**
      * @expectedException Sabre\DAV\Exception\PreconditionFailed
      */
-    public function testIfNoneMatchCorrectEtag() {
+    function testIfNoneMatchCorrectEtag() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"abc123"']);
         $httpResponse = new HTTP\Response();
@@ -150,9 +150,9 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
     /**
      * @expectedException Sabre\DAV\Exception\PreconditionFailed
      */
-    public function testIfNoneMatchCorrectEtagMultiple() {
+    function testIfNoneMatchCorrectEtagMultiple() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"1234, "abc123"']);
         $httpResponse = new HTTP\Response();
@@ -162,9 +162,9 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
 
     /**
      */
-    public function testIfNoneMatchCorrectEtagAsGet() {
+    function testIfNoneMatchCorrectEtagAsGet() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $httpRequest = new HTTP\Request('GET', '/foo', ['If-None-Match' => '"abc123"']);
         $server->httpResponse = new HTTP\ResponseMock();
@@ -178,9 +178,9 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
     /**
      * This was a test written for issue #515.
      */
-    public function testNoneMatchCorrectEtagEnsureSapiSent() {
+    function testNoneMatchCorrectEtagEnsureSapiSent() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
         $server->sapi = new HTTP\SapiMock();
         HTTP\SapiMock::$sent = 0;
@@ -193,7 +193,7 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
         $this->assertFalse($server->checkPreconditions($httpRequest, $server->httpResponse));
         $this->assertEquals(304, $server->httpResponse->getStatus());
         $this->assertEquals([
-            'ETag' => ['"abc123"'],
+            'ETag'            => ['"abc123"'],
             'X-Sabre-Version' => [Version::VERSION],
         ], $server->httpResponse->getHeaders());
         $this->assertEquals(1, HTTP\SapiMock::$sent);
@@ -202,35 +202,35 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
 
     /**
      */
-    public function testIfModifiedSinceUnModified() {
+    function testIfModifiedSinceUnModified() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
-        $httpRequest = HTTP\Sapi::createFromServerArray(array(
+        $httpRequest = HTTP\Sapi::createFromServerArray([
             'HTTP_IF_MODIFIED_SINCE' => 'Sun, 06 Nov 1994 08:49:37 GMT',
-            'REQUEST_URI'   => '/foo'
-        ));
+            'REQUEST_URI'            => '/foo'
+        ]);
         $server->httpResponse = new HTTP\ResponseMock();
         $this->assertFalse($server->checkPreconditions($httpRequest, $server->httpResponse));
 
         $this->assertEquals(304, $server->httpResponse->status);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'Last-Modified' => ['Sat, 06 Apr 1985 23:30:00 GMT'],
-        ), $server->httpResponse->getHeaders());
+        ], $server->httpResponse->getHeaders());
 
     }
 
 
     /**
      */
-    public function testIfModifiedSinceModified() {
+    function testIfModifiedSinceModified() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
-        $httpRequest = HTTP\Sapi::createFromServerArray(array(
+        $httpRequest = HTTP\Sapi::createFromServerArray([
             'HTTP_IF_MODIFIED_SINCE' => 'Tue, 06 Nov 1984 08:49:37 GMT',
-            'REQUEST_URI'   => '/foo'
-        ));
+            'REQUEST_URI'            => '/foo'
+        ]);
 
         $httpResponse = new HTTP\ResponseMock();
         $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
@@ -239,14 +239,14 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
 
     /**
      */
-    public function testIfModifiedSinceInvalidDate() {
+    function testIfModifiedSinceInvalidDate() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
-        $httpRequest = HTTP\Sapi::createFromServerArray(array(
+        $httpRequest = HTTP\Sapi::createFromServerArray([
             'HTTP_IF_MODIFIED_SINCE' => 'Your mother',
-            'REQUEST_URI'   => '/foo'
-        ));
+            'REQUEST_URI'            => '/foo'
+        ]);
         $httpResponse = new HTTP\ResponseMock();
 
         // Invalid dates must be ignored, so this should return true
@@ -256,14 +256,14 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
 
     /**
      */
-    public function testIfModifiedSinceInvalidDate2() {
+    function testIfModifiedSinceInvalidDate2() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
-        $httpRequest = HTTP\Sapi::createFromServerArray(array(
+        $httpRequest = HTTP\Sapi::createFromServerArray([
             'HTTP_IF_MODIFIED_SINCE' => 'Sun, 06 Nov 1994 08:49:37 EST',
-            'REQUEST_URI'   => '/foo'
-        ));
+            'REQUEST_URI'            => '/foo'
+        ]);
         $httpResponse = new HTTP\ResponseMock();
         $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
 
@@ -272,14 +272,14 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
 
     /**
      */
-    public function testIfUnmodifiedSinceUnModified() {
+    function testIfUnmodifiedSinceUnModified() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
-        $httpRequest = HTTP\Sapi::createFromServerArray(array(
+        $httpRequest = HTTP\Sapi::createFromServerArray([
             'HTTP_IF_UNMODIFIED_SINCE' => 'Sun, 06 Nov 1994 08:49:37 GMT',
-            'REQUEST_URI'   => '/foo'
-        ));
+            'REQUEST_URI'              => '/foo'
+        ]);
         $httpResponse = new HTTP\Response();
         $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
 
@@ -289,14 +289,14 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
     /**
      * @expectedException Sabre\DAV\Exception\PreconditionFailed
      */
-    public function testIfUnmodifiedSinceModified() {
+    function testIfUnmodifiedSinceModified() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
-        $httpRequest = HTTP\Sapi::createFromServerArray(array(
+        $httpRequest = HTTP\Sapi::createFromServerArray([
             'HTTP_IF_UNMODIFIED_SINCE' => 'Tue, 06 Nov 1984 08:49:37 GMT',
-            'REQUEST_URI'   => '/foo'
-        ));
+            'REQUEST_URI'              => '/foo'
+        ]);
         $httpResponse = new HTTP\ResponseMock();
         $server->checkPreconditions($httpRequest, $httpResponse);
 
@@ -304,14 +304,14 @@ class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
 
     /**
      */
-    public function testIfUnmodifiedSinceInvalidDate() {
+    function testIfUnmodifiedSinceInvalidDate() {
 
-        $root = new SimpleCollection('root',array(new ServerPreconditionsNode()));
+        $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
         $server = new Server($root);
-        $httpRequest = HTTP\Sapi::createFromServerArray(array(
+        $httpRequest = HTTP\Sapi::createFromServerArray([
             'HTTP_IF_UNMODIFIED_SINCE' => 'Sun, 06 Nov 1984 08:49:37 CET',
-            'REQUEST_URI'   => '/foo'
-        ));
+            'REQUEST_URI'              => '/foo'
+        ]);
         $httpResponse = new HTTP\ResponseMock();
         $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerSimpleTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerSimpleTest.php
index 66dde9db8..043179a00 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerSimpleTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerSimpleTest.php
@@ -463,7 +463,7 @@ class ServerSimpleTest extends AbstractServer{
      * There are certain cases where no HTTP status may be set. We need to
      * intercept these and set it to a default error message.
      */
-    function testNoHTTPSTatusSet() {
+    function testNoHTTPStatusSet() {
 
         $this->server->on('method:GET', function() { return false; }, 1);
         $this->server->httpRequest = new HTTP\Request('GET', '/');
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
index 7fde11b22..383f8e657 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
@@ -1,101 +1,100 @@
 <?php
 
 namespace Sabre\DAV;
-use Sabre\HTTP;
 
 class ServerUpdatePropertiesTest extends \PHPUnit_Framework_TestCase {
 
     function testUpdatePropertiesFail() {
 
-        $tree = array(
+        $tree = [
             new SimpleCollection('foo'),
-        );
+        ];
         $server = new Server($tree);
 
-        $result = $server->updateProperties('foo', array(
+        $result = $server->updateProperties('foo', [
             '{DAV:}foo' => 'bar'
-        ));
+        ]);
 
-        $expected = array(
+        $expected = [
             '{DAV:}foo' => 403,
-        );
+        ];
         $this->assertEquals($expected, $result);
 
     }
 
     function testUpdatePropertiesProtected() {
 
-        $tree = array(
+        $tree = [
             new SimpleCollection('foo'),
-        );
+        ];
         $server = new Server($tree);
 
         $server->on('propPatch', function($path, PropPatch $propPatch) {
             $propPatch->handleRemaining(function() { return true; });
         });
-        $result = $server->updateProperties('foo', array(
+        $result = $server->updateProperties('foo', [
             '{DAV:}getetag' => 'bla',
-            '{DAV:}foo' => 'bar'
-        ));
+            '{DAV:}foo'     => 'bar'
+        ]);
 
-        $expected = array(
+        $expected = [
             '{DAV:}getetag' => 403,
-            '{DAV:}foo' => 424,
-        );
+            '{DAV:}foo'     => 424,
+        ];
         $this->assertEquals($expected, $result);
 
     }
 
     function testUpdatePropertiesEventFail() {
 
-        $tree = array(
+        $tree = [
             new SimpleCollection('foo'),
-        );
+        ];
         $server = new Server($tree);
         $server->on('propPatch', function($path, PropPatch $propPatch) {
             $propPatch->setResultCode('{DAV:}foo', 404);
             $propPatch->handleRemaining(function() { return true; });
         });
 
-        $result = $server->updateProperties('foo', array(
-            '{DAV:}foo' => 'bar',
+        $result = $server->updateProperties('foo', [
+            '{DAV:}foo'  => 'bar',
             '{DAV:}foo2' => 'bla',
-        ));
+        ]);
 
-        $expected = array(
-            '{DAV:}foo' => 404,
+        $expected = [
+            '{DAV:}foo'  => 404,
             '{DAV:}foo2' => 424,
-        );
+        ];
         $this->assertEquals($expected, $result);
 
     }
 
     function testUpdatePropertiesEventSuccess() {
 
-        $tree = array(
+        $tree = [
             new SimpleCollection('foo'),
-        );
+        ];
         $server = new Server($tree);
         $server->on('propPatch', function($path, PropPatch $propPatch) {
 
             $propPatch->handle(['{DAV:}foo', '{DAV:}foo2'], function() {
                 return [
-                    '{DAV:}foo' => 200,
+                    '{DAV:}foo'  => 200,
                     '{DAV:}foo2' => 201,
                 ];
             });
 
         });
 
-        $result = $server->updateProperties('foo', array(
-            '{DAV:}foo' => 'bar',
+        $result = $server->updateProperties('foo', [
+            '{DAV:}foo'  => 'bar',
             '{DAV:}foo2' => 'bla',
-        ));
+        ]);
 
-        $expected = array(
-            '{DAV:}foo' => 200,
+        $expected = [
+            '{DAV:}foo'  => 200,
             '{DAV:}foo2' => 201,
-        );
+        ];
         $this->assertEquals($expected, $result);
 
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/SimpleFileTest.php b/vendor/sabre/dav/tests/Sabre/DAV/SimpleFileTest.php
index 9b083b998..15ccfaf9e 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/SimpleFileTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/SimpleFileTest.php
@@ -6,7 +6,7 @@ class SimpleFileTest extends \PHPUnit_Framework_TestCase {
 
     function testAll() {
 
-        $file = new SimpleFile('filename.txt','contents','text/plain');
+        $file = new SimpleFile('filename.txt', 'contents', 'text/plain');
 
         $this->assertEquals('filename.txt', $file->getName());
         $this->assertEquals('contents', $file->get());
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php b/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
index 941d1f913..8888f0276 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
@@ -15,61 +15,61 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase {
 
     function dataset() {
 
-        return array(
-            array('FOOBAR', 'FOO',    'i;octet', 'contains', true),
-            array('FOOBAR', 'foo',    'i;octet', 'contains', false),
-            array('FÖÖBAR', 'FÖÖ',    'i;octet', 'contains', true),
-            array('FÖÖBAR', 'föö',    'i;octet', 'contains', false),
-            array('FOOBAR', 'FOOBAR', 'i;octet', 'equals', true),
-            array('FOOBAR', 'fooBAR', 'i;octet', 'equals', false),
-            array('FOOBAR', 'FOO',    'i;octet', 'starts-with', true),
-            array('FOOBAR', 'foo',    'i;octet', 'starts-with', false),
-            array('FOOBAR', 'BAR',    'i;octet', 'starts-with', false),
-            array('FOOBAR', 'bar',    'i;octet', 'starts-with', false),
-            array('FOOBAR', 'FOO',    'i;octet', 'ends-with', false),
-            array('FOOBAR', 'foo',    'i;octet', 'ends-with', false),
-            array('FOOBAR', 'BAR',    'i;octet', 'ends-with', true),
-            array('FOOBAR', 'bar',    'i;octet', 'ends-with', false),
+        return [
+            ['FOOBAR', 'FOO',    'i;octet', 'contains', true],
+            ['FOOBAR', 'foo',    'i;octet', 'contains', false],
+            ['FÖÖBAR', 'FÖÖ',    'i;octet', 'contains', true],
+            ['FÖÖBAR', 'föö',    'i;octet', 'contains', false],
+            ['FOOBAR', 'FOOBAR', 'i;octet', 'equals', true],
+            ['FOOBAR', 'fooBAR', 'i;octet', 'equals', false],
+            ['FOOBAR', 'FOO',    'i;octet', 'starts-with', true],
+            ['FOOBAR', 'foo',    'i;octet', 'starts-with', false],
+            ['FOOBAR', 'BAR',    'i;octet', 'starts-with', false],
+            ['FOOBAR', 'bar',    'i;octet', 'starts-with', false],
+            ['FOOBAR', 'FOO',    'i;octet', 'ends-with', false],
+            ['FOOBAR', 'foo',    'i;octet', 'ends-with', false],
+            ['FOOBAR', 'BAR',    'i;octet', 'ends-with', true],
+            ['FOOBAR', 'bar',    'i;octet', 'ends-with', false],
 
-            array('FOOBAR', 'FOO',    'i;ascii-casemap', 'contains', true),
-            array('FOOBAR', 'foo',    'i;ascii-casemap', 'contains', true),
-            array('FÖÖBAR', 'FÖÖ',    'i;ascii-casemap', 'contains', true),
-            array('FÖÖBAR', 'föö',    'i;ascii-casemap', 'contains', false),
-            array('FOOBAR', 'FOOBAR', 'i;ascii-casemap', 'equals', true),
-            array('FOOBAR', 'fooBAR', 'i;ascii-casemap', 'equals', true),
-            array('FOOBAR', 'FOO',    'i;ascii-casemap', 'starts-with', true),
-            array('FOOBAR', 'foo',    'i;ascii-casemap', 'starts-with', true),
-            array('FOOBAR', 'BAR',    'i;ascii-casemap', 'starts-with', false),
-            array('FOOBAR', 'bar',    'i;ascii-casemap', 'starts-with', false),
-            array('FOOBAR', 'FOO',    'i;ascii-casemap', 'ends-with', false),
-            array('FOOBAR', 'foo',    'i;ascii-casemap', 'ends-with', false),
-            array('FOOBAR', 'BAR',    'i;ascii-casemap', 'ends-with', true),
-            array('FOOBAR', 'bar',    'i;ascii-casemap', 'ends-with', true),
+            ['FOOBAR', 'FOO',    'i;ascii-casemap', 'contains', true],
+            ['FOOBAR', 'foo',    'i;ascii-casemap', 'contains', true],
+            ['FÖÖBAR', 'FÖÖ',    'i;ascii-casemap', 'contains', true],
+            ['FÖÖBAR', 'föö',    'i;ascii-casemap', 'contains', false],
+            ['FOOBAR', 'FOOBAR', 'i;ascii-casemap', 'equals', true],
+            ['FOOBAR', 'fooBAR', 'i;ascii-casemap', 'equals', true],
+            ['FOOBAR', 'FOO',    'i;ascii-casemap', 'starts-with', true],
+            ['FOOBAR', 'foo',    'i;ascii-casemap', 'starts-with', true],
+            ['FOOBAR', 'BAR',    'i;ascii-casemap', 'starts-with', false],
+            ['FOOBAR', 'bar',    'i;ascii-casemap', 'starts-with', false],
+            ['FOOBAR', 'FOO',    'i;ascii-casemap', 'ends-with', false],
+            ['FOOBAR', 'foo',    'i;ascii-casemap', 'ends-with', false],
+            ['FOOBAR', 'BAR',    'i;ascii-casemap', 'ends-with', true],
+            ['FOOBAR', 'bar',    'i;ascii-casemap', 'ends-with', true],
 
-            array('FOOBAR', 'FOO',    'i;unicode-casemap', 'contains', true),
-            array('FOOBAR', 'foo',    'i;unicode-casemap', 'contains', true),
-            array('FÖÖBAR', 'FÖÖ',    'i;unicode-casemap', 'contains', true),
-            array('FÖÖBAR', 'föö',    'i;unicode-casemap', 'contains', true),
-            array('FOOBAR', 'FOOBAR', 'i;unicode-casemap', 'equals', true),
-            array('FOOBAR', 'fooBAR', 'i;unicode-casemap', 'equals', true),
-            array('FOOBAR', 'FOO',    'i;unicode-casemap', 'starts-with', true),
-            array('FOOBAR', 'foo',    'i;unicode-casemap', 'starts-with', true),
-            array('FOOBAR', 'BAR',    'i;unicode-casemap', 'starts-with', false),
-            array('FOOBAR', 'bar',    'i;unicode-casemap', 'starts-with', false),
-            array('FOOBAR', 'FOO',    'i;unicode-casemap', 'ends-with', false),
-            array('FOOBAR', 'foo',    'i;unicode-casemap', 'ends-with', false),
-            array('FOOBAR', 'BAR',    'i;unicode-casemap', 'ends-with', true),
-            array('FOOBAR', 'bar',    'i;unicode-casemap', 'ends-with', true),
-        );
+            ['FOOBAR', 'FOO',    'i;unicode-casemap', 'contains', true],
+            ['FOOBAR', 'foo',    'i;unicode-casemap', 'contains', true],
+            ['FÖÖBAR', 'FÖÖ',    'i;unicode-casemap', 'contains', true],
+            ['FÖÖBAR', 'föö',    'i;unicode-casemap', 'contains', true],
+            ['FOOBAR', 'FOOBAR', 'i;unicode-casemap', 'equals', true],
+            ['FOOBAR', 'fooBAR', 'i;unicode-casemap', 'equals', true],
+            ['FOOBAR', 'FOO',    'i;unicode-casemap', 'starts-with', true],
+            ['FOOBAR', 'foo',    'i;unicode-casemap', 'starts-with', true],
+            ['FOOBAR', 'BAR',    'i;unicode-casemap', 'starts-with', false],
+            ['FOOBAR', 'bar',    'i;unicode-casemap', 'starts-with', false],
+            ['FOOBAR', 'FOO',    'i;unicode-casemap', 'ends-with', false],
+            ['FOOBAR', 'foo',    'i;unicode-casemap', 'ends-with', false],
+            ['FOOBAR', 'BAR',    'i;unicode-casemap', 'ends-with', true],
+            ['FOOBAR', 'bar',    'i;unicode-casemap', 'ends-with', true],
+        ];
 
     }
 
     /**
      * @expectedException Sabre\DAV\Exception\BadRequest
      */
-    public function testBadCollation() {
+    function testBadCollation() {
 
-        StringUtil::textMatch('foobar','foo','blabla','contains');
+        StringUtil::textMatch('foobar', 'foo', 'blabla', 'contains');
 
     }
 
@@ -77,13 +77,13 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase {
     /**
      * @expectedException Sabre\DAV\Exception\BadRequest
      */
-    public function testBadMatchType() {
+    function testBadMatchType() {
 
-        StringUtil::textMatch('foobar','foo','i;octet','booh');
+        StringUtil::textMatch('foobar', 'foo', 'i;octet', 'booh');
 
     }
 
-    public function testEnsureUTF8_ascii() {
+    function testEnsureUTF8_ascii() {
 
         $inputString = "harkema";
         $outputString = "harkema";
@@ -95,7 +95,7 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase {
 
     }
 
-    public function testEnsureUTF8_latin1() {
+    function testEnsureUTF8_latin1() {
 
         $inputString = "m\xfcnster";
         $outputString = "münster";
@@ -107,7 +107,7 @@ class StringUtilTest extends \PHPUnit_Framework_TestCase {
 
     }
 
-    public function testEnsureUTF8_utf8() {
+    function testEnsureUTF8_utf8() {
 
         $inputString = "m\xc3\xbcnster";
         $outputString = "münster";
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/TemporaryFileFilterTest.php b/vendor/sabre/dav/tests/Sabre/DAV/TemporaryFileFilterTest.php
index 7122f4a01..6acd6b077 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/TemporaryFileFilterTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/TemporaryFileFilterTest.php
@@ -25,7 +25,7 @@ class TemporaryFileFilterTest extends AbstractServer {
         $this->assertEquals(201, $this->response->status);
         $this->assertEquals('0', $this->response->getHeader('Content-Length'));
 
-        $this->assertEquals('Testing new file',file_get_contents(SABRE_TEMPDIR . '/testput.txt'));
+        $this->assertEquals('Testing new file', file_get_contents(SABRE_TEMPDIR . '/testput.txt'));
 
     }
 
@@ -39,11 +39,11 @@ class TemporaryFileFilterTest extends AbstractServer {
 
         $this->assertEquals('', $this->response->body);
         $this->assertEquals(201, $this->response->status);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Temp' => ['true'],
-        ),$this->response->getHeaders());
+        ], $this->response->getHeaders());
 
-        $this->assertFalse(file_exists(SABRE_TEMPDIR . '/._testput.txt'),'._testput.txt should not exist in the regular file structure.');
+        $this->assertFalse(file_exists(SABRE_TEMPDIR . '/._testput.txt'), '._testput.txt should not exist in the regular file structure.');
 
     }
 
@@ -57,20 +57,20 @@ class TemporaryFileFilterTest extends AbstractServer {
 
         $this->assertEquals('', $this->response->body);
         $this->assertEquals(201, $this->response->status);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Temp' => ['true'],
-        ),$this->response->getHeaders());
+        ], $this->response->getHeaders());
 
-        $this->assertFalse(file_exists(SABRE_TEMPDIR . '/._testput.txt'),'._testput.txt should not exist in the regular file structure.');
+        $this->assertFalse(file_exists(SABRE_TEMPDIR . '/._testput.txt'), '._testput.txt should not exist in the regular file structure.');
 
 
         $this->server->exec();
 
         $this->assertEquals(412, $this->response->status);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Temp' => ['true'],
             'Content-Type' => ['application/xml; charset=utf-8'],
-        ),$this->response->getHeaders());
+        ], $this->response->getHeaders());
 
     }
 
@@ -83,9 +83,9 @@ class TemporaryFileFilterTest extends AbstractServer {
 
         $this->assertEquals('', $this->response->body);
         $this->assertEquals(201, $this->response->status);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Temp' => ['true'],
-        ),$this->response->getHeaders());
+        ], $this->response->getHeaders());
 
         $request = new HTTP\Request('GET', '/._testput.txt');
 
@@ -93,13 +93,13 @@ class TemporaryFileFilterTest extends AbstractServer {
         $this->server->exec();
 
         $this->assertEquals(200, $this->response->status);
-        $this->assertEquals(array(
-            'X-Sabre-Temp' => ['true'],
+        $this->assertEquals([
+            'X-Sabre-Temp'   => ['true'],
             'Content-Length' => [16],
-            'Content-Type' => ['application/octet-stream'],
-        ),$this->response->getHeaders());
+            'Content-Type'   => ['application/octet-stream'],
+        ], $this->response->getHeaders());
 
-        $this->assertEquals('Testing new file',stream_get_contents($this->response->body));
+        $this->assertEquals('Testing new file', stream_get_contents($this->response->body));
 
     }
 
@@ -125,11 +125,11 @@ class TemporaryFileFilterTest extends AbstractServer {
         $this->server->exec();
 
         $this->assertEquals(201, $this->response->status);
-        $this->assertEquals('application/xml; charset=utf-8',$this->response->getHeader('Content-Type'));
-        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/',$this->response->getHeader('Lock-Token'))===1,'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-        $this->assertEquals('true',$this->response->getHeader('X-Sabre-Temp'));
+        $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
+        $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
+        $this->assertEquals('true', $this->response->getHeader('X-Sabre-Temp'));
 
-        $this->assertFalse(file_exists(SABRE_TEMPDIR . '/._testlock.txt'),'._testlock.txt should not exist in the regular file structure.');
+        $this->assertFalse(file_exists(SABRE_TEMPDIR . '/._testlock.txt'), '._testlock.txt should not exist in the regular file structure.');
 
     }
 
@@ -143,20 +143,20 @@ class TemporaryFileFilterTest extends AbstractServer {
 
         $this->assertEquals('', $this->response->body);
         $this->assertEquals(201, $this->response->status);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Temp' => ['true'],
-        ),$this->response->getHeaders());
+        ], $this->response->getHeaders());
 
         $request = new HTTP\Request('DELETE', '/._testput.txt');
         $this->server->httpRequest = $request;
         $this->server->exec();
 
-        $this->assertEquals(204, $this->response->status, "Incorrect status code received. Full body:\n". $this->response->body);
-        $this->assertEquals(array(
+        $this->assertEquals(204, $this->response->status, "Incorrect status code received. Full body:\n" . $this->response->body);
+        $this->assertEquals([
             'X-Sabre-Temp' => ['true'],
-        ),$this->response->getHeaders());
+        ], $this->response->getHeaders());
 
-        $this->assertEquals('',$this->response->body);
+        $this->assertEquals('', $this->response->body);
 
     }
 
@@ -169,30 +169,30 @@ class TemporaryFileFilterTest extends AbstractServer {
 
         $this->assertEquals('', $this->response->body);
         $this->assertEquals(201, $this->response->status);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Temp' => ['true'],
-        ),$this->response->getHeaders());
+        ], $this->response->getHeaders());
 
         $request = new HTTP\Request('PROPFIND', '/._testput.txt');
 
         $this->server->httpRequest = ($request);
         $this->server->exec();
 
-        $this->assertEquals(207, $this->response->status,'Incorrect status code returned. Body: ' . $this->response->body);
-        $this->assertEquals(array(
+        $this->assertEquals(207, $this->response->status, 'Incorrect status code returned. Body: ' . $this->response->body);
+        $this->assertEquals([
             'X-Sabre-Temp' => ['true'],
             'Content-Type' => ['application/xml; charset=utf-8'],
-        ),$this->response->getHeaders());
+        ], $this->response->getHeaders());
 
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/","xmlns\\1=\"urn:DAV\"",$this->response->body);
+        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
         $xml = simplexml_load_string($body);
-        $xml->registerXPathNamespace('d','urn:DAV');
+        $xml->registerXPathNamespace('d', 'urn:DAV');
 
         list($data) = $xml->xpath('/d:multistatus/d:response/d:href');
-        $this->assertEquals('/._testput.txt',(string)$data,'href element should have been /._testput.txt');
+        $this->assertEquals('/._testput.txt', (string)$data, 'href element should have been /._testput.txt');
 
         $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:resourcetype');
-        $this->assertEquals(1,count($data));
+        $this->assertEquals(1, count($data));
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/TestPlugin.php b/vendor/sabre/dav/tests/Sabre/DAV/TestPlugin.php
index bb5ea6acc..619ac03fd 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/TestPlugin.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/TestPlugin.php
@@ -2,9 +2,8 @@
 
 namespace Sabre\DAV;
 
-use
-    Sabre\HTTP\RequestInterface,
-    Sabre\HTTP\ResponseInterface;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
 
 class TestPlugin extends ServerPlugin {
 
@@ -24,7 +23,7 @@ class TestPlugin extends ServerPlugin {
 
     function initialize(Server $server) {
 
-        $server->on('beforeMethod', [$this,'beforeMethod']);
+        $server->on('beforeMethod', [$this, 'beforeMethod']);
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
index 9516c2390..ad33200c8 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
@@ -16,18 +16,18 @@ class TreeTest extends \PHPUnit_Framework_TestCase {
     function testCopy() {
 
         $tree = new TreeMock();
-        $tree->copy('hi','hi2');
+        $tree->copy('hi', 'hi2');
 
         $this->assertArrayHasKey('hi2', $tree->getNodeForPath('')->newDirectories);
         $this->assertEquals('foobar', $tree->getNodeForPath('hi/file')->get());
-        $this->assertEquals(array('test1'=>'value'), $tree->getNodeForPath('hi/file')->getProperties(array()));
+        $this->assertEquals(['test1' => 'value'], $tree->getNodeForPath('hi/file')->getProperties([]));
 
     }
 
     function testMove() {
 
         $tree = new TreeMock();
-        $tree->move('hi','hi2');
+        $tree->move('hi', 'hi2');
 
         $this->assertEquals('hi2', $tree->getNodeForPath('hi')->getName());
         $this->assertTrue($tree->getNodeForPath('hi')->isRenamed);
@@ -37,7 +37,7 @@ class TreeTest extends \PHPUnit_Framework_TestCase {
     function testDeepMove() {
 
         $tree = new TreeMock();
-        $tree->move('hi/sub','hi2');
+        $tree->move('hi/sub', 'hi2');
 
         $this->assertArrayHasKey('hi2', $tree->getNodeForPath('')->newDirectories);
         $this->assertTrue($tree->getNodeForPath('hi/sub')->isDeleted);
@@ -56,7 +56,7 @@ class TreeTest extends \PHPUnit_Framework_TestCase {
 
         $tree = new TreeMock();
         $children = $tree->getChildren('');
-        $this->assertEquals(2,count($children));
+        $this->assertEquals(2, count($children));
         $this->assertEquals('hi', $children[0]->getName());
 
     }
@@ -85,12 +85,12 @@ class TreeTest extends \PHPUnit_Framework_TestCase {
 
 class TreeMock extends Tree {
 
-    private $nodes = array();
+    private $nodes = [];
 
     function __construct() {
 
         $file = new TreeFileTester('file');
-        $file->properties = ['test1'=>'value'];
+        $file->properties = ['test1' => 'value'];
         $file->data = 'foobar';
 
         parent::__construct(
@@ -113,8 +113,8 @@ class TreeMock extends Tree {
 
 class TreeDirectoryTester extends SimpleCollection {
 
-    public $newDirectories = array();
-    public $newFiles = array();
+    public $newDirectories = [];
+    public $newFiles = [];
     public $isDeleted = false;
     public $isRenamed = false;
 
@@ -124,7 +124,7 @@ class TreeDirectoryTester extends SimpleCollection {
 
     }
 
-    function createFile($name,$data = null) {
+    function createFile($name, $data = null) {
 
         $this->newFiles[$name] = $data;
 
@@ -132,7 +132,7 @@ class TreeDirectoryTester extends SimpleCollection {
 
     function getChild($name) {
 
-        if (isset($this->newDirectories[$name])) return new TreeDirectoryTester($name);
+        if (isset($this->newDirectories[$name])) return new self($name);
         if (isset($this->newFiles[$name])) return new TreeFileTester($name, $this->newFiles[$name]);
         return parent::getChild($name);
 
@@ -225,7 +225,7 @@ class TreeMultiGetTester extends TreeDirectoryTester implements IMultiGet {
     function getMultipleChildren(array $paths) {
 
         $result = [];
-        foreach($paths as $path) {
+        foreach ($paths as $path) {
             try {
                 $child = $this->getChild($path);
                 $result[] = $child;
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
index 4ecd42717..7d7a54d06 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
@@ -14,6 +14,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
 
         $acl = new Plugin();
         $server = new DAV\Server();
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin($acl);
 
         $acl->httpAcl($server->httpRequest, $server->httpResponse);
@@ -21,15 +22,14 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
     }
 
     /**
-
-    /**
+     /**
      * @expectedException Sabre\DAV\Exception\MethodNotAllowed
      */
     function testNotSupportedByNode() {
 
-        $tree = array(
+        $tree = [
             new DAV\SimpleCollection('test'),
-        );
+        ];
         $acl = new Plugin();
         $server = new DAV\Server($tree);
         $server->httpRequest = new HTTP\Request();
@@ -37,6 +37,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
 <d:acl xmlns:d="DAV:">
 </d:acl>';
         $server->httpRequest->setBody($body);
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin($acl);
 
         $acl->httpACL($server->httpRequest, $server->httpResponse);
@@ -45,9 +46,9 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
 
     function testSuccessSimple() {
 
-        $tree = array(
-            new MockACLNode('test',array()),
-        );
+        $tree = [
+            new MockACLNode('test', []),
+        ];
         $acl = new Plugin();
         $server = new DAV\Server($tree);
         $server->httpRequest = new HTTP\Request();
@@ -57,6 +58,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
 <d:acl xmlns:d="DAV:">
 </d:acl>';
         $server->httpRequest->setBody($body);
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin($acl);
 
         $this->assertFalse($acl->httpACL($server->httpRequest, $server->httpResponse));
@@ -68,12 +70,12 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
      */
     function testUnrecognizedPrincipal() {
 
-        $tree = array(
-            new MockACLNode('test',array()),
-        );
+        $tree = [
+            new MockACLNode('test', []),
+        ];
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request('ACL','/test');
+        $server->httpRequest = new HTTP\Request('ACL', '/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -82,6 +84,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
     </d:ace>
 </d:acl>';
         $server->httpRequest->setBody($body);
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin($acl);
 
         $acl->httpACL($server->httpRequest, $server->httpResponse);
@@ -93,15 +96,15 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
      */
     function testUnrecognizedPrincipal2() {
 
-        $tree = array(
-            new MockACLNode('test',array()),
-            new DAV\SimpleCollection('principals',array(
+        $tree = [
+            new MockACLNode('test', []),
+            new DAV\SimpleCollection('principals', [
                 new DAV\SimpleCollection('notaprincipal'),
-            )),
-        );
+            ]),
+        ];
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request('ACL','/test');
+        $server->httpRequest = new HTTP\Request('ACL', '/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -110,6 +113,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
     </d:ace>
 </d:acl>';
         $server->httpRequest->setBody($body);
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin($acl);
 
         $acl->httpACL($server->httpRequest, $server->httpResponse);
@@ -121,12 +125,12 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
      */
     function testUnknownPrivilege() {
 
-        $tree = array(
-            new MockACLNode('test',array()),
-        );
+        $tree = [
+            new MockACLNode('test', []),
+        ];
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request('ACL','/test');
+        $server->httpRequest = new HTTP\Request('ACL', '/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -135,6 +139,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
     </d:ace>
 </d:acl>';
         $server->httpRequest->setBody($body);
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin($acl);
 
         $acl->httpACL($server->httpRequest, $server->httpResponse);
@@ -146,20 +151,24 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
      */
     function testAbstractPrivilege() {
 
-        $tree = array(
-            new MockACLNode('test',array()),
-        );
+        $tree = [
+            new MockACLNode('test', []),
+        ];
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request('ACL','/test');
+        $server->on('getSupportedPrivilegeSet', function($node, &$supportedPrivilegeSet) {
+            $supportedPrivilegeSet['{DAV:}foo'] = ['abstract' => true];
+        });
+        $server->httpRequest = new HTTP\Request('ACL', '/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
-        <d:grant><d:privilege><d:all /></d:privilege></d:grant>
-        <d:principal><d:href>/principals/notfound</d:href></d:principal>
+        <d:grant><d:privilege><d:foo /></d:privilege></d:grant>
+        <d:principal><d:href>/principals/foo/</d:href></d:principal>
     </d:ace>
 </d:acl>';
         $server->httpRequest->setBody($body);
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin($acl);
 
         $acl->httpACL($server->httpRequest, $server->httpResponse);
@@ -171,20 +180,20 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
      */
     function testUpdateProtectedPrivilege() {
 
-        $oldACL = array(
-            array(
+        $oldACL = [
+            [
                 'principal' => 'principals/notfound',
                 'privilege' => '{DAV:}write',
                 'protected' => true,
-            ),
-        );
+            ],
+        ];
 
-        $tree = array(
-            new MockACLNode('test',$oldACL),
-        );
+        $tree = [
+            new MockACLNode('test', $oldACL),
+        ];
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request('ACL','/test');
+        $server->httpRequest = new HTTP\Request('ACL', '/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -193,6 +202,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
     </d:ace>
 </d:acl>';
         $server->httpRequest->setBody($body);
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin($acl);
 
         $acl->httpACL($server->httpRequest, $server->httpResponse);
@@ -204,20 +214,20 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
      */
     function testUpdateProtectedPrivilege2() {
 
-        $oldACL = array(
-            array(
+        $oldACL = [
+            [
                 'principal' => 'principals/notfound',
                 'privilege' => '{DAV:}write',
                 'protected' => true,
-            ),
-        );
+            ],
+        ];
 
-        $tree = array(
-            new MockACLNode('test',$oldACL),
-        );
+        $tree = [
+            new MockACLNode('test', $oldACL),
+        ];
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request('ACL','/test');
+        $server->httpRequest = new HTTP\Request('ACL', '/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -226,6 +236,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
     </d:ace>
 </d:acl>';
         $server->httpRequest->setBody($body);
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin($acl);
 
         $acl->httpACL($server->httpRequest, $server->httpResponse);
@@ -237,20 +248,20 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
      */
     function testUpdateProtectedPrivilege3() {
 
-        $oldACL = array(
-            array(
+        $oldACL = [
+            [
                 'principal' => 'principals/notfound',
                 'privilege' => '{DAV:}write',
                 'protected' => true,
-            ),
-        );
+            ],
+        ];
 
-        $tree = array(
-            new MockACLNode('test',$oldACL),
-        );
+        $tree = [
+            new MockACLNode('test', $oldACL),
+        ];
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request('ACL','/test');
+        $server->httpRequest = new HTTP\Request('ACL', '/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -259,6 +270,7 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
     </d:ace>
 </d:acl>';
         $server->httpRequest->setBody($body);
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin($acl);
 
         $acl->httpACL($server->httpRequest, $server->httpResponse);
@@ -267,28 +279,28 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
 
     function testSuccessComplex() {
 
-        $oldACL = array(
-            array(
+        $oldACL = [
+            [
                 'principal' => 'principals/foo',
                 'privilege' => '{DAV:}write',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'principal' => 'principals/bar',
                 'privilege' => '{DAV:}read',
-            ),
-        );
+            ],
+        ];
 
-        $tree = array(
-            $node = new MockACLNode('test',$oldACL),
-            new DAV\SimpleCollection('principals', array(
-                new MockPrincipal('foo','principals/foo'),
-                new MockPrincipal('baz','principals/baz'),
-            )),
-        );
+        $tree = [
+            $node = new MockACLNode('test', $oldACL),
+            new DAV\SimpleCollection('principals', [
+                new MockPrincipal('foo', 'principals/foo'),
+                new MockPrincipal('baz', 'principals/baz'),
+            ]),
+        ];
         $acl = new Plugin();
         $server = new DAV\Server($tree);
-        $server->httpRequest = new HTTP\Request('ACL','/test');
+        $server->httpRequest = new HTTP\Request('ACL', '/test');
         $body = '<?xml version="1.0"?>
 <d:acl xmlns:d="DAV:">
     <d:ace>
@@ -302,23 +314,24 @@ class ACLMethodTest extends \PHPUnit_Framework_TestCase {
     </d:ace>
 </d:acl>';
         $server->httpRequest->setBody($body);
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin($acl);
 
 
         $this->assertFalse($acl->httpAcl($server->httpRequest, $server->httpResponse));
 
-        $this->assertEquals(array(
-            array(
+        $this->assertEquals([
+            [
                 'principal' => 'principals/foo',
                 'privilege' => '{DAV:}write',
                 'protected' => true,
-            ),
-            array(
+            ],
+            [
                 'principal' => 'principals/baz',
                 'privilege' => '{DAV:}write',
                 'protected' => false,
-            ),
-        ), $node->getACL());
+            ],
+        ], $node->getACL());
 
     }
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/AllowAccessTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/AllowAccessTest.php
index 14a80003a..f16693625 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/AllowAccessTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/AllowAccessTest.php
@@ -3,7 +3,6 @@
 namespace Sabre\DAVACL;
 
 use Sabre\DAV;
-use Sabre\HTTP;
 
 class AllowAccessTest extends \PHPUnit_Framework_TestCase {
 
@@ -14,13 +13,24 @@ class AllowAccessTest extends \PHPUnit_Framework_TestCase {
 
     function setUp() {
 
-        $nodes = array(
-            new DAV\SimpleCollection('testdir'),
-        );
+        $nodes = [
+            new DAV\Mock\Collection('testdir', [
+                'file1.txt' => 'contents',
+            ]),
+        ];
 
         $this->server = new DAV\Server($nodes);
+        $this->server->addPlugin(
+            new DAV\Auth\Plugin(
+                new DAV\Auth\Backend\Mock()
+            )
+        );
+        // Login
+        $this->server->getPlugin('auth')->beforeMethod(
+            new \Sabre\HTTP\Request(),
+            new \Sabre\HTTP\Response()
+        );
         $aclPlugin = new Plugin();
-        $aclPlugin->allowAccessToNodesWithoutACL = true;
         $this->server->addPlugin($aclPlugin);
 
     }
@@ -64,16 +74,7 @@ class AllowAccessTest extends \PHPUnit_Framework_TestCase {
     function testPUT() {
 
         $this->server->httpRequest->setMethod('PUT');
-        $this->server->httpRequest->setUrl('/testdir');
-
-        $this->assertTrue($this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]));
-
-    }
-
-    function testACL() {
-
-        $this->server->httpRequest->setMethod('ACL');
-        $this->server->httpRequest->setUrl('/testdir');
+        $this->server->httpRequest->setUrl('/testdir/file1.txt');
 
         $this->assertTrue($this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]));
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/BlockAccessTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/BlockAccessTest.php
index be3e9dae9..ceae9aed0 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/BlockAccessTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/BlockAccessTest.php
@@ -3,7 +3,6 @@
 namespace Sabre\DAVACL;
 
 use Sabre\DAV;
-use Sabre\HTTP;
 
 class BlockAccessTest extends \PHPUnit_Framework_TestCase {
 
@@ -21,7 +20,17 @@ class BlockAccessTest extends \PHPUnit_Framework_TestCase {
 
         $this->server = new DAV\Server($nodes);
         $this->plugin = new Plugin();
-        $this->plugin->allowAccessToNodesWithoutACL = false;
+        $this->plugin->setDefaultAcl([]);
+        $this->server->addPlugin(
+            new DAV\Auth\Plugin(
+                new DAV\Auth\Backend\Mock()
+            )
+        );
+        // Login
+        $this->server->getPlugin('auth')->beforeMethod(
+            new \Sabre\HTTP\Request(),
+            new \Sabre\HTTP\Response()
+        );
         $this->server->addPlugin($this->plugin);
 
     }
@@ -178,10 +187,10 @@ class BlockAccessTest extends \PHPUnit_Framework_TestCase {
             200 => [],
             404 => [],
             403 => [
-                '{DAV:}displayname' => null,
+                '{DAV:}displayname'      => null,
                 '{DAV:}getcontentlength' => null,
-                '{DAV:}bar' => null,
-                '{DAV:}owner' => null,
+                '{DAV:}bar'              => null,
+                '{DAV:}owner'            => null,
             ],
         ];
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/AceConflictTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
index fc48af67f..1cdf2949f 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
@@ -11,24 +11,24 @@ class AceConflictTest extends \PHPUnit_Framework_TestCase {
         $ex = new AceConflict('message');
 
         $server = new DAV\Server();
-        $dom = new \DOMDocument('1.0','utf-8');
-        $root = $dom->createElementNS('DAV:','d:root');
+        $dom = new \DOMDocument('1.0', 'utf-8');
+        $root = $dom->createElementNS('DAV:', 'd:root');
         $dom->appendChild($root);
 
         $ex->serialize($server, $root);
 
-        $xpaths = array(
-            '/d:root' => 1,
+        $xpaths = [
+            '/d:root'                   => 1,
             '/d:root/d:no-ace-conflict' => 1,
-        );
+        ];
 
         // Reloading because PHP DOM sucks
         $dom2 = new \DOMDocument('1.0', 'utf-8');
         $dom2->loadXML($dom->saveXML());
 
         $dxpath = new \DOMXPath($dom2);
-        $dxpath->registerNamespace('d','DAV:');
-        foreach($xpaths as $xpath=>$count) {
+        $dxpath->registerNamespace('d', 'DAV:');
+        foreach ($xpaths as $xpath => $count) {
 
             $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
index 7e66adab6..b13e7722d 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
@@ -4,41 +4,41 @@ namespace Sabre\DAVACL\Exception;
 
 use Sabre\DAV;
 
-class NeedPrivilegesTest extends \PHPUnit_Framework_TestCase {
+class NeedPrivilegesExceptionTest extends \PHPUnit_Framework_TestCase {
 
     function testSerialize() {
 
         $uri = 'foo';
-        $privileges = array(
+        $privileges = [
             '{DAV:}read',
             '{DAV:}write',
-        );
+        ];
         $ex = new NeedPrivileges($uri, $privileges);
 
         $server = new DAV\Server();
-        $dom = new \DOMDocument('1.0','utf-8');
-        $root = $dom->createElementNS('DAV:','d:root');
+        $dom = new \DOMDocument('1.0', 'utf-8');
+        $root = $dom->createElementNS('DAV:', 'd:root');
         $dom->appendChild($root);
 
         $ex->serialize($server, $root);
 
-        $xpaths = array(
-            '/d:root' => 1,
-            '/d:root/d:need-privileges' => 1,
-            '/d:root/d:need-privileges/d:resource' => 2,
-            '/d:root/d:need-privileges/d:resource/d:href' => 2,
-            '/d:root/d:need-privileges/d:resource/d:privilege' => 2,
-            '/d:root/d:need-privileges/d:resource/d:privilege/d:read' => 1,
+        $xpaths = [
+            '/d:root'                                                  => 1,
+            '/d:root/d:need-privileges'                                => 1,
+            '/d:root/d:need-privileges/d:resource'                     => 2,
+            '/d:root/d:need-privileges/d:resource/d:href'              => 2,
+            '/d:root/d:need-privileges/d:resource/d:privilege'         => 2,
+            '/d:root/d:need-privileges/d:resource/d:privilege/d:read'  => 1,
             '/d:root/d:need-privileges/d:resource/d:privilege/d:write' => 1,
-        );
+        ];
 
         // Reloading because PHP DOM sucks
         $dom2 = new \DOMDocument('1.0', 'utf-8');
         $dom2->loadXML($dom->saveXML());
 
         $dxpath = new \DOMXPath($dom2);
-        $dxpath->registerNamespace('d','DAV:');
-        foreach($xpaths as $xpath=>$count) {
+        $dxpath->registerNamespace('d', 'DAV:');
+        foreach ($xpaths as $xpath => $count) {
 
             $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
index 2406c1c38..f52b17371 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
@@ -11,24 +11,24 @@ class NoAbstractTest extends \PHPUnit_Framework_TestCase {
         $ex = new NoAbstract('message');
 
         $server = new DAV\Server();
-        $dom = new \DOMDocument('1.0','utf-8');
-        $root = $dom->createElementNS('DAV:','d:root');
+        $dom = new \DOMDocument('1.0', 'utf-8');
+        $root = $dom->createElementNS('DAV:', 'd:root');
         $dom->appendChild($root);
 
         $ex->serialize($server, $root);
 
-        $xpaths = array(
-            '/d:root' => 1,
+        $xpaths = [
+            '/d:root'               => 1,
             '/d:root/d:no-abstract' => 1,
-        );
+        ];
 
         // Reloading because PHP DOM sucks
         $dom2 = new \DOMDocument('1.0', 'utf-8');
         $dom2->loadXML($dom->saveXML());
 
         $dxpath = new \DOMXPath($dom2);
-        $dxpath->registerNamespace('d','DAV:');
-        foreach($xpaths as $xpath=>$count) {
+        $dxpath->registerNamespace('d', 'DAV:');
+        foreach ($xpaths as $xpath => $count) {
 
             $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
index 6077b0ba5..df89aaf84 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
@@ -11,24 +11,24 @@ class NotRecognizedPrincipalTest extends \PHPUnit_Framework_TestCase {
         $ex = new NotRecognizedPrincipal('message');
 
         $server = new DAV\Server();
-        $dom = new \DOMDocument('1.0','utf-8');
-        $root = $dom->createElementNS('DAV:','d:root');
+        $dom = new \DOMDocument('1.0', 'utf-8');
+        $root = $dom->createElementNS('DAV:', 'd:root');
         $dom->appendChild($root);
 
         $ex->serialize($server, $root);
 
-        $xpaths = array(
-            '/d:root' => 1,
+        $xpaths = [
+            '/d:root'                        => 1,
             '/d:root/d:recognized-principal' => 1,
-        );
+        ];
 
         // Reloading because PHP DOM sucks
         $dom2 = new \DOMDocument('1.0', 'utf-8');
         $dom2->loadXML($dom->saveXML());
 
         $dxpath = new \DOMXPath($dom2);
-        $dxpath->registerNamespace('d','DAV:');
-        foreach($xpaths as $xpath=>$count) {
+        $dxpath->registerNamespace('d', 'DAV:');
+        foreach ($xpaths as $xpath => $count) {
 
             $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
index 8e7b3685d..50623952b 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
@@ -11,24 +11,24 @@ class NotSupportedPrivilegeTest extends \PHPUnit_Framework_TestCase {
         $ex = new NotSupportedPrivilege('message');
 
         $server = new DAV\Server();
-        $dom = new \DOMDocument('1.0','utf-8');
-        $root = $dom->createElementNS('DAV:','d:root');
+        $dom = new \DOMDocument('1.0', 'utf-8');
+        $root = $dom->createElementNS('DAV:', 'd:root');
         $dom->appendChild($root);
 
         $ex->serialize($server, $root);
 
-        $xpaths = array(
-            '/d:root' => 1,
+        $xpaths = [
+            '/d:root'                           => 1,
             '/d:root/d:not-supported-privilege' => 1,
-        );
+        ];
 
         // Reloading because PHP DOM sucks
         $dom2 = new \DOMDocument('1.0', 'utf-8');
         $dom2->loadXML($dom->saveXML());
 
         $dxpath = new \DOMXPath($dom2);
-        $dxpath->registerNamespace('d','DAV:');
-        foreach($xpaths as $xpath=>$count) {
+        $dxpath->registerNamespace('d', 'DAV:');
+        foreach ($xpaths as $xpath => $count) {
 
             $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
index 5e99f2e73..91de64372 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
@@ -11,31 +11,38 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
 
     function getServer() {
 
-        $tree = array(
-            new DAV\Mock\PropertiesCollection('node1', [], array(
+        $tree = [
+            new DAV\Mock\PropertiesCollection('node1', [], [
                 '{http://sabredav.org/ns}simple' => 'foo',
                 '{http://sabredav.org/ns}href'   => new DAV\Xml\Property\Href('node2'),
-                '{DAV:}displayname'     => 'Node 1',
-            )),
-            new DAV\Mock\PropertiesCollection('node2', [], array(
+                '{DAV:}displayname'              => 'Node 1',
+            ]),
+            new DAV\Mock\PropertiesCollection('node2', [], [
+                '{http://sabredav.org/ns}simple'   => 'simple',
+                '{http://sabredav.org/ns}hreflist' => new DAV\Xml\Property\Href(['node1', 'node3']),
+                '{DAV:}displayname'                => 'Node 2',
+            ]),
+            new DAV\Mock\PropertiesCollection('node3', [], [
                 '{http://sabredav.org/ns}simple' => 'simple',
-                '{http://sabredav.org/ns}hreflist' => new DAV\Xml\Property\Href(['node1','node3']),
-                '{DAV:}displayname'     => 'Node 2',
-            )),
-            new DAV\Mock\PropertiesCollection('node3', [], array(
-                '{http://sabredav.org/ns}simple' => 'simple',
-                '{DAV:}displayname'     => 'Node 3',
-            )),
-        );
+                '{DAV:}displayname'              => 'Node 3',
+            ]),
+        ];
 
         $fakeServer = new DAV\Server($tree);
         $fakeServer->sapi = new HTTP\SapiMock();
         $fakeServer->debugExceptions = true;
         $fakeServer->httpResponse = new HTTP\ResponseMock();
         $plugin = new Plugin();
-        $plugin->allowAccessToNodesWithoutACL = true;
-
+        $plugin->allowUnauthenticatedAccess = false;
+        // Anyone can do anything
+        $plugin->setDefaultACL([
+            [
+                'principal' => '{DAV:}all',
+                'privilege' => '{DAV:}all',
+            ]
+        ]);
         $this->assertTrue($plugin instanceof Plugin);
+
         $fakeServer->addPlugin($plugin);
         $this->assertEquals($plugin, $fakeServer->getPlugin('acl'));
 
@@ -53,11 +60,11 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
   <d:property name="href" namespace="http://sabredav.org/ns" />
 </d:expand-property>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '0',
             'REQUEST_URI'    => '/node1',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -67,38 +74,38 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $server->exec();
 
-        $this->assertEquals(207, $server->httpResponse->status,'Incorrect status code received. Full body: ' . $server->httpResponse->body);
-        $this->assertEquals(array(
+        $this->assertEquals(207, $server->httpResponse->status, 'Incorrect status code received. Full body: ' . $server->httpResponse->body);
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $server->httpResponse->getHeaders());
 
 
-        $check = array(
+        $check = [
             '/d:multistatus',
-            '/d:multistatus/d:response' => 1,
-            '/d:multistatus/d:response/d:href' => 1,
-            '/d:multistatus/d:response/d:propstat' => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop' => 2,
+            '/d:multistatus/d:response'                                 => 1,
+            '/d:multistatus/d:response/d:href'                          => 1,
+            '/d:multistatus/d:response/d:propstat'                      => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop'               => 2,
             '/d:multistatus/d:response/d:propstat/d:prop/d:displayname' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:simple' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href' => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:simple'      => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href'        => 1,
             '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:href' => 1,
-        );
+        ];
 
         $xml = simplexml_load_string($server->httpResponse->body);
-        $xml->registerXPathNamespace('d','DAV:');
-        $xml->registerXPathNamespace('s','http://sabredav.org/ns');
-        foreach($check as $v1=>$v2) {
+        $xml->registerXPathNamespace('d', 'DAV:');
+        $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
+        foreach ($check as $v1 => $v2) {
 
-            $xpath = is_int($v1)?$v2:$v1;
+            $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
             if (!is_int($v1)) $count = $v2;
 
-            $this->assertEquals($count,count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response: ' . $server->httpResponse->body);
+            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response: ' . $server->httpResponse->body);
 
         }
 
@@ -116,11 +123,11 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
   </d:property>
 </d:expand-property>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '0',
             'REQUEST_URI'    => '/node1',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -131,39 +138,39 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(207, $server->httpResponse->status, 'Incorrect response status received. Full response body: ' . $server->httpResponse->body);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $server->httpResponse->getHeaders());
 
 
-        $check = array(
+        $check = [
             '/d:multistatus',
-            '/d:multistatus/d:response' => 1,
-            '/d:multistatus/d:response/d:href' => 1,
-            '/d:multistatus/d:response/d:propstat' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:href' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop' => 1,
+            '/d:multistatus/d:response'                                                                     => 1,
+            '/d:multistatus/d:response/d:href'                                                              => 1,
+            '/d:multistatus/d:response/d:propstat'                                                          => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop'                                                   => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href'                                            => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response'                                 => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:href'                          => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat'                      => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop'               => 1,
             '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop/d:displayname' => 1,
-        );
+        ];
 
         $xml = simplexml_load_string($server->httpResponse->body);
-        $xml->registerXPathNamespace('d','DAV:');
-        $xml->registerXPathNamespace('s','http://sabredav.org/ns');
-        foreach($check as $v1=>$v2) {
+        $xml->registerXPathNamespace('d', 'DAV:');
+        $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
+        foreach ($check as $v1 => $v2) {
 
-            $xpath = is_int($v1)?$v2:$v1;
+            $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
             if (!is_int($v1)) $count = $v2;
 
-            $this->assertEquals($count,count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . ' Full response body: ' . $server->httpResponse->getBodyAsString());
+            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . ' Full response body: ' . $server->httpResponse->getBodyAsString());
 
         }
 
@@ -181,11 +188,11 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
   </d:property>
 </d:expand-property>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '0',
             'REQUEST_URI'    => '/node2',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -196,39 +203,39 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(207, $server->httpResponse->status);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $server->httpResponse->getHeaders());
 
 
-        $check = array(
+        $check = [
             '/d:multistatus',
-            '/d:multistatus/d:response' => 1,
-            '/d:multistatus/d:response/d:href' => 1,
-            '/d:multistatus/d:response/d:propstat' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response' => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:href' => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat' => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop' => 2,
+            '/d:multistatus/d:response'                                                                         => 1,
+            '/d:multistatus/d:response/d:href'                                                                  => 1,
+            '/d:multistatus/d:response/d:propstat'                                                              => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop'                                                       => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist'                                            => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response'                                 => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:href'                          => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat'                      => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop'               => 2,
             '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/d:displayname' => 2,
-        );
+        ];
 
         $xml = simplexml_load_string($server->httpResponse->body);
-        $xml->registerXPathNamespace('d','DAV:');
-        $xml->registerXPathNamespace('s','http://sabredav.org/ns');
-        foreach($check as $v1=>$v2) {
+        $xml->registerXPathNamespace('d', 'DAV:');
+        $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
+        foreach ($check as $v1 => $v2) {
 
-            $xpath = is_int($v1)?$v2:$v1;
+            $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
             if (!is_int($v1)) $count = $v2;
 
-            $this->assertEquals($count,count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result));
+            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result));
 
         }
 
@@ -249,11 +256,11 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
   </d:property>
 </d:expand-property>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '0',
             'REQUEST_URI'    => '/node2',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -264,45 +271,45 @@ class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(207, $server->httpResponse->status);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $server->httpResponse->getHeaders());
 
 
-        $check = array(
+        $check = [
             '/d:multistatus',
-            '/d:multistatus/d:response' => 1,
-            '/d:multistatus/d:response/d:href' => 1,
-            '/d:multistatus/d:response/d:propstat' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response' => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:href' => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat' => 3,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop' => 3,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/d:displayname' => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href' => 2,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:href' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat' => 1,
-            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop' => 1,
+            '/d:multistatus/d:response'                                                                                                             => 1,
+            '/d:multistatus/d:response/d:href'                                                                                                      => 1,
+            '/d:multistatus/d:response/d:propstat'                                                                                                  => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop'                                                                                           => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist'                                                                                => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response'                                                                     => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:href'                                                              => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat'                                                          => 3,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop'                                                   => 3,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/d:displayname'                                     => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href'                                            => 2,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response'                                 => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:href'                          => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat'                      => 1,
+            '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop'               => 1,
             '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop/d:displayname' => 1,
-        );
+        ];
 
         $xml = simplexml_load_string($server->httpResponse->body);
-        $xml->registerXPathNamespace('d','DAV:');
-        $xml->registerXPathNamespace('s','http://sabredav.org/ns');
-        foreach($check as $v1=>$v2) {
+        $xml->registerXPathNamespace('d', 'DAV:');
+        $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
+        foreach ($check as $v1 => $v2) {
 
-            $xpath = is_int($v1)?$v2:$v1;
+            $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
             if (!is_int($v1)) $count = $v2;
 
-            $this->assertEquals($count,count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result));
+            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result));
 
         }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/MockACLNode.php b/vendor/sabre/dav/tests/Sabre/DAVACL/MockACLNode.php
index 7b3e8fc12..2d9744e29 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/MockACLNode.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/MockACLNode.php
@@ -3,14 +3,13 @@
 namespace Sabre\DAVACL;
 
 use Sabre\DAV;
-use Sabre\HTTP;
 
 class MockACLNode extends DAV\Node implements IACL {
 
     public $name;
     public $acl;
 
-    function __construct($name, array $acl = array()) {
+    function __construct($name, array $acl = []) {
 
         $this->name = $name;
         $this->acl = $acl;
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/MockPrincipal.php b/vendor/sabre/dav/tests/Sabre/DAVACL/MockPrincipal.php
index dd8542b8d..934906802 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/MockPrincipal.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/MockPrincipal.php
@@ -3,16 +3,15 @@
 namespace Sabre\DAVACL;
 
 use Sabre\DAV;
-use Sabre\HTTP;
 
 class MockPrincipal extends DAV\Node implements IPrincipal {
 
     public $name;
     public $principalUrl;
-    public $groupMembership = array();
-    public $groupMemberSet = array();
+    public $groupMembership = [];
+    public $groupMemberSet = [];
 
-    function __construct($name,$principalUrl,array $groupMembership = array(), array $groupMemberSet = array()) {
+    function __construct($name, $principalUrl, array $groupMembership = [], array $groupMemberSet = []) {
 
         $this->name = $name;
         $this->principalUrl = $principalUrl;
@@ -35,7 +34,7 @@ class MockPrincipal extends DAV\Node implements IPrincipal {
 
     function getAlternateUriSet() {
 
-        return array();
+        return [];
 
     }
 
@@ -63,4 +62,3 @@ class MockPrincipal extends DAV\Node implements IPrincipal {
 
     }
 }
-
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PluginAdminTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PluginAdminTest.php
index fb7516a78..8552448f5 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PluginAdminTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PluginAdminTest.php
@@ -5,7 +5,6 @@ namespace Sabre\DAVACL;
 use Sabre\DAV;
 use Sabre\HTTP;
 
-
 require_once 'Sabre/DAVACL/MockACLNode.php';
 require_once 'Sabre/HTTP/ResponseMock.php';
 
@@ -17,10 +16,10 @@ class PluginAdminTest extends \PHPUnit_Framework_TestCase {
 
         $principalBackend = new PrincipalBackend\Mock();
 
-        $tree = array(
-            new MockACLNode('adminonly', array()),
+        $tree = [
+            new MockACLNode('adminonly', []),
             new PrincipalCollection($principalBackend),
-        );
+        ];
 
         $this->server = new DAV\Server($tree);
         $this->server->sapi = new HTTP\SapiMock();
@@ -33,11 +32,11 @@ class PluginAdminTest extends \PHPUnit_Framework_TestCase {
         $plugin = new Plugin();
         $this->server->addPlugin($plugin);
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'OPTIONS',
-            'HTTP_DEPTH' => 1,
-            'REQUEST_URI' => '/adminonly',
-        ));
+            'HTTP_DEPTH'     => 1,
+            'REQUEST_URI'    => '/adminonly',
+        ]);
 
         $response = new HTTP\ResponseMock();
 
@@ -56,16 +55,16 @@ class PluginAdminTest extends \PHPUnit_Framework_TestCase {
     function testAdminAccess() {
 
         $plugin = new Plugin();
-        $plugin->adminPrincipals = array(
+        $plugin->adminPrincipals = [
             'principals/admin',
-        );
+        ];
         $this->server->addPlugin($plugin);
 
-        $request = HTTP\Sapi::createFromServerArray(array(
+        $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'OPTIONS',
-            'HTTP_DEPTH' => 1,
-            'REQUEST_URI' => '/adminonly',
-        ));
+            'HTTP_DEPTH'     => 1,
+            'REQUEST_URI'    => '/adminonly',
+        ]);
 
         $response = new HTTP\ResponseMock();
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PluginPropertiesTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PluginPropertiesTest.php
index e5b7e1a3f..fb42efba7 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PluginPropertiesTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PluginPropertiesTest.php
@@ -10,6 +10,14 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
     function testPrincipalCollectionSet() {
 
         $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
+        $plugin->setDefaultACL([
+            [
+                'principal' => '{DAV:}all',
+                'privilege' => '{DAV:}all',
+            ],
+        ]);
+        //Anyone can do anything
         $plugin->principalCollectionSet = [
             'principals1',
             'principals2',
@@ -25,8 +33,8 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         $result = $server->getPropertiesForPath('', $requestedProperties);
         $result = $result[0];
 
-        $this->assertEquals(1,count($result[200]));
-        $this->assertArrayHasKey('{DAV:}principal-collection-set',$result[200]);
+        $this->assertEquals(1, count($result[200]));
+        $this->assertArrayHasKey('{DAV:}principal-collection-set', $result[200]);
         $this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $result[200]['{DAV:}principal-collection-set']);
 
         $expected = [
@@ -46,6 +54,12 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         $plugin = new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock());
         $fakeServer->addPlugin($plugin);
         $plugin = new Plugin();
+        $plugin->setDefaultACL([
+            [
+                'principal' => '{DAV:}all',
+                'privilege' => '{DAV:}all',
+            ],
+        ]);
         $fakeServer->addPlugin($plugin);
 
 
@@ -56,8 +70,8 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         $result = $fakeServer->getPropertiesForPath('', $requestedProperties);
         $result = $result[0];
 
-        $this->assertEquals(1,count($result[200]));
-        $this->assertArrayHasKey('{DAV:}current-user-principal',$result[200]);
+        $this->assertEquals(1, count($result[200]));
+        $this->assertArrayHasKey('{DAV:}current-user-principal', $result[200]);
         $this->assertInstanceOf('Sabre\DAVACL\Xml\Property\Principal', $result[200]['{DAV:}current-user-principal']);
         $this->assertEquals(Xml\Property\Principal::UNAUTHENTICATED, $result[200]['{DAV:}current-user-principal']->getType());
 
@@ -67,8 +81,8 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         $result = $fakeServer->getPropertiesForPath('', $requestedProperties);
         $result = $result[0];
 
-        $this->assertEquals(1,count($result[200]));
-        $this->assertArrayHasKey('{DAV:}current-user-principal',$result[200]);
+        $this->assertEquals(1, count($result[200]));
+        $this->assertArrayHasKey('{DAV:}current-user-principal', $result[200]);
         $this->assertInstanceOf('Sabre\DAVACL\Xml\Property\Principal', $result[200]['{DAV:}current-user-principal']);
         $this->assertEquals(Xml\Property\Principal::HREF, $result[200]['{DAV:}current-user-principal']->getType());
         $this->assertEquals('principals/admin/', $result[200]['{DAV:}current-user-principal']->getHref());
@@ -78,6 +92,13 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
     function testSupportedPrivilegeSet() {
 
         $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
+        $plugin->setDefaultACL([
+            [
+                'principal' => '{DAV:}all',
+                'privilege' => '{DAV:}all',
+            ],
+        ]);
         $server = new DAV\Server();
         $server->addPlugin($plugin);
 
@@ -88,8 +109,8 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         $result = $server->getPropertiesForPath('', $requestedProperties);
         $result = $result[0];
 
-        $this->assertEquals(1,count($result[200]));
-        $this->assertArrayHasKey('{DAV:}supported-privilege-set',$result[200]);
+        $this->assertEquals(1, count($result[200]));
+        $this->assertArrayHasKey('{DAV:}supported-privilege-set', $result[200]);
         $this->assertInstanceOf('Sabre\\DAVACL\\Xml\\Property\\SupportedPrivilegeSet', $result[200]['{DAV:}supported-privilege-set']);
 
         $server = new DAV\Server();
@@ -98,26 +119,25 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         $result = $server->xml->write('{DAV:}root', $prop);
 
         $xpaths = [
-            '/d:root' => 1,
-            '/d:root/d:supported-privilege' => 1,
-            '/d:root/d:supported-privilege/d:privilege' => 1,
-            '/d:root/d:supported-privilege/d:privilege/d:all' => 1,
-            '/d:root/d:supported-privilege/d:abstract' => 1,
-            '/d:root/d:supported-privilege/d:supported-privilege' => 2,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:privilege' => 2,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:privilege/d:read' => 1,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:privilege/d:write' => 1,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege' => 8,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege' => 8,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:read-acl' => 1,
+            '/d:root'                                                                                                                 => 1,
+            '/d:root/d:supported-privilege'                                                                                           => 1,
+            '/d:root/d:supported-privilege/d:privilege'                                                                               => 1,
+            '/d:root/d:supported-privilege/d:privilege/d:all'                                                                         => 1,
+            '/d:root/d:supported-privilege/d:abstract'                                                                                => 0,
+            '/d:root/d:supported-privilege/d:supported-privilege'                                                                     => 2,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:privilege'                                                         => 2,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:privilege/d:read'                                                  => 1,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:privilege/d:write'                                                 => 1,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege'                                               => 7,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege'                                   => 7,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:read-acl'                        => 1,
             '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:read-current-user-privilege-set' => 1,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:write-content' => 1,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:write-properties' => 1,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:write-acl' => 1,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:bind' => 1,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:unbind' => 1,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:unlock' => 1,
-            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:abstract' => 0,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:write-content'                   => 1,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:write-properties'                => 1,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:bind'                            => 1,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:unbind'                          => 1,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:unlock'                          => 1,
+            '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:abstract'                                    => 0,
         ];
 
 
@@ -126,10 +146,10 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         $dom2->loadXML($result);
 
         $dxpath = new \DOMXPath($dom2);
-        $dxpath->registerNamespace('d','DAV:');
-        foreach($xpaths as $xpath=>$count) {
+        $dxpath->registerNamespace('d', 'DAV:');
+        foreach ($xpaths as $xpath => $count) {
 
-            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count. ' Full XML: ' . $result);
+            $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count . ' Full XML: ' . $result);
 
         }
 
@@ -138,6 +158,13 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
     function testACL() {
 
         $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
+        $plugin->setDefaultACL([
+            [
+                'principal' => '{DAV:}all',
+                'privilege' => '{DAV:}all',
+            ],
+        ]);
 
         $nodes = [
             new MockACLNode('foo', [
@@ -147,7 +174,7 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
                 ]
             ]),
             new DAV\SimpleCollection('principals', [
-                $principal = new MockPrincipal('admin','principals/admin'),
+                $principal = new MockPrincipal('admin', 'principals/admin'),
             ]),
 
         ];
@@ -167,8 +194,8 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         $result = $server->getPropertiesForPath('foo', $requestedProperties);
         $result = $result[0];
 
-        $this->assertEquals(1,count($result[200]),'The {DAV:}acl property did not return from the list. Full list: ' . print_r($result, true));
-        $this->assertArrayHasKey('{DAV:}acl',$result[200]);
+        $this->assertEquals(1, count($result[200]), 'The {DAV:}acl property did not return from the list. Full list: ' . print_r($result, true));
+        $this->assertArrayHasKey('{DAV:}acl', $result[200]);
         $this->assertInstanceOf('Sabre\\DAVACL\\Xml\Property\\Acl', $result[200]['{DAV:}acl']);
 
     }
@@ -176,6 +203,7 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
     function testACLRestrictions() {
 
         $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
 
         $nodes = [
             new MockACLNode('foo', [
@@ -185,7 +213,7 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
                 ]
             ]),
             new DAV\SimpleCollection('principals', [
-                $principal = new MockPrincipal('admin','principals/admin'),
+                $principal = new MockPrincipal('admin', 'principals/admin'),
             ]),
 
         ];
@@ -205,8 +233,8 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         $result = $server->getPropertiesForPath('foo', $requestedProperties);
         $result = $result[0];
 
-        $this->assertEquals(1,count($result[200]),'The {DAV:}acl-restrictions property did not return from the list. Full list: ' . print_r($result, true));
-        $this->assertArrayHasKey('{DAV:}acl-restrictions',$result[200]);
+        $this->assertEquals(1, count($result[200]), 'The {DAV:}acl-restrictions property did not return from the list. Full list: ' . print_r($result, true));
+        $this->assertArrayHasKey('{DAV:}acl-restrictions', $result[200]);
         $this->assertInstanceOf('Sabre\\DAVACL\\Xml\\Property\\AclRestrictions', $result[200]['{DAV:}acl-restrictions']);
 
     }
@@ -215,7 +243,7 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $tree = [
             new DAV\SimpleCollection('principals', [
-                $principal = new MockPrincipal('user','principals/user'),
+                $principal = new MockPrincipal('user', 'principals/user'),
             ])
         ];
 
@@ -223,6 +251,13 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         //$plugin = new DAV\Auth\Plugin(new DAV\Auth\MockBackend())
         //$fakeServer->addPlugin($plugin);
         $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
+        $plugin->setDefaultACL([
+            [
+                'principal' => '{DAV:}all',
+                'privilege' => '{DAV:}all',
+            ],
+        ]);
         $fakeServer->addPlugin($plugin);
 
         $requestedProperties = [
@@ -243,7 +278,7 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $tree = [
             new DAV\SimpleCollection('principals', [
-                $principal = new MockPrincipal('user','principals/user'),
+                $principal = new MockPrincipal('user', 'principals/user'),
             ]),
         ];
 
@@ -251,6 +286,13 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         //$plugin = new DAV\Auth\Plugin(new DAV\Auth\MockBackend());
         //$fakeServer->addPlugin($plugin);
         $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
+        $plugin->setDefaultACL([
+            [
+                'principal' => '{DAV:}all',
+                'privilege' => '{DAV:}all',
+            ],
+        ]);
         $fakeServer->addPlugin($plugin);
 
         $requestedProperties = [
@@ -272,7 +314,7 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $tree = [
             new DAV\SimpleCollection('principals', [
-                $principal = new MockPrincipal('user','principals/user'),
+                $principal = new MockPrincipal('user', 'principals/user'),
             ]),
         ];
 
@@ -280,6 +322,13 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
         //$plugin = new DAV\Auth\Plugin(new DAV\Auth\MockBackend());
         //$fakeServer->addPlugin($plugin);
         $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
+        $plugin->setDefaultACL([
+            [
+                'principal' => '{DAV:}all',
+                'privilege' => '{DAV:}all',
+            ],
+        ]);
         $fakeServer->addPlugin($plugin);
 
         $requestedProperties = [
@@ -301,13 +350,20 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $tree = [
             new DAV\SimpleCollection('principals', [
-                $principal = new MockPrincipal('user','principals/user'),
+                $principal = new MockPrincipal('user', 'principals/user'),
             ]),
         ];
 
         $fakeServer = new DAV\Server($tree);
         $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
         $fakeServer->addPlugin($plugin);
+        $plugin->setDefaultACL([
+            [
+                'principal' => '{DAV:}all',
+                'privilege' => '{DAV:}all',
+            ],
+        ]);
 
         $requestedProperties = [
             '{DAV:}group-membership',
@@ -328,13 +384,20 @@ class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
 
         $tree = [
             new DAV\SimpleCollection('principals', [
-                $principal = new MockPrincipal('user','principals/user'),
+                $principal = new MockPrincipal('user', 'principals/user'),
             ]),
         ];
 
         $fakeServer = new DAV\Server($tree);
         $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
         $fakeServer->addPlugin($plugin);
+        $plugin->setDefaultACL([
+            [
+                'principal' => '{DAV:}all',
+                'privilege' => '{DAV:}all',
+            ],
+        ]);
 
         $requestedProperties = [
             '{DAV:}displayname',
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
index 64cedd142..0147e6a61 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
@@ -3,28 +3,25 @@
 namespace Sabre\DAVACL;
 
 use Sabre\DAV;
-use Sabre\HTTP;
-
-
-require_once 'Sabre/DAVACL/MockPrincipal.php';
 
 class PluginUpdatePropertiesTest extends \PHPUnit_Framework_TestCase {
 
     function testUpdatePropertiesPassthrough() {
 
-        $tree = array(
+        $tree = [
             new DAV\SimpleCollection('foo'),
-        );
+        ];
         $server = new DAV\Server($tree);
+        $server->addPlugin(new DAV\Auth\Plugin());
         $server->addPlugin(new Plugin());
 
-        $result = $server->updateProperties('foo', array(
+        $result = $server->updateProperties('foo', [
             '{DAV:}foo' => 'bar',
-        ));
+        ]);
 
-        $expected = array(
+        $expected = [
             '{DAV:}foo' => 403,
-        );
+        ];
 
         $this->assertEquals($expected, $result);
 
@@ -32,35 +29,39 @@ class PluginUpdatePropertiesTest extends \PHPUnit_Framework_TestCase {
 
     function testRemoveGroupMembers() {
 
-        $tree = array(
-            new MockPrincipal('foo','foo'),
-        );
+        $tree = [
+            new MockPrincipal('foo', 'foo'),
+        ];
         $server = new DAV\Server($tree);
-        $server->addPlugin(new Plugin());
+        $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
+        $server->addPlugin($plugin);
 
-        $result = $server->updateProperties('foo', array(
+        $result = $server->updateProperties('foo', [
             '{DAV:}group-member-set' => null,
-        ));
+        ]);
 
-        $expected = array(
+        $expected = [
             '{DAV:}group-member-set' => 204
-        );
+        ];
 
         $this->assertEquals($expected, $result);
-        $this->assertEquals(array(),$tree[0]->getGroupMemberSet());
+        $this->assertEquals([], $tree[0]->getGroupMemberSet());
 
     }
 
     function testSetGroupMembers() {
 
         $tree = [
-            new MockPrincipal('foo','foo'),
+            new MockPrincipal('foo', 'foo'),
         ];
         $server = new DAV\Server($tree);
-        $server->addPlugin(new Plugin());
+        $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
+        $server->addPlugin($plugin);
 
         $result = $server->updateProperties('foo', [
-            '{DAV:}group-member-set' => new DAV\Xml\Property\Href(['/bar','/baz'], true),
+            '{DAV:}group-member-set' => new DAV\Xml\Property\Href(['/bar', '/baz'], true),
         ]);
 
         $expected = [
@@ -68,7 +69,7 @@ class PluginUpdatePropertiesTest extends \PHPUnit_Framework_TestCase {
         ];
 
         $this->assertEquals($expected, $result);
-        $this->assertEquals(['bar', 'baz'],$tree[0]->getGroupMemberSet());
+        $this->assertEquals(['bar', 'baz'], $tree[0]->getGroupMemberSet());
 
     }
 
@@ -77,15 +78,17 @@ class PluginUpdatePropertiesTest extends \PHPUnit_Framework_TestCase {
      */
     function testSetBadValue() {
 
-        $tree = array(
-            new MockPrincipal('foo','foo'),
-        );
+        $tree = [
+            new MockPrincipal('foo', 'foo'),
+        ];
         $server = new DAV\Server($tree);
-        $server->addPlugin(new Plugin());
+        $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
+        $server->addPlugin($plugin);
 
-        $result = $server->updateProperties('foo', array(
+        $result = $server->updateProperties('foo', [
             '{DAV:}group-member-set' => new \StdClass(),
-        ));
+        ]);
 
     }
 
@@ -95,10 +98,12 @@ class PluginUpdatePropertiesTest extends \PHPUnit_Framework_TestCase {
             new DAV\SimpleCollection('foo'),
         ];
         $server = new DAV\Server($tree);
-        $server->addPlugin(new Plugin());
+        $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
+        $server->addPlugin($plugin);
 
         $result = $server->updateProperties('foo', [
-            '{DAV:}group-member-set' => new DAV\Xml\Property\Href(['/bar','/baz'],false),
+            '{DAV:}group-member-set' => new DAV\Xml\Property\Href(['/bar', '/baz'], false),
         ]);
 
         $expected = [
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
index 3814ebc0d..9fef3018d 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
@@ -5,10 +5,24 @@ namespace Sabre\DAVACL\PrincipalBackend;
 use Sabre\DAV;
 use Sabre\HTTP;
 
-
 abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
-    abstract function getPDO();
+    use DAV\DbTestHelperTrait;
+
+    function setUp() {
+
+        $this->dropTables(['principals', 'groupmembers']);
+        $this->createSchema('principals');
+
+        $pdo = $this->getPDO();
+
+        $pdo->query("INSERT INTO principals (uri,email,displayname) VALUES ('principals/user','user@example.org','User')");
+        $pdo->query("INSERT INTO principals (uri,email,displayname) VALUES ('principals/group','group@example.org','Group')");
+
+        $pdo->query("INSERT INTO groupmembers (principal_id,member_id) VALUES (5,4)");
+
+    }
+
 
     function testConstruct() {
 
@@ -26,21 +40,26 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
 
-        $expected = array(
-            array(
-                'uri' => 'principals/user',
+        $expected = [
+            [
+                'uri'                                   => 'principals/admin',
+                '{http://sabredav.org/ns}email-address' => 'admin@example.org',
+                '{DAV:}displayname'                     => 'Administrator',
+            ],
+            [
+                'uri'                                   => 'principals/user',
                 '{http://sabredav.org/ns}email-address' => 'user@example.org',
-                '{DAV:}displayname' => 'User',
-            ),
-            array(
-                'uri' => 'principals/group',
+                '{DAV:}displayname'                     => 'User',
+            ],
+            [
+                'uri'                                   => 'principals/group',
                 '{http://sabredav.org/ns}email-address' => 'group@example.org',
-                '{DAV:}displayname' => 'Group',
-            ),
-        );
+                '{DAV:}displayname'                     => 'Group',
+            ],
+        ];
 
         $this->assertEquals($expected, $backend->getPrincipalsByPrefix('principals'));
-        $this->assertEquals(array(), $backend->getPrincipalsByPrefix('foo'));
+        $this->assertEquals([], $backend->getPrincipalsByPrefix('foo'));
 
     }
 
@@ -52,12 +71,12 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
 
-        $expected = array(
-            'id' => 1,
-            'uri' => 'principals/user',
+        $expected = [
+            'id'                                    => 4,
+            'uri'                                   => 'principals/user',
             '{http://sabredav.org/ns}email-address' => 'user@example.org',
-            '{DAV:}displayname' => 'User',
-        );
+            '{DAV:}displayname'                     => 'User',
+        ];
 
         $this->assertEquals($expected, $backend->getPrincipalByPath('principals/user'));
         $this->assertEquals(null, $backend->getPrincipalByPath('foo'));
@@ -68,9 +87,9 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
-        $expected = array('principals/user');
+        $expected = ['principals/user'];
 
-        $this->assertEquals($expected,$backend->getGroupMemberSet('principals/group'));
+        $this->assertEquals($expected, $backend->getGroupMemberSet('principals/group'));
 
     }
 
@@ -78,9 +97,9 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $pdo = $this->getPDO();
         $backend = new PDO($pdo);
-        $expected = array('principals/group');
+        $expected = ['principals/group'];
 
-        $this->assertEquals($expected,$backend->getGroupMembership('principals/user'));
+        $this->assertEquals($expected, $backend->getGroupMembership('principals/user'));
 
     }
 
@@ -90,15 +109,15 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         // Start situation
         $backend = new PDO($pdo);
-        $this->assertEquals(array('principals/user'), $backend->getGroupMemberSet('principals/group'));
+        $this->assertEquals(['principals/user'], $backend->getGroupMemberSet('principals/group'));
 
         // Removing all principals
-        $backend->setGroupMemberSet('principals/group', array());
-        $this->assertEquals(array(), $backend->getGroupMemberSet('principals/group'));
+        $backend->setGroupMemberSet('principals/group', []);
+        $this->assertEquals([], $backend->getGroupMemberSet('principals/group'));
 
         // Adding principals again
-        $backend->setGroupMemberSet('principals/group', array('principals/user'));
-        $this->assertEquals(array('principals/user'), $backend->getGroupMemberSet('principals/group'));
+        $backend->setGroupMemberSet('principals/group', ['principals/user']);
+        $this->assertEquals(['principals/user'], $backend->getGroupMemberSet('principals/group'));
 
 
     }
@@ -109,17 +128,17 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $backend = new PDO($pdo);
 
-        $result = $backend->searchPrincipals('principals', array('{DAV:}blabla' => 'foo'));
-        $this->assertEquals(array(), $result);
+        $result = $backend->searchPrincipals('principals', ['{DAV:}blabla' => 'foo']);
+        $this->assertEquals([], $result);
 
-        $result = $backend->searchPrincipals('principals', array('{DAV:}displayname' => 'ou'));
-        $this->assertEquals(array('principals/group'), $result);
+        $result = $backend->searchPrincipals('principals', ['{DAV:}displayname' => 'ou']);
+        $this->assertEquals(['principals/group'], $result);
 
-        $result = $backend->searchPrincipals('principals', array('{DAV:}displayname' => 'UsEr', '{http://sabredav.org/ns}email-address' => 'USER@EXAMPLE'));
-        $this->assertEquals(array('principals/user'), $result);
+        $result = $backend->searchPrincipals('principals', ['{DAV:}displayname' => 'UsEr', '{http://sabredav.org/ns}email-address' => 'USER@EXAMPLE']);
+        $this->assertEquals(['principals/user'], $result);
 
-        $result = $backend->searchPrincipals('mom', array('{DAV:}displayname' => 'UsEr', '{http://sabredav.org/ns}email-address' => 'USER@EXAMPLE'));
-        $this->assertEquals(array(), $result);
+        $result = $backend->searchPrincipals('mom', ['{DAV:}displayname' => 'UsEr', '{http://sabredav.org/ns}email-address' => 'USER@EXAMPLE']);
+        $this->assertEquals([], $result);
 
     }
 
@@ -137,12 +156,12 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $this->assertTrue($result);
 
-        $this->assertEquals(array(
-            'id' => 1,
-            'uri' => 'principals/user',
-            '{DAV:}displayname' => 'pietje',
+        $this->assertEquals([
+            'id'                                    => 4,
+            'uri'                                   => 'principals/user',
+            '{DAV:}displayname'                     => 'pietje',
             '{http://sabredav.org/ns}email-address' => 'user@example.org',
-        ), $backend->getPrincipalByPath('principals/user'));
+        ], $backend->getPrincipalByPath('principals/user'));
 
     }
 
@@ -153,7 +172,7 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $propPatch = new DAV\PropPatch([
             '{DAV:}displayname' => 'pietje',
-            '{DAV:}unknown' => 'foo',
+            '{DAV:}unknown'     => 'foo',
         ]);
 
         $backend->updatePrincipal('principals/user', $propPatch);
@@ -161,17 +180,17 @@ abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
 
         $this->assertFalse($result);
 
-        $this->assertEquals(array(
+        $this->assertEquals([
             '{DAV:}displayname' => 424,
-            '{DAV:}unknown' => 403
-        ), $propPatch->getResult());
+            '{DAV:}unknown'     => 403
+        ], $propPatch->getResult());
 
-        $this->assertEquals(array(
-            'id' => '1',
-            'uri' => 'principals/user',
-            '{DAV:}displayname' => 'User',
+        $this->assertEquals([
+            'id'                                    => '4',
+            'uri'                                   => 'principals/user',
+            '{DAV:}displayname'                     => 'User',
             '{http://sabredav.org/ns}email-address' => 'user@example.org',
-        ), $backend->getPrincipalByPath('principals/user'));
+        ], $backend->getPrincipalByPath('principals/user'));
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php
index 83353c86c..8779eb69f 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php
@@ -2,49 +2,8 @@
 
 namespace Sabre\DAVACL\PrincipalBackend;
 
-use Sabre\DAV;
-use Sabre\HTTP;
-
-
-require_once 'Sabre/TestUtil.php';
-
 class PDOMySQLTest extends AbstractPDOTest {
 
-    function getPDO() {
-
-        if (!SABRE_HASMYSQL) $this->markTestSkipped('MySQL driver is not available, or not properly configured');
-        $pdo = \Sabre\TestUtil::getMySQLDB();
-        if (!$pdo) $this->markTestSkipped('Could not connect to MySQL database');
-        $pdo->query("DROP TABLE IF EXISTS principals");
-        $pdo->query(<<<SQL
-create table principals (
-  id integer unsigned not null primary key auto_increment,
-  uri varchar(50),
-  email varchar(80),
-  displayname VARCHAR(80),
-  vcardurl VARCHAR(80),
-  unique(uri)
-)
-SQL
-        );
-
-        $pdo->query("INSERT INTO principals (uri,email,displayname) VALUES ('principals/user','user@example.org','User')");
-        $pdo->query("INSERT INTO principals (uri,email,displayname) VALUES ('principals/group','group@example.org','Group')");
-        $pdo->query("DROP TABLE IF EXISTS groupmembers");
-        $pdo->query(<<<SQL
-CREATE TABLE groupmembers (
-  id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
-  principal_id INTEGER UNSIGNED NOT NULL,
-  member_id INTEGER UNSIGNED NOT NULL,
-  UNIQUE(principal_id, member_id)
-)
-SQL
-        );
-
-        $pdo->query("INSERT INTO groupmembers (principal_id,member_id) VALUES (2,1)");
-
-        return $pdo;
-
-    }
+    public $driver = 'mysql';
 
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php
index f335ed51f..48454981d 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php
@@ -2,44 +2,8 @@
 
 namespace Sabre\DAVACL\PrincipalBackend;
 
-use Sabre\DAV;
-use Sabre\HTTP;
+class PDOSqliteTest extends AbstractPDOTest {
 
-
-require_once 'Sabre/DAV/Auth/Backend/AbstractPDOTest.php';
-
-class PDOSQLiteTest extends AbstractPDOTest {
-
-    function tearDown() {
-
-        if (file_exists(SABRE_TEMPDIR . '/pdobackend')) unlink(SABRE_TEMPDIR . '/pdobackend');
-        if (file_exists(SABRE_TEMPDIR . '/pdobackend2')) unlink(SABRE_TEMPDIR . '/pdobackend2');
-
-    }
-
-    function getPDO() {
-
-        if (!SABRE_HASSQLITE) $this->markTestSkipped('SQLite driver is not available');
-        $pdo = new \PDO('sqlite:'.SABRE_TEMPDIR.'/pdobackend');
-        $pdo->setAttribute(\PDO::ATTR_ERRMODE,\PDO::ERRMODE_EXCEPTION);
-        $pdo->query('CREATE TABLE principals (id INTEGER PRIMARY KEY ASC, uri TEXT, email VARCHAR(80), displayname VARCHAR(80))');
-        $pdo->query('INSERT INTO principals VALUES (1, "principals/user","user@example.org","User")');
-        $pdo->query('INSERT INTO principals VALUES (2, "principals/group","group@example.org","Group")');
-
-        $pdo->query(<<<SQL
-CREATE TABLE groupmembers (
-  id INTEGER PRIMARY KEY ASC,
-  principal_id INT,
-  member_id INT,
-  UNIQUE(principal_id, member_id)
-)
-SQL
-        );
-
-        $pdo->query("INSERT INTO groupmembers (principal_id,member_id) VALUES (2,1)");
-
-        return $pdo;
-
-    }
+    public $driver = 'sqlite';
 
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalCollectionTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
index f51d2dcce..bcf78821b 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
@@ -2,26 +2,22 @@
 
 namespace Sabre\DAVACL;
 
-use Sabre\DAV;
-use Sabre\HTTP;
-
-
 class PrincipalCollectionTest extends \PHPUnit_Framework_TestCase {
 
-    public function testBasic() {
+    function testBasic() {
 
         $backend = new PrincipalBackend\Mock();
         $pc = new PrincipalCollection($backend);
         $this->assertTrue($pc instanceof PrincipalCollection);
 
-        $this->assertEquals('principals',$pc->getName());
+        $this->assertEquals('principals', $pc->getName());
 
     }
 
     /**
      * @depends testBasic
      */
-    public function testGetChildren() {
+    function testGetChildren() {
 
         $backend = new PrincipalBackend\Mock();
         $pc = new PrincipalCollection($backend);
@@ -29,7 +25,7 @@ class PrincipalCollectionTest extends \PHPUnit_Framework_TestCase {
         $children = $pc->getChildren();
         $this->assertTrue(is_array($children));
 
-        foreach($children as $child) {
+        foreach ($children as $child) {
             $this->assertTrue($child instanceof IPrincipal);
         }
 
@@ -39,7 +35,7 @@ class PrincipalCollectionTest extends \PHPUnit_Framework_TestCase {
      * @depends testBasic
      * @expectedException Sabre\DAV\Exception\MethodNotAllowed
      */
-    public function testGetChildrenDisable() {
+    function testGetChildrenDisable() {
 
         $backend = new PrincipalBackend\Mock();
         $pc = new PrincipalCollection($backend);
@@ -49,7 +45,7 @@ class PrincipalCollectionTest extends \PHPUnit_Framework_TestCase {
 
     }
 
-    public function testFindByUri() {
+    function testFindByUri() {
 
         $backend = new PrincipalBackend\Mock();
         $pc = new PrincipalCollection($backend);
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
index 8e4c86782..60e156d9a 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
@@ -23,6 +23,7 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
         $fakeServer->debugExceptions = true;
         $plugin = new MockPlugin();
         $plugin->allowAccessToNodesWithoutACL = true;
+        $plugin->allowUnauthenticatedAccess = false;
 
         $this->assertTrue($plugin instanceof Plugin);
         $fakeServer->addPlugin($plugin);
@@ -48,11 +49,11 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
   </d:prop>
 </d:principal-property-search>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '1',
             'REQUEST_URI'    => '/principals',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -63,10 +64,10 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(400, $server->httpResponse->getStatus(), $server->httpResponse->getBodyAsString());
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $server->httpResponse->getHeaders());
 
     }
 
@@ -87,11 +88,11 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
   </d:prop>
 </d:principal-property-search>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '0',
             'REQUEST_URI'    => '/principals',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -102,11 +103,11 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(207, $server->httpResponse->getStatus(), "Full body: " . $server->httpResponse->getBodyAsString());
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-            'Vary'         => ['Brief,Prefer'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+            'Vary'            => ['Brief,Prefer'],
+        ], $server->httpResponse->getHeaders());
 
     }
 
@@ -127,11 +128,11 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
   </d:prop>
 </d:principal-property-search>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '0',
             'REQUEST_URI'    => '/',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -142,36 +143,36 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(207, $server->httpResponse->status, $server->httpResponse->body);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-            'Vary'         => ['Brief,Prefer'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+            'Vary'            => ['Brief,Prefer'],
+        ], $server->httpResponse->getHeaders());
 
 
-        $check = array(
+        $check = [
             '/d:multistatus',
-            '/d:multistatus/d:response' => 2,
-            '/d:multistatus/d:response/d:href' => 2,
-            '/d:multistatus/d:response/d:propstat' => 4,
-            '/d:multistatus/d:response/d:propstat/d:prop' => 4,
-            '/d:multistatus/d:response/d:propstat/d:prop/d:displayname' => 2,
+            '/d:multistatus/d:response'                                      => 2,
+            '/d:multistatus/d:response/d:href'                               => 2,
+            '/d:multistatus/d:response/d:propstat'                           => 4,
+            '/d:multistatus/d:response/d:propstat/d:prop'                    => 4,
+            '/d:multistatus/d:response/d:propstat/d:prop/d:displayname'      => 2,
             '/d:multistatus/d:response/d:propstat/d:prop/d:getcontentlength' => 2,
-            '/d:multistatus/d:response/d:propstat/d:status' => 4,
-        );
+            '/d:multistatus/d:response/d:propstat/d:status'                  => 4,
+        ];
 
         $xml = simplexml_load_string($server->httpResponse->body);
-        $xml->registerXPathNamespace('d','DAV:');
-        foreach($check as $v1=>$v2) {
+        $xml->registerXPathNamespace('d', 'DAV:');
+        foreach ($check as $v1 => $v2) {
 
-            $xpath = is_int($v1)?$v2:$v1;
+            $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
             if (!is_int($v1)) $count = $v2;
 
-            $this->assertEquals($count,count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
+            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
 
         }
 
@@ -200,11 +201,11 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
   </d:prop>
 </d:principal-property-search>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '0',
             'REQUEST_URI'    => '/',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -215,36 +216,36 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(207, $server->httpResponse->status, $server->httpResponse->body);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-            'Vary'         => ['Brief,Prefer'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+            'Vary'            => ['Brief,Prefer'],
+        ], $server->httpResponse->getHeaders());
 
 
-        $check = array(
+        $check = [
             '/d:multistatus',
-            '/d:multistatus/d:response' => 0,
-            '/d:multistatus/d:response/d:href' => 0,
-            '/d:multistatus/d:response/d:propstat' => 0,
-            '/d:multistatus/d:response/d:propstat/d:prop' => 0,
-            '/d:multistatus/d:response/d:propstat/d:prop/d:displayname' => 0,
+            '/d:multistatus/d:response'                                      => 0,
+            '/d:multistatus/d:response/d:href'                               => 0,
+            '/d:multistatus/d:response/d:propstat'                           => 0,
+            '/d:multistatus/d:response/d:propstat/d:prop'                    => 0,
+            '/d:multistatus/d:response/d:propstat/d:prop/d:displayname'      => 0,
             '/d:multistatus/d:response/d:propstat/d:prop/d:getcontentlength' => 0,
-            '/d:multistatus/d:response/d:propstat/d:status' => 0,
-        );
+            '/d:multistatus/d:response/d:propstat/d:status'                  => 0,
+        ];
 
         $xml = simplexml_load_string($server->httpResponse->body);
-        $xml->registerXPathNamespace('d','DAV:');
-        foreach($check as $v1=>$v2) {
+        $xml->registerXPathNamespace('d', 'DAV:');
+        foreach ($check as $v1 => $v2) {
 
-            $xpath = is_int($v1)?$v2:$v1;
+            $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
             if (!is_int($v1)) $count = $v2;
 
-            $this->assertEquals($count,count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
+            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
 
         }
 
@@ -272,11 +273,11 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
   </d:prop>
 </d:principal-property-search>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '0',
             'REQUEST_URI'    => '/',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -287,36 +288,36 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(207, $server->httpResponse->status, $server->httpResponse->body);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-            'Vary'         => ['Brief,Prefer'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+            'Vary'            => ['Brief,Prefer'],
+        ], $server->httpResponse->getHeaders());
 
 
-        $check = array(
+        $check = [
             '/d:multistatus',
-            '/d:multistatus/d:response' => 2,
-            '/d:multistatus/d:response/d:href' => 2,
-            '/d:multistatus/d:response/d:propstat' => 4,
-            '/d:multistatus/d:response/d:propstat/d:prop' => 4,
-            '/d:multistatus/d:response/d:propstat/d:prop/d:displayname' => 2,
+            '/d:multistatus/d:response'                                      => 2,
+            '/d:multistatus/d:response/d:href'                               => 2,
+            '/d:multistatus/d:response/d:propstat'                           => 4,
+            '/d:multistatus/d:response/d:propstat/d:prop'                    => 4,
+            '/d:multistatus/d:response/d:propstat/d:prop/d:displayname'      => 2,
             '/d:multistatus/d:response/d:propstat/d:prop/d:getcontentlength' => 2,
-            '/d:multistatus/d:response/d:propstat/d:status' => 4,
-        );
+            '/d:multistatus/d:response/d:propstat/d:status'                  => 4,
+        ];
 
         $xml = simplexml_load_string($server->httpResponse->body);
-        $xml->registerXPathNamespace('d','DAV:');
-        foreach($check as $v1=>$v2) {
+        $xml->registerXPathNamespace('d', 'DAV:');
+        foreach ($check as $v1 => $v2) {
 
-            $xpath = is_int($v1)?$v2:$v1;
+            $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
             if (!is_int($v1)) $count = $v2;
 
-            $this->assertEquals($count,count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
+            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
 
         }
 
@@ -337,11 +338,11 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
   </d:prop>
 </d:principal-property-search>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '0',
             'REQUEST_URI'    => '/',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -352,30 +353,30 @@ class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(207, $server->httpResponse->status, $server->httpResponse->body);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-            'Vary'         => ['Brief,Prefer'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+            'Vary'            => ['Brief,Prefer'],
+        ], $server->httpResponse->getHeaders());
 
 
-        $check = array(
+        $check = [
             '/d:multistatus',
             '/d:multistatus/d:response' => 0,
-        );
+        ];
 
         $xml = simplexml_load_string($server->httpResponse->body);
-        $xml->registerXPathNamespace('d','DAV:');
-        foreach($check as $v1=>$v2) {
+        $xml->registerXPathNamespace('d', 'DAV:');
+        foreach ($check as $v1 => $v2) {
 
-            $xpath = is_int($v1)?$v2:$v1;
+            $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
             if (!is_int($v1)) $count = $v2;
 
-            $this->assertEquals($count,count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
+            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
 
         }
 
@@ -386,10 +387,10 @@ class MockPlugin extends Plugin {
 
     function getCurrentUserPrivilegeSet($node) {
 
-        return array(
+        return [
             '{DAV:}read',
             '{DAV:}write',
-        );
+        ];
 
     }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
index 952dc174a..fa1314d10 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
@@ -21,6 +21,7 @@ class PrincipalSearchPropertySetTest extends \PHPUnit_Framework_TestCase {
         $fakeServer->sapi = new HTTP\SapiMock();
         $fakeServer->httpResponse = new HTTP\ResponseMock();
         $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
         $this->assertTrue($plugin instanceof Plugin);
         $fakeServer->addPlugin($plugin);
         $this->assertEquals($plugin, $fakeServer->getPlugin('acl'));
@@ -34,11 +35,11 @@ class PrincipalSearchPropertySetTest extends \PHPUnit_Framework_TestCase {
         $xml = '<?xml version="1.0"?>
 <d:principal-search-property-set xmlns:d="DAV:" />';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '1',
             'REQUEST_URI'    => '/principals',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -49,10 +50,10 @@ class PrincipalSearchPropertySetTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(400, $server->httpResponse->status);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $server->httpResponse->getHeaders());
 
     }
 
@@ -61,11 +62,11 @@ class PrincipalSearchPropertySetTest extends \PHPUnit_Framework_TestCase {
         $xml = '<?xml version="1.0"?>
 <d:principal-search-property-set xmlns:d="DAV:"><d:ohell /></d:principal-search-property-set>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '0',
             'REQUEST_URI'    => '/principals',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -76,10 +77,10 @@ class PrincipalSearchPropertySetTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(400, $server->httpResponse->status, $server->httpResponse->body);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $server->httpResponse->getHeaders());
 
     }
 
@@ -88,11 +89,11 @@ class PrincipalSearchPropertySetTest extends \PHPUnit_Framework_TestCase {
         $xml = '<?xml version="1.0"?>
 <d:principal-search-property-set xmlns:d="DAV:"/>';
 
-        $serverVars = array(
+        $serverVars = [
             'REQUEST_METHOD' => 'REPORT',
             'HTTP_DEPTH'     => '0',
             'REQUEST_URI'    => '/principals',
-        );
+        ];
 
         $request = HTTP\Sapi::createFromServerArray($serverVars);
         $request->setBody($xml);
@@ -103,34 +104,34 @@ class PrincipalSearchPropertySetTest extends \PHPUnit_Framework_TestCase {
         $server->exec();
 
         $this->assertEquals(200, $server->httpResponse->status, $server->httpResponse->body);
-        $this->assertEquals(array(
+        $this->assertEquals([
             'X-Sabre-Version' => [DAV\Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8'],
-        ), $server->httpResponse->getHeaders());
+            'Content-Type'    => ['application/xml; charset=utf-8'],
+        ], $server->httpResponse->getHeaders());
 
 
-        $check = array(
+        $check = [
             '/d:principal-search-property-set',
-            '/d:principal-search-property-set/d:principal-search-property' => 2,
-            '/d:principal-search-property-set/d:principal-search-property/d:prop' => 2,
-            '/d:principal-search-property-set/d:principal-search-property/d:prop/d:displayname' => 1,
+            '/d:principal-search-property-set/d:principal-search-property'                        => 2,
+            '/d:principal-search-property-set/d:principal-search-property/d:prop'                 => 2,
+            '/d:principal-search-property-set/d:principal-search-property/d:prop/d:displayname'   => 1,
             '/d:principal-search-property-set/d:principal-search-property/d:prop/s:email-address' => 1,
-            '/d:principal-search-property-set/d:principal-search-property/d:description' => 2,
-        );
+            '/d:principal-search-property-set/d:principal-search-property/d:description'          => 2,
+        ];
 
         $xml = simplexml_load_string($server->httpResponse->body);
-        $xml->registerXPathNamespace('d','DAV:');
-        $xml->registerXPathNamespace('s','http://sabredav.org/ns');
-        foreach($check as $v1=>$v2) {
+        $xml->registerXPathNamespace('d', 'DAV:');
+        $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
+        foreach ($check as $v1 => $v2) {
 
-            $xpath = is_int($v1)?$v2:$v1;
+            $xpath = is_int($v1) ? $v2 : $v1;
 
             $result = $xml->xpath($xpath);
 
             $count = 1;
             if (!is_int($v1)) $count = $v2;
 
-            $this->assertEquals($count,count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
+            $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
 
         }
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php
index 03fd9d64d..20622ad17 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php
@@ -7,10 +7,10 @@ use Sabre\HTTP;
 
 class PrincipalTest extends \PHPUnit_Framework_TestCase {
 
-    public function testConstruct() {
+    function testConstruct() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
         $this->assertTrue($principal instanceof Principal);
 
     }
@@ -18,65 +18,65 @@ class PrincipalTest extends \PHPUnit_Framework_TestCase {
     /**
      * @expectedException Sabre\DAV\Exception
      */
-    public function testConstructNoUri() {
+    function testConstructNoUri() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array());
+        $principal = new Principal($principalBackend, []);
 
     }
 
-    public function testGetName() {
+    function testGetName() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
-        $this->assertEquals('admin',$principal->getName());
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
+        $this->assertEquals('admin', $principal->getName());
 
     }
 
-    public function testGetDisplayName() {
+    function testGetDisplayName() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
-        $this->assertEquals('admin',$principal->getDisplayname());
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
+        $this->assertEquals('admin', $principal->getDisplayname());
 
-        $principal = new Principal($principalBackend, array(
-            'uri' => 'principals/admin',
+        $principal = new Principal($principalBackend, [
+            'uri'               => 'principals/admin',
             '{DAV:}displayname' => 'Mr. Admin'
-        ));
-        $this->assertEquals('Mr. Admin',$principal->getDisplayname());
+        ]);
+        $this->assertEquals('Mr. Admin', $principal->getDisplayname());
 
     }
 
-    public function testGetProperties() {
+    function testGetProperties() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array(
-            'uri' => 'principals/admin',
-            '{DAV:}displayname' => 'Mr. Admin',
+        $principal = new Principal($principalBackend, [
+            'uri'                                   => 'principals/admin',
+            '{DAV:}displayname'                     => 'Mr. Admin',
             '{http://www.example.org/custom}custom' => 'Custom',
             '{http://sabredav.org/ns}email-address' => 'admin@example.org',
-        ));
+        ]);
 
-        $keys = array(
+        $keys = [
             '{DAV:}displayname',
             '{http://www.example.org/custom}custom',
             '{http://sabredav.org/ns}email-address',
-        );
+        ];
         $props = $principal->getProperties($keys);
 
-        foreach($keys as $key) $this->assertArrayHasKey($key,$props);
+        foreach ($keys as $key) $this->assertArrayHasKey($key, $props);
 
-        $this->assertEquals('Mr. Admin',$props['{DAV:}displayname']);
+        $this->assertEquals('Mr. Admin', $props['{DAV:}displayname']);
 
         $this->assertEquals('admin@example.org', $props['{http://sabredav.org/ns}email-address']);
     }
 
-    public function testUpdateProperties() {
+    function testUpdateProperties() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
 
-        $propPatch = new DAV\PropPatch(array('{DAV:}yourmom' => 'test'));
+        $propPatch = new DAV\PropPatch(['{DAV:}yourmom' => 'test']);
 
         $result = $principal->propPatch($propPatch);
         $result = $propPatch->commit();
@@ -84,123 +84,123 @@ class PrincipalTest extends \PHPUnit_Framework_TestCase {
 
     }
 
-    public function testGetPrincipalUrl() {
+    function testGetPrincipalUrl() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
-        $this->assertEquals('principals/admin',$principal->getPrincipalUrl());
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
+        $this->assertEquals('principals/admin', $principal->getPrincipalUrl());
 
     }
 
-    public function testGetAlternateUriSet() {
+    function testGetAlternateUriSet() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array(
-            'uri' => 'principals/admin',
-            '{DAV:}displayname' => 'Mr. Admin',
+        $principal = new Principal($principalBackend, [
+            'uri'                                   => 'principals/admin',
+            '{DAV:}displayname'                     => 'Mr. Admin',
             '{http://www.example.org/custom}custom' => 'Custom',
             '{http://sabredav.org/ns}email-address' => 'admin@example.org',
-            '{DAV:}alternate-URI-set' => array(
+            '{DAV:}alternate-URI-set'               => [
                 'mailto:admin+1@example.org',
                 'mailto:admin+2@example.org',
                 'mailto:admin@example.org',
-            ),
-        ));
+            ],
+        ]);
 
-        $expected = array(
+        $expected = [
             'mailto:admin+1@example.org',
             'mailto:admin+2@example.org',
             'mailto:admin@example.org',
-        );
+        ];
 
-        $this->assertEquals($expected,$principal->getAlternateUriSet());
+        $this->assertEquals($expected, $principal->getAlternateUriSet());
 
     }
-    public function testGetAlternateUriSetEmpty() {
+    function testGetAlternateUriSetEmpty() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array(
+        $principal = new Principal($principalBackend, [
             'uri' => 'principals/admin',
-        ));
+        ]);
 
-        $expected = array();
+        $expected = [];
 
-        $this->assertEquals($expected,$principal->getAlternateUriSet());
+        $this->assertEquals($expected, $principal->getAlternateUriSet());
 
     }
 
-    public function testGetGroupMemberSet() {
+    function testGetGroupMemberSet() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
-        $this->assertEquals(array(),$principal->getGroupMemberSet());
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
+        $this->assertEquals([], $principal->getGroupMemberSet());
 
     }
-    public function testGetGroupMembership() {
+    function testGetGroupMembership() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
-        $this->assertEquals(array(),$principal->getGroupMembership());
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
+        $this->assertEquals([], $principal->getGroupMembership());
 
     }
 
-    public function testSetGroupMemberSet() {
+    function testSetGroupMemberSet() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
-        $principal->setGroupMemberSet(array('principals/foo'));
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
+        $principal->setGroupMemberSet(['principals/foo']);
 
-        $this->assertEquals(array(
-            'principals/admin' => array('principals/foo'),
-        ), $principalBackend->groupMembers);
+        $this->assertEquals([
+            'principals/admin' => ['principals/foo'],
+        ], $principalBackend->groupMembers);
 
     }
 
-    public function testGetOwner() {
+    function testGetOwner() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
-        $this->assertEquals('principals/admin',$principal->getOwner());
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
+        $this->assertEquals('principals/admin', $principal->getOwner());
 
     }
 
-    public function testGetGroup() {
+    function testGetGroup() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
         $this->assertNull($principal->getGroup());
 
     }
 
-    public function testGetACl() {
+    function testGetACl() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
-        $this->assertEquals(array(
-            array(
-                'privilege' => '{DAV:}read',
-                'principal' => '{DAV:}authenticated',
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
+        $this->assertEquals([
+            [
+                'privilege' => '{DAV:}all',
+                'principal' => '{DAV:}owner',
                 'protected' => true,
-            )
-        ),$principal->getACL());
+            ]
+        ], $principal->getACL());
 
     }
 
     /**
-     * @expectedException Sabre\DAV\Exception\MethodNotAllowed
+     * @expectedException \Sabre\DAV\Exception\Forbidden
      */
-    public function testSetACl() {
+    function testSetACl() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
-        $principal->setACL(array());
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
+        $principal->setACL([]);
 
     }
 
-    public function testGetSupportedPrivilegeSet() {
+    function testGetSupportedPrivilegeSet() {
 
         $principalBackend = new PrincipalBackend\Mock();
-        $principal = new Principal($principalBackend, array('uri' => 'principals/admin'));
+        $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
         $this->assertNull($principal->getSupportedPrivilegeSet());
 
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAVACL/SimplePluginTest.php b/vendor/sabre/dav/tests/Sabre/DAVACL/SimplePluginTest.php
index fb73cc16a..2de0ba6a8 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVACL/SimplePluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVACL/SimplePluginTest.php
@@ -5,7 +5,6 @@ namespace Sabre\DAVACL;
 use Sabre\DAV;
 use Sabre\HTTP;
 
-
 require_once 'Sabre/DAVACL/MockPrincipal.php';
 require_once 'Sabre/DAVACL/MockACLNode.php';
 
@@ -14,21 +13,22 @@ class SimplePluginTest extends \PHPUnit_Framework_TestCase {
     function testValues() {
 
         $aclPlugin = new Plugin();
-        $this->assertEquals('acl',$aclPlugin->getPluginName());
+        $this->assertEquals('acl', $aclPlugin->getPluginName());
         $this->assertEquals(
-            array('access-control', 'calendarserver-principal-property-search'),
+            ['access-control', 'calendarserver-principal-property-search'],
             $aclPlugin->getFeatures()
         );
 
         $this->assertEquals(
-            array(
+            [
                 '{DAV:}expand-property',
+                '{DAV:}principal-match',
                 '{DAV:}principal-property-search',
                 '{DAV:}principal-search-property-set'
-            ),
+            ],
             $aclPlugin->getSupportedReportSet(''));
 
-        $this->assertEquals(array('ACL'), $aclPlugin->getMethods(''));
+        $this->assertEquals(['ACL'], $aclPlugin->getMethods(''));
 
 
         $this->assertEquals(
@@ -39,90 +39,84 @@ class SimplePluginTest extends \PHPUnit_Framework_TestCase {
 
     function testGetFlatPrivilegeSet() {
 
-        $expected = array(
-            '{DAV:}all' => array(
-                'privilege' => '{DAV:}all',
-                'abstract' => true,
-                'aggregates' => array(
+        $expected = [
+            '{DAV:}all' => [
+                'privilege'  => '{DAV:}all',
+                'abstract'   => false,
+                'aggregates' => [
                     '{DAV:}read',
                     '{DAV:}write',
-                ),
-                'concrete' => null,
-            ),
-            '{DAV:}read' => array(
-                'privilege' => '{DAV:}read',
-                'abstract' => false,
-                'aggregates' => array(
+                ],
+                'concrete' => '{DAV:}all',
+            ],
+            '{DAV:}read' => [
+                'privilege'  => '{DAV:}read',
+                'abstract'   => false,
+                'aggregates' => [
                     '{DAV:}read-acl',
                     '{DAV:}read-current-user-privilege-set',
-                ),
+                ],
                 'concrete' => '{DAV:}read',
-            ),
-            '{DAV:}read-acl' => array(
-                'privilege' => '{DAV:}read-acl',
-                'abstract' => false,
-                'aggregates' => array(),
-                'concrete' => '{DAV:}read-acl',
-            ),
-            '{DAV:}read-current-user-privilege-set' => array(
-                'privilege' => '{DAV:}read-current-user-privilege-set',
-                'abstract' => false,
-                'aggregates' => array(),
-                'concrete' => '{DAV:}read-current-user-privilege-set',
-            ),
-            '{DAV:}write' => array(
-                'privilege' => '{DAV:}write',
-                'abstract' => false,
-                'aggregates' => array(
-                    '{DAV:}write-acl',
+            ],
+            '{DAV:}read-acl' => [
+                'privilege'  => '{DAV:}read-acl',
+                'abstract'   => false,
+                'aggregates' => [],
+                'concrete'   => '{DAV:}read-acl',
+            ],
+            '{DAV:}read-current-user-privilege-set' => [
+                'privilege'  => '{DAV:}read-current-user-privilege-set',
+                'abstract'   => false,
+                'aggregates' => [],
+                'concrete'   => '{DAV:}read-current-user-privilege-set',
+            ],
+            '{DAV:}write' => [
+                'privilege'  => '{DAV:}write',
+                'abstract'   => false,
+                'aggregates' => [
                     '{DAV:}write-properties',
                     '{DAV:}write-content',
+                    '{DAV:}unlock',
                     '{DAV:}bind',
                     '{DAV:}unbind',
-                    '{DAV:}unlock',
-                ),
+                ],
                 'concrete' => '{DAV:}write',
-            ),
-            '{DAV:}write-acl' => array(
-                'privilege' => '{DAV:}write-acl',
-                'abstract' => false,
-                'aggregates' => array(),
-                'concrete' => '{DAV:}write-acl',
-            ),
-            '{DAV:}write-properties' => array(
-                'privilege' => '{DAV:}write-properties',
-                'abstract' => false,
-                'aggregates' => array(),
-                'concrete' => '{DAV:}write-properties',
-            ),
-            '{DAV:}write-content' => array(
-                'privilege' => '{DAV:}write-content',
-                'abstract' => false,
-                'aggregates' => array(),
-                'concrete' => '{DAV:}write-content',
-            ),
-            '{DAV:}unlock' => array(
-                'privilege' => '{DAV:}unlock',
-                'abstract' => false,
-                'aggregates' => array(),
-                'concrete' => '{DAV:}unlock',
-            ),
-            '{DAV:}bind' => array(
-                'privilege' => '{DAV:}bind',
-                'abstract' => false,
-                'aggregates' => array(),
-                'concrete' => '{DAV:}bind',
-            ),
-            '{DAV:}unbind' => array(
-                'privilege' => '{DAV:}unbind',
-                'abstract' => false,
-                'aggregates' => array(),
-                'concrete' => '{DAV:}unbind',
-            ),
+            ],
+            '{DAV:}write-properties' => [
+                'privilege'  => '{DAV:}write-properties',
+                'abstract'   => false,
+                'aggregates' => [],
+                'concrete'   => '{DAV:}write-properties',
+            ],
+            '{DAV:}write-content' => [
+                'privilege'  => '{DAV:}write-content',
+                'abstract'   => false,
+                'aggregates' => [],
+                'concrete'   => '{DAV:}write-content',
+            ],
+            '{DAV:}unlock' => [
+                'privilege'  => '{DAV:}unlock',
+                'abstract'   => false,
+                'aggregates' => [],
+                'concrete'   => '{DAV:}unlock',
+            ],
+            '{DAV:}bind' => [
+                'privilege'  => '{DAV:}bind',
+                'abstract'   => false,
+                'aggregates' => [],
+                'concrete'   => '{DAV:}bind',
+            ],
+            '{DAV:}unbind' => [
+                'privilege'  => '{DAV:}unbind',
+                'abstract'   => false,
+                'aggregates' => [],
+                'concrete'   => '{DAV:}unbind',
+            ],
 
-        );
+        ];
 
         $plugin = new Plugin();
+        $plugin->allowUnauthenticatedAccess = false;
         $server = new DAV\Server();
         $server->addPlugin($plugin);
         $this->assertEquals($expected, $plugin->getFlatPrivilegeSet(''));
@@ -132,24 +126,26 @@ class SimplePluginTest extends \PHPUnit_Framework_TestCase {
     function testCurrentUserPrincipalsNotLoggedIn() {
 
         $acl = new Plugin();
+        $acl->allowUnauthenticatedAccess = false;
         $server = new DAV\Server();
         $server->addPlugin($acl);
 
-        $this->assertEquals(array(),$acl->getCurrentUserPrincipals());
+        $this->assertEquals([], $acl->getCurrentUserPrincipals());
 
     }
 
     function testCurrentUserPrincipalsSimple() {
 
-        $tree = array(
+        $tree = [
 
-            new DAV\SimpleCollection('principals', array(
-                new MockPrincipal('admin','principals/admin'),
-            ))
+            new DAV\SimpleCollection('principals', [
+                new MockPrincipal('admin', 'principals/admin'),
+            ])
 
-        );
+        ];
 
         $acl = new Plugin();
+        $acl->allowUnauthenticatedAccess = false;
         $server = new DAV\Server($tree);
         $server->addPlugin($acl);
 
@@ -159,24 +155,25 @@ class SimplePluginTest extends \PHPUnit_Framework_TestCase {
         //forcing login
         $auth->beforeMethod(new HTTP\Request(), new HTTP\Response());
 
-        $this->assertEquals(array('principals/admin'),$acl->getCurrentUserPrincipals());
+        $this->assertEquals(['principals/admin'], $acl->getCurrentUserPrincipals());
 
     }
 
     function testCurrentUserPrincipalsGroups() {
 
-        $tree = array(
+        $tree = [
 
-            new DAV\SimpleCollection('principals', array(
-                new MockPrincipal('admin','principals/admin',array('principals/administrators', 'principals/everyone')),
-                new MockPrincipal('administrators','principals/administrators',array('principals/groups'), array('principals/admin')),
-                new MockPrincipal('everyone','principals/everyone',array(), array('principals/admin')),
-                new MockPrincipal('groups','principals/groups',array(), array('principals/administrators')),
-            ))
+            new DAV\SimpleCollection('principals', [
+                new MockPrincipal('admin', 'principals/admin', ['principals/administrators', 'principals/everyone']),
+                new MockPrincipal('administrators', 'principals/administrators', ['principals/groups'], ['principals/admin']),
+                new MockPrincipal('everyone', 'principals/everyone', [], ['principals/admin']),
+                new MockPrincipal('groups', 'principals/groups', [], ['principals/administrators']),
+            ])
 
-        );
+        ];
 
         $acl = new Plugin();
+        $acl->allowUnauthenticatedAccess = false;
         $server = new DAV\Server($tree);
         $server->addPlugin($acl);
 
@@ -186,75 +183,77 @@ class SimplePluginTest extends \PHPUnit_Framework_TestCase {
         //forcing login
         $auth->beforeMethod(new HTTP\Request(), new HTTP\Response());
 
-        $expected = array(
+        $expected = [
             'principals/admin',
             'principals/administrators',
             'principals/everyone',
             'principals/groups',
-        );
+        ];
 
-        $this->assertEquals($expected,$acl->getCurrentUserPrincipals());
+        $this->assertEquals($expected, $acl->getCurrentUserPrincipals());
 
         // The second one should trigger the cache and be identical
-        $this->assertEquals($expected,$acl->getCurrentUserPrincipals());
+        $this->assertEquals($expected, $acl->getCurrentUserPrincipals());
 
     }
 
     function testGetACL() {
 
-        $acl = array(
-            array(
+        $acl = [
+            [
                 'principal' => 'principals/admin',
                 'privilege' => '{DAV:}read',
-            ),
-            array(
+            ],
+            [
                 'principal' => 'principals/admin',
                 'privilege' => '{DAV:}write',
-            ),
-        );
+            ],
+        ];
 
 
-        $tree = array(
-            new MockACLNode('foo',$acl),
-        );
+        $tree = [
+            new MockACLNode('foo', $acl),
+        ];
 
         $server = new DAV\Server($tree);
         $aclPlugin = new Plugin();
+        $aclPlugin->allowUnauthenticatedAccess = false;
         $server->addPlugin($aclPlugin);
 
-        $this->assertEquals($acl,$aclPlugin->getACL('foo'));
+        $this->assertEquals($acl, $aclPlugin->getACL('foo'));
 
     }
 
     function testGetCurrentUserPrivilegeSet() {
 
-        $acl = array(
-            array(
+        $acl = [
+            [
                 'principal' => 'principals/admin',
                 'privilege' => '{DAV:}read',
-            ),
-            array(
+            ],
+            [
                 'principal' => 'principals/user1',
                 'privilege' => '{DAV:}read',
-            ),
-            array(
+            ],
+            [
                 'principal' => 'principals/admin',
                 'privilege' => '{DAV:}write',
-            ),
-        );
+            ],
+        ];
 
 
-        $tree = array(
-            new MockACLNode('foo',$acl),
+        $tree = [
+            new MockACLNode('foo', $acl),
 
-            new DAV\SimpleCollection('principals', array(
-                new MockPrincipal('admin','principals/admin'),
-            )),
+            new DAV\SimpleCollection('principals', [
+                new MockPrincipal('admin', 'principals/admin'),
+            ]),
 
-        );
+        ];
 
         $server = new DAV\Server($tree);
         $aclPlugin = new Plugin();
+        $aclPlugin->allowUnauthenticatedAccess = false;
         $server->addPlugin($aclPlugin);
 
         $auth = new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock());
@@ -263,52 +262,51 @@ class SimplePluginTest extends \PHPUnit_Framework_TestCase {
         //forcing login
         $auth->beforeMethod(new HTTP\Request(), new HTTP\Response());
 
-        $expected = array(
+        $expected = [
             '{DAV:}write',
-            '{DAV:}write-acl',
             '{DAV:}write-properties',
             '{DAV:}write-content',
-            '{DAV:}bind',
-            '{DAV:}unbind',
             '{DAV:}unlock',
+            '{DAV:}write-acl',
             '{DAV:}read',
             '{DAV:}read-acl',
             '{DAV:}read-current-user-privilege-set',
-        );
+        ];
 
-        $this->assertEquals($expected,$aclPlugin->getCurrentUserPrivilegeSet('foo'));
+        $this->assertEquals($expected, $aclPlugin->getCurrentUserPrivilegeSet('foo'));
 
     }
 
     function testCheckPrivileges() {
 
-        $acl = array(
-            array(
+        $acl = [
+            [
                 'principal' => 'principals/admin',
                 'privilege' => '{DAV:}read',
-            ),
-            array(
+            ],
+            [
                 'principal' => 'principals/user1',
                 'privilege' => '{DAV:}read',
-            ),
-            array(
+            ],
+            [
                 'principal' => 'principals/admin',
                 'privilege' => '{DAV:}write',
-            ),
-        );
+            ],
+        ];
 
 
-        $tree = array(
-            new MockACLNode('foo',$acl),
+        $tree = [
+            new MockACLNode('foo', $acl),
 
-            new DAV\SimpleCollection('principals', array(
-                new MockPrincipal('admin','principals/admin'),
-            )),
+            new DAV\SimpleCollection('principals', [
+                new MockPrincipal('admin', 'principals/admin'),
+            ]),
 
-        );
+        ];
 
         $server = new DAV\Server($tree);
         $aclPlugin = new Plugin();
+        $aclPlugin->allowUnauthenticatedAccess = false;
         $server->addPlugin($aclPlugin);
 
         $auth = new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock());
@@ -317,11 +315,7 @@ class SimplePluginTest extends \PHPUnit_Framework_TestCase {
         //forcing login
         //$auth->beforeMethod('GET','/');
 
-        $this->assertFalse($aclPlugin->checkPrivileges('foo', array('{DAV:}read'), Plugin::R_PARENT, false));
+        $this->assertFalse($aclPlugin->checkPrivileges('foo', ['{DAV:}read'], Plugin::R_PARENT, false));
 
     }
 }
-
-
-
-
diff --git a/vendor/sabre/dav/tests/Sabre/DAVServerTest.php b/vendor/sabre/dav/tests/Sabre/DAVServerTest.php
index d329b5b05..35f240d23 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVServerTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVServerTest.php
@@ -27,6 +27,7 @@ abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
     protected $setupCalDAVICSExport = false;
     protected $setupLocks = false;
     protected $setupFiles = false;
+    protected $setupSharing = false;
     protected $setupPropertyStorage = false;
 
     /**
@@ -90,6 +91,13 @@ abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
     protected $locksPlugin;
 
     /**
+     * Sharing plugin.
+     *
+     * @var \Sabre\DAV\Sharing\Plugin
+     */
+    protected $sharingPlugin;
+
+    /*
      * @var Sabre\DAV\PropertyStorage\Plugin
      */
     protected $propertyStoragePlugin;
@@ -102,6 +110,12 @@ abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
 
     function setUp() {
 
+        $this->initializeEverything();
+
+    }
+
+    function initializeEverything() {
+
         $this->setUpBackends();
         $this->setUpTree();
 
@@ -113,6 +127,10 @@ abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
             $this->caldavPlugin = new CalDAV\Plugin();
             $this->server->addPlugin($this->caldavPlugin);
         }
+        if ($this->setupCalDAVSharing || $this->setupSharing) {
+            $this->sharingPlugin = new DAV\Sharing\Plugin();
+            $this->server->addPlugin($this->sharingPlugin);
+        }
         if ($this->setupCalDAVSharing) {
             $this->caldavSharingPlugin = new CalDAV\SharingPlugin();
             $this->server->addPlugin($this->caldavSharingPlugin);
@@ -132,10 +150,6 @@ abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
             $this->carddavPlugin = new CardDAV\Plugin();
             $this->server->addPlugin($this->carddavPlugin);
         }
-        if ($this->setupACL) {
-            $this->aclPlugin = new DAVACL\Plugin();
-            $this->server->addPlugin($this->aclPlugin);
-        }
         if ($this->setupLocks) {
             $this->locksPlugin = new DAV\Locks\Plugin(
                 $this->locksBackend
@@ -149,13 +163,15 @@ abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
             $this->server->addPlugin($this->propertyStoragePlugin);
         }
         if ($this->autoLogin) {
-            $authBackend = new DAV\Auth\Backend\Mock();
-            $authBackend->setPrincipal('principals/' . $this->autoLogin);
-            $this->authPlugin = new DAV\Auth\Plugin($authBackend);
-            $this->server->addPlugin($this->authPlugin);
-
-            // This will trigger the actual login procedure
-            $this->authPlugin->beforeMethod(new Request(), new Response());
+            $this->autoLogin($this->autoLogin);
+        }
+        if ($this->setupACL) {
+            $this->aclPlugin = new DAVACL\Plugin();
+            if (!$this->autoLogin) {
+                $this->aclPlugin->allowUnauthenticatedAccess = false;
+            }
+            $this->aclPlugin->adminPrincipals = ['principals/admin'];
+            $this->server->addPlugin($this->aclPlugin);
         }
 
     }
@@ -166,22 +182,54 @@ abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
      * You can either pass an instance of Sabre\HTTP\Request, or an array,
      * which will then be used as the _SERVER array.
      *
+     * If $expectedStatus is set, we'll compare it with the HTTP status of
+     * the returned response. If it doesn't match, we'll immediately fail
+     * the test.
+     *
      * @param array|\Sabre\HTTP\Request $request
+     * @param int $expectedStatus
      * @return \Sabre\HTTP\Response
      */
-    function request($request) {
+    function request($request, $expectedStatus = null) {
 
         if (is_array($request)) {
             $request = HTTP\Request::createFromServerArray($request);
         }
+        $response = new HTTP\ResponseMock();
+
         $this->server->httpRequest = $request;
-        $this->server->httpResponse = new HTTP\ResponseMock();
+        $this->server->httpResponse = $response;
         $this->server->exec();
 
+        if ($expectedStatus) {
+            $responseBody = $expectedStatus !== $response->getStatus() ? $response->getBodyAsString() : '';
+            $this->assertEquals($expectedStatus, $response->getStatus(), 'Incorrect HTTP status received for request. Response body: ' . $responseBody);
+        }
         return $this->server->httpResponse;
 
     }
 
+    /**
+     * This function takes a username and sets the server in a state where
+     * this user is logged in, and no longer requires an authentication check.
+     *
+     * @param string $userName
+     */
+    function autoLogin($userName) {
+        $authBackend = new DAV\Auth\Backend\Mock();
+        $authBackend->setPrincipal('principals/' . $userName);
+        $this->authPlugin = new DAV\Auth\Plugin($authBackend);
+
+        // If the auth plugin already exists, we're removing its hooks:
+        if ($oldAuth = $this->server->getPlugin('auth')) {
+            $this->server->removeListener('beforeMethod', [$oldAuth, 'beforeMethod']);
+        }
+        $this->server->addPlugin($this->authPlugin);
+
+        // This will trigger the actual login procedure
+        $this->authPlugin->beforeMethod(new Request(), new Response());
+    }
+
     /**
      * Override this to provide your own Tree for your test-case.
      */
@@ -200,10 +248,14 @@ abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
             );
         }
 
-        if ($this->setupCardDAV || $this->setupCalDAV) {
+        if ($this->setupCalDAV) {
             $this->tree[] = new CalDAV\Principal\Collection(
                 $this->principalBackend
             );
+        } elseif ($this->setupCardDAV || $this->setupACL) {
+            $this->tree[] = new DAVACL\PrincipalCollection(
+                $this->principalBackend
+            );
         }
         if ($this->setupFiles) {
 
@@ -231,7 +283,7 @@ abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
         if ($this->setupCardDAV && is_null($this->carddavBackend)) {
             $this->carddavBackend = new CardDAV\Backend\Mock($this->carddavAddressBooks, $this->carddavCards);
         }
-        if ($this->setupCardDAV || $this->setupCalDAV) {
+        if ($this->setupCardDAV || $this->setupCalDAV || $this->setupACL) {
             $this->principalBackend = new DAVACL\PrincipalBackend\Mock();
         }
         if ($this->setupLocks) {
@@ -244,7 +296,7 @@ abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
     }
 
 
-    function assertHTTPStatus($expectedStatus, HTTP\Request $req) {
+    function assertHttpStatus($expectedStatus, HTTP\Request $req) {
 
         $resp = $this->request($req);
         $this->assertEquals((int)$expectedStatus, (int)$resp->status, 'Incorrect HTTP status received: ' . $resp->body);
diff --git a/vendor/sabre/dav/tests/Sabre/TestUtil.php b/vendor/sabre/dav/tests/Sabre/TestUtil.php
index 20bce1ea0..9df94915f 100644
--- a/vendor/sabre/dav/tests/Sabre/TestUtil.php
+++ b/vendor/sabre/dav/tests/Sabre/TestUtil.php
@@ -11,17 +11,17 @@ class TestUtil {
      */
     static function clearTempDir() {
 
-        self::deleteTree(SABRE_TEMPDIR,false);
+        self::deleteTree(SABRE_TEMPDIR, false);
 
     }
 
 
-    static private function deleteTree($path,$deleteRoot = true) {
+    private static function deleteTree($path, $deleteRoot = true) {
 
-        foreach(scandir($path) as $node) {
+        foreach (scandir($path) as $node) {
 
-            if ($node=='.' || $node=='..') continue;
-            $myPath = $path.'/'. $node;
+            if ($node == '.' || $node == '..') continue;
+            $myPath = $path . '/' . $node;
             if (is_file($myPath)) {
                 unlink($myPath);
             } else {
@@ -38,8 +38,8 @@ class TestUtil {
     static function getMySQLDB() {
 
         try {
-            $pdo = new \PDO(SABRE_MYSQLDSN,SABRE_MYSQLUSER,SABRE_MYSQLPASS);
-            $pdo->setAttribute(\PDO::ATTR_ERRMODE,\PDO::ERRMODE_EXCEPTION);
+            $pdo = new \PDO(SABRE_MYSQLDSN, SABRE_MYSQLUSER, SABRE_MYSQLPASS);
+            $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
             return $pdo;
         } catch (\PDOException $e) {
             return null;
@@ -49,10 +49,23 @@ class TestUtil {
 
     static function getSQLiteDB() {
 
-        $pdo = new \PDO('sqlite:'.SABRE_TEMPDIR.'/pdobackend');
-        $pdo->setAttribute(\PDO::ATTR_ERRMODE,\PDO::ERRMODE_EXCEPTION);
+        $pdo = new \PDO('sqlite:' . SABRE_TEMPDIR . '/pdobackend');
+        $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
         return $pdo;
 
     }
 
+    static function getPgSqlDB() {
+
+        //try {
+            $pdo = new \PDO(SABRE_PGSQLDSN);
+            $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+            return $pdo;
+        //} catch (\PDOException $e) {
+        //    return null;
+        //}
+
+    }
+
+
 }
diff --git a/vendor/sabre/dav/tests/bootstrap.php b/vendor/sabre/dav/tests/bootstrap.php
index 325ccd3c7..26eb32aa2 100644
--- a/vendor/sabre/dav/tests/bootstrap.php
+++ b/vendor/sabre/dav/tests/bootstrap.php
@@ -7,28 +7,30 @@ $autoLoader = include __DIR__ . '/../vendor/autoload.php';
 // SabreDAV tests auto loading
 $autoLoader->add('Sabre\\', __DIR__);
 // VObject tests auto loading
-$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject');
-$autoLoader->addPsr4('Sabre\\Xml\\',__DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml');
+$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/../vendor/sabre/vobject/tests/VObject');
+$autoLoader->addPsr4('Sabre\\Xml\\', __DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml');
 
 date_default_timezone_set('UTC');
 
 $config = [
     'SABRE_TEMPDIR'   => dirname(__FILE__) . '/temp/',
-    'SABRE_HASSQLITE' => in_array('sqlite',PDO::getAvailableDrivers()),
-    'SABRE_HASMYSQL'  => in_array('mysql',PDO::getAvailableDrivers()),
-    'SABRE_MYSQLDSN'  => 'mysql:host=127.0.0.1;dbname=sabredav',
-    'SABRE_MYSQLUSER' => 'root',
+    'SABRE_HASSQLITE' => in_array('sqlite', PDO::getAvailableDrivers()),
+    'SABRE_HASMYSQL'  => in_array('mysql', PDO::getAvailableDrivers()),
+    'SABRE_HASPGSQL'  => in_array('pgsql', PDO::getAvailableDrivers()),
+    'SABRE_MYSQLDSN'  => 'mysql:host=127.0.0.1;dbname=sabredav_test',
+    'SABRE_MYSQLUSER' => 'sabredav',
     'SABRE_MYSQLPASS' => '',
+    'SABRE_PGSQLDSN'  => 'pgsql:host=localhost;dbname=sabredav_test;user=sabredav;password=sabredav',
 ];
 
 if (file_exists(__DIR__ . '/config.user.php')) {
     include __DIR__ . '/config.user.php';
-    foreach($userConfig as $key=>$value) {
+    foreach ($userConfig as $key => $value) {
         $config[$key] = $value;
     }
 }
 
-foreach($config as $key=>$value) {
+foreach ($config as $key => $value) {
     if (!defined($key)) define($key, $value);
 }
 
diff --git a/vendor/sabre/dav/tests/phpunit.xml b/vendor/sabre/dav/tests/phpunit.xml
deleted file mode 100644
index db475f12b..000000000
--- a/vendor/sabre/dav/tests/phpunit.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<phpunit
-  colors="true"
-  bootstrap="bootstrap.php"
-  convertErrorsToExceptions="true"
-  convertNoticesToExceptions="true"
-  convertWarningsToExceptions="true"
-  strict="true"
-  >
-  <testsuite name="sabre-event">
-      <directory>../vendor/sabre/event/tests/</directory>
-  </testsuite>
-  <testsuite name="sabre-uri">
-      <directory>../vendor/sabre/uri/tests/</directory>
-  </testsuite>
-  <testsuite name="sabre-xml">
-    <directory>../vendor/sabre/xml/tests/Sabre/Xml/</directory>
-  </testsuite>
-  <testsuite name="sabre-http">
-      <directory>../vendor/sabre/http/tests/HTTP</directory>
-  </testsuite>
-  <testsuite name="sabre-vobject">
-      <directory>../vendor/sabre/vobject/tests/VObject</directory>
-  </testsuite>
-
-  <testsuite name="sabre-dav">
-      <directory>Sabre/DAV</directory>
-  </testsuite>
-  <testsuite name="sabre-davacl">
-      <directory>Sabre/DAVACL</directory>
-  </testsuite>
-  <testsuite name="sabre-caldav">
-      <directory>Sabre/CalDAV</directory>
-  </testsuite>
-  <testsuite name="sabre-carddav">
-      <directory>Sabre/CardDAV</directory>
-  </testsuite>
-
-  <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-       <directory suffix=".php">../lib/</directory>
-       <exclude>
-         <file>../lib/Sabre/autoload.php</file>
-         <file>../lib/Sabre/VObject/includes.php</file>
-       </exclude>
-    </whitelist>
-  </filter>
-</phpunit>
diff --git a/vendor/sabre/vobject/bin/bench.php b/vendor/sabre/vobject/bin/bench.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/vobject/bin/fetch_windows_zones.php b/vendor/sabre/vobject/bin/fetch_windows_zones.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/vobject/bin/generateicalendardata.php b/vendor/sabre/vobject/bin/generateicalendardata.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/vobject/bin/mergeduplicates.php b/vendor/sabre/vobject/bin/mergeduplicates.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/xml/.travis.yml b/vendor/sabre/xml/.travis.yml
index 19a61a2c8..9bba4d451 100644
--- a/vendor/sabre/xml/.travis.yml
+++ b/vendor/sabre/xml/.travis.yml
@@ -4,6 +4,7 @@ php:
   - 5.5
   - 5.6
   - 7
+  - nightly
   - hhvm
 
 matrix:
@@ -11,10 +12,14 @@ matrix:
 
 sudo: false
 
-cache: vendor
+cache:
+  directories:
+    - $HOME/.composer/cache
 
 script:
   - ./bin/phpunit --configuration tests/phpunit.xml.dist
   - ./bin/sabre-cs-fixer fix . --dry-run --diff
 
-before_script: composer install
+before_script:
+  - phpenv config-rm xdebug.ini; true
+  - composer install
diff --git a/vendor/sabre/xml/CHANGELOG.md b/vendor/sabre/xml/CHANGELOG.md
index 3d8eb0fcb..a8085401b 100644
--- a/vendor/sabre/xml/CHANGELOG.md
+++ b/vendor/sabre/xml/CHANGELOG.md
@@ -1,6 +1,17 @@
 ChangeLog
 =========
 
+1.4.2 (????-??-??)
+------------------
+
+* The `contextStack` in the Reader object is now correctly rolled back in
+  error conditions (@staabm).
+* repeatingElements deserializer now still parses if a bare element name
+  without clark notation was given.
+* `$elementMap` in the Reader now also supports bare element names.
+* `Service::expect()` can now also work with bare element names.
+
+
 1.4.1 (2016-03-12)
 -----------------
 
diff --git a/vendor/sabre/xml/lib/Deserializer/functions.php b/vendor/sabre/xml/lib/Deserializer/functions.php
index fe88a6db8..2e5d877e9 100644
--- a/vendor/sabre/xml/lib/Deserializer/functions.php
+++ b/vendor/sabre/xml/lib/Deserializer/functions.php
@@ -14,7 +14,7 @@ use Sabre\Xml\Reader;
  * deserializer functions.
  */
 
-/*
+/**
  * The 'keyValue' deserializer parses all child elements, and outputs them as
  * a "key=>value" array.
  *
@@ -213,7 +213,7 @@ function valueObject(Reader $reader, $className, $namespace) {
 
 }
 
-/*
+/**
  * This deserializer helps you deserialize xml structures that look like
  * this:
  *
@@ -240,6 +240,9 @@ function valueObject(Reader $reader, $className, $namespace) {
  */
 function repeatingElements(Reader $reader, $childElementName) {
 
+    if ($childElementName[0] !== '{') {
+        $childElementName = '{}' . $childElementName;
+    }
     $result = [];
 
     foreach ($reader->parseGetElements() as $element) {
diff --git a/vendor/sabre/xml/lib/Reader.php b/vendor/sabre/xml/lib/Reader.php
index 7cba76c59..f35dc8537 100644
--- a/vendor/sabre/xml/lib/Reader.php
+++ b/vendor/sabre/xml/lib/Reader.php
@@ -142,7 +142,12 @@ class Reader extends XMLReader {
         // choice. See:
         //
         // https://bugs.php.net/bug.php?id=64230
-        if (!@$this->read()) return false;
+        if (!@$this->read()) {
+            if (!is_null($elementMap)) {
+                $this->popContext();
+            }
+            return false;
+        }
 
         while (true) {
 
@@ -152,6 +157,9 @@ class Reader extends XMLReader {
 
                 if ($errors) {
                     libxml_clear_errors();
+                    if (!is_null($elementMap)) {
+                        $this->popContext();
+                    }
                     throw new LibXMLException($errors);
                 }
             }
@@ -170,6 +178,9 @@ class Reader extends XMLReader {
                     $this->read();
                     break 2;
                 case self::NONE :
+                    if (!is_null($elementMap)) {
+                        $this->popContext();
+                    }
                     throw new ParseException('We hit the end of the document prematurely. This likely means that some parser "eats" too many elements. Do not attempt to continue parsing.');
                 default :
                     // Advance to the next element
@@ -282,8 +293,13 @@ class Reader extends XMLReader {
      */
     function getDeserializerForElementName($name) {
 
+
         if (!array_key_exists($name, $this->elementMap)) {
-            return ['Sabre\\Xml\\Element\\Base', 'xmlDeserialize'];
+            if (substr($name, 0, 2) == '{}' && array_key_exists(substr($name, 2), $this->elementMap)) {
+                $name = substr($name, 2);
+            } else {
+                return ['Sabre\\Xml\\Element\\Base', 'xmlDeserialize'];
+            }
         }
 
         $deserializer = $this->elementMap[$name];
diff --git a/vendor/sabre/xml/lib/Service.php b/vendor/sabre/xml/lib/Service.php
index b2603a4c7..09ee341cf 100644
--- a/vendor/sabre/xml/lib/Service.php
+++ b/vendor/sabre/xml/lib/Service.php
@@ -151,8 +151,14 @@ class Service {
         $r->contextUri = $contextUri;
         $r->xml($input);
 
+        $rootElementName = (array)$rootElementName;
+
+        foreach ($rootElementName as &$rEl) {
+            if ($rEl[0] !== '{') $rEl = '{}' . $rEl;
+        }
+
         $result = $r->parse();
-        if (!in_array($result['name'], (array)$rootElementName, true)) {
+        if (!in_array($result['name'], $rootElementName, true)) {
             throw new ParseException('Expected ' . implode(' or ', (array)$rootElementName) . ' but received ' . $result['name'] . ' as the root element');
         }
         return $result['value'];
diff --git a/view/ca/hmessages.po b/view/ca/hmessages.po
index ecb96b8f8..2eda76a7a 100644
--- a/view/ca/hmessages.po
+++ b/view/ca/hmessages.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-10 00:02-0700\n"
-"PO-Revision-Date: 2016-06-10 09:14+0000\n"
+"POT-Creation-Date: 2016-07-22 00:02-0700\n"
+"PO-Revision-Date: 2016-07-25 08:54+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Catalan (Spain) (http://www.transifex.com/Friendica/red-matrix/language/ca_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,156 @@ msgstr ""
 "Language: ca_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../../Zotlabs/Access/PermissionRoles.php:182
+#: ../../include/permissions.php:904
+msgid "Social Networking"
+msgstr "Xarxes Socials"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:183
+#: ../../include/permissions.php:904
+msgid "Social - Mostly Public"
+msgstr "Social -  Principalment Públic"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:184
+#: ../../include/permissions.php:904
+msgid "Social - Restricted"
+msgstr "Social - Restingit"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:185
+#: ../../include/permissions.php:904
+msgid "Social - Private"
+msgstr "Social - Privat"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:188
+#: ../../include/permissions.php:905
+msgid "Community Forum"
+msgstr "Foro de Comunitat"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:189
+#: ../../include/permissions.php:905
+msgid "Forum - Mostly Public"
+msgstr "Fòrum - Principalment Públic"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:190
+#: ../../include/permissions.php:905
+msgid "Forum - Restricted"
+msgstr "Fòrum - Restringit"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:191
+#: ../../include/permissions.php:905
+msgid "Forum - Private"
+msgstr "Fòrum - Privat"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:194
+#: ../../include/permissions.php:906
+msgid "Feed Republish"
+msgstr "Republicador"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:195
+#: ../../include/permissions.php:906
+msgid "Feed - Mostly Public"
+msgstr "Realimentador - Públic Principalment"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:196
+#: ../../include/permissions.php:906
+msgid "Feed - Restricted"
+msgstr "Retroalimentador - Restringit"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:199
+#: ../../include/permissions.php:907
+msgid "Special Purpose"
+msgstr "Objectiu Especial"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:200
+#: ../../include/permissions.php:907
+msgid "Special - Celebrity/Soapbox"
+msgstr "Espacial - Celebritat/Plataforma"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:201
+#: ../../include/permissions.php:907
+msgid "Special - Group Repository"
+msgstr "Especial  - Repositori d'un Grup"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:204 ../../include/selectors.php:49
+#: ../../include/selectors.php:66 ../../include/selectors.php:104
+#: ../../include/selectors.php:140 ../../include/permissions.php:908
+msgid "Other"
+msgstr "Altres"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:205
+#: ../../include/permissions.php:908
+msgid "Custom/Expert Mode"
+msgstr "Personalitzat/Manera Experta"
+
+#: ../../Zotlabs/Access/Permissions.php:30
+msgid "Can view my channel stream and posts"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:31 ../../include/permissions.php:33
+msgid "Can send me their channel stream and posts"
+msgstr "Pot enviar-me el flux i entrades del seu canal"
+
+#: ../../Zotlabs/Access/Permissions.php:32 ../../include/permissions.php:27
+msgid "Can view my default channel profile"
+msgstr "Pot veure el meu perfil del canal per defecte"
+
+#: ../../Zotlabs/Access/Permissions.php:33 ../../include/permissions.php:28
+msgid "Can view my connections"
+msgstr "Pot veure les meves connexions"
+
+#: ../../Zotlabs/Access/Permissions.php:34 ../../include/permissions.php:29
+msgid "Can view my file storage and photos"
+msgstr "Pot veure al meu magatzem d'arxius i fotos"
+
+#: ../../Zotlabs/Access/Permissions.php:35
+msgid "Can upload/modify my file storage and photos"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:36
+msgid "Can view my channel webpages"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:37
+msgid "Can create/edit my channel webpages"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:38
+msgid "Can post on my channel (wall) page"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:39 ../../include/permissions.php:35
+msgid "Can comment on or like my posts"
+msgstr "Pot fer comentaris o dir si agrada en les meves entrades"
+
+#: ../../Zotlabs/Access/Permissions.php:40 ../../include/permissions.php:36
+msgid "Can send me private mail messages"
+msgstr "Pot enviar-me un missatge de correu privat"
+
+#: ../../Zotlabs/Access/Permissions.php:41
+msgid "Can like/dislike profiles and profile things"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:42
+msgid "Can forward to all my channel connections via @+ mentions in posts"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:43
+msgid "Can chat with me"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:44 ../../include/permissions.php:44
+msgid "Can source my public posts in derived channels"
+msgstr "Pot mostrar l'origen de les meves entrades públiques en altres canals"
+
+#: ../../Zotlabs/Access/Permissions.php:45
+msgid "Can administer my channel"
+msgstr ""
+
 #: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
 msgid "parent"
-msgstr "pare"
+msgstr "amunt"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2620
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2605
 msgid "Collection"
 msgstr "Col·lecció"
 
@@ -49,16 +194,17 @@ msgstr "Programació de la bústia d'entrada"
 msgid "Schedule Outbox"
 msgstr "Programació de la bústia de sortida"
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
-#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486
-#: ../../Zotlabs/Lib/Apps.php:561 ../../include/widgets.php:1505
-#: ../../include/conversation.php:1032
+#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:796
+#: ../../Zotlabs/Module/Photos.php:1241
+#: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:490
+#: ../../Zotlabs/Lib/Apps.php:565 ../../include/conversation.php:1035
+#: ../../include/widgets.php:1599
 msgid "Unknown"
 msgstr "Desconegut"
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93
-#: ../../include/conversation.php:1639
+#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:93
+#: ../../include/conversation.php:1654
 msgid "Files"
 msgstr "Arxius"
 
@@ -71,22 +217,23 @@ msgid "Shared"
 msgstr "Compartit"
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
-#: ../../Zotlabs/Module/Webpages.php:186
+#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/New_channel.php:142
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Webpages.php:193
 msgid "Create"
 msgstr "Crear"
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1518
+#: ../../Zotlabs/Module/Photos.php:823 ../../Zotlabs/Module/Photos.php:1362
+#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1612
 msgid "Upload"
 msgstr "Pujar"
 
 #: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:247
-#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:592
-#: ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:646
+#: ../../Zotlabs/Module/Settings.php:672
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr "Nom"
@@ -96,7 +243,7 @@ msgid "Type"
 msgstr "Tipus"
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1344
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1324
 msgid "Size"
 msgstr "Mida"
 
@@ -105,34 +252,32 @@ msgstr "Mida"
 msgid "Last Modified"
 msgstr "Últim Modificat"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Editpost.php:84
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Editlayout.php:113
-#: ../../Zotlabs/Module/Editwebpage.php:146
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:187
-#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Lib/ThreadItem.php:106
-#: ../../include/channel.php:937 ../../include/channel.php:941
-#: ../../include/menu.php:108 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36
+#: ../../Zotlabs/Module/Editlayout.php:114
+#: ../../Zotlabs/Module/Editwebpage.php:145
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Settings.php:706 ../../Zotlabs/Module/Thing.php:260
+#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/page_widgets.php:9
+#: ../../include/page_widgets.php:39 ../../include/channel.php:976
+#: ../../include/channel.php:980 ../../include/menu.php:108
 msgid "Edit"
 msgstr "Edita"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Connedit.php:572
-#: ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Connedit.php:602
 #: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Editlayout.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039
+#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Photos.php:1171 ../../Zotlabs/Module/Admin.php:1039
 #: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114
-#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261
-#: ../../Zotlabs/Module/Webpages.php:189 ../../Zotlabs/Lib/Apps.php:338
-#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:657
+#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Module/Settings.php:707 ../../Zotlabs/Module/Thing.php:261
+#: ../../Zotlabs/Module/Webpages.php:196 ../../Zotlabs/Lib/Apps.php:342
+#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660
 msgid "Delete"
 msgstr "Esborra"
 
@@ -158,74 +303,73 @@ msgstr "Crea una nova carpeta"
 msgid "Upload file"
 msgstr "Puja arxiu"
 
-#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:112
+#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Module/Import_items.php:114
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../include/items.php:385
+#: ../../include/items.php:384
 msgid "Permission denied"
 msgstr "Permís denegat"
 
-#: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Channel.php:105
-#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:65
+#: ../../Zotlabs/Module/Achievements.php:34
+#: ../../Zotlabs/Module/Connedit.php:390 ../../Zotlabs/Module/Id.php:76
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Events.php:264
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Events.php:265
-#: ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Chat.php:100
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:69
-#: ../../Zotlabs/Module/Editwebpage.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Filestorage.php:24
-#: ../../Zotlabs/Module/Filestorage.php:79
-#: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:210
-#: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070
+#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:104
+#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Pdledit.php:26
+#: ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:93
+#: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
+#: ../../Zotlabs/Module/Item.php:213 ../../Zotlabs/Module/Item.php:221
+#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Photos.php:73
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:121
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Channel.php:104
+#: ../../Zotlabs/Module/Channel.php:225 ../../Zotlabs/Module/Channel.php:266
 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Notifications.php:70
-#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68
-#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203
-#: ../../Zotlabs/Module/Profiles.php:601
-#: ../../Zotlabs/Module/Profile_photo.php:256
-#: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Appman.php:75
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
+#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Profile_photo.php:265
+#: ../../Zotlabs/Module/Profile_photo.php:278
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Editblock.php:67
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
-#: ../../Zotlabs/Module/Sharedwithme.php:11
+#: ../../Zotlabs/Module/Settings.php:626 ../../Zotlabs/Module/Setup.php:215
+#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Thing.php:274
+#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:331
 #: ../../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:25
-#: ../../Zotlabs/Module/Viewconnections.php:30
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
-#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/items.php:3438
-#: ../../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/photos.php:27
+#: ../../Zotlabs/Module/Webpages.php:73
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Api.php:13
+#: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../include/photos.php:27 ../../include/attach.php:141
+#: ../../include/attach.php:189 ../../include/attach.php:252
+#: ../../include/attach.php:266 ../../include/attach.php:273
+#: ../../include/attach.php:338 ../../include/attach.php:352
+#: ../../include/attach.php:359 ../../include/attach.php:439
+#: ../../include/attach.php:901 ../../include/attach.php:972
+#: ../../include/attach.php:1124 ../../include/items.php:3448
 msgid "Permission denied."
 msgstr "Permís denegat."
 
@@ -233,9 +377,9 @@ msgstr "Permís denegat."
 msgid "Not Found"
 msgstr "No s'ha pogut trobar la pàgina"
 
-#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97
-#: ../../Zotlabs/Module/Page.php:93
+#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Display.php:118
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Help.php:97
+#: ../../Zotlabs/Module/Block.php:79
 msgid "Page not found."
 msgstr "Pàgina no trobada."
 
@@ -251,13 +395,13 @@ msgstr "Autenticació remota bloquejada. Ha iniciat sessió en aquest lloc a niv
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Benvingut %s. Autenticació remota reeixida."
 
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../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/channel.php:837
+#: ../../Zotlabs/Module/Achievements.php:15
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Layouts.php:31
+#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:33
+#: ../../include/channel.php:876
 msgid "Requested profile is not available."
 msgstr "El perfil demanat no està disponible."
 
@@ -265,229 +409,6 @@ msgstr "El perfil demanat no està disponible."
 msgid "Some blurb about what to do when you're new here"
 msgstr "Algunes propostes sobre el que cal fer quan ets nou aquí"
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152
-#: ../../Zotlabs/Module/Editblock.php:108
-msgid "Block Name"
-msgstr "Nom del Bloc"
-
-#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2265
-msgid "Blocks"
-msgstr "Bloc"
-
-#: ../../Zotlabs/Module/Blocks.php:153
-msgid "Block Title"
-msgstr "Títol del bloc"
-
-#: ../../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 "Creat"
-
-#: ../../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 "Editat"
-
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
-#: ../../include/conversation.php:1208
-msgid "Share"
-msgstr "Compartir"
-
-#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193
-#: ../../include/page_widgets.php:39
-msgid "View"
-msgstr "Mostra"
-
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Block.php:43
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
-msgid "Channel not found."
-msgstr "Canal no trobat."
-
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr "Permís denegat."
-
-#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
-msgid "l, F j"
-msgstr "l, F j"
-
-#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
-#: ../../include/text.php:1732
-msgid "Link to Source"
-msgstr "Enllaç a la Font"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Edit Event"
-msgstr "Editar l'Esdeveniment"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Create Event"
-msgstr "Crear Esdeveniment"
-
-#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
-#: ../../Zotlabs/Module/Photos.php:949
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
-#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
-msgid "Next"
-msgstr "Pròxim"
-
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
-#: ../../include/widgets.php:755
-msgid "Export"
-msgstr "Exporta"
-
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
-#: ../../include/widgets.php:756
-msgid "Import"
-msgstr "Importar"
-
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Import.php:550
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Photos.php:677
-#: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
-#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032
-#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421
-#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733
-#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Appman.php:126
-#: ../../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:312
-#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
-#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:757
-#: ../../include/widgets.php:769 ../../include/js_strings.php:22
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Submit"
-msgstr "Enviar"
-
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
-msgid "Today"
-msgstr "Avui"
-
-#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
-msgid "You must be logged in to see this page."
-msgstr "Has d'estar identificat per a veure aquesta pàgina."
-
-#: ../../Zotlabs/Module/Channel.php:41
-msgid "Posts and comments"
-msgstr "Entrades i comentaris"
-
-#: ../../Zotlabs/Module/Channel.php:42
-msgid "Only posts"
-msgstr "Només entrades"
-
-#: ../../Zotlabs/Module/Channel.php:102
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Permisos insuficients. Petició redirigida a la pàgina del perfil."
-
-#: ../../Zotlabs/Module/Chat.php:181
-msgid "Room not found"
-msgstr "No s'ha trobat la sala"
-
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "Leave Room"
-msgstr "Abandona la sala"
-
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "Delete Room"
-msgstr "Esborra Sala"
-
-#: ../../Zotlabs/Module/Chat.php:199
-msgid "I am away right now"
-msgstr "Absent"
-
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "I am online"
-msgstr "Estic connectat/da"
-
-#: ../../Zotlabs/Module/Chat.php:202
-msgid "Bookmark this room"
-msgstr "Fes favorit aquest xat"
-
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
-#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176
-msgid "Please enter a link URL:"
-msgstr "Si us plau entra l'enllaç URL:"
-
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
-#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
-#: ../../include/conversation.php:1256
-msgid "Encrypt text"
-msgstr "Text encriptat"
-
-#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143
-msgid "Insert web link"
-msgstr "Insereix enllaç web"
-
-#: ../../Zotlabs/Module/Chat.php:218
-msgid "Feature disabled."
-msgstr "Funcionalitat desactivada."
-
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "New Chatroom"
-msgstr "Nova sala per a Xerrar"
-
-#: ../../Zotlabs/Module/Chat.php:233
-msgid "Chatroom name"
-msgstr "Nom de la sala de xat"
-
-#: ../../Zotlabs/Module/Chat.php:234
-msgid "Expiration of chats (minutes)"
-msgstr "Expiració dels chats (minuts)"
-
-#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
-#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
-#: ../../include/acl_selectors.php:283
-msgid "Permissions"
-msgstr "Permisos "
-
-#: ../../Zotlabs/Module/Chat.php:246
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "%1$s de Xats"
-
-#: ../../Zotlabs/Module/Chat.php:251
-msgid "No chatrooms available"
-msgstr "No hi ha sales de xat disponibles"
-
-#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Create New"
-msgstr "Crear Nou"
-
-#: ../../Zotlabs/Module/Chat.php:255
-msgid "Expiration"
-msgstr "Expiració"
-
-#: ../../Zotlabs/Module/Chat.php:256
-msgid "min"
-msgstr "min"
-
 #: ../../Zotlabs/Module/Chatsvc.php:117
 msgid "Away"
 msgstr "Absent"
@@ -496,65 +417,6 @@ msgstr "Absent"
 msgid "Online"
 msgstr "En connexió"
 
-#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40
-msgid "Invalid item."
-msgstr "Article invàlid."
-
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
-msgstr "Favorit afegit"
-
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
-msgstr "Els Meus Favorits"
-
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
-msgstr "Les connexions dels meus Favorits"
-
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
-msgstr "Continua"
-
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
-msgstr "Configuració de Canals Premium"
-
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
-msgstr "Habilita les restriccions de connexió del canal premium"
-
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Si us plau, introdueixi les restriccions o condicions, com ara el rebut de PayPal, les pautes d'ús, etc."
-
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Aquest canal pot requerir passos addicionals o reconeixement de les següents condicions abans de connectar:"
-
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Connexions potencials veuran el següent text abans de continuar:"
-
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "En continuar, certifico que he complert amb totes les instruccions proporcionades en aquesta pàgina."
-
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(No s'han proporcionat instruccions específiques pel propietari del canal.)"
-
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
-msgstr "Canal Restringit o Premium"
-
 #: ../../Zotlabs/Module/Connedit.php:80
 msgid "Could not access contact record."
 msgstr "No s'ha pogut accedir al llibre de contactes."
@@ -563,317 +425,350 @@ msgstr "No s'ha pogut accedir al llibre de contactes."
 msgid "Could not locate selected profile."
 msgstr "No s'ha trobat el perfil indicat."
 
-#: ../../Zotlabs/Module/Connedit.php:227
+#: ../../Zotlabs/Module/Connedit.php:248
 msgid "Connection updated."
 msgstr "S'ha actualitzat la connexió."
 
-#: ../../Zotlabs/Module/Connedit.php:229
+#: ../../Zotlabs/Module/Connedit.php:250
 msgid "Failed to update connection record."
 msgstr "No s'ha pogut actualitzar el registre de connexió."
 
-#: ../../Zotlabs/Module/Connedit.php:276
+#: ../../Zotlabs/Module/Connedit.php:300
 msgid "is now connected to"
 msgstr "Ara està conectat amb"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89
-#: ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:459
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Connedit.php:685
+#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:459 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:89
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "No"
 msgstr "No"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
-#: ../../Zotlabs/Module/Api.php:88 ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:461
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:461 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:88
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "Yes"
 msgstr "Sí"
 
-#: ../../Zotlabs/Module/Connedit.php:411
+#: ../../Zotlabs/Module/Connedit.php:435
 msgid "Could not access address book record."
 msgstr "No puc accedir al registre del contacte"
 
-#: ../../Zotlabs/Module/Connedit.php:425
+#: ../../Zotlabs/Module/Connedit.php:455
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Ha fallat la recàrrega - el canal es actualment inaccesible."
 
-#: ../../Zotlabs/Module/Connedit.php:440 ../../Zotlabs/Module/Connedit.php:449
-#: ../../Zotlabs/Module/Connedit.php:458 ../../Zotlabs/Module/Connedit.php:467
-#: ../../Zotlabs/Module/Connedit.php:480
+#: ../../Zotlabs/Module/Connedit.php:470 ../../Zotlabs/Module/Connedit.php:479
+#: ../../Zotlabs/Module/Connedit.php:488 ../../Zotlabs/Module/Connedit.php:497
+#: ../../Zotlabs/Module/Connedit.php:510
 msgid "Unable to set address book parameters."
 msgstr "No es poden ajustar els paràmetres dels contactes."
 
-#: ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:533
 msgid "Connection has been removed."
 msgstr "S'han eliminat les conexions."
 
-#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219
-#: ../../include/nav.php:86 ../../include/conversation.php:954
+#: ../../Zotlabs/Module/Connedit.php:549 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:86 ../../include/conversation.php:957
 msgid "View Profile"
 msgstr "Veure Perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:522
+#: ../../Zotlabs/Module/Connedit.php:552
 #, php-format
 msgid "View %s's profile"
 msgstr "Mostra el perfil de %s"
 
-#: ../../Zotlabs/Module/Connedit.php:526
+#: ../../Zotlabs/Module/Connedit.php:556
 msgid "Refresh Permissions"
 msgstr "Recarrega els Permissos"
 
-#: ../../Zotlabs/Module/Connedit.php:529
+#: ../../Zotlabs/Module/Connedit.php:559
 msgid "Fetch updated permissions"
 msgstr "Obté els permisos actualitzats"
 
-#: ../../Zotlabs/Module/Connedit.php:533
+#: ../../Zotlabs/Module/Connedit.php:563
 msgid "Recent Activity"
 msgstr "Activitat Recent"
 
-#: ../../Zotlabs/Module/Connedit.php:536
+#: ../../Zotlabs/Module/Connedit.php:566
 msgid "View recent posts and comments"
 msgstr "Mostra les entrades i comentaris recents"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1041
 msgid "Unblock"
 msgstr "Desbloquejat"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1040
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1040
 msgid "Block"
 msgstr "Bloquejat"
 
-#: ../../Zotlabs/Module/Connedit.php:543
+#: ../../Zotlabs/Module/Connedit.php:573
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Boqueja (o Desbloqueja) les comunicacions amb aquesta connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:544
+#: ../../Zotlabs/Module/Connedit.php:574
 msgid "This connection is blocked!"
 msgstr "Aquesta connexió està bloquejada!"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 msgid "Unignore"
 msgstr "Inhabilita"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 #: ../../Zotlabs/Module/Connections.php:277
 #: ../../Zotlabs/Module/Notifications.php:55
 msgid "Ignore"
 msgstr "Ignora"
 
-#: ../../Zotlabs/Module/Connedit.php:551
+#: ../../Zotlabs/Module/Connedit.php:581
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignora (o Considera) les communicacions entrants d'aquesta connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:552
+#: ../../Zotlabs/Module/Connedit.php:582
 msgid "This connection is ignored!"
 msgstr "Aquesta connexió es ignorada!"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Unarchive"
 msgstr "Desarxiva"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Archive"
 msgstr "Arxiva"
 
-#: ../../Zotlabs/Module/Connedit.php:559
+#: ../../Zotlabs/Module/Connedit.php:589
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Arxiva (o Desarxiva) aquesta connexió - Marca el canal com a mort pero manté el contingut "
 
-#: ../../Zotlabs/Module/Connedit.php:560
+#: ../../Zotlabs/Module/Connedit.php:590
 msgid "This connection is archived!"
 msgstr "Aquesta connexió està arxivada!"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Unhide"
 msgstr "Mostra"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Hide"
 msgstr "Amaga"
 
-#: ../../Zotlabs/Module/Connedit.php:567
+#: ../../Zotlabs/Module/Connedit.php:597
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Amaga (o Mostra) aquesta connexió de les altres connexions teves"
 
-#: ../../Zotlabs/Module/Connedit.php:568
+#: ../../Zotlabs/Module/Connedit.php:598
 msgid "This connection is hidden!"
 msgstr "Aquesta connexió està amagada!"
 
-#: ../../Zotlabs/Module/Connedit.php:575
+#: ../../Zotlabs/Module/Connedit.php:605
 msgid "Delete this connection"
 msgstr "Elimina aquesta connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493
+#: ../../Zotlabs/Module/Connedit.php:620 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Jo"
 
-#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494
+#: ../../Zotlabs/Module/Connedit.php:621 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Família"
 
-#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342
-#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
-#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
-#: ../../include/widgets.php:495 ../../include/selectors.php:123
-#: ../../include/channel.php:389 ../../include/channel.php:390
-#: ../../include/channel.php:397
+#: ../../Zotlabs/Module/Connedit.php:622 ../../Zotlabs/Module/Settings.php:391
+#: ../../Zotlabs/Module/Settings.php:395 ../../Zotlabs/Module/Settings.php:396
+#: ../../Zotlabs/Module/Settings.php:399 ../../Zotlabs/Module/Settings.php:410
+#: ../../include/channel.php:402 ../../include/channel.php:403
+#: ../../include/channel.php:410 ../../include/selectors.php:123
+#: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "Amics"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496
+#: ../../Zotlabs/Module/Connedit.php:623 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Coneguts"
 
-#: ../../Zotlabs/Module/Connedit.php:594
+#: ../../Zotlabs/Module/Connedit.php:624
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
 msgid "All"
 msgstr "Tots"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Approve this connection"
 msgstr "Apccepta aquesta connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Accept connection to allow communication"
 msgstr "Accepta la connexió per permetre la comunicació"
 
-#: ../../Zotlabs/Module/Connedit.php:659
+#: ../../Zotlabs/Module/Connedit.php:690
 msgid "Set Affinity"
 msgstr "Ajusta l'Afinitat"
 
-#: ../../Zotlabs/Module/Connedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:693
 msgid "Set Profile"
 msgstr "Ajusta el Perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Zotlabs/Module/Connedit.php:696
 msgid "Set Affinity & Profile"
 msgstr "Ajusta Afinitat i Perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:698
+#: ../../Zotlabs/Module/Connedit.php:745
 msgid "none"
 msgstr "res"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/widgets.php:623
 msgid "Connection Default Permissions"
 msgstr "Permisos per Defecte de la Connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3926
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/items.php:3935
 #, php-format
 msgid "Connection: %s"
 msgstr "Connexió: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Apply these permissions automatically"
 msgstr "Aplica aquests permissos automaticament"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Connection requests will be approved without your interaction"
 msgstr "Les peticions de connexió seran aprovades sense la teva interacció"
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Zotlabs/Module/Connedit.php:752
 msgid "This connection's primary address is"
 msgstr "La primera adreça d'aqueste connexió es"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:753
 msgid "Available locations:"
 msgstr "Localització disponible:"
 
-#: ../../Zotlabs/Module/Connedit.php:710
+#: ../../Zotlabs/Module/Connedit.php:757
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Els permisos indicats en aquesta pàgina seran aplicats a totes les noves connexions."
 
-#: ../../Zotlabs/Module/Connedit.php:711
+#: ../../Zotlabs/Module/Connedit.php:758
 msgid "Connection Tools"
 msgstr "Eines de Connexió"
 
-#: ../../Zotlabs/Module/Connedit.php:713
+#: ../../Zotlabs/Module/Connedit.php:760
 msgid "Slide to adjust your degree of friendship"
 msgstr "Llisca per ajustar el nivell d'amistat"
 
-#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159
+#: ../../Zotlabs/Module/Connedit.php:761 ../../Zotlabs/Module/Rate.php:159
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Valora"
 
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Zotlabs/Module/Connedit.php:762
 msgid "Slide to adjust your rating"
 msgstr "Llisca per ajustar la valoració"
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:763 ../../Zotlabs/Module/Connedit.php:768
 msgid "Optionally explain your rating"
 msgstr "Opcionalment pots explicar la teva valoració"
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Zotlabs/Module/Connedit.php:765
 msgid "Custom Filter"
 msgstr "Filtre a mida"
 
-#: ../../Zotlabs/Module/Connedit.php:719
+#: ../../Zotlabs/Module/Connedit.php:766
 msgid "Only import posts with this text"
 msgstr "Importa exclusivament entrades amb aquest text"
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:766 ../../Zotlabs/Module/Connedit.php:767
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "paraules una per línia o #etiquetes o /patrons/ o idioma=xx, deixar en blanc per importar totes les entrades"
 
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:767
 msgid "Do not import posts with this text"
 msgstr "No importar entrades amb aquest text"
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:769
 msgid "This information is public!"
 msgstr "Aquesta informació es pública!"
 
-#: ../../Zotlabs/Module/Connedit.php:727
+#: ../../Zotlabs/Module/Connedit.php:774
 msgid "Connection Pending Approval"
 msgstr "Connexió Pendent d'Aprovació"
 
-#: ../../Zotlabs/Module/Connedit.php:730
+#: ../../Zotlabs/Module/Connedit.php:777
 msgid "inherited"
 msgstr "heretat"
 
-#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Module/Connedit.php:778 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:238
+#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Pdledit.php:66
+#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Import.php:560
+#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Mail.php:370 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771
+#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1211
+#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Admin.php:1648
+#: ../../Zotlabs/Module/Admin.php:1733 ../../Zotlabs/Module/Admin.php:2116
+#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Settings.php:644
+#: ../../Zotlabs/Module/Settings.php:757 ../../Zotlabs/Module/Settings.php:806
+#: ../../Zotlabs/Module/Settings.php:832 ../../Zotlabs/Module/Settings.php:855
+#: ../../Zotlabs/Module/Settings.php:943
+#: ../../Zotlabs/Module/Settings.php:1129 ../../Zotlabs/Module/Setup.php:312
+#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Thing.php:316
+#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:763
+#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:99
+msgid "Submit"
+msgstr "Enviar"
+
+#: ../../Zotlabs/Module/Connedit.php:779
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Tria el perfil que vols mostrar a %s quan es vegi el perfil segur."
 
-#: ../../Zotlabs/Module/Connedit.php:734
+#: ../../Zotlabs/Module/Connedit.php:781
 msgid "Their Settings"
 msgstr "Els seus Ajustos"
 
-#: ../../Zotlabs/Module/Connedit.php:735
+#: ../../Zotlabs/Module/Connedit.php:782
 msgid "My Settings"
 msgstr "Els Meus Ajustos"
 
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:784
 msgid "Individual Permissions"
 msgstr "Permisos Individuals"
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Zotlabs/Module/Connedit.php:785
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -881,7 +776,7 @@ msgid ""
 " settings here."
 msgstr "Alguns permisos poden ser heretats dels teus canals <a href=\"settings\"><strong>ajustos de privacitat</strong></a>, Els quals tenen més prioritat que els ajustos individuals. <strong>No</strong> pots canviar aquests ajustos aquí."
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Zotlabs/Module/Connedit.php:786
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -889,17 +784,121 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Alguns permisos poden ser heretats dels teus canals <a href=\"settings\"><strong>ajustos de privacitat</strong></a>, Els quals tenen més prioritat que els ajustos individuals. <strong>Pots</strong> canviar aquests ajustos aquí pero no tindran cap impacte fins que no canviis els ajustos heretats."
 
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Connedit.php:787
 msgid "Last update:"
 msgstr "Darrera actualització:"
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Directory.php:63
+#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:20
+#: ../../Zotlabs/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr "Accés públic denegat."
 
+#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:32
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
+#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3369
+msgid "Item not found."
+msgstr "Element no trobat."
+
+#: ../../Zotlabs/Module/Id.php:13
+msgid "First Name"
+msgstr "Nom"
+
+#: ../../Zotlabs/Module/Id.php:14
+msgid "Last Name"
+msgstr "Cognoms"
+
+#: ../../Zotlabs/Module/Id.php:15
+msgid "Nickname"
+msgstr "Àlies"
+
+#: ../../Zotlabs/Module/Id.php:16
+msgid "Full Name"
+msgstr "Nom Sencer"
+
+#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../include/network.php:2203
+msgid "Email"
+msgstr "Correu electrónic"
+
+#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
+#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:238
+msgid "Profile Photo"
+msgstr "Foto del Perfil"
+
+#: ../../Zotlabs/Module/Id.php:22
+msgid "Profile Photo 16px"
+msgstr "Foto del Perfil 16px"
+
+#: ../../Zotlabs/Module/Id.php:23
+msgid "Profile Photo 32px"
+msgstr "Foto del Perfil 32px"
+
+#: ../../Zotlabs/Module/Id.php:24
+msgid "Profile Photo 48px"
+msgstr "Foto del Perfil 48px"
+
+#: ../../Zotlabs/Module/Id.php:25
+msgid "Profile Photo 64px"
+msgstr "Foto del Perfil 64px"
+
+#: ../../Zotlabs/Module/Id.php:26
+msgid "Profile Photo 80px"
+msgstr "Foto del Perfil 80px"
+
+#: ../../Zotlabs/Module/Id.php:27
+msgid "Profile Photo 128px"
+msgstr "Foto del Perfil 128px"
+
+#: ../../Zotlabs/Module/Id.php:28
+msgid "Timezone"
+msgstr "Zona horària"
+
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
+msgid "Homepage URL"
+msgstr "URL de la pàgina d'inici"
+
+#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:236
+msgid "Language"
+msgstr "Idioma"
+
+#: ../../Zotlabs/Module/Id.php:31
+msgid "Birth Year"
+msgstr "Any de Naixement"
+
+#: ../../Zotlabs/Module/Id.php:32
+msgid "Birth Month"
+msgstr "Mes de Naixement"
+
+#: ../../Zotlabs/Module/Id.php:33
+msgid "Birth Day"
+msgstr "Dia de Naixement"
+
+#: ../../Zotlabs/Module/Id.php:34
+msgid "Birthdate"
+msgstr "Aniversari"
+
+#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
+msgid "Gender"
+msgstr "Gènere"
+
+#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Male"
+msgstr "Masculí"
+
+#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Female"
+msgstr "Femení"
+
+#: ../../Zotlabs/Module/Follow.php:34
+msgid "Channel added."
+msgstr "S'ha afegit el canal."
+
 #: ../../Zotlabs/Module/Directory.php:243
 #, php-format
 msgid "%d rating"
@@ -919,12 +918,12 @@ msgstr "Estatus:"
 msgid "Homepage: "
 msgstr "Pàgina Personal:"
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1223
 msgid "Age:"
 msgstr "Edat:"
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
-#: ../../include/event.php:84 ../../include/channel.php:1027
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/channel.php:1066
+#: ../../include/event.php:52 ../../include/event.php:84
 #: ../../include/bb2diaspora.php:507
 msgid "Location:"
 msgstr "Localització:"
@@ -933,18 +932,18 @@ msgstr "Localització:"
 msgid "Description:"
 msgstr "Descripció:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1239
 msgid "Hometown:"
 msgstr "Ciutat Natal:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1247
 msgid "About:"
 msgstr "Sobre:"
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147
-#: ../../include/widgets.php:184 ../../include/connections.php:78
-#: ../../include/conversation.php:956 ../../include/channel.php:1012
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1051
+#: ../../include/connections.php:78 ../../include/conversation.php:959
+#: ../../include/widgets.php:147 ../../include/widgets.php:184
 msgid "Connect"
 msgstr "Connecta "
 
@@ -1020,38 +1019,322 @@ msgstr "De més Antic a més Nou"
 msgid "No entries (some entries may be hidden)."
 msgstr "Sense entrades (algunes podrien estar amagades)."
 
-#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
-#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3359
-msgid "Item not found."
-msgstr "Element no trobat."
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
+msgstr "Continua"
+
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
+msgstr "Configuració de Canals Premium"
+
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
+msgstr "Habilita les restriccions de connexió del canal premium"
+
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Si us plau, introdueixi les restriccions o condicions, com ara el rebut de PayPal, les pautes d'ús, etc."
+
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Aquest canal pot requerir passos addicionals o reconeixement de les següents condicions abans de connectar:"
+
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Connexions potencials veuran el següent text abans de continuar:"
+
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "En continuar, certifico que he complert amb totes les instruccions proporcionades en aquesta pàgina."
+
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(No s'han proporcionat instruccions específiques pel propietari del canal.)"
+
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
+msgstr "Canal Restringit o Premium"
+
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
+msgstr "Entrades de Calendari importades."
+
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+msgstr "No es troben entrades decalendari."
+
+#: ../../Zotlabs/Module/Events.php:104
+msgid "Event can not end before it has started."
+msgstr "L'esdeveniment ha de començar abans d'acabar."
+
+#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
+#: ../../Zotlabs/Module/Events.php:135
+msgid "Unable to generate preview."
+msgstr "No s'ha pogut generar la vista prèvia."
+
+#: ../../Zotlabs/Module/Events.php:113
+msgid "Event title and start time are required."
+msgstr "Cal indicar l'inici i el final de l'esdeveniment."
+
+#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
+msgid "Event not found."
+msgstr "No s'ha trobat l'esdeveniment."
+
+#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:372
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
+#: ../../include/text.php:1924 ../../include/event.php:951
+msgid "event"
+msgstr "succés"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Edit event title"
+msgstr "Edita el títol d'esdeveniment"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Event title"
+msgstr "Títol esdeveniment"
+
+#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
+#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
+#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
+#: ../../include/datetime.php:245
+msgid "Required"
+msgstr "Requerit"
+
+#: ../../Zotlabs/Module/Events.php:450
+msgid "Categories (comma-separated list)"
+msgstr "Categories (llista separada per comes)"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Edit Category"
+msgstr "Editar Categoria"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Category"
+msgstr "Categoria"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Edit start date and time"
+msgstr "Editar data i hora d'inici"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Start date and time"
+msgstr "Data i hora d'inici"
+
+#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
+msgid "Finish date and time are not known or not relevant"
+msgstr "L'ora de finalització no es coneix o es irrelevant."
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Edit finish date and time"
+msgstr "Editar la data i hora de finalització"
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Finish date and time"
+msgstr "Data i hora de finalització"
+
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+msgid "Adjust for viewer timezone"
+msgstr "Ajusta a la zona horària del visitant."
+
+#: ../../Zotlabs/Module/Events.php:459
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
+msgstr "És important per esdeveniments locals, però pels globals no és pràctic."
+
+#: ../../Zotlabs/Module/Events.php:461
+msgid "Edit Description"
+msgstr "Editar la Descripció"
+
+#: ../../Zotlabs/Module/Events.php:461 ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Rbmark.php:101
+msgid "Description"
+msgstr "Descripció"
+
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Location"
+msgstr "Editar la localització"
+
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Profiles.php:477
+#: ../../Zotlabs/Module/Profiles.php:698 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
+msgid "Location"
+msgstr "Localització"
+
+#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
+msgid "Share this event"
+msgstr "Comparteix aquest esdeveniment"
+
+#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1091
+#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Lib/ThreadItem.php:719
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1198
+msgid "Preview"
+msgstr "Avanç"
+
+#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1247
+msgid "Permission settings"
+msgstr "Ajustos de permisos"
+
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Advanced Options"
+msgstr "Opcions Avançades"
+
+#: ../../Zotlabs/Module/Events.php:587 ../../Zotlabs/Module/Cal.php:259
+msgid "l, F j"
+msgstr "l, j \\d\\e/\\d' F"
+
+#: ../../Zotlabs/Module/Events.php:609
+msgid "Edit event"
+msgstr "Edita l'esdeveniment"
+
+#: ../../Zotlabs/Module/Events.php:611
+msgid "Delete event"
+msgstr "Esborra l'esdeveniment"
+
+#: ../../Zotlabs/Module/Events.php:636 ../../Zotlabs/Module/Cal.php:308
+#: ../../include/text.php:1712
+msgid "Link to Source"
+msgstr "Enllaç a la Font"
+
+#: ../../Zotlabs/Module/Events.php:645
+msgid "calendar"
+msgstr "calendari"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Edit Event"
+msgstr "Editar l'Esdeveniment"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Create Event"
+msgstr "Crear Esdeveniment"
+
+#: ../../Zotlabs/Module/Events.php:665 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
+#: ../../Zotlabs/Module/Photos.php:947
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:675
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
+#: ../../Zotlabs/Module/Photos.php:956 ../../Zotlabs/Module/Setup.php:267
+msgid "Next"
+msgstr "Pròxim"
+
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Cal.php:334
+msgid "Export"
+msgstr "Exporta"
+
+#: ../../Zotlabs/Module/Events.php:670 ../../Zotlabs/Module/Layouts.php:197
+#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Webpages.php:200 ../../include/page_widgets.php:42
+msgid "View"
+msgstr "Mostra"
+
+#: ../../Zotlabs/Module/Events.php:671
+msgid "Month"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:672
+msgid "Week"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:673
+msgid "Day"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:341
+msgid "Today"
+msgstr "Avui"
+
+#: ../../Zotlabs/Module/Events.php:707
+msgid "Event removed"
+msgstr "S'ha eliminat l'esdeveniment"
+
+#: ../../Zotlabs/Module/Events.php:710
+msgid "Failed to remove event"
+msgstr "No s'ha pogut esborrar l'esdeveniment"
+
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
+msgstr "Favorit afegit"
+
+#: ../../Zotlabs/Module/Bookmarks.php:75
+msgid "My Bookmarks"
+msgstr "Els Meus Favorits"
+
+#: ../../Zotlabs/Module/Bookmarks.php:86
+msgid "My Connections Bookmarks"
+msgstr "Les connexions dels meus Favorits"
 
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 #: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:81
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 msgid "Item not found"
 msgstr "No s'ha trobat l'element"
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228
-msgid "Title (optional)"
-msgstr "Títol (opcional)"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
+msgstr "Article no editable"
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
-msgstr "Editar Bloc"
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:134
+msgid "Edit post"
+msgstr "Modifica l'entrada"
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
-msgstr "No s'ha trobat el canal"
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222
+#: ../../include/nav.php:92 ../../include/conversation.php:1647
+msgid "Photos"
+msgstr "Fotos"
 
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
-msgstr "Connexions en comú"
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:645
+#: ../../Zotlabs/Module/Settings.php:671 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Wiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:202 ../../include/conversation.php:1235
+#: ../../include/conversation.php:1274
+msgid "Cancel"
+msgstr "Cancel·la"
 
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
-msgstr "No hi ha connexions en comú."
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
+msgstr "Article invàlid."
+
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Wall_upload.php:33
+msgid "Channel not found."
+msgstr "Canal no trobat."
+
+#: ../../Zotlabs/Module/Page.php:131
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
+" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Save to Folder:"
+msgstr "Guardar en la Carpeta"
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "- select -"
+msgstr "- selecciona -"
+
+#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
+#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:926
+#: ../../include/text.php:938 ../../include/widgets.php:201
+msgid "Save"
+msgstr "Guardar"
 
 #: ../../Zotlabs/Module/Connections.php:56
 #: ../../Zotlabs/Module/Connections.php:161
@@ -1079,7 +1362,7 @@ msgstr "Arxivades"
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1535
+#: ../../include/conversation.php:1550
 msgid "New"
 msgstr "Nou"
 
@@ -1166,15 +1449,15 @@ msgstr "Ignorar connexió"
 msgid "Recent activity"
 msgstr "Activitat recent"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
-#: ../../include/text.php:875 ../../include/nav.php:186
+#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209
+#: ../../include/nav.php:188 ../../include/text.php:855
 msgid "Connections"
 msgstr "Connexions"
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:228 ../../include/text.php:945
-#: ../../include/text.php:957 ../../include/nav.php:165
-#: ../../include/acl_selectors.php:276
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:167
+#: ../../include/text.php:925 ../../include/text.php:937
+#: ../../include/acl_selectors.php:274
 msgid "Search"
 msgstr "Cerca"
 
@@ -1187,7 +1470,7 @@ msgid "Connections search"
 msgstr "Cerca connexions"
 
 #: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:79
+#: ../../Zotlabs/Module/Profile_photo.php:61
 msgid "Image uploaded but image cropping failed."
 msgstr "S'ha pujat la imatge però no s'ha pogut retallar."
 
@@ -1197,66 +1480,66 @@ msgid "Cover Photos"
 msgstr "Fotos de Portada"
 
 #: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:133
+#: ../../Zotlabs/Module/Profile_photo.php:135
 msgid "Image resize failed."
 msgstr "No s'ha pogut escalar la imatge."
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144
+#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:148
 msgid "Unable to process image"
 msgstr "incapaç de processar la imatge"
 
 #: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:217
+#: ../../Zotlabs/Module/Profile_photo.php:223
 msgid "Image upload failed."
 msgstr "La pujada de la imatge va fracassar."
 
 #: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:236
+#: ../../Zotlabs/Module/Profile_photo.php:242
 msgid "Unable to process image."
 msgstr "Incapaç de processar l'imatge."
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4270
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4283
 msgid "female"
 msgstr "femení"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4271
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4284
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s actualitzà el seu %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4272
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4285
 msgid "male"
 msgstr "masculí"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4273
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4286
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s actualitzà el seu %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4275
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4288
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s actualitzà els seus %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1661
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1726
 msgid "cover photo"
 msgstr "Foto de la portada"
 
 #: ../../Zotlabs/Module/Cover_photo.php:303
 #: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:283
-#: ../../Zotlabs/Module/Profile_photo.php:324
+#: ../../Zotlabs/Module/Profile_photo.php:300
+#: ../../Zotlabs/Module/Profile_photo.php:341
 msgid "Photo not available."
 msgstr "Foto no disponible."
 
 #: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:387
 msgid "Upload File:"
 msgstr "Puja Arxiu:"
 
 #: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:366
+#: ../../Zotlabs/Module/Profile_photo.php:388
 msgid "Select a profile:"
 msgstr "Tria un perfil:"
 
@@ -1265,200 +1548,69 @@ msgid "Upload Cover Photo"
 msgstr "Puja Foto de Portada"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:985
+#: ../../Zotlabs/Module/Profile_photo.php:396
+#: ../../Zotlabs/Module/Settings.php:1080
 msgid "or"
 msgstr "o"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "skip this step"
 msgstr "salta aquest pas"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "select a photo from your photo albums"
 msgstr "tria una foto del teu àlbum de fotos"
 
 #: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Profile_photo.php:415
 msgid "Crop Image"
 msgstr "Retalla Imatge"
 
 #: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:391
+#: ../../Zotlabs/Module/Profile_photo.php:416
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Si us plau, retalla la imatge per a una optima visualització"
 
 #: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:393
+#: ../../Zotlabs/Module/Profile_photo.php:418
 msgid "Done Editing"
 msgstr "Edició Feta"
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
-msgstr "Article no editable"
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
+msgid "webpage"
+msgstr "pàgina web"
 
-#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
-msgid "Edit post"
-msgstr "Modifica l'entrada"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
+msgid "block"
+msgstr "bloc"
 
-#: ../../Zotlabs/Module/Events.php:26
-msgid "Calendar entries imported."
-msgstr "Entrades de Calendari importades."
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
+msgid "layout"
+msgstr "disposició"
 
-#: ../../Zotlabs/Module/Events.php:28
-msgid "No calendar entries found."
-msgstr "No es troben entrades decalendari."
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
+msgid "menu"
+msgstr "menú"
 
-#: ../../Zotlabs/Module/Events.php:105
-msgid "Event can not end before it has started."
-msgstr "L'esdeveniment ha de començar abans d'acabar."
+#: ../../Zotlabs/Module/Impel.php:187
+#, php-format
+msgid "%s element installed"
+msgstr "%s element instal·lat"
 
-#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116
-#: ../../Zotlabs/Module/Events.php:136
-msgid "Unable to generate preview."
-msgstr "No s'ha pogut generar la vista prèvia."
+#: ../../Zotlabs/Module/Impel.php:190
+#, php-format
+msgid "%s element installation failed"
+msgstr "%s instal·lació d'element va fallar"
 
-#: ../../Zotlabs/Module/Events.php:114
-msgid "Event title and start time are required."
-msgstr "Cal indicar l'inici i el final de l'esdeveniment."
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
+msgstr "Permís denegat."
 
-#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
-msgid "Event not found."
-msgstr "No s'ha trobat l'esdeveniment."
-
-#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949
-#: ../../include/text.php:1943 ../../include/conversation.php:123
-msgid "event"
-msgstr "succés"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Edit event title"
-msgstr "Edita el títol d'esdeveniment"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Event title"
-msgstr "Títol esdeveniment"
-
-#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
-#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
-#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
-#: ../../include/datetime.php:245
-msgid "Required"
-msgstr "Requerit"
-
-#: ../../Zotlabs/Module/Events.php:451
-msgid "Categories (comma-separated list)"
-msgstr "Categories (llista separada per comes)"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Edit Category"
-msgstr "Editar Categoria"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Category"
-msgstr "Categoria"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Edit start date and time"
-msgstr "Editar data i hora d'inici"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Start date and time"
-msgstr "Data i hora d'inici"
-
-#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459
-msgid "Finish date and time are not known or not relevant"
-msgstr "L'ora de finalització no es coneix o es irrelevant."
-
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Edit finish date and time"
-msgstr "Editar la data i hora de finalització"
-
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Finish date and time"
-msgstr "Data i hora de finalització"
-
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
-msgid "Adjust for viewer timezone"
-msgstr "Ajusta a la zona horària del visitant."
-
-#: ../../Zotlabs/Module/Events.php:460
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr "És important per esdeveniments locals, però pels globals no és pràctic."
-
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Edit Description"
-msgstr "Editar la Descripció"
-
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117
-#: ../../Zotlabs/Module/Rbmark.php:101
-msgid "Description"
-msgstr "Descripció"
-
-#: ../../Zotlabs/Module/Events.php:464
-msgid "Edit Location"
-msgstr "Editar la localització"
-
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
-#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
-msgid "Location"
-msgstr "Localització"
-
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
-msgid "Share this event"
-msgstr "Comparteix aquest esdeveniment"
-
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:719
-#: ../../include/conversation.php:1187 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr "Avanç"
-
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232
-msgid "Permission settings"
-msgstr "Ajustos de permisos"
-
-#: ../../Zotlabs/Module/Events.php:476
-msgid "Advanced Options"
-msgstr "Opcions Avançades"
-
-#: ../../Zotlabs/Module/Events.php:610
-msgid "Edit event"
-msgstr "Edita l'esdeveniment"
-
-#: ../../Zotlabs/Module/Events.php:612
-msgid "Delete event"
-msgstr "Esborra l'esdeveniment"
-
-#: ../../Zotlabs/Module/Events.php:646
-msgid "calendar"
-msgstr "calendari"
-
-#: ../../Zotlabs/Module/Events.php:706
-msgid "Event removed"
-msgstr "S'ha eliminat l'esdeveniment"
-
-#: ../../Zotlabs/Module/Events.php:709
-msgid "Failed to remove event"
-msgstr "No s'ha pogut esborrar l'esdeveniment"
-
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220
-#: ../../include/nav.php:92 ../../include/conversation.php:1632
-msgid "Photos"
-msgstr "Fotos"
-
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591
-#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259
-msgid "Cancel"
-msgstr "Cancel·la"
+#: ../../Zotlabs/Module/Cal.php:337
+msgid "Import"
+msgstr "Importar"
 
 #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
 msgid "This site is not a directory server"
@@ -1468,112 +1620,184 @@ msgstr "Aquest lloc web no és un servidor de directori"
 msgid "This directory server requires an access token"
 msgstr "Aquest servidor de directori requereix un token de accès"
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
-msgstr "Guardar en la Carpeta"
+#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:28
+#: ../../Zotlabs/Module/Wiki.php:20
+msgid "You must be logged in to see this page."
+msgstr "Has d'estar identificat per a veure aquesta pàgina."
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
-msgstr "- selecciona -"
+#: ../../Zotlabs/Module/Chat.php:181
+msgid "Room not found"
+msgstr "No s'ha trobat la sala"
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
-#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:946
-#: ../../include/text.php:958 ../../include/widgets.php:201
-msgid "Save"
-msgstr "Guardar"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "Leave Room"
+msgstr "Abandona la sala"
 
-#: ../../Zotlabs/Module/Dreport.php:27
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "Delete Room"
+msgstr "Esborra Sala"
+
+#: ../../Zotlabs/Module/Chat.php:199
+msgid "I am away right now"
+msgstr "Absent"
+
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "I am online"
+msgstr "Estic connectat/da"
+
+#: ../../Zotlabs/Module/Chat.php:202
+msgid "Bookmark this room"
+msgstr "Fes favorit aquest xat"
+
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:197
+#: ../../Zotlabs/Module/Mail.php:306 ../../include/conversation.php:1181
+msgid "Please enter a link URL:"
+msgstr "Si us plau entra l'enllaç URL:"
+
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:250
+#: ../../Zotlabs/Module/Mail.php:375 ../../Zotlabs/Lib/ThreadItem.php:722
+#: ../../include/conversation.php:1271
+msgid "Encrypt text"
+msgstr "Text encriptat"
+
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editwebpage.php:146
+#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:369
+#: ../../Zotlabs/Module/Editblock.php:111 ../../include/conversation.php:1146
+msgid "Insert web link"
+msgstr "Insereix enllaç web"
+
+#: ../../Zotlabs/Module/Chat.php:218
+msgid "Feature disabled."
+msgstr "Funcionalitat desactivada."
+
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "New Chatroom"
+msgstr "Nova sala per a Xerrar"
+
+#: ../../Zotlabs/Module/Chat.php:233
+msgid "Chatroom name"
+msgstr "Nom de la sala de xat"
+
+#: ../../Zotlabs/Module/Chat.php:234
+msgid "Expiration of chats (minutes)"
+msgstr "Expiració dels chats (minuts)"
+
+#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
+#: ../../include/acl_selectors.php:281
+msgid "Permissions"
+msgstr "Permisos "
+
+#: ../../Zotlabs/Module/Chat.php:246
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "%1$s de Xats"
+
+#: ../../Zotlabs/Module/Chat.php:251
+msgid "No chatrooms available"
+msgstr "No hi ha sales de xat disponibles"
+
+#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create New"
+msgstr "Crear Nou"
+
+#: ../../Zotlabs/Module/Chat.php:255
+msgid "Expiration"
+msgstr "Expiració"
+
+#: ../../Zotlabs/Module/Chat.php:256
+msgid "min"
+msgstr "min"
+
+#: ../../Zotlabs/Module/Dreport.php:44
 msgid "Invalid message"
 msgstr "Missatge invàlid."
 
-#: ../../Zotlabs/Module/Dreport.php:59
+#: ../../Zotlabs/Module/Dreport.php:76
 msgid "no results"
 msgstr "sense resultats"
 
-#: ../../Zotlabs/Module/Dreport.php:64
+#: ../../Zotlabs/Module/Dreport.php:91
+msgid "channel sync processed"
+msgstr "sincronització del canal processada"
+
+#: ../../Zotlabs/Module/Dreport.php:95
+msgid "queued"
+msgstr "Posat en cua"
+
+#: ../../Zotlabs/Module/Dreport.php:99
+msgid "posted"
+msgstr "enviat"
+
+#: ../../Zotlabs/Module/Dreport.php:103
+msgid "accepted for delivery"
+msgstr "acceptat per entregar"
+
+#: ../../Zotlabs/Module/Dreport.php:107
+msgid "updated"
+msgstr "actualitzat"
+
+#: ../../Zotlabs/Module/Dreport.php:110
+msgid "update ignored"
+msgstr "actualització ignorada"
+
+#: ../../Zotlabs/Module/Dreport.php:113
+msgid "permission denied"
+msgstr "permís denegat"
+
+#: ../../Zotlabs/Module/Dreport.php:117
+msgid "recipient not found"
+msgstr "Contenidor no trobat"
+
+#: ../../Zotlabs/Module/Dreport.php:120
+msgid "mail recalled"
+msgstr "Recupera el correu"
+
+#: ../../Zotlabs/Module/Dreport.php:123
+msgid "duplicate mail received"
+msgstr "rebut correu duplicat"
+
+#: ../../Zotlabs/Module/Dreport.php:126
+msgid "mail delivered"
+msgstr "correu entregat"
+
+#: ../../Zotlabs/Module/Dreport.php:146
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Informe de lliurament per %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "channel sync processed"
-msgstr "sincronització del canal processada"
+#: ../../Zotlabs/Module/Dreport.php:149
+msgid "Options"
+msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:82
-msgid "queued"
-msgstr "Posat en cua"
+#: ../../Zotlabs/Module/Dreport.php:150
+msgid "Redeliver"
+msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:86
-msgid "posted"
-msgstr "enviat"
-
-#: ../../Zotlabs/Module/Dreport.php:90
-msgid "accepted for delivery"
-msgstr "acceptat per entregar"
-
-#: ../../Zotlabs/Module/Dreport.php:94
-msgid "updated"
-msgstr "actualitzat"
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "update ignored"
-msgstr "actualització ignorada"
-
-#: ../../Zotlabs/Module/Dreport.php:100
-msgid "permission denied"
-msgstr "permís denegat"
-
-#: ../../Zotlabs/Module/Dreport.php:104
-msgid "recipient not found"
-msgstr "Contenidor no trobat"
-
-#: ../../Zotlabs/Module/Dreport.php:107
-msgid "mail recalled"
-msgstr "Recupera el correu"
-
-#: ../../Zotlabs/Module/Dreport.php:110
-msgid "duplicate mail received"
-msgstr "rebut correu duplicat"
-
-#: ../../Zotlabs/Module/Dreport.php:113
-msgid "mail delivered"
-msgstr "correu entregat"
-
-#: ../../Zotlabs/Module/Editlayout.php:126
-#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
+#: ../../Zotlabs/Module/Editlayout.php:127
+#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
 msgid "Layout Name"
 msgstr "Nom del Format Gràfic"
 
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:130
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:131
 msgid "Layout Description (Optional)"
 msgstr "Descripció del Format (Opcional)"
 
-#: ../../Zotlabs/Module/Editlayout.php:135
+#: ../../Zotlabs/Module/Editlayout.php:136
 msgid "Edit Layout"
 msgstr "Edita Format Gràfic"
 
-#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Zotlabs/Module/Editwebpage.php:142
 msgid "Page link"
 msgstr "Enllaç de la pàgina"
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Editwebpage.php:168
 msgid "Edit Webpage"
 msgstr "Edita la Pàgina Web"
 
-#: ../../Zotlabs/Module/Follow.php:34
-msgid "Channel added."
-msgstr "S'ha afegit el canal."
-
-#: ../../Zotlabs/Module/Acl.php:227
-msgid "network"
-msgstr "xarxa"
-
-#: ../../Zotlabs/Module/Acl.php:237
-msgid "RSS"
-msgstr "RSS"
-
 #: ../../Zotlabs/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "Creat grup privat."
@@ -1583,7 +1807,7 @@ msgid "Could not create privacy group."
 msgstr "No es pot crear el grup privat."
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3893
+#: ../../include/items.php:3902
 msgid "Privacy group not found."
 msgstr "No es troben grups privats."
 
@@ -1627,31 +1851,57 @@ msgstr "Tots els Canals Connectats"
 msgid "Click on a channel to add or remove."
 msgstr "Clic sobre el canal per afegir o esborrar."
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
-msgid "Share content from Firefox to $Projectname"
-msgstr "Compartir contingut des de Firefox a $Projectname"
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+msgid "App installed."
+msgstr "Aplicació instal·lada."
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
-msgid "Activate the Firefox $Projectname provider"
-msgstr "Activar el proveïdor de $Projectname a Firefox"
+#: ../../Zotlabs/Module/Appman.php:46
+msgid "Malformed app."
+msgstr "Aplicació amb errors"
 
-#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
-msgid "Authorize application connection"
-msgstr "Autoritza la connexió de l'aplicació"
+#: ../../Zotlabs/Module/Appman.php:104
+msgid "Embed code"
+msgstr "Codi embegut"
 
-#: ../../Zotlabs/Module/Api.php:62
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Torna a la teva aplicació i insereix aquest Codi de Seguretat:"
+#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
+msgid "Edit App"
+msgstr "Edita l'Aplicació"
 
-#: ../../Zotlabs/Module/Api.php:72
-msgid "Please login to continue."
-msgstr "Si et plau, identifica't per continuar."
+#: ../../Zotlabs/Module/Appman.php:110
+msgid "Create App"
+msgstr "Crea l'Aplicació"
 
-#: ../../Zotlabs/Module/Api.php:87
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Vols autoritzar a aquesta aplicació l'accés a les teves entrades i contactes i/o a crear noves entrades com si fos tu mateix."
+#: ../../Zotlabs/Module/Appman.php:115
+msgid "Name of app"
+msgstr "Nom de l'Aplicació"
+
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Location (URL) of app"
+msgstr "Ubicació (URL) de l'aplicació"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Photo icon URL"
+msgstr "Foto icona URL"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "80 x 80 pixels - optional"
+msgstr "80 x 80 pixels - opcional"
+
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "Categories (optional, comma separated list)"
+msgstr "Categories (opcional, lista separada per comes)"
+
+#: ../../Zotlabs/Module/Appman.php:120
+msgid "Version ID"
+msgstr "Versió ID"
+
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Price of app"
+msgstr "Preu de l'aplicació"
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Location (URL) to purchase app"
+msgstr "Ubicació (URL) per comprar l'aplicació"
 
 #: ../../Zotlabs/Module/Help.php:26
 msgid "Documentation Search"
@@ -1663,8 +1913,8 @@ msgid "Help:"
 msgstr "Ajuda:"
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223
-#: ../../include/nav.php:159
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/nav.php:161
 msgid "Help"
 msgstr "Ajuda"
 
@@ -1672,335 +1922,124 @@ msgstr "Ajuda"
 msgid "$Projectname Documentation"
 msgstr "$Projectname Documentació"
 
-#: ../../Zotlabs/Module/Filestorage.php:88
-msgid "Permission Denied."
-msgstr "Permisos Denegats."
-
-#: ../../Zotlabs/Module/Filestorage.php:104
-msgid "File not found."
-msgstr "Arxiu no torbat."
-
-#: ../../Zotlabs/Module/Filestorage.php:147
-msgid "Edit file permissions"
-msgstr "Edita els permisos d'arxiu"
-
-#: ../../Zotlabs/Module/Filestorage.php:156
-msgid "Set/edit permissions"
-msgstr "Canvia/edita permisos"
-
-#: ../../Zotlabs/Module/Filestorage.php:157
-msgid "Include all files and sub folders"
-msgstr "Inclou tots als arxius i subdirectoris"
-
-#: ../../Zotlabs/Module/Filestorage.php:158
-msgid "Return to file list"
-msgstr "Tornar al llistat d'arxius"
-
-#: ../../Zotlabs/Module/Filestorage.php:160
-msgid "Copy/paste this code to attach file to a post"
-msgstr "Copia/enganxa aquest codi per a adjuntar un arxiu a l'entrada"
-
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Copy/paste this URL to link file from a web page"
-msgstr "Copia/enganxa aquesta URL per a enllaçar l'arxiu d'una pàgina web"
-
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Share this file"
-msgstr "Comparteix l'arxiu"
-
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Show URL to this file"
-msgstr "Mostra la URL d'aquest arxiu"
-
-#: ../../Zotlabs/Module/Filestorage.php:165
-msgid "Notify your contacts about this file"
-msgstr "Notifica als teus contactes aquest arxiu"
-
-#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
-#: ../../include/nav.php:163
-msgid "Apps"
-msgstr "Aplicatius"
-
 #: ../../Zotlabs/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Article no disponible."
 
-#: ../../Zotlabs/Module/Import.php:32
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "El teu paquet de serveis només admet %d canals."
+#: ../../Zotlabs/Module/Pdledit.php:18
+msgid "Layout updated."
+msgstr "S'ha actualitzat la disposició."
 
-#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
-msgstr "No hi ha res a importar."
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
+msgid "Edit System Page Description"
+msgstr "Editor del Sistema de Descripció de Pàgines"
 
-#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
-msgstr "No s'han pogut descarregar les dades del servidor antic"
+#: ../../Zotlabs/Module/Pdledit.php:56
+msgid "Layout not found."
+msgstr "No s'ha trobat cap disposició de pàgina."
 
-#: ../../Zotlabs/Module/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
-msgstr "El fitxer importat està buit."
+#: ../../Zotlabs/Module/Pdledit.php:62
+msgid "Module Name:"
+msgstr "Nom del mòdul:"
 
-#: ../../Zotlabs/Module/Import.php:122
-#: ../../Zotlabs/Module/Import_items.php:86
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Atenció: Les versions de la Base de Dades difereixen en %1$d actualitzacions."
+#: ../../Zotlabs/Module/Pdledit.php:63
+msgid "Layout Help"
+msgstr "Ajuda per la disposició de pàgina"
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
-msgid "Cloned channel not found. Import failed."
-msgstr "No s'ha pogut importar el canal perquè el canal clonat no s'ha trobat."
+#: ../../Zotlabs/Module/Ffsapi.php:12
+msgid "Share content from Firefox to $Projectname"
+msgstr "Compartir contingut des de Firefox a $Projectname"
 
-#: ../../Zotlabs/Module/Import.php:160
-msgid "No channel. Import failed."
-msgstr "Sense canal. No s'ha pogut importar."
+#: ../../Zotlabs/Module/Ffsapi.php:15
+msgid "Activate the Firefox $Projectname provider"
+msgstr "Activar el proveïdor de $Projectname a Firefox"
 
-#: ../../Zotlabs/Module/Import.php:510
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
-msgstr "S'ha completat la importació."
+#: ../../Zotlabs/Module/Acl.php:312
+msgid "network"
+msgstr "xarxa"
 
-#: ../../Zotlabs/Module/Import.php:532
-msgid "You must be logged in to use this feature."
-msgstr "Has d'estar registrat per fer servir aquesta funcionalitat."
+#: ../../Zotlabs/Module/Acl.php:322
+msgid "RSS"
+msgstr "RSS"
 
-#: ../../Zotlabs/Module/Import.php:537
-msgid "Import Channel"
-msgstr "Importa un canal"
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
+msgstr "Permisos Denegats."
 
-#: ../../Zotlabs/Module/Import.php:538
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You"
-" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file."
-msgstr "Empra aquest formulari per importar un canal existent en un altre servidor/concentrador. Pots recuperar el canal  des de l'antic servidor/concentrador via la xarxa o mitjançant un fitxer d'exportació"
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
+msgstr "Arxiu no torbat."
 
-#: ../../Zotlabs/Module/Import.php:539
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "File to Upload"
-msgstr "Fitxer a pujar"
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
+msgstr "Edita els permisos d'arxiu"
 
-#: ../../Zotlabs/Module/Import.php:540
-msgid "Or provide the old server/hub details"
-msgstr "O proveeix els detalls de l'antic servidor/node"
+#: ../../Zotlabs/Module/Filestorage.php:155
+msgid "Set/edit permissions"
+msgstr "Canvia/edita permisos"
 
-#: ../../Zotlabs/Module/Import.php:541
-msgid "Your old identity address (xyz@example.com)"
-msgstr "La teva adreça de canal antiga. El format és canal@exemple.org"
+#: ../../Zotlabs/Module/Filestorage.php:156
+msgid "Include all files and sub folders"
+msgstr "Inclou tots als arxius i subdirectoris"
 
-#: ../../Zotlabs/Module/Import.php:542
-msgid "Your old login email address"
-msgstr "La teva adreça de correu electrònic antiga"
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Return to file list"
+msgstr "Tornar al llistat d'arxius"
 
-#: ../../Zotlabs/Module/Import.php:543
-msgid "Your old login password"
-msgstr "La teva contrasenya antiga"
+#: ../../Zotlabs/Module/Filestorage.php:159
+msgid "Copy/paste this code to attach file to a post"
+msgstr "Copia/enganxa aquest codi per a adjuntar un arxiu a l'entrada"
 
-#: ../../Zotlabs/Module/Import.php:544
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be"
-" able to post from either location, but only one can be marked as the "
-"primary location for files, photos, and media."
-msgstr "Per a qualsevol de les opcions, escull si vols fer primària l'adreça d'aquest node o mantenir l'anterior com a primària. Podràs penjar entrades des de totes dues adreces, però per als fitxers, imatges i altres en cal una de primària."
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Copy/paste this URL to link file from a web page"
+msgstr "Copia/enganxa aquesta URL per a enllaçar l'arxiu d'una pàgina web"
 
-#: ../../Zotlabs/Module/Import.php:545
-msgid "Make this hub my primary location"
-msgstr "Fes d'aquest node la meva ubicació primària"
+#: ../../Zotlabs/Module/Filestorage.php:162
+msgid "Share this file"
+msgstr "Comparteix l'arxiu"
 
-#: ../../Zotlabs/Module/Import.php:546
-msgid ""
-"Import existing posts if possible (experimental - limited by available "
-"memory"
-msgstr "Importa les entrades existents si es possible (experimental - limitat per la memòria disponible"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Show URL to this file"
+msgstr "Mostra la URL d'aquest arxiu"
 
-#: ../../Zotlabs/Module/Import.php:547
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
-msgstr "Aquest procès pot trigar minuts en completar. Si et plau envia el formulari només una vegada i manté aquesta pàgina oberta fins que finalitzi."
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Notify your contacts about this file"
+msgstr "Notifica als teus contactes aquest arxiu"
 
-#: ../../Zotlabs/Module/Item.php:178
-msgid "Unable to locate original post."
-msgstr "No s'ha pogut trobar l'entrada original."
-
-#: ../../Zotlabs/Module/Item.php:427
-msgid "Empty post discarded."
-msgstr "S'ha descartat l'entrada perquè no té contingut."
-
-#: ../../Zotlabs/Module/Item.php:467
-msgid "Executable content type not permitted to this channel."
-msgstr "No està permès el contingut de tipus executable en aquest canal."
-
-#: ../../Zotlabs/Module/Item.php:847
-msgid "Duplicate post suppressed."
-msgstr "Publicació duplicada s'ha suprimit."
-
-#: ../../Zotlabs/Module/Item.php:977
-msgid "System error. Post not saved."
-msgstr "Hi ha hagut un error del sistema. L'entrada no s'ha desat."
-
-#: ../../Zotlabs/Module/Item.php:1241
-msgid "Unable to obtain post information from database."
-msgstr "No s'ha pogut obtenir informació de l'entrada a la base de dades."
-
-#: ../../Zotlabs/Module/Item.php:1248
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Has assolit el teu límit de %1$.0f entrades (descomptant comentaris)."
-
-#: ../../Zotlabs/Module/Item.php:1255
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Has assolit el teu limit de %1$.0f pàgines web."
-
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2267
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2240
 msgid "Layouts"
 msgstr "Format Gràfic"
 
-#: ../../Zotlabs/Module/Layouts.php:183
+#: ../../Zotlabs/Module/Layouts.php:185
 msgid "Comanche page description language help"
 msgstr "Pgina d'ajuda del llenguatge Comanche"
 
-#: ../../Zotlabs/Module/Layouts.php:187
+#: ../../Zotlabs/Module/Layouts.php:189
 msgid "Layout Description"
 msgstr "Descripció del Disseny de la Pàgina"
 
-#: ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:114
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Webpages.php:205
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr "Creat"
+
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:115
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Webpages.php:206
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+msgstr "Editat"
+
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1070
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:195
+#: ../../include/conversation.php:1219
+msgid "Share"
+msgstr "Compartir"
+
+#: ../../Zotlabs/Module/Layouts.php:194
 msgid "Download PDL file"
 msgstr "Descarrega l'arxiu PDL"
 
-#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
-#: ../../Zotlabs/Module/Siteinfo.php:65
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../Zotlabs/Module/Home.php:79
-#, php-format
-msgid "Welcome to %s"
-msgstr "Benvingut a %s"
-
-#: ../../Zotlabs/Module/Id.php:13
-msgid "First Name"
-msgstr "Nom"
-
-#: ../../Zotlabs/Module/Id.php:14
-msgid "Last Name"
-msgstr "Cognoms"
-
-#: ../../Zotlabs/Module/Id.php:15
-msgid "Nickname"
-msgstr "Àlies"
-
-#: ../../Zotlabs/Module/Id.php:16
-msgid "Full Name"
-msgstr "Nom Sencer"
-
-#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
-#: ../../include/network.php:2151 ../../boot.php:1705
-msgid "Email"
-msgstr "Correu electrónic"
-
-#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236
-msgid "Profile Photo"
-msgstr "Foto del Perfil"
-
-#: ../../Zotlabs/Module/Id.php:22
-msgid "Profile Photo 16px"
-msgstr "Foto del Perfil 16px"
-
-#: ../../Zotlabs/Module/Id.php:23
-msgid "Profile Photo 32px"
-msgstr "Foto del Perfil 32px"
-
-#: ../../Zotlabs/Module/Id.php:24
-msgid "Profile Photo 48px"
-msgstr "Foto del Perfil 48px"
-
-#: ../../Zotlabs/Module/Id.php:25
-msgid "Profile Photo 64px"
-msgstr "Foto del Perfil 64px"
-
-#: ../../Zotlabs/Module/Id.php:26
-msgid "Profile Photo 80px"
-msgstr "Foto del Perfil 80px"
-
-#: ../../Zotlabs/Module/Id.php:27
-msgid "Profile Photo 128px"
-msgstr "Foto del Perfil 128px"
-
-#: ../../Zotlabs/Module/Id.php:28
-msgid "Timezone"
-msgstr "Zona horària"
-
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
-msgid "Homepage URL"
-msgstr "URL de la pàgina d'inici"
-
-#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234
-msgid "Language"
-msgstr "Idioma"
-
-#: ../../Zotlabs/Module/Id.php:31
-msgid "Birth Year"
-msgstr "Any de Naixement"
-
-#: ../../Zotlabs/Module/Id.php:32
-msgid "Birth Month"
-msgstr "Mes de Naixement"
-
-#: ../../Zotlabs/Module/Id.php:33
-msgid "Birth Day"
-msgstr "Dia de Naixement"
-
-#: ../../Zotlabs/Module/Id.php:34
-msgid "Birthdate"
-msgstr "Aniversari"
-
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
-msgid "Gender"
-msgstr "Gènere"
-
-#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Male"
-msgstr "Masculí"
-
-#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Female"
-msgstr "Femení"
-
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
-msgid "webpage"
-msgstr "pàgina web"
-
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
-msgid "block"
-msgstr "bloc"
-
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
-msgid "layout"
-msgstr "disposició"
-
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
-msgid "menu"
-msgstr "menú"
-
-#: ../../Zotlabs/Module/Impel.php:196
-#, php-format
-msgid "%s element installed"
-msgstr "%s element instal·lat"
-
-#: ../../Zotlabs/Module/Impel.php:199
-#, php-format
-msgid "%s element installation failed"
-msgstr "%s instal·lació d'element va fallar"
-
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr "M'agrada / No m'agrada"
@@ -2036,1180 +2075,65 @@ msgstr "El canal està inactiu."
 msgid "Previous action reversed."
 msgstr "S'ha desfet l'acció anterior."
 
-#: ../../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/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
+#: ../../include/text.php:1921
 msgid "photo"
 msgstr "foto"
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/text.php:1946 ../../include/conversation.php:148
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../include/conversation.php:148 ../../include/text.php:1927
 msgid "status"
 msgstr "estat"
 
-#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
+#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s agrada %2$s de %3$s"
 
-#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s no agrada %2$s de %3$s"
 
-#: ../../Zotlabs/Module/Like.php:424
+#: ../../Zotlabs/Module/Like.php:423
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s està d'acord amb %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:426
+#: ../../Zotlabs/Module/Like.php:425
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s no està d'acord amb %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:428
+#: ../../Zotlabs/Module/Like.php:427
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s s'abstén en %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:430
+#: ../../Zotlabs/Module/Like.php:429
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s assistirà a %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:432
+#: ../../Zotlabs/Module/Like.php:431
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s no assistirà a %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:434
+#: ../../Zotlabs/Module/Like.php:433
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s potser assistirà a %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:537
+#: ../../Zotlabs/Module/Like.php:536
 msgid "Action completed."
 msgstr "S'ha completat l'acció."
 
-#: ../../Zotlabs/Module/Like.php:538
+#: ../../Zotlabs/Module/Like.php:537
 msgid "Thank you."
 msgstr "Gràcies."
 
-#: ../../Zotlabs/Module/Import_items.php:102
-msgid "Import completed"
-msgstr "S'ha completat la importació"
-
-#: ../../Zotlabs/Module/Import_items.php:117
-msgid "Import Items"
-msgstr "Importa Articles"
-
-#: ../../Zotlabs/Module/Import_items.php:118
-msgid ""
-"Use this form to import existing posts and content from an export file."
-msgstr "Empra aquest formulari per importar entrades existents i contingut d'un arxiu d'exportació."
-
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
-msgstr "El límit total invitacions s'ha superat."
-
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s: adreça de correu electrònic no vàlida."
-
-#: ../../Zotlabs/Module/Invite.php:63
-msgid "Please join us on $Projectname"
-msgstr "Si us plau uneix-te a nosaltres a $Projectname."
-
-#: ../../Zotlabs/Module/Invite.php:74
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Límit d'invitacions excedit. Si us plau, poseu-vos en contacte amb l'administrador del lloc."
-
-#: ../../Zotlabs/Module/Invite.php:79
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Entrega del Missatge fallida."
-
-#: ../../Zotlabs/Module/Invite.php:83
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d missatge enviat."
-msgstr[1] "%d missatges enviats."
-
-#: ../../Zotlabs/Module/Invite.php:102
-msgid "You have no more invitations available"
-msgstr "No té més invitacions disponibles"
-
-#: ../../Zotlabs/Module/Invite.php:133
-msgid "Send invitations"
-msgstr "Enviar invitacions"
-
-#: ../../Zotlabs/Module/Invite.php:134
-msgid "Enter email addresses, one per line:"
-msgstr "Introduïu les adreces de correu electrònic, una per línia:"
-
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
-msgid "Your message:"
-msgstr "El teu missatge:"
-
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Please join my community on $Projectname."
-msgstr "Si us plau uneix-te la meva comunitat en $Projectname."
-
-#: ../../Zotlabs/Module/Invite.php:138
-msgid "You will need to supply this invitation code:"
-msgstr "Hauràs de facilitar aquest codi d'invitació:"
-
-#: ../../Zotlabs/Module/Invite.php:139
-msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Pots registrar-te a qualsevol node de $Projectname (estàn tots interconnectats)"
-
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Escriu la meva adreça de xarxa al $Projectname,  a la barra de cerca del lloc."
-
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "or visit"
-msgstr "o visitar"
-
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "3. Click [Connect]"
-msgstr "3. Clicar [Conectar]"
-
-#: ../../Zotlabs/Module/Lockview.php:61
-msgid "Remote privacy information not available."
-msgstr "informació privada remota no disponible."
-
-#: ../../Zotlabs/Module/Lockview.php:82
-msgid "Visible to:"
-msgstr "Visible per:"
-
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
-msgstr "Situació que no es troba."
-
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
-msgstr "Ha fallat la cerca d'ubicació."
-
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary"
-" location."
-msgstr "Seleccioneu una altra ubicació per esdevenir primària abans de retirar la ubicació principal."
-
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
-msgstr "Sincronitza ubicacions"
-
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
-msgstr "No es troben els llocs."
-
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
-msgstr "Gestionar Ubicacions de Canal"
-
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470
-#: ../../Zotlabs/Module/Admin.php:1224
-msgid "Address"
-msgstr "Adreça"
-
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
-msgstr "Primari"
-
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
-msgid "Drop"
-msgstr "Menysprea"
-
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
-msgstr "Sincronitza Ara"
-
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
-msgstr "Si us plau espera diversos minuts entre operacions consecutives."
-
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing"
-" your channel."
-msgstr "Quan sigui possible, per desapareixer d'un lloc, accedeix a aquest lloc web/node i elimina el teu canal."
-
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
-msgstr "Empra aquest formulari per desapareixer del lloc si el node ja no està operatiu."
-
-#: ../../Zotlabs/Module/Magic.php:71
-msgid "Hub not found."
-msgstr "Node no trobat."
-
-#: ../../Zotlabs/Module/Mail.php:38
-msgid "Unable to lookup recipient."
-msgstr "Incapaç de trobar el destinatari."
-
-#: ../../Zotlabs/Module/Mail.php:45
-msgid "Unable to communicate with requested channel."
-msgstr "Incapaç de comunicar amb el canal demanat."
-
-#: ../../Zotlabs/Module/Mail.php:52
-msgid "Cannot verify requested channel."
-msgstr "No puc verificar el canal demanat."
-
-#: ../../Zotlabs/Module/Mail.php:78
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "El canal seleccionat te restriccions sobre els missatges privats. L'enviament ha fallat."
-
-#: ../../Zotlabs/Module/Mail.php:143
-msgid "Messages"
-msgstr "Missatges"
-
-#: ../../Zotlabs/Module/Mail.php:178
-msgid "Message recalled."
-msgstr "Recupera el missatge."
-
-#: ../../Zotlabs/Module/Mail.php:191
-msgid "Conversation removed."
-msgstr "Conversació eliminada."
-
-#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Expira YYYY-MM-DD HH:MM"
-
-#: ../../Zotlabs/Module/Mail.php:234
-msgid "Requested channel is not in this network"
-msgstr "El canal demanat no hi es en questa xarxa"
-
-#: ../../Zotlabs/Module/Mail.php:242
-msgid "Send Private Message"
-msgstr "Envia Missatge Privat"
-
-#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
-msgid "To:"
-msgstr "Per:"
-
-#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
-msgid "Subject:"
-msgstr "Assumpte:"
-
-#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
-#: ../../include/conversation.php:1220
-msgid "Attach file"
-msgstr "Adjunta arxiu"
-
-#: ../../Zotlabs/Module/Mail.php:253
-msgid "Send"
-msgstr "Envia"
-
-#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
-#: ../../include/conversation.php:1251
-msgid "Set expiration date"
-msgstr "Ajusta la data d'expiració"
-
-#: ../../Zotlabs/Module/Mail.php:340
-msgid "Delete message"
-msgstr "Elimina el missatge"
-
-#: ../../Zotlabs/Module/Mail.php:341
-msgid "Delivery report"
-msgstr "Informe d'entrega"
-
-#: ../../Zotlabs/Module/Mail.php:342
-msgid "Recall message"
-msgstr "Recupera el missatge"
-
-#: ../../Zotlabs/Module/Mail.php:344
-msgid "Message has been recalled."
-msgstr "El missatge s'ha recuperat."
-
-#: ../../Zotlabs/Module/Mail.php:361
-msgid "Delete Conversation"
-msgstr "Conversació esborrada"
-
-#: ../../Zotlabs/Module/Mail.php:363
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Comunicació segura no disponible. Pots respondre des de la pàgina de perfil del remitent."
-
-#: ../../Zotlabs/Module/Mail.php:367
-msgid "Send Reply"
-msgstr "Envia Resposta"
-
-#: ../../Zotlabs/Module/Mail.php:372
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr "El teu missatge per %s (%s):"
-
-#: ../../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 "Has creat %1$.0f de %2$.0f canals permesos."
-
-#: ../../Zotlabs/Module/Manage.php:143
-msgid "Create a new channel"
-msgstr "Crear un nou canal"
-
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
-#: ../../include/nav.php:206
-msgid "Channel Manager"
-msgstr "Gestor de Canals"
-
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
-msgstr "Canal Actual"
-
-#: ../../Zotlabs/Module/Manage.php:167
-msgid "Switch to one of your channels by selecting it."
-msgstr "Canviar a un altre dels teus canals seleccionant-ho."
-
-#: ../../Zotlabs/Module/Manage.php:168
-msgid "Default Channel"
-msgstr "Canal per Defecte"
-
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
-msgstr "Estableix com a Predeterminat"
-
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
-msgstr "%d missatges nous"
-
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
-msgstr "%d noves presentacions"
-
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
-msgstr "Canal Delegat"
-
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr "No es troba un compte vàlid."
-
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr "Sol·licitud de restabliment de contrasenya emesa. Consulta el teu correu electrònic."
-
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Lloc d'Usuari (%s)"
-
-#: ../../Zotlabs/Module/Lostpass.php:44
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "S'ha soŀlicitat restablir la contrasenya al hub %s"
-
-#: ../../Zotlabs/Module/Lostpass.php:67
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Ha fallat el restabliment de contrasenya perquè la no s'ha pogut verificar soŀlicitud. Pot ser que ja ho hàgiu soŀlicitat abans."
-
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1711
-msgid "Password Reset"
-msgstr "Restabliment de contrasenya"
-
-#: ../../Zotlabs/Module/Lostpass.php:91
-msgid "Your password has been reset as requested."
-msgstr "S'ha restablert la vostra contrasenya."
-
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your new password is"
-msgstr "La nova contrasenya és"
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Save or copy your new password - and then"
-msgstr "Desa o copia la nova contrasenya, i després"
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "click here to login"
-msgstr "fes clic aquí per iniciar sessió"
-
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Pots canviar la contrasenya a la pàgina <em>Paràmetres</em>, un cop iniciada la sessió."
-
-#: ../../Zotlabs/Module/Lostpass.php:112
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "La teva contrasenya a %s ha canviat"
-
-#: ../../Zotlabs/Module/Lostpass.php:127
-msgid "Forgot your Password?"
-msgstr "No recordes la contrasenya?"
-
-#: ../../Zotlabs/Module/Lostpass.php:128
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Escriu la teva adreça de correu electrònic i envia per restablir la contrasenya. Després revisa el seu correu electrònic per obtenir més instruccions."
-
-#: ../../Zotlabs/Module/Lostpass.php:129
-msgid "Email Address"
-msgstr "Adreça electrònica"
-
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Reset"
-msgstr "Reajustar"
-
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
-msgstr "No s'ha pogut actualitzar el menú."
-
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
-msgstr "No s'ha pogut crear el menú."
-
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
-msgstr "Nom del menú"
-
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Nom únic (no visible a la pàgina web) - requerit"
-
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
-msgstr "Títol del menú"
-
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Visible a la pàgina web - deixar buit per a no posar títol"
-
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
-msgstr "Permetre Marcadors"
-
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
-msgstr "El menú es pot emprar per a guardar marcadors"
-
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
-msgstr "Envia i procedeix"
-
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2266
-msgid "Menus"
-msgstr "Menús"
-
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
-msgstr "Marcadors permesos"
-
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
-msgstr "Esborra el menú"
-
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
-msgstr "Edita el contingut del menú"
-
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
-msgstr "Edita el menú"
-
-#: ../../Zotlabs/Module/Menu.php:136
-msgid "Menu could not be deleted."
-msgstr "El menu no es pot esborrar."
-
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
-msgid "Menu not found."
-msgstr "Menú no trobat."
-
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
-msgstr "Edita Menú"
-
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
-msgstr "Afegeix o esborra entrades a aquest menú"
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
-msgstr "Nom del Menú"
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
-msgstr "Ha de ser únic, nomes vist per tú"
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
-msgstr "Títol del menú"
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title as seen by others"
-msgstr "Títol del menú vist pels altres"
-
-#: ../../Zotlabs/Module/Menu.php:157
-msgid "Allow bookmarks"
-msgstr "Marcadors permesos"
-
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
-msgstr "No trobat."
-
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr "%1$s es %2$s"
-
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225
-msgid "Mood"
-msgstr "Ànim"
-
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
-msgstr "Estableix el teu estat d'ànim actual i digues-li als teus amics"
-
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
-msgstr "Perfils compatibles"
-
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "No tens paraules clau al perfil principal per poder cercar perfils semblants."
-
-#: ../../Zotlabs/Module/Match.php:67
-msgid "is interested in:"
-msgstr "té interès en:"
-
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
-msgstr "No s'han trobat perfils compatibles"
-
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
-msgstr "No existeix el grup"
-
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
-msgstr "No existeix el canal"
-
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
-msgstr "fòrum"
-
-#: ../../Zotlabs/Module/Network.php:153
-msgid "Search Results For:"
-msgstr "Cerca resultats per:"
-
-#: ../../Zotlabs/Module/Network.php:217
-msgid "Privacy group is empty"
-msgstr "el grup privat està vuit"
-
-#: ../../Zotlabs/Module/Network.php:226
-msgid "Privacy group: "
-msgstr "Grup privat:"
-
-#: ../../Zotlabs/Module/Network.php:252
-msgid "Invalid connection."
-msgstr "La connexió és invàlida."
-
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:98
-msgid "No more system notifications."
-msgstr "No hi ha més notificacions del sistema."
-
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:102
-msgid "System Notifications"
-msgstr "Notificacions del sistema"
-
-#: ../../Zotlabs/Module/Mitem.php:52
-msgid "Unable to create element."
-msgstr "Incapaç de crear l'element."
-
-#: ../../Zotlabs/Module/Mitem.php:76
-msgid "Unable to update menu element."
-msgstr "Incapaç d'actualitzar un element del menú."
-
-#: ../../Zotlabs/Module/Mitem.php:92
-msgid "Unable to add menu element."
-msgstr "Incapaç d'afegir l'element del menú."
-
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
-msgid "Menu Item Permissions"
-msgstr "Permisos de l'Article del Menú"
-
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1068
-msgid "(click to open/close)"
-msgstr "(clica per obrir/tancar)"
-
-#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
-msgid "Link Name"
-msgstr "Nom de l'Enllaç"
-
-#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
-msgid "Link or Submenu Target"
-msgstr "Enllaç o Submenú Objectiu"
-
-#: ../../Zotlabs/Module/Mitem.php:157
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "Entra la URL de l'enlla´o tria un nom de menú per crear un submenú"
-
-#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
-msgid "Use magic-auth if available"
-msgstr "Empra magic-auth si esta disponible"
-
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
-msgid "Open link in new window"
-msgstr "Obrir l'enllaç en una nova finestra"
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Order in list"
-msgstr "Ordre per llista"
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Els números més alts aniràn al fons de la llista"
-
-#: ../../Zotlabs/Module/Mitem.php:161
-msgid "Submit and finish"
-msgstr "Envia i termina"
-
-#: ../../Zotlabs/Module/Mitem.php:162
-msgid "Submit and continue"
-msgstr "Envia i continua"
-
-#: ../../Zotlabs/Module/Mitem.php:170
-msgid "Menu:"
-msgstr "Menú:"
-
-#: ../../Zotlabs/Module/Mitem.php:173
-msgid "Link Target"
-msgstr "Enllaç Objectiu"
-
-#: ../../Zotlabs/Module/Mitem.php:176
-msgid "Edit menu"
-msgstr "Edita menú"
-
-#: ../../Zotlabs/Module/Mitem.php:179
-msgid "Edit element"
-msgstr "Edita element"
-
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Drop element"
-msgstr "Deixa anar element"
-
-#: ../../Zotlabs/Module/Mitem.php:181
-msgid "New element"
-msgstr "Nou element"
-
-#: ../../Zotlabs/Module/Mitem.php:182
-msgid "Edit this menu container"
-msgstr "Edita aquest contenidor de menú"
-
-#: ../../Zotlabs/Module/Mitem.php:183
-msgid "Add menu element"
-msgstr "Afegeix element de menú"
-
-#: ../../Zotlabs/Module/Mitem.php:184
-msgid "Delete this menu item"
-msgstr "Esborra aquest article del menú"
-
-#: ../../Zotlabs/Module/Mitem.php:185
-msgid "Edit this menu item"
-msgstr "Edita aquest article del menú"
-
-#: ../../Zotlabs/Module/Mitem.php:202
-msgid "Menu item not found."
-msgstr "Article del menú no trobat."
-
-#: ../../Zotlabs/Module/Mitem.php:215
-msgid "Menu item deleted."
-msgstr "Article del menú eliminat."
-
-#: ../../Zotlabs/Module/Mitem.php:217
-msgid "Menu item could not be deleted."
-msgstr "Article del menú no es pot eliminar."
-
-#: ../../Zotlabs/Module/Mitem.php:224
-msgid "Edit Menu Element"
-msgstr "Editar Element del Menú"
-
-#: ../../Zotlabs/Module/Mitem.php:230
-msgid "Link text"
-msgstr "Enllaç de text"
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Name or caption"
-msgstr "Nom o llegenda"
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
-msgstr "Exemples: \"Pep Gomila\", \"Manel i els seus Cavalls\", \"Fútbol\", \"Grup d'Aviadors\""
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-msgid "Choose a short nickname"
-msgstr "Tria un àlies curt"
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-#, php-format
-msgid ""
-"Your nickname will be used to create an easy to remember channel address "
-"e.g. nickname%s"
-msgstr "El teu àlies serà emprat per crear un nom fàcil per recordar l'adreça del canal p.e. àlies%s"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Channel role and privacy"
-msgstr "Funció i privacitat del canal"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Select a channel role with your privacy requirements."
-msgstr "Tria una funció pel canal amb els teus requisits de privacitat."
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Read more about roles"
-msgstr "Llegix més sobre els rols"
-
-#: ../../Zotlabs/Module/New_channel.php:135
-msgid "Create Channel"
-msgstr "Crea un Canal"
-
-#: ../../Zotlabs/Module/New_channel.php:136
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
-msgstr "Un canal es la tva identitat en aquesta xarxa. Pot representar una persona, un bloc, o un fòrum per anomenar alguns. Els canals poden connectar-se amb altres canals per compartir informació amb permisos molt detallats."
-
-#: ../../Zotlabs/Module/New_channel.php:137
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr "o <a href=\"import\">importa un canal existent</a> des d'un altre ubicació."
-
-#: ../../Zotlabs/Module/Notifications.php:30
-msgid "Invalid request identifier."
-msgstr "Sol·licitud d'identificació invàlida."
-
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "Discard"
-msgstr "Descarta"
-
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
-msgid "Mark all system notifications seen"
-msgstr "Marca totes les notificacions vistes"
-
-#: ../../Zotlabs/Module/Photos.php:84
-msgid "Page owner information could not be retrieved."
-msgstr "La informació del propietari de la pàgina no va poder ser recuperada"
-
-#: ../../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
-#: ../../include/photo/photo_driver.php:718
-msgid "Profile Photos"
-msgstr "Fotos del Perfil"
-
-#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
-msgid "Album not found."
-msgstr "Àlbum no trobat"
-
-#: ../../Zotlabs/Module/Photos.php:132
-msgid "Delete Album"
-msgstr "Esborra Àlbum"
-
-#: ../../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 "Existeixen moltes carpetes de emmagatzemament amb aquest nom d'àlbum, però en diferents directoris.  Si us plau esborra la carpeta o carpetes amb el gestor d'arxius."
-
-#: ../../Zotlabs/Module/Photos.php:210 ../../Zotlabs/Module/Photos.php:1053
-msgid "Delete Photo"
-msgstr "Esborra Foto"
-
-#: ../../Zotlabs/Module/Photos.php:533
-msgid "No photos selected"
-msgstr "No has seleccionat fotos"
-
-#: ../../Zotlabs/Module/Photos.php:582
-msgid "Access to this item is restricted."
-msgstr "L'accés a aquest element esta restringit."
-
-#: ../../Zotlabs/Module/Photos.php:621
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "S'estan fent servir %1$.2f MB de %2$.2f MB de l'espai per a imatges."
-
-#: ../../Zotlabs/Module/Photos.php:624
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "S'estan fent servir %1$.2f MB de l'espai per a imatges."
-
-#: ../../Zotlabs/Module/Photos.php:660
-msgid "Upload Photos"
-msgstr "Puja imatges"
-
-#: ../../Zotlabs/Module/Photos.php:664
-msgid "Enter an album name"
-msgstr "Escriu el nom del àlbum"
-
-#: ../../Zotlabs/Module/Photos.php:665
-msgid "or select an existing album (doubleclick)"
-msgstr "o bé fes doble clic a un d'existent"
-
-#: ../../Zotlabs/Module/Photos.php:666
-msgid "Create a status post for this upload"
-msgstr "Genera una entrada a partir de la pujada"
-
-#: ../../Zotlabs/Module/Photos.php:667
-msgid "Caption (optional):"
-msgstr "Subtítol (opcional):"
-
-#: ../../Zotlabs/Module/Photos.php:668
-msgid "Description (optional):"
-msgstr "Descripció (opcional):"
-
-#: ../../Zotlabs/Module/Photos.php:695
-msgid "Album name could not be decoded"
-msgstr "No s'ha pogut descodificar el nom de l'àlbum"
-
-#: ../../Zotlabs/Module/Photos.php:743
-msgid "Contact Photos"
-msgstr "Imatges de contactes"
-
-#: ../../Zotlabs/Module/Photos.php:766
-msgid "Show Newest First"
-msgstr "Ordena de més nou a més antic"
-
-#: ../../Zotlabs/Module/Photos.php:768
-msgid "Show Oldest First"
-msgstr "Ordena de més antic a més nou"
-
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
-#: ../../include/widgets.php:1499
-msgid "View Photo"
-msgstr "Mostra la imatge"
-
-#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1516
-msgid "Edit Album"
-msgstr "Modifica l'àlbum"
-
-#: ../../Zotlabs/Module/Photos.php:870
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "S'ha denegat el permís. Pot ser que l'accés estigui restringit."
-
-#: ../../Zotlabs/Module/Photos.php:872
-msgid "Photo not available"
-msgstr "La imatge no està disponible"
-
-#: ../../Zotlabs/Module/Photos.php:930
-msgid "Use as profile photo"
-msgstr "Fes-la imatge de perfil"
-
-#: ../../Zotlabs/Module/Photos.php:931
-msgid "Use as cover photo"
-msgstr "Emprar com a foto de portada"
-
-#: ../../Zotlabs/Module/Photos.php:938
-msgid "Private Photo"
-msgstr "Imatge privada"
-
-#: ../../Zotlabs/Module/Photos.php:953
-msgid "View Full Size"
-msgstr "Mostra a mida completa"
-
-#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437
-#: ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr "Esborra"
-
-#: ../../Zotlabs/Module/Photos.php:1032
-msgid "Edit photo"
-msgstr "Modifica la imatge"
-
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Rotate CW (right)"
-msgstr "Tomba cap a la dreta"
-
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CCW (left)"
-msgstr "Tomba cap a l'esquerra"
-
-#: ../../Zotlabs/Module/Photos.php:1038
-msgid "Enter a new album name"
-msgstr "Escriu el nom del nou àlbum"
-
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "or select an existing one (doubleclick)"
-msgstr "o bé fes doble clic a un d'existent"
-
-#: ../../Zotlabs/Module/Photos.php:1042
-msgid "Caption"
-msgstr "Llegenda"
-
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Add a Tag"
-msgstr "Afegeix una etiqueta"
-
-#: ../../Zotlabs/Module/Photos.php:1048
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Exemple: @joan, @Paula_Peris, @mar@exemple.org"
-
-#: ../../Zotlabs/Module/Photos.php:1051
-msgid "Flag as adult in album view"
-msgstr "Marca com a contingut adult"
-
-#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
-msgid "I like this (toggle)"
-msgstr "M'agrada això (canvia)"
-
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
-msgid "I don't like this (toggle)"
-msgstr "No m'agrada això (canvia)"
-
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
-#: ../../include/conversation.php:740
-msgid "Please wait"
-msgstr "Si us plau, espera"
-
-#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../Zotlabs/Lib/ThreadItem.php:707
-msgid "This is you"
-msgstr "Ets tú"
-
-#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
-msgid "Comment"
-msgstr "Comentari"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Likes"
-msgstr "Agrada"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Dislikes"
-msgstr "Desagrada"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Agree"
-msgstr "Acord"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Disagree"
-msgstr "Desacord"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Abstain"
-msgstr "Abstenirse"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Attending"
-msgstr "Assistint"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Not attending"
-msgstr "Desassistint"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Might attend"
-msgstr "Podrien assistir"
-
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
-#: ../../include/conversation.php:1717
-msgid "View all"
-msgstr "Veure tot"
-
-#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1741
-#: ../../include/channel.php:1158
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Agrada"
-msgstr[1] "Agraden"
-
-#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/conversation.php:1744
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "Desagrada"
-msgstr[1] "Desagrada"
-
-#: ../../Zotlabs/Module/Photos.php:1235
-msgid "Photo Tools"
-msgstr "Eines per Fotos"
-
-#: ../../Zotlabs/Module/Photos.php:1244
-msgid "In This Photo:"
-msgstr "Hi apareixen:"
-
-#: ../../Zotlabs/Module/Photos.php:1249
-msgid "Map"
-msgstr "Mapa"
-
-#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
-msgctxt "noun"
-msgid "Likes"
-msgstr "Agrada"
-
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
-msgctxt "noun"
-msgid "Dislikes"
-msgstr "Desagrada"
-
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
-#: ../../include/acl_selectors.php:285
-msgid "Close"
-msgstr "Tanca"
-
-#: ../../Zotlabs/Module/Photos.php:1337
-msgid "View Album"
-msgstr "Mostra'n l'àlbum"
-
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362
-msgid "Recent Photos"
-msgstr "Imatges recents"
-
-#: ../../Zotlabs/Module/Ping.php:265
-msgid "sent you a private message"
-msgstr "Se t'ha enviat un missatge privat"
-
-#: ../../Zotlabs/Module/Ping.php:313
-msgid "added your channel"
-msgstr "el teu canal s'ha afegit"
-
-#: ../../Zotlabs/Module/Ping.php:323
-msgid "g A l F d"
-msgstr "g A l F d"
-
-#: ../../Zotlabs/Module/Ping.php:346
-msgid "[today]"
-msgstr "[avui]"
-
-#: ../../Zotlabs/Module/Ping.php:355
-msgid "posted an event"
-msgstr "enviat un esdeveniment"
-
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr "No es possible trobar el node"
-
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr "Entrada realitzada amb èxit. "
-
-#: ../../Zotlabs/Module/Openid.php:30
-msgid "OpenID protocol error. No ID returned."
-msgstr "Error del protocol OpenID. No ha retornat ID"
-
-#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
-msgid "Login failed."
-msgstr "Identificació fallida."
-
-#: ../../Zotlabs/Module/Page.php:133
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
-" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Aquest ajust requereix un procés espedial i l'edició esta bloquejada."
-
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
-msgstr "Editor de Configuració"
-
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please"
-" leave this page unless you are comfortable with and knowledgeable about how"
-" to correctly use this feature."
-msgstr "atenció: Realitzar segons quins ajustos pot fer el canal inoperable. Deixa aquesta pàgina si no estas segur i tens suficients coneixements sobre l'ús correcte d'aquesta característica."
-
-#: ../../Zotlabs/Module/Pdledit.php:18
-msgid "Layout updated."
-msgstr "S'ha actualitzat la disposició."
-
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
-msgid "Edit System Page Description"
-msgstr "Editor del Sistema de Descripció de Pàgines"
-
-#: ../../Zotlabs/Module/Pdledit.php:56
-msgid "Layout not found."
-msgstr "No s'ha trobat cap disposició de pàgina."
-
-#: ../../Zotlabs/Module/Pdledit.php:62
-msgid "Module Name:"
-msgstr "Nom del mòdul:"
-
-#: ../../Zotlabs/Module/Pdledit.php:63
-msgid "Layout Help"
-msgstr "Ajuda per la disposició de pàgina"
-
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226
-#: ../../include/conversation.php:960
-msgid "Poke"
-msgstr "Esperonar"
-
-#: ../../Zotlabs/Module/Poke.php:169
-msgid "Poke somebody"
-msgstr "Emprenyar algú"
-
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
-msgstr "Esperonat/Picat"
-
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
-msgstr "emprenyar, picar o fer altres coses a algú"
-
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
-msgstr "Destinatari"
-
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
-msgstr "Tria que vols fer amb el destinatari"
-
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
-msgstr "Fer aquesta entrada privada"
-
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
-#, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr "URL sol·licitada retorna error: %1$s"
-
 #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
 #: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
 msgid "Profile not found."
@@ -3279,6 +2203,11 @@ msgstr "Pàgina Personal"
 msgid "Interests"
 msgstr "Interessos"
 
+#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1224
+msgid "Address"
+msgstr "Adreça"
+
 #: ../../Zotlabs/Module/Profiles.php:560
 msgid "Profile updated."
 msgstr "Perfil actualitzat."
@@ -3296,7 +2225,7 @@ msgid "View this profile"
 msgstr "Veure aquest perfil"
 
 #: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
-#: ../../include/channel.php:959
+#: ../../include/channel.php:998
 msgid "Edit visibility"
 msgstr "Editar visibilitat"
 
@@ -3308,7 +2237,7 @@ msgstr "Eines per Perfils"
 msgid "Change cover photo"
 msgstr "Canviar la foto de portada"
 
-#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:969
 msgid "Change profile photo"
 msgstr "Canviar la foto del perfil"
 
@@ -3328,8 +2257,8 @@ msgstr "Elimina aquest perfil"
 msgid "Add profile things"
 msgstr "Afegeix coses al perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105
-#: ../../include/conversation.php:1526
+#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541
+#: ../../include/widgets.php:105
 msgid "Personal"
 msgstr "Personal"
 
@@ -3469,119 +2398,1097 @@ msgstr "Informació de contacte i xarxes socials"
 msgid "My other channels"
 msgstr "Els meus altres canals"
 
-#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:994
 msgid "Profile Image"
 msgstr "Imatge del Perfil"
 
 #: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
-#: ../../include/channel.php:937
+#: ../../include/channel.php:976
 msgid "Edit Profiles"
 msgstr "Editar Perfils"
 
-#: ../../Zotlabs/Module/Profile_photo.php:179
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Refresca la memòria cau del navegador si la foto no s'actualitza immediatament. Dreceres: «Ctrl+F5» i «Ctrl+Maj+R»"
-
-#: ../../Zotlabs/Module/Profile_photo.php:367
-msgid "Upload Profile Photo"
-msgstr "Puja una Foto pel Perfil"
-
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr "Identificador invàlid de perfil."
-
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
-msgstr "Perfil del Editor de Visibilitat"
-
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249
-msgid "Profile"
-msgstr "Perfil"
-
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
-msgstr "Clica sobre el contacte per afegir o esborrar."
-
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
-msgstr "Visible per"
-
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1270
-msgid "Public Hubs"
-msgstr "Nodes Públics"
-
-#: ../../Zotlabs/Module/Pubsites.php:25
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
-msgstr "Els nodes llistats permeten registrar usuaris de la xarxa $Projectname. Com que tots els nodes estan enllaçats entre ells, la identitat és vàlida a tota la xarxa. Alguns nodes poden demanar subscripció o oferir serveis addicional de pagament. Per a més detalls, <strong>proveu</strong> de seguir els enllaços dels proveïdors."
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Hub URL"
-msgstr "URL del Node"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Access Type"
-msgstr "Tipus d'accés"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Registration Policy"
-msgstr "Condicions de registre"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Stats"
-msgstr "Estadístiques"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Software"
-msgstr "Programari"
-
-#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:959
-msgid "Ratings"
-msgstr "Valoracions"
-
-#: ../../Zotlabs/Module/Pubsites.php:38
-msgid "Rate"
-msgstr "Puntua"
-
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Website:"
-msgstr "Lloc web:"
-
-#: ../../Zotlabs/Module/Rate.php:163
+#: ../../Zotlabs/Module/Import.php:33
 #, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Canal Remot [%s] (encara no es coneix en aquest lloc)"
+msgid "Your service plan only allows %d channels."
+msgstr "El teu paquet de serveis només admet %d canals."
 
-#: ../../Zotlabs/Module/Rate.php:164
-msgid "Rating (this information is public)"
-msgstr "Valoració (aquesta informació és pública)"
+#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42
+msgid "Nothing to import."
+msgstr "No hi ha res a importar."
 
-#: ../../Zotlabs/Module/Rate.php:165
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Opcionalment pots explicar la teva qualificació (aquesta informació és pública)"
+#: ../../Zotlabs/Module/Import.php:95 ../../Zotlabs/Module/Import_items.php:66
+msgid "Unable to download data from old server"
+msgstr "No s'han pogut descarregar les dades del servidor antic"
 
-#: ../../Zotlabs/Module/Ratings.php:73
-msgid "No ratings"
-msgstr "No valorat"
+#: ../../Zotlabs/Module/Import.php:101
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Imported file is empty."
+msgstr "El fitxer importat està buit."
 
-#: ../../Zotlabs/Module/Ratings.php:104
-msgid "Rating: "
-msgstr "Valoració:"
+#: ../../Zotlabs/Module/Import.php:123
+#: ../../Zotlabs/Module/Import_items.php:88
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Atenció: Les versions de la Base de Dades difereixen en %1$d actualitzacions."
 
-#: ../../Zotlabs/Module/Ratings.php:105
-msgid "Website: "
-msgstr "Lloc web:"
+#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107
+msgid "Cloned channel not found. Import failed."
+msgstr "No s'ha pogut importar el canal perquè el canal clonat no s'ha trobat."
 
-#: ../../Zotlabs/Module/Ratings.php:107
-msgid "Description: "
-msgstr "Descripció:"
+#: ../../Zotlabs/Module/Import.php:163
+msgid "No channel. Import failed."
+msgstr "Sense canal. No s'ha pogut importar."
+
+#: ../../Zotlabs/Module/Import.php:520
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
+msgstr "S'ha completat la importació."
+
+#: ../../Zotlabs/Module/Import.php:542
+msgid "You must be logged in to use this feature."
+msgstr "Has d'estar registrat per fer servir aquesta funcionalitat."
+
+#: ../../Zotlabs/Module/Import.php:547
+msgid "Import Channel"
+msgstr "Importa un canal"
+
+#: ../../Zotlabs/Module/Import.php:548
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file."
+msgstr "Empra aquest formulari per importar un canal existent en un altre servidor/concentrador. Pots recuperar el canal  des de l'antic servidor/concentrador via la xarxa o mitjançant un fitxer d'exportació"
+
+#: ../../Zotlabs/Module/Import.php:549
+#: ../../Zotlabs/Module/Import_items.php:121
+msgid "File to Upload"
+msgstr "Fitxer a pujar"
+
+#: ../../Zotlabs/Module/Import.php:550
+msgid "Or provide the old server/hub details"
+msgstr "O proveeix els detalls de l'antic servidor/node"
+
+#: ../../Zotlabs/Module/Import.php:551
+msgid "Your old identity address (xyz@example.com)"
+msgstr "La teva adreça de canal antiga. El format és canal@exemple.org"
+
+#: ../../Zotlabs/Module/Import.php:552
+msgid "Your old login email address"
+msgstr "La teva adreça de correu electrònic antiga"
+
+#: ../../Zotlabs/Module/Import.php:553
+msgid "Your old login password"
+msgstr "La teva contrasenya antiga"
+
+#: ../../Zotlabs/Module/Import.php:554
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Per a qualsevol de les opcions, escull si vols fer primària l'adreça d'aquest node o mantenir l'anterior com a primària. Podràs penjar entrades des de totes dues adreces, però per als fitxers, imatges i altres en cal una de primària."
+
+#: ../../Zotlabs/Module/Import.php:555
+msgid "Make this hub my primary location"
+msgstr "Fes d'aquest node la meva ubicació primària"
+
+#: ../../Zotlabs/Module/Import.php:556
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importa les entrades existents si es possible (experimental - limitat per la memòria disponible"
+
+#: ../../Zotlabs/Module/Import.php:557
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Aquest procès pot trigar minuts en completar. Si et plau envia el formulari només una vegada i manté aquesta pàgina oberta fins que finalitzi."
+
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../Zotlabs/Module/Siteinfo.php:48
+msgid "$Projectname"
+msgstr "$Projectname"
+
+#: ../../Zotlabs/Module/Home.php:92
+#, php-format
+msgid "Welcome to %s"
+msgstr "Benvingut a %s"
+
+#: ../../Zotlabs/Module/Item.php:179
+msgid "Unable to locate original post."
+msgstr "No s'ha pogut trobar l'entrada original."
+
+#: ../../Zotlabs/Module/Item.php:432
+msgid "Empty post discarded."
+msgstr "S'ha descartat l'entrada perquè no té contingut."
+
+#: ../../Zotlabs/Module/Item.php:472
+msgid "Executable content type not permitted to this channel."
+msgstr "No està permès el contingut de tipus executable en aquest canal."
+
+#: ../../Zotlabs/Module/Item.php:856
+msgid "Duplicate post suppressed."
+msgstr "Publicació duplicada s'ha suprimit."
+
+#: ../../Zotlabs/Module/Item.php:989
+msgid "System error. Post not saved."
+msgstr "Hi ha hagut un error del sistema. L'entrada no s'ha desat."
+
+#: ../../Zotlabs/Module/Item.php:1242
+msgid "Unable to obtain post information from database."
+msgstr "No s'ha pogut obtenir informació de l'entrada a la base de dades."
+
+#: ../../Zotlabs/Module/Item.php:1249
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Has assolit el teu límit de %1$.0f entrades (descomptant comentaris)."
+
+#: ../../Zotlabs/Module/Item.php:1256
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Has assolit el teu limit de %1$.0f pàgines web."
+
+#: ../../Zotlabs/Module/Photos.php:82
+msgid "Page owner information could not be retrieved."
+msgstr "La informació del propietari de la pàgina no va poder ser recuperada"
+
+#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:741
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:212
+#: ../../Zotlabs/Module/Profile_photo.php:311
+#: ../../include/photo/photo_driver.php:718
+msgid "Profile Photos"
+msgstr "Fotos del Perfil"
+
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147
+msgid "Album not found."
+msgstr "Àlbum no trobat"
+
+#: ../../Zotlabs/Module/Photos.php:130
+msgid "Delete Album"
+msgstr "Esborra Àlbum"
+
+#: ../../Zotlabs/Module/Photos.php:151
+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 "Existeixen moltes carpetes de emmagatzemament amb aquest nom d'àlbum, però en diferents directoris.  Si us plau esborra la carpeta o carpetes amb el gestor d'arxius."
+
+#: ../../Zotlabs/Module/Photos.php:208 ../../Zotlabs/Module/Photos.php:1051
+msgid "Delete Photo"
+msgstr "Esborra Foto"
+
+#: ../../Zotlabs/Module/Photos.php:531
+msgid "No photos selected"
+msgstr "No has seleccionat fotos"
+
+#: ../../Zotlabs/Module/Photos.php:580
+msgid "Access to this item is restricted."
+msgstr "L'accés a aquest element esta restringit."
+
+#: ../../Zotlabs/Module/Photos.php:619
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "S'estan fent servir %1$.2f MB de %2$.2f MB de l'espai per a imatges."
+
+#: ../../Zotlabs/Module/Photos.php:622
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "S'estan fent servir %1$.2f MB de l'espai per a imatges."
+
+#: ../../Zotlabs/Module/Photos.php:658
+msgid "Upload Photos"
+msgstr "Puja imatges"
+
+#: ../../Zotlabs/Module/Photos.php:662
+msgid "Enter an album name"
+msgstr "Escriu el nom del àlbum"
+
+#: ../../Zotlabs/Module/Photos.php:663
+msgid "or select an existing album (doubleclick)"
+msgstr "o bé fes doble clic a un d'existent"
+
+#: ../../Zotlabs/Module/Photos.php:664
+msgid "Create a status post for this upload"
+msgstr "Genera una entrada a partir de la pujada"
+
+#: ../../Zotlabs/Module/Photos.php:665
+msgid "Caption (optional):"
+msgstr "Subtítol (opcional):"
+
+#: ../../Zotlabs/Module/Photos.php:666
+msgid "Description (optional):"
+msgstr "Descripció (opcional):"
+
+#: ../../Zotlabs/Module/Photos.php:693
+msgid "Album name could not be decoded"
+msgstr "No s'ha pogut descodificar el nom de l'àlbum"
+
+#: ../../Zotlabs/Module/Photos.php:741
+msgid "Contact Photos"
+msgstr "Imatges de contactes"
+
+#: ../../Zotlabs/Module/Photos.php:764
+msgid "Show Newest First"
+msgstr "Ordena de més nou a més antic"
+
+#: ../../Zotlabs/Module/Photos.php:766
+msgid "Show Oldest First"
+msgstr "Ordena de més antic a més nou"
+
+#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1329
+#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1593
+msgid "View Photo"
+msgstr "Mostra la imatge"
+
+#: ../../Zotlabs/Module/Photos.php:821
+#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1610
+msgid "Edit Album"
+msgstr "Modifica l'àlbum"
+
+#: ../../Zotlabs/Module/Photos.php:868
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "S'ha denegat el permís. Pot ser que l'accés estigui restringit."
+
+#: ../../Zotlabs/Module/Photos.php:870
+msgid "Photo not available"
+msgstr "La imatge no està disponible"
+
+#: ../../Zotlabs/Module/Photos.php:928
+msgid "Use as profile photo"
+msgstr "Fes-la imatge de perfil"
+
+#: ../../Zotlabs/Module/Photos.php:929
+msgid "Use as cover photo"
+msgstr "Emprar com a foto de portada"
+
+#: ../../Zotlabs/Module/Photos.php:936
+msgid "Private Photo"
+msgstr "Imatge privada"
+
+#: ../../Zotlabs/Module/Photos.php:951
+msgid "View Full Size"
+msgstr "Mostra a mida completa"
+
+#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Admin.php:1437
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
+msgstr "Esborra"
+
+#: ../../Zotlabs/Module/Photos.php:1030
+msgid "Edit photo"
+msgstr "Modifica la imatge"
+
+#: ../../Zotlabs/Module/Photos.php:1032
+msgid "Rotate CW (right)"
+msgstr "Tomba cap a la dreta"
+
+#: ../../Zotlabs/Module/Photos.php:1033
+msgid "Rotate CCW (left)"
+msgstr "Tomba cap a l'esquerra"
+
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "Enter a new album name"
+msgstr "Escriu el nom del nou àlbum"
+
+#: ../../Zotlabs/Module/Photos.php:1037
+msgid "or select an existing one (doubleclick)"
+msgstr "o bé fes doble clic a un d'existent"
+
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Caption"
+msgstr "Llegenda"
+
+#: ../../Zotlabs/Module/Photos.php:1042
+msgid "Add a Tag"
+msgstr "Afegeix una etiqueta"
+
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Exemple: @joan, @Paula_Peris, @mar@exemple.org"
+
+#: ../../Zotlabs/Module/Photos.php:1049
+msgid "Flag as adult in album view"
+msgstr "Marca com a contingut adult"
+
+#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Lib/ThreadItem.php:261
+msgid "I like this (toggle)"
+msgstr "M'agrada això (canvia)"
+
+#: ../../Zotlabs/Module/Photos.php:1069 ../../Zotlabs/Lib/ThreadItem.php:262
+msgid "I don't like this (toggle)"
+msgstr "No m'agrada això (canvia)"
+
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:397
+#: ../../include/conversation.php:743
+msgid "Please wait"
+msgstr "Si us plau, espera"
+
+#: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1205
+#: ../../Zotlabs/Lib/ThreadItem.php:707
+msgid "This is you"
+msgstr "Ets tú"
+
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
+#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr "Comentari"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
+msgstr "Agrada"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
+msgstr "Desagrada"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
+msgstr "Acord"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
+msgstr "Desacord"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
+msgstr "Abstenirse"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
+msgstr "Assistint"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
+msgstr "Desassistint"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
+msgstr "Podrien assistir"
+
+#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1136
+#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../include/conversation.php:1738
+msgid "View all"
+msgstr "Veure tot"
+
+#: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../include/taxonomy.php:403 ../../include/channel.php:1198
+#: ../../include/conversation.php:1762
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Agrada"
+msgstr[1] "Agraden"
+
+#: ../../Zotlabs/Module/Photos.php:1133 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/conversation.php:1765
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "Desagrada"
+msgstr[1] "Desagrada"
+
+#: ../../Zotlabs/Module/Photos.php:1233
+msgid "Photo Tools"
+msgstr "Eines per Fotos"
+
+#: ../../Zotlabs/Module/Photos.php:1242
+msgid "In This Photo:"
+msgstr "Hi apareixen:"
+
+#: ../../Zotlabs/Module/Photos.php:1247
+msgid "Map"
+msgstr "Mapa"
+
+#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/ThreadItem.php:386
+msgctxt "noun"
+msgid "Likes"
+msgstr "Agrada"
+
+#: ../../Zotlabs/Module/Photos.php:1256 ../../Zotlabs/Lib/ThreadItem.php:387
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "Desagrada"
+
+#: ../../Zotlabs/Module/Photos.php:1261 ../../Zotlabs/Lib/ThreadItem.php:392
+#: ../../include/acl_selectors.php:283
+msgid "Close"
+msgstr "Tanca"
+
+#: ../../Zotlabs/Module/Photos.php:1335
+msgid "View Album"
+msgstr "Mostra'n l'àlbum"
+
+#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359
+#: ../../Zotlabs/Module/Photos.php:1360
+msgid "Recent Photos"
+msgstr "Imatges recents"
+
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
+msgstr "informació privada remota no disponible."
+
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
+msgstr "Visible per:"
+
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
+msgstr "S'ha completat la importació"
+
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
+msgstr "Importa Articles"
+
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid ""
+"Use this form to import existing posts and content from an export file."
+msgstr "Empra aquest formulari per importar entrades existents i contingut d'un arxiu d'exportació."
+
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
+msgstr "El límit total invitacions s'ha superat."
+
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s: adreça de correu electrònic no vàlida."
+
+#: ../../Zotlabs/Module/Invite.php:63
+msgid "Please join us on $Projectname"
+msgstr "Si us plau uneix-te a nosaltres a $Projectname."
+
+#: ../../Zotlabs/Module/Invite.php:74
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Límit d'invitacions excedit. Si us plau, poseu-vos en contacte amb l'administrador del lloc."
+
+#: ../../Zotlabs/Module/Invite.php:79
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Entrega del Missatge fallida."
+
+#: ../../Zotlabs/Module/Invite.php:83
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d missatge enviat."
+msgstr[1] "%d missatges enviats."
+
+#: ../../Zotlabs/Module/Invite.php:102
+msgid "You have no more invitations available"
+msgstr "No té més invitacions disponibles"
+
+#: ../../Zotlabs/Module/Invite.php:133
+msgid "Send invitations"
+msgstr "Enviar invitacions"
+
+#: ../../Zotlabs/Module/Invite.php:134
+msgid "Enter email addresses, one per line:"
+msgstr "Introduïu les adreces de correu electrònic, una per línia:"
+
+#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:241
+msgid "Your message:"
+msgstr "El teu missatge:"
+
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Please join my community on $Projectname."
+msgstr "Si us plau uneix-te la meva comunitat en $Projectname."
+
+#: ../../Zotlabs/Module/Invite.php:138
+msgid "You will need to supply this invitation code:"
+msgstr "Hauràs de facilitar aquest codi d'invitació:"
+
+#: ../../Zotlabs/Module/Invite.php:139
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Pots registrar-te a qualsevol node de $Projectname (estàn tots interconnectats)"
+
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Escriu la meva adreça de xarxa al $Projectname,  a la barra de cerca del lloc."
+
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "or visit"
+msgstr "o visitar"
+
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "3. Click [Connect]"
+msgstr "3. Clicar [Conectar]"
+
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
+msgstr "Situació que no es troba."
+
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
+msgstr "Ha fallat la cerca d'ubicació."
+
+#: ../../Zotlabs/Module/Locs.php:66
+msgid ""
+"Please select another location to become primary before removing the primary"
+" location."
+msgstr "Seleccioneu una altra ubicació per esdevenir primària abans de retirar la ubicació principal."
+
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
+msgstr "Sincronitza ubicacions"
+
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
+msgstr "No es troben els llocs."
+
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
+msgstr "Gestionar Ubicacions de Canal"
+
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
+msgstr "Primari"
+
+#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+msgid "Drop"
+msgstr "Menysprea"
+
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
+msgstr "Sincronitza Ara"
+
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
+msgstr "Si us plau espera diversos minuts entre operacions consecutives."
+
+#: ../../Zotlabs/Module/Locs.php:124
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing"
+" your channel."
+msgstr "Quan sigui possible, per desapareixer d'un lloc, accedeix a aquest lloc web/node i elimina el teu canal."
+
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr "Empra aquest formulari per desapareixer del lloc si el node ja no està operatiu."
+
+#: ../../Zotlabs/Module/Magic.php:71
+msgid "Hub not found."
+msgstr "Node no trobat."
+
+#: ../../Zotlabs/Module/Mail.php:38
+msgid "Unable to lookup recipient."
+msgstr "Incapaç de trobar el destinatari."
+
+#: ../../Zotlabs/Module/Mail.php:45
+msgid "Unable to communicate with requested channel."
+msgstr "Incapaç de comunicar amb el canal demanat."
+
+#: ../../Zotlabs/Module/Mail.php:52
+msgid "Cannot verify requested channel."
+msgstr "No puc verificar el canal demanat."
+
+#: ../../Zotlabs/Module/Mail.php:70
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "El canal seleccionat te restriccions sobre els missatges privats. L'enviament ha fallat."
+
+#: ../../Zotlabs/Module/Mail.php:135
+msgid "Messages"
+msgstr "Missatges"
+
+#: ../../Zotlabs/Module/Mail.php:170
+msgid "Message recalled."
+msgstr "Recupera el missatge."
+
+#: ../../Zotlabs/Module/Mail.php:183
+msgid "Conversation removed."
+msgstr "Conversació eliminada."
+
+#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Expira YYYY-MM-DD HH:MM"
+
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Requested channel is not in this network"
+msgstr "El canal demanat no hi es en questa xarxa"
+
+#: ../../Zotlabs/Module/Mail.php:234
+msgid "Send Private Message"
+msgstr "Envia Missatge Privat"
+
+#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360
+msgid "To:"
+msgstr "Per:"
+
+#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362
+msgid "Subject:"
+msgstr "Assumpte:"
+
+#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
+#: ../../include/conversation.php:1231
+msgid "Attach file"
+msgstr "Adjunta arxiu"
+
+#: ../../Zotlabs/Module/Mail.php:245
+msgid "Send"
+msgstr "Envia"
+
+#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373
+#: ../../include/conversation.php:1266
+msgid "Set expiration date"
+msgstr "Ajusta la data d'expiració"
+
+#: ../../Zotlabs/Module/Mail.php:332
+msgid "Delete message"
+msgstr "Elimina el missatge"
+
+#: ../../Zotlabs/Module/Mail.php:333
+msgid "Delivery report"
+msgstr "Informe d'entrega"
+
+#: ../../Zotlabs/Module/Mail.php:334
+msgid "Recall message"
+msgstr "Recupera el missatge"
+
+#: ../../Zotlabs/Module/Mail.php:336
+msgid "Message has been recalled."
+msgstr "El missatge s'ha recuperat."
+
+#: ../../Zotlabs/Module/Mail.php:353
+msgid "Delete Conversation"
+msgstr "Conversació esborrada"
+
+#: ../../Zotlabs/Module/Mail.php:355
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Comunicació segura no disponible. Pots respondre des de la pàgina de perfil del remitent."
+
+#: ../../Zotlabs/Module/Mail.php:359
+msgid "Send Reply"
+msgstr "Envia Resposta"
+
+#: ../../Zotlabs/Module/Mail.php:364
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "El teu missatge per %s (%s):"
+
+#: ../../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 "Has creat %1$.0f de %2$.0f canals permesos."
+
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create a new channel"
+msgstr "Crear un nou canal"
+
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214
+#: ../../include/nav.php:208
+msgid "Channel Manager"
+msgstr "Gestor de Canals"
+
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
+msgstr "Canal Actual"
+
+#: ../../Zotlabs/Module/Manage.php:167
+msgid "Switch to one of your channels by selecting it."
+msgstr "Canviar a un altre dels teus canals seleccionant-ho."
+
+#: ../../Zotlabs/Module/Manage.php:168
+msgid "Default Channel"
+msgstr "Canal per Defecte"
+
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
+msgstr "Estableix com a Predeterminat"
+
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
+msgstr "%d missatges nous"
+
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
+msgstr "%d noves presentacions"
+
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
+msgstr "Canal Delegat"
+
+#: ../../Zotlabs/Module/Menu.php:49
+msgid "Unable to update menu."
+msgstr "No s'ha pogut actualitzar el menú."
+
+#: ../../Zotlabs/Module/Menu.php:60
+msgid "Unable to create menu."
+msgstr "No s'ha pogut crear el menú."
+
+#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+msgid "Menu Name"
+msgstr "Nom del menú"
+
+#: ../../Zotlabs/Module/Menu.php:98
+msgid "Unique name (not visible on webpage) - required"
+msgstr "Nom únic (no visible a la pàgina web) - requerit"
+
+#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+msgid "Menu Title"
+msgstr "Títol del menú"
+
+#: ../../Zotlabs/Module/Menu.php:99
+msgid "Visible on webpage - leave empty for no title"
+msgstr "Visible a la pàgina web - deixar buit per a no posar títol"
+
+#: ../../Zotlabs/Module/Menu.php:100
+msgid "Allow Bookmarks"
+msgstr "Permetre Marcadors"
+
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+msgid "Menu may be used to store saved bookmarks"
+msgstr "El menú es pot emprar per a guardar marcadors"
+
+#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+msgid "Submit and proceed"
+msgstr "Envia i procedeix"
+
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2239
+msgid "Menus"
+msgstr "Menús"
+
+#: ../../Zotlabs/Module/Menu.php:117
+msgid "Bookmarks allowed"
+msgstr "Marcadors permesos"
+
+#: ../../Zotlabs/Module/Menu.php:119
+msgid "Delete this menu"
+msgstr "Esborra el menú"
+
+#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+msgid "Edit menu contents"
+msgstr "Edita el contingut del menú"
+
+#: ../../Zotlabs/Module/Menu.php:121
+msgid "Edit this menu"
+msgstr "Edita el menú"
+
+#: ../../Zotlabs/Module/Menu.php:136
+msgid "Menu could not be deleted."
+msgstr "El menu no es pot esborrar."
+
+#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+msgid "Menu not found."
+msgstr "Menú no trobat."
+
+#: ../../Zotlabs/Module/Menu.php:149
+msgid "Edit Menu"
+msgstr "Edita Menú"
+
+#: ../../Zotlabs/Module/Menu.php:153
+msgid "Add or remove entries to this menu"
+msgstr "Afegeix o esborra entrades a aquest menú"
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Menu name"
+msgstr "Nom del Menú"
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Must be unique, only seen by you"
+msgstr "Ha de ser únic, nomes vist per tú"
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title"
+msgstr "Títol del menú"
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title as seen by others"
+msgstr "Títol del menú vist pels altres"
+
+#: ../../Zotlabs/Module/Menu.php:157
+msgid "Allow bookmarks"
+msgstr "Marcadors permesos"
+
+#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
+#: ../../Zotlabs/Module/Xchan.php:41
+msgid "Not found."
+msgstr "No trobat."
+
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
+msgstr "No es troba un compte vàlid."
+
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr "Sol·licitud de restabliment de contrasenya emesa. Consulta el teu correu electrònic."
+
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Lloc d'Usuari (%s)"
+
+#: ../../Zotlabs/Module/Lostpass.php:44
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "S'ha soŀlicitat restablir la contrasenya al hub %s"
+
+#: ../../Zotlabs/Module/Lostpass.php:67
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Ha fallat el restabliment de contrasenya perquè la no s'ha pogut verificar soŀlicitud. Pot ser que ja ho hàgiu soŀlicitat abans."
+
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1712
+msgid "Password Reset"
+msgstr "Restabliment de contrasenya"
+
+#: ../../Zotlabs/Module/Lostpass.php:91
+msgid "Your password has been reset as requested."
+msgstr "S'ha restablert la vostra contrasenya."
+
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your new password is"
+msgstr "La nova contrasenya és"
+
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Save or copy your new password - and then"
+msgstr "Desa o copia la nova contrasenya, i després"
+
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "click here to login"
+msgstr "fes clic aquí per iniciar sessió"
+
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Pots canviar la contrasenya a la pàgina <em>Paràmetres</em>, un cop iniciada la sessió."
+
+#: ../../Zotlabs/Module/Lostpass.php:112
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "La teva contrasenya a %s ha canviat"
+
+#: ../../Zotlabs/Module/Lostpass.php:127
+msgid "Forgot your Password?"
+msgstr "No recordes la contrasenya?"
+
+#: ../../Zotlabs/Module/Lostpass.php:128
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Escriu la teva adreça de correu electrònic i envia per restablir la contrasenya. Després revisa el seu correu electrònic per obtenir més instruccions."
+
+#: ../../Zotlabs/Module/Lostpass.php:129
+msgid "Email Address"
+msgstr "Adreça electrònica"
+
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Reset"
+msgstr "Reajustar"
+
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr "%1$s es %2$s"
+
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227
+msgid "Mood"
+msgstr "Ànim"
+
+#: ../../Zotlabs/Module/Mood.php:136
+msgid "Set your current mood and tell your friends"
+msgstr "Estableix el teu estat d'ànim actual i digues-li als teus amics"
+
+#: ../../Zotlabs/Module/Network.php:94
+msgid "No such group"
+msgstr "No existeix el grup"
+
+#: ../../Zotlabs/Module/Network.php:134
+msgid "No such channel"
+msgstr "No existeix el canal"
+
+#: ../../Zotlabs/Module/Network.php:139
+msgid "forum"
+msgstr "fòrum"
+
+#: ../../Zotlabs/Module/Network.php:151
+msgid "Search Results For:"
+msgstr "Cerca resultats per:"
+
+#: ../../Zotlabs/Module/Network.php:215
+msgid "Privacy group is empty"
+msgstr "el grup privat està vuit"
+
+#: ../../Zotlabs/Module/Network.php:224
+msgid "Privacy group: "
+msgstr "Grup privat:"
+
+#: ../../Zotlabs/Module/Network.php:250
+msgid "Invalid connection."
+msgstr "La connexió és invàlida."
+
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:98
+msgid "No more system notifications."
+msgstr "No hi ha més notificacions del sistema."
+
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:102
+msgid "System Notifications"
+msgstr "Notificacions del sistema"
+
+#: ../../Zotlabs/Module/Match.php:26
+msgid "Profile Match"
+msgstr "Perfils compatibles"
+
+#: ../../Zotlabs/Module/Match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "No tens paraules clau al perfil principal per poder cercar perfils semblants."
+
+#: ../../Zotlabs/Module/Match.php:67
+msgid "is interested in:"
+msgstr "té interès en:"
+
+#: ../../Zotlabs/Module/Match.php:74
+msgid "No matches"
+msgstr "No s'han trobat perfils compatibles"
+
+#: ../../Zotlabs/Module/Channel.php:40
+msgid "Posts and comments"
+msgstr "Entrades i comentaris"
+
+#: ../../Zotlabs/Module/Channel.php:41
+msgid "Only posts"
+msgstr "Només entrades"
+
+#: ../../Zotlabs/Module/Channel.php:101
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Permisos insuficients. Petició redirigida a la pàgina del perfil."
+
+#: ../../Zotlabs/Module/Mitem.php:52
+msgid "Unable to create element."
+msgstr "Incapaç de crear l'element."
+
+#: ../../Zotlabs/Module/Mitem.php:76
+msgid "Unable to update menu element."
+msgstr "Incapaç d'actualitzar un element del menú."
+
+#: ../../Zotlabs/Module/Mitem.php:92
+msgid "Unable to add menu element."
+msgstr "Incapaç d'afegir l'element del menú."
+
+#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
+msgid "Menu Item Permissions"
+msgstr "Permisos de l'Article del Menú"
+
+#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
+#: ../../Zotlabs/Module/Settings.php:1163
+msgid "(click to open/close)"
+msgstr "(clica per obrir/tancar)"
+
+#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
+msgid "Link Name"
+msgstr "Nom de l'Enllaç"
+
+#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
+msgid "Link or Submenu Target"
+msgstr "Enllaç o Submenú Objectiu"
+
+#: ../../Zotlabs/Module/Mitem.php:157
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "Entra la URL de l'enlla´o tria un nom de menú per crear un submenú"
+
+#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
+msgid "Use magic-auth if available"
+msgstr "Empra magic-auth si esta disponible"
+
+#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
+msgid "Open link in new window"
+msgstr "Obrir l'enllaç en una nova finestra"
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Order in list"
+msgstr "Ordre per llista"
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Els números més alts aniràn al fons de la llista"
+
+#: ../../Zotlabs/Module/Mitem.php:161
+msgid "Submit and finish"
+msgstr "Envia i termina"
+
+#: ../../Zotlabs/Module/Mitem.php:162
+msgid "Submit and continue"
+msgstr "Envia i continua"
+
+#: ../../Zotlabs/Module/Mitem.php:170
+msgid "Menu:"
+msgstr "Menú:"
+
+#: ../../Zotlabs/Module/Mitem.php:173
+msgid "Link Target"
+msgstr "Enllaç Objectiu"
+
+#: ../../Zotlabs/Module/Mitem.php:176
+msgid "Edit menu"
+msgstr "Edita menú"
+
+#: ../../Zotlabs/Module/Mitem.php:179
+msgid "Edit element"
+msgstr "Edita element"
+
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Drop element"
+msgstr "Deixa anar element"
+
+#: ../../Zotlabs/Module/Mitem.php:181
+msgid "New element"
+msgstr "Nou element"
+
+#: ../../Zotlabs/Module/Mitem.php:182
+msgid "Edit this menu container"
+msgstr "Edita aquest contenidor de menú"
+
+#: ../../Zotlabs/Module/Mitem.php:183
+msgid "Add menu element"
+msgstr "Afegeix element de menú"
+
+#: ../../Zotlabs/Module/Mitem.php:184
+msgid "Delete this menu item"
+msgstr "Esborra aquest article del menú"
+
+#: ../../Zotlabs/Module/Mitem.php:185
+msgid "Edit this menu item"
+msgstr "Edita aquest article del menú"
+
+#: ../../Zotlabs/Module/Mitem.php:202
+msgid "Menu item not found."
+msgstr "Article del menú no trobat."
+
+#: ../../Zotlabs/Module/Mitem.php:215
+msgid "Menu item deleted."
+msgstr "Article del menú eliminat."
+
+#: ../../Zotlabs/Module/Mitem.php:217
+msgid "Menu item could not be deleted."
+msgstr "Article del menú no es pot eliminar."
+
+#: ../../Zotlabs/Module/Mitem.php:224
+msgid "Edit Menu Element"
+msgstr "Editar Element del Menú"
+
+#: ../../Zotlabs/Module/Mitem.php:230
+msgid "Link text"
+msgstr "Enllaç de text"
 
 #: ../../Zotlabs/Module/Admin.php:77
 msgid "Theme settings updated."
@@ -3642,7 +3549,7 @@ msgstr "Comptes registrades"
 
 #: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715
 msgid "Pending registrations"
-msgstr "Comptes pendents de registre"
+msgstr "Comptes pendents d'inscripció"
 
 #: ../../Zotlabs/Module/Admin.php:247
 msgid "Registered channels"
@@ -3668,11 +3575,11 @@ msgstr "Versió (desenvolupament) del repositori"
 msgid "Site settings updated."
 msgstr "Ajustos del Lloc actualitzats"
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2841
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2829
 msgid "Default"
 msgstr "Predeterminat"
 
-#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:899
 msgid "mobile"
 msgstr "mòbil"
 
@@ -3704,13 +3611,13 @@ msgstr "El meu lloc te lliure accés"
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "El meu lloc te comptes gratis amb opció de millores per pagament"
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1382
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1476
 msgid "Site"
 msgstr "Lloc"
 
 #: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245
 msgid "Registration"
-msgstr "Registre"
+msgstr "Inscripcions"
 
 #: ../../Zotlabs/Module/Admin.php:494
 msgid "File upload"
@@ -3784,7 +3691,7 @@ msgstr "Mida màxima en bytes d'imatges pujades. Per defecte es 0, el que vol di
 
 #: ../../Zotlabs/Module/Admin.php:509
 msgid "Does this site allow new member registration?"
-msgstr "Permet aquest lloc registre de nous membres?"
+msgstr "Permet aquest lloc l'inscripció de nous membres?"
 
 #: ../../Zotlabs/Module/Admin.php:510
 msgid "Invitation only"
@@ -3794,7 +3701,7 @@ msgstr "Només per invitació"
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
-msgstr "Només permet registre de nos membres amb codi d'invitació. A més la política de registre s'ha d'establir a Sí."
+msgstr "Només permet inscriure nous membres amb codi d'invitació. A més la política de registre s'ha d'establir a Sí."
 
 #: ../../Zotlabs/Module/Admin.php:511
 msgid "Which best describes the types of account offered by this hub?"
@@ -3802,11 +3709,11 @@ msgstr "Que es es que millor descriu la mena de comptes oferits per aquest conce
 
 #: ../../Zotlabs/Module/Admin.php:512
 msgid "Register text"
-msgstr "text de registre"
+msgstr "Text d'inscripció"
 
 #: ../../Zotlabs/Module/Admin.php:512
 msgid "Will be displayed prominently on the registration page."
-msgstr "Es mostrarà preminentment a la pàgina de registre"
+msgstr "Es mostrarà preminentment a la pàgina d'inscripció"
 
 #: ../../Zotlabs/Module/Admin.php:513
 msgid "Site homepage to show visitors (default: login box)"
@@ -3992,12 +3899,12 @@ msgid "0 for no expiration of imported content"
 msgstr "0 vol dir sense temps d'expiració pel contingut importat"
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "Off"
 msgstr "Apagat"
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "On"
 msgstr "Funcionant"
 
@@ -4054,7 +3961,7 @@ msgid ""
 "embedded content from that site is explicitly blocked."
 msgstr "Tota la resta de contingut embegut seà filtrat, <strong>excepte</strong> contingut embegut d'aquest lloc que està blocat explícitament."
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1385
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1479
 msgid "Security"
 msgstr "Seguretat"
 
@@ -4222,7 +4129,7 @@ msgid "Account '%s' unblocked"
 msgstr "S'ha desbloquejat el compte '%s'"
 
 #: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
-#: ../../include/widgets.php:1383
+#: ../../include/widgets.php:1477
 msgid "Accounts"
 msgstr "Comptes"
 
@@ -4232,7 +4139,7 @@ msgstr "Sel·leciona-ho tot"
 
 #: ../../Zotlabs/Module/Admin.php:1034
 msgid "Registrations waiting for confirm"
-msgstr ""
+msgstr "Inscripcions esperant confirmació"
 
 #: ../../Zotlabs/Module/Admin.php:1035
 msgid "Request date"
@@ -4252,7 +4159,7 @@ msgstr "Tots els Canals"
 
 #: ../../Zotlabs/Module/Admin.php:1049
 msgid "Register date"
-msgstr "Data de registre"
+msgstr "Data d'inscripció"
 
 #: ../../Zotlabs/Module/Admin.php:1050
 msgid "Last login"
@@ -4328,7 +4235,7 @@ msgstr "Canal '%s' permet codi"
 msgid "Channel '%s' code disallowed"
 msgstr "Canal '%s' no permet codi"
 
-#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1384
+#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1478
 msgid "Channels"
 msgstr "Canals"
 
@@ -4348,7 +4255,7 @@ msgstr "Permet Codi"
 msgid "Disallow Code"
 msgstr "No Permet Codi"
 
-#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1611
+#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626
 msgid "Channel"
 msgstr "Canal"
 
@@ -4387,7 +4294,7 @@ msgid "Enable"
 msgstr "Activat"
 
 #: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
-#: ../../include/widgets.php:1387
+#: ../../include/widgets.php:1481
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4396,8 +4303,8 @@ msgid "Toggle"
 msgstr "Commutar"
 
 #: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
-#: ../../Zotlabs/Lib/Apps.php:215 ../../include/widgets.php:638
-#: ../../include/nav.php:208
+#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:210
+#: ../../include/widgets.php:647
 msgid "Settings"
 msgstr "Ajustos"
 
@@ -4453,7 +4360,7 @@ msgstr "Descarrega el Repositori de Plugins"
 msgid "Install new repo"
 msgstr "Instal·la un nou repositori "
 
-#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:334
 msgid "Install"
 msgstr "Instal·lar"
 
@@ -4469,8 +4376,8 @@ msgstr "Repositori de Plugins Instal·lat"
 msgid "Install a New Plugin Repository"
 msgstr "Instal·la un Nou Repositori de Plugins"
 
-#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:72
+#: ../../Zotlabs/Module/Settings.php:670 ../../Zotlabs/Lib/Apps.php:334
 msgid "Update"
 msgstr "Actualització"
 
@@ -4487,7 +4394,7 @@ msgid "Screenshot"
 msgstr "Copia de pantalla"
 
 #: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
-#: ../../include/widgets.php:1388
+#: ../../include/widgets.php:1482
 msgid "Themes"
 msgstr "Temes"
 
@@ -4503,8 +4410,8 @@ msgstr "[No soportat]"
 msgid "Log settings updated."
 msgstr "Registre d'ajustos actualitzat."
 
-#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1409
-#: ../../include/widgets.php:1419
+#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1503
+#: ../../include/widgets.php:1513
 msgid "Logs"
 msgstr "Logs"
 
@@ -4524,7 +4431,7 @@ msgstr "Arxiu de registre"
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
-msgstr ""
+msgstr "Ha de ser escribible pel servidor web. Relatiu al directori de nivell superior del servidor web"
 
 #: ../../Zotlabs/Module/Admin.php:1742
 msgid "Log level"
@@ -4570,7 +4477,7 @@ msgstr "No es troba la definició del camp"
 msgid "Edit Profile Field"
 msgstr "Camp d'Edició del Perfil"
 
-#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1390
+#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1484
 msgid "Profile Fields"
 msgstr "Camps del Perfil"
 
@@ -4598,57 +4505,384 @@ msgstr "Camps Personalitzats"
 msgid "Create Custom Field"
 msgstr "Crear un Camp Personalitzat"
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
-msgid "App installed."
-msgstr "Aplicació instal·lada."
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Name or caption"
+msgstr "Nom o llegenda"
 
-#: ../../Zotlabs/Module/Appman.php:46
-msgid "Malformed app."
-msgstr "Aplicació amb errors"
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
+msgstr "Exemples: \"Pep Gomila\", \"Manel i els seus Cavalls\", \"Fútbol\", \"Grup d'Aviadors\""
 
-#: ../../Zotlabs/Module/Appman.php:104
-msgid "Embed code"
-msgstr "Codi embegut"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+msgid "Choose a short nickname"
+msgstr "Tria un àlies curt"
 
-#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
-msgid "Edit App"
-msgstr "Edita l'Aplicació"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+#, php-format
+msgid ""
+"Your nickname will be used to create an easy to remember channel address "
+"e.g. nickname%s"
+msgstr "El teu àlies serà emprat per crear un nom fàcil per recordar l'adreça del canal p.e. àlies%s"
 
-#: ../../Zotlabs/Module/Appman.php:110
-msgid "Create App"
-msgstr "Crea l'Aplicació"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Channel role and privacy"
+msgstr "Funció i privacitat del canal"
 
-#: ../../Zotlabs/Module/Appman.php:115
-msgid "Name of app"
-msgstr "Nom de l'Aplicació"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Select a channel role with your privacy requirements."
+msgstr "Tria una funció pel canal amb els teus requisits de privacitat."
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Location (URL) of app"
-msgstr "Ubicació (URL) de l'aplicació"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Read more about roles"
+msgstr "Llegix més sobre els rols"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "Photo icon URL"
-msgstr "Foto icona URL"
+#: ../../Zotlabs/Module/New_channel.php:135
+msgid "Create Channel"
+msgstr "Crea un Canal"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "80 x 80 pixels - optional"
-msgstr "80 x 80 pixels - opcional"
+#: ../../Zotlabs/Module/New_channel.php:136
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
+msgstr "Un canal es la tva identitat en aquesta xarxa. Pot representar una persona, un bloc, o un fòrum per anomenar alguns. Els canals poden connectar-se amb altres canals per compartir informació amb permisos molt detallats."
 
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Categories (optional, comma separated list)"
-msgstr "Categories (opcional, lista separada per comes)"
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr "o <a href=\"import\">importa un canal existent</a> des d'un altre ubicació."
 
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Version ID"
-msgstr "Versió ID"
+#: ../../Zotlabs/Module/Ping.php:265
+msgid "sent you a private message"
+msgstr "Se t'ha enviat un missatge privat"
 
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Price of app"
-msgstr "Preu de l'aplicació"
+#: ../../Zotlabs/Module/Ping.php:313
+msgid "added your channel"
+msgstr "el teu canal s'ha afegit"
 
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Location (URL) to purchase app"
-msgstr "Ubicació (URL) per comprar l'aplicació"
+#: ../../Zotlabs/Module/Ping.php:323
+msgid "g A l F d"
+msgstr "g A l F d"
+
+#: ../../Zotlabs/Module/Ping.php:346
+msgid "[today]"
+msgstr "[avui]"
+
+#: ../../Zotlabs/Module/Ping.php:355
+msgid "posted an event"
+msgstr "enviat un esdeveniment"
+
+#: ../../Zotlabs/Module/Notifications.php:30
+msgid "Invalid request identifier."
+msgstr "Sol·licitud d'identificació invàlida."
+
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "Discard"
+msgstr "Descarta"
+
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:193
+msgid "Mark all system notifications seen"
+msgstr "Marca totes les notificacions vistes"
+
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228
+#: ../../include/conversation.php:963
+msgid "Poke"
+msgstr "Esperonar"
+
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
+msgstr "Emprenyar algú"
+
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
+msgstr "Esperonat/Picat"
+
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
+msgstr "emprenyar, picar o fer altres coses a algú"
+
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
+msgstr "Destinatari"
+
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
+msgstr "Tria que vols fer amb el destinatari"
+
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
+msgstr "Fer aquesta entrada privada"
+
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr "No es possible trobar el node"
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr "Entrada realitzada amb èxit. "
+
+#: ../../Zotlabs/Module/Openid.php:30
+msgid "OpenID protocol error. No ID returned."
+msgstr "Error del protocol OpenID. No ha retornat ID"
+
+#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:285
+msgid "Login failed."
+msgstr "Identificació fallida."
+
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr "Identificador invàlid de perfil."
+
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
+msgstr "Perfil del Editor de Visibilitat"
+
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1290
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
+msgstr "Clica sobre el contacte per afegir o esborrar."
+
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
+msgstr "Visible per"
+
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Aquest ajust requereix un procés espedial i l'edició esta bloquejada."
+
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
+msgstr "Editor de Configuració"
+
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "atenció: Realitzar segons quins ajustos pot fer el canal inoperable. Deixa aquesta pàgina si no estas segur i tens suficients coneixements sobre l'ús correcte d'aquesta característica."
+
+#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "URL sol·licitada retorna error: %1$s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:19
+#, php-format
+msgid "Version %s"
+msgstr "Versió %s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Installed plugins/addons/apps:"
+msgstr "Plugins/addons/apps Instal·lats:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:36
+msgid "No installed plugins/addons/apps"
+msgstr "Plugins/addons/apps no instal·lats"
+
+#: ../../Zotlabs/Module/Siteinfo.php:49
+msgid ""
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Aquest és un node de $Projectname, una xarxa cooperativa mundial de llocs web descentralitzats amb gran control de la privacitat."
+
+#: ../../Zotlabs/Module/Siteinfo.php:51
+msgid "Tag: "
+msgstr "Etiqueta:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:53
+msgid "Last background fetch: "
+msgstr "Última actualització en rerefons:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:55
+msgid "Current load average: "
+msgstr "Càrrega actual mitja:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:58
+msgid "Running at web location"
+msgstr "Correguent en el lloc web"
+
+#: ../../Zotlabs/Module/Siteinfo.php:59
+msgid ""
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr "Visita <a href=\"http://hubzilla.org\">hubzilla.org</a> per saber-ne més de $Projectname."
+
+#: ../../Zotlabs/Module/Siteinfo.php:60
+msgid "Bug reports and issues: please visit"
+msgstr "Per informar d'errors o problemes ves a"
+
+#: ../../Zotlabs/Module/Siteinfo.php:62
+msgid "$projectname issues"
+msgstr "$projectname qüestions"
+
+#: ../../Zotlabs/Module/Siteinfo.php:63
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Per suggerències, felicitacions i altres, envia'ns un mail a «redmatrix» [arroba] librelist [punt] com"
+
+#: ../../Zotlabs/Module/Siteinfo.php:65
+msgid "Site Administrators"
+msgstr "Administradors del lloc"
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Em trobat un problema durant l'inici de sessió amb el OpenID que has facilitat. verifica l'ortografia correcta de la ID."
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid "The error message was:"
+msgstr "El missatge d'error fou:"
+
+#: ../../Zotlabs/Module/Rmagic.php:48
+msgid "Authentication failed."
+msgstr "Ha fallat l'autentificació."
+
+#: ../../Zotlabs/Module/Rmagic.php:88
+msgid "Remote Authentication"
+msgstr "Autentificació Remota"
+
+#: ../../Zotlabs/Module/Rmagic.php:89
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Introdueix la teva adreça del canal (eg canal@exemple.com)"
+
+#: ../../Zotlabs/Module/Rmagic.php:90
+msgid "Authenticate"
+msgstr "Autentica't"
+
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1337
+msgid "Public Hubs"
+msgstr "Nodes Públics"
+
+#: ../../Zotlabs/Module/Pubsites.php:25
+msgid ""
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
+msgstr "Els nodes llistats permeten registrar usuaris de la xarxa $Projectname. Com que tots els nodes estan enllaçats entre ells, la identitat és vàlida a tota la xarxa. Alguns nodes poden demanar subscripció o oferir serveis addicional de pagament. Per a més detalls, <strong>proveu</strong> de seguir els enllaços dels proveïdors."
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Hub URL"
+msgstr "URL del Node"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Access Type"
+msgstr "Tipus d'accés"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Registration Policy"
+msgstr "Condicions d'inscripció"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Stats"
+msgstr "Estadístiques"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Software"
+msgstr "Programari"
+
+#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
+#: ../../include/conversation.php:962
+msgid "Ratings"
+msgstr "Valoracions"
+
+#: ../../Zotlabs/Module/Pubsites.php:38
+msgid "Rate"
+msgstr "Puntua"
+
+#: ../../Zotlabs/Module/Profile_photo.php:186
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Refresca la memòria cau del navegador si la foto no s'actualitza immediatament. Dreceres: «Ctrl+F5» i «Ctrl+Maj+R»"
+
+#: ../../Zotlabs/Module/Profile_photo.php:389
+msgid "Upload Profile Photo"
+msgstr "Puja una Foto pel Perfil"
+
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Editblock.php:108
+msgid "Block Name"
+msgstr "Nom del Bloc"
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2238
+msgid "Blocks"
+msgstr "Bloc"
+
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr "Títol del bloc"
+
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Website:"
+msgstr "Lloc web:"
+
+#: ../../Zotlabs/Module/Rate.php:163
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Canal Remot [%s] (encara no es coneix en aquest lloc)"
+
+#: ../../Zotlabs/Module/Rate.php:164
+msgid "Rating (this information is public)"
+msgstr "Valoració (aquesta informació és pública)"
+
+#: ../../Zotlabs/Module/Rate.php:165
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Opcionalment pots explicar la teva qualificació (aquesta informació és pública)"
+
+#: ../../Zotlabs/Module/Ratings.php:73
+msgid "No ratings"
+msgstr "No valorat"
+
+#: ../../Zotlabs/Module/Ratings.php:104
+msgid "Rating: "
+msgstr "Valoració:"
+
+#: ../../Zotlabs/Module/Ratings.php:105
+msgid "Website: "
+msgstr "Lloc web:"
+
+#: ../../Zotlabs/Module/Ratings.php:107
+msgid "Description: "
+msgstr "Descripció:"
+
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:165
+#: ../../include/widgets.php:102
+msgid "Apps"
+msgstr "Aplicatius"
+
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243
+msgid "Title (optional)"
+msgstr "Títol (opcional)"
+
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
+msgstr "Editar Bloc"
+
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr "No s'ha trobat el canal"
+
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr "Connexions en comú"
+
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
+msgstr "No hi ha connexions en comú."
 
 #: ../../Zotlabs/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
@@ -4668,12 +4902,12 @@ msgstr "O entra un nou nom de favorit"
 
 #: ../../Zotlabs/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
-msgstr "Nombre màxim de registres diaris excedit. Si us plau, provau demà."
+msgstr "Nombre màxim d'inscripcions diaris excedit. Si us plau, provau demà."
 
 #: ../../Zotlabs/Module/Register.php:55
 msgid ""
 "Please indicate acceptance of the Terms of Service. Registration failed."
-msgstr "El registre ha fallat. Si et plau, indica que acceptes les Condicions del Servei."
+msgstr "L'inscripció ha fallat. Si et plau, indica que acceptes les Condicions del Servei."
 
 #: ../../Zotlabs/Module/Register.php:89
 msgid "Passwords do not match."
@@ -4687,29 +4921,29 @@ msgstr "Registrat amb èxit. Si et plau revisa el teu correu electrònic per a l
 
 #: ../../Zotlabs/Module/Register.php:137
 msgid "Your registration is pending approval by the site owner."
-msgstr "El teu registre esta pendent de validació pel propietari del lloc."
+msgstr "La teva inscripció esta pendent de validació pel propietari del lloc."
 
 #: ../../Zotlabs/Module/Register.php:140
 msgid "Your registration can not be processed."
-msgstr "El teu registre no ha pogut ser processat. "
+msgstr "La teva inscripció no ha pogut ser processat. "
 
 #: ../../Zotlabs/Module/Register.php:184
 msgid "Registration on this hub is disabled."
-msgstr "El registre en aquest node està deshabilitat."
+msgstr "L'inscripció en aquest node està deshabilitat."
 
 #: ../../Zotlabs/Module/Register.php:193
 msgid "Registration on this hub is by approval only."
-msgstr "El registre en aquest node es únicament per validació."
+msgstr "L'inscripció en aquest node es únicament per validació."
 
 #: ../../Zotlabs/Module/Register.php:194
 msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>"
-msgstr "<a href=\"pubsites\">Registre en altre node afiliat</a>"
+msgstr "<a href=\"pubsites\">Inscripció en altre node afiliat</a>"
 
 #: ../../Zotlabs/Module/Register.php:204
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
-msgstr "El lloc ha excedit el límit màxim diari de nous comptes/registres. Provau demà."
+msgstr "El lloc ha excedit el límit màxim diari de nous comptes/inscripció. Provau demà."
 
 #: ../../Zotlabs/Module/Register.php:215
 msgid "Terms of Service"
@@ -4753,120 +4987,154 @@ msgstr "sí"
 msgid "Membership on this site is by invitation only."
 msgstr "La pertinença en aquest lloc es per invitació exclusivament."
 
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
-#: ../../boot.php:1685
+#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:149
+#: ../../boot.php:1686
 msgid "Register"
-msgstr "Registre"
+msgstr "Inscripció"
 
-#: ../../Zotlabs/Module/Register.php:262
-msgid "Proceed to create your first channel"
-msgstr "Comença a crear el teu primer canal"
+#: ../../Zotlabs/Module/Register.php:263
+msgid ""
+"This site may require email verification after submitting this form. If you "
+"are returned to a login page, please check your email for instructions."
+msgstr ""
 
 #: ../../Zotlabs/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Inicia Sessió."
 
-#: ../../Zotlabs/Module/Removeaccount.php:34
+#: ../../Zotlabs/Module/Removeaccount.php:35
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "L'esborrat de comptes no està permès fins que transcorren 48 hores des de l'últim canvi de contrasenya."
 
-#: ../../Zotlabs/Module/Removeaccount.php:56
+#: ../../Zotlabs/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Esborra el compte"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "WARNING: "
 msgstr "ALERTA:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Aquest compte i tots els seus canals s'estan apunt d'esborrar totalment de la xarxa."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This action is permanent and can not be undone!"
 msgstr "Aquesta acció és irreversible!"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeme.php:62
 msgid "Please enter your password for verification:"
 msgstr "Aquesta acció requereix tornar a introduir la contrasenya:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Esborra de la xarxa aquest compte, tots els seus canals, i tots els seus canals clons."
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Per defecte, només les instancies dels canal ubicats en aquest node poden esser esborrades  de la xarxa"
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
-#: ../../Zotlabs/Module/Settings.php:705
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings.php:759
 msgid "Remove Account"
 msgstr "Esborra el Compte"
 
-#: ../../Zotlabs/Module/Removeme.php:33
+#: ../../Zotlabs/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "L'esborrat de canals no està permès fins que transcorren 48 hores des de l'últim canvi de contrasenya."
 
-#: ../../Zotlabs/Module/Removeme.php:58
+#: ../../Zotlabs/Module/Removeme.php:60
 msgid "Remove This Channel"
 msgstr "Elimina Aquest Canal"
 
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This channel will be completely removed from the network. "
 msgstr "Aquest canal serà completament eliminat de la xarxa."
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid "Remove this channel and all its clones from the network"
 msgstr "Elimina aquest canal i els seus clons de la xarxa"
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "Per defecte, només la instancia del canal ubicat en aquest node pot esser esborrat  de la xarxa"
 
-#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Removeme.php:64 ../../Zotlabs/Module/Settings.php:1219
 msgid "Remove Channel"
 msgstr "Elimina el canal"
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+msgid "Export Channel"
+msgstr "Exportar Canal"
+
+#: ../../Zotlabs/Module/Uexport.php:57
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Em trobat un problema durant l'inici de sessió amb el OpenID que has facilitat. verifica l'ortografia correcta de la ID."
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Exporta la informació bàsica del canal a un arxiu. Això actua com a còpia de recolzament de les teves connexions, permisos, perfil i dades bàsiques, les quals pots emprar per traslladar aquestes dades a una altre lloc/node, però no conté el contingut del canal."
 
-#: ../../Zotlabs/Module/Rmagic.php:44
-msgid "The error message was:"
-msgstr "El missatge d'error fou:"
+#: ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Content"
+msgstr "Exportar el Contingut"
 
-#: ../../Zotlabs/Module/Rmagic.php:48
-msgid "Authentication failed."
-msgstr "Ha fallat l'autentificació."
+#: ../../Zotlabs/Module/Uexport.php:59
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Exporta la informació del canal i tot el contingut recent a un arxiu de recolzament JSON que por ser restaurat o importat en altre lloc/node. Això còpia totes les teves connexions, permisos, perfil i dades i mesos de entrades. L'arxiu pot ser MOLT gran. Si et plau, sigues pacient ja que pot trigar uns minuts a començar a baixar."
 
-#: ../../Zotlabs/Module/Rmagic.php:88
-msgid "Remote Authentication"
-msgstr "Autentificació Remota"
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export your posts from a given year."
+msgstr "Exporta les teves entrades d'un any donat."
 
-#: ../../Zotlabs/Module/Rmagic.php:89
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Introdueix la teva adreça del canal (eg canal@exemple.com)"
+#: ../../Zotlabs/Module/Uexport.php:62
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "Pots també exportar les teves entrades i conversacions d'un any o un mes en particular. Ajusta la data a la barra de direccions del navegador per seleccionar altres dates. Si la exportació falla (possiblement degut al esgotament de la memòria del node servidor), si et plau, intenta de nou la selecció d'un rang de dates més limitat."
 
-#: ../../Zotlabs/Module/Rmagic.php:90
-msgid "Authenticate"
-msgstr "Autentica't"
+#: ../../Zotlabs/Module/Uexport.php:63
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a "
+"href=\"%1$s\">%2$s</a>"
+msgstr "Per seleccionar tots els missatges per a un any determinat, com aquest any, visiteu <a href=\"%1$s\">%2$s</a>"
+
+#: ../../Zotlabs/Module/Uexport.php:64
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr "Per seleccionar tots els missatges per a un mes determinat, com el de gener d'aquest any, visiteu <a href=\"%1$s\">%2$s</a>"
+
+#: ../../Zotlabs/Module/Uexport.php:65
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a "
+"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
+" please import or restore these in date order (oldest first)."
+msgstr "Aquests arxius de contingut poden ser importats o restaurats per visitar  <a href=\"%1$s\">%2$s</a> en qualsevol lloc que conté el teu canal. Per obtenir els millors resultats si us plau, importar o restaurar aquests en ordre de data (la més antiga primer)."
 
 #: ../../Zotlabs/Module/Search.php:216
 #, php-format
@@ -4882,609 +5150,652 @@ msgstr "Resultats de cerca per: %s"
 msgid "No service class restrictions found."
 msgstr "No s'han trobat restriccions de clase."
 
-#: ../../Zotlabs/Module/Settings.php:69
+#: ../../Zotlabs/Module/Settings.php:64
 msgid "Name is required"
 msgstr "Es requereix un Nom"
 
-#: ../../Zotlabs/Module/Settings.php:73
+#: ../../Zotlabs/Module/Settings.php:68
 msgid "Key and Secret are required"
 msgstr "Es requereix Clau (Key) i el Secret (Secret)"
 
-#: ../../Zotlabs/Module/Settings.php:225
+#: ../../Zotlabs/Module/Settings.php:138
+#, php-format
+msgid "This channel is limited to %d tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:144
+msgid "Name and Password are required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:168
+msgid "Token saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:274
 msgid "Not valid email."
 msgstr "E-correu no vàlid."
 
-#: ../../Zotlabs/Module/Settings.php:228
+#: ../../Zotlabs/Module/Settings.php:277
 msgid "Protected email address. Cannot change to that email."
 msgstr "Adreça d'e-correu protegida. No es pot canviar a aquest e-correu."
 
-#: ../../Zotlabs/Module/Settings.php:237
+#: ../../Zotlabs/Module/Settings.php:286
 msgid "System failure storing new email. Please try again."
 msgstr "Fallada del sistema al guardar un nou correu. Si us plau, proba de nou."
 
-#: ../../Zotlabs/Module/Settings.php:254
+#: ../../Zotlabs/Module/Settings.php:303
 msgid "Password verification failed."
 msgstr "La verificació de la contrasenya ha fallat."
 
-#: ../../Zotlabs/Module/Settings.php:261
+#: ../../Zotlabs/Module/Settings.php:310
 msgid "Passwords do not match. Password unchanged."
 msgstr "Les contrasenyes no coincideixen. Contrasenya sense canvis."
 
-#: ../../Zotlabs/Module/Settings.php:265
+#: ../../Zotlabs/Module/Settings.php:314
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Les contrasenyes en blanc no estan permesas. Contrasenya sense canvis."
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Zotlabs/Module/Settings.php:328
 msgid "Password changed."
 msgstr "Contrasenya canviada."
 
-#: ../../Zotlabs/Module/Settings.php:281
+#: ../../Zotlabs/Module/Settings.php:330
 msgid "Password update failed. Please try again."
 msgstr "L'actualització de la contrasenya va fallar. Si us plau, torneu a intentar-ho."
 
-#: ../../Zotlabs/Module/Settings.php:525
+#: ../../Zotlabs/Module/Settings.php:579
 msgid "Settings updated."
 msgstr "Ajustes actualizados."
 
-#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
-#: ../../Zotlabs/Module/Settings.php:651
+#: ../../Zotlabs/Module/Settings.php:643 ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:705
 msgid "Add application"
 msgstr "Afegir aplicatiu"
 
-#: ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:646
 msgid "Name of application"
 msgstr "Nom de l'aplicatiu"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:673
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:648
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Generat automàticament- Canvia-ho si ho vols. Max. longitud 20"
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:648 ../../Zotlabs/Module/Settings.php:674
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
+#: ../../Zotlabs/Module/Settings.php:649 ../../Zotlabs/Module/Settings.php:675
 msgid "Redirect"
 msgstr "Redirecciona"
 
-#: ../../Zotlabs/Module/Settings.php:595
+#: ../../Zotlabs/Module/Settings.php:649
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "URI redirigida - No canviar excepte perquè el teu aplicatiu ho requereixi."
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Settings.php:622
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Settings.php:676
 msgid "Icon url"
 msgstr "Icona de url"
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Sources.php:112
 #: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr "Opcional"
 
-#: ../../Zotlabs/Module/Settings.php:607
+#: ../../Zotlabs/Module/Settings.php:661
 msgid "Application not found."
 msgstr "Aplicatiu no trobat."
 
-#: ../../Zotlabs/Module/Settings.php:650
+#: ../../Zotlabs/Module/Settings.php:704
 msgid "Connected Apps"
 msgstr "Aplicatius Conectats"
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:708
 msgid "Client key starts with"
 msgstr "La clau del client comença amb"
 
-#: ../../Zotlabs/Module/Settings.php:655
+#: ../../Zotlabs/Module/Settings.php:709
 msgid "No name"
 msgstr "Sin nombre"
 
-#: ../../Zotlabs/Module/Settings.php:656
+#: ../../Zotlabs/Module/Settings.php:710
 msgid "Remove authorization"
 msgstr "Elimina autorització"
 
-#: ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:723
 msgid "No feature settings configured"
 msgstr "No hi ha opcions de les funcions configurades"
 
-#: ../../Zotlabs/Module/Settings.php:676
+#: ../../Zotlabs/Module/Settings.php:730
 msgid "Feature/Addon Settings"
 msgstr "Ajustos de Complements"
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:753
 msgid "Account Settings"
 msgstr "Ajustos de Compte"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:754
 msgid "Current Password"
 msgstr "Contrasenya Actual"
 
-#: ../../Zotlabs/Module/Settings.php:701
+#: ../../Zotlabs/Module/Settings.php:755
 msgid "Enter New Password"
 msgstr "Entra la Nova Contrasenya"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 msgid "Confirm New Password"
 msgstr "Confirma la Nova Contrasenya"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 msgid "Leave password fields blank unless changing"
 msgstr "Deixa els camps de contrasenya en blanc llevat que la vulguis canviar"
 
-#: ../../Zotlabs/Module/Settings.php:704
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:758
+#: ../../Zotlabs/Module/Settings.php:1136
 msgid "Email Address:"
 msgstr "Adreça de E-Correu:"
 
-#: ../../Zotlabs/Module/Settings.php:706
+#: ../../Zotlabs/Module/Settings.php:760
 msgid "Remove this account including all its channels"
 msgstr "Esborra aquest compte inclosos tots els seus canals"
 
-#: ../../Zotlabs/Module/Settings.php:729
+#: ../../Zotlabs/Module/Settings.php:789
+msgid ""
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in Access Control Lists and "
+"visitors may login using these credentials to access the private content."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:791
+msgid ""
+"You may also provide <em>dropbox</em> style access links to friends and "
+"associates by adding the Login Password to any specific site URL as shown. "
+"Examples:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:796 ../../include/widgets.php:614
+msgid "Guest Access Tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:803
+msgid "Login Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:804
+msgid "Login Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:805
+msgid "Expires (yyyy-mm-dd)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:830
 msgid "Additional Features"
 msgstr "Característiques Addicionals"
 
-#: ../../Zotlabs/Module/Settings.php:753
+#: ../../Zotlabs/Module/Settings.php:854
 msgid "Connector Settings"
 msgstr "Ajustos de Connector"
 
-#: ../../Zotlabs/Module/Settings.php:792
+#: ../../Zotlabs/Module/Settings.php:893
 msgid "No special theme for mobile devices"
 msgstr "No emprar tema especial per aparells mòbils"
 
-#: ../../Zotlabs/Module/Settings.php:795
+#: ../../Zotlabs/Module/Settings.php:896
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimental)"
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:938
 msgid "Display Settings"
 msgstr "Ajustos de Pantalla"
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:939
 msgid "Theme Settings"
 msgstr "Ajustos de Tema"
 
-#: ../../Zotlabs/Module/Settings.php:839
+#: ../../Zotlabs/Module/Settings.php:940
 msgid "Custom Theme Settings"
 msgstr "Ajustos Personals de Tema"
 
-#: ../../Zotlabs/Module/Settings.php:840
+#: ../../Zotlabs/Module/Settings.php:941
 msgid "Content Settings"
 msgstr "Ajustos de Contingut"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:947
 msgid "Display Theme:"
 msgstr "Ajustos de Tema:"
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:948
 msgid "Mobile Theme:"
 msgstr "Tema Mòbil:"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 msgid "Preload images before rendering the page"
 msgstr "Precarrega les imatges abans de dibuixar la pàgina"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "El temps subjectiu per carregar la pàgina pot ser llarg però la pàgina estarà preparada quan es mostri"
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:950
 msgid "Enable user zoom on mobile devices"
 msgstr "Zoom d'usuari en dispositius mòbils"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Update browser every xx seconds"
 msgstr "Actualitza el navegador cada xx segons"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Mínim de 10 segons, sense màxim"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:952
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Nombre màxim de conversacions a càrregar cada vegada"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:952
 msgid "Maximum of 100 items"
 msgstr "Màxim de 100 elements"
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:953
 msgid "Show emoticons (smilies) as images"
 msgstr "Mostra emoticons (smilies) com a imatges"
 
-#: ../../Zotlabs/Module/Settings.php:853
+#: ../../Zotlabs/Module/Settings.php:954
 msgid "Link post titles to source"
 msgstr "Enllaça a l'origen els títols de l'entrada"
 
-#: ../../Zotlabs/Module/Settings.php:854
+#: ../../Zotlabs/Module/Settings.php:955
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Editor de Disseny de la Pàgina del Sistema - (avançat)"
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:958
 msgid "Use blog/list mode on channel page"
 msgstr "Empra el mode blog/llista a la pàgina del canal"
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:958 ../../Zotlabs/Module/Settings.php:959
 msgid "(comments displayed separately)"
 msgstr "(Observacions es mostren per separat)"
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:959
 msgid "Use blog/list mode on grid page"
 msgstr "Empra el mode de blog/llista a la pàgina de la malla"
 
-#: ../../Zotlabs/Module/Settings.php:859
+#: ../../Zotlabs/Module/Settings.php:960
 msgid "Channel page max height of content (in pixels)"
 msgstr "Alçada màxima de contingut (en píxels) de la pàgina de Canal"
 
-#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:960 ../../Zotlabs/Module/Settings.php:961
 msgid "click to expand content exceeding this height"
 msgstr "Clic per expandir el contingut que excedeixi aquesta alçada"
 
-#: ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:961
 msgid "Grid page max height of content (in pixels)"
 msgstr "Alçada màxima dels continguts (en píxels) de la Pàgina de Malla "
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Zotlabs/Module/Settings.php:990
 msgid "Nobody except yourself"
 msgstr "Ningú excepte tú"
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:991
 msgid "Only those you specifically allow"
 msgstr "Només allò que específicament permetis"
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:992
 msgid "Approved connections"
 msgstr "Connexions aprovades"
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:993
 msgid "Any connections"
 msgstr "Qualsevol connexió"
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:994
 msgid "Anybody on this website"
 msgstr "Qualsevol en aquest lloc"
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:995
 msgid "Anybody in this network"
 msgstr "Qualsevol en aquesta xarxa"
 
-#: ../../Zotlabs/Module/Settings.php:900
+#: ../../Zotlabs/Module/Settings.php:996
 msgid "Anybody authenticated"
 msgstr "Qualsevol autenticat"
 
-#: ../../Zotlabs/Module/Settings.php:901
+#: ../../Zotlabs/Module/Settings.php:997
 msgid "Anybody on the internet"
 msgstr "Qualsevol a internet"
 
-#: ../../Zotlabs/Module/Settings.php:976
+#: ../../Zotlabs/Module/Settings.php:1071
 msgid "Publish your default profile in the network directory"
 msgstr "Publica el teu perfil per defecte al directori de la xarxa"
 
-#: ../../Zotlabs/Module/Settings.php:981
+#: ../../Zotlabs/Module/Settings.php:1076
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Ens permets suggerir-te com a potencial amic als nous membres?"
 
-#: ../../Zotlabs/Module/Settings.php:990
+#: ../../Zotlabs/Module/Settings.php:1085
 msgid "Your channel address is"
 msgstr "La teva adreça del canal es"
 
-#: ../../Zotlabs/Module/Settings.php:1032
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Channel Settings"
 msgstr "Ajustos del Canal"
 
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:1134
 msgid "Basic Settings"
 msgstr "Ajustos Bàsics"
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140
+#: ../../Zotlabs/Module/Settings.php:1135 ../../include/channel.php:1180
 msgid "Full Name:"
 msgstr "Nom Complet:"
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1137
 msgid "Your Timezone:"
 msgstr "La teva Franja Horària"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Default Post Location:"
 msgstr "Localització Predeterminada de les Entrades:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Geographical location to display on your posts"
 msgstr "Posició geogràfica a mostrar a les teves entrades"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1139
 msgid "Use Browser Location:"
 msgstr "Empra la Localització del Navegador:"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 msgid "Adult Content"
 msgstr "Contingut per a Adults"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Aquest canal publica freqúentment o amb regularitat contingut per a adults. (Si us plau, etiqueti qualsevol material per a adults amb #NSFW)"
 
-#: ../../Zotlabs/Module/Settings.php:1048
+#: ../../Zotlabs/Module/Settings.php:1143
 msgid "Security and Privacy Settings"
 msgstr "Ajustos de Seguretat i Privacitat"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1146
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Els teus permisos estan configurats. Clic per veure/ajustar"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 msgid "Hide my online presence"
 msgstr "Amaga la meva presencia en línia"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Evita mostrar en el teu perfil, que estàs en línia"
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Zotlabs/Module/Settings.php:1150
 msgid "Simple Privacy Settings:"
 msgstr "Ajustos simples de privacitat:"
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1151
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Molt públic - <em>extremadament permissiu (s'ha d'anar en compte)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Zotlabs/Module/Settings.php:1152
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Normal - <em>públic per defecte, privat quan es desitgi (similar als permisos de xarxa social, però amb millor privacitat)"
 
-#: ../../Zotlabs/Module/Settings.php:1058
+#: ../../Zotlabs/Module/Settings.php:1153
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privat - <em>privat per defecte, mai públic o obert</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1154
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Bloquejat - <em>tothom bloquejat per defecte</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 msgid "Allow others to tag your posts"
 msgstr "Permet a altres etiquetar les teves entrades"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Sovint emprat per la comunitat per marcar retroactivament contingut inapropiat"
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1158
 msgid "Advanced Privacy Settings"
 msgstr "Ajustos avançats de privacitat"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "Expire other channel content after this many days"
 msgstr "El contingut d'altes canals caduca després d'aquests dies"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "0 or blank to use the website limit."
 msgstr "0 o en blanc per emprar el limit del lloc web."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Aquest lloc web expira després de %d dies."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "This website does not expire imported content."
 msgstr "A aquest lloc web no expira el contingut importat"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "El límit del lloc web pren la preferència si es inferior al teu límit."
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "Maximum Friend Requests/Day:"
 msgstr "Nombre màxim de peticions d'amistat per dia"
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "May reduce spam activity"
 msgstr "Pot reduir l'SPAM"
 
-#: ../../Zotlabs/Module/Settings.php:1067
+#: ../../Zotlabs/Module/Settings.php:1162
 msgid "Default Post and Publish Permissions"
 msgstr "Permisos de Entrades i Publicació per defecte"
 
-#: ../../Zotlabs/Module/Settings.php:1069
+#: ../../Zotlabs/Module/Settings.php:1164
 msgid "Use my default audience setting for the type of object published"
 msgstr "Empra els meus ajustos per defecte segons el tipus de entrada publicada"
 
-#: ../../Zotlabs/Module/Settings.php:1072
+#: ../../Zotlabs/Module/Settings.php:1167
 msgid "Channel permissions category:"
 msgstr "Categoria de permisos de canal:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Nombre màxim de missatges privats de desconeguts al dia:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Useful to reduce spamming"
 msgstr "Útil per a reduir l'spam"
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1176
 msgid "Notification Settings"
 msgstr "Ajustos de notificacions"
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1177
 msgid "By default post a status message when:"
 msgstr "Per defecte envia un missatge d'estat quan:"
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1178
 msgid "accepting a friend request"
 msgstr "S'accepta una sol·licitud d'amistat"
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1179
 msgid "joining a forum/community"
 msgstr "Apuntar-se a un fòrum o comunitat"
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1180
 msgid "making an <em>interesting</em> profile change"
 msgstr "Faci un canvi  <em>interesant</em> al perfil"
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1181
 msgid "Send a notification email when:"
 msgstr "Notifica per correu quan:"
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1182
 msgid "You receive a connection request"
 msgstr "Rebi una petició de connexió"
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1183
 msgid "Your connections are confirmed"
 msgstr "Es confirma una connexió"
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1184
 msgid "Someone writes on your profile wall"
 msgstr "Algú ha escrit al mur del teu perfil"
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1185
 msgid "Someone writes a followup comment"
 msgstr "Algú ha escrit un comentari de resposta"
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1186
 msgid "You receive a private message"
 msgstr "Rebi un missatge privat"
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1187
 msgid "You receive a friend suggestion"
 msgstr "Rebi una suggerència d'amistat"
 
-#: ../../Zotlabs/Module/Settings.php:1093
+#: ../../Zotlabs/Module/Settings.php:1188
 msgid "You are tagged in a post"
 msgstr "Estàs etiquetat a l'entrada"
 
-#: ../../Zotlabs/Module/Settings.php:1094
+#: ../../Zotlabs/Module/Settings.php:1189
 msgid "You are poked/prodded/etc. in a post"
 msgstr "S'enfoten/te piquen/etc. en una entrada"
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1192
 msgid "Show visual notifications including:"
 msgstr "Mostra notificacion visuals, com ara:"
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1194
 msgid "Unseen grid activity"
 msgstr "Activitat de malla no vista"
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1195
 msgid "Unseen channel activity"
 msgstr "Activitat no vista del canal"
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1196
 msgid "Unseen private messages"
 msgstr "Missatges privats no llegits"
 
-#: ../../Zotlabs/Module/Settings.php:1101
-#: ../../Zotlabs/Module/Settings.php:1106
-#: ../../Zotlabs/Module/Settings.php:1107
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1196
+#: ../../Zotlabs/Module/Settings.php:1201
+#: ../../Zotlabs/Module/Settings.php:1202
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "Recommended"
 msgstr "Recomanat"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1197
 msgid "Upcoming events"
 msgstr "Esdeveniments propers"
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1198
 msgid "Events today"
 msgstr "Esdeveniments d'avui"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Upcoming birthdays"
 msgstr "Aniversaris propers"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Not available in all themes"
 msgstr "No està disponible en tots els temes"
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1200
 msgid "System (personal) notifications"
 msgstr "Notificacions (personals) del sistema"
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1201
 msgid "System info messages"
 msgstr "Missatges d'informació del sistema"
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1202
 msgid "System critical alerts"
 msgstr "Alertes crítiques del sistema"
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "New connections"
 msgstr "Noves connexions"
 
-#: ../../Zotlabs/Module/Settings.php:1109
+#: ../../Zotlabs/Module/Settings.php:1204
 msgid "System Registrations"
-msgstr "Registres del sistema"
+msgstr "Inscripcions del Sistema"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1205
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Mostra també les entrades de mur noves, les entrades privades i les connexions a \"Notícies\""
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 msgid "Notify me of events this many days in advance"
 msgstr "Notifica'm dels esdeveniments amb aquests dies d'antelació"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 msgid "Must be greater than 0"
 msgstr "Ha de ser més gran que 0"
 
-#: ../../Zotlabs/Module/Settings.php:1114
+#: ../../Zotlabs/Module/Settings.php:1209
 msgid "Advanced Account/Page Type Settings"
 msgstr "Ajustos avançats de compte i tipus de pàgina"
 
-#: ../../Zotlabs/Module/Settings.php:1115
+#: ../../Zotlabs/Module/Settings.php:1210
 msgid "Change the behaviour of this account for special situations"
 msgstr "Modifica el comportament d'aquest compte en situacions especials"
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1213
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr "Activa el mode d'expert (a <a href=\"settings/features\">Ajustos > Més funcions</a>)"
 
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1214
 msgid "Miscellaneous Settings"
 msgstr "Ajustos diversos"
 
-#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1215
 msgid "Default photo upload folder"
 msgstr "Carpeta per defecte de fotos pujades"
 
-#: ../../Zotlabs/Module/Settings.php:1120
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1215
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - any en curs, %m -  mes corrent"
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "Default file upload folder"
 msgstr "Carpeta per defecte d'arxius pujats"
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1218
 msgid "Personal menu to display in your channel pages"
 msgstr "Menú personal per mostrar en les teves pàgines de canal"
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Zotlabs/Module/Settings.php:1220
 msgid "Remove this channel."
 msgstr "Elimina aquest canal."
 
-#: ../../Zotlabs/Module/Settings.php:1126
+#: ../../Zotlabs/Module/Settings.php:1221
 msgid "Firefox Share $Projectname provider"
 msgstr "Firefox Share $Projectname provider"
 
-#: ../../Zotlabs/Module/Settings.php:1127
+#: ../../Zotlabs/Module/Settings.php:1222
 msgid "Start calendar week on monday"
 msgstr "Comença la setmana del calendari el dilluns"
 
@@ -5517,7 +5828,7 @@ msgid ""
 msgstr "Podria ser necessari importar el fitxer \"install / schema_xxx.sql\" manualment utilitzant un client de base de dades."
 
 #: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
-#: ../../Zotlabs/Module/Setup.php:721
+#: ../../Zotlabs/Module/Setup.php:722
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Si us plau, consulteu el fitxer \"install / INSTALL.txt\"."
 
@@ -5717,199 +6028,200 @@ msgid "mb_string PHP module"
 msgstr "mòdul PHP mb_string"
 
 #: ../../Zotlabs/Module/Setup.php:496
-msgid "mcrypt PHP module"
-msgstr "mòdul PHP mcrypt"
-
-#: ../../Zotlabs/Module/Setup.php:497
 msgid "xml PHP module"
 msgstr "Mòdul xml de PHP"
 
-#: ../../Zotlabs/Module/Setup.php:501 ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:500 ../../Zotlabs/Module/Setup.php:502
 msgid "Apache mod_rewrite module"
 msgstr "mòdul Apache mod_rewrite"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Zotlabs/Module/Setup.php:500
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Error: el mòdul mod-rewrite del servidor web Apache es requereix i no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:506 ../../Zotlabs/Module/Setup.php:509
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Zotlabs/Module/Setup.php:506
 msgid ""
 "Error: proc_open is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Error: es requereix proc_open però o no està instal·lat o ha estat desactivat a php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:514
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Error: el mòdul PHP libCURL es requereix però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:518
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Error: el mòdul PHP GD graphics amb support JPEG es requereix però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:523
+#: ../../Zotlabs/Module/Setup.php:522
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Error: el mòdul PHP openssl es requereix però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Zotlabs/Module/Setup.php:526
 msgid ""
 "Error: mysqli or postgres PHP module required but neither are installed."
 msgstr "Error: el mòdul PHO mysqli o postgres es requereix però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:531
+#: ../../Zotlabs/Module/Setup.php:530
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Error: el mòdul PHP mb_string es requereix però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:535
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Error: el mòdul PHP mcrypt es requereix però no està instal·lat."
-
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Zotlabs/Module/Setup.php:534
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Error: el mòdul xml de PHP es requereix per DAV però no està instal·lat."
 
-#: ../../Zotlabs/Module/Setup.php:557
+#: ../../Zotlabs/Module/Setup.php:552
 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 "L'instaŀlador ha de poder crear i modificar un fitxer anomenat «.htconfig.php» a la carpeta arrel del servidor, però sembla que no ho pot fer."
 
-#: ../../Zotlabs/Module/Setup.php:558
+#: ../../Zotlabs/Module/Setup.php:553
 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 "Això sol ser un problema de permisos. Per molt que el teu usuari pugui modificar-lo, és el del servidor web qui necessita els poders de modificació."
 
-#: ../../Zotlabs/Module/Setup.php:559
+#: ../../Zotlabs/Module/Setup.php:554
 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 final d'aquest procés hauràs de desar un text a l'arxiu «.htconfig.php», que es troba a la carpeta arrel del servidor."
 
-#: ../../Zotlabs/Module/Setup.php:560
+#: ../../Zotlabs/Module/Setup.php:555
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr "Aquest procés és opcional. Per a fer una instaŀlació manual consulta les instruccions a «install/INSTALL.txt\"."
 
-#: ../../Zotlabs/Module/Setup.php:563
+#: ../../Zotlabs/Module/Setup.php:558
 msgid ".htconfig.php is writable"
 msgstr "L'arxiu «.htconfig.php» es pot modificar"
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Zotlabs/Module/Setup.php:572
 msgid ""
 "Red uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr "Red fa servir el motor de plantilles Smarty3 per a renderitzar les vistes més ràpidament."
 
-#: ../../Zotlabs/Module/Setup.php:578
+#: ../../Zotlabs/Module/Setup.php:573
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr "Per tal de guardar aquestes plantilles compilades, el servidor web necessita tenir premis d'escriptura en el directori %s sota la carpeta principal."
 
-#: ../../Zotlabs/Module/Setup.php:579 ../../Zotlabs/Module/Setup.php:600
+#: ../../Zotlabs/Module/Setup.php:574 ../../Zotlabs/Module/Setup.php:595
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Comprova que l'usuari que executa el servidor (www-data en Apache) té permisos d'escriptura en aquesta carpeta."
 
-#: ../../Zotlabs/Module/Setup.php:580
+#: ../../Zotlabs/Module/Setup.php:575
 #, 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: com a mesura de seguretat l'usuari del servidor web ha de tenir accés d'escriptura només a %s, i no a les plantilles (.tpl) que conté."
 
-#: ../../Zotlabs/Module/Setup.php:583
+#: ../../Zotlabs/Module/Setup.php:578
 #, php-format
 msgid "%s is writable"
 msgstr "Es pot escriure a %s"
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Zotlabs/Module/Setup.php:594
 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 fa servir la carpeta «store» per a desar els fitxers pujats. Per tant, el servidor web necessita tenir permís d'escriptura en aquesta carpeta, que està a l'arrel del servidor web."
+"This software 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Zotlabs/Module/Setup.php:598
 msgid "store is writable"
 msgstr "Es pot escriure al magatzem (store)"
 
-#: ../../Zotlabs/Module/Setup.php:636
+#: ../../Zotlabs/Module/Setup.php:631
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "El certificat SSL no s'ha pogut validar. Arregla-ho o deshabilita l'accés https a aquest lloc"
 
-#: ../../Zotlabs/Module/Setup.php:637
+#: ../../Zotlabs/Module/Setup.php:632
 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 tens accès pet https al teu lloc web o permets connexions pel port TCP 443 (port https), Has d'emprar un certificat VÀLID. NO es poden emprar certificats AUTO-SIGNATS!"
 
-#: ../../Zotlabs/Module/Setup.php:638
+#: ../../Zotlabs/Module/Setup.php:633
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "El motiu d'aquesta restricció és que les teves entrades públiques poden contenir referències a imatges del teu propi node."
 
-#: ../../Zotlabs/Module/Setup.php:639
+#: ../../Zotlabs/Module/Setup.php:634
 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 el teu certificat no és reconegut, llavors el membres d'altres hubs, encara que tinguin certificats vàlids, rebran una advertència de seguretat en carregar contingut teu."
 
-#: ../../Zotlabs/Module/Setup.php:640
+#: ../../Zotlabs/Module/Setup.php:635
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Per tant, com que perjudica la usabilitat més enllà del teu lloc, la restricció de tenir un certificat reconegut és molt important."
 
-#: ../../Zotlabs/Module/Setup.php:641
+#: ../../Zotlabs/Module/Setup.php:636
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Hi ha autoritats de certificació reconegudes que ofereixen certificats gratuïts."
 
-#: ../../Zotlabs/Module/Setup.php:643
+#: ../../Zotlabs/Module/Setup.php:638
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:641
 msgid "SSL certificate validation"
 msgstr "Validació del certificat SSL"
 
-#: ../../Zotlabs/Module/Setup.php:649
+#: ../../Zotlabs/Module/Setup.php:647
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "No es poden reescriure les URL a «.htaccess». Comprova la configuració del servidor:"
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Zotlabs/Module/Setup.php:650
 msgid "Url rewrite is working"
 msgstr "Es poden reescriure les URL a «.htaccess»"
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:659
 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 "L'arxiu de configuracio de la base de dades «.htconfig.php» no s'ha pogut modificar. El pots crear tu a l'arrel del servidor web amb el text de la caixa com a contingut."
 
-#: ../../Zotlabs/Module/Setup.php:685
+#: ../../Zotlabs/Module/Setup.php:683
 msgid "Errors encountered creating database tables."
 msgstr "S'han produït errors mentre es creaven taules a la base de dades."
 
-#: ../../Zotlabs/Module/Setup.php:719
+#: ../../Zotlabs/Module/Setup.php:720
 msgid "<h1>What next</h1>"
 msgstr "<h1>I ara què?</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:720
+#: ../../Zotlabs/Module/Setup.php:721
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -5931,64 +6243,62 @@ msgstr "Esborra tots els arxius"
 msgid "Remove this file"
 msgstr "Esborra l'arxiu"
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Zotlabs/Module/Thing.php:114
+msgid "Thing updated"
+msgstr "S'ha actualitzat la cosa"
+
+#: ../../Zotlabs/Module/Thing.php:166
+msgid "Object store: failed"
+msgstr "No s'ha pogut emmagatzemar l'objecte"
+
+#: ../../Zotlabs/Module/Thing.php:170
+msgid "Thing added"
+msgstr "S'ha afegit la cosa"
+
+#: ../../Zotlabs/Module/Thing.php:196
 #, php-format
-msgid "Version %s"
-msgstr "Versió %s"
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:40
-msgid "Installed plugins/addons/apps:"
-msgstr "Plugins/addons/apps Instal·lats:"
+#: ../../Zotlabs/Module/Thing.php:259
+msgid "Show Thing"
+msgstr "Mostra la cosa"
 
-#: ../../Zotlabs/Module/Siteinfo.php:53
-msgid "No installed plugins/addons/apps"
-msgstr "Plugins/addons/apps no instal·lats"
+#: ../../Zotlabs/Module/Thing.php:266
+msgid "item not found."
+msgstr "no s'ha trobat l'element."
 
-#: ../../Zotlabs/Module/Siteinfo.php:66
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
-msgstr "Aquest és un node de $Projectname, una xarxa cooperativa mundial de llocs web descentralitzats amb gran control de la privacitat."
+#: ../../Zotlabs/Module/Thing.php:299
+msgid "Edit Thing"
+msgstr "Edita la cosa"
 
-#: ../../Zotlabs/Module/Siteinfo.php:68
-msgid "Tag: "
-msgstr "Etiqueta:"
+#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
+msgid "Select a profile"
+msgstr "Tria un perfil"
 
-#: ../../Zotlabs/Module/Siteinfo.php:70
-msgid "Last background fetch: "
-msgstr "Última actualització en rerefons:"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Post an activity"
+msgstr "Publica una activitat"
 
-#: ../../Zotlabs/Module/Siteinfo.php:72
-msgid "Current load average: "
-msgstr "Càrrega actual mitja:"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Only sends to viewers of the applicable profile"
+msgstr "S'envia només a visitants del perfil corresponent"
 
-#: ../../Zotlabs/Module/Siteinfo.php:75
-msgid "Running at web location"
-msgstr "Correguent en el lloc web"
+#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
+msgid "Name of thing e.g. something"
+msgstr "Nom de la cosa. Exemple: patata"
 
-#: ../../Zotlabs/Module/Siteinfo.php:76
-msgid ""
-"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
-"about $Projectname."
-msgstr "Visita <a href=\"http://hubzilla.org\">hubzilla.org</a> per saber-ne més de $Projectname."
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
+msgid "URL of thing (optional)"
+msgstr "Adreça URL de la cosa (opcional)"
 
-#: ../../Zotlabs/Module/Siteinfo.php:77
-msgid "Bug reports and issues: please visit"
-msgstr "Per informar d'errors o problemes ves a"
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
+msgid "URL for photo of thing (optional)"
+msgstr "Adreça URL de la foto d'una cosa (opcional)"
 
-#: ../../Zotlabs/Module/Siteinfo.php:79
-msgid "$projectname issues"
-msgstr "$projectname qüestions"
-
-#: ../../Zotlabs/Module/Siteinfo.php:80
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Per suggerències, felicitacions i altres, envia'ns un mail a «redmatrix» [arroba] librelist [punt] com"
-
-#: ../../Zotlabs/Module/Siteinfo.php:82
-msgid "Site Administrators"
-msgstr "Administradors del lloc"
+#: ../../Zotlabs/Module/Thing.php:349
+msgid "Add Thing to your Profile"
+msgstr "Afegeix una cosa al teu perfil"
 
 #: ../../Zotlabs/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
@@ -6006,8 +6316,8 @@ msgstr "Origen actualitzat."
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630
-#: ../../include/features.php:71
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:72
+#: ../../include/widgets.php:639
 msgid "Channel Sources"
 msgstr "Canal Origen"
 
@@ -6083,12 +6393,12 @@ msgstr "No hi ha suggerencies. Si es un lloc nou, espera 24 hores i proba de nou
 msgid "Ignore/Hide"
 msgstr "Ignora/Amaga"
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:263
 msgid "post"
 msgstr "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:1929
 msgid "comment"
 msgstr "comentari"
 
@@ -6109,131 +6419,110 @@ msgstr "Elimina l'etiqueta d'element"
 msgid "Select a tag to remove: "
 msgstr "Tria l'etiqueta a eliminar:"
 
-#: ../../Zotlabs/Module/Thing.php:114
-msgid "Thing updated"
-msgstr "S'ha actualitzat la cosa"
+#: ../../Zotlabs/Module/Webpages.php:191 ../../Zotlabs/Lib/Apps.php:218
+#: ../../include/nav.php:106 ../../include/conversation.php:1700
+msgid "Webpages"
+msgstr "Pàgines web"
 
-#: ../../Zotlabs/Module/Thing.php:166
-msgid "Object store: failed"
-msgstr "No s'ha pogut emmagatzemar l'objecte"
+#: ../../Zotlabs/Module/Webpages.php:202 ../../include/page_widgets.php:44
+msgid "Actions"
+msgstr "Accions"
 
-#: ../../Zotlabs/Module/Thing.php:170
-msgid "Thing added"
-msgstr "S'ha afegit la cosa"
+#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:45
+msgid "Page Link"
+msgstr "Enllaç a Pàgina"
 
-#: ../../Zotlabs/Module/Thing.php:196
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr "OBJ: %1$s %2$s %3$s"
+#: ../../Zotlabs/Module/Webpages.php:204
+msgid "Page Title"
+msgstr "Títol de la pàgina"
 
-#: ../../Zotlabs/Module/Thing.php:259
-msgid "Show Thing"
-msgstr "Mostra la cosa"
+#: ../../Zotlabs/Module/Wiki.php:34
+msgid "Not found"
+msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:266
-msgid "item not found."
-msgstr "no s'ha trobat l'element."
+#: ../../Zotlabs/Module/Wiki.php:92 ../../Zotlabs/Lib/Apps.php:219
+#: ../../include/nav.php:108 ../../include/conversation.php:1710
+#: ../../include/conversation.php:1713 ../../include/features.php:55
+msgid "Wiki"
+msgstr "Wiki"
 
-#: ../../Zotlabs/Module/Thing.php:299
-msgid "Edit Thing"
-msgstr "Edita la cosa"
+#: ../../Zotlabs/Module/Wiki.php:93
+msgid "Sandbox"
+msgstr "Sandbox"
 
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
-msgid "Select a profile"
-msgstr "Tria un perfil"
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Post an activity"
-msgstr "Publica una activitat"
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Only sends to viewers of the applicable profile"
-msgstr "S'envia només a visitants del perfil corresponent"
-
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
-msgid "Name of thing e.g. something"
-msgstr "Nom de la cosa. Exemple: patata"
-
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
-msgid "URL of thing (optional)"
-msgstr "Adreça URL de la cosa (opcional)"
-
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
-msgid "URL for photo of thing (optional)"
-msgstr "Adreça URL de la foto d'una cosa (opcional)"
-
-#: ../../Zotlabs/Module/Thing.php:349
-msgid "Add Thing to your Profile"
-msgstr "Afegeix una cosa al teu perfil"
-
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
-msgid "Export Channel"
-msgstr "Exportar Canal"
-
-#: ../../Zotlabs/Module/Uexport.php:57
+#: ../../Zotlabs/Module/Wiki.php:95
 msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
-msgstr "Exporta la informació bàsica del canal a un arxiu. Això actua com a còpia de recolzament de les teves connexions, permisos, perfil i dades bàsiques, les quals pots emprar per traslladar aquestes dades a una altre lloc/node, però no conté el contingut del canal."
+"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be"
+" saved*.\""
+msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Content"
-msgstr "Exportar el Contingut"
+#: ../../Zotlabs/Module/Wiki.php:164
+msgid "Revision Comparison"
+msgstr "Comparació de revisió"
 
-#: ../../Zotlabs/Module/Uexport.php:59
-msgid ""
-"Export your channel information and recent content to a JSON backup that can"
-" be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for"
-" this download to begin."
-msgstr "Exporta la informació del canal i tot el contingut recent a un arxiu de recolzament JSON que por ser restaurat o importat en altre lloc/node. Això còpia totes les teves connexions, permisos, perfil i dades i mesos de entrades. L'arxiu pot ser MOLT gran. Si et plau, sigues pacient ja que pot trigar uns minuts a començar a baixar."
+#: ../../Zotlabs/Module/Wiki.php:165
+msgid "Revert"
+msgstr "Reverteix"
 
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export your posts from a given year."
-msgstr "Exporta les teves entrades d'un any donat."
+#: ../../Zotlabs/Module/Wiki.php:192
+msgid "Enter the name of your new wiki:"
+msgstr "Escriu el nom del teu nou wiki:"
 
-#: ../../Zotlabs/Module/Uexport.php:62
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
-msgstr "Pots també exportar les teves entrades i conversacions d'un any o un mes en particular. Ajusta la data a la barra de direccions del navegador per seleccionar altres dates. Si la exportació falla (possiblement degut al esgotament de la memòria del node servidor), si et plau, intenta de nou la selecció d'un rang de dates més limitat."
+#: ../../Zotlabs/Module/Wiki.php:193
+msgid "Enter the name of the new page:"
+msgstr "Escriu el nom de la teva nova pàgina:"
 
-#: ../../Zotlabs/Module/Uexport.php:63
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a "
-"href=\"%1$s\">%2$s</a>"
-msgstr "Per seleccionar tots els missatges per a un any determinat, com aquest any, visiteu <a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Wiki.php:194
+msgid "Enter the new name:"
+msgstr "Escriu el nou nom:"
 
-#: ../../Zotlabs/Module/Uexport.php:64
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr "Per seleccionar tots els missatges per a un mes determinat, com el de gener d'aquest any, visiteu <a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Wiki.php:200 ../../include/conversation.php:1150
+msgid "Embed image from photo albums"
+msgstr "Embeu una imatge dels àlbums de fotos"
 
-#: ../../Zotlabs/Module/Uexport.php:65
-#, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a "
-"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
-" please import or restore these in date order (oldest first)."
-msgstr "Aquests arxius de contingut poden ser importats o restaurats per visitar  <a href=\"%1$s\">%2$s</a> en qualsevol lloc que conté el teu canal. Per obtenir els millors resultats si us plau, importar o restaurar aquests en ordre de data (la més antiga primer)."
+#: ../../Zotlabs/Module/Wiki.php:201 ../../include/conversation.php:1234
+msgid "Embed an image from your albums"
+msgstr "Embeu una imatge dels teus àlbums"
 
-#: ../../Zotlabs/Module/Viewconnections.php:62
+#: ../../Zotlabs/Module/Wiki.php:203 ../../include/conversation.php:1236
+#: ../../include/conversation.php:1273
+msgid "OK"
+msgstr "OK"
+
+#: ../../Zotlabs/Module/Wiki.php:204 ../../include/conversation.php:1186
+msgid "Choose images to embed"
+msgstr "Tria una imatge per a embeure-la"
+
+#: ../../Zotlabs/Module/Wiki.php:205 ../../include/conversation.php:1187
+msgid "Choose an album"
+msgstr "Tria un àlbum"
+
+#: ../../Zotlabs/Module/Wiki.php:206 ../../include/conversation.php:1188
+msgid "Choose a different album..."
+msgstr "Tria un àlbum diferent..."
+
+#: ../../Zotlabs/Module/Wiki.php:207 ../../include/conversation.php:1189
+msgid "Error getting album list"
+msgstr "Ha ocorregut un error quan treia la llista de àlbums"
+
+#: ../../Zotlabs/Module/Wiki.php:208 ../../include/conversation.php:1190
+msgid "Error getting photo link"
+msgstr "Ha ocorregut un error quan treia l'enllaç a la foto"
+
+#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1191
+msgid "Error getting album"
+msgstr "Ha ocorregut un error treient l'àlbum"
+
+#: ../../Zotlabs/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr "Sense connexions."
 
-#: ../../Zotlabs/Module/Viewconnections.php:75
+#: ../../Zotlabs/Module/Viewconnections.php:78
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Visita el perfil [%s] de %s"
 
-#: ../../Zotlabs/Module/Viewconnections.php:104
+#: ../../Zotlabs/Module/Viewconnections.php:107
 msgid "View Connections"
 msgstr "Veure Connexions"
 
@@ -6241,22 +6530,23 @@ msgstr "Veure Connexions"
 msgid "Source of Item"
 msgstr "Origen de l'article"
 
-#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217
-#: ../../include/nav.php:106 ../../include/conversation.php:1685
-msgid "Webpages"
-msgstr "Pàgines web"
+#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
+msgid "Authorize application connection"
+msgstr "Autoritza la connexió de l'aplicació"
 
-#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
-msgid "Actions"
-msgstr "Accions"
+#: ../../Zotlabs/Module/Api.php:62
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Torna a la teva aplicació i insereix aquest Codi de Seguretat:"
 
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
-msgid "Page Link"
-msgstr "Enllaç a Pàgina"
+#: ../../Zotlabs/Module/Api.php:72
+msgid "Please login to continue."
+msgstr "Si et plau, identifica't per continuar."
 
-#: ../../Zotlabs/Module/Webpages.php:197
-msgid "Page Title"
-msgstr "Títol de la pàgina"
+#: ../../Zotlabs/Module/Api.php:87
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Vols autoritzar a aquesta aplicació l'accés a les teves entrades i contactes i/o a crear noves entrades com si fos tu mateix."
 
 #: ../../Zotlabs/Module/Xchan.php:10
 msgid "Xchan Lookup"
@@ -6266,92 +6556,6 @@ msgstr "Cerca a xchan"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Cerca a xchan començant per (o webbie)"
 
-#: ../../Zotlabs/Lib/Apps.php:204
-msgid "Site Admin"
-msgstr "Administració"
-
-#: ../../Zotlabs/Lib/Apps.php:205
-msgid "Bug Report"
-msgstr "Informe d'Errors"
-
-#: ../../Zotlabs/Lib/Apps.php:206
-msgid "View Bookmarks"
-msgstr "Veure Marcadors"
-
-#: ../../Zotlabs/Lib/Apps.php:207
-msgid "My Chatrooms"
-msgstr "Les meves Sales de Xat"
-
-#: ../../Zotlabs/Lib/Apps.php:209
-msgid "Firefox Share"
-msgstr "Compartir amb Firefox"
-
-#: ../../Zotlabs/Lib/Apps.php:210
-msgid "Remote Diagnostics"
-msgstr "Diagnòstics Remots"
-
-#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
-msgid "Suggest Channels"
-msgstr "Suggerir Canals"
-
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
-#: ../../boot.php:1703
-msgid "Login"
-msgstr "Identifica't"
-
-#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
-msgid "Grid"
-msgstr "Malla"
-
-#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182
-msgid "Channel Home"
-msgstr "Canal Personal"
-
-#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:201
-#: ../../include/conversation.php:1649 ../../include/conversation.php:1652
-msgid "Events"
-msgstr "Esdeveniments"
-
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167
-msgid "Directory"
-msgstr "Directori"
-
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193
-msgid "Mail"
-msgstr "Correu"
-
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96
-msgid "Chat"
-msgstr "Xerrar"
-
-#: ../../Zotlabs/Lib/Apps.php:229
-msgid "Probe"
-msgstr "Sondeig"
-
-#: ../../Zotlabs/Lib/Apps.php:230
-msgid "Suggest"
-msgstr "Suggeriment"
-
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Random Channel"
-msgstr "Canal Aleatori"
-
-#: ../../Zotlabs/Lib/Apps.php:232
-msgid "Invite"
-msgstr "Convida"
-
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1386
-msgid "Features"
-msgstr "Funcionalitats"
-
-#: ../../Zotlabs/Lib/Apps.php:235
-msgid "Post"
-msgstr "Entrada"
-
-#: ../../Zotlabs/Lib/Apps.php:335
-msgid "Purchase"
-msgstr "Compra"
-
 #: ../../Zotlabs/Lib/Chatroom.php:27
 msgid "Missing room name"
 msgstr "Perdut el nom de la sala"
@@ -6372,19 +6576,19 @@ msgstr "Sala no trobada."
 msgid "Room is full"
 msgstr "La sala es plena"
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1882
 msgid "$Projectname Notification"
 msgstr "Notificació de $Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1883
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1885
 msgid "Thank You,"
 msgstr "Gràcies,"
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1887
 #, php-format
 msgid "%s Administrator"
 msgstr "%s Administrador"
@@ -6577,11 +6781,97 @@ msgstr "Creada una nova entrada"
 msgid "commented on %s's post"
 msgstr "comentat a l'entrada de %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:664
+#: ../../Zotlabs/Lib/Apps.php:205
+msgid "Site Admin"
+msgstr "Administració"
+
+#: ../../Zotlabs/Lib/Apps.php:206
+msgid "Bug Report"
+msgstr "Informe d'Errors"
+
+#: ../../Zotlabs/Lib/Apps.php:207
+msgid "View Bookmarks"
+msgstr "Veure Marcadors"
+
+#: ../../Zotlabs/Lib/Apps.php:208
+msgid "My Chatrooms"
+msgstr "Les meves Sales de Xat"
+
+#: ../../Zotlabs/Lib/Apps.php:210
+msgid "Firefox Share"
+msgstr "Compartir amb Firefox"
+
+#: ../../Zotlabs/Lib/Apps.php:211
+msgid "Remote Diagnostics"
+msgstr "Diagnòstics Remots"
+
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:90
+msgid "Suggest Channels"
+msgstr "Suggerir Canals"
+
+#: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:112
+#: ../../boot.php:1704
+msgid "Login"
+msgstr "Identifica't"
+
+#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:181
+msgid "Grid"
+msgstr "Malla"
+
+#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:184
+msgid "Channel Home"
+msgstr "Canal Personal"
+
+#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:203
+#: ../../include/conversation.php:1664 ../../include/conversation.php:1667
+msgid "Events"
+msgstr "Esdeveniments"
+
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:169
+msgid "Directory"
+msgstr "Directori"
+
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:195
+msgid "Mail"
+msgstr "Correu"
+
+#: ../../Zotlabs/Lib/Apps.php:229 ../../include/nav.php:96
+msgid "Chat"
+msgstr "Xerrar"
+
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Probe"
+msgstr "Sondeig"
+
+#: ../../Zotlabs/Lib/Apps.php:232
+msgid "Suggest"
+msgstr "Suggeriment"
+
+#: ../../Zotlabs/Lib/Apps.php:233
+msgid "Random Channel"
+msgstr "Canal Aleatori"
+
+#: ../../Zotlabs/Lib/Apps.php:234
+msgid "Invite"
+msgstr "Convida"
+
+#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1480
+msgid "Features"
+msgstr "Funcionalitats"
+
+#: ../../Zotlabs/Lib/Apps.php:237
+msgid "Post"
+msgstr "Entrada"
+
+#: ../../Zotlabs/Lib/Apps.php:339
+msgid "Purchase"
+msgstr "Compra"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:667
 msgid "Private Message"
 msgstr "Missatge Privat"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:656
+#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:659
 msgid "Select"
 msgstr "Selecciona"
 
@@ -6629,11 +6919,11 @@ msgstr "Canvia el Estat de la Preferència"
 msgid "starred"
 msgstr "preferit"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:671
+#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:674
 msgid "Message signature validated"
 msgstr "Validada la signatura del missatge"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:672
+#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:675
 msgid "Message signature incorrect"
 msgstr "Signatura del missatge incorrecta"
 
@@ -6689,17 +6979,17 @@ msgstr "Mur-a-Mur"
 msgid "via Wall-To-Wall:"
 msgstr "via Mur-a-Mur:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:719
+#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:722
 #, php-format
 msgid "from %s"
 msgstr "De %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:722
+#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:725
 #, php-format
 msgid "last edited: %s"
 msgstr "últim editat: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:723
+#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:726
 #, php-format
 msgid "Expires: %s"
 msgstr "Expira: %s"
@@ -6717,26 +7007,27 @@ msgid "Mark all seen"
 msgstr "Marca tot com ja vist"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
-msgid "[+] show all"
-msgstr "[+] mostra tot"
+#, php-format
+msgid "%s show all"
+msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1215
+#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1226
 msgid "Bold"
 msgstr "Negreta"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1216
+#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1227
 msgid "Italic"
 msgstr "Italica"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1217
+#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1228
 msgid "Underline"
 msgstr "Subratllat"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1218
+#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1229
 msgid "Quote"
 msgstr "Cometes"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1219
+#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1230
 msgid "Code"
 msgstr "Codi"
 
@@ -6752,11 +7043,74 @@ msgstr "Insereix Enllaç"
 msgid "Video"
 msgstr "Video"
 
+#: ../../Zotlabs/Lib/PermissionDescription.php:31
+#: ../../include/acl_selectors.php:230
+msgid "Visible to your default audience"
+msgstr "Visible per a la teva audiència "
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:106
+#: ../../include/acl_selectors.php:266
+msgid "Only me"
+msgstr "Només jo"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+msgid "Public"
+msgstr "Públic"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Anybody in the $Projectname network"
+msgstr "Ningú a la xarxa $Projectname"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+#, php-format
+msgid "Any account on %s"
+msgstr "Qualsevol compte a %s"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+msgid "Any of my connections"
+msgstr "Qualsevol de les meves connexions"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Only connections I specifically allow"
+msgstr "Només les connexions que permeto específicament"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Qualsevol persona autenticada (podria incloure als usuaris d'altres xarxes)"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Qualsevol connexió incloent aquells que encara no han estat aprovats"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr "Aquest és l'ajust per defecte per al públic del seu flux normal i entrades."
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
+msgid ""
+"This is your default setting for who can view your default channel profile"
+msgstr "Aquesta és la configuració per defecte per a qui pugui veure el teu perfil per defecte del canal"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+msgid "This is your default setting for who can view your connections"
+msgstr "Aquesta és la configuració per defecte per a qui pugui veure les teves connexions"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:155
+msgid ""
+"This is your default setting for who can view your file storage and photos"
+msgstr "Aquesta és la configuració per defecte per a qui pugui veure els teus arxius i fotos"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:156
+msgid "This is your default setting for the audience of your webpages"
+msgstr "Aquests son els ajustos per defecte de l'audiència de les teves pàgines web"
+
 #: ../../include/Import/import_diaspora.php:16
 msgid "No username found in import file."
 msgstr "No s'ha trobat nom d'usuari a l'arxiu d'importació."
 
-#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50
+#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:51
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "No s'ha pogut importar el canal perquè l'adreça única de canal no s'ha pogut crear."
 
@@ -6765,6 +7119,291 @@ msgstr "No s'ha pogut importar el canal perquè l'adreça única de canal no s'h
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "No s'ha trobat informació de DNS pel servidor de base de dades '%s'"
 
+#: ../../include/photos.php:114
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "La imatge excedeix la mida limit pel lloc web en %lu bytes"
+
+#: ../../include/photos.php:121
+msgid "Image file is empty."
+msgstr "El fitxer d'imatge esta buit."
+
+#: ../../include/photos.php:259
+msgid "Photo storage failed."
+msgstr "Fracassà l'emmagatzematge de la Foto"
+
+#: ../../include/photos.php:299
+msgid "a new photo"
+msgstr "Una foto nova"
+
+#: ../../include/photos.php:303
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s enviat %2$s a %3$s"
+
+#: ../../include/photos.php:506 ../../include/conversation.php:1650
+msgid "Photo Albums"
+msgstr "Albums de Fotos"
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Puja Noves Fotos"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1703
+msgid "Logout"
+msgstr "Desconectar"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115
+msgid "End this session"
+msgstr "Finalitza aquesta sessió"
+
+#: ../../include/nav.php:85 ../../include/nav.php:146
+msgid "Home"
+msgstr "Inici"
+
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr "Les teves entrades i converses"
+
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr "La teva pàgina de perfil"
+
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr "Gestiona/Edita perfils"
+
+#: ../../include/nav.php:90 ../../include/channel.php:980
+msgid "Edit Profile"
+msgstr "Edita Perfil"
+
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr "Edita el teu perfil"
+
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr "Les Teves Fotos"
+
+#: ../../include/nav.php:93
+msgid "Your files"
+msgstr "Els teus arxius"
+
+#: ../../include/nav.php:96
+msgid "Your chatrooms"
+msgstr "Les teves sales de xerrar"
+
+#: ../../include/nav.php:102 ../../include/conversation.php:1690
+msgid "Bookmarks"
+msgstr "Marcadors"
+
+#: ../../include/nav.php:102
+msgid "Your bookmarks"
+msgstr "Els teus marcadors"
+
+#: ../../include/nav.php:106
+msgid "Your webpages"
+msgstr "Les teves pàgines web"
+
+#: ../../include/nav.php:108
+msgid "Your wiki"
+msgstr ""
+
+#: ../../include/nav.php:112
+msgid "Sign in"
+msgstr "Signatura"
+
+#: ../../include/nav.php:129
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - click per desconectar"
+
+#: ../../include/nav.php:132
+msgid "Remote authentication"
+msgstr "Autenticació remota"
+
+#: ../../include/nav.php:132
+msgid "Click to authenticate to your home hub"
+msgstr "Clica per autentificar-te en el teu node"
+
+#: ../../include/nav.php:146
+msgid "Home Page"
+msgstr "Pàgina Personal"
+
+#: ../../include/nav.php:149
+msgid "Create an account"
+msgstr "Crear un compte"
+
+#: ../../include/nav.php:161
+msgid "Help and documentation"
+msgstr "Ajuda i documentació"
+
+#: ../../include/nav.php:165
+msgid "Applications, utilities, links, games"
+msgstr "Aplicacions, utilitats, enllaços, jocs"
+
+#: ../../include/nav.php:167
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Cerca pel lloc @name, #tag, ?docs, contingut"
+
+#: ../../include/nav.php:169
+msgid "Channel Directory"
+msgstr "Directori de Canals"
+
+#: ../../include/nav.php:181
+msgid "Your grid"
+msgstr "La teva malla"
+
+#: ../../include/nav.php:182
+msgid "Mark all grid notifications seen"
+msgstr "Marca totes les notificacions de la malla vistes"
+
+#: ../../include/nav.php:184
+msgid "Channel home"
+msgstr "Canal personal"
+
+#: ../../include/nav.php:185
+msgid "Mark all channel notifications seen"
+msgstr "Marca totes les notificacions de canal vistes"
+
+#: ../../include/nav.php:191
+msgid "Notices"
+msgstr "Noticies"
+
+#: ../../include/nav.php:191
+msgid "Notifications"
+msgstr "Notificacions"
+
+#: ../../include/nav.php:192
+msgid "See all notifications"
+msgstr "Veure totes les Notificacions"
+
+#: ../../include/nav.php:195
+msgid "Private mail"
+msgstr "Correu privat"
+
+#: ../../include/nav.php:196
+msgid "See all private messages"
+msgstr "Veure tots els missatges privats"
+
+#: ../../include/nav.php:197
+msgid "Mark all private messages seen"
+msgstr "Marcar tots els missatges privats vistos"
+
+#: ../../include/nav.php:198 ../../include/widgets.php:667
+msgid "Inbox"
+msgstr "Safata d'entrada"
+
+#: ../../include/nav.php:199 ../../include/widgets.php:672
+msgid "Outbox"
+msgstr "Safata de sortida"
+
+#: ../../include/nav.php:200 ../../include/widgets.php:677
+msgid "New Message"
+msgstr "Nou Missatge"
+
+#: ../../include/nav.php:203
+msgid "Event Calendar"
+msgstr "Calendari d'Events"
+
+#: ../../include/nav.php:204
+msgid "See all events"
+msgstr "Veure tots els esdeveniments"
+
+#: ../../include/nav.php:205
+msgid "Mark all events seen"
+msgstr "Marcar tots els esdeveniments vistos"
+
+#: ../../include/nav.php:208
+msgid "Manage Your Channels"
+msgstr "Gestiona els Teus Canals"
+
+#: ../../include/nav.php:210
+msgid "Account/Channel Settings"
+msgstr "Ajustos de Compte/Canal"
+
+#: ../../include/nav.php:218 ../../include/widgets.php:1510
+msgid "Admin"
+msgstr "Admin"
+
+#: ../../include/nav.php:218
+msgid "Site Setup and Configuration"
+msgstr "Ajustos i Configuració del Lloc"
+
+#: ../../include/nav.php:249 ../../include/conversation.php:854
+msgid "Loading..."
+msgstr "Carregant..."
+
+#: ../../include/nav.php:254
+msgid "@name, #tag, ?doc, content"
+msgstr "@nom, #etiqueta, ?doc, contingut"
+
+#: ../../include/nav.php:255
+msgid "Please wait..."
+msgstr "Si us plau, espera......."
+
+#: ../../include/network.php:704
+msgid "view full size"
+msgstr "Veure a mida competa"
+
+#: ../../include/network.php:1930 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../../include/network.php:1944
+msgid "No Subject"
+msgstr "Sense Assumpte"
+
+#: ../../include/network.php:2198 ../../include/network.php:2199
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/network.php:2200
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/network.php:2201
+msgid "GNU-Social"
+msgstr "GNU-Social"
+
+#: ../../include/network.php:2202
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/network.php:2204
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/network.php:2205
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/network.php:2206
+msgid "Zot"
+msgstr "Zot"
+
+#: ../../include/network.php:2207
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/network.php:2208
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/network.php:2209
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/page_widgets.php:7
+msgid "New Page"
+msgstr "Pàgina Nova"
+
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr "Títol"
+
 #: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
 #: ../../include/widgets.php:46 ../../include/widgets.php:429
 #: ../../include/contact_widgets.php:91
@@ -6803,952 +7442,159 @@ msgstr "agrada"
 msgid "dislikes"
 msgstr "desagrada"
 
-#: ../../include/event.php:22 ../../include/event.php:69
-#: ../../include/bb2diaspora.php:485
-msgid "l F d, Y \\@ g:i A"
-msgstr "l F d, Y \\@ g:i A"
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
+msgstr "Incapaç de trobar l'informació d'identitat a la base de dades"
 
-#: ../../include/event.php:30 ../../include/event.php:73
-#: ../../include/bb2diaspora.php:491
-msgid "Starts:"
-msgstr "Inicia:"
+#: ../../include/channel.php:67
+msgid "Empty name"
+msgstr "Nom buit"
 
-#: ../../include/event.php:40 ../../include/event.php:77
-#: ../../include/bb2diaspora.php:499
-msgid "Finishes:"
-msgstr "Acaba:"
+#: ../../include/channel.php:70
+msgid "Name too long"
+msgstr "Nom massa llarg"
 
-#: ../../include/event.php:812
-msgid "This event has been added to your calendar."
-msgstr "Aquest succés ha estat afegit al teu calendari."
+#: ../../include/channel.php:181
+msgid "No account identifier"
+msgstr "Sense identificador de compte"
 
-#: ../../include/event.php:1012
-msgid "Not specified"
-msgstr "Sense especificar"
+#: ../../include/channel.php:193
+msgid "Nickname is required."
+msgstr "Alies/malnom es requerit."
 
-#: ../../include/event.php:1013
-msgid "Needs Action"
-msgstr "Necessita una Acció"
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Àlies reservat. Tria un altre."
 
-#: ../../include/event.php:1014
-msgid "Completed"
-msgstr "Completat"
-
-#: ../../include/event.php:1015
-msgid "In Process"
-msgstr "En Procès"
-
-#: ../../include/event.php:1016
-msgid "Cancelled"
-msgstr "Cancel·lat"
-
-#: ../../include/import.php:29
+#: ../../include/channel.php:212
 msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "No s'ha pogut importar el canal perquè l'identificador del canal no s'ha pogut duplicar en aquest servidor."
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "L'álies te caracters no soportats o ja esta en ús en aquest lloc"
 
-#: ../../include/import.php:76
-msgid "Channel clone failed. Import failed."
-msgstr "No s'ha pogut importar el canal perquè el canal no s'ha pogut clonar."
+#: ../../include/channel.php:272
+msgid "Unable to retrieve created identity"
+msgstr "No es pot recuperar la identitat creada"
 
-#: ../../include/items.php:892 ../../include/items.php:937
-msgid "(Unknown)"
-msgstr "(Desconegut)"
+#: ../../include/channel.php:341
+msgid "Default Profile"
+msgstr "Perfil per Defecte"
 
-#: ../../include/items.php:1136
-msgid "Visible to anybody on the internet."
-msgstr "Visible per tothom a la Internet"
+#: ../../include/channel.php:830
+msgid "Requested channel is not available."
+msgstr "El canal demanat no està disponible."
 
-#: ../../include/items.php:1138
-msgid "Visible to you only."
-msgstr "Visible només per tú."
+#: ../../include/channel.php:977
+msgid "Create New Profile"
+msgstr "Crear un Perfil Nou"
 
-#: ../../include/items.php:1140
-msgid "Visible to anybody in this network."
-msgstr "Visible per tothom en aquesta xarxa."
+#: ../../include/channel.php:997
+msgid "Visible to everybody"
+msgstr "Visible per tothom"
 
-#: ../../include/items.php:1142
-msgid "Visible to anybody authenticated."
-msgstr "Visible per tothom autenticat."
+#: ../../include/channel.php:1070 ../../include/channel.php:1182
+msgid "Gender:"
+msgstr "Gènere:"
 
-#: ../../include/items.php:1144
+#: ../../include/channel.php:1071 ../../include/channel.php:1226
+msgid "Status:"
+msgstr "Estatus:"
+
+#: ../../include/channel.php:1072 ../../include/channel.php:1237
+msgid "Homepage:"
+msgstr "Pàgina Personal:"
+
+#: ../../include/channel.php:1073
+msgid "Online Now"
+msgstr "Ara en Linia"
+
+#: ../../include/channel.php:1187
+msgid "Like this channel"
+msgstr "M'agrada aquest canal"
+
+#: ../../include/channel.php:1211
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: ../../include/channel.php:1212
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/channel.php:1219
+msgid "Birthday:"
+msgstr "Aniversari:"
+
+#: ../../include/channel.php:1232
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visible per a tothom a %s."
+msgid "for %1$d %2$s"
+msgstr "per %1$d %2$s"
 
-#: ../../include/items.php:1146
-msgid "Visible to all connections."
-msgstr "Visible per a totes les connexions."
+#: ../../include/channel.php:1235
+msgid "Sexual Preference:"
+msgstr "Preferència Sexual:"
 
-#: ../../include/items.php:1148
-msgid "Visible to approved connections."
-msgstr "Visible per a les connexions aprovades."
+#: ../../include/channel.php:1241
+msgid "Tags:"
+msgstr "Etiquetes:"
 
-#: ../../include/items.php:1150
-msgid "Visible to specific connections."
-msgstr "Visible per a específiques connexions."
+#: ../../include/channel.php:1243
+msgid "Political Views:"
+msgstr "Idees Polítiques:"
 
-#: ../../include/items.php:3909
-msgid "Privacy group is empty."
-msgstr "El grup privat està vuit."
+#: ../../include/channel.php:1245
+msgid "Religion:"
+msgstr "Religió:"
 
-#: ../../include/items.php:3916
-#, php-format
-msgid "Privacy group: %s"
-msgstr "Grup privat: %s"
+#: ../../include/channel.php:1249
+msgid "Hobbies/Interests:"
+msgstr "Aficions/Interessos:"
 
-#: ../../include/items.php:3928
-msgid "Connection not found."
-msgstr "Connexió no trobada."
+#: ../../include/channel.php:1251
+msgid "Likes:"
+msgstr "Agrada:"
 
-#: ../../include/items.php:4277
-msgid "profile photo"
-msgstr "foto del perfil"
+#: ../../include/channel.php:1253
+msgid "Dislikes:"
+msgstr "Desagrada:"
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
-msgstr "No s'ha proporcionat bústia."
+#: ../../include/channel.php:1255
+msgid "Contact information and Social Networks:"
+msgstr "Informació de contacte i Xarxes Socials:"
 
-#: ../../include/message.php:25
-msgid "[no subject]"
-msgstr "[no subject]"
+#: ../../include/channel.php:1257
+msgid "My other channels:"
+msgstr "Els meus altres canals:"
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "incapaç de determinar el remitent"
+#: ../../include/channel.php:1259
+msgid "Musical interests:"
+msgstr "Interessos Musicals:"
 
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
-msgstr "L'entrada guardada no pot ser verificada"
+#: ../../include/channel.php:1261
+msgid "Books, literature:"
+msgstr "Llibres, literatura:"
 
-#: ../../include/text.php:428
-msgid "prev"
-msgstr "prev"
+#: ../../include/channel.php:1263
+msgid "Television:"
+msgstr "Televisió:"
 
-#: ../../include/text.php:430
-msgid "first"
-msgstr "primer"
+#: ../../include/channel.php:1265
+msgid "Film/dance/culture/entertainment:"
+msgstr "Películes/Dança/Cultura/Entreteniment:"
 
-#: ../../include/text.php:459
-msgid "last"
-msgstr "últim"
+#: ../../include/channel.php:1267
+msgid "Love/Romance:"
+msgstr "Amor/Romace:"
 
-#: ../../include/text.php:462
-msgid "next"
-msgstr "pròxim"
+#: ../../include/channel.php:1269
+msgid "Work/employment:"
+msgstr "Treball/feina:"
 
-#: ../../include/text.php:472
-msgid "older"
-msgstr "el més antic"
+#: ../../include/channel.php:1271
+msgid "School/education:"
+msgstr "Escola/educació:"
 
-#: ../../include/text.php:474
-msgid "newer"
-msgstr "El més nou"
-
-#: ../../include/text.php:863
-msgid "No connections"
-msgstr "Sense Connexions"
-
-#: ../../include/text.php:888
-#, php-format
-msgid "View all %s connections"
-msgstr "Veure totes les connexions de %s"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-msgid "poke"
-msgstr "esperona"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-#: ../../include/conversation.php:243
-msgid "poked"
-msgstr "esperonat"
-
-#: ../../include/text.php:1039
-msgid "ping"
-msgstr "coloca"
-
-#: ../../include/text.php:1039
-msgid "pinged"
-msgstr "colocat"
-
-#: ../../include/text.php:1040
-msgid "prod"
-msgstr "picar"
-
-#: ../../include/text.php:1040
-msgid "prodded"
-msgstr "picat"
-
-#: ../../include/text.php:1041
-msgid "slap"
-msgstr "bufetada"
-
-#: ../../include/text.php:1041
-msgid "slapped"
-msgstr "bufetejat"
-
-#: ../../include/text.php:1042
-msgid "finger"
-msgstr "senyal"
-
-#: ../../include/text.php:1042
-msgid "fingered"
-msgstr "senyalat"
-
-#: ../../include/text.php:1043
-msgid "rebuff"
-msgstr "menyspreu"
-
-#: ../../include/text.php:1043
-msgid "rebuffed"
-msgstr "menyspreuat"
-
-#: ../../include/text.php:1055
-msgid "happy"
-msgstr "feliç"
-
-#: ../../include/text.php:1056
-msgid "sad"
-msgstr "trist"
-
-#: ../../include/text.php:1057
-msgid "mellow"
-msgstr "melós"
-
-#: ../../include/text.php:1058
-msgid "tired"
-msgstr "cansat"
-
-#: ../../include/text.php:1059
-msgid "perky"
-msgstr "turgent"
-
-#: ../../include/text.php:1060
-msgid "angry"
-msgstr "enfadat"
-
-#: ../../include/text.php:1061
-msgid "stupefied"
-msgstr "estupefacte"
-
-#: ../../include/text.php:1062
-msgid "puzzled"
-msgstr "perplexe"
-
-#: ../../include/text.php:1063
-msgid "interested"
-msgstr "Interessat"
-
-#: ../../include/text.php:1064
-msgid "bitter"
-msgstr "amargat"
-
-#: ../../include/text.php:1065
-msgid "cheerful"
-msgstr "feliç"
-
-#: ../../include/text.php:1066
-msgid "alive"
-msgstr "viu"
-
-#: ../../include/text.php:1067
-msgid "annoyed"
-msgstr "molest"
-
-#: ../../include/text.php:1068
-msgid "anxious"
-msgstr "ansiós"
-
-#: ../../include/text.php:1069
-msgid "cranky"
-msgstr "malagaitós"
-
-#: ../../include/text.php:1070
-msgid "disturbed"
-msgstr "transtornat"
-
-#: ../../include/text.php:1071
-msgid "frustrated"
-msgstr "frustrat"
-
-#: ../../include/text.php:1072
-msgid "depressed"
-msgstr "deprimit"
-
-#: ../../include/text.php:1073
-msgid "motivated"
-msgstr "motivat"
-
-#: ../../include/text.php:1074
-msgid "relaxed"
-msgstr "relaxat"
-
-#: ../../include/text.php:1075
-msgid "surprised"
-msgstr "sorprès"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:70
-msgid "Monday"
-msgstr "Dilluns"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:71
-msgid "Tuesday"
-msgstr "Dimarts"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:72
-msgid "Wednesday"
-msgstr "Dimecres"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:73
-msgid "Thursday"
-msgstr "Dijous"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:74
-msgid "Friday"
-msgstr "Divendres"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:75
-msgid "Saturday"
-msgstr "Dissabte"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:69
-msgid "Sunday"
-msgstr "Diumenge"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:45
-msgid "January"
-msgstr "Gener"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:46
-msgid "February"
-msgstr "Febrer"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:47
-msgid "March"
-msgstr "Març"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:48
-msgid "April"
-msgstr "Abril"
-
-#: ../../include/text.php:1261
-msgid "May"
-msgstr "Maig"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:50
-msgid "June"
-msgstr "Juny"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:51
-msgid "July"
-msgstr "Juliol"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:52
-msgid "August"
-msgstr "Agost"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:53
-msgid "September"
-msgstr "Setembre"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:54
-msgid "October"
-msgstr "Octubre"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:55
-msgid "November"
-msgstr "Novembre"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:56
-msgid "December"
-msgstr "Desembre"
-
-#: ../../include/text.php:1338 ../../include/text.php:1342
-msgid "Unknown Attachment"
-msgstr "Adjunt Desconegut"
-
-#: ../../include/text.php:1344
-msgid "unknown"
-msgstr "desconegut"
-
-#: ../../include/text.php:1380
-msgid "remove category"
-msgstr "elimina categoria"
-
-#: ../../include/text.php:1457
-msgid "remove from file"
-msgstr "elimina del arxiu"
-
-#: ../../include/text.php:1753 ../../include/text.php:1824
-msgid "default"
-msgstr "per defecte"
-
-#: ../../include/text.php:1761
-msgid "Page layout"
-msgstr "Format de la pàgina"
-
-#: ../../include/text.php:1761
-msgid "You can create your own with the layouts tool"
-msgstr "Pots crear el teu propi amb l'editor de format de pàgina."
-
-#: ../../include/text.php:1803
-msgid "Page content type"
-msgstr "Tipus de contingut de la pàgina"
-
-#: ../../include/text.php:1836
-msgid "Select an alternate language"
-msgstr "Tria un idioma alternatiu"
-
-#: ../../include/text.php:1953
-msgid "activity"
-msgstr "activitat"
-
-#: ../../include/text.php:2262
-msgid "Design Tools"
-msgstr "Eines de disseny"
-
-#: ../../include/text.php:2268
-msgid "Pages"
-msgstr "Pàgines"
-
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr "Sistema"
-
-#: ../../include/widgets.php:106
-msgid "New App"
-msgstr "Nova App"
-
-#: ../../include/widgets.php:154
-msgid "Suggestions"
-msgstr "Suggerencies"
-
-#: ../../include/widgets.php:155
-msgid "See more..."
-msgstr "Veure més....."
-
-#: ../../include/widgets.php:175
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Tens %1$.0f de %2$.0f connexions permeses."
-
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
-msgstr "Afegeix una Nova Connexió"
-
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr "Introdueix l'adreça del canal"
-
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Exemples: bob@example.com, https://exemple.com/barbara"
-
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr "Notes"
-
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr "Plaç de remoció"
-
-#: ../../include/widgets.php:281 ../../include/features.php:84
-msgid "Saved Searches"
-msgstr "Cerques Guardades"
-
-#: ../../include/widgets.php:282 ../../include/group.php:316
-msgid "add"
-msgstr "afegeix"
-
-#: ../../include/widgets.php:310 ../../include/contact_widgets.php:53
-#: ../../include/features.php:98
-msgid "Saved Folders"
-msgstr "Carpetes Guardades"
-
-#: ../../include/widgets.php:313 ../../include/widgets.php:432
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-msgid "Everything"
-msgstr "Tot"
-
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr "Arxius"
-
-#: ../../include/widgets.php:516
-msgid "Refresh"
-msgstr "Refresc"
-
-#: ../../include/widgets.php:556
-msgid "Account settings"
-msgstr "Ajustos de Compte"
-
-#: ../../include/widgets.php:562
-msgid "Channel settings"
-msgstr "Ajustos de Canal"
-
-#: ../../include/widgets.php:571
-msgid "Additional features"
-msgstr "Característiques addicionals"
-
-#: ../../include/widgets.php:578
-msgid "Feature/Addon settings"
-msgstr "Ajustos de Complements"
-
-#: ../../include/widgets.php:584
-msgid "Display settings"
-msgstr "Ajustos de pantalla"
-
-#: ../../include/widgets.php:591
-msgid "Manage locations"
-msgstr "Gestiona ubicacions"
-
-#: ../../include/widgets.php:600
-msgid "Export channel"
-msgstr "Exportat canal"
-
-#: ../../include/widgets.php:607
-msgid "Connected apps"
-msgstr "Apps connectades"
-
-#: ../../include/widgets.php:622
-msgid "Premium Channel Settings"
-msgstr "Ajustos Premium de Canal"
-
-#: ../../include/widgets.php:651
-msgid "Private Mail Menu"
-msgstr "Menú de Correu Privat"
-
-#: ../../include/widgets.php:653
-msgid "Combined View"
-msgstr "Vista Combinada"
-
-#: ../../include/widgets.php:658 ../../include/nav.php:196
-msgid "Inbox"
-msgstr "Safata d'entrada"
-
-#: ../../include/widgets.php:663 ../../include/nav.php:197
-msgid "Outbox"
-msgstr "Safata de sortida"
-
-#: ../../include/widgets.php:668 ../../include/nav.php:198
-msgid "New Message"
-msgstr "Nou Missatge"
-
-#: ../../include/widgets.php:685 ../../include/widgets.php:697
-msgid "Conversations"
-msgstr "Conversacions"
-
-#: ../../include/widgets.php:689
-msgid "Received Messages"
-msgstr "Missatges Rebuts"
-
-#: ../../include/widgets.php:693
-msgid "Sent Messages"
-msgstr "Missatges Enviats"
-
-#: ../../include/widgets.php:707
-msgid "No messages."
-msgstr "Sense missatges."
-
-#: ../../include/widgets.php:725
-msgid "Delete conversation"
-msgstr "Conversació esborrada"
-
-#: ../../include/widgets.php:751
-msgid "Events Menu"
-msgstr "Menú d'Esdeveniments"
-
-#: ../../include/widgets.php:752
-msgid "Day View"
-msgstr "Vista de Dia"
-
-#: ../../include/widgets.php:753
-msgid "Week View"
-msgstr "Vista de Setmana"
-
-#: ../../include/widgets.php:754
-msgid "Month View"
-msgstr "Vista de Mes"
-
-#: ../../include/widgets.php:766
-msgid "Events Tools"
-msgstr "Eina d'Esdeveniments"
-
-#: ../../include/widgets.php:767
-msgid "Export Calendar"
-msgstr "Exportar Calendari"
-
-#: ../../include/widgets.php:768
-msgid "Import Calendar"
-msgstr "Importar Calendari"
-
-#: ../../include/widgets.php:842 ../../include/conversation.php:1662
-#: ../../include/conversation.php:1665
-msgid "Chatrooms"
-msgstr "Sala per Xerrar"
-
-#: ../../include/widgets.php:846
-msgid "Overview"
-msgstr "Visió General"
-
-#: ../../include/widgets.php:853
-msgid "Chat Members"
-msgstr "Membres de la Sala de Xat"
-
-#: ../../include/widgets.php:876
-msgid "Bookmarked Chatrooms"
-msgstr "Sales de Xat Favorites"
-
-#: ../../include/widgets.php:899
-msgid "Suggested Chatrooms"
-msgstr "Sales de Xat Suggerides"
-
-#: ../../include/widgets.php:1044 ../../include/widgets.php:1156
-msgid "photo/image"
-msgstr "foto/imatge"
-
-#: ../../include/widgets.php:1099
-msgid "Click to show more"
-msgstr "Fes clic per veure més"
-
-#: ../../include/widgets.php:1250
-msgid "Rating Tools"
-msgstr "Eines de Valoració"
-
-#: ../../include/widgets.php:1254 ../../include/widgets.php:1256
-msgid "Rate Me"
-msgstr "Valora'm"
-
-#: ../../include/widgets.php:1259
-msgid "View Ratings"
-msgstr "Veure Valoracions"
-
-#: ../../include/widgets.php:1316
-msgid "Forums"
-msgstr "Forums"
-
-#: ../../include/widgets.php:1345
-msgid "Tasks"
-msgstr "Tasques"
-
-#: ../../include/widgets.php:1354
-msgid "Documentation"
-msgstr "Documentació"
-
-#: ../../include/widgets.php:1356
-msgid "Project/Site Information"
-msgstr "Informació del Projecte/Lloc"
-
-#: ../../include/widgets.php:1357
-msgid "For Members"
-msgstr "Per Membres"
-
-#: ../../include/widgets.php:1358
-msgid "For Administrators"
-msgstr "Per Administradors"
-
-#: ../../include/widgets.php:1359
-msgid "For Developers"
-msgstr "Per Desenvolupadors"
-
-#: ../../include/widgets.php:1383 ../../include/widgets.php:1421
-msgid "Member registrations waiting for confirmation"
-msgstr "Una inscripció per a ser membre està esperant confirmació"
-
-#: ../../include/widgets.php:1389
-msgid "Inspect queue"
-msgstr "Revisa cua"
-
-#: ../../include/widgets.php:1391
-msgid "DB updates"
-msgstr "Actualitzacions de Base de Dades"
-
-#: ../../include/widgets.php:1416 ../../include/nav.php:216
-msgid "Admin"
-msgstr "Admin"
-
-#: ../../include/widgets.php:1417
-msgid "Plugin Features"
-msgstr "Característiques del Plugin"
-
-#: ../../include/follow.php:27
-msgid "Channel is blocked on this site."
-msgstr "El canal està bloquejat en aquest lloc."
-
-#: ../../include/follow.php:32
-msgid "Channel location missing."
-msgstr "Ubicació del canal perduda."
-
-#: ../../include/follow.php:81
-msgid "Response from remote channel was incomplete."
-msgstr "La resposta del canal remot fou incompleta."
-
-#: ../../include/follow.php:98
-msgid "Channel was deleted and no longer exists."
-msgstr "El canal fou esborrat i actualment no existeix."
-
-#: ../../include/follow.php:154 ../../include/follow.php:190
-msgid "Protocol disabled."
-msgstr "Protocol desactivat."
-
-#: ../../include/follow.php:178
-msgid "Channel discovery failed."
-msgstr "Descobriment de canal fallit."
-
-#: ../../include/follow.php:216
-msgid "Cannot connect to yourself."
-msgstr "No pots connectar amb tu mateix."
-
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "%1$s de marcadors"
-
-#: ../../include/api.php:1336
-msgid "Public Timeline"
-msgstr "Línia de Temps Pública"
-
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:844
-#: ../../include/bbcode.php:847 ../../include/bbcode.php:852
-#: ../../include/bbcode.php:855 ../../include/bbcode.php:858
-#: ../../include/bbcode.php:861 ../../include/bbcode.php:866
-#: ../../include/bbcode.php:869 ../../include/bbcode.php:874
-#: ../../include/bbcode.php:877 ../../include/bbcode.php:880
-#: ../../include/bbcode.php:883
-msgid "Image/photo"
-msgstr "Imatge/foto"
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:894
-msgid "Encrypted content"
-msgstr "Contingut encriptat"
-
-#: ../../include/bbcode.php:178
-#, php-format
-msgid "Install %s element: "
-msgstr "Instal·la l'element %s:"
-
-#: ../../include/bbcode.php:182
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Aquesta entrada contè un element %s instal·lable, potser manques de permissos per instal·lar-lo en aquest lloc."
-
-#: ../../include/bbcode.php:254
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s va escriure el següent %2$s %3$s"
-
-#: ../../include/bbcode.php:331 ../../include/bbcode.php:339
-msgid "Click to open/close"
-msgstr "Clic per obrir/tancar"
-
-#: ../../include/bbcode.php:339
-msgid "spoiler"
-msgstr "xafa guitarres"
-
-#: ../../include/bbcode.php:585
-msgid "Different viewers will see this text differently"
-msgstr "Diferents observadors veuran aquest text de diferents formes"
-
-#: ../../include/bbcode.php:832
-msgid "$1 wrote:"
-msgstr "$1 va escriure:"
-
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr "Opcions de Directori"
-
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr "Manera Segura"
-
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr "Només Fòrums Públics"
-
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr "Només Aquest Lloc Web"
-
-#: ../../include/security.php:383
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "El formulario de la cadena de seguridad no era correcto. Esto probablemente ocurrió porque el formulario se ha abierto durante demasiado tiempo (> 3 horas) antes de enviarlo."
-
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1702
-msgid "Logout"
-msgstr "Desconectar"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
-msgstr "Finalitza aquesta sessió"
-
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
-msgstr "Inici"
-
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr "Les teves entrades i converses"
-
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr "La teva pàgina de perfil"
-
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr "Gestiona/Edita perfils"
-
-#: ../../include/nav.php:90 ../../include/channel.php:941
-msgid "Edit Profile"
-msgstr "Edita Perfil"
-
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr "Edita el teu perfil"
-
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr "Les Teves Fotos"
-
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr "Els teus arxius"
-
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
-msgstr "Les teves sales de xerrar"
-
-#: ../../include/nav.php:102 ../../include/conversation.php:1675
-msgid "Bookmarks"
-msgstr "Marcadors"
-
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
-msgstr "Els teus marcadors"
-
-#: ../../include/nav.php:106
-msgid "Your webpages"
-msgstr "Les teves pàgines web"
-
-#: ../../include/nav.php:110
-msgid "Sign in"
-msgstr "Signatura"
-
-#: ../../include/nav.php:127
-#, php-format
-msgid "%s - click to logout"
-msgstr "%s - click per desconectar"
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr "Autenticació remota"
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr "Clica per autentificar-te en el teu node"
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr "Pàgina Personal"
-
-#: ../../include/nav.php:147
-msgid "Create an account"
-msgstr "Crear un compte"
-
-#: ../../include/nav.php:159
-msgid "Help and documentation"
-msgstr "Ajuda i documentació"
-
-#: ../../include/nav.php:163
-msgid "Applications, utilities, links, games"
-msgstr "Aplicacions, utilitats, enllaços, jocs"
-
-#: ../../include/nav.php:165
-msgid "Search site @name, #tag, ?docs, content"
-msgstr "Cerca pel lloc @name, #tag, ?docs, contingut"
-
-#: ../../include/nav.php:167
-msgid "Channel Directory"
-msgstr "Directori de Canals"
-
-#: ../../include/nav.php:179
-msgid "Your grid"
-msgstr "La teva malla"
-
-#: ../../include/nav.php:180
-msgid "Mark all grid notifications seen"
-msgstr "Marca totes les notificacions de la malla vistes"
-
-#: ../../include/nav.php:182
-msgid "Channel home"
-msgstr "Canal personal"
-
-#: ../../include/nav.php:183
-msgid "Mark all channel notifications seen"
-msgstr "Marca totes les notificacions de canal vistes"
-
-#: ../../include/nav.php:189
-msgid "Notices"
-msgstr "Noticies"
-
-#: ../../include/nav.php:189
-msgid "Notifications"
-msgstr "Notificacions"
-
-#: ../../include/nav.php:190
-msgid "See all notifications"
-msgstr "Veure totes les Notificacions"
-
-#: ../../include/nav.php:193
-msgid "Private mail"
-msgstr "Correu privat"
-
-#: ../../include/nav.php:194
-msgid "See all private messages"
-msgstr "Veure tots els missatges privats"
-
-#: ../../include/nav.php:195
-msgid "Mark all private messages seen"
-msgstr "Marcar tots els missatges privats vistos"
-
-#: ../../include/nav.php:201
-msgid "Event Calendar"
-msgstr "Calendari d'Events"
-
-#: ../../include/nav.php:202
-msgid "See all events"
-msgstr "Veure tots els esdeveniments"
-
-#: ../../include/nav.php:203
-msgid "Mark all events seen"
-msgstr "Marcar tots els esdeveniments vistos"
-
-#: ../../include/nav.php:206
-msgid "Manage Your Channels"
-msgstr "Gestiona els Teus Canals"
-
-#: ../../include/nav.php:208
-msgid "Account/Channel Settings"
-msgstr "Ajustos de Compte/Canal"
-
-#: ../../include/nav.php:216
-msgid "Site Setup and Configuration"
-msgstr "Ajustos i Configuració del Lloc"
-
-#: ../../include/nav.php:247 ../../include/conversation.php:851
-msgid "Loading..."
-msgstr "Carregant..."
-
-#: ../../include/nav.php:252
-msgid "@name, #tag, ?doc, content"
-msgstr "@nom, #etiqueta, ?doc, contingut"
-
-#: ../../include/nav.php:253
-msgid "Please wait..."
-msgstr "Si us plau, espera......."
+#: ../../include/channel.php:1292
+msgid "Like this thing"
+msgstr "M'agrada això"
 
 #: ../../include/connections.php:95
 msgid "New window"
@@ -7763,52 +7609,6 @@ msgstr "Obrir la localització seleccionada en un altre finestra o pestanya del
 msgid "User '%s' deleted"
 msgstr "usuari '%s' esborrat"
 
-#: ../../include/contact_widgets.php:11
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invitació disponible"
-msgstr[1] "%d invitacions disponibles"
-
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
-msgstr "Troba Canals"
-
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
-msgstr "Entra un nom o interes"
-
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
-msgstr "Conecta/Segueix"
-
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Exemples: Lionel Messi, Futbolista"
-
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
-msgstr "Perfil Aleatori"
-
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
-msgstr "Convida Amics"
-
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Exemple avançat: nom=pep i pais=eire"
-
-#: ../../include/contact_widgets.php:122
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d connexió en comú"
-msgstr[1] "%d connexions en comú"
-
-#: ../../include/contact_widgets.php:127
-msgid "show more"
-msgstr "mostrar més"
-
 #: ../../include/conversation.php:204
 #, php-format
 msgid "%1$s is now connected with %2$s"
@@ -7819,258 +7619,269 @@ msgstr "%1$s esta ara connectat amb %2$s"
 msgid "%1$s poked %2$s"
 msgstr "%1$s  a esperonat %2$s"
 
-#: ../../include/conversation.php:691
+#: ../../include/conversation.php:243 ../../include/text.php:1013
+#: ../../include/text.php:1018
+msgid "poked"
+msgstr "esperonat"
+
+#: ../../include/conversation.php:694
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Vista %s del perfil @ %s"
 
-#: ../../include/conversation.php:710
+#: ../../include/conversation.php:713
 msgid "Categories:"
 msgstr "Categories:"
 
-#: ../../include/conversation.php:711
+#: ../../include/conversation.php:714
 msgid "Filed under:"
 msgstr "Arxivar a:"
 
-#: ../../include/conversation.php:738
+#: ../../include/conversation.php:741
 msgid "View in context"
 msgstr "Veure en context"
 
-#: ../../include/conversation.php:847
+#: ../../include/conversation.php:850
 msgid "remove"
 msgstr "treu"
 
-#: ../../include/conversation.php:852
+#: ../../include/conversation.php:855
 msgid "Delete Selected Items"
 msgstr "Esborra els Articles Seleccionats"
 
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:951
 msgid "View Source"
 msgstr "Veure l'Origen"
 
-#: ../../include/conversation.php:949
+#: ../../include/conversation.php:952
 msgid "Follow Thread"
 msgstr "Segueix el Fil"
 
-#: ../../include/conversation.php:950
+#: ../../include/conversation.php:953
 msgid "Unfollow Thread"
 msgstr "Fil Abandonat"
 
-#: ../../include/conversation.php:955
+#: ../../include/conversation.php:958
 msgid "Activity/Posts"
 msgstr "Activitat/Entrades"
 
-#: ../../include/conversation.php:957
+#: ../../include/conversation.php:960
 msgid "Edit Connection"
 msgstr "Modifica la Connexió"
 
-#: ../../include/conversation.php:958
+#: ../../include/conversation.php:961
 msgid "Message"
 msgstr "Missatge"
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s likes this."
 msgstr "%s agrada això."
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s no agrada això."
 
-#: ../../include/conversation.php:1079
+#: ../../include/conversation.php:1082
 #, 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 gent</span> agrada això."
 msgstr[1] "<span  %1$s>%2$d gent</span> agrada això."
 
-#: ../../include/conversation.php:1081
+#: ../../include/conversation.php:1084
 #, 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 gent</span> no agrada això."
 msgstr[1] "<span  %1$s>%2$d gent</span> no agrada això."
 
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1090
 msgid "and"
 msgstr "i"
 
-#: ../../include/conversation.php:1090
+#: ../../include/conversation.php:1093
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ", i %d altra gent"
 msgstr[1] ", i %d altra gent"
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s like this."
 msgstr "%s agrada això."
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s don't like this."
 msgstr "%s no agrada això."
 
-#: ../../include/conversation.php:1130
+#: ../../include/conversation.php:1133
 msgid "Set your location"
 msgstr "Ajusta la teva ubicació"
 
-#: ../../include/conversation.php:1131
+#: ../../include/conversation.php:1134
 msgid "Clear browser location"
 msgstr "Treu la localització del navegador"
 
-#: ../../include/conversation.php:1177
+#: ../../include/conversation.php:1182
 msgid "Tag term:"
 msgstr "Paraula de l'Etiqueta:"
 
-#: ../../include/conversation.php:1178
+#: ../../include/conversation.php:1183
 msgid "Where are you right now?"
 msgstr "On ets ara?"
 
-#: ../../include/conversation.php:1210
+#: ../../include/conversation.php:1221
 msgid "Page link name"
 msgstr "Nom de la pàgina enllaçada"
 
-#: ../../include/conversation.php:1213
+#: ../../include/conversation.php:1224
 msgid "Post as"
 msgstr "Envia com"
 
-#: ../../include/conversation.php:1223
+#: ../../include/conversation.php:1238
 msgid "Toggle voting"
 msgstr "Commutar votació"
 
-#: ../../include/conversation.php:1231
+#: ../../include/conversation.php:1246
 msgid "Categories (optional, comma-separated list)"
 msgstr "Categories (opcional, llista separada per comes)"
 
-#: ../../include/conversation.php:1254
+#: ../../include/conversation.php:1269
 msgid "Set publish date"
 msgstr "Ajusta la data de publicació"
 
-#: ../../include/conversation.php:1258
-msgid "OK"
-msgstr "OK"
-
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1518
 msgid "Discover"
 msgstr "Descobrir"
 
-#: ../../include/conversation.php:1506
+#: ../../include/conversation.php:1521
 msgid "Imported public streams"
 msgstr "Importar fluxos públics"
 
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1526
 msgid "Commented Order"
 msgstr "Ordenar per Comentaris"
 
-#: ../../include/conversation.php:1514
+#: ../../include/conversation.php:1529
 msgid "Sort by Comment Date"
 msgstr "Ordenar per Data del Comentari"
 
-#: ../../include/conversation.php:1518
+#: ../../include/conversation.php:1533
 msgid "Posted Order"
 msgstr "Ordenar per Entrades"
 
-#: ../../include/conversation.php:1521
+#: ../../include/conversation.php:1536
 msgid "Sort by Post Date"
 msgstr "Ordenar per Data d' Entrada"
 
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1544
 msgid "Posts that mention or involve you"
 msgstr "Entrades que et mencionen o involucren"
 
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1553
 msgid "Activity Stream - by date"
 msgstr "Activitat del Flux - per data"
 
-#: ../../include/conversation.php:1544
+#: ../../include/conversation.php:1559
 msgid "Starred"
 msgstr "Preferit"
 
-#: ../../include/conversation.php:1547
+#: ../../include/conversation.php:1562
 msgid "Favourite Posts"
 msgstr "Entrades Favorites"
 
-#: ../../include/conversation.php:1554
+#: ../../include/conversation.php:1569
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1557
+#: ../../include/conversation.php:1572
 msgid "Posts flagged as SPAM"
 msgstr "Entrades marcades com a SPAM"
 
-#: ../../include/conversation.php:1614
+#: ../../include/conversation.php:1629
 msgid "Status Messages and Posts"
 msgstr "Estat dels Missatges i Entrades"
 
-#: ../../include/conversation.php:1623
+#: ../../include/conversation.php:1638
 msgid "About"
 msgstr "El Meu Perfil"
 
-#: ../../include/conversation.php:1626
+#: ../../include/conversation.php:1641
 msgid "Profile Details"
 msgstr "Detalls del Perfil"
 
-#: ../../include/conversation.php:1635 ../../include/photos.php:502
-msgid "Photo Albums"
-msgstr "Albums de Fotos"
-
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1657
 msgid "Files and Storage"
 msgstr "Arxius i Emmagatzegament"
 
-#: ../../include/conversation.php:1678
+#: ../../include/conversation.php:1677 ../../include/conversation.php:1680
+#: ../../include/widgets.php:836
+msgid "Chatrooms"
+msgstr "Sala per Xerrar"
+
+#: ../../include/conversation.php:1693
 msgid "Saved Bookmarks"
 msgstr "Marcadors Guardats"
 
-#: ../../include/conversation.php:1688
+#: ../../include/conversation.php:1703
 msgid "Manage Webpages"
 msgstr "Gestió de Pàgines Web"
 
-#: ../../include/conversation.php:1747
+#: ../../include/conversation.php:1768
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Assistint"
 msgstr[1] "Assistint"
 
-#: ../../include/conversation.php:1750
+#: ../../include/conversation.php:1771
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Desassistint"
 msgstr[1] "Desassistint"
 
-#: ../../include/conversation.php:1753
+#: ../../include/conversation.php:1774
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indecís"
 msgstr[1] "Indecisos"
 
-#: ../../include/conversation.php:1756
+#: ../../include/conversation.php:1777
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "Acord"
 msgstr[1] "Acords"
 
-#: ../../include/conversation.php:1759
+#: ../../include/conversation.php:1780
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "Desacord"
 msgstr[1] "Desacords"
 
-#: ../../include/conversation.php:1762
+#: ../../include/conversation.php:1783
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "Abstenirse"
 msgstr[1] "Abstenirse"
 
+#: ../../include/import.php:30
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "No s'ha pogut importar el canal perquè l'identificador del canal no s'ha pogut duplicar en aquest servidor."
+
+#: ../../include/import.php:97
+msgid "Channel clone failed. Import failed."
+msgstr "No s'ha pogut importar el canal perquè el canal no s'ha pogut clonar."
+
 #: ../../include/selectors.php:30
 msgid "Frequently"
 msgstr "Freqüentment"
@@ -8135,12 +7946,6 @@ msgstr "Neutre"
 msgid "Non-specific"
 msgstr "Indefinit"
 
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-#: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:881
-msgid "Other"
-msgstr "Altres"
-
 #: ../../include/selectors.php:49
 msgid "Undecided"
 msgstr "Indecís"
@@ -8317,361 +8122,366 @@ msgstr "No Et Fa Res"
 msgid "Ask me"
 msgstr "Pregunta"
 
-#: ../../include/PermissionDescription.php:31
-#: ../../include/acl_selectors.php:232
-msgid "Visible to your default audience"
-msgstr "Visible per a la teva audiència "
-
-#: ../../include/PermissionDescription.php:115
-#: ../../include/acl_selectors.php:268
-msgid "Only me"
-msgstr "Només jo"
-
-#: ../../include/PermissionDescription.php:116
-msgid "Public"
-msgstr "Públic"
-
-#: ../../include/PermissionDescription.php:117
-msgid "Anybody in the $Projectname network"
-msgstr "Ningú a la xarxa $Projectname"
-
-#: ../../include/PermissionDescription.php:118
+#: ../../include/bookmarks.php:35
 #, php-format
-msgid "Any account on %s"
-msgstr "Qualsevol compte a %s"
+msgid "%1$s's bookmarks"
+msgstr "%1$s de marcadors"
 
-#: ../../include/PermissionDescription.php:119
-msgid "Any of my connections"
-msgstr "Qualsevol de les meves connexions"
+#: ../../include/security.php:109
+msgid "guest:"
+msgstr ""
 
-#: ../../include/PermissionDescription.php:120
-msgid "Only connections I specifically allow"
-msgstr "Només les connexions que permeto específicament"
-
-#: ../../include/PermissionDescription.php:121
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr "Qualsevol persona autenticada (podria incloure als usuaris d'altres xarxes)"
-
-#: ../../include/PermissionDescription.php:122
-msgid "Any connections including those who haven't yet been approved"
-msgstr "Qualsevol connexió incloent aquells que encara no han estat aprovats"
-
-#: ../../include/PermissionDescription.php:161
+#: ../../include/security.php:427
 msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
-msgstr "Aquest és l'ajust per defecte per al públic del seu flux normal i entrades."
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "El formulario de la cadena de seguridad no era correcto. Esto probablemente ocurrió porque el formulario se ha abierto durante demasiado tiempo (> 3 horas) antes de enviarlo."
 
-#: ../../include/PermissionDescription.php:162
+#: ../../include/text.php:404
+msgid "prev"
+msgstr "prev"
+
+#: ../../include/text.php:406
+msgid "first"
+msgstr "primer"
+
+#: ../../include/text.php:435
+msgid "last"
+msgstr "últim"
+
+#: ../../include/text.php:438
+msgid "next"
+msgstr "pròxim"
+
+#: ../../include/text.php:448
+msgid "older"
+msgstr "el més antic"
+
+#: ../../include/text.php:450
+msgid "newer"
+msgstr "El més nou"
+
+#: ../../include/text.php:843
+msgid "No connections"
+msgstr "Sense Connexions"
+
+#: ../../include/text.php:868
+#, php-format
+msgid "View all %s connections"
+msgstr "Veure totes les connexions de %s"
+
+#: ../../include/text.php:1013 ../../include/text.php:1018
+msgid "poke"
+msgstr "esperona"
+
+#: ../../include/text.php:1019
+msgid "ping"
+msgstr "coloca"
+
+#: ../../include/text.php:1019
+msgid "pinged"
+msgstr "colocat"
+
+#: ../../include/text.php:1020
+msgid "prod"
+msgstr "picar"
+
+#: ../../include/text.php:1020
+msgid "prodded"
+msgstr "picat"
+
+#: ../../include/text.php:1021
+msgid "slap"
+msgstr "bufetada"
+
+#: ../../include/text.php:1021
+msgid "slapped"
+msgstr "bufetejat"
+
+#: ../../include/text.php:1022
+msgid "finger"
+msgstr "senyal"
+
+#: ../../include/text.php:1022
+msgid "fingered"
+msgstr "senyalat"
+
+#: ../../include/text.php:1023
+msgid "rebuff"
+msgstr "menyspreu"
+
+#: ../../include/text.php:1023
+msgid "rebuffed"
+msgstr "menyspreuat"
+
+#: ../../include/text.php:1035
+msgid "happy"
+msgstr "feliç"
+
+#: ../../include/text.php:1036
+msgid "sad"
+msgstr "trist"
+
+#: ../../include/text.php:1037
+msgid "mellow"
+msgstr "melós"
+
+#: ../../include/text.php:1038
+msgid "tired"
+msgstr "cansat"
+
+#: ../../include/text.php:1039
+msgid "perky"
+msgstr "turgent"
+
+#: ../../include/text.php:1040
+msgid "angry"
+msgstr "enfadat"
+
+#: ../../include/text.php:1041
+msgid "stupefied"
+msgstr "estupefacte"
+
+#: ../../include/text.php:1042
+msgid "puzzled"
+msgstr "perplexe"
+
+#: ../../include/text.php:1043
+msgid "interested"
+msgstr "Interessat"
+
+#: ../../include/text.php:1044
+msgid "bitter"
+msgstr "amargat"
+
+#: ../../include/text.php:1045
+msgid "cheerful"
+msgstr "feliç"
+
+#: ../../include/text.php:1046
+msgid "alive"
+msgstr "viu"
+
+#: ../../include/text.php:1047
+msgid "annoyed"
+msgstr "molest"
+
+#: ../../include/text.php:1048
+msgid "anxious"
+msgstr "ansiós"
+
+#: ../../include/text.php:1049
+msgid "cranky"
+msgstr "malagaitós"
+
+#: ../../include/text.php:1050
+msgid "disturbed"
+msgstr "transtornat"
+
+#: ../../include/text.php:1051
+msgid "frustrated"
+msgstr "frustrat"
+
+#: ../../include/text.php:1052
+msgid "depressed"
+msgstr "deprimit"
+
+#: ../../include/text.php:1053
+msgid "motivated"
+msgstr "motivat"
+
+#: ../../include/text.php:1054
+msgid "relaxed"
+msgstr "relaxat"
+
+#: ../../include/text.php:1055
+msgid "surprised"
+msgstr "sorprès"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "Dilluns"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "Dimarts"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "Dimecres"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "Dijous"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "Divendres"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "Dissabte"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "Diumenge"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:45
+msgid "January"
+msgstr "Gener"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:46
+msgid "February"
+msgstr "Febrer"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:47
+msgid "March"
+msgstr "Març"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:48
+msgid "April"
+msgstr "Abril"
+
+#: ../../include/text.php:1241
+msgid "May"
+msgstr "Maig"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:50
+msgid "June"
+msgstr "Juny"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:51
+msgid "July"
+msgstr "Juliol"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:52
+msgid "August"
+msgstr "Agost"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:53
+msgid "September"
+msgstr "Setembre"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:54
+msgid "October"
+msgstr "Octubre"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:55
+msgid "November"
+msgstr "Novembre"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:56
+msgid "December"
+msgstr "Desembre"
+
+#: ../../include/text.php:1318 ../../include/text.php:1322
+msgid "Unknown Attachment"
+msgstr "Adjunt Desconegut"
+
+#: ../../include/text.php:1324
+msgid "unknown"
+msgstr "desconegut"
+
+#: ../../include/text.php:1360
+msgid "remove category"
+msgstr "elimina categoria"
+
+#: ../../include/text.php:1437
+msgid "remove from file"
+msgstr "elimina del arxiu"
+
+#: ../../include/text.php:1734 ../../include/text.php:1805
+msgid "default"
+msgstr "per defecte"
+
+#: ../../include/text.php:1742
+msgid "Page layout"
+msgstr "Format de la pàgina"
+
+#: ../../include/text.php:1742
+msgid "You can create your own with the layouts tool"
+msgstr "Pots crear el teu propi amb l'editor de format de pàgina."
+
+#: ../../include/text.php:1784
+msgid "Page content type"
+msgstr "Tipus de contingut de la pàgina"
+
+#: ../../include/text.php:1817
+msgid "Select an alternate language"
+msgstr "Tria un idioma alternatiu"
+
+#: ../../include/text.php:1934
+msgid "activity"
+msgstr "activitat"
+
+#: ../../include/text.php:2235
+msgid "Design Tools"
+msgstr "Eines de disseny"
+
+#: ../../include/text.php:2241
+msgid "Pages"
+msgstr "Pàgines"
+
+#: ../../include/auth.php:147
+msgid "Logged out."
+msgstr "Sortir."
+
+#: ../../include/auth.php:274
+msgid "Failed authentication"
+msgstr "Autenticació fallida"
+
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
+msgstr "Pot veure el flux i entrades normals"
+
+#: ../../include/permissions.php:30
+msgid "Can view my webpages"
+msgstr "Pot veure les meves pàgines web"
+
+#: ../../include/permissions.php:34
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Pot fer entrades a la meva pàgina de canal (\"mur\")"
+
+#: ../../include/permissions.php:37
+msgid "Can like/dislike stuff"
+msgstr "Pot dir si agrada/desagrada "
+
+#: ../../include/permissions.php:37
+msgid "Profiles and things other than posts/comments"
+msgstr "Perfils i altres coses a més d'entrades/comentaris"
+
+#: ../../include/permissions.php:39
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Ho pot enviar a tots els meus contactes del canal via entrades @mencions"
+
+#: ../../include/permissions.php:39
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Avançat - capaç de crear canals de grups de foro"
+
+#: ../../include/permissions.php:40
+msgid "Can chat with me (when available)"
+msgstr "Pot xatejar amb mi (si estic disponible)"
+
+#: ../../include/permissions.php:41
+msgid "Can write to my file storage and photos"
+msgstr "Pot escriure al meu magatzem d'arxius i fotos"
+
+#: ../../include/permissions.php:42
+msgid "Can edit my webpages"
+msgstr "Pot editar les meves pàgines web"
+
+#: ../../include/permissions.php:44
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Quelcom avançat - molt útil en comunitats obertes"
+
+#: ../../include/permissions.php:46
+msgid "Can administer my channel resources"
+msgstr "Pot administrar els meus recursos del canal"
+
+#: ../../include/permissions.php:46
 msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr "Aquesta és la configuració per defecte per a qui pugui veure el teu perfil per defecte del canal"
-
-#: ../../include/PermissionDescription.php:163
-msgid "This is your default setting for who can view your connections"
-msgstr "Aquesta és la configuració per defecte per a qui pugui veure les teves connexions"
-
-#: ../../include/PermissionDescription.php:164
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr "Aquesta és la configuració per defecte per a qui pugui veure els teus arxius i fotos"
-
-#: ../../include/PermissionDescription.php:165
-msgid "This is your default setting for the audience of your webpages"
-msgstr "Aquests son els ajustos per defecte de l'audiència de les teves pàgines web"
-
-#: ../../include/account.php:28
-msgid "Not a valid email address"
-msgstr "Adreça de correu electrònic no vàlida"
-
-#: ../../include/account.php:30
-msgid "Your email domain is not among those allowed on this site"
-msgstr "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc"
-
-#: ../../include/account.php:36
-msgid "Your email address is already registered at this site."
-msgstr "La teva adreça de correu electrònic ja esta registrada en aquest lloc"
-
-#: ../../include/account.php:68
-msgid "An invitation is required."
-msgstr "Es requereix Invitació"
-
-#: ../../include/account.php:72
-msgid "Invitation could not be verified."
-msgstr "L'invitació no ha pogut ser verificada"
-
-#: ../../include/account.php:122
-msgid "Please enter the required information."
-msgstr "Entra la informació sol·licitada"
-
-#: ../../include/account.php:189
-msgid "Failed to store account information."
-msgstr "Ha fallat guardar la informació del compte"
-
-#: ../../include/account.php:249
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Registre confirmat per  %s"
-
-#: ../../include/account.php:315
-#, php-format
-msgid "Registration request at %s"
-msgstr "Sol·licitud de registre a %s"
-
-#: ../../include/account.php:317 ../../include/account.php:344
-#: ../../include/account.php:404 ../../include/network.php:1871
-msgid "Administrator"
-msgstr "Administrador"
-
-#: ../../include/account.php:339
-msgid "your registration password"
-msgstr "la teva contrasenya registrada"
-
-#: ../../include/account.php:342 ../../include/account.php:402
-#, php-format
-msgid "Registration details for %s"
-msgstr "Detalls del registre per %s"
-
-#: ../../include/account.php:414
-msgid "Account approved."
-msgstr "Compte aprovat."
-
-#: ../../include/account.php:454
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registre revocat per %s"
-
-#: ../../include/account.php:506
-msgid "Account verified. Please login."
-msgstr "Compte verificat. Si us plau, inicia sessió."
-
-#: ../../include/account.php:723 ../../include/account.php:725
-msgid "Click here to upgrade."
-msgstr "Feu clic aquí per actualitzar."
-
-#: ../../include/account.php:731
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Aquesta acció és superior als límits establerts pel seu pla de subscripció."
-
-#: ../../include/account.php:736
-msgid "This action is not available under your subscription plan."
-msgstr "Aquesta acció no està disponible en el seu pla de subscripció."
-
-#: ../../include/attach.php:247 ../../include/attach.php:333
-msgid "Item was not found."
-msgstr "Article no trobat."
-
-#: ../../include/attach.php:497
-msgid "No source file."
-msgstr "No hi ha arxiu d'origen."
-
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
-msgstr "No trobo l'arxiu a reemplaçar"
-
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
-msgstr "No trobo l'arxiu a revisar/actualitzar"
-
-#: ../../include/attach.php:672
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "L'arxiu excedeix la mida limit de %d"
-
-#: ../../include/attach.php:686
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Has arribat al teu límit de %1$.0f Mbytes de emagatzematge d'adjunts."
-
-#: ../../include/attach.php:842
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Pujada del arxiu fallida. Possible límit del sistema o acció interrompuda."
-
-#: ../../include/attach.php:855
-msgid "Stored file could not be verified. Upload failed."
-msgstr "L'arxiu guardat no es pot verificar. Pujada fallida."
-
-#: ../../include/attach.php:909 ../../include/attach.php:925
-msgid "Path not available."
-msgstr "Trajectòria no disponible"
-
-#: ../../include/attach.php:971 ../../include/attach.php:1123
-msgid "Empty pathname"
-msgstr "Trajèctoria vuida."
-
-#: ../../include/attach.php:997
-msgid "duplicate filename or path"
-msgstr "Nom o trajectòria duplicat"
-
-#: ../../include/attach.php:1019
-msgid "Path not found."
-msgstr "Trajectòria no trobada."
-
-#: ../../include/attach.php:1077
-msgid "mkdir failed."
-msgstr "mkdir va fracassar."
-
-#: ../../include/attach.php:1081
-msgid "database storage failed."
-msgstr "Arxiu de base de dades va fallar."
-
-#: ../../include/attach.php:1129
-msgid "Empty path"
-msgstr "Trajèctoria vuida"
-
-#: ../../include/channel.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "Incapaç de trobar l'informació d'identitat a la base de dades"
-
-#: ../../include/channel.php:66
-msgid "Empty name"
-msgstr "Nom buit"
-
-#: ../../include/channel.php:69
-msgid "Name too long"
-msgstr "Nom massa llarg"
-
-#: ../../include/channel.php:180
-msgid "No account identifier"
-msgstr "Sense identificador de compte"
-
-#: ../../include/channel.php:192
-msgid "Nickname is required."
-msgstr "Alies/malnom es requerit."
-
-#: ../../include/channel.php:206
-msgid "Reserved nickname. Please choose another."
-msgstr "Àlies reservat. Tria un altre."
-
-#: ../../include/channel.php:211
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "L'álies te caracters no soportats o ja esta en ús en aquest lloc"
-
-#: ../../include/channel.php:287
-msgid "Unable to retrieve created identity"
-msgstr "No es pot recuperar la identitat creada"
-
-#: ../../include/channel.php:345
-msgid "Default Profile"
-msgstr "Perfil per Defecte"
-
-#: ../../include/channel.php:791
-msgid "Requested channel is not available."
-msgstr "El canal demanat no està disponible."
-
-#: ../../include/channel.php:938
-msgid "Create New Profile"
-msgstr "Crear un Perfil Nou"
-
-#: ../../include/channel.php:958
-msgid "Visible to everybody"
-msgstr "Visible per tothom"
-
-#: ../../include/channel.php:1031 ../../include/channel.php:1142
-msgid "Gender:"
-msgstr "Gènere:"
-
-#: ../../include/channel.php:1032 ../../include/channel.php:1186
-msgid "Status:"
-msgstr "Estatus:"
-
-#: ../../include/channel.php:1033 ../../include/channel.php:1197
-msgid "Homepage:"
-msgstr "Pàgina Personal:"
-
-#: ../../include/channel.php:1034
-msgid "Online Now"
-msgstr "Ara en Linia"
-
-#: ../../include/channel.php:1147
-msgid "Like this channel"
-msgstr "M'agrada aquest canal"
-
-#: ../../include/channel.php:1171
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: ../../include/channel.php:1172
-msgid "j F"
-msgstr "j F"
-
-#: ../../include/channel.php:1179
-msgid "Birthday:"
-msgstr "Aniversari:"
-
-#: ../../include/channel.php:1192
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "per %1$d %2$s"
-
-#: ../../include/channel.php:1195
-msgid "Sexual Preference:"
-msgstr "Preferència Sexual:"
-
-#: ../../include/channel.php:1201
-msgid "Tags:"
-msgstr "Etiquetes:"
-
-#: ../../include/channel.php:1203
-msgid "Political Views:"
-msgstr "Idees Polítiques:"
-
-#: ../../include/channel.php:1205
-msgid "Religion:"
-msgstr "Religió:"
-
-#: ../../include/channel.php:1209
-msgid "Hobbies/Interests:"
-msgstr "Aficions/Interessos:"
-
-#: ../../include/channel.php:1211
-msgid "Likes:"
-msgstr "Agrada:"
-
-#: ../../include/channel.php:1213
-msgid "Dislikes:"
-msgstr "Desagrada:"
-
-#: ../../include/channel.php:1215
-msgid "Contact information and Social Networks:"
-msgstr "Informació de contacte i Xarxes Socials:"
-
-#: ../../include/channel.php:1217
-msgid "My other channels:"
-msgstr "Els meus altres canals:"
-
-#: ../../include/channel.php:1219
-msgid "Musical interests:"
-msgstr "Interessos Musicals:"
-
-#: ../../include/channel.php:1221
-msgid "Books, literature:"
-msgstr "Llibres, literatura:"
-
-#: ../../include/channel.php:1223
-msgid "Television:"
-msgstr "Televisió:"
-
-#: ../../include/channel.php:1225
-msgid "Film/dance/culture/entertainment:"
-msgstr "Películes/Dança/Cultura/Entreteniment:"
-
-#: ../../include/channel.php:1227
-msgid "Love/Romance:"
-msgstr "Amor/Romace:"
-
-#: ../../include/channel.php:1229
-msgid "Work/employment:"
-msgstr "Treball/feina:"
-
-#: ../../include/channel.php:1231
-msgid "School/education:"
-msgstr "Escola/educació:"
-
-#: ../../include/channel.php:1251
-msgid "Like this thing"
-msgstr "M'agrada això"
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Extremadament avançat. No toquis res si no saps que estàs fent"
 
 #: ../../include/features.php:48
 msgid "General Features"
@@ -8718,378 +8528,257 @@ msgid "Provide managed web pages on your channel"
 msgstr "Proporcionar pàgines web gestionades al seu canal"
 
 #: ../../include/features.php:55
+msgid "Provide a wiki for your channel"
+msgstr ""
+
+#: ../../include/features.php:56
 msgid "Hide Rating"
 msgstr "Amaga la Valoració"
 
-#: ../../include/features.php:55
+#: ../../include/features.php:56
 msgid ""
 "Hide the rating buttons on your channel and profile pages. Note: People can "
 "still rate you somewhere else."
 msgstr "Amaga el botó de valoracions al teu canal i pàgines del perfil. Nota: Et poden continuar valorant en altres llocs."
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Private Notes"
 msgstr "Notes Privades"
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr "Activa l'eina per guardar notes i recordatoris (nota:no està encriptat)"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Navigation Channel Select"
 msgstr "Navegació pel Selector de Canals"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Canvieu els canals directament des del menú desplegable de navegació"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "Photo Location"
 msgstr "Ubicació de la Foto"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr "Si les dades d'ubicació estàn disponibles a les fotos pujades, vincular a un mapa."
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Access Controlled Chatrooms"
 msgstr "Accés Controlat a les Sales de Xat"
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Provide chatrooms and chat services with access control."
 msgstr "Proveeix sales de Xat i serveis de Xat amb control d'accés."
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid "Smart Birthdays"
 msgstr "Aniversaris Intel·ligents"
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid ""
 "Make birthday events timezone aware in case your friends are scattered "
 "across the planet."
 msgstr "Fes, conscients de la zona horària, els esdeveniments d'aniversari, en cas que els teus amics estiguin dispersos per tot el planeta."
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Expert Mode"
 msgstr "Manera Experta"
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr "Activar Mode Expert per a proporcionar opcions avançades de configuració"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid "Premium Channel"
 msgstr "Privilegis del Canal"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr "Li permet establir restriccions i els termes en els quals es connecten amb el seu canal"
 
-#: ../../include/features.php:67
+#: ../../include/features.php:68
 msgid "Post Composition Features"
 msgstr "Característiques de Composició d'Entrades"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Large Photos"
 msgstr "Grans Fotos"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr "Inclou gran (1024px) foto de miniatura a les entrades. Si no està activat, empra petita (640px) foto de miniatura."
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Automatically import channel content from other channels or feeds"
 msgstr "Importa automàticament el contingut del canal des de altres canals o feeds"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Even More Encryption"
 msgstr "Encara Més Encriptació"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr "Permet l'encripció opcional del contingut extrem-a-extrem amb clau secreta compartida"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Enable Voting Tools"
 msgstr "Habilitar Eines de Votació"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Provide a class of post which others can vote on"
 msgstr "Proporcionar una classe d'entrada que altres puguin votar"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Delayed Posting"
 msgstr "Retarda Publicació"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Allow posts to be published at a later date"
 msgstr "Permet que les publicacions es publiquin en data posterior"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Suppress Duplicate Posts/Comments"
 msgstr "Suprimeix Duplicats de Publicacions/Comentaris"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr "Evita que publicacions amb identic contingut siguin publicades amb menys de dos minuts entre entregues."
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Network and Stream Filtering"
 msgstr "Filtrat de Xarxa i Flux"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Search by Date"
 msgstr "Cerca per Data"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to select posts by date ranges"
 msgstr "Capacitat per seleccionar entrades per rang de dates"
 
-#: ../../include/features.php:83 ../../include/group.php:311
+#: ../../include/features.php:84 ../../include/group.php:311
 msgid "Privacy Groups"
 msgstr "Grup Privat"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Enable management and selection of privacy groups"
 msgstr "Habilita gestió i selecció de grups privats"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85 ../../include/widgets.php:281
+msgid "Saved Searches"
+msgstr "Cerques Guardades"
+
+#: ../../include/features.php:85
 msgid "Save search terms for re-use"
 msgstr "Guardar els termin de la cerca per a re-usar"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Network Personal Tab"
 msgstr "Pestanya Personal de Xarxa"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Activa la pestanya per mostrar només les entrades de xarxa en les que has intervingut"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Network New Tab"
 msgstr "Pestanya Nou a la Xarxa"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Enable tab to display all new Network activity"
 msgstr "Activa pestanya per mostrar tota l'activitat nova de la Xarxa"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Affinity Tool"
 msgstr "Eina d'Afinitat"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filtre d'activitat del flux per importància de la relació"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Connection Filtering"
 msgstr "Filtre de Connexió"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Filtre de missatges d'entrada de conexions, basat en paraules clau/contingut "
 
-#: ../../include/features.php:89
+#: ../../include/features.php:90
 msgid "Show channel suggestions"
 msgstr "Mostra suggerencies de canals"
 
-#: ../../include/features.php:94
+#: ../../include/features.php:95
 msgid "Post/Comment Tools"
 msgstr "Eina d'Entrades/Comentaris"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Community Tagging"
 msgstr "Etiquetat per la Comunitat"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Ability to tag existing posts"
 msgstr "Capacitat d'etiquetar entrades existents"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Post Categories"
 msgstr "Categories d'Entrades"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Add categories to your posts"
 msgstr "Afegeix categoria a la teva entrada"
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Emoji Reactions"
-msgstr ""
-
-#: ../../include/features.php:97
-msgid "Add emoji reaction ability to posts"
-msgstr ""
+msgstr "Reaccions dels Emoji"
 
 #: ../../include/features.php:98
+msgid "Add emoji reaction ability to posts"
+msgstr "Afegeix un emoji habilitat per reaccionar a entrades"
+
+#: ../../include/features.php:99 ../../include/widgets.php:310
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Carpetes Guardades"
+
+#: ../../include/features.php:99
 msgid "Ability to file posts under folders"
 msgstr "Capacitat de arxivar entrades en les carpetes"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Dislike Posts"
 msgstr "No Agrada l'Entrada"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Ability to dislike posts/comments"
 msgstr "Capacitat per marcar amb \"No Agrada\" les entrades/comentaris"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Star Posts"
 msgstr "Entrades Excel·lents"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Capacitat per marcar entrades especials amb l'indicador d'excel·lencia"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Tag Cloud"
 msgstr "Núvol d'Etiquetes."
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Proporcionar un núvol d'etiquetes personals a la teva pàgina de canal"
 
-#: ../../include/oembed.php:324
-msgid "Embedded content"
-msgstr "Contingut embegut"
-
-#: ../../include/oembed.php:333
-msgid "Embedding disabled"
-msgstr "Incorporació desactivada"
-
-#: ../../include/acl_selectors.php:271
-msgid "Who can see this?"
-msgstr "Qui pot veure això?"
-
-#: ../../include/acl_selectors.php:272
-msgid "Custom selection"
-msgstr "Selecció a mida"
-
-#: ../../include/acl_selectors.php:273
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
-" the scope of \"Show\"."
-msgstr "Selecciona \"Mostrar\" per permetre la visualització. \"No Mostrar\" et permet obviar i limitar l'abast de \"Mostrar\"."
-
-#: ../../include/acl_selectors.php:274
-msgid "Show"
-msgstr "Mostra"
-
-#: ../../include/acl_selectors.php:275
-msgid "Don't show"
-msgstr "No mostrar"
-
-#: ../../include/acl_selectors.php:281
-msgid "Other networks and post services"
-msgstr "Altres xarxes i serveis de correu"
-
-#: ../../include/acl_selectors.php:311
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These"
-" permissions set who is allowed to view the post."
-msgstr "Els permisos d'entrada %s no poden esser canviats %s posteriorment a que una entrada ja està compartida. </br />Aquest ajust dels permisos indica qui pot veure l'entrada."
-
-#: ../../include/auth.php:105
-msgid "Logged out."
-msgstr "Sortir."
-
-#: ../../include/auth.php:212
-msgid "Failed authentication"
-msgstr "Autenticació fallida"
-
-#: ../../include/datetime.php:135
-msgid "Birthday"
-msgstr "Aniversari"
-
-#: ../../include/datetime.php:137
-msgid "Age: "
-msgstr "Edat:"
-
-#: ../../include/datetime.php:139
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "YYYY-MM-DD o MM-DD"
-
-#: ../../include/datetime.php:272 ../../boot.php:2470
-msgid "never"
-msgstr "mai"
-
-#: ../../include/datetime.php:278
-msgid "less than a second ago"
-msgstr "fa menys d'un segon"
-
-#: ../../include/datetime.php:296
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "Fa %1$d %2$s"
-
-#: ../../include/datetime.php:307
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] "any"
-msgstr[1] "anys"
-
-#: ../../include/datetime.php:310
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] "mes"
-msgstr[1] "mesos "
-
-#: ../../include/datetime.php:313
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "setmana"
-msgstr[1] "setmanes"
-
-#: ../../include/datetime.php:316
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dia"
-msgstr[1] "dies"
-
-#: ../../include/datetime.php:319
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hora"
-msgstr[1] "hores"
-
-#: ../../include/datetime.php:322
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minut"
-msgstr[1] "minuts"
-
-#: ../../include/datetime.php:325
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "segon"
-msgstr[1] "segons"
-
-#: ../../include/datetime.php:562
-#, php-format
-msgid "%1$s's birthday"
-msgstr "Aniversari de %1$s"
-
-#: ../../include/datetime.php:563
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr "Feliç Aniversari %1$s"
-
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -9117,21 +8806,583 @@ msgstr "Afegir grup privat"
 msgid "Channels not in any privacy group"
 msgstr "Sense canals en grups privats"
 
+#: ../../include/group.php:316 ../../include/widgets.php:282
+msgid "add"
+msgstr "afegeix"
+
+#: ../../include/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:485
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d \\d\\e/\\d' F de Y \\@ H:i T"
+
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:491
+msgid "Starts:"
+msgstr "Inicia:"
+
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:499
+msgid "Finishes:"
+msgstr "Acaba:"
+
+#: ../../include/event.php:814
+msgid "This event has been added to your calendar."
+msgstr "Aquest succés ha estat afegit al teu calendari."
+
+#: ../../include/event.php:1014
+msgid "Not specified"
+msgstr "Sense especificar"
+
+#: ../../include/event.php:1015
+msgid "Needs Action"
+msgstr "Necessita una Acció"
+
+#: ../../include/event.php:1016
+msgid "Completed"
+msgstr "Completat"
+
+#: ../../include/event.php:1017
+msgid "In Process"
+msgstr "En Procès"
+
+#: ../../include/event.php:1018
+msgid "Cancelled"
+msgstr "Cancel·lat"
+
+#: ../../include/account.php:28
+msgid "Not a valid email address"
+msgstr "Adreça de correu electrònic no vàlida"
+
+#: ../../include/account.php:30
+msgid "Your email domain is not among those allowed on this site"
+msgstr "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc"
+
+#: ../../include/account.php:36
+msgid "Your email address is already registered at this site."
+msgstr "La teva adreça de correu electrònic ja esta registrada en aquest lloc"
+
+#: ../../include/account.php:68
+msgid "An invitation is required."
+msgstr "Es requereix Invitació"
+
+#: ../../include/account.php:72
+msgid "Invitation could not be verified."
+msgstr "L'invitació no ha pogut ser verificada"
+
+#: ../../include/account.php:122
+msgid "Please enter the required information."
+msgstr "Entra la informació sol·licitada"
+
+#: ../../include/account.php:189
+msgid "Failed to store account information."
+msgstr "Ha fallat guardar la informació del compte"
+
+#: ../../include/account.php:249
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Inscripció confirmada per  %s"
+
+#: ../../include/account.php:315
+#, php-format
+msgid "Registration request at %s"
+msgstr "Sol·licitud d'inscripció a %s"
+
+#: ../../include/account.php:339
+msgid "your registration password"
+msgstr "la teva contrasenya registrada"
+
+#: ../../include/account.php:342 ../../include/account.php:402
+#, php-format
+msgid "Registration details for %s"
+msgstr "Detalls de l'inscripció per %s"
+
+#: ../../include/account.php:414
+msgid "Account approved."
+msgstr "Compte aprovat."
+
+#: ../../include/account.php:454
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Inscripció revocada per %s"
+
+#: ../../include/account.php:739 ../../include/account.php:741
+msgid "Click here to upgrade."
+msgstr "Feu clic aquí per actualitzar."
+
+#: ../../include/account.php:747
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Aquesta acció és superior als límits establerts pel seu pla de subscripció."
+
+#: ../../include/account.php:752
+msgid "This action is not available under your subscription plan."
+msgstr "Aquesta acció no està disponible en el seu pla de subscripció."
+
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
+msgstr "El canal està bloquejat en aquest lloc."
+
+#: ../../include/follow.php:32
+msgid "Channel location missing."
+msgstr "Ubicació del canal perduda."
+
+#: ../../include/follow.php:80
+msgid "Response from remote channel was incomplete."
+msgstr "La resposta del canal remot fou incompleta."
+
+#: ../../include/follow.php:97
+msgid "Channel was deleted and no longer exists."
+msgstr "El canal fou esborrat i actualment no existeix."
+
+#: ../../include/follow.php:147 ../../include/follow.php:183
+msgid "Protocol disabled."
+msgstr "Protocol desactivat."
+
+#: ../../include/follow.php:171
+msgid "Channel discovery failed."
+msgstr "Descobriment de canal fallit."
+
+#: ../../include/follow.php:210
+msgid "Cannot connect to yourself."
+msgstr "No pots connectar amb tu mateix."
+
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
+msgstr "Article no trobat."
+
+#: ../../include/attach.php:499
+msgid "No source file."
+msgstr "No hi ha arxiu d'origen."
+
+#: ../../include/attach.php:521
+msgid "Cannot locate file to replace"
+msgstr "No trobo l'arxiu a reemplaçar"
+
+#: ../../include/attach.php:539
+msgid "Cannot locate file to revise/update"
+msgstr "No trobo l'arxiu a revisar/actualitzar"
+
+#: ../../include/attach.php:674
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "L'arxiu excedeix la mida limit de %d"
+
+#: ../../include/attach.php:688
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Has arribat al teu límit de %1$.0f Mbytes de emagatzematge d'adjunts."
+
+#: ../../include/attach.php:846
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Pujada del arxiu fallida. Possible límit del sistema o acció interrompuda."
+
+#: ../../include/attach.php:859
+msgid "Stored file could not be verified. Upload failed."
+msgstr "L'arxiu guardat no es pot verificar. Pujada fallida."
+
+#: ../../include/attach.php:915 ../../include/attach.php:931
+msgid "Path not available."
+msgstr "Trajectòria no disponible"
+
+#: ../../include/attach.php:977 ../../include/attach.php:1129
+msgid "Empty pathname"
+msgstr "Trajèctoria vuida."
+
+#: ../../include/attach.php:1003
+msgid "duplicate filename or path"
+msgstr "Nom o trajectòria duplicat"
+
+#: ../../include/attach.php:1025
+msgid "Path not found."
+msgstr "Trajectòria no trobada."
+
+#: ../../include/attach.php:1083
+msgid "mkdir failed."
+msgstr "mkdir va fracassar."
+
+#: ../../include/attach.php:1087
+msgid "database storage failed."
+msgstr "Arxiu de base de dades va fallar."
+
+#: ../../include/attach.php:1135
+msgid "Empty path"
+msgstr "Trajèctoria vuida"
+
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:878
+#: ../../include/bbcode.php:881 ../../include/bbcode.php:886
+#: ../../include/bbcode.php:889 ../../include/bbcode.php:892
+#: ../../include/bbcode.php:895 ../../include/bbcode.php:900
+#: ../../include/bbcode.php:903 ../../include/bbcode.php:908
+#: ../../include/bbcode.php:911 ../../include/bbcode.php:914
+#: ../../include/bbcode.php:917
+msgid "Image/photo"
+msgstr "Imatge/foto"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:928
+msgid "Encrypted content"
+msgstr "Contingut encriptat"
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr "Instal·la l'element %s:"
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Aquesta entrada contè un element %s instal·lable, potser manques de permissos per instal·lar-lo en aquest lloc."
+
+#: ../../include/bbcode.php:261
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s va escriure el següent %2$s %3$s"
+
+#: ../../include/bbcode.php:338 ../../include/bbcode.php:346
+msgid "Click to open/close"
+msgstr "Clic per obrir/tancar"
+
+#: ../../include/bbcode.php:346
+msgid "spoiler"
+msgstr "xafa guitarres"
+
+#: ../../include/bbcode.php:619
+msgid "Different viewers will see this text differently"
+msgstr "Diferents observadors veuran aquest text de diferents formes"
+
+#: ../../include/bbcode.php:866
+msgid "$1 wrote:"
+msgstr "$1 va escriure:"
+
+#: ../../include/items.php:897 ../../include/items.php:942
+msgid "(Unknown)"
+msgstr "(Desconegut)"
+
+#: ../../include/items.php:1141
+msgid "Visible to anybody on the internet."
+msgstr "Visible per tothom a la Internet"
+
+#: ../../include/items.php:1143
+msgid "Visible to you only."
+msgstr "Visible només per tú."
+
+#: ../../include/items.php:1145
+msgid "Visible to anybody in this network."
+msgstr "Visible per tothom en aquesta xarxa."
+
+#: ../../include/items.php:1147
+msgid "Visible to anybody authenticated."
+msgstr "Visible per tothom autenticat."
+
+#: ../../include/items.php:1149
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Visible per a tothom a %s."
+
+#: ../../include/items.php:1151
+msgid "Visible to all connections."
+msgstr "Visible per a totes les connexions."
+
+#: ../../include/items.php:1153
+msgid "Visible to approved connections."
+msgstr "Visible per a les connexions aprovades."
+
+#: ../../include/items.php:1155
+msgid "Visible to specific connections."
+msgstr "Visible per a específiques connexions."
+
+#: ../../include/items.php:3918
+msgid "Privacy group is empty."
+msgstr "El grup privat està vuit."
+
+#: ../../include/items.php:3925
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Grup privat: %s"
+
+#: ../../include/items.php:3937
+msgid "Connection not found."
+msgstr "Connexió no trobada."
+
+#: ../../include/items.php:4290
+msgid "profile photo"
+msgstr "foto del perfil"
+
+#: ../../include/oembed.php:336
+msgid "Embedded content"
+msgstr "Contingut embegut"
+
+#: ../../include/oembed.php:345
+msgid "Embedding disabled"
+msgstr "Incorporació desactivada"
+
+#: ../../include/widgets.php:103
+msgid "System"
+msgstr "Sistema"
+
+#: ../../include/widgets.php:106
+msgid "New App"
+msgstr "Nova App"
+
+#: ../../include/widgets.php:154
+msgid "Suggestions"
+msgstr "Suggerencies"
+
+#: ../../include/widgets.php:155
+msgid "See more..."
+msgstr "Veure més....."
+
+#: ../../include/widgets.php:175
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Tens %1$.0f de %2$.0f connexions permeses."
+
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
+msgstr "Afegeix una Nova Connexió"
+
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
+msgstr "Introdueix l'adreça del canal"
+
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Exemples: bob@example.com, https://exemple.com/barbara"
+
+#: ../../include/widgets.php:199
+msgid "Notes"
+msgstr "Notes"
+
+#: ../../include/widgets.php:273
+msgid "Remove term"
+msgstr "Plaç de remoció"
+
+#: ../../include/widgets.php:313 ../../include/widgets.php:432
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
+msgstr "Tot"
+
+#: ../../include/widgets.php:354
+msgid "Archives"
+msgstr "Arxius"
+
+#: ../../include/widgets.php:516
+msgid "Refresh"
+msgstr "Refresc"
+
+#: ../../include/widgets.php:556
+msgid "Account settings"
+msgstr "Ajustos de Compte"
+
+#: ../../include/widgets.php:562
+msgid "Channel settings"
+msgstr "Ajustos de Canal"
+
+#: ../../include/widgets.php:571
+msgid "Additional features"
+msgstr "Característiques addicionals"
+
+#: ../../include/widgets.php:578
+msgid "Feature/Addon settings"
+msgstr "Ajustos de Complements"
+
+#: ../../include/widgets.php:584
+msgid "Display settings"
+msgstr "Ajustos de pantalla"
+
+#: ../../include/widgets.php:591
+msgid "Manage locations"
+msgstr "Gestiona ubicacions"
+
+#: ../../include/widgets.php:600
+msgid "Export channel"
+msgstr "Exportat canal"
+
+#: ../../include/widgets.php:607
+msgid "Connected apps"
+msgstr "Apps connectades"
+
+#: ../../include/widgets.php:631
+msgid "Premium Channel Settings"
+msgstr "Ajustos Premium de Canal"
+
+#: ../../include/widgets.php:660
+msgid "Private Mail Menu"
+msgstr "Menú de Correu Privat"
+
+#: ../../include/widgets.php:662
+msgid "Combined View"
+msgstr "Vista Combinada"
+
+#: ../../include/widgets.php:694 ../../include/widgets.php:706
+msgid "Conversations"
+msgstr "Conversacions"
+
+#: ../../include/widgets.php:698
+msgid "Received Messages"
+msgstr "Missatges Rebuts"
+
+#: ../../include/widgets.php:702
+msgid "Sent Messages"
+msgstr "Missatges Enviats"
+
+#: ../../include/widgets.php:716
+msgid "No messages."
+msgstr "Sense missatges."
+
+#: ../../include/widgets.php:734
+msgid "Delete conversation"
+msgstr "Conversació esborrada"
+
+#: ../../include/widgets.php:760
+msgid "Events Tools"
+msgstr "Eina d'Esdeveniments"
+
+#: ../../include/widgets.php:761
+msgid "Export Calendar"
+msgstr "Exportar Calendari"
+
+#: ../../include/widgets.php:762
+msgid "Import Calendar"
+msgstr "Importar Calendari"
+
+#: ../../include/widgets.php:840
+msgid "Overview"
+msgstr "Visió General"
+
+#: ../../include/widgets.php:847
+msgid "Chat Members"
+msgstr "Membres de la Sala de Xat"
+
+#: ../../include/widgets.php:869
+msgid "Wiki List"
+msgstr "Llista de Wikis"
+
+#: ../../include/widgets.php:907
+msgid "Wiki Pages"
+msgstr "Pàgines de Wikis"
+
+#: ../../include/widgets.php:942
+msgid "Bookmarked Chatrooms"
+msgstr "Sales de Xat Favorites"
+
+#: ../../include/widgets.php:965
+msgid "Suggested Chatrooms"
+msgstr "Sales de Xat Suggerides"
+
+#: ../../include/widgets.php:1111 ../../include/widgets.php:1223
+msgid "photo/image"
+msgstr "foto/imatge"
+
+#: ../../include/widgets.php:1166
+msgid "Click to show more"
+msgstr "Fes clic per veure més"
+
+#: ../../include/widgets.php:1317
+msgid "Rating Tools"
+msgstr "Eines de Valoració"
+
+#: ../../include/widgets.php:1321 ../../include/widgets.php:1323
+msgid "Rate Me"
+msgstr "Valora'm"
+
+#: ../../include/widgets.php:1326
+msgid "View Ratings"
+msgstr "Veure Valoracions"
+
+#: ../../include/widgets.php:1410
+msgid "Forums"
+msgstr "Forums"
+
+#: ../../include/widgets.php:1439
+msgid "Tasks"
+msgstr "Tasques"
+
+#: ../../include/widgets.php:1448
+msgid "Documentation"
+msgstr "Documentació"
+
+#: ../../include/widgets.php:1450
+msgid "Project/Site Information"
+msgstr "Informació del Projecte/Lloc"
+
+#: ../../include/widgets.php:1451
+msgid "For Members"
+msgstr "Per Membres"
+
+#: ../../include/widgets.php:1452
+msgid "For Administrators"
+msgstr "Per Administradors"
+
+#: ../../include/widgets.php:1453
+msgid "For Developers"
+msgstr "Per Desenvolupadors"
+
+#: ../../include/widgets.php:1477 ../../include/widgets.php:1515
+msgid "Member registrations waiting for confirmation"
+msgstr "Una inscripció per a ser membre està esperant confirmació"
+
+#: ../../include/widgets.php:1483
+msgid "Inspect queue"
+msgstr "Revisa cua"
+
+#: ../../include/widgets.php:1485
+msgid "DB updates"
+msgstr "Actualitzacions de Base de Dades"
+
+#: ../../include/widgets.php:1511
+msgid "Plugin Features"
+msgstr "Característiques del Plugin"
+
+#: ../../include/activities.php:41
+msgid " and "
+msgstr "i"
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr "Perfil públic"
+
+#: ../../include/activities.php:58
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s canviat %2$s a &ldquo;%3$s&rdquo;"
+
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Visita %1$s en %2$s"
+
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s Ha actualitzat %2$s, canviant %3$s."
+
+#: ../../include/bb2diaspora.php:398
+msgid "Attachments:"
+msgstr "Adjuntat:"
+
+#: ../../include/bb2diaspora.php:487
+msgid "$Projectname event notification:"
+msgstr "Notificació d'esdeveniment de $Projectname"
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "Esborrar aquest item?"
 
 #: ../../include/js_strings.php:8
-msgid "[-] show less"
-msgstr "[-] mostra menys"
+#, php-format
+msgid "%s show less"
+msgstr ""
 
 #: ../../include/js_strings.php:9
-msgid "[+] expand"
-msgstr "[+] expandeix"
+#, php-format
+msgid "%s expand"
+msgstr ""
 
 #: ../../include/js_strings.php:10
-msgid "[-] collapse"
-msgstr "[-] colapsa"
+#, php-format
+msgid "%s collapse"
+msgstr ""
 
 #: ../../include/js_strings.php:11
 msgid "Password too short"
@@ -9361,278 +9612,223 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "Tot el dia"
 
-#: ../../include/network.php:657
-msgid "view full size"
-msgstr "Veure a mida competa"
-
-#: ../../include/network.php:1885
-msgid "No Subject"
-msgstr "Sense Assumpte"
-
-#: ../../include/network.php:2146 ../../include/network.php:2147
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/network.php:2148
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/network.php:2149
-msgid "GNU-Social"
-msgstr "GNU-Social"
-
-#: ../../include/network.php:2150
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/network.php:2152
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/network.php:2153
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/network.php:2154
-msgid "Zot"
-msgstr "Zot"
-
-#: ../../include/network.php:2155
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ../../include/network.php:2156
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: ../../include/network.php:2157
-msgid "MySpace"
-msgstr "MySpace"
-
-#: ../../include/photos.php:110
+#: ../../include/contact_widgets.php:11
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "La imatge excedeix la mida limit pel lloc web en %lu bytes"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitació disponible"
+msgstr[1] "%d invitacions disponibles"
 
-#: ../../include/photos.php:117
-msgid "Image file is empty."
-msgstr "El fitxer d'imatge esta buit."
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
+msgstr "Troba Canals"
 
-#: ../../include/photos.php:255
-msgid "Photo storage failed."
-msgstr "Fracassà l'emmagatzematge de la Foto"
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
+msgstr "Entra un nom o interes"
 
-#: ../../include/photos.php:295
-msgid "a new photo"
-msgstr "Una foto nova"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
+msgstr "Conecta/Segueix"
 
-#: ../../include/photos.php:299
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Exemples: Lionel Messi, Futbolista"
+
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
+msgstr "Perfil Aleatori"
+
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
+msgstr "Convida Amics"
+
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Exemple avançat: nom=pep i pais=eire"
+
+#: ../../include/contact_widgets.php:122
 #, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s enviat %2$s a %3$s"
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d connexió en comú"
+msgstr[1] "%d connexions en comú"
 
-#: ../../include/photos.php:506
-msgid "Upload New Photos"
-msgstr "Puja Noves Fotos"
+#: ../../include/contact_widgets.php:127
+msgid "show more"
+msgstr "mostrar més"
 
-#: ../../include/zot.php:699
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr "Opcions de Directori"
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr "Manera Segura"
+
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr "Només Fòrums Públics"
+
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr "Només Aquest Lloc Web"
+
+#: ../../include/message.php:20
+msgid "No recipient provided."
+msgstr "No s'ha proporcionat bústia."
+
+#: ../../include/message.php:25
+msgid "[no subject]"
+msgstr "[no subject]"
+
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
+msgstr "incapaç de determinar el remitent"
+
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
+msgstr "L'entrada guardada no pot ser verificada"
+
+#: ../../include/acl_selectors.php:269
+msgid "Who can see this?"
+msgstr "Qui pot veure això?"
+
+#: ../../include/acl_selectors.php:270
+msgid "Custom selection"
+msgstr "Selecció a mida"
+
+#: ../../include/acl_selectors.php:271
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
+" the scope of \"Show\"."
+msgstr "Selecciona \"Mostrar\" per permetre la visualització. \"No Mostrar\" et permet obviar i limitar l'abast de \"Mostrar\"."
+
+#: ../../include/acl_selectors.php:272
+msgid "Show"
+msgstr "Mostra"
+
+#: ../../include/acl_selectors.php:273
+msgid "Don't show"
+msgstr "No mostrar"
+
+#: ../../include/acl_selectors.php:279
+msgid "Other networks and post services"
+msgstr "Altres xarxes i serveis de correu"
+
+#: ../../include/acl_selectors.php:309
+#, php-format
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These"
+" permissions set who is allowed to view the post."
+msgstr "Els permisos d'entrada %s no poden esser canviats %s posteriorment a que una entrada ja està compartida. </br />Aquest ajust dels permisos indica qui pot veure l'entrada."
+
+#: ../../include/datetime.php:135
+msgid "Birthday"
+msgstr "Aniversari"
+
+#: ../../include/datetime.php:137
+msgid "Age: "
+msgstr "Edat:"
+
+#: ../../include/datetime.php:139
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "YYYY-MM-DD o MM-DD"
+
+#: ../../include/datetime.php:272 ../../boot.php:2479
+msgid "never"
+msgstr "mai"
+
+#: ../../include/datetime.php:278
+msgid "less than a second ago"
+msgstr "fa menys d'un segon"
+
+#: ../../include/datetime.php:296
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr "Fa %1$d %2$s"
+
+#: ../../include/datetime.php:307
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] "any"
+msgstr[1] "anys"
+
+#: ../../include/datetime.php:310
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] "mes"
+msgstr[1] "mesos "
+
+#: ../../include/datetime.php:313
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "setmana"
+msgstr[1] "setmanes"
+
+#: ../../include/datetime.php:316
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dia"
+msgstr[1] "dies"
+
+#: ../../include/datetime.php:319
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "hores"
+
+#: ../../include/datetime.php:322
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minut"
+msgstr[1] "minuts"
+
+#: ../../include/datetime.php:325
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "segon"
+msgstr[1] "segons"
+
+#: ../../include/datetime.php:562
+#, php-format
+msgid "%1$s's birthday"
+msgstr "Aniversari de %1$s"
+
+#: ../../include/datetime.php:563
+#, php-format
+msgid "Happy Birthday %1$s"
+msgstr "Feliç Aniversari %1$s"
+
+#: ../../include/api.php:1327
+msgid "Public Timeline"
+msgstr "Línia de Temps Pública"
+
+#: ../../include/zot.php:697
 msgid "Invalid data packet"
 msgstr "paquet de dades invàlid"
 
-#: ../../include/zot.php:715
+#: ../../include/zot.php:713
 msgid "Unable to verify channel signature"
 msgstr "No es pot verificar la signatura del canal"
 
-#: ../../include/zot.php:2363
+#: ../../include/zot.php:2326
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "No es pot verificar la signatura del lloc per %s"
 
-#: ../../include/zot.php:3712
+#: ../../include/zot.php:3703
 msgid "invalid target signature"
 msgstr "Signatura objectiu invàlida"
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Pàgina Nova"
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr "Títol"
-
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
-msgstr "Pot veure el flux i entrades normals"
-
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
-msgstr "Pot veure el meu perfil del canal per defecte"
-
-#: ../../include/permissions.php:28
-msgid "Can view my connections"
-msgstr "Pot veure les meves connexions"
-
-#: ../../include/permissions.php:29
-msgid "Can view my file storage and photos"
-msgstr "Pot veure al meu magatzem d'arxius i fotos"
-
-#: ../../include/permissions.php:30
-msgid "Can view my webpages"
-msgstr "Pot veure les meves pàgines web"
-
-#: ../../include/permissions.php:33
-msgid "Can send me their channel stream and posts"
-msgstr "Pot enviar-me el flux i entrades del seu canal"
-
-#: ../../include/permissions.php:34
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Pot fer entrades a la meva pàgina de canal (\"mur\")"
-
-#: ../../include/permissions.php:35
-msgid "Can comment on or like my posts"
-msgstr "Pot fer comentaris o dir si agrada en les meves entrades"
-
-#: ../../include/permissions.php:36
-msgid "Can send me private mail messages"
-msgstr "Pot enviar-me un missatge de correu privat"
-
-#: ../../include/permissions.php:37
-msgid "Can like/dislike stuff"
-msgstr "Pot dir si agrada/desagrada "
-
-#: ../../include/permissions.php:37
-msgid "Profiles and things other than posts/comments"
-msgstr "Perfils i altres coses a més d'entrades/comentaris"
-
-#: ../../include/permissions.php:39
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Ho pot enviar a tots els meus contactes del canal via entrades @mencions"
-
-#: ../../include/permissions.php:39
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Avançat - capaç de crear canals de grups de foro"
-
-#: ../../include/permissions.php:40
-msgid "Can chat with me (when available)"
-msgstr "Pot xatejar amb mi (si estic disponible)"
-
-#: ../../include/permissions.php:41
-msgid "Can write to my file storage and photos"
-msgstr "Pot escriure al meu magatzem d'arxius i fotos"
-
-#: ../../include/permissions.php:42
-msgid "Can edit my webpages"
-msgstr "Pot editar les meves pàgines web"
-
-#: ../../include/permissions.php:44
-msgid "Can source my public posts in derived channels"
-msgstr "Pot mostrar l'origen de les meves entrades públiques en altres canals"
-
-#: ../../include/permissions.php:44
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Quelcom avançat - molt útil en comunitats obertes"
-
-#: ../../include/permissions.php:46
-msgid "Can administer my channel resources"
-msgstr "Pot administrar els meus recursos del canal"
-
-#: ../../include/permissions.php:46
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Extremadament avançat. No toquis res si no saps que estàs fent"
-
-#: ../../include/permissions.php:877
-msgid "Social Networking"
-msgstr "Xarxes Socials"
-
-#: ../../include/permissions.php:877
-msgid "Social - Mostly Public"
-msgstr "Social -  Principalment Públic"
-
-#: ../../include/permissions.php:877
-msgid "Social - Restricted"
-msgstr "Social - Restingit"
-
-#: ../../include/permissions.php:877
-msgid "Social - Private"
-msgstr "Social - Privat"
-
-#: ../../include/permissions.php:878
-msgid "Community Forum"
-msgstr "Foro de Comunitat"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Mostly Public"
-msgstr "Fòrum - Principalment Públic"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Restricted"
-msgstr "Fòrum - Restringit"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Private"
-msgstr "Fòrum - Privat"
-
-#: ../../include/permissions.php:879
-msgid "Feed Republish"
-msgstr "Republicador"
-
-#: ../../include/permissions.php:879
-msgid "Feed - Mostly Public"
-msgstr "Realimentador - Públic Principalment"
-
-#: ../../include/permissions.php:879
-msgid "Feed - Restricted"
-msgstr "Retroalimentador - Restringit"
-
-#: ../../include/permissions.php:880
-msgid "Special Purpose"
-msgstr "Objectiu Especial"
-
-#: ../../include/permissions.php:880
-msgid "Special - Celebrity/Soapbox"
-msgstr "Espacial - Celebritat/Plataforma"
-
-#: ../../include/permissions.php:880
-msgid "Special - Group Repository"
-msgstr "Especial  - Repositori d'un Grup"
-
-#: ../../include/permissions.php:881
-msgid "Custom/Expert Mode"
-msgstr "Personalitzat/Manera Experta"
-
-#: ../../include/activities.php:41
-msgid " and "
-msgstr "i"
-
-#: ../../include/activities.php:49
-msgid "public profile"
-msgstr "Perfil públic"
-
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s canviat %2$s a &ldquo;%3$s&rdquo;"
-
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Visita %1$s en %2$s"
-
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s Ha actualitzat %2$s, canviant %3$s."
-
-#: ../../include/bb2diaspora.php:398
-msgid "Attachments:"
-msgstr "Adjuntat:"
-
-#: ../../include/bb2diaspora.php:487
-msgid "$Projectname event notification:"
-msgstr "Notificació d'esdeveniment de $Projectname"
-
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (Hubzilla per defecte)"
@@ -9769,62 +9965,66 @@ msgstr "Ajusta la mida de la foto del autor a la conversa"
 msgid "Set size of followup author photos"
 msgstr "Ajusta la mida del seguidor de les fotos de l'autor"
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr "Cerca %1$s(%2$s)"
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../boot.php:1480
+#: ../../boot.php:1481
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "L'actualització %s ha fallat. Mira el registre d'errors."
 
-#: ../../boot.php:1483
+#: ../../boot.php:1484
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error d'Actualització a %s"
 
-#: ../../boot.php:1684
+#: ../../boot.php:1685
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Crea un compte per accedir als serveis i aplicacions dins de Hubzilla"
 
 #: ../../boot.php:1706
+msgid "Login/Email"
+msgstr ""
+
+#: ../../boot.php:1707
 msgid "Password"
 msgstr "Contrasenya"
 
-#: ../../boot.php:1707
+#: ../../boot.php:1708
 msgid "Remember me"
 msgstr "Recorda'm"
 
-#: ../../boot.php:1710
+#: ../../boot.php:1711
 msgid "Forgot your password?"
 msgstr "Has perdut la Contrasenya?"
 
-#: ../../boot.php:2276
+#: ../../boot.php:2277
 msgid "toggle mobile"
 msgstr "canvia a format per a mòbils"
 
-#: ../../boot.php:2425
+#: ../../boot.php:2432
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "El certificat SSL és invalid, soluciona-ho, si us plau."
 
-#: ../../boot.php:2428
+#: ../../boot.php:2435
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Error de SSL per la web %s"
 
-#: ../../boot.php:2469
+#: ../../boot.php:2478
 msgid "Cron/Scheduled tasks not running."
 msgstr "No s'estan executant les tasques programades al cron."
 
-#: ../../boot.php:2473
+#: ../../boot.php:2482
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Les tasques de Cron no rulen a %s"
diff --git a/view/ca/hstrings.php b/view/ca/hstrings.php
index 7470f8c84..d876aea80 100644
--- a/view/ca/hstrings.php
+++ b/view/ca/hstrings.php
@@ -4,8 +4,40 @@ if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	return ($n != 1);;
 }}
-;
-App::$strings["parent"] = "pare";
+App::$rtl = 0;
+App::$strings["Social Networking"] = "Xarxes Socials";
+App::$strings["Social - Mostly Public"] = "Social -  Principalment Públic";
+App::$strings["Social - Restricted"] = "Social - Restingit";
+App::$strings["Social - Private"] = "Social - Privat";
+App::$strings["Community Forum"] = "Foro de Comunitat";
+App::$strings["Forum - Mostly Public"] = "Fòrum - Principalment Públic";
+App::$strings["Forum - Restricted"] = "Fòrum - Restringit";
+App::$strings["Forum - Private"] = "Fòrum - Privat";
+App::$strings["Feed Republish"] = "Republicador";
+App::$strings["Feed - Mostly Public"] = "Realimentador - Públic Principalment";
+App::$strings["Feed - Restricted"] = "Retroalimentador - Restringit";
+App::$strings["Special Purpose"] = "Objectiu Especial";
+App::$strings["Special - Celebrity/Soapbox"] = "Espacial - Celebritat/Plataforma";
+App::$strings["Special - Group Repository"] = "Especial  - Repositori d'un Grup";
+App::$strings["Other"] = "Altres";
+App::$strings["Custom/Expert Mode"] = "Personalitzat/Manera Experta";
+App::$strings["Can view my channel stream and posts"] = "";
+App::$strings["Can send me their channel stream and posts"] = "Pot enviar-me el flux i entrades del seu canal";
+App::$strings["Can view my default channel profile"] = "Pot veure el meu perfil del canal per defecte";
+App::$strings["Can view my connections"] = "Pot veure les meves connexions";
+App::$strings["Can view my file storage and photos"] = "Pot veure al meu magatzem d'arxius i fotos";
+App::$strings["Can upload/modify my file storage and photos"] = "";
+App::$strings["Can view my channel webpages"] = "";
+App::$strings["Can create/edit my channel webpages"] = "";
+App::$strings["Can post on my channel (wall) page"] = "";
+App::$strings["Can comment on or like my posts"] = "Pot fer comentaris o dir si agrada en les meves entrades";
+App::$strings["Can send me private mail messages"] = "Pot enviar-me un missatge de correu privat";
+App::$strings["Can like/dislike profiles and profile things"] = "";
+App::$strings["Can forward to all my channel connections via @+ mentions in posts"] = "";
+App::$strings["Can chat with me"] = "";
+App::$strings["Can source my public posts in derived channels"] = "Pot mostrar l'origen de les meves entrades públiques en altres canals";
+App::$strings["Can administer my channel"] = "";
+App::$strings["parent"] = "amunt";
 App::$strings["Collection"] = "Col·lecció";
 App::$strings["Principal"] = "Principal";
 App::$strings["Addressbook"] = "Llista d'Adreçes";
@@ -37,63 +69,8 @@ App::$strings["Remote authentication blocked. You are logged into this site loca
 App::$strings["Welcome %s. Remote authentication successful."] = "Benvingut %s. Autenticació remota reeixida.";
 App::$strings["Requested profile is not available."] = "El perfil demanat no està disponible.";
 App::$strings["Some blurb about what to do when you're new here"] = "Algunes propostes sobre el que cal fer quan ets nou aquí";
-App::$strings["Block Name"] = "Nom del Bloc";
-App::$strings["Blocks"] = "Bloc";
-App::$strings["Block Title"] = "Títol del bloc";
-App::$strings["Created"] = "Creat";
-App::$strings["Edited"] = "Editat";
-App::$strings["Share"] = "Compartir";
-App::$strings["View"] = "Mostra";
-App::$strings["Channel not found."] = "Canal no trobat.";
-App::$strings["Permissions denied."] = "Permís denegat.";
-App::$strings["l, F j"] = "l, F j";
-App::$strings["Link to Source"] = "Enllaç a la Font";
-App::$strings["Edit Event"] = "Editar l'Esdeveniment";
-App::$strings["Create Event"] = "Crear Esdeveniment";
-App::$strings["Previous"] = "Anterior";
-App::$strings["Next"] = "Pròxim";
-App::$strings["Export"] = "Exporta";
-App::$strings["Import"] = "Importar";
-App::$strings["Submit"] = "Enviar";
-App::$strings["Today"] = "Avui";
-App::$strings["You must be logged in to see this page."] = "Has d'estar identificat per a veure aquesta pàgina.";
-App::$strings["Posts and comments"] = "Entrades i comentaris";
-App::$strings["Only posts"] = "Només entrades";
-App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficients. Petició redirigida a la pàgina del perfil.";
-App::$strings["Room not found"] = "No s'ha trobat la sala";
-App::$strings["Leave Room"] = "Abandona la sala";
-App::$strings["Delete Room"] = "Esborra Sala";
-App::$strings["I am away right now"] = "Absent";
-App::$strings["I am online"] = "Estic connectat/da";
-App::$strings["Bookmark this room"] = "Fes favorit aquest xat";
-App::$strings["Please enter a link URL:"] = "Si us plau entra l'enllaç URL:";
-App::$strings["Encrypt text"] = "Text encriptat";
-App::$strings["Insert web link"] = "Insereix enllaç web";
-App::$strings["Feature disabled."] = "Funcionalitat desactivada.";
-App::$strings["New Chatroom"] = "Nova sala per a Xerrar";
-App::$strings["Chatroom name"] = "Nom de la sala de xat";
-App::$strings["Expiration of chats (minutes)"] = "Expiració dels chats (minuts)";
-App::$strings["Permissions"] = "Permisos ";
-App::$strings["%1\$s's Chatrooms"] = "%1\$s de Xats";
-App::$strings["No chatrooms available"] = "No hi ha sales de xat disponibles";
-App::$strings["Create New"] = "Crear Nou";
-App::$strings["Expiration"] = "Expiració";
-App::$strings["min"] = "min";
 App::$strings["Away"] = "Absent";
 App::$strings["Online"] = "En connexió";
-App::$strings["Invalid item."] = "Article invàlid.";
-App::$strings["Bookmark added"] = "Favorit afegit";
-App::$strings["My Bookmarks"] = "Els Meus Favorits";
-App::$strings["My Connections Bookmarks"] = "Les connexions dels meus Favorits";
-App::$strings["Continue"] = "Continua";
-App::$strings["Premium Channel Setup"] = "Configuració de Canals Premium";
-App::$strings["Enable premium channel connection restrictions"] = "Habilita les restriccions de connexió del canal premium";
-App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Si us plau, introdueixi les restriccions o condicions, com ara el rebut de PayPal, les pautes d'ús, etc.";
-App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Aquest canal pot requerir passos addicionals o reconeixement de les següents condicions abans de connectar:";
-App::$strings["Potential connections will then see the following text before proceeding:"] = "Connexions potencials veuran el següent text abans de continuar:";
-App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "En continuar, certifico que he complert amb totes les instruccions proporcionades en aquesta pàgina.";
-App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(No s'han proporcionat instruccions específiques pel propietari del canal.)";
-App::$strings["Restricted or Premium Channel"] = "Canal Restringit o Premium";
 App::$strings["Could not access contact record."] = "No s'ha pogut accedir al llibre de contactes.";
 App::$strings["Could not locate selected profile."] = "No s'ha trobat el perfil indicat.";
 App::$strings["Connection updated."] = "S'ha actualitzat la connexió.";
@@ -158,6 +135,7 @@ App::$strings["Do not import posts with this text"] = "No importar entrades amb
 App::$strings["This information is public!"] = "Aquesta informació es pública!";
 App::$strings["Connection Pending Approval"] = "Connexió Pendent d'Aprovació";
 App::$strings["inherited"] = "heretat";
+App::$strings["Submit"] = "Enviar";
 App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Tria el perfil que vols mostrar a %s quan es vegi el perfil segur.";
 App::$strings["Their Settings"] = "Els seus Ajustos";
 App::$strings["My Settings"] = "Els Meus Ajustos";
@@ -166,6 +144,30 @@ App::$strings["Some permissions may be inherited from your channel's <a href=\"s
 App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Alguns permisos poden ser heretats dels teus canals <a href=\"settings\"><strong>ajustos de privacitat</strong></a>, Els quals tenen més prioritat que els ajustos individuals. <strong>Pots</strong> canviar aquests ajustos aquí pero no tindran cap impacte fins que no canviis els ajustos heretats.";
 App::$strings["Last update:"] = "Darrera actualització:";
 App::$strings["Public access denied."] = "Accés públic denegat.";
+App::$strings["Item not found."] = "Element no trobat.";
+App::$strings["First Name"] = "Nom";
+App::$strings["Last Name"] = "Cognoms";
+App::$strings["Nickname"] = "Àlies";
+App::$strings["Full Name"] = "Nom Sencer";
+App::$strings["Email"] = "Correu electrónic";
+App::$strings["Profile Photo"] = "Foto del Perfil";
+App::$strings["Profile Photo 16px"] = "Foto del Perfil 16px";
+App::$strings["Profile Photo 32px"] = "Foto del Perfil 32px";
+App::$strings["Profile Photo 48px"] = "Foto del Perfil 48px";
+App::$strings["Profile Photo 64px"] = "Foto del Perfil 64px";
+App::$strings["Profile Photo 80px"] = "Foto del Perfil 80px";
+App::$strings["Profile Photo 128px"] = "Foto del Perfil 128px";
+App::$strings["Timezone"] = "Zona horària";
+App::$strings["Homepage URL"] = "URL de la pàgina d'inici";
+App::$strings["Language"] = "Idioma";
+App::$strings["Birth Year"] = "Any de Naixement";
+App::$strings["Birth Month"] = "Mes de Naixement";
+App::$strings["Birth Day"] = "Dia de Naixement";
+App::$strings["Birthdate"] = "Aniversari";
+App::$strings["Gender"] = "Gènere";
+App::$strings["Male"] = "Masculí";
+App::$strings["Female"] = "Femení";
+App::$strings["Channel added."] = "S'ha afegit el canal.";
 App::$strings["%d rating"] = array(
 	0 => "%d valoració",
 	1 => "%d valoracions",
@@ -196,13 +198,74 @@ App::$strings["Reverse Alphabetic"] = "Alfabètic Invers";
 App::$strings["Newest to Oldest"] = "De més Nou a més Vell";
 App::$strings["Oldest to Newest"] = "De més Antic a més Nou";
 App::$strings["No entries (some entries may be hidden)."] = "Sense entrades (algunes podrien estar amagades).";
-App::$strings["Item not found."] = "Element no trobat.";
+App::$strings["Continue"] = "Continua";
+App::$strings["Premium Channel Setup"] = "Configuració de Canals Premium";
+App::$strings["Enable premium channel connection restrictions"] = "Habilita les restriccions de connexió del canal premium";
+App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Si us plau, introdueixi les restriccions o condicions, com ara el rebut de PayPal, les pautes d'ús, etc.";
+App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Aquest canal pot requerir passos addicionals o reconeixement de les següents condicions abans de connectar:";
+App::$strings["Potential connections will then see the following text before proceeding:"] = "Connexions potencials veuran el següent text abans de continuar:";
+App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "En continuar, certifico que he complert amb totes les instruccions proporcionades en aquesta pàgina.";
+App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(No s'han proporcionat instruccions específiques pel propietari del canal.)";
+App::$strings["Restricted or Premium Channel"] = "Canal Restringit o Premium";
+App::$strings["Calendar entries imported."] = "Entrades de Calendari importades.";
+App::$strings["No calendar entries found."] = "No es troben entrades decalendari.";
+App::$strings["Event can not end before it has started."] = "L'esdeveniment ha de començar abans d'acabar.";
+App::$strings["Unable to generate preview."] = "No s'ha pogut generar la vista prèvia.";
+App::$strings["Event title and start time are required."] = "Cal indicar l'inici i el final de l'esdeveniment.";
+App::$strings["Event not found."] = "No s'ha trobat l'esdeveniment.";
+App::$strings["event"] = "succés";
+App::$strings["Edit event title"] = "Edita el títol d'esdeveniment";
+App::$strings["Event title"] = "Títol esdeveniment";
+App::$strings["Required"] = "Requerit";
+App::$strings["Categories (comma-separated list)"] = "Categories (llista separada per comes)";
+App::$strings["Edit Category"] = "Editar Categoria";
+App::$strings["Category"] = "Categoria";
+App::$strings["Edit start date and time"] = "Editar data i hora d'inici";
+App::$strings["Start date and time"] = "Data i hora d'inici";
+App::$strings["Finish date and time are not known or not relevant"] = "L'ora de finalització no es coneix o es irrelevant.";
+App::$strings["Edit finish date and time"] = "Editar la data i hora de finalització";
+App::$strings["Finish date and time"] = "Data i hora de finalització";
+App::$strings["Adjust for viewer timezone"] = "Ajusta a la zona horària del visitant.";
+App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "És important per esdeveniments locals, però pels globals no és pràctic.";
+App::$strings["Edit Description"] = "Editar la Descripció";
+App::$strings["Description"] = "Descripció";
+App::$strings["Edit Location"] = "Editar la localització";
+App::$strings["Location"] = "Localització";
+App::$strings["Share this event"] = "Comparteix aquest esdeveniment";
+App::$strings["Preview"] = "Avanç";
+App::$strings["Permission settings"] = "Ajustos de permisos";
+App::$strings["Advanced Options"] = "Opcions Avançades";
+App::$strings["l, F j"] = "l, j \\d\\e/\\d' F";
+App::$strings["Edit event"] = "Edita l'esdeveniment";
+App::$strings["Delete event"] = "Esborra l'esdeveniment";
+App::$strings["Link to Source"] = "Enllaç a la Font";
+App::$strings["calendar"] = "calendari";
+App::$strings["Edit Event"] = "Editar l'Esdeveniment";
+App::$strings["Create Event"] = "Crear Esdeveniment";
+App::$strings["Previous"] = "Anterior";
+App::$strings["Next"] = "Pròxim";
+App::$strings["Export"] = "Exporta";
+App::$strings["View"] = "Mostra";
+App::$strings["Month"] = "";
+App::$strings["Week"] = "";
+App::$strings["Day"] = "";
+App::$strings["Today"] = "Avui";
+App::$strings["Event removed"] = "S'ha eliminat l'esdeveniment";
+App::$strings["Failed to remove event"] = "No s'ha pogut esborrar l'esdeveniment";
+App::$strings["Bookmark added"] = "Favorit afegit";
+App::$strings["My Bookmarks"] = "Els Meus Favorits";
+App::$strings["My Connections Bookmarks"] = "Les connexions dels meus Favorits";
 App::$strings["Item not found"] = "No s'ha trobat l'element";
-App::$strings["Title (optional)"] = "Títol (opcional)";
-App::$strings["Edit Block"] = "Editar Bloc";
-App::$strings["No channel."] = "No s'ha trobat el canal";
-App::$strings["Common connections"] = "Connexions en comú";
-App::$strings["No connections in common."] = "No hi ha connexions en comú.";
+App::$strings["Item is not editable"] = "Article no editable";
+App::$strings["Edit post"] = "Modifica l'entrada";
+App::$strings["Photos"] = "Fotos";
+App::$strings["Cancel"] = "Cancel·la";
+App::$strings["Invalid item."] = "Article invàlid.";
+App::$strings["Channel not found."] = "Canal no trobat.";
+App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+App::$strings["Save to Folder:"] = "Guardar en la Carpeta";
+App::$strings["- select -"] = "- selecciona -";
+App::$strings["Save"] = "Guardar";
 App::$strings["Blocked"] = "Bloquejades";
 App::$strings["Ignored"] = "Ignorades";
 App::$strings["Hidden"] = "Amagades";
@@ -254,51 +317,38 @@ App::$strings["select a photo from your photo albums"] = "tria una foto del teu
 App::$strings["Crop Image"] = "Retalla Imatge";
 App::$strings["Please adjust the image cropping for optimum viewing."] = "Si us plau, retalla la imatge per a una optima visualització";
 App::$strings["Done Editing"] = "Edició Feta";
-App::$strings["Item is not editable"] = "Article no editable";
-App::$strings["Edit post"] = "Modifica l'entrada";
-App::$strings["Calendar entries imported."] = "Entrades de Calendari importades.";
-App::$strings["No calendar entries found."] = "No es troben entrades decalendari.";
-App::$strings["Event can not end before it has started."] = "L'esdeveniment ha de començar abans d'acabar.";
-App::$strings["Unable to generate preview."] = "No s'ha pogut generar la vista prèvia.";
-App::$strings["Event title and start time are required."] = "Cal indicar l'inici i el final de l'esdeveniment.";
-App::$strings["Event not found."] = "No s'ha trobat l'esdeveniment.";
-App::$strings["event"] = "succés";
-App::$strings["Edit event title"] = "Edita el títol d'esdeveniment";
-App::$strings["Event title"] = "Títol esdeveniment";
-App::$strings["Required"] = "Requerit";
-App::$strings["Categories (comma-separated list)"] = "Categories (llista separada per comes)";
-App::$strings["Edit Category"] = "Editar Categoria";
-App::$strings["Category"] = "Categoria";
-App::$strings["Edit start date and time"] = "Editar data i hora d'inici";
-App::$strings["Start date and time"] = "Data i hora d'inici";
-App::$strings["Finish date and time are not known or not relevant"] = "L'ora de finalització no es coneix o es irrelevant.";
-App::$strings["Edit finish date and time"] = "Editar la data i hora de finalització";
-App::$strings["Finish date and time"] = "Data i hora de finalització";
-App::$strings["Adjust for viewer timezone"] = "Ajusta a la zona horària del visitant.";
-App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "És important per esdeveniments locals, però pels globals no és pràctic.";
-App::$strings["Edit Description"] = "Editar la Descripció";
-App::$strings["Description"] = "Descripció";
-App::$strings["Edit Location"] = "Editar la localització";
-App::$strings["Location"] = "Localització";
-App::$strings["Share this event"] = "Comparteix aquest esdeveniment";
-App::$strings["Preview"] = "Avanç";
-App::$strings["Permission settings"] = "Ajustos de permisos";
-App::$strings["Advanced Options"] = "Opcions Avançades";
-App::$strings["Edit event"] = "Edita l'esdeveniment";
-App::$strings["Delete event"] = "Esborra l'esdeveniment";
-App::$strings["calendar"] = "calendari";
-App::$strings["Event removed"] = "S'ha eliminat l'esdeveniment";
-App::$strings["Failed to remove event"] = "No s'ha pogut esborrar l'esdeveniment";
-App::$strings["Photos"] = "Fotos";
-App::$strings["Cancel"] = "Cancel·la";
+App::$strings["webpage"] = "pàgina web";
+App::$strings["block"] = "bloc";
+App::$strings["layout"] = "disposició";
+App::$strings["menu"] = "menú";
+App::$strings["%s element installed"] = "%s element instal·lat";
+App::$strings["%s element installation failed"] = "%s instal·lació d'element va fallar";
+App::$strings["Permissions denied."] = "Permís denegat.";
+App::$strings["Import"] = "Importar";
 App::$strings["This site is not a directory server"] = "Aquest lloc web no és un servidor de directori";
 App::$strings["This directory server requires an access token"] = "Aquest servidor de directori requereix un token de accès";
-App::$strings["Save to Folder:"] = "Guardar en la Carpeta";
-App::$strings["- select -"] = "- selecciona -";
-App::$strings["Save"] = "Guardar";
+App::$strings["You must be logged in to see this page."] = "Has d'estar identificat per a veure aquesta pàgina.";
+App::$strings["Room not found"] = "No s'ha trobat la sala";
+App::$strings["Leave Room"] = "Abandona la sala";
+App::$strings["Delete Room"] = "Esborra Sala";
+App::$strings["I am away right now"] = "Absent";
+App::$strings["I am online"] = "Estic connectat/da";
+App::$strings["Bookmark this room"] = "Fes favorit aquest xat";
+App::$strings["Please enter a link URL:"] = "Si us plau entra l'enllaç URL:";
+App::$strings["Encrypt text"] = "Text encriptat";
+App::$strings["Insert web link"] = "Insereix enllaç web";
+App::$strings["Feature disabled."] = "Funcionalitat desactivada.";
+App::$strings["New Chatroom"] = "Nova sala per a Xerrar";
+App::$strings["Chatroom name"] = "Nom de la sala de xat";
+App::$strings["Expiration of chats (minutes)"] = "Expiració dels chats (minuts)";
+App::$strings["Permissions"] = "Permisos ";
+App::$strings["%1\$s's Chatrooms"] = "%1\$s de Xats";
+App::$strings["No chatrooms available"] = "No hi ha sales de xat disponibles";
+App::$strings["Create New"] = "Crear Nou";
+App::$strings["Expiration"] = "Expiració";
+App::$strings["min"] = "min";
 App::$strings["Invalid message"] = "Missatge invàlid.";
 App::$strings["no results"] = "sense resultats";
-App::$strings["Delivery report for %1\$s"] = "Informe de lliurament per %1\$s";
 App::$strings["channel sync processed"] = "sincronització del canal processada";
 App::$strings["queued"] = "Posat en cua";
 App::$strings["posted"] = "enviat";
@@ -310,14 +360,14 @@ App::$strings["recipient not found"] = "Contenidor no trobat";
 App::$strings["mail recalled"] = "Recupera el correu";
 App::$strings["duplicate mail received"] = "rebut correu duplicat";
 App::$strings["mail delivered"] = "correu entregat";
+App::$strings["Delivery report for %1\$s"] = "Informe de lliurament per %1\$s";
+App::$strings["Options"] = "";
+App::$strings["Redeliver"] = "";
 App::$strings["Layout Name"] = "Nom del Format Gràfic";
 App::$strings["Layout Description (Optional)"] = "Descripció del Format (Opcional)";
 App::$strings["Edit Layout"] = "Edita Format Gràfic";
 App::$strings["Page link"] = "Enllaç de la pàgina";
 App::$strings["Edit Webpage"] = "Edita la Pàgina Web";
-App::$strings["Channel added."] = "S'ha afegit el canal.";
-App::$strings["network"] = "xarxa";
-App::$strings["RSS"] = "RSS";
 App::$strings["Privacy group created."] = "Creat grup privat.";
 App::$strings["Could not create privacy group."] = "No es pot crear el grup privat.";
 App::$strings["Privacy group not found."] = "No es troben grups privats.";
@@ -331,16 +381,33 @@ App::$strings["Privacy group editor"] = "Editor del grup privat";
 App::$strings["Members"] = "Membres";
 App::$strings["All Connected Channels"] = "Tots els Canals Connectats";
 App::$strings["Click on a channel to add or remove."] = "Clic sobre el canal per afegir o esborrar.";
-App::$strings["Share content from Firefox to \$Projectname"] = "Compartir contingut des de Firefox a \$Projectname";
-App::$strings["Activate the Firefox \$Projectname provider"] = "Activar el proveïdor de \$Projectname a Firefox";
-App::$strings["Authorize application connection"] = "Autoritza la connexió de l'aplicació";
-App::$strings["Return to your app and insert this Securty Code:"] = "Torna a la teva aplicació i insereix aquest Codi de Seguretat:";
-App::$strings["Please login to continue."] = "Si et plau, identifica't per continuar.";
-App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vols autoritzar a aquesta aplicació l'accés a les teves entrades i contactes i/o a crear noves entrades com si fos tu mateix.";
+App::$strings["App installed."] = "Aplicació instal·lada.";
+App::$strings["Malformed app."] = "Aplicació amb errors";
+App::$strings["Embed code"] = "Codi embegut";
+App::$strings["Edit App"] = "Edita l'Aplicació";
+App::$strings["Create App"] = "Crea l'Aplicació";
+App::$strings["Name of app"] = "Nom de l'Aplicació";
+App::$strings["Location (URL) of app"] = "Ubicació (URL) de l'aplicació";
+App::$strings["Photo icon URL"] = "Foto icona URL";
+App::$strings["80 x 80 pixels - optional"] = "80 x 80 pixels - opcional";
+App::$strings["Categories (optional, comma separated list)"] = "Categories (opcional, lista separada per comes)";
+App::$strings["Version ID"] = "Versió ID";
+App::$strings["Price of app"] = "Preu de l'aplicació";
+App::$strings["Location (URL) to purchase app"] = "Ubicació (URL) per comprar l'aplicació";
 App::$strings["Documentation Search"] = "Cerca de Documentació";
 App::$strings["Help:"] = "Ajuda:";
 App::$strings["Help"] = "Ajuda";
 App::$strings["\$Projectname Documentation"] = "\$Projectname Documentació";
+App::$strings["Item not available."] = "Article no disponible.";
+App::$strings["Layout updated."] = "S'ha actualitzat la disposició.";
+App::$strings["Edit System Page Description"] = "Editor del Sistema de Descripció de Pàgines";
+App::$strings["Layout not found."] = "No s'ha trobat cap disposició de pàgina.";
+App::$strings["Module Name:"] = "Nom del mòdul:";
+App::$strings["Layout Help"] = "Ajuda per la disposició de pàgina";
+App::$strings["Share content from Firefox to \$Projectname"] = "Compartir contingut des de Firefox a \$Projectname";
+App::$strings["Activate the Firefox \$Projectname provider"] = "Activar el proveïdor de \$Projectname a Firefox";
+App::$strings["network"] = "xarxa";
+App::$strings["RSS"] = "RSS";
 App::$strings["Permission Denied."] = "Permisos Denegats.";
 App::$strings["File not found."] = "Arxiu no torbat.";
 App::$strings["Edit file permissions"] = "Edita els permisos d'arxiu";
@@ -352,70 +419,13 @@ App::$strings["Copy/paste this URL to link file from a web page"] = "Copia/engan
 App::$strings["Share this file"] = "Comparteix l'arxiu";
 App::$strings["Show URL to this file"] = "Mostra la URL d'aquest arxiu";
 App::$strings["Notify your contacts about this file"] = "Notifica als teus contactes aquest arxiu";
-App::$strings["Apps"] = "Aplicatius";
-App::$strings["Item not available."] = "Article no disponible.";
-App::$strings["Your service plan only allows %d channels."] = "El teu paquet de serveis només admet %d canals.";
-App::$strings["Nothing to import."] = "No hi ha res a importar.";
-App::$strings["Unable to download data from old server"] = "No s'han pogut descarregar les dades del servidor antic";
-App::$strings["Imported file is empty."] = "El fitxer importat està buit.";
-App::$strings["Warning: Database versions differ by %1\$d updates."] = "Atenció: Les versions de la Base de Dades difereixen en %1\$d actualitzacions.";
-App::$strings["Cloned channel not found. Import failed."] = "No s'ha pogut importar el canal perquè el canal clonat no s'ha trobat.";
-App::$strings["No channel. Import failed."] = "Sense canal. No s'ha pogut importar.";
-App::$strings["Import completed."] = "S'ha completat la importació.";
-App::$strings["You must be logged in to use this feature."] = "Has d'estar registrat per fer servir aquesta funcionalitat.";
-App::$strings["Import Channel"] = "Importa un canal";
-App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Empra aquest formulari per importar un canal existent en un altre servidor/concentrador. Pots recuperar el canal  des de l'antic servidor/concentrador via la xarxa o mitjançant un fitxer d'exportació";
-App::$strings["File to Upload"] = "Fitxer a pujar";
-App::$strings["Or provide the old server/hub details"] = "O proveeix els detalls de l'antic servidor/node";
-App::$strings["Your old identity address (xyz@example.com)"] = "La teva adreça de canal antiga. El format és canal@exemple.org";
-App::$strings["Your old login email address"] = "La teva adreça de correu electrònic antiga";
-App::$strings["Your old login password"] = "La teva contrasenya antiga";
-App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Per a qualsevol de les opcions, escull si vols fer primària l'adreça d'aquest node o mantenir l'anterior com a primària. Podràs penjar entrades des de totes dues adreces, però per als fitxers, imatges i altres en cal una de primària.";
-App::$strings["Make this hub my primary location"] = "Fes d'aquest node la meva ubicació primària";
-App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importa les entrades existents si es possible (experimental - limitat per la memòria disponible";
-App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Aquest procès pot trigar minuts en completar. Si et plau envia el formulari només una vegada i manté aquesta pàgina oberta fins que finalitzi.";
-App::$strings["Unable to locate original post."] = "No s'ha pogut trobar l'entrada original.";
-App::$strings["Empty post discarded."] = "S'ha descartat l'entrada perquè no té contingut.";
-App::$strings["Executable content type not permitted to this channel."] = "No està permès el contingut de tipus executable en aquest canal.";
-App::$strings["Duplicate post suppressed."] = "Publicació duplicada s'ha suprimit.";
-App::$strings["System error. Post not saved."] = "Hi ha hagut un error del sistema. L'entrada no s'ha desat.";
-App::$strings["Unable to obtain post information from database."] = "No s'ha pogut obtenir informació de l'entrada a la base de dades.";
-App::$strings["You have reached your limit of %1$.0f top level posts."] = "Has assolit el teu límit de %1$.0f entrades (descomptant comentaris).";
-App::$strings["You have reached your limit of %1$.0f webpages."] = "Has assolit el teu limit de %1$.0f pàgines web.";
 App::$strings["Layouts"] = "Format Gràfic";
 App::$strings["Comanche page description language help"] = "Pgina d'ajuda del llenguatge Comanche";
 App::$strings["Layout Description"] = "Descripció del Disseny de la Pàgina";
+App::$strings["Created"] = "Creat";
+App::$strings["Edited"] = "Editat";
+App::$strings["Share"] = "Compartir";
 App::$strings["Download PDL file"] = "Descarrega l'arxiu PDL";
-App::$strings["\$Projectname"] = "\$Projectname";
-App::$strings["Welcome to %s"] = "Benvingut a %s";
-App::$strings["First Name"] = "Nom";
-App::$strings["Last Name"] = "Cognoms";
-App::$strings["Nickname"] = "Àlies";
-App::$strings["Full Name"] = "Nom Sencer";
-App::$strings["Email"] = "Correu electrónic";
-App::$strings["Profile Photo"] = "Foto del Perfil";
-App::$strings["Profile Photo 16px"] = "Foto del Perfil 16px";
-App::$strings["Profile Photo 32px"] = "Foto del Perfil 32px";
-App::$strings["Profile Photo 48px"] = "Foto del Perfil 48px";
-App::$strings["Profile Photo 64px"] = "Foto del Perfil 64px";
-App::$strings["Profile Photo 80px"] = "Foto del Perfil 80px";
-App::$strings["Profile Photo 128px"] = "Foto del Perfil 128px";
-App::$strings["Timezone"] = "Zona horària";
-App::$strings["Homepage URL"] = "URL de la pàgina d'inici";
-App::$strings["Language"] = "Idioma";
-App::$strings["Birth Year"] = "Any de Naixement";
-App::$strings["Birth Month"] = "Mes de Naixement";
-App::$strings["Birth Day"] = "Dia de Naixement";
-App::$strings["Birthdate"] = "Aniversari";
-App::$strings["Gender"] = "Gènere";
-App::$strings["Male"] = "Masculí";
-App::$strings["Female"] = "Femení";
-App::$strings["webpage"] = "pàgina web";
-App::$strings["block"] = "bloc";
-App::$strings["layout"] = "disposició";
-App::$strings["menu"] = "menú";
-App::$strings["%s element installed"] = "%s element instal·lat";
-App::$strings["%s element installation failed"] = "%s instal·lació d'element va fallar";
 App::$strings["Like/Dislike"] = "M'agrada / No m'agrada";
 App::$strings["This action is restricted to members."] = "Aquesta acció està restringida als membres.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "<a href=\"rmagic\">Entra amb la teva identitat \$Projectname</a> o <a href=\"register\">registra't a \$Projectname</a> per continuar.";
@@ -436,175 +446,103 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s no assistirà a %
 App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s potser assistirà a %3\$s de %2\$s";
 App::$strings["Action completed."] = "S'ha completat l'acció.";
 App::$strings["Thank you."] = "Gràcies.";
-App::$strings["Import completed"] = "S'ha completat la importació";
-App::$strings["Import Items"] = "Importa Articles";
-App::$strings["Use this form to import existing posts and content from an export file."] = "Empra aquest formulari per importar entrades existents i contingut d'un arxiu d'exportació.";
-App::$strings["Total invitation limit exceeded."] = "El límit total invitacions s'ha superat.";
-App::$strings["%s : Not a valid email address."] = "%s: adreça de correu electrònic no vàlida.";
-App::$strings["Please join us on \$Projectname"] = "Si us plau uneix-te a nosaltres a \$Projectname.";
-App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Límit d'invitacions excedit. Si us plau, poseu-vos en contacte amb l'administrador del lloc.";
-App::$strings["%s : Message delivery failed."] = "%s : Entrega del Missatge fallida.";
-App::$strings["%d message sent."] = array(
-	0 => "%d missatge enviat.",
-	1 => "%d missatges enviats.",
-);
-App::$strings["You have no more invitations available"] = "No té més invitacions disponibles";
-App::$strings["Send invitations"] = "Enviar invitacions";
-App::$strings["Enter email addresses, one per line:"] = "Introduïu les adreces de correu electrònic, una per línia:";
-App::$strings["Your message:"] = "El teu missatge:";
-App::$strings["Please join my community on \$Projectname."] = "Si us plau uneix-te la meva comunitat en \$Projectname.";
-App::$strings["You will need to supply this invitation code:"] = "Hauràs de facilitar aquest codi d'invitació:";
-App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Pots registrar-te a qualsevol node de \$Projectname (estàn tots interconnectats)";
-App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Escriu la meva adreça de xarxa al \$Projectname,  a la barra de cerca del lloc.";
-App::$strings["or visit"] = "o visitar";
-App::$strings["3. Click [Connect]"] = "3. Clicar [Conectar]";
-App::$strings["Remote privacy information not available."] = "informació privada remota no disponible.";
-App::$strings["Visible to:"] = "Visible per:";
-App::$strings["Location not found."] = "Situació que no es troba.";
-App::$strings["Location lookup failed."] = "Ha fallat la cerca d'ubicació.";
-App::$strings["Please select another location to become primary before removing the primary location."] = "Seleccioneu una altra ubicació per esdevenir primària abans de retirar la ubicació principal.";
-App::$strings["Syncing locations"] = "Sincronitza ubicacions";
-App::$strings["No locations found."] = "No es troben els llocs.";
-App::$strings["Manage Channel Locations"] = "Gestionar Ubicacions de Canal";
+App::$strings["Profile not found."] = "Perfil no trobat.";
+App::$strings["Profile deleted."] = "Perfil eliminat.";
+App::$strings["Profile-"] = "Perfil-";
+App::$strings["New profile created."] = "Nou perfil creat.";
+App::$strings["Profile unavailable to clone."] = "Perfil que no es pot clonar.";
+App::$strings["Profile unavailable to export."] = "Perfil que no es pot exportar.";
+App::$strings["Profile Name is required."] = "Es requereix el Nom del Perfil.";
+App::$strings["Marital Status"] = "Estat Marital";
+App::$strings["Romantic Partner"] = "Company/a Romàntic";
+App::$strings["Likes"] = "Agrada";
+App::$strings["Dislikes"] = "Desagrada";
+App::$strings["Work/Employment"] = "Treball/Feina";
+App::$strings["Religion"] = "Religió";
+App::$strings["Political Views"] = "Idees Polítiques";
+App::$strings["Sexual Preference"] = "Preferència Sexual";
+App::$strings["Homepage"] = "Pàgina Personal";
+App::$strings["Interests"] = "Interessos";
 App::$strings["Address"] = "Adreça";
-App::$strings["Primary"] = "Primari";
-App::$strings["Drop"] = "Menysprea";
-App::$strings["Sync Now"] = "Sincronitza Ara";
-App::$strings["Please wait several minutes between consecutive operations."] = "Si us plau espera diversos minuts entre operacions consecutives.";
-App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Quan sigui possible, per desapareixer d'un lloc, accedeix a aquest lloc web/node i elimina el teu canal.";
-App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Empra aquest formulari per desapareixer del lloc si el node ja no està operatiu.";
-App::$strings["Hub not found."] = "Node no trobat.";
-App::$strings["Unable to lookup recipient."] = "Incapaç de trobar el destinatari.";
-App::$strings["Unable to communicate with requested channel."] = "Incapaç de comunicar amb el canal demanat.";
-App::$strings["Cannot verify requested channel."] = "No puc verificar el canal demanat.";
-App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionat te restriccions sobre els missatges privats. L'enviament ha fallat.";
-App::$strings["Messages"] = "Missatges";
-App::$strings["Message recalled."] = "Recupera el missatge.";
-App::$strings["Conversation removed."] = "Conversació eliminada.";
-App::$strings["Expires YYYY-MM-DD HH:MM"] = "Expira YYYY-MM-DD HH:MM";
-App::$strings["Requested channel is not in this network"] = "El canal demanat no hi es en questa xarxa";
-App::$strings["Send Private Message"] = "Envia Missatge Privat";
-App::$strings["To:"] = "Per:";
-App::$strings["Subject:"] = "Assumpte:";
-App::$strings["Attach file"] = "Adjunta arxiu";
-App::$strings["Send"] = "Envia";
-App::$strings["Set expiration date"] = "Ajusta la data d'expiració";
-App::$strings["Delete message"] = "Elimina el missatge";
-App::$strings["Delivery report"] = "Informe d'entrega";
-App::$strings["Recall message"] = "Recupera el missatge";
-App::$strings["Message has been recalled."] = "El missatge s'ha recuperat.";
-App::$strings["Delete Conversation"] = "Conversació esborrada";
-App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicació segura no disponible. Pots respondre des de la pàgina de perfil del remitent.";
-App::$strings["Send Reply"] = "Envia Resposta";
-App::$strings["Your message for %s (%s):"] = "El teu missatge per %s (%s):";
-App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Has creat %1$.0f de %2$.0f canals permesos.";
-App::$strings["Create a new channel"] = "Crear un nou canal";
-App::$strings["Channel Manager"] = "Gestor de Canals";
-App::$strings["Current Channel"] = "Canal Actual";
-App::$strings["Switch to one of your channels by selecting it."] = "Canviar a un altre dels teus canals seleccionant-ho.";
-App::$strings["Default Channel"] = "Canal per Defecte";
-App::$strings["Make Default"] = "Estableix com a Predeterminat";
-App::$strings["%d new messages"] = "%d missatges nous";
-App::$strings["%d new introductions"] = "%d noves presentacions";
-App::$strings["Delegated Channel"] = "Canal Delegat";
-App::$strings["No valid account found."] = "No es troba un compte vàlid.";
-App::$strings["Password reset request issued. Check your email."] = "Sol·licitud de restabliment de contrasenya emesa. Consulta el teu correu electrònic.";
-App::$strings["Site Member (%s)"] = "Lloc d'Usuari (%s)";
-App::$strings["Password reset requested at %s"] = "S'ha soŀlicitat restablir la contrasenya al hub %s";
-App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Ha fallat el restabliment de contrasenya perquè la no s'ha pogut verificar soŀlicitud. Pot ser que ja ho hàgiu soŀlicitat abans.";
-App::$strings["Password Reset"] = "Restabliment de contrasenya";
-App::$strings["Your password has been reset as requested."] = "S'ha restablert la vostra contrasenya.";
-App::$strings["Your new password is"] = "La nova contrasenya és";
-App::$strings["Save or copy your new password - and then"] = "Desa o copia la nova contrasenya, i després";
-App::$strings["click here to login"] = "fes clic aquí per iniciar sessió";
-App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Pots canviar la contrasenya a la pàgina <em>Paràmetres</em>, un cop iniciada la sessió.";
-App::$strings["Your password has changed at %s"] = "La teva contrasenya a %s ha canviat";
-App::$strings["Forgot your Password?"] = "No recordes la contrasenya?";
-App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Escriu la teva adreça de correu electrònic i envia per restablir la contrasenya. Després revisa el seu correu electrònic per obtenir més instruccions.";
-App::$strings["Email Address"] = "Adreça electrònica";
-App::$strings["Reset"] = "Reajustar";
-App::$strings["Unable to update menu."] = "No s'ha pogut actualitzar el menú.";
-App::$strings["Unable to create menu."] = "No s'ha pogut crear el menú.";
-App::$strings["Menu Name"] = "Nom del menú";
-App::$strings["Unique name (not visible on webpage) - required"] = "Nom únic (no visible a la pàgina web) - requerit";
-App::$strings["Menu Title"] = "Títol del menú";
-App::$strings["Visible on webpage - leave empty for no title"] = "Visible a la pàgina web - deixar buit per a no posar títol";
-App::$strings["Allow Bookmarks"] = "Permetre Marcadors";
-App::$strings["Menu may be used to store saved bookmarks"] = "El menú es pot emprar per a guardar marcadors";
-App::$strings["Submit and proceed"] = "Envia i procedeix";
-App::$strings["Menus"] = "Menús";
-App::$strings["Bookmarks allowed"] = "Marcadors permesos";
-App::$strings["Delete this menu"] = "Esborra el menú";
-App::$strings["Edit menu contents"] = "Edita el contingut del menú";
-App::$strings["Edit this menu"] = "Edita el menú";
-App::$strings["Menu could not be deleted."] = "El menu no es pot esborrar.";
-App::$strings["Menu not found."] = "Menú no trobat.";
-App::$strings["Edit Menu"] = "Edita Menú";
-App::$strings["Add or remove entries to this menu"] = "Afegeix o esborra entrades a aquest menú";
-App::$strings["Menu name"] = "Nom del Menú";
-App::$strings["Must be unique, only seen by you"] = "Ha de ser únic, nomes vist per tú";
-App::$strings["Menu title"] = "Títol del menú";
-App::$strings["Menu title as seen by others"] = "Títol del menú vist pels altres";
-App::$strings["Allow bookmarks"] = "Marcadors permesos";
-App::$strings["Not found."] = "No trobat.";
-App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s es %2\$s";
-App::$strings["Mood"] = "Ànim";
-App::$strings["Set your current mood and tell your friends"] = "Estableix el teu estat d'ànim actual i digues-li als teus amics";
-App::$strings["Profile Match"] = "Perfils compatibles";
-App::$strings["No keywords to match. Please add keywords to your default profile."] = "No tens paraules clau al perfil principal per poder cercar perfils semblants.";
-App::$strings["is interested in:"] = "té interès en:";
-App::$strings["No matches"] = "No s'han trobat perfils compatibles";
-App::$strings["No such group"] = "No existeix el grup";
-App::$strings["No such channel"] = "No existeix el canal";
-App::$strings["forum"] = "fòrum";
-App::$strings["Search Results For:"] = "Cerca resultats per:";
-App::$strings["Privacy group is empty"] = "el grup privat està vuit";
-App::$strings["Privacy group: "] = "Grup privat:";
-App::$strings["Invalid connection."] = "La connexió és invàlida.";
-App::$strings["No more system notifications."] = "No hi ha més notificacions del sistema.";
-App::$strings["System Notifications"] = "Notificacions del sistema";
-App::$strings["Unable to create element."] = "Incapaç de crear l'element.";
-App::$strings["Unable to update menu element."] = "Incapaç d'actualitzar un element del menú.";
-App::$strings["Unable to add menu element."] = "Incapaç d'afegir l'element del menú.";
-App::$strings["Menu Item Permissions"] = "Permisos de l'Article del Menú";
-App::$strings["(click to open/close)"] = "(clica per obrir/tancar)";
-App::$strings["Link Name"] = "Nom de l'Enllaç";
-App::$strings["Link or Submenu Target"] = "Enllaç o Submenú Objectiu";
-App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Entra la URL de l'enlla´o tria un nom de menú per crear un submenú";
-App::$strings["Use magic-auth if available"] = "Empra magic-auth si esta disponible";
-App::$strings["Open link in new window"] = "Obrir l'enllaç en una nova finestra";
-App::$strings["Order in list"] = "Ordre per llista";
-App::$strings["Higher numbers will sink to bottom of listing"] = "Els números més alts aniràn al fons de la llista";
-App::$strings["Submit and finish"] = "Envia i termina";
-App::$strings["Submit and continue"] = "Envia i continua";
-App::$strings["Menu:"] = "Menú:";
-App::$strings["Link Target"] = "Enllaç Objectiu";
-App::$strings["Edit menu"] = "Edita menú";
-App::$strings["Edit element"] = "Edita element";
-App::$strings["Drop element"] = "Deixa anar element";
-App::$strings["New element"] = "Nou element";
-App::$strings["Edit this menu container"] = "Edita aquest contenidor de menú";
-App::$strings["Add menu element"] = "Afegeix element de menú";
-App::$strings["Delete this menu item"] = "Esborra aquest article del menú";
-App::$strings["Edit this menu item"] = "Edita aquest article del menú";
-App::$strings["Menu item not found."] = "Article del menú no trobat.";
-App::$strings["Menu item deleted."] = "Article del menú eliminat.";
-App::$strings["Menu item could not be deleted."] = "Article del menú no es pot eliminar.";
-App::$strings["Edit Menu Element"] = "Editar Element del Menú";
-App::$strings["Link text"] = "Enllaç de text";
-App::$strings["Name or caption"] = "Nom o llegenda";
-App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Exemples: \"Pep Gomila\", \"Manel i els seus Cavalls\", \"Fútbol\", \"Grup d'Aviadors\"";
-App::$strings["Choose a short nickname"] = "Tria un àlies curt";
-App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "El teu àlies serà emprat per crear un nom fàcil per recordar l'adreça del canal p.e. àlies%s";
-App::$strings["Channel role and privacy"] = "Funció i privacitat del canal";
-App::$strings["Select a channel role with your privacy requirements."] = "Tria una funció pel canal amb els teus requisits de privacitat.";
-App::$strings["Read more about roles"] = "Llegix més sobre els rols";
-App::$strings["Create Channel"] = "Crea un Canal";
-App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canal es la tva identitat en aquesta xarxa. Pot representar una persona, un bloc, o un fòrum per anomenar alguns. Els canals poden connectar-se amb altres canals per compartir informació amb permisos molt detallats.";
-App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "o <a href=\"import\">importa un canal existent</a> des d'un altre ubicació.";
-App::$strings["Invalid request identifier."] = "Sol·licitud d'identificació invàlida.";
-App::$strings["Discard"] = "Descarta";
-App::$strings["Mark all system notifications seen"] = "Marca totes les notificacions vistes";
+App::$strings["Profile updated."] = "Perfil actualitzat.";
+App::$strings["Hide your connections list from viewers of this profile"] = "Amaga dels curiosos la teva llista de connexions d'aquest perfil";
+App::$strings["Edit Profile Details"] = "Edita els Detalls del Perfil";
+App::$strings["View this profile"] = "Veure aquest perfil";
+App::$strings["Edit visibility"] = "Editar visibilitat";
+App::$strings["Profile Tools"] = "Eines per Perfils";
+App::$strings["Change cover photo"] = "Canviar la foto de portada";
+App::$strings["Change profile photo"] = "Canviar la foto del perfil";
+App::$strings["Create a new profile using these settings"] = "Crea un perfil nou amb aquests ajustos";
+App::$strings["Clone this profile"] = "Clonar aquest perfil";
+App::$strings["Delete this profile"] = "Elimina aquest perfil";
+App::$strings["Add profile things"] = "Afegeix coses al perfil";
+App::$strings["Personal"] = "Personal";
+App::$strings["Relation"] = "Relació";
+App::$strings["Miscellaneous"] = "Miscelania";
+App::$strings["Import profile from file"] = "Importa perfil des d'un arxiu";
+App::$strings["Export profile to file"] = "Exporta perfil a un arxiu";
+App::$strings["Your gender"] = "El teu gènere";
+App::$strings["Marital status"] = "Estat marital";
+App::$strings["Sexual preference"] = "Preferència sexual";
+App::$strings["Profile name"] = "Nom del perfil";
+App::$strings["This is your default profile."] = "Aquest es el teu perfil per defecte";
+App::$strings["Your full name"] = "El teu nom complet";
+App::$strings["Title/Description"] = "Títol/Descripció";
+App::$strings["Street address"] = "Carrer";
+App::$strings["Locality/City"] = "Població/Ciutat";
+App::$strings["Region/State"] = "Regió/Estat";
+App::$strings["Postal/Zip code"] = "Codi Postal";
+App::$strings["Country"] = "País";
+App::$strings["Who (if applicable)"] = "Qui (si es aplicable)";
+App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Examples: cathy123, Cathy Williams, cathy@example.com";
+App::$strings["Since (date)"] = "Des de (data)";
+App::$strings["Tell us about yourself"] = "Quelcom sobre tu";
+App::$strings["Hometown"] = "Ciutat Natal";
+App::$strings["Political views"] = "Idees polítiques";
+App::$strings["Religious views"] = "Creences religioses";
+App::$strings["Keywords used in directory listings"] = "Paraules clau emprades en els llistats de directoris";
+App::$strings["Example: fishing photography software"] = "Exemple: software de fotografia submarina";
+App::$strings["Musical interests"] = "Interessos Musicals";
+App::$strings["Books, literature"] = "Llibres, literatura";
+App::$strings["Television"] = "Televisió";
+App::$strings["Film/Dance/Culture/Entertainment"] = "Pel·lícules/Dansa/Cultura/Entreteniment";
+App::$strings["Hobbies/Interests"] = "Aficions/Interessos";
+App::$strings["Love/Romance"] = "Amor/Romace";
+App::$strings["School/Education"] = "Escola/Educació";
+App::$strings["Contact information and social networks"] = "Informació de contacte i xarxes socials";
+App::$strings["My other channels"] = "Els meus altres canals";
+App::$strings["Profile Image"] = "Imatge del Perfil";
+App::$strings["Edit Profiles"] = "Editar Perfils";
+App::$strings["Your service plan only allows %d channels."] = "El teu paquet de serveis només admet %d canals.";
+App::$strings["Nothing to import."] = "No hi ha res a importar.";
+App::$strings["Unable to download data from old server"] = "No s'han pogut descarregar les dades del servidor antic";
+App::$strings["Imported file is empty."] = "El fitxer importat està buit.";
+App::$strings["Warning: Database versions differ by %1\$d updates."] = "Atenció: Les versions de la Base de Dades difereixen en %1\$d actualitzacions.";
+App::$strings["Cloned channel not found. Import failed."] = "No s'ha pogut importar el canal perquè el canal clonat no s'ha trobat.";
+App::$strings["No channel. Import failed."] = "Sense canal. No s'ha pogut importar.";
+App::$strings["Import completed."] = "S'ha completat la importació.";
+App::$strings["You must be logged in to use this feature."] = "Has d'estar registrat per fer servir aquesta funcionalitat.";
+App::$strings["Import Channel"] = "Importa un canal";
+App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Empra aquest formulari per importar un canal existent en un altre servidor/concentrador. Pots recuperar el canal  des de l'antic servidor/concentrador via la xarxa o mitjançant un fitxer d'exportació";
+App::$strings["File to Upload"] = "Fitxer a pujar";
+App::$strings["Or provide the old server/hub details"] = "O proveeix els detalls de l'antic servidor/node";
+App::$strings["Your old identity address (xyz@example.com)"] = "La teva adreça de canal antiga. El format és canal@exemple.org";
+App::$strings["Your old login email address"] = "La teva adreça de correu electrònic antiga";
+App::$strings["Your old login password"] = "La teva contrasenya antiga";
+App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Per a qualsevol de les opcions, escull si vols fer primària l'adreça d'aquest node o mantenir l'anterior com a primària. Podràs penjar entrades des de totes dues adreces, però per als fitxers, imatges i altres en cal una de primària.";
+App::$strings["Make this hub my primary location"] = "Fes d'aquest node la meva ubicació primària";
+App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importa les entrades existents si es possible (experimental - limitat per la memòria disponible";
+App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Aquest procès pot trigar minuts en completar. Si et plau envia el formulari només una vegada i manté aquesta pàgina oberta fins que finalitzi.";
+App::$strings["\$Projectname"] = "\$Projectname";
+App::$strings["Welcome to %s"] = "Benvingut a %s";
+App::$strings["Unable to locate original post."] = "No s'ha pogut trobar l'entrada original.";
+App::$strings["Empty post discarded."] = "S'ha descartat l'entrada perquè no té contingut.";
+App::$strings["Executable content type not permitted to this channel."] = "No està permès el contingut de tipus executable en aquest canal.";
+App::$strings["Duplicate post suppressed."] = "Publicació duplicada s'ha suprimit.";
+App::$strings["System error. Post not saved."] = "Hi ha hagut un error del sistema. L'entrada no s'ha desat.";
+App::$strings["Unable to obtain post information from database."] = "No s'ha pogut obtenir informació de l'entrada a la base de dades.";
+App::$strings["You have reached your limit of %1$.0f top level posts."] = "Has assolit el teu límit de %1$.0f entrades (descomptant comentaris).";
+App::$strings["You have reached your limit of %1$.0f webpages."] = "Has assolit el teu limit de %1$.0f pàgines web.";
 App::$strings["Page owner information could not be retrieved."] = "La informació del propietari de la pàgina no va poder ser recuperada";
 App::$strings["Profile Photos"] = "Fotos del Perfil";
 App::$strings["Album not found."] = "Àlbum no trobat";
@@ -673,122 +611,164 @@ App::$strings["__ctx:noun__ Dislikes"] = "Desagrada";
 App::$strings["Close"] = "Tanca";
 App::$strings["View Album"] = "Mostra'n l'àlbum";
 App::$strings["Recent Photos"] = "Imatges recents";
-App::$strings["sent you a private message"] = "Se t'ha enviat un missatge privat";
-App::$strings["added your channel"] = "el teu canal s'ha afegit";
-App::$strings["g A l F d"] = "g A l F d";
-App::$strings["[today]"] = "[avui]";
-App::$strings["posted an event"] = "enviat un esdeveniment";
-App::$strings["Unable to find your hub."] = "No es possible trobar el node";
-App::$strings["Post successful."] = "Entrada realitzada amb èxit. ";
-App::$strings["OpenID protocol error. No ID returned."] = "Error del protocol OpenID. No ha retornat ID";
-App::$strings["Login failed."] = "Identificació fallida.";
-App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-App::$strings["This setting requires special processing and editing has been blocked."] = "Aquest ajust requereix un procés espedial i l'edició esta bloquejada.";
-App::$strings["Configuration Editor"] = "Editor de Configuració";
-App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "atenció: Realitzar segons quins ajustos pot fer el canal inoperable. Deixa aquesta pàgina si no estas segur i tens suficients coneixements sobre l'ús correcte d'aquesta característica.";
-App::$strings["Layout updated."] = "S'ha actualitzat la disposició.";
-App::$strings["Edit System Page Description"] = "Editor del Sistema de Descripció de Pàgines";
-App::$strings["Layout not found."] = "No s'ha trobat cap disposició de pàgina.";
-App::$strings["Module Name:"] = "Nom del mòdul:";
-App::$strings["Layout Help"] = "Ajuda per la disposició de pàgina";
-App::$strings["Poke"] = "Esperonar";
-App::$strings["Poke somebody"] = "Emprenyar algú";
-App::$strings["Poke/Prod"] = "Esperonat/Picat";
-App::$strings["Poke, prod or do other things to somebody"] = "emprenyar, picar o fer altres coses a algú";
-App::$strings["Recipient"] = "Destinatari";
-App::$strings["Choose what you wish to do to recipient"] = "Tria que vols fer amb el destinatari";
-App::$strings["Make this post private"] = "Fer aquesta entrada privada";
-App::$strings["Fetching URL returns error: %1\$s"] = "URL sol·licitada retorna error: %1\$s";
-App::$strings["Profile not found."] = "Perfil no trobat.";
-App::$strings["Profile deleted."] = "Perfil eliminat.";
-App::$strings["Profile-"] = "Perfil-";
-App::$strings["New profile created."] = "Nou perfil creat.";
-App::$strings["Profile unavailable to clone."] = "Perfil que no es pot clonar.";
-App::$strings["Profile unavailable to export."] = "Perfil que no es pot exportar.";
-App::$strings["Profile Name is required."] = "Es requereix el Nom del Perfil.";
-App::$strings["Marital Status"] = "Estat Marital";
-App::$strings["Romantic Partner"] = "Company/a Romàntic";
-App::$strings["Likes"] = "Agrada";
-App::$strings["Dislikes"] = "Desagrada";
-App::$strings["Work/Employment"] = "Treball/Feina";
-App::$strings["Religion"] = "Religió";
-App::$strings["Political Views"] = "Idees Polítiques";
-App::$strings["Sexual Preference"] = "Preferència Sexual";
-App::$strings["Homepage"] = "Pàgina Personal";
-App::$strings["Interests"] = "Interessos";
-App::$strings["Profile updated."] = "Perfil actualitzat.";
-App::$strings["Hide your connections list from viewers of this profile"] = "Amaga dels curiosos la teva llista de connexions d'aquest perfil";
-App::$strings["Edit Profile Details"] = "Edita els Detalls del Perfil";
-App::$strings["View this profile"] = "Veure aquest perfil";
-App::$strings["Edit visibility"] = "Editar visibilitat";
-App::$strings["Profile Tools"] = "Eines per Perfils";
-App::$strings["Change cover photo"] = "Canviar la foto de portada";
-App::$strings["Change profile photo"] = "Canviar la foto del perfil";
-App::$strings["Create a new profile using these settings"] = "Crea un perfil nou amb aquests ajustos";
-App::$strings["Clone this profile"] = "Clonar aquest perfil";
-App::$strings["Delete this profile"] = "Elimina aquest perfil";
-App::$strings["Add profile things"] = "Afegeix coses al perfil";
-App::$strings["Personal"] = "Personal";
-App::$strings["Relation"] = "Relació";
-App::$strings["Miscellaneous"] = "Miscelania";
-App::$strings["Import profile from file"] = "Importa perfil des d'un arxiu";
-App::$strings["Export profile to file"] = "Exporta perfil a un arxiu";
-App::$strings["Your gender"] = "El teu gènere";
-App::$strings["Marital status"] = "Estat marital";
-App::$strings["Sexual preference"] = "Preferència sexual";
-App::$strings["Profile name"] = "Nom del perfil";
-App::$strings["This is your default profile."] = "Aquest es el teu perfil per defecte";
-App::$strings["Your full name"] = "El teu nom complet";
-App::$strings["Title/Description"] = "Títol/Descripció";
-App::$strings["Street address"] = "Carrer";
-App::$strings["Locality/City"] = "Població/Ciutat";
-App::$strings["Region/State"] = "Regió/Estat";
-App::$strings["Postal/Zip code"] = "Codi Postal";
-App::$strings["Country"] = "País";
-App::$strings["Who (if applicable)"] = "Qui (si es aplicable)";
-App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Examples: cathy123, Cathy Williams, cathy@example.com";
-App::$strings["Since (date)"] = "Des de (data)";
-App::$strings["Tell us about yourself"] = "Quelcom sobre tu";
-App::$strings["Hometown"] = "Ciutat Natal";
-App::$strings["Political views"] = "Idees polítiques";
-App::$strings["Religious views"] = "Creences religioses";
-App::$strings["Keywords used in directory listings"] = "Paraules clau emprades en els llistats de directoris";
-App::$strings["Example: fishing photography software"] = "Exemple: software de fotografia submarina";
-App::$strings["Musical interests"] = "Interessos Musicals";
-App::$strings["Books, literature"] = "Llibres, literatura";
-App::$strings["Television"] = "Televisió";
-App::$strings["Film/Dance/Culture/Entertainment"] = "Pel·lícules/Dansa/Cultura/Entreteniment";
-App::$strings["Hobbies/Interests"] = "Aficions/Interessos";
-App::$strings["Love/Romance"] = "Amor/Romace";
-App::$strings["School/Education"] = "Escola/Educació";
-App::$strings["Contact information and social networks"] = "Informació de contacte i xarxes socials";
-App::$strings["My other channels"] = "Els meus altres canals";
-App::$strings["Profile Image"] = "Imatge del Perfil";
-App::$strings["Edit Profiles"] = "Editar Perfils";
-App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Refresca la memòria cau del navegador si la foto no s'actualitza immediatament. Dreceres: «Ctrl+F5» i «Ctrl+Maj+R»";
-App::$strings["Upload Profile Photo"] = "Puja una Foto pel Perfil";
-App::$strings["Invalid profile identifier."] = "Identificador invàlid de perfil.";
-App::$strings["Profile Visibility Editor"] = "Perfil del Editor de Visibilitat";
-App::$strings["Profile"] = "Perfil";
-App::$strings["Click on a contact to add or remove."] = "Clica sobre el contacte per afegir o esborrar.";
-App::$strings["Visible To"] = "Visible per";
-App::$strings["Public Hubs"] = "Nodes Públics";
-App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Els nodes llistats permeten registrar usuaris de la xarxa \$Projectname. Com que tots els nodes estan enllaçats entre ells, la identitat és vàlida a tota la xarxa. Alguns nodes poden demanar subscripció o oferir serveis addicional de pagament. Per a més detalls, <strong>proveu</strong> de seguir els enllaços dels proveïdors.";
-App::$strings["Hub URL"] = "URL del Node";
-App::$strings["Access Type"] = "Tipus d'accés";
-App::$strings["Registration Policy"] = "Condicions de registre";
-App::$strings["Stats"] = "Estadístiques";
-App::$strings["Software"] = "Programari";
-App::$strings["Ratings"] = "Valoracions";
-App::$strings["Rate"] = "Puntua";
-App::$strings["Website:"] = "Lloc web:";
-App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Canal Remot [%s] (encara no es coneix en aquest lloc)";
-App::$strings["Rating (this information is public)"] = "Valoració (aquesta informació és pública)";
-App::$strings["Optionally explain your rating (this information is public)"] = "Opcionalment pots explicar la teva qualificació (aquesta informació és pública)";
-App::$strings["No ratings"] = "No valorat";
-App::$strings["Rating: "] = "Valoració:";
-App::$strings["Website: "] = "Lloc web:";
-App::$strings["Description: "] = "Descripció:";
+App::$strings["Remote privacy information not available."] = "informació privada remota no disponible.";
+App::$strings["Visible to:"] = "Visible per:";
+App::$strings["Import completed"] = "S'ha completat la importació";
+App::$strings["Import Items"] = "Importa Articles";
+App::$strings["Use this form to import existing posts and content from an export file."] = "Empra aquest formulari per importar entrades existents i contingut d'un arxiu d'exportació.";
+App::$strings["Total invitation limit exceeded."] = "El límit total invitacions s'ha superat.";
+App::$strings["%s : Not a valid email address."] = "%s: adreça de correu electrònic no vàlida.";
+App::$strings["Please join us on \$Projectname"] = "Si us plau uneix-te a nosaltres a \$Projectname.";
+App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Límit d'invitacions excedit. Si us plau, poseu-vos en contacte amb l'administrador del lloc.";
+App::$strings["%s : Message delivery failed."] = "%s : Entrega del Missatge fallida.";
+App::$strings["%d message sent."] = array(
+	0 => "%d missatge enviat.",
+	1 => "%d missatges enviats.",
+);
+App::$strings["You have no more invitations available"] = "No té més invitacions disponibles";
+App::$strings["Send invitations"] = "Enviar invitacions";
+App::$strings["Enter email addresses, one per line:"] = "Introduïu les adreces de correu electrònic, una per línia:";
+App::$strings["Your message:"] = "El teu missatge:";
+App::$strings["Please join my community on \$Projectname."] = "Si us plau uneix-te la meva comunitat en \$Projectname.";
+App::$strings["You will need to supply this invitation code:"] = "Hauràs de facilitar aquest codi d'invitació:";
+App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Pots registrar-te a qualsevol node de \$Projectname (estàn tots interconnectats)";
+App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Escriu la meva adreça de xarxa al \$Projectname,  a la barra de cerca del lloc.";
+App::$strings["or visit"] = "o visitar";
+App::$strings["3. Click [Connect]"] = "3. Clicar [Conectar]";
+App::$strings["Location not found."] = "Situació que no es troba.";
+App::$strings["Location lookup failed."] = "Ha fallat la cerca d'ubicació.";
+App::$strings["Please select another location to become primary before removing the primary location."] = "Seleccioneu una altra ubicació per esdevenir primària abans de retirar la ubicació principal.";
+App::$strings["Syncing locations"] = "Sincronitza ubicacions";
+App::$strings["No locations found."] = "No es troben els llocs.";
+App::$strings["Manage Channel Locations"] = "Gestionar Ubicacions de Canal";
+App::$strings["Primary"] = "Primari";
+App::$strings["Drop"] = "Menysprea";
+App::$strings["Sync Now"] = "Sincronitza Ara";
+App::$strings["Please wait several minutes between consecutive operations."] = "Si us plau espera diversos minuts entre operacions consecutives.";
+App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Quan sigui possible, per desapareixer d'un lloc, accedeix a aquest lloc web/node i elimina el teu canal.";
+App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Empra aquest formulari per desapareixer del lloc si el node ja no està operatiu.";
+App::$strings["Hub not found."] = "Node no trobat.";
+App::$strings["Unable to lookup recipient."] = "Incapaç de trobar el destinatari.";
+App::$strings["Unable to communicate with requested channel."] = "Incapaç de comunicar amb el canal demanat.";
+App::$strings["Cannot verify requested channel."] = "No puc verificar el canal demanat.";
+App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionat te restriccions sobre els missatges privats. L'enviament ha fallat.";
+App::$strings["Messages"] = "Missatges";
+App::$strings["Message recalled."] = "Recupera el missatge.";
+App::$strings["Conversation removed."] = "Conversació eliminada.";
+App::$strings["Expires YYYY-MM-DD HH:MM"] = "Expira YYYY-MM-DD HH:MM";
+App::$strings["Requested channel is not in this network"] = "El canal demanat no hi es en questa xarxa";
+App::$strings["Send Private Message"] = "Envia Missatge Privat";
+App::$strings["To:"] = "Per:";
+App::$strings["Subject:"] = "Assumpte:";
+App::$strings["Attach file"] = "Adjunta arxiu";
+App::$strings["Send"] = "Envia";
+App::$strings["Set expiration date"] = "Ajusta la data d'expiració";
+App::$strings["Delete message"] = "Elimina el missatge";
+App::$strings["Delivery report"] = "Informe d'entrega";
+App::$strings["Recall message"] = "Recupera el missatge";
+App::$strings["Message has been recalled."] = "El missatge s'ha recuperat.";
+App::$strings["Delete Conversation"] = "Conversació esborrada";
+App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicació segura no disponible. Pots respondre des de la pàgina de perfil del remitent.";
+App::$strings["Send Reply"] = "Envia Resposta";
+App::$strings["Your message for %s (%s):"] = "El teu missatge per %s (%s):";
+App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Has creat %1$.0f de %2$.0f canals permesos.";
+App::$strings["Create a new channel"] = "Crear un nou canal";
+App::$strings["Channel Manager"] = "Gestor de Canals";
+App::$strings["Current Channel"] = "Canal Actual";
+App::$strings["Switch to one of your channels by selecting it."] = "Canviar a un altre dels teus canals seleccionant-ho.";
+App::$strings["Default Channel"] = "Canal per Defecte";
+App::$strings["Make Default"] = "Estableix com a Predeterminat";
+App::$strings["%d new messages"] = "%d missatges nous";
+App::$strings["%d new introductions"] = "%d noves presentacions";
+App::$strings["Delegated Channel"] = "Canal Delegat";
+App::$strings["Unable to update menu."] = "No s'ha pogut actualitzar el menú.";
+App::$strings["Unable to create menu."] = "No s'ha pogut crear el menú.";
+App::$strings["Menu Name"] = "Nom del menú";
+App::$strings["Unique name (not visible on webpage) - required"] = "Nom únic (no visible a la pàgina web) - requerit";
+App::$strings["Menu Title"] = "Títol del menú";
+App::$strings["Visible on webpage - leave empty for no title"] = "Visible a la pàgina web - deixar buit per a no posar títol";
+App::$strings["Allow Bookmarks"] = "Permetre Marcadors";
+App::$strings["Menu may be used to store saved bookmarks"] = "El menú es pot emprar per a guardar marcadors";
+App::$strings["Submit and proceed"] = "Envia i procedeix";
+App::$strings["Menus"] = "Menús";
+App::$strings["Bookmarks allowed"] = "Marcadors permesos";
+App::$strings["Delete this menu"] = "Esborra el menú";
+App::$strings["Edit menu contents"] = "Edita el contingut del menú";
+App::$strings["Edit this menu"] = "Edita el menú";
+App::$strings["Menu could not be deleted."] = "El menu no es pot esborrar.";
+App::$strings["Menu not found."] = "Menú no trobat.";
+App::$strings["Edit Menu"] = "Edita Menú";
+App::$strings["Add or remove entries to this menu"] = "Afegeix o esborra entrades a aquest menú";
+App::$strings["Menu name"] = "Nom del Menú";
+App::$strings["Must be unique, only seen by you"] = "Ha de ser únic, nomes vist per tú";
+App::$strings["Menu title"] = "Títol del menú";
+App::$strings["Menu title as seen by others"] = "Títol del menú vist pels altres";
+App::$strings["Allow bookmarks"] = "Marcadors permesos";
+App::$strings["Not found."] = "No trobat.";
+App::$strings["No valid account found."] = "No es troba un compte vàlid.";
+App::$strings["Password reset request issued. Check your email."] = "Sol·licitud de restabliment de contrasenya emesa. Consulta el teu correu electrònic.";
+App::$strings["Site Member (%s)"] = "Lloc d'Usuari (%s)";
+App::$strings["Password reset requested at %s"] = "S'ha soŀlicitat restablir la contrasenya al hub %s";
+App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Ha fallat el restabliment de contrasenya perquè la no s'ha pogut verificar soŀlicitud. Pot ser que ja ho hàgiu soŀlicitat abans.";
+App::$strings["Password Reset"] = "Restabliment de contrasenya";
+App::$strings["Your password has been reset as requested."] = "S'ha restablert la vostra contrasenya.";
+App::$strings["Your new password is"] = "La nova contrasenya és";
+App::$strings["Save or copy your new password - and then"] = "Desa o copia la nova contrasenya, i després";
+App::$strings["click here to login"] = "fes clic aquí per iniciar sessió";
+App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Pots canviar la contrasenya a la pàgina <em>Paràmetres</em>, un cop iniciada la sessió.";
+App::$strings["Your password has changed at %s"] = "La teva contrasenya a %s ha canviat";
+App::$strings["Forgot your Password?"] = "No recordes la contrasenya?";
+App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Escriu la teva adreça de correu electrònic i envia per restablir la contrasenya. Després revisa el seu correu electrònic per obtenir més instruccions.";
+App::$strings["Email Address"] = "Adreça electrònica";
+App::$strings["Reset"] = "Reajustar";
+App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s es %2\$s";
+App::$strings["Mood"] = "Ànim";
+App::$strings["Set your current mood and tell your friends"] = "Estableix el teu estat d'ànim actual i digues-li als teus amics";
+App::$strings["No such group"] = "No existeix el grup";
+App::$strings["No such channel"] = "No existeix el canal";
+App::$strings["forum"] = "fòrum";
+App::$strings["Search Results For:"] = "Cerca resultats per:";
+App::$strings["Privacy group is empty"] = "el grup privat està vuit";
+App::$strings["Privacy group: "] = "Grup privat:";
+App::$strings["Invalid connection."] = "La connexió és invàlida.";
+App::$strings["No more system notifications."] = "No hi ha més notificacions del sistema.";
+App::$strings["System Notifications"] = "Notificacions del sistema";
+App::$strings["Profile Match"] = "Perfils compatibles";
+App::$strings["No keywords to match. Please add keywords to your default profile."] = "No tens paraules clau al perfil principal per poder cercar perfils semblants.";
+App::$strings["is interested in:"] = "té interès en:";
+App::$strings["No matches"] = "No s'han trobat perfils compatibles";
+App::$strings["Posts and comments"] = "Entrades i comentaris";
+App::$strings["Only posts"] = "Només entrades";
+App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Permisos insuficients. Petició redirigida a la pàgina del perfil.";
+App::$strings["Unable to create element."] = "Incapaç de crear l'element.";
+App::$strings["Unable to update menu element."] = "Incapaç d'actualitzar un element del menú.";
+App::$strings["Unable to add menu element."] = "Incapaç d'afegir l'element del menú.";
+App::$strings["Menu Item Permissions"] = "Permisos de l'Article del Menú";
+App::$strings["(click to open/close)"] = "(clica per obrir/tancar)";
+App::$strings["Link Name"] = "Nom de l'Enllaç";
+App::$strings["Link or Submenu Target"] = "Enllaç o Submenú Objectiu";
+App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Entra la URL de l'enlla´o tria un nom de menú per crear un submenú";
+App::$strings["Use magic-auth if available"] = "Empra magic-auth si esta disponible";
+App::$strings["Open link in new window"] = "Obrir l'enllaç en una nova finestra";
+App::$strings["Order in list"] = "Ordre per llista";
+App::$strings["Higher numbers will sink to bottom of listing"] = "Els números més alts aniràn al fons de la llista";
+App::$strings["Submit and finish"] = "Envia i termina";
+App::$strings["Submit and continue"] = "Envia i continua";
+App::$strings["Menu:"] = "Menú:";
+App::$strings["Link Target"] = "Enllaç Objectiu";
+App::$strings["Edit menu"] = "Edita menú";
+App::$strings["Edit element"] = "Edita element";
+App::$strings["Drop element"] = "Deixa anar element";
+App::$strings["New element"] = "Nou element";
+App::$strings["Edit this menu container"] = "Edita aquest contenidor de menú";
+App::$strings["Add menu element"] = "Afegeix element de menú";
+App::$strings["Delete this menu item"] = "Esborra aquest article del menú";
+App::$strings["Edit this menu item"] = "Edita aquest article del menú";
+App::$strings["Menu item not found."] = "Article del menú no trobat.";
+App::$strings["Menu item deleted."] = "Article del menú eliminat.";
+App::$strings["Menu item could not be deleted."] = "Article del menú no es pot eliminar.";
+App::$strings["Edit Menu Element"] = "Editar Element del Menú";
+App::$strings["Link text"] = "Enllaç de text";
 App::$strings["Theme settings updated."] = "Ajustos de tema actualitzats.";
 App::$strings["# Accounts"] = "# Comptes";
 App::$strings["# blocked accounts"] = "# comptes bloquejats";
@@ -802,7 +782,7 @@ App::$strings["Your software should be updated"] = "El teu programari cal que s'
 App::$strings["Administration"] = "Administració";
 App::$strings["Summary"] = "Sumari";
 App::$strings["Registered accounts"] = "Comptes registrades";
-App::$strings["Pending registrations"] = "Comptes pendents de registre";
+App::$strings["Pending registrations"] = "Comptes pendents d'inscripció";
 App::$strings["Registered channels"] = "Canals registrats";
 App::$strings["Active plugins"] = "Plugins actius";
 App::$strings["Version"] = "Versió";
@@ -819,7 +799,7 @@ App::$strings["My site has paid access only"] = "El meu lloc te accès per pagam
 App::$strings["My site has free access only"] = "El meu lloc te lliure accés";
 App::$strings["My site offers free accounts with optional paid upgrades"] = "El meu lloc te comptes gratis amb opció de millores per pagament";
 App::$strings["Site"] = "Lloc";
-App::$strings["Registration"] = "Registre";
+App::$strings["Registration"] = "Inscripcions";
 App::$strings["File upload"] = "Pujar arxiu";
 App::$strings["Policies"] = "Polítiques";
 App::$strings["Advanced"] = "Avançat";
@@ -836,12 +816,12 @@ App::$strings["Allow Feeds as Connections"] = "Permetre Retroalimentadors com Co
 App::$strings["(Heavy system resource usage)"] = "(Demana molts recursos del sistema)";
 App::$strings["Maximum image size"] = "Mida màxima d'imatge";
 App::$strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Mida màxima en bytes d'imatges pujades. Per defecte es 0, el que vol dir sense límits.";
-App::$strings["Does this site allow new member registration?"] = "Permet aquest lloc registre de nous membres?";
+App::$strings["Does this site allow new member registration?"] = "Permet aquest lloc l'inscripció de nous membres?";
 App::$strings["Invitation only"] = "Només per invitació";
-App::$strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Només permet registre de nos membres amb codi d'invitació. A més la política de registre s'ha d'establir a Sí.";
+App::$strings["Only allow new member registrations with an invitation code. Above register policy must be set to Yes."] = "Només permet inscriure nous membres amb codi d'invitació. A més la política de registre s'ha d'establir a Sí.";
 App::$strings["Which best describes the types of account offered by this hub?"] = "Que es es que millor descriu la mena de comptes oferits per aquest concentrador?";
-App::$strings["Register text"] = "text de registre";
-App::$strings["Will be displayed prominently on the registration page."] = "Es mostrarà preminentment a la pàgina de registre";
+App::$strings["Register text"] = "Text d'inscripció";
+App::$strings["Will be displayed prominently on the registration page."] = "Es mostrarà preminentment a la pàgina d'inscripció";
 App::$strings["Site homepage to show visitors (default: login box)"] = "Pàgina d'inici a mostrar als visitants (per defecte: la pàgina d'identificació)";
 App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "exemple: 'públic' per a mostrar un flux públic, 'page/sys/home' per a mostrar una pàgina web dita 'home' o 'include:home.html' per a incloure un arxiu.";
 App::$strings["Preserve site homepage URL"] = "Preservar URL de la pàgina web";
@@ -938,12 +918,12 @@ App::$strings["Account '%s' blocked"] = "S'ha bloquejat el compte '%s'";
 App::$strings["Account '%s' unblocked"] = "S'ha desbloquejat el compte '%s'";
 App::$strings["Accounts"] = "Comptes";
 App::$strings["select all"] = "Sel·leciona-ho tot";
-App::$strings["Registrations waiting for confirm"] = "";
+App::$strings["Registrations waiting for confirm"] = "Inscripcions esperant confirmació";
 App::$strings["Request date"] = "Data de la petició";
 App::$strings["No registrations."] = "Sense registracions.";
 App::$strings["Deny"] = "Denegat";
 App::$strings["All Channels"] = "Tots els Canals";
-App::$strings["Register date"] = "Data de registre";
+App::$strings["Register date"] = "Data d'inscripció";
 App::$strings["Last login"] = "Darrera identificació";
 App::$strings["Expires"] = "Expira";
 App::$strings["Service Class"] = "Classe de Servei";
@@ -1012,7 +992,7 @@ App::$strings["Logs"] = "Logs";
 App::$strings["Clear"] = "Neteja";
 App::$strings["Debugging"] = "Depurant";
 App::$strings["Log file"] = "Arxiu de registre";
-App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "";
+App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "Ha de ser escribible pel servidor web. Relatiu al directori de nivell superior del servidor web";
 App::$strings["Log level"] = "Nivell de registre";
 App::$strings["New Profile Field"] = "Camp de Perfil Nou";
 App::$strings["Field nickname"] = "Àlies de Camp";
@@ -1031,33 +1011,105 @@ App::$strings["(In addition to basic fields)"] = "( addicionalment als camps bà
 App::$strings["All available fields"] = "Tots els camps disponibles";
 App::$strings["Custom Fields"] = "Camps Personalitzats";
 App::$strings["Create Custom Field"] = "Crear un Camp Personalitzat";
-App::$strings["App installed."] = "Aplicació instal·lada.";
-App::$strings["Malformed app."] = "Aplicació amb errors";
-App::$strings["Embed code"] = "Codi embegut";
-App::$strings["Edit App"] = "Edita l'Aplicació";
-App::$strings["Create App"] = "Crea l'Aplicació";
-App::$strings["Name of app"] = "Nom de l'Aplicació";
-App::$strings["Location (URL) of app"] = "Ubicació (URL) de l'aplicació";
-App::$strings["Photo icon URL"] = "Foto icona URL";
-App::$strings["80 x 80 pixels - optional"] = "80 x 80 pixels - opcional";
-App::$strings["Categories (optional, comma separated list)"] = "Categories (opcional, lista separada per comes)";
-App::$strings["Version ID"] = "Versió ID";
-App::$strings["Price of app"] = "Preu de l'aplicació";
-App::$strings["Location (URL) to purchase app"] = "Ubicació (URL) per comprar l'aplicació";
+App::$strings["Name or caption"] = "Nom o llegenda";
+App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Exemples: \"Pep Gomila\", \"Manel i els seus Cavalls\", \"Fútbol\", \"Grup d'Aviadors\"";
+App::$strings["Choose a short nickname"] = "Tria un àlies curt";
+App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "El teu àlies serà emprat per crear un nom fàcil per recordar l'adreça del canal p.e. àlies%s";
+App::$strings["Channel role and privacy"] = "Funció i privacitat del canal";
+App::$strings["Select a channel role with your privacy requirements."] = "Tria una funció pel canal amb els teus requisits de privacitat.";
+App::$strings["Read more about roles"] = "Llegix més sobre els rols";
+App::$strings["Create Channel"] = "Crea un Canal";
+App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canal es la tva identitat en aquesta xarxa. Pot representar una persona, un bloc, o un fòrum per anomenar alguns. Els canals poden connectar-se amb altres canals per compartir informació amb permisos molt detallats.";
+App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "o <a href=\"import\">importa un canal existent</a> des d'un altre ubicació.";
+App::$strings["sent you a private message"] = "Se t'ha enviat un missatge privat";
+App::$strings["added your channel"] = "el teu canal s'ha afegit";
+App::$strings["g A l F d"] = "g A l F d";
+App::$strings["[today]"] = "[avui]";
+App::$strings["posted an event"] = "enviat un esdeveniment";
+App::$strings["Invalid request identifier."] = "Sol·licitud d'identificació invàlida.";
+App::$strings["Discard"] = "Descarta";
+App::$strings["Mark all system notifications seen"] = "Marca totes les notificacions vistes";
+App::$strings["Poke"] = "Esperonar";
+App::$strings["Poke somebody"] = "Emprenyar algú";
+App::$strings["Poke/Prod"] = "Esperonat/Picat";
+App::$strings["Poke, prod or do other things to somebody"] = "emprenyar, picar o fer altres coses a algú";
+App::$strings["Recipient"] = "Destinatari";
+App::$strings["Choose what you wish to do to recipient"] = "Tria que vols fer amb el destinatari";
+App::$strings["Make this post private"] = "Fer aquesta entrada privada";
+App::$strings["Unable to find your hub."] = "No es possible trobar el node";
+App::$strings["Post successful."] = "Entrada realitzada amb èxit. ";
+App::$strings["OpenID protocol error. No ID returned."] = "Error del protocol OpenID. No ha retornat ID";
+App::$strings["Login failed."] = "Identificació fallida.";
+App::$strings["Invalid profile identifier."] = "Identificador invàlid de perfil.";
+App::$strings["Profile Visibility Editor"] = "Perfil del Editor de Visibilitat";
+App::$strings["Profile"] = "Perfil";
+App::$strings["Click on a contact to add or remove."] = "Clica sobre el contacte per afegir o esborrar.";
+App::$strings["Visible To"] = "Visible per";
+App::$strings["This setting requires special processing and editing has been blocked."] = "Aquest ajust requereix un procés espedial i l'edició esta bloquejada.";
+App::$strings["Configuration Editor"] = "Editor de Configuració";
+App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "atenció: Realitzar segons quins ajustos pot fer el canal inoperable. Deixa aquesta pàgina si no estas segur i tens suficients coneixements sobre l'ús correcte d'aquesta característica.";
+App::$strings["Fetching URL returns error: %1\$s"] = "URL sol·licitada retorna error: %1\$s";
+App::$strings["Version %s"] = "Versió %s";
+App::$strings["Installed plugins/addons/apps:"] = "Plugins/addons/apps Instal·lats:";
+App::$strings["No installed plugins/addons/apps"] = "Plugins/addons/apps no instal·lats";
+App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Aquest és un node de \$Projectname, una xarxa cooperativa mundial de llocs web descentralitzats amb gran control de la privacitat.";
+App::$strings["Tag: "] = "Etiqueta:";
+App::$strings["Last background fetch: "] = "Última actualització en rerefons:";
+App::$strings["Current load average: "] = "Càrrega actual mitja:";
+App::$strings["Running at web location"] = "Correguent en el lloc web";
+App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Visita <a href=\"http://hubzilla.org\">hubzilla.org</a> per saber-ne més de \$Projectname.";
+App::$strings["Bug reports and issues: please visit"] = "Per informar d'errors o problemes ves a";
+App::$strings["\$projectname issues"] = "\$projectname qüestions";
+App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Per suggerències, felicitacions i altres, envia'ns un mail a «redmatrix» [arroba] librelist [punt] com";
+App::$strings["Site Administrators"] = "Administradors del lloc";
+App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Em trobat un problema durant l'inici de sessió amb el OpenID que has facilitat. verifica l'ortografia correcta de la ID.";
+App::$strings["The error message was:"] = "El missatge d'error fou:";
+App::$strings["Authentication failed."] = "Ha fallat l'autentificació.";
+App::$strings["Remote Authentication"] = "Autentificació Remota";
+App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Introdueix la teva adreça del canal (eg canal@exemple.com)";
+App::$strings["Authenticate"] = "Autentica't";
+App::$strings["Public Hubs"] = "Nodes Públics";
+App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Els nodes llistats permeten registrar usuaris de la xarxa \$Projectname. Com que tots els nodes estan enllaçats entre ells, la identitat és vàlida a tota la xarxa. Alguns nodes poden demanar subscripció o oferir serveis addicional de pagament. Per a més detalls, <strong>proveu</strong> de seguir els enllaços dels proveïdors.";
+App::$strings["Hub URL"] = "URL del Node";
+App::$strings["Access Type"] = "Tipus d'accés";
+App::$strings["Registration Policy"] = "Condicions d'inscripció";
+App::$strings["Stats"] = "Estadístiques";
+App::$strings["Software"] = "Programari";
+App::$strings["Ratings"] = "Valoracions";
+App::$strings["Rate"] = "Puntua";
+App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Refresca la memòria cau del navegador si la foto no s'actualitza immediatament. Dreceres: «Ctrl+F5» i «Ctrl+Maj+R»";
+App::$strings["Upload Profile Photo"] = "Puja una Foto pel Perfil";
+App::$strings["Block Name"] = "Nom del Bloc";
+App::$strings["Blocks"] = "Bloc";
+App::$strings["Block Title"] = "Títol del bloc";
+App::$strings["Website:"] = "Lloc web:";
+App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Canal Remot [%s] (encara no es coneix en aquest lloc)";
+App::$strings["Rating (this information is public)"] = "Valoració (aquesta informació és pública)";
+App::$strings["Optionally explain your rating (this information is public)"] = "Opcionalment pots explicar la teva qualificació (aquesta informació és pública)";
+App::$strings["No ratings"] = "No valorat";
+App::$strings["Rating: "] = "Valoració:";
+App::$strings["Website: "] = "Lloc web:";
+App::$strings["Description: "] = "Descripció:";
+App::$strings["Apps"] = "Aplicatius";
+App::$strings["Title (optional)"] = "Títol (opcional)";
+App::$strings["Edit Block"] = "Editar Bloc";
+App::$strings["No channel."] = "No s'ha trobat el canal";
+App::$strings["Common connections"] = "Connexions en comú";
+App::$strings["No connections in common."] = "No hi ha connexions en comú.";
 App::$strings["Select a bookmark folder"] = "Tria una carpeta d'interès";
 App::$strings["Save Bookmark"] = "Guarda Favorits";
 App::$strings["URL of bookmark"] = "URL de favorit";
 App::$strings["Or enter new bookmark folder name"] = "O entra un nou nom de favorit";
-App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Nombre màxim de registres diaris excedit. Si us plau, provau demà.";
-App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "El registre ha fallat. Si et plau, indica que acceptes les Condicions del Servei.";
+App::$strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = "Nombre màxim d'inscripcions diaris excedit. Si us plau, provau demà.";
+App::$strings["Please indicate acceptance of the Terms of Service. Registration failed."] = "L'inscripció ha fallat. Si et plau, indica que acceptes les Condicions del Servei.";
 App::$strings["Passwords do not match."] = "Les contrasenyes no coincideixen.";
 App::$strings["Registration successful. Please check your email for validation instructions."] = "Registrat amb èxit. Si et plau revisa el teu correu electrònic per a les instruccions de validació.";
-App::$strings["Your registration is pending approval by the site owner."] = "El teu registre esta pendent de validació pel propietari del lloc.";
-App::$strings["Your registration can not be processed."] = "El teu registre no ha pogut ser processat. ";
-App::$strings["Registration on this hub is disabled."] = "El registre en aquest node està deshabilitat.";
-App::$strings["Registration on this hub is by approval only."] = "El registre en aquest node es únicament per validació.";
-App::$strings["<a href=\"pubsites\">Register at another affiliated hub.</a>"] = "<a href=\"pubsites\">Registre en altre node afiliat</a>";
-App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "El lloc ha excedit el límit màxim diari de nous comptes/registres. Provau demà.";
+App::$strings["Your registration is pending approval by the site owner."] = "La teva inscripció esta pendent de validació pel propietari del lloc.";
+App::$strings["Your registration can not be processed."] = "La teva inscripció no ha pogut ser processat. ";
+App::$strings["Registration on this hub is disabled."] = "L'inscripció en aquest node està deshabilitat.";
+App::$strings["Registration on this hub is by approval only."] = "L'inscripció en aquest node es únicament per validació.";
+App::$strings["<a href=\"pubsites\">Register at another affiliated hub.</a>"] = "<a href=\"pubsites\">Inscripció en altre node afiliat</a>";
+App::$strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = "El lloc ha excedit el límit màxim diari de nous comptes/inscripció. Provau demà.";
 App::$strings["Terms of Service"] = "Condicions del Servei";
 App::$strings["I accept the %s for this website"] = "Accepto el %s per a aquest lloc web";
 App::$strings["I am over 13 years of age and accept the %s for this website"] = "Tinc més de 13 anys i accepto les %s d'aquest lloc web";
@@ -1068,8 +1120,8 @@ App::$strings["Please enter your invitation code"] = "Si et plau, introdueix el
 App::$strings["no"] = "no";
 App::$strings["yes"] = "sí";
 App::$strings["Membership on this site is by invitation only."] = "La pertinença en aquest lloc es per invitació exclusivament.";
-App::$strings["Register"] = "Registre";
-App::$strings["Proceed to create your first channel"] = "Comença a crear el teu primer canal";
+App::$strings["Register"] = "Inscripció";
+App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "";
 App::$strings["Please login."] = "Inicia Sessió.";
 App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "L'esborrat de comptes no està permès fins que transcorren 48 hores des de l'últim canvi de contrasenya.";
 App::$strings["Remove This Account"] = "Esborra el compte";
@@ -1086,17 +1138,23 @@ App::$strings["This channel will be completely removed from the network. "] = "A
 App::$strings["Remove this channel and all its clones from the network"] = "Elimina aquest canal i els seus clons de la xarxa";
 App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Per defecte, només la instancia del canal ubicat en aquest node pot esser esborrat  de la xarxa";
 App::$strings["Remove Channel"] = "Elimina el canal";
-App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Em trobat un problema durant l'inici de sessió amb el OpenID que has facilitat. verifica l'ortografia correcta de la ID.";
-App::$strings["The error message was:"] = "El missatge d'error fou:";
-App::$strings["Authentication failed."] = "Ha fallat l'autentificació.";
-App::$strings["Remote Authentication"] = "Autentificació Remota";
-App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Introdueix la teva adreça del canal (eg canal@exemple.com)";
-App::$strings["Authenticate"] = "Autentica't";
+App::$strings["Export Channel"] = "Exportar Canal";
+App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exporta la informació bàsica del canal a un arxiu. Això actua com a còpia de recolzament de les teves connexions, permisos, perfil i dades bàsiques, les quals pots emprar per traslladar aquestes dades a una altre lloc/node, però no conté el contingut del canal.";
+App::$strings["Export Content"] = "Exportar el Contingut";
+App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exporta la informació del canal i tot el contingut recent a un arxiu de recolzament JSON que por ser restaurat o importat en altre lloc/node. Això còpia totes les teves connexions, permisos, perfil i dades i mesos de entrades. L'arxiu pot ser MOLT gran. Si et plau, sigues pacient ja que pot trigar uns minuts a començar a baixar.";
+App::$strings["Export your posts from a given year."] = "Exporta les teves entrades d'un any donat.";
+App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Pots també exportar les teves entrades i conversacions d'un any o un mes en particular. Ajusta la data a la barra de direccions del navegador per seleccionar altres dates. Si la exportació falla (possiblement degut al esgotament de la memòria del node servidor), si et plau, intenta de nou la selecció d'un rang de dates més limitat.";
+App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Per seleccionar tots els missatges per a un any determinat, com aquest any, visiteu <a href=\"%1\$s\">%2\$s</a>";
+App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Per seleccionar tots els missatges per a un mes determinat, com el de gener d'aquest any, visiteu <a href=\"%1\$s\">%2\$s</a>";
+App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Aquests arxius de contingut poden ser importats o restaurats per visitar  <a href=\"%1\$s\">%2\$s</a> en qualsevol lloc que conté el teu canal. Per obtenir els millors resultats si us plau, importar o restaurar aquests en ordre de data (la més antiga primer).";
 App::$strings["Items tagged with: %s"] = "Elements etiquetats amb: %s";
 App::$strings["Search results for: %s"] = "Resultats de cerca per: %s";
 App::$strings["No service class restrictions found."] = "No s'han trobat restriccions de clase.";
 App::$strings["Name is required"] = "Es requereix un Nom";
 App::$strings["Key and Secret are required"] = "Es requereix Clau (Key) i el Secret (Secret)";
+App::$strings["This channel is limited to %d tokens"] = "";
+App::$strings["Name and Password are required."] = "";
+App::$strings["Token saved."] = "";
 App::$strings["Not valid email."] = "E-correu no vàlid.";
 App::$strings["Protected email address. Cannot change to that email."] = "Adreça d'e-correu protegida. No es pot canviar a aquest e-correu.";
 App::$strings["System failure storing new email. Please try again."] = "Fallada del sistema al guardar un nou correu. Si us plau, proba de nou.";
@@ -1129,6 +1187,12 @@ App::$strings["Confirm New Password"] = "Confirma la Nova Contrasenya";
 App::$strings["Leave password fields blank unless changing"] = "Deixa els camps de contrasenya en blanc llevat que la vulguis canviar";
 App::$strings["Email Address:"] = "Adreça de E-Correu:";
 App::$strings["Remove this account including all its channels"] = "Esborra aquest compte inclosos tots els seus canals";
+App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content."] = "";
+App::$strings["You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "";
+App::$strings["Guest Access Tokens"] = "";
+App::$strings["Login Name"] = "";
+App::$strings["Login Password"] = "";
+App::$strings["Expires (yyyy-mm-dd)"] = "";
 App::$strings["Additional Features"] = "Característiques Addicionals";
 App::$strings["Connector Settings"] = "Ajustos de Connector";
 App::$strings["No special theme for mobile devices"] = "No emprar tema especial per aparells mòbils";
@@ -1226,7 +1290,7 @@ App::$strings["System (personal) notifications"] = "Notificacions (personals) de
 App::$strings["System info messages"] = "Missatges d'informació del sistema";
 App::$strings["System critical alerts"] = "Alertes crítiques del sistema";
 App::$strings["New connections"] = "Noves connexions";
-App::$strings["System Registrations"] = "Registres del sistema";
+App::$strings["System Registrations"] = "Inscripcions del Sistema";
 App::$strings["Also show new wall posts, private messages and connections under Notices"] = "Mostra també les entrades de mur noves, les entrades privades i les connexions a \"Notícies\"";
 App::$strings["Notify me of events this many days in advance"] = "Notifica'm dels esdeveniments amb aquests dies d'antelació";
 App::$strings["Must be greater than 0"] = "Ha de ser més gran que 0";
@@ -1291,7 +1355,6 @@ App::$strings["GD graphics PHP module"] = "mòdul PHP GD gràfics";
 App::$strings["OpenSSL PHP module"] = "mòdul PHP OpenSSL";
 App::$strings["mysqli or postgres PHP module"] = "mòdul PHP mysqli o postgres";
 App::$strings["mb_string PHP module"] = "mòdul PHP mb_string";
-App::$strings["mcrypt PHP module"] = "mòdul PHP mcrypt";
 App::$strings["xml PHP module"] = "Mòdul xml de PHP";
 App::$strings["Apache mod_rewrite module"] = "mòdul Apache mod_rewrite";
 App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: el mòdul mod-rewrite del servidor web Apache es requereix i no està instal·lat.";
@@ -1302,7 +1365,6 @@ App::$strings["Error: GD graphics PHP module with JPEG support required but not
 App::$strings["Error: openssl PHP module required but not installed."] = "Error: el mòdul PHP openssl es requereix però no està instal·lat.";
 App::$strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Error: el mòdul PHO mysqli o postgres es requereix però no està instal·lat.";
 App::$strings["Error: mb_string PHP module required but not installed."] = "Error: el mòdul PHP mb_string es requereix però no està instal·lat.";
-App::$strings["Error: mcrypt PHP module required but not installed."] = "Error: el mòdul PHP mcrypt es requereix però no està instal·lat.";
 App::$strings["Error: xml PHP module required for DAV but not installed."] = "Error: el mòdul xml de PHP es requereix per DAV però no està instal·lat.";
 App::$strings["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."] = "L'instaŀlador ha de poder crear i modificar un fitxer anomenat «.htconfig.php» a la carpeta arrel del servidor, però sembla que no ho pot fer.";
 App::$strings["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."] = "Això sol ser un problema de permisos. Per molt que el teu usuari pugui modificar-lo, és el del servidor web qui necessita els poders de modificació.";
@@ -1314,7 +1376,7 @@ App::$strings["In order to store these compiled templates, the web server needs
 App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Comprova que l'usuari que executa el servidor (www-data en Apache) té permisos d'escriptura en aquesta carpeta.";
 App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Nota: com a mesura de seguretat l'usuari del servidor web ha de tenir accés d'escriptura només a %s, i no a les plantilles (.tpl) que conté.";
 App::$strings["%s is writable"] = "Es pot escriure a %s";
-App::$strings["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"] = "Red fa servir la carpeta «store» per a desar els fitxers pujats. Per tant, el servidor web necessita tenir permís d'escriptura en aquesta carpeta, que està a l'arrel del servidor web.";
+App::$strings["This software 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"] = "";
 App::$strings["store is writable"] = "Es pot escriure al magatzem (store)";
 App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "El certificat SSL no s'ha pogut validar. Arregla-ho o deshabilita l'accés https a aquest lloc";
 App::$strings["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!"] = "Si tens accès pet https al teu lloc web o permets connexions pel port TCP 443 (port https), Has d'emprar un certificat VÀLID. NO es poden emprar certificats AUTO-SIGNATS!";
@@ -1322,6 +1384,7 @@ App::$strings["This restriction is incorporated because public posts from you ma
 App::$strings["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."] = "Si el teu certificat no és reconegut, llavors el membres d'altres hubs, encara que tinguin certificats vàlids, rebran una advertència de seguretat en carregar contingut teu.";
 App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Per tant, com que perjudica la usabilitat més enllà del teu lloc, la restricció de tenir un certificat reconegut és molt important.";
 App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Hi ha autoritats de certificació reconegudes que ofereixen certificats gratuïts.";
+App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "";
 App::$strings["SSL certificate validation"] = "Validació del certificat SSL";
 App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "No es poden reescriure les URL a «.htaccess». Comprova la configuració del servidor:";
 App::$strings["Url rewrite is working"] = "Es poden reescriure les URL a «.htaccess»";
@@ -1333,19 +1396,20 @@ App::$strings["Files: shared with me"] = "Arxius: compartits amb jo";
 App::$strings["NEW"] = "NOU";
 App::$strings["Remove all files"] = "Esborra tots els arxius";
 App::$strings["Remove this file"] = "Esborra l'arxiu";
-App::$strings["Version %s"] = "Versió %s";
-App::$strings["Installed plugins/addons/apps:"] = "Plugins/addons/apps Instal·lats:";
-App::$strings["No installed plugins/addons/apps"] = "Plugins/addons/apps no instal·lats";
-App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Aquest és un node de \$Projectname, una xarxa cooperativa mundial de llocs web descentralitzats amb gran control de la privacitat.";
-App::$strings["Tag: "] = "Etiqueta:";
-App::$strings["Last background fetch: "] = "Última actualització en rerefons:";
-App::$strings["Current load average: "] = "Càrrega actual mitja:";
-App::$strings["Running at web location"] = "Correguent en el lloc web";
-App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Visita <a href=\"http://hubzilla.org\">hubzilla.org</a> per saber-ne més de \$Projectname.";
-App::$strings["Bug reports and issues: please visit"] = "Per informar d'errors o problemes ves a";
-App::$strings["\$projectname issues"] = "\$projectname qüestions";
-App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Per suggerències, felicitacions i altres, envia'ns un mail a «redmatrix» [arroba] librelist [punt] com";
-App::$strings["Site Administrators"] = "Administradors del lloc";
+App::$strings["Thing updated"] = "S'ha actualitzat la cosa";
+App::$strings["Object store: failed"] = "No s'ha pogut emmagatzemar l'objecte";
+App::$strings["Thing added"] = "S'ha afegit la cosa";
+App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+App::$strings["Show Thing"] = "Mostra la cosa";
+App::$strings["item not found."] = "no s'ha trobat l'element.";
+App::$strings["Edit Thing"] = "Edita la cosa";
+App::$strings["Select a profile"] = "Tria un perfil";
+App::$strings["Post an activity"] = "Publica una activitat";
+App::$strings["Only sends to viewers of the applicable profile"] = "S'envia només a visitants del perfil corresponent";
+App::$strings["Name of thing e.g. something"] = "Nom de la cosa. Exemple: patata";
+App::$strings["URL of thing (optional)"] = "Adreça URL de la cosa (opcional)";
+App::$strings["URL for photo of thing (optional)"] = "Adreça URL de la foto d'una cosa (opcional)";
+App::$strings["Add Thing to your Profile"] = "Afegeix una cosa al teu perfil";
 App::$strings["Failed to create source. No channel selected."] = "Error en crear l'origen. Cap canal seleccionat.";
 App::$strings["Source created."] = "Origen creat.";
 App::$strings["Source updated."] = "Origen actualitzat.";
@@ -1373,60 +1437,38 @@ App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetat %3\
 App::$strings["Tag removed"] = "S'ha tret l'etiqueta";
 App::$strings["Remove Item Tag"] = "Elimina l'etiqueta d'element";
 App::$strings["Select a tag to remove: "] = "Tria l'etiqueta a eliminar:";
-App::$strings["Thing updated"] = "S'ha actualitzat la cosa";
-App::$strings["Object store: failed"] = "No s'ha pogut emmagatzemar l'objecte";
-App::$strings["Thing added"] = "S'ha afegit la cosa";
-App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-App::$strings["Show Thing"] = "Mostra la cosa";
-App::$strings["item not found."] = "no s'ha trobat l'element.";
-App::$strings["Edit Thing"] = "Edita la cosa";
-App::$strings["Select a profile"] = "Tria un perfil";
-App::$strings["Post an activity"] = "Publica una activitat";
-App::$strings["Only sends to viewers of the applicable profile"] = "S'envia només a visitants del perfil corresponent";
-App::$strings["Name of thing e.g. something"] = "Nom de la cosa. Exemple: patata";
-App::$strings["URL of thing (optional)"] = "Adreça URL de la cosa (opcional)";
-App::$strings["URL for photo of thing (optional)"] = "Adreça URL de la foto d'una cosa (opcional)";
-App::$strings["Add Thing to your Profile"] = "Afegeix una cosa al teu perfil";
-App::$strings["Export Channel"] = "Exportar Canal";
-App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exporta la informació bàsica del canal a un arxiu. Això actua com a còpia de recolzament de les teves connexions, permisos, perfil i dades bàsiques, les quals pots emprar per traslladar aquestes dades a una altre lloc/node, però no conté el contingut del canal.";
-App::$strings["Export Content"] = "Exportar el Contingut";
-App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exporta la informació del canal i tot el contingut recent a un arxiu de recolzament JSON que por ser restaurat o importat en altre lloc/node. Això còpia totes les teves connexions, permisos, perfil i dades i mesos de entrades. L'arxiu pot ser MOLT gran. Si et plau, sigues pacient ja que pot trigar uns minuts a començar a baixar.";
-App::$strings["Export your posts from a given year."] = "Exporta les teves entrades d'un any donat.";
-App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Pots també exportar les teves entrades i conversacions d'un any o un mes en particular. Ajusta la data a la barra de direccions del navegador per seleccionar altres dates. Si la exportació falla (possiblement degut al esgotament de la memòria del node servidor), si et plau, intenta de nou la selecció d'un rang de dates més limitat.";
-App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Per seleccionar tots els missatges per a un any determinat, com aquest any, visiteu <a href=\"%1\$s\">%2\$s</a>";
-App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Per seleccionar tots els missatges per a un mes determinat, com el de gener d'aquest any, visiteu <a href=\"%1\$s\">%2\$s</a>";
-App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Aquests arxius de contingut poden ser importats o restaurats per visitar  <a href=\"%1\$s\">%2\$s</a> en qualsevol lloc que conté el teu canal. Per obtenir els millors resultats si us plau, importar o restaurar aquests en ordre de data (la més antiga primer).";
-App::$strings["No connections."] = "Sense connexions.";
-App::$strings["Visit %s's profile [%s]"] = "Visita el perfil [%s] de %s";
-App::$strings["View Connections"] = "Veure Connexions";
-App::$strings["Source of Item"] = "Origen de l'article";
 App::$strings["Webpages"] = "Pàgines web";
 App::$strings["Actions"] = "Accions";
 App::$strings["Page Link"] = "Enllaç a Pàgina";
 App::$strings["Page Title"] = "Títol de la pàgina";
+App::$strings["Not found"] = "";
+App::$strings["Wiki"] = "Wiki";
+App::$strings["Sandbox"] = "Sandbox";
+App::$strings["\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be saved*.\""] = "";
+App::$strings["Revision Comparison"] = "Comparació de revisió";
+App::$strings["Revert"] = "Reverteix";
+App::$strings["Enter the name of your new wiki:"] = "Escriu el nom del teu nou wiki:";
+App::$strings["Enter the name of the new page:"] = "Escriu el nom de la teva nova pàgina:";
+App::$strings["Enter the new name:"] = "Escriu el nou nom:";
+App::$strings["Embed image from photo albums"] = "Embeu una imatge dels àlbums de fotos";
+App::$strings["Embed an image from your albums"] = "Embeu una imatge dels teus àlbums";
+App::$strings["OK"] = "OK";
+App::$strings["Choose images to embed"] = "Tria una imatge per a embeure-la";
+App::$strings["Choose an album"] = "Tria un àlbum";
+App::$strings["Choose a different album..."] = "Tria un àlbum diferent...";
+App::$strings["Error getting album list"] = "Ha ocorregut un error quan treia la llista de àlbums";
+App::$strings["Error getting photo link"] = "Ha ocorregut un error quan treia l'enllaç a la foto";
+App::$strings["Error getting album"] = "Ha ocorregut un error treient l'àlbum";
+App::$strings["No connections."] = "Sense connexions.";
+App::$strings["Visit %s's profile [%s]"] = "Visita el perfil [%s] de %s";
+App::$strings["View Connections"] = "Veure Connexions";
+App::$strings["Source of Item"] = "Origen de l'article";
+App::$strings["Authorize application connection"] = "Autoritza la connexió de l'aplicació";
+App::$strings["Return to your app and insert this Securty Code:"] = "Torna a la teva aplicació i insereix aquest Codi de Seguretat:";
+App::$strings["Please login to continue."] = "Si et plau, identifica't per continuar.";
+App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vols autoritzar a aquesta aplicació l'accés a les teves entrades i contactes i/o a crear noves entrades com si fos tu mateix.";
 App::$strings["Xchan Lookup"] = "Cerca a xchan";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Cerca a xchan començant per (o webbie)";
-App::$strings["Site Admin"] = "Administració";
-App::$strings["Bug Report"] = "Informe d'Errors";
-App::$strings["View Bookmarks"] = "Veure Marcadors";
-App::$strings["My Chatrooms"] = "Les meves Sales de Xat";
-App::$strings["Firefox Share"] = "Compartir amb Firefox";
-App::$strings["Remote Diagnostics"] = "Diagnòstics Remots";
-App::$strings["Suggest Channels"] = "Suggerir Canals";
-App::$strings["Login"] = "Identifica't";
-App::$strings["Grid"] = "Malla";
-App::$strings["Channel Home"] = "Canal Personal";
-App::$strings["Events"] = "Esdeveniments";
-App::$strings["Directory"] = "Directori";
-App::$strings["Mail"] = "Correu";
-App::$strings["Chat"] = "Xerrar";
-App::$strings["Probe"] = "Sondeig";
-App::$strings["Suggest"] = "Suggeriment";
-App::$strings["Random Channel"] = "Canal Aleatori";
-App::$strings["Invite"] = "Convida";
-App::$strings["Features"] = "Funcionalitats";
-App::$strings["Post"] = "Entrada";
-App::$strings["Purchase"] = "Compra";
 App::$strings["Missing room name"] = "Perdut el nom de la sala";
 App::$strings["Duplicate room name"] = "Nom de la sala duplicat";
 App::$strings["Invalid room specifier."] = "Especificació de la sala invàlida.";
@@ -1474,6 +1516,27 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Per fav
 App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Notificació]";
 App::$strings["created a new post"] = "Creada una nova entrada";
 App::$strings["commented on %s's post"] = "comentat a l'entrada de %s";
+App::$strings["Site Admin"] = "Administració";
+App::$strings["Bug Report"] = "Informe d'Errors";
+App::$strings["View Bookmarks"] = "Veure Marcadors";
+App::$strings["My Chatrooms"] = "Les meves Sales de Xat";
+App::$strings["Firefox Share"] = "Compartir amb Firefox";
+App::$strings["Remote Diagnostics"] = "Diagnòstics Remots";
+App::$strings["Suggest Channels"] = "Suggerir Canals";
+App::$strings["Login"] = "Identifica't";
+App::$strings["Grid"] = "Malla";
+App::$strings["Channel Home"] = "Canal Personal";
+App::$strings["Events"] = "Esdeveniments";
+App::$strings["Directory"] = "Directori";
+App::$strings["Mail"] = "Correu";
+App::$strings["Chat"] = "Xerrar";
+App::$strings["Probe"] = "Sondeig";
+App::$strings["Suggest"] = "Suggeriment";
+App::$strings["Random Channel"] = "Canal Aleatori";
+App::$strings["Invite"] = "Convida";
+App::$strings["Features"] = "Funcionalitats";
+App::$strings["Post"] = "Entrada";
+App::$strings["Purchase"] = "Compra";
 App::$strings["Private Message"] = "Missatge Privat";
 App::$strings["Select"] = "Selecciona";
 App::$strings["Save to Folder"] = "Guardar en la Carpeta";
@@ -1510,7 +1573,7 @@ App::$strings["Expires: %s"] = "Expira: %s";
 App::$strings["Save Bookmarks"] = "Guarda Favorits";
 App::$strings["Add to Calendar"] = "Afegeix al Calendari";
 App::$strings["Mark all seen"] = "Marca tot com ja vist";
-App::$strings["[+] show all"] = "[+] mostra tot";
+App::$strings["%s show all"] = "";
 App::$strings["Bold"] = "Negreta";
 App::$strings["Italic"] = "Italica";
 App::$strings["Underline"] = "Subratllat";
@@ -1519,9 +1582,93 @@ App::$strings["Code"] = "Codi";
 App::$strings["Image"] = "Imatge";
 App::$strings["Insert Link"] = "Insereix Enllaç";
 App::$strings["Video"] = "Video";
+App::$strings["Visible to your default audience"] = "Visible per a la teva audiència ";
+App::$strings["Only me"] = "Només jo";
+App::$strings["Public"] = "Públic";
+App::$strings["Anybody in the \$Projectname network"] = "Ningú a la xarxa \$Projectname";
+App::$strings["Any account on %s"] = "Qualsevol compte a %s";
+App::$strings["Any of my connections"] = "Qualsevol de les meves connexions";
+App::$strings["Only connections I specifically allow"] = "Només les connexions que permeto específicament";
+App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Qualsevol persona autenticada (podria incloure als usuaris d'altres xarxes)";
+App::$strings["Any connections including those who haven't yet been approved"] = "Qualsevol connexió incloent aquells que encara no han estat aprovats";
+App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Aquest és l'ajust per defecte per al públic del seu flux normal i entrades.";
+App::$strings["This is your default setting for who can view your default channel profile"] = "Aquesta és la configuració per defecte per a qui pugui veure el teu perfil per defecte del canal";
+App::$strings["This is your default setting for who can view your connections"] = "Aquesta és la configuració per defecte per a qui pugui veure les teves connexions";
+App::$strings["This is your default setting for who can view your file storage and photos"] = "Aquesta és la configuració per defecte per a qui pugui veure els teus arxius i fotos";
+App::$strings["This is your default setting for the audience of your webpages"] = "Aquests son els ajustos per defecte de l'audiència de les teves pàgines web";
 App::$strings["No username found in import file."] = "No s'ha trobat nom d'usuari a l'arxiu d'importació.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "No s'ha pogut importar el canal perquè l'adreça única de canal no s'ha pogut crear.";
 App::$strings["Cannot locate DNS info for database server '%s'"] = "No s'ha trobat informació de DNS pel servidor de base de dades '%s'";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "La imatge excedeix la mida limit pel lloc web en %lu bytes";
+App::$strings["Image file is empty."] = "El fitxer d'imatge esta buit.";
+App::$strings["Photo storage failed."] = "Fracassà l'emmagatzematge de la Foto";
+App::$strings["a new photo"] = "Una foto nova";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s enviat %2\$s a %3\$s";
+App::$strings["Photo Albums"] = "Albums de Fotos";
+App::$strings["Upload New Photos"] = "Puja Noves Fotos";
+App::$strings["Logout"] = "Desconectar";
+App::$strings["End this session"] = "Finalitza aquesta sessió";
+App::$strings["Home"] = "Inici";
+App::$strings["Your posts and conversations"] = "Les teves entrades i converses";
+App::$strings["Your profile page"] = "La teva pàgina de perfil";
+App::$strings["Manage/Edit profiles"] = "Gestiona/Edita perfils";
+App::$strings["Edit Profile"] = "Edita Perfil";
+App::$strings["Edit your profile"] = "Edita el teu perfil";
+App::$strings["Your photos"] = "Les Teves Fotos";
+App::$strings["Your files"] = "Els teus arxius";
+App::$strings["Your chatrooms"] = "Les teves sales de xerrar";
+App::$strings["Bookmarks"] = "Marcadors";
+App::$strings["Your bookmarks"] = "Els teus marcadors";
+App::$strings["Your webpages"] = "Les teves pàgines web";
+App::$strings["Your wiki"] = "";
+App::$strings["Sign in"] = "Signatura";
+App::$strings["%s - click to logout"] = "%s - click per desconectar";
+App::$strings["Remote authentication"] = "Autenticació remota";
+App::$strings["Click to authenticate to your home hub"] = "Clica per autentificar-te en el teu node";
+App::$strings["Home Page"] = "Pàgina Personal";
+App::$strings["Create an account"] = "Crear un compte";
+App::$strings["Help and documentation"] = "Ajuda i documentació";
+App::$strings["Applications, utilities, links, games"] = "Aplicacions, utilitats, enllaços, jocs";
+App::$strings["Search site @name, #tag, ?docs, content"] = "Cerca pel lloc @name, #tag, ?docs, contingut";
+App::$strings["Channel Directory"] = "Directori de Canals";
+App::$strings["Your grid"] = "La teva malla";
+App::$strings["Mark all grid notifications seen"] = "Marca totes les notificacions de la malla vistes";
+App::$strings["Channel home"] = "Canal personal";
+App::$strings["Mark all channel notifications seen"] = "Marca totes les notificacions de canal vistes";
+App::$strings["Notices"] = "Noticies";
+App::$strings["Notifications"] = "Notificacions";
+App::$strings["See all notifications"] = "Veure totes les Notificacions";
+App::$strings["Private mail"] = "Correu privat";
+App::$strings["See all private messages"] = "Veure tots els missatges privats";
+App::$strings["Mark all private messages seen"] = "Marcar tots els missatges privats vistos";
+App::$strings["Inbox"] = "Safata d'entrada";
+App::$strings["Outbox"] = "Safata de sortida";
+App::$strings["New Message"] = "Nou Missatge";
+App::$strings["Event Calendar"] = "Calendari d'Events";
+App::$strings["See all events"] = "Veure tots els esdeveniments";
+App::$strings["Mark all events seen"] = "Marcar tots els esdeveniments vistos";
+App::$strings["Manage Your Channels"] = "Gestiona els Teus Canals";
+App::$strings["Account/Channel Settings"] = "Ajustos de Compte/Canal";
+App::$strings["Admin"] = "Admin";
+App::$strings["Site Setup and Configuration"] = "Ajustos i Configuració del Lloc";
+App::$strings["Loading..."] = "Carregant...";
+App::$strings["@name, #tag, ?doc, content"] = "@nom, #etiqueta, ?doc, contingut";
+App::$strings["Please wait..."] = "Si us plau, espera.......";
+App::$strings["view full size"] = "Veure a mida competa";
+App::$strings["Administrator"] = "Administrador";
+App::$strings["No Subject"] = "Sense Assumpte";
+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["New Page"] = "Pàgina Nova";
+App::$strings["Title"] = "Títol";
 App::$strings["Categories"] = "Categories";
 App::$strings["Tags"] = "Etiquetes";
 App::$strings["Keywords"] = "Paraules clau";
@@ -1531,34 +1678,196 @@ App::$strings["want"] = "vull";
 App::$strings["wants"] = "vols";
 App::$strings["likes"] = "agrada";
 App::$strings["dislikes"] = "desagrada";
-App::$strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-App::$strings["Starts:"] = "Inicia:";
-App::$strings["Finishes:"] = "Acaba:";
-App::$strings["This event has been added to your calendar."] = "Aquest succés ha estat afegit al teu calendari.";
-App::$strings["Not specified"] = "Sense especificar";
-App::$strings["Needs Action"] = "Necessita una Acció";
-App::$strings["Completed"] = "Completat";
-App::$strings["In Process"] = "En Procès";
-App::$strings["Cancelled"] = "Cancel·lat";
+App::$strings["Unable to obtain identity information from database"] = "Incapaç de trobar l'informació d'identitat a la base de dades";
+App::$strings["Empty name"] = "Nom buit";
+App::$strings["Name too long"] = "Nom massa llarg";
+App::$strings["No account identifier"] = "Sense identificador de compte";
+App::$strings["Nickname is required."] = "Alies/malnom es requerit.";
+App::$strings["Reserved nickname. Please choose another."] = "Àlies reservat. Tria un altre.";
+App::$strings["Nickname has unsupported characters or is already being used on this site."] = "L'álies te caracters no soportats o ja esta en ús en aquest lloc";
+App::$strings["Unable to retrieve created identity"] = "No es pot recuperar la identitat creada";
+App::$strings["Default Profile"] = "Perfil per Defecte";
+App::$strings["Requested channel is not available."] = "El canal demanat no està disponible.";
+App::$strings["Create New Profile"] = "Crear un Perfil Nou";
+App::$strings["Visible to everybody"] = "Visible per tothom";
+App::$strings["Gender:"] = "Gènere:";
+App::$strings["Status:"] = "Estatus:";
+App::$strings["Homepage:"] = "Pàgina Personal:";
+App::$strings["Online Now"] = "Ara en Linia";
+App::$strings["Like this channel"] = "M'agrada aquest canal";
+App::$strings["j F, Y"] = "j F, Y";
+App::$strings["j F"] = "j F";
+App::$strings["Birthday:"] = "Aniversari:";
+App::$strings["for %1\$d %2\$s"] = "per %1\$d %2\$s";
+App::$strings["Sexual Preference:"] = "Preferència Sexual:";
+App::$strings["Tags:"] = "Etiquetes:";
+App::$strings["Political Views:"] = "Idees Polítiques:";
+App::$strings["Religion:"] = "Religió:";
+App::$strings["Hobbies/Interests:"] = "Aficions/Interessos:";
+App::$strings["Likes:"] = "Agrada:";
+App::$strings["Dislikes:"] = "Desagrada:";
+App::$strings["Contact information and Social Networks:"] = "Informació de contacte i Xarxes Socials:";
+App::$strings["My other channels:"] = "Els meus altres canals:";
+App::$strings["Musical interests:"] = "Interessos Musicals:";
+App::$strings["Books, literature:"] = "Llibres, literatura:";
+App::$strings["Television:"] = "Televisió:";
+App::$strings["Film/dance/culture/entertainment:"] = "Películes/Dança/Cultura/Entreteniment:";
+App::$strings["Love/Romance:"] = "Amor/Romace:";
+App::$strings["Work/employment:"] = "Treball/feina:";
+App::$strings["School/education:"] = "Escola/educació:";
+App::$strings["Like this thing"] = "M'agrada això";
+App::$strings["New window"] = "Nova finestra";
+App::$strings["Open the selected location in a different window or browser tab"] = "Obrir la localització seleccionada en un altre finestra o pestanya del navegador";
+App::$strings["User '%s' deleted"] = "usuari '%s' esborrat";
+App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s esta ara connectat amb %2\$s";
+App::$strings["%1\$s poked %2\$s"] = "%1\$s  a esperonat %2\$s";
+App::$strings["poked"] = "esperonat";
+App::$strings["View %s's profile @ %s"] = "Vista %s del perfil @ %s";
+App::$strings["Categories:"] = "Categories:";
+App::$strings["Filed under:"] = "Arxivar a:";
+App::$strings["View in context"] = "Veure en context";
+App::$strings["remove"] = "treu";
+App::$strings["Delete Selected Items"] = "Esborra els Articles Seleccionats";
+App::$strings["View Source"] = "Veure l'Origen";
+App::$strings["Follow Thread"] = "Segueix el Fil";
+App::$strings["Unfollow Thread"] = "Fil Abandonat";
+App::$strings["Activity/Posts"] = "Activitat/Entrades";
+App::$strings["Edit Connection"] = "Modifica la Connexió";
+App::$strings["Message"] = "Missatge";
+App::$strings["%s likes this."] = "%s agrada això.";
+App::$strings["%s doesn't like this."] = "%s no agrada això.";
+App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
+	0 => "<span  %1\$s>%2\$d gent</span> agrada això.",
+	1 => "<span  %1\$s>%2\$d gent</span> agrada això.",
+);
+App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "<span  %1\$s>%2\$d gent</span> no agrada això.",
+	1 => "<span  %1\$s>%2\$d gent</span> no agrada això.",
+);
+App::$strings["and"] = "i";
+App::$strings[", and %d other people"] = array(
+	0 => ", i %d altra gent",
+	1 => ", i %d altra gent",
+);
+App::$strings["%s like this."] = "%s agrada això.";
+App::$strings["%s don't like this."] = "%s no agrada això.";
+App::$strings["Set your location"] = "Ajusta la teva ubicació";
+App::$strings["Clear browser location"] = "Treu la localització del navegador";
+App::$strings["Tag term:"] = "Paraula de l'Etiqueta:";
+App::$strings["Where are you right now?"] = "On ets ara?";
+App::$strings["Page link name"] = "Nom de la pàgina enllaçada";
+App::$strings["Post as"] = "Envia com";
+App::$strings["Toggle voting"] = "Commutar votació";
+App::$strings["Categories (optional, comma-separated list)"] = "Categories (opcional, llista separada per comes)";
+App::$strings["Set publish date"] = "Ajusta la data de publicació";
+App::$strings["Discover"] = "Descobrir";
+App::$strings["Imported public streams"] = "Importar fluxos públics";
+App::$strings["Commented Order"] = "Ordenar per Comentaris";
+App::$strings["Sort by Comment Date"] = "Ordenar per Data del Comentari";
+App::$strings["Posted Order"] = "Ordenar per Entrades";
+App::$strings["Sort by Post Date"] = "Ordenar per Data d' Entrada";
+App::$strings["Posts that mention or involve you"] = "Entrades que et mencionen o involucren";
+App::$strings["Activity Stream - by date"] = "Activitat del Flux - per data";
+App::$strings["Starred"] = "Preferit";
+App::$strings["Favourite Posts"] = "Entrades Favorites";
+App::$strings["Spam"] = "Spam";
+App::$strings["Posts flagged as SPAM"] = "Entrades marcades com a SPAM";
+App::$strings["Status Messages and Posts"] = "Estat dels Missatges i Entrades";
+App::$strings["About"] = "El Meu Perfil";
+App::$strings["Profile Details"] = "Detalls del Perfil";
+App::$strings["Files and Storage"] = "Arxius i Emmagatzegament";
+App::$strings["Chatrooms"] = "Sala per Xerrar";
+App::$strings["Saved Bookmarks"] = "Marcadors Guardats";
+App::$strings["Manage Webpages"] = "Gestió de Pàgines Web";
+App::$strings["__ctx:noun__ Attending"] = array(
+	0 => "Assistint",
+	1 => "Assistint",
+);
+App::$strings["__ctx:noun__ Not Attending"] = array(
+	0 => "Desassistint",
+	1 => "Desassistint",
+);
+App::$strings["__ctx:noun__ Undecided"] = array(
+	0 => "Indecís",
+	1 => "Indecisos",
+);
+App::$strings["__ctx:noun__ Agree"] = array(
+	0 => "Acord",
+	1 => "Acords",
+);
+App::$strings["__ctx:noun__ Disagree"] = array(
+	0 => "Desacord",
+	1 => "Desacords",
+);
+App::$strings["__ctx:noun__ Abstain"] = array(
+	0 => "Abstenirse",
+	1 => "Abstenirse",
+);
 App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "No s'ha pogut importar el canal perquè l'identificador del canal no s'ha pogut duplicar en aquest servidor.";
 App::$strings["Channel clone failed. Import failed."] = "No s'ha pogut importar el canal perquè el canal no s'ha pogut clonar.";
-App::$strings["(Unknown)"] = "(Desconegut)";
-App::$strings["Visible to anybody on the internet."] = "Visible per tothom a la Internet";
-App::$strings["Visible to you only."] = "Visible només per tú.";
-App::$strings["Visible to anybody in this network."] = "Visible per tothom en aquesta xarxa.";
-App::$strings["Visible to anybody authenticated."] = "Visible per tothom autenticat.";
-App::$strings["Visible to anybody on %s."] = "Visible per a tothom a %s.";
-App::$strings["Visible to all connections."] = "Visible per a totes les connexions.";
-App::$strings["Visible to approved connections."] = "Visible per a les connexions aprovades.";
-App::$strings["Visible to specific connections."] = "Visible per a específiques connexions.";
-App::$strings["Privacy group is empty."] = "El grup privat està vuit.";
-App::$strings["Privacy group: %s"] = "Grup privat: %s";
-App::$strings["Connection not found."] = "Connexió no trobada.";
-App::$strings["profile photo"] = "foto del perfil";
-App::$strings["No recipient provided."] = "No s'ha proporcionat bústia.";
-App::$strings["[no subject]"] = "[no subject]";
-App::$strings["Unable to determine sender."] = "incapaç de determinar el remitent";
-App::$strings["Stored post could not be verified."] = "L'entrada guardada no pot ser verificada";
+App::$strings["Frequently"] = "Freqüentment";
+App::$strings["Hourly"] = "Horariament";
+App::$strings["Twice daily"] = "Dos vegades al dia";
+App::$strings["Daily"] = "Diariament";
+App::$strings["Weekly"] = "Setmanalment";
+App::$strings["Monthly"] = "Mensualment";
+App::$strings["Currently Male"] = "Actualment Masculí";
+App::$strings["Currently Female"] = "Actualment Femení";
+App::$strings["Mostly Male"] = "Més aviat Masculí";
+App::$strings["Mostly Female"] = "Més Aviat Femení";
+App::$strings["Transgender"] = "Canvi de Sexe";
+App::$strings["Intersex"] = "Intersexual";
+App::$strings["Transsexual"] = "Transsexual";
+App::$strings["Hermaphrodite"] = "Hermafrodita";
+App::$strings["Neuter"] = "Neutre";
+App::$strings["Non-specific"] = "Indefinit";
+App::$strings["Undecided"] = "Indecís";
+App::$strings["Males"] = "Homes";
+App::$strings["Females"] = "Dones";
+App::$strings["Gay"] = "Gay";
+App::$strings["Lesbian"] = "Lesbianes";
+App::$strings["No Preference"] = "Sense Preferències";
+App::$strings["Bisexual"] = "Bisexual";
+App::$strings["Autosexual"] = "Autosexual";
+App::$strings["Abstinent"] = "Abstinent";
+App::$strings["Virgin"] = "Verge";
+App::$strings["Deviant"] = "Desviat";
+App::$strings["Fetish"] = "Fetixiste";
+App::$strings["Oodles"] = "Orgies";
+App::$strings["Nonsexual"] = "Asexual";
+App::$strings["Single"] = "Solter";
+App::$strings["Lonely"] = "Solitari";
+App::$strings["Available"] = "Disponible";
+App::$strings["Unavailable"] = "No Disponible";
+App::$strings["Has crush"] = "Aplastat";
+App::$strings["Infatuated"] = "Encapritxat";
+App::$strings["Dating"] = "Promés";
+App::$strings["Unfaithful"] = "Infidel";
+App::$strings["Sex Addict"] = "Adicte al Sexe";
+App::$strings["Friends/Benefits"] = "Amics amb Beneficis";
+App::$strings["Casual"] = "Casual";
+App::$strings["Engaged"] = "Ocupat";
+App::$strings["Married"] = "Casat";
+App::$strings["Imaginarily married"] = "Casat Imaginàriament";
+App::$strings["Partners"] = "Parella";
+App::$strings["Cohabiting"] = "Cohabitant";
+App::$strings["Common law"] = "Tradició";
+App::$strings["Happy"] = "Feliç";
+App::$strings["Not looking"] = "No Cerco";
+App::$strings["Swinger"] = "Llibertí";
+App::$strings["Betrayed"] = "Traït";
+App::$strings["Separated"] = "Separat";
+App::$strings["Unstable"] = "Inestable";
+App::$strings["Divorced"] = "Divorciat";
+App::$strings["Imaginarily divorced"] = "Divorciat Imaginàriament";
+App::$strings["Widowed"] = "Vidu/ua";
+App::$strings["Uncertain"] = "Incert";
+App::$strings["It's complicated"] = "Es Complicat";
+App::$strings["Don't care"] = "No Et Fa Res";
+App::$strings["Ask me"] = "Pregunta";
+App::$strings["%1\$s's bookmarks"] = "%1\$s de marcadors";
+App::$strings["guest:"] = "";
+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 formulario de la cadena de seguridad no era correcto. Esto probablemente ocurrió porque el formulario se ha abierto durante demasiado tiempo (> 3 horas) antes de enviarlo.";
 App::$strings["prev"] = "prev";
 App::$strings["first"] = "primer";
 App::$strings["last"] = "últim";
@@ -1568,7 +1877,6 @@ App::$strings["newer"] = "El més nou";
 App::$strings["No connections"] = "Sense Connexions";
 App::$strings["View all %s connections"] = "Veure totes les connexions de %s";
 App::$strings["poke"] = "esperona";
-App::$strings["poked"] = "esperonat";
 App::$strings["ping"] = "coloca";
 App::$strings["pinged"] = "colocat";
 App::$strings["prod"] = "picar";
@@ -1631,385 +1939,21 @@ App::$strings["Select an alternate language"] = "Tria un idioma alternatiu";
 App::$strings["activity"] = "activitat";
 App::$strings["Design Tools"] = "Eines de disseny";
 App::$strings["Pages"] = "Pàgines";
-App::$strings["System"] = "Sistema";
-App::$strings["New App"] = "Nova App";
-App::$strings["Suggestions"] = "Suggerencies";
-App::$strings["See more..."] = "Veure més.....";
-App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Tens %1$.0f de %2$.0f connexions permeses.";
-App::$strings["Add New Connection"] = "Afegeix una Nova Connexió";
-App::$strings["Enter channel address"] = "Introdueix l'adreça del canal";
-App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Exemples: bob@example.com, https://exemple.com/barbara";
-App::$strings["Notes"] = "Notes";
-App::$strings["Remove term"] = "Plaç de remoció";
-App::$strings["Saved Searches"] = "Cerques Guardades";
-App::$strings["add"] = "afegeix";
-App::$strings["Saved Folders"] = "Carpetes Guardades";
-App::$strings["Everything"] = "Tot";
-App::$strings["Archives"] = "Arxius";
-App::$strings["Refresh"] = "Refresc";
-App::$strings["Account settings"] = "Ajustos de Compte";
-App::$strings["Channel settings"] = "Ajustos de Canal";
-App::$strings["Additional features"] = "Característiques addicionals";
-App::$strings["Feature/Addon settings"] = "Ajustos de Complements";
-App::$strings["Display settings"] = "Ajustos de pantalla";
-App::$strings["Manage locations"] = "Gestiona ubicacions";
-App::$strings["Export channel"] = "Exportat canal";
-App::$strings["Connected apps"] = "Apps connectades";
-App::$strings["Premium Channel Settings"] = "Ajustos Premium de Canal";
-App::$strings["Private Mail Menu"] = "Menú de Correu Privat";
-App::$strings["Combined View"] = "Vista Combinada";
-App::$strings["Inbox"] = "Safata d'entrada";
-App::$strings["Outbox"] = "Safata de sortida";
-App::$strings["New Message"] = "Nou Missatge";
-App::$strings["Conversations"] = "Conversacions";
-App::$strings["Received Messages"] = "Missatges Rebuts";
-App::$strings["Sent Messages"] = "Missatges Enviats";
-App::$strings["No messages."] = "Sense missatges.";
-App::$strings["Delete conversation"] = "Conversació esborrada";
-App::$strings["Events Menu"] = "Menú d'Esdeveniments";
-App::$strings["Day View"] = "Vista de Dia";
-App::$strings["Week View"] = "Vista de Setmana";
-App::$strings["Month View"] = "Vista de Mes";
-App::$strings["Events Tools"] = "Eina d'Esdeveniments";
-App::$strings["Export Calendar"] = "Exportar Calendari";
-App::$strings["Import Calendar"] = "Importar Calendari";
-App::$strings["Chatrooms"] = "Sala per Xerrar";
-App::$strings["Overview"] = "Visió General";
-App::$strings["Chat Members"] = "Membres de la Sala de Xat";
-App::$strings["Bookmarked Chatrooms"] = "Sales de Xat Favorites";
-App::$strings["Suggested Chatrooms"] = "Sales de Xat Suggerides";
-App::$strings["photo/image"] = "foto/imatge";
-App::$strings["Click to show more"] = "Fes clic per veure més";
-App::$strings["Rating Tools"] = "Eines de Valoració";
-App::$strings["Rate Me"] = "Valora'm";
-App::$strings["View Ratings"] = "Veure Valoracions";
-App::$strings["Forums"] = "Forums";
-App::$strings["Tasks"] = "Tasques";
-App::$strings["Documentation"] = "Documentació";
-App::$strings["Project/Site Information"] = "Informació del Projecte/Lloc";
-App::$strings["For Members"] = "Per Membres";
-App::$strings["For Administrators"] = "Per Administradors";
-App::$strings["For Developers"] = "Per Desenvolupadors";
-App::$strings["Member registrations waiting for confirmation"] = "Una inscripció per a ser membre està esperant confirmació";
-App::$strings["Inspect queue"] = "Revisa cua";
-App::$strings["DB updates"] = "Actualitzacions de Base de Dades";
-App::$strings["Admin"] = "Admin";
-App::$strings["Plugin Features"] = "Característiques del Plugin";
-App::$strings["Channel is blocked on this site."] = "El canal està bloquejat en aquest lloc.";
-App::$strings["Channel location missing."] = "Ubicació del canal perduda.";
-App::$strings["Response from remote channel was incomplete."] = "La resposta del canal remot fou incompleta.";
-App::$strings["Channel was deleted and no longer exists."] = "El canal fou esborrat i actualment no existeix.";
-App::$strings["Protocol disabled."] = "Protocol desactivat.";
-App::$strings["Channel discovery failed."] = "Descobriment de canal fallit.";
-App::$strings["Cannot connect to yourself."] = "No pots connectar amb tu mateix.";
-App::$strings["%1\$s's bookmarks"] = "%1\$s de marcadors";
-App::$strings["Public Timeline"] = "Línia de Temps Pública";
-App::$strings["Image/photo"] = "Imatge/foto";
-App::$strings["Encrypted content"] = "Contingut encriptat";
-App::$strings["Install %s element: "] = "Instal·la l'element %s:";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Aquesta entrada contè un element %s instal·lable, potser manques de permissos per instal·lar-lo en aquest lloc.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s va escriure el següent %2\$s %3\$s";
-App::$strings["Click to open/close"] = "Clic per obrir/tancar";
-App::$strings["spoiler"] = "xafa guitarres";
-App::$strings["Different viewers will see this text differently"] = "Diferents observadors veuran aquest text de diferents formes";
-App::$strings["$1 wrote:"] = "$1 va escriure:";
-App::$strings["Directory Options"] = "Opcions de Directori";
-App::$strings["Safe Mode"] = "Manera Segura";
-App::$strings["Public Forums Only"] = "Només Fòrums Públics";
-App::$strings["This Website Only"] = "Només Aquest Lloc Web";
-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 formulario de la cadena de seguridad no era correcto. Esto probablemente ocurrió porque el formulario se ha abierto durante demasiado tiempo (> 3 horas) antes de enviarlo.";
-App::$strings["Logout"] = "Desconectar";
-App::$strings["End this session"] = "Finalitza aquesta sessió";
-App::$strings["Home"] = "Inici";
-App::$strings["Your posts and conversations"] = "Les teves entrades i converses";
-App::$strings["Your profile page"] = "La teva pàgina de perfil";
-App::$strings["Manage/Edit profiles"] = "Gestiona/Edita perfils";
-App::$strings["Edit Profile"] = "Edita Perfil";
-App::$strings["Edit your profile"] = "Edita el teu perfil";
-App::$strings["Your photos"] = "Les Teves Fotos";
-App::$strings["Your files"] = "Els teus arxius";
-App::$strings["Your chatrooms"] = "Les teves sales de xerrar";
-App::$strings["Bookmarks"] = "Marcadors";
-App::$strings["Your bookmarks"] = "Els teus marcadors";
-App::$strings["Your webpages"] = "Les teves pàgines web";
-App::$strings["Sign in"] = "Signatura";
-App::$strings["%s - click to logout"] = "%s - click per desconectar";
-App::$strings["Remote authentication"] = "Autenticació remota";
-App::$strings["Click to authenticate to your home hub"] = "Clica per autentificar-te en el teu node";
-App::$strings["Home Page"] = "Pàgina Personal";
-App::$strings["Create an account"] = "Crear un compte";
-App::$strings["Help and documentation"] = "Ajuda i documentació";
-App::$strings["Applications, utilities, links, games"] = "Aplicacions, utilitats, enllaços, jocs";
-App::$strings["Search site @name, #tag, ?docs, content"] = "Cerca pel lloc @name, #tag, ?docs, contingut";
-App::$strings["Channel Directory"] = "Directori de Canals";
-App::$strings["Your grid"] = "La teva malla";
-App::$strings["Mark all grid notifications seen"] = "Marca totes les notificacions de la malla vistes";
-App::$strings["Channel home"] = "Canal personal";
-App::$strings["Mark all channel notifications seen"] = "Marca totes les notificacions de canal vistes";
-App::$strings["Notices"] = "Noticies";
-App::$strings["Notifications"] = "Notificacions";
-App::$strings["See all notifications"] = "Veure totes les Notificacions";
-App::$strings["Private mail"] = "Correu privat";
-App::$strings["See all private messages"] = "Veure tots els missatges privats";
-App::$strings["Mark all private messages seen"] = "Marcar tots els missatges privats vistos";
-App::$strings["Event Calendar"] = "Calendari d'Events";
-App::$strings["See all events"] = "Veure tots els esdeveniments";
-App::$strings["Mark all events seen"] = "Marcar tots els esdeveniments vistos";
-App::$strings["Manage Your Channels"] = "Gestiona els Teus Canals";
-App::$strings["Account/Channel Settings"] = "Ajustos de Compte/Canal";
-App::$strings["Site Setup and Configuration"] = "Ajustos i Configuració del Lloc";
-App::$strings["Loading..."] = "Carregant...";
-App::$strings["@name, #tag, ?doc, content"] = "@nom, #etiqueta, ?doc, contingut";
-App::$strings["Please wait..."] = "Si us plau, espera.......";
-App::$strings["New window"] = "Nova finestra";
-App::$strings["Open the selected location in a different window or browser tab"] = "Obrir la localització seleccionada en un altre finestra o pestanya del navegador";
-App::$strings["User '%s' deleted"] = "usuari '%s' esborrat";
-App::$strings["%d invitation available"] = array(
-	0 => "%d invitació disponible",
-	1 => "%d invitacions disponibles",
-);
-App::$strings["Find Channels"] = "Troba Canals";
-App::$strings["Enter name or interest"] = "Entra un nom o interes";
-App::$strings["Connect/Follow"] = "Conecta/Segueix";
-App::$strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Lionel Messi, Futbolista";
-App::$strings["Random Profile"] = "Perfil Aleatori";
-App::$strings["Invite Friends"] = "Convida Amics";
-App::$strings["Advanced example: name=fred and country=iceland"] = "Exemple avançat: nom=pep i pais=eire";
-App::$strings["%d connection in common"] = array(
-	0 => "%d connexió en comú",
-	1 => "%d connexions en comú",
-);
-App::$strings["show more"] = "mostrar més";
-App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s esta ara connectat amb %2\$s";
-App::$strings["%1\$s poked %2\$s"] = "%1\$s  a esperonat %2\$s";
-App::$strings["View %s's profile @ %s"] = "Vista %s del perfil @ %s";
-App::$strings["Categories:"] = "Categories:";
-App::$strings["Filed under:"] = "Arxivar a:";
-App::$strings["View in context"] = "Veure en context";
-App::$strings["remove"] = "treu";
-App::$strings["Delete Selected Items"] = "Esborra els Articles Seleccionats";
-App::$strings["View Source"] = "Veure l'Origen";
-App::$strings["Follow Thread"] = "Segueix el Fil";
-App::$strings["Unfollow Thread"] = "Fil Abandonat";
-App::$strings["Activity/Posts"] = "Activitat/Entrades";
-App::$strings["Edit Connection"] = "Modifica la Connexió";
-App::$strings["Message"] = "Missatge";
-App::$strings["%s likes this."] = "%s agrada això.";
-App::$strings["%s doesn't like this."] = "%s no agrada això.";
-App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
-	0 => "<span  %1\$s>%2\$d gent</span> agrada això.",
-	1 => "<span  %1\$s>%2\$d gent</span> agrada això.",
-);
-App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
-	0 => "<span  %1\$s>%2\$d gent</span> no agrada això.",
-	1 => "<span  %1\$s>%2\$d gent</span> no agrada això.",
-);
-App::$strings["and"] = "i";
-App::$strings[", and %d other people"] = array(
-	0 => ", i %d altra gent",
-	1 => ", i %d altra gent",
-);
-App::$strings["%s like this."] = "%s agrada això.";
-App::$strings["%s don't like this."] = "%s no agrada això.";
-App::$strings["Set your location"] = "Ajusta la teva ubicació";
-App::$strings["Clear browser location"] = "Treu la localització del navegador";
-App::$strings["Tag term:"] = "Paraula de l'Etiqueta:";
-App::$strings["Where are you right now?"] = "On ets ara?";
-App::$strings["Page link name"] = "Nom de la pàgina enllaçada";
-App::$strings["Post as"] = "Envia com";
-App::$strings["Toggle voting"] = "Commutar votació";
-App::$strings["Categories (optional, comma-separated list)"] = "Categories (opcional, llista separada per comes)";
-App::$strings["Set publish date"] = "Ajusta la data de publicació";
-App::$strings["OK"] = "OK";
-App::$strings["Discover"] = "Descobrir";
-App::$strings["Imported public streams"] = "Importar fluxos públics";
-App::$strings["Commented Order"] = "Ordenar per Comentaris";
-App::$strings["Sort by Comment Date"] = "Ordenar per Data del Comentari";
-App::$strings["Posted Order"] = "Ordenar per Entrades";
-App::$strings["Sort by Post Date"] = "Ordenar per Data d' Entrada";
-App::$strings["Posts that mention or involve you"] = "Entrades que et mencionen o involucren";
-App::$strings["Activity Stream - by date"] = "Activitat del Flux - per data";
-App::$strings["Starred"] = "Preferit";
-App::$strings["Favourite Posts"] = "Entrades Favorites";
-App::$strings["Spam"] = "Spam";
-App::$strings["Posts flagged as SPAM"] = "Entrades marcades com a SPAM";
-App::$strings["Status Messages and Posts"] = "Estat dels Missatges i Entrades";
-App::$strings["About"] = "El Meu Perfil";
-App::$strings["Profile Details"] = "Detalls del Perfil";
-App::$strings["Photo Albums"] = "Albums de Fotos";
-App::$strings["Files and Storage"] = "Arxius i Emmagatzegament";
-App::$strings["Saved Bookmarks"] = "Marcadors Guardats";
-App::$strings["Manage Webpages"] = "Gestió de Pàgines Web";
-App::$strings["__ctx:noun__ Attending"] = array(
-	0 => "Assistint",
-	1 => "Assistint",
-);
-App::$strings["__ctx:noun__ Not Attending"] = array(
-	0 => "Desassistint",
-	1 => "Desassistint",
-);
-App::$strings["__ctx:noun__ Undecided"] = array(
-	0 => "Indecís",
-	1 => "Indecisos",
-);
-App::$strings["__ctx:noun__ Agree"] = array(
-	0 => "Acord",
-	1 => "Acords",
-);
-App::$strings["__ctx:noun__ Disagree"] = array(
-	0 => "Desacord",
-	1 => "Desacords",
-);
-App::$strings["__ctx:noun__ Abstain"] = array(
-	0 => "Abstenirse",
-	1 => "Abstenirse",
-);
-App::$strings["Frequently"] = "Freqüentment";
-App::$strings["Hourly"] = "Horariament";
-App::$strings["Twice daily"] = "Dos vegades al dia";
-App::$strings["Daily"] = "Diariament";
-App::$strings["Weekly"] = "Setmanalment";
-App::$strings["Monthly"] = "Mensualment";
-App::$strings["Currently Male"] = "Actualment Masculí";
-App::$strings["Currently Female"] = "Actualment Femení";
-App::$strings["Mostly Male"] = "Més aviat Masculí";
-App::$strings["Mostly Female"] = "Més Aviat Femení";
-App::$strings["Transgender"] = "Canvi de Sexe";
-App::$strings["Intersex"] = "Intersexual";
-App::$strings["Transsexual"] = "Transsexual";
-App::$strings["Hermaphrodite"] = "Hermafrodita";
-App::$strings["Neuter"] = "Neutre";
-App::$strings["Non-specific"] = "Indefinit";
-App::$strings["Other"] = "Altres";
-App::$strings["Undecided"] = "Indecís";
-App::$strings["Males"] = "Homes";
-App::$strings["Females"] = "Dones";
-App::$strings["Gay"] = "Gay";
-App::$strings["Lesbian"] = "Lesbianes";
-App::$strings["No Preference"] = "Sense Preferències";
-App::$strings["Bisexual"] = "Bisexual";
-App::$strings["Autosexual"] = "Autosexual";
-App::$strings["Abstinent"] = "Abstinent";
-App::$strings["Virgin"] = "Verge";
-App::$strings["Deviant"] = "Desviat";
-App::$strings["Fetish"] = "Fetixiste";
-App::$strings["Oodles"] = "Orgies";
-App::$strings["Nonsexual"] = "Asexual";
-App::$strings["Single"] = "Solter";
-App::$strings["Lonely"] = "Solitari";
-App::$strings["Available"] = "Disponible";
-App::$strings["Unavailable"] = "No Disponible";
-App::$strings["Has crush"] = "Aplastat";
-App::$strings["Infatuated"] = "Encapritxat";
-App::$strings["Dating"] = "Promés";
-App::$strings["Unfaithful"] = "Infidel";
-App::$strings["Sex Addict"] = "Adicte al Sexe";
-App::$strings["Friends/Benefits"] = "Amics amb Beneficis";
-App::$strings["Casual"] = "Casual";
-App::$strings["Engaged"] = "Ocupat";
-App::$strings["Married"] = "Casat";
-App::$strings["Imaginarily married"] = "Casat Imaginàriament";
-App::$strings["Partners"] = "Parella";
-App::$strings["Cohabiting"] = "Cohabitant";
-App::$strings["Common law"] = "Tradició";
-App::$strings["Happy"] = "Feliç";
-App::$strings["Not looking"] = "No Cerco";
-App::$strings["Swinger"] = "Llibertí";
-App::$strings["Betrayed"] = "Traït";
-App::$strings["Separated"] = "Separat";
-App::$strings["Unstable"] = "Inestable";
-App::$strings["Divorced"] = "Divorciat";
-App::$strings["Imaginarily divorced"] = "Divorciat Imaginàriament";
-App::$strings["Widowed"] = "Vidu/ua";
-App::$strings["Uncertain"] = "Incert";
-App::$strings["It's complicated"] = "Es Complicat";
-App::$strings["Don't care"] = "No Et Fa Res";
-App::$strings["Ask me"] = "Pregunta";
-App::$strings["Visible to your default audience"] = "Visible per a la teva audiència ";
-App::$strings["Only me"] = "Només jo";
-App::$strings["Public"] = "Públic";
-App::$strings["Anybody in the \$Projectname network"] = "Ningú a la xarxa \$Projectname";
-App::$strings["Any account on %s"] = "Qualsevol compte a %s";
-App::$strings["Any of my connections"] = "Qualsevol de les meves connexions";
-App::$strings["Only connections I specifically allow"] = "Només les connexions que permeto específicament";
-App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Qualsevol persona autenticada (podria incloure als usuaris d'altres xarxes)";
-App::$strings["Any connections including those who haven't yet been approved"] = "Qualsevol connexió incloent aquells que encara no han estat aprovats";
-App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Aquest és l'ajust per defecte per al públic del seu flux normal i entrades.";
-App::$strings["This is your default setting for who can view your default channel profile"] = "Aquesta és la configuració per defecte per a qui pugui veure el teu perfil per defecte del canal";
-App::$strings["This is your default setting for who can view your connections"] = "Aquesta és la configuració per defecte per a qui pugui veure les teves connexions";
-App::$strings["This is your default setting for who can view your file storage and photos"] = "Aquesta és la configuració per defecte per a qui pugui veure els teus arxius i fotos";
-App::$strings["This is your default setting for the audience of your webpages"] = "Aquests son els ajustos per defecte de l'audiència de les teves pàgines web";
-App::$strings["Not a valid email address"] = "Adreça de correu electrònic no vàlida";
-App::$strings["Your email domain is not among those allowed on this site"] = "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc";
-App::$strings["Your email address is already registered at this site."] = "La teva adreça de correu electrònic ja esta registrada en aquest lloc";
-App::$strings["An invitation is required."] = "Es requereix Invitació";
-App::$strings["Invitation could not be verified."] = "L'invitació no ha pogut ser verificada";
-App::$strings["Please enter the required information."] = "Entra la informació sol·licitada";
-App::$strings["Failed to store account information."] = "Ha fallat guardar la informació del compte";
-App::$strings["Registration confirmation for %s"] = "Registre confirmat per  %s";
-App::$strings["Registration request at %s"] = "Sol·licitud de registre a %s";
-App::$strings["Administrator"] = "Administrador";
-App::$strings["your registration password"] = "la teva contrasenya registrada";
-App::$strings["Registration details for %s"] = "Detalls del registre per %s";
-App::$strings["Account approved."] = "Compte aprovat.";
-App::$strings["Registration revoked for %s"] = "Registre revocat per %s";
-App::$strings["Account verified. Please login."] = "Compte verificat. Si us plau, inicia sessió.";
-App::$strings["Click here to upgrade."] = "Feu clic aquí per actualitzar.";
-App::$strings["This action exceeds the limits set by your subscription plan."] = "Aquesta acció és superior als límits establerts pel seu pla de subscripció.";
-App::$strings["This action is not available under your subscription plan."] = "Aquesta acció no està disponible en el seu pla de subscripció.";
-App::$strings["Item was not found."] = "Article no trobat.";
-App::$strings["No source file."] = "No hi ha arxiu d'origen.";
-App::$strings["Cannot locate file to replace"] = "No trobo l'arxiu a reemplaçar";
-App::$strings["Cannot locate file to revise/update"] = "No trobo l'arxiu a revisar/actualitzar";
-App::$strings["File exceeds size limit of %d"] = "L'arxiu excedeix la mida limit de %d";
-App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Has arribat al teu límit de %1$.0f Mbytes de emagatzematge d'adjunts.";
-App::$strings["File upload failed. Possible system limit or action terminated."] = "Pujada del arxiu fallida. Possible límit del sistema o acció interrompuda.";
-App::$strings["Stored file could not be verified. Upload failed."] = "L'arxiu guardat no es pot verificar. Pujada fallida.";
-App::$strings["Path not available."] = "Trajectòria no disponible";
-App::$strings["Empty pathname"] = "Trajèctoria vuida.";
-App::$strings["duplicate filename or path"] = "Nom o trajectòria duplicat";
-App::$strings["Path not found."] = "Trajectòria no trobada.";
-App::$strings["mkdir failed."] = "mkdir va fracassar.";
-App::$strings["database storage failed."] = "Arxiu de base de dades va fallar.";
-App::$strings["Empty path"] = "Trajèctoria vuida";
-App::$strings["Unable to obtain identity information from database"] = "Incapaç de trobar l'informació d'identitat a la base de dades";
-App::$strings["Empty name"] = "Nom buit";
-App::$strings["Name too long"] = "Nom massa llarg";
-App::$strings["No account identifier"] = "Sense identificador de compte";
-App::$strings["Nickname is required."] = "Alies/malnom es requerit.";
-App::$strings["Reserved nickname. Please choose another."] = "Àlies reservat. Tria un altre.";
-App::$strings["Nickname has unsupported characters or is already being used on this site."] = "L'álies te caracters no soportats o ja esta en ús en aquest lloc";
-App::$strings["Unable to retrieve created identity"] = "No es pot recuperar la identitat creada";
-App::$strings["Default Profile"] = "Perfil per Defecte";
-App::$strings["Requested channel is not available."] = "El canal demanat no està disponible.";
-App::$strings["Create New Profile"] = "Crear un Perfil Nou";
-App::$strings["Visible to everybody"] = "Visible per tothom";
-App::$strings["Gender:"] = "Gènere:";
-App::$strings["Status:"] = "Estatus:";
-App::$strings["Homepage:"] = "Pàgina Personal:";
-App::$strings["Online Now"] = "Ara en Linia";
-App::$strings["Like this channel"] = "M'agrada aquest canal";
-App::$strings["j F, Y"] = "j F, Y";
-App::$strings["j F"] = "j F";
-App::$strings["Birthday:"] = "Aniversari:";
-App::$strings["for %1\$d %2\$s"] = "per %1\$d %2\$s";
-App::$strings["Sexual Preference:"] = "Preferència Sexual:";
-App::$strings["Tags:"] = "Etiquetes:";
-App::$strings["Political Views:"] = "Idees Polítiques:";
-App::$strings["Religion:"] = "Religió:";
-App::$strings["Hobbies/Interests:"] = "Aficions/Interessos:";
-App::$strings["Likes:"] = "Agrada:";
-App::$strings["Dislikes:"] = "Desagrada:";
-App::$strings["Contact information and Social Networks:"] = "Informació de contacte i Xarxes Socials:";
-App::$strings["My other channels:"] = "Els meus altres canals:";
-App::$strings["Musical interests:"] = "Interessos Musicals:";
-App::$strings["Books, literature:"] = "Llibres, literatura:";
-App::$strings["Television:"] = "Televisió:";
-App::$strings["Film/dance/culture/entertainment:"] = "Películes/Dança/Cultura/Entreteniment:";
-App::$strings["Love/Romance:"] = "Amor/Romace:";
-App::$strings["Work/employment:"] = "Treball/feina:";
-App::$strings["School/education:"] = "Escola/educació:";
-App::$strings["Like this thing"] = "M'agrada això";
+App::$strings["Logged out."] = "Sortir.";
+App::$strings["Failed authentication"] = "Autenticació fallida";
+App::$strings["Can view my normal stream and posts"] = "Pot veure el flux i entrades normals";
+App::$strings["Can view my webpages"] = "Pot veure les meves pàgines web";
+App::$strings["Can post on my channel page (\"wall\")"] = "Pot fer entrades a la meva pàgina de canal (\"mur\")";
+App::$strings["Can like/dislike stuff"] = "Pot dir si agrada/desagrada ";
+App::$strings["Profiles and things other than posts/comments"] = "Perfils i altres coses a més d'entrades/comentaris";
+App::$strings["Can forward to all my channel contacts via post @mentions"] = "Ho pot enviar a tots els meus contactes del canal via entrades @mencions";
+App::$strings["Advanced - useful for creating group forum channels"] = "Avançat - capaç de crear canals de grups de foro";
+App::$strings["Can chat with me (when available)"] = "Pot xatejar amb mi (si estic disponible)";
+App::$strings["Can write to my file storage and photos"] = "Pot escriure al meu magatzem d'arxius i fotos";
+App::$strings["Can edit my webpages"] = "Pot editar les meves pàgines web";
+App::$strings["Somewhat advanced - very useful in open communities"] = "Quelcom avançat - molt útil en comunitats obertes";
+App::$strings["Can administer my channel resources"] = "Pot administrar els meus recursos del canal";
+App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Extremadament avançat. No toquis res si no saps que estàs fent";
 App::$strings["General Features"] = "Característiques Generals";
 App::$strings["Content Expiration"] = "Expiració del Contingut";
 App::$strings["Remove posts/comments and/or private messages at a future time"] = "eliminarà entrades/comentaris i/o missatges privats en un període determinat de temps.";
@@ -2021,6 +1965,7 @@ App::$strings["Profile Import/Export"] = "Importar/Exportar Perfil";
 App::$strings["Save and load profile details across sites/channels"] = "Guarda i carrega els detalls del perfil al llarg dels llocs/canals";
 App::$strings["Web Pages"] = "Pàgines Web";
 App::$strings["Provide managed web pages on your channel"] = "Proporcionar pàgines web gestionades al seu canal";
+App::$strings["Provide a wiki for your channel"] = "";
 App::$strings["Hide Rating"] = "Amaga la Valoració";
 App::$strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Amaga el botó de valoracions al teu canal i pàgines del perfil. Nota: Et poden continuar valorant en altres llocs.";
 App::$strings["Private Notes"] = "Notes Privades";
@@ -2054,6 +1999,7 @@ App::$strings["Search by Date"] = "Cerca per Data";
 App::$strings["Ability to select posts by date ranges"] = "Capacitat per seleccionar entrades per rang de dates";
 App::$strings["Privacy Groups"] = "Grup Privat";
 App::$strings["Enable management and selection of privacy groups"] = "Habilita gestió i selecció de grups privats";
+App::$strings["Saved Searches"] = "Cerques Guardades";
 App::$strings["Save search terms for re-use"] = "Guardar els termin de la cerca per a re-usar";
 App::$strings["Network Personal Tab"] = "Pestanya Personal de Xarxa";
 App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Activa la pestanya per mostrar només les entrades de xarxa en les que has intervingut";
@@ -2069,8 +2015,9 @@ App::$strings["Community Tagging"] = "Etiquetat per la Comunitat";
 App::$strings["Ability to tag existing posts"] = "Capacitat d'etiquetar entrades existents";
 App::$strings["Post Categories"] = "Categories d'Entrades";
 App::$strings["Add categories to your posts"] = "Afegeix categoria a la teva entrada";
-App::$strings["Emoji Reactions"] = "";
-App::$strings["Add emoji reaction ability to posts"] = "";
+App::$strings["Emoji Reactions"] = "Reaccions dels Emoji";
+App::$strings["Add emoji reaction ability to posts"] = "Afegeix un emoji habilitat per reaccionar a entrades";
+App::$strings["Saved Folders"] = "Carpetes Guardades";
 App::$strings["Ability to file posts under folders"] = "Capacitat de arxivar entrades en les carpetes";
 App::$strings["Dislike Posts"] = "No Agrada l'Entrada";
 App::$strings["Ability to dislike posts/comments"] = "Capacitat per marcar amb \"No Agrada\" les entrades/comentaris";
@@ -2078,63 +2025,149 @@ App::$strings["Star Posts"] = "Entrades Excel·lents";
 App::$strings["Ability to mark special posts with a star indicator"] = "Capacitat per marcar entrades especials amb l'indicador d'excel·lencia";
 App::$strings["Tag Cloud"] = "Núvol d'Etiquetes.";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Proporcionar un núvol d'etiquetes personals a la teva pàgina de canal";
-App::$strings["Embedded content"] = "Contingut embegut";
-App::$strings["Embedding disabled"] = "Incorporació desactivada";
-App::$strings["Who can see this?"] = "Qui pot veure això?";
-App::$strings["Custom selection"] = "Selecció a mida";
-App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Selecciona \"Mostrar\" per permetre la visualització. \"No Mostrar\" et permet obviar i limitar l'abast de \"Mostrar\".";
-App::$strings["Show"] = "Mostra";
-App::$strings["Don't show"] = "No mostrar";
-App::$strings["Other networks and post services"] = "Altres xarxes i serveis de correu";
-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."] = "Els permisos d'entrada %s no poden esser canviats %s posteriorment a que una entrada ja està compartida. </br />Aquest ajust dels permisos indica qui pot veure l'entrada.";
-App::$strings["Logged out."] = "Sortir.";
-App::$strings["Failed authentication"] = "Autenticació fallida";
-App::$strings["Birthday"] = "Aniversari";
-App::$strings["Age: "] = "Edat:";
-App::$strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD o MM-DD";
-App::$strings["never"] = "mai";
-App::$strings["less than a second ago"] = "fa menys d'un segon";
-App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "Fa %1\$d %2\$s";
-App::$strings["__ctx:relative_date__ year"] = array(
-	0 => "any",
-	1 => "anys",
-);
-App::$strings["__ctx:relative_date__ month"] = array(
-	0 => "mes",
-	1 => "mesos ",
-);
-App::$strings["__ctx:relative_date__ week"] = array(
-	0 => "setmana",
-	1 => "setmanes",
-);
-App::$strings["__ctx:relative_date__ day"] = array(
-	0 => "dia",
-	1 => "dies",
-);
-App::$strings["__ctx:relative_date__ hour"] = array(
-	0 => "hora",
-	1 => "hores",
-);
-App::$strings["__ctx:relative_date__ minute"] = array(
-	0 => "minut",
-	1 => "minuts",
-);
-App::$strings["__ctx:relative_date__ second"] = array(
-	0 => "segon",
-	1 => "segons",
-);
-App::$strings["%1\$s's birthday"] = "Aniversari de %1\$s";
-App::$strings["Happy Birthday %1\$s"] = "Feliç Aniversari %1\$s";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grup esborrat amb aquest nom fou reviscolat. Els permisos dels items existents <strong>poden</strong> aplicar-se a aquest grup i qualsevol membre futur. Si no es això el que vols, si et plau, crea un altre grup amb un nom diferent.";
 App::$strings["Add new connections to this privacy group"] = "Afegir noves connexions a aquest grup privat";
 App::$strings["edit"] = "edita";
 App::$strings["Edit group"] = "Editar grup";
 App::$strings["Add privacy group"] = "Afegir grup privat";
 App::$strings["Channels not in any privacy group"] = "Sense canals en grups privats";
+App::$strings["add"] = "afegeix";
+App::$strings["l F d, Y \\@ g:i A"] = "l d \\d\\e/\\d' F de Y \\@ H:i T";
+App::$strings["Starts:"] = "Inicia:";
+App::$strings["Finishes:"] = "Acaba:";
+App::$strings["This event has been added to your calendar."] = "Aquest succés ha estat afegit al teu calendari.";
+App::$strings["Not specified"] = "Sense especificar";
+App::$strings["Needs Action"] = "Necessita una Acció";
+App::$strings["Completed"] = "Completat";
+App::$strings["In Process"] = "En Procès";
+App::$strings["Cancelled"] = "Cancel·lat";
+App::$strings["Not a valid email address"] = "Adreça de correu electrònic no vàlida";
+App::$strings["Your email domain is not among those allowed on this site"] = "El seu domini de correu electrònic no es troba entre els permesos en aquest lloc";
+App::$strings["Your email address is already registered at this site."] = "La teva adreça de correu electrònic ja esta registrada en aquest lloc";
+App::$strings["An invitation is required."] = "Es requereix Invitació";
+App::$strings["Invitation could not be verified."] = "L'invitació no ha pogut ser verificada";
+App::$strings["Please enter the required information."] = "Entra la informació sol·licitada";
+App::$strings["Failed to store account information."] = "Ha fallat guardar la informació del compte";
+App::$strings["Registration confirmation for %s"] = "Inscripció confirmada per  %s";
+App::$strings["Registration request at %s"] = "Sol·licitud d'inscripció a %s";
+App::$strings["your registration password"] = "la teva contrasenya registrada";
+App::$strings["Registration details for %s"] = "Detalls de l'inscripció per %s";
+App::$strings["Account approved."] = "Compte aprovat.";
+App::$strings["Registration revoked for %s"] = "Inscripció revocada per %s";
+App::$strings["Click here to upgrade."] = "Feu clic aquí per actualitzar.";
+App::$strings["This action exceeds the limits set by your subscription plan."] = "Aquesta acció és superior als límits establerts pel seu pla de subscripció.";
+App::$strings["This action is not available under your subscription plan."] = "Aquesta acció no està disponible en el seu pla de subscripció.";
+App::$strings["Channel is blocked on this site."] = "El canal està bloquejat en aquest lloc.";
+App::$strings["Channel location missing."] = "Ubicació del canal perduda.";
+App::$strings["Response from remote channel was incomplete."] = "La resposta del canal remot fou incompleta.";
+App::$strings["Channel was deleted and no longer exists."] = "El canal fou esborrat i actualment no existeix.";
+App::$strings["Protocol disabled."] = "Protocol desactivat.";
+App::$strings["Channel discovery failed."] = "Descobriment de canal fallit.";
+App::$strings["Cannot connect to yourself."] = "No pots connectar amb tu mateix.";
+App::$strings["Item was not found."] = "Article no trobat.";
+App::$strings["No source file."] = "No hi ha arxiu d'origen.";
+App::$strings["Cannot locate file to replace"] = "No trobo l'arxiu a reemplaçar";
+App::$strings["Cannot locate file to revise/update"] = "No trobo l'arxiu a revisar/actualitzar";
+App::$strings["File exceeds size limit of %d"] = "L'arxiu excedeix la mida limit de %d";
+App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Has arribat al teu límit de %1$.0f Mbytes de emagatzematge d'adjunts.";
+App::$strings["File upload failed. Possible system limit or action terminated."] = "Pujada del arxiu fallida. Possible límit del sistema o acció interrompuda.";
+App::$strings["Stored file could not be verified. Upload failed."] = "L'arxiu guardat no es pot verificar. Pujada fallida.";
+App::$strings["Path not available."] = "Trajectòria no disponible";
+App::$strings["Empty pathname"] = "Trajèctoria vuida.";
+App::$strings["duplicate filename or path"] = "Nom o trajectòria duplicat";
+App::$strings["Path not found."] = "Trajectòria no trobada.";
+App::$strings["mkdir failed."] = "mkdir va fracassar.";
+App::$strings["database storage failed."] = "Arxiu de base de dades va fallar.";
+App::$strings["Empty path"] = "Trajèctoria vuida";
+App::$strings["Image/photo"] = "Imatge/foto";
+App::$strings["Encrypted content"] = "Contingut encriptat";
+App::$strings["Install %s element: "] = "Instal·la l'element %s:";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Aquesta entrada contè un element %s instal·lable, potser manques de permissos per instal·lar-lo en aquest lloc.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s va escriure el següent %2\$s %3\$s";
+App::$strings["Click to open/close"] = "Clic per obrir/tancar";
+App::$strings["spoiler"] = "xafa guitarres";
+App::$strings["Different viewers will see this text differently"] = "Diferents observadors veuran aquest text de diferents formes";
+App::$strings["$1 wrote:"] = "$1 va escriure:";
+App::$strings["(Unknown)"] = "(Desconegut)";
+App::$strings["Visible to anybody on the internet."] = "Visible per tothom a la Internet";
+App::$strings["Visible to you only."] = "Visible només per tú.";
+App::$strings["Visible to anybody in this network."] = "Visible per tothom en aquesta xarxa.";
+App::$strings["Visible to anybody authenticated."] = "Visible per tothom autenticat.";
+App::$strings["Visible to anybody on %s."] = "Visible per a tothom a %s.";
+App::$strings["Visible to all connections."] = "Visible per a totes les connexions.";
+App::$strings["Visible to approved connections."] = "Visible per a les connexions aprovades.";
+App::$strings["Visible to specific connections."] = "Visible per a específiques connexions.";
+App::$strings["Privacy group is empty."] = "El grup privat està vuit.";
+App::$strings["Privacy group: %s"] = "Grup privat: %s";
+App::$strings["Connection not found."] = "Connexió no trobada.";
+App::$strings["profile photo"] = "foto del perfil";
+App::$strings["Embedded content"] = "Contingut embegut";
+App::$strings["Embedding disabled"] = "Incorporació desactivada";
+App::$strings["System"] = "Sistema";
+App::$strings["New App"] = "Nova App";
+App::$strings["Suggestions"] = "Suggerencies";
+App::$strings["See more..."] = "Veure més.....";
+App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Tens %1$.0f de %2$.0f connexions permeses.";
+App::$strings["Add New Connection"] = "Afegeix una Nova Connexió";
+App::$strings["Enter channel address"] = "Introdueix l'adreça del canal";
+App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Exemples: bob@example.com, https://exemple.com/barbara";
+App::$strings["Notes"] = "Notes";
+App::$strings["Remove term"] = "Plaç de remoció";
+App::$strings["Everything"] = "Tot";
+App::$strings["Archives"] = "Arxius";
+App::$strings["Refresh"] = "Refresc";
+App::$strings["Account settings"] = "Ajustos de Compte";
+App::$strings["Channel settings"] = "Ajustos de Canal";
+App::$strings["Additional features"] = "Característiques addicionals";
+App::$strings["Feature/Addon settings"] = "Ajustos de Complements";
+App::$strings["Display settings"] = "Ajustos de pantalla";
+App::$strings["Manage locations"] = "Gestiona ubicacions";
+App::$strings["Export channel"] = "Exportat canal";
+App::$strings["Connected apps"] = "Apps connectades";
+App::$strings["Premium Channel Settings"] = "Ajustos Premium de Canal";
+App::$strings["Private Mail Menu"] = "Menú de Correu Privat";
+App::$strings["Combined View"] = "Vista Combinada";
+App::$strings["Conversations"] = "Conversacions";
+App::$strings["Received Messages"] = "Missatges Rebuts";
+App::$strings["Sent Messages"] = "Missatges Enviats";
+App::$strings["No messages."] = "Sense missatges.";
+App::$strings["Delete conversation"] = "Conversació esborrada";
+App::$strings["Events Tools"] = "Eina d'Esdeveniments";
+App::$strings["Export Calendar"] = "Exportar Calendari";
+App::$strings["Import Calendar"] = "Importar Calendari";
+App::$strings["Overview"] = "Visió General";
+App::$strings["Chat Members"] = "Membres de la Sala de Xat";
+App::$strings["Wiki List"] = "Llista de Wikis";
+App::$strings["Wiki Pages"] = "Pàgines de Wikis";
+App::$strings["Bookmarked Chatrooms"] = "Sales de Xat Favorites";
+App::$strings["Suggested Chatrooms"] = "Sales de Xat Suggerides";
+App::$strings["photo/image"] = "foto/imatge";
+App::$strings["Click to show more"] = "Fes clic per veure més";
+App::$strings["Rating Tools"] = "Eines de Valoració";
+App::$strings["Rate Me"] = "Valora'm";
+App::$strings["View Ratings"] = "Veure Valoracions";
+App::$strings["Forums"] = "Forums";
+App::$strings["Tasks"] = "Tasques";
+App::$strings["Documentation"] = "Documentació";
+App::$strings["Project/Site Information"] = "Informació del Projecte/Lloc";
+App::$strings["For Members"] = "Per Membres";
+App::$strings["For Administrators"] = "Per Administradors";
+App::$strings["For Developers"] = "Per Desenvolupadors";
+App::$strings["Member registrations waiting for confirmation"] = "Una inscripció per a ser membre està esperant confirmació";
+App::$strings["Inspect queue"] = "Revisa cua";
+App::$strings["DB updates"] = "Actualitzacions de Base de Dades";
+App::$strings["Plugin Features"] = "Característiques del Plugin";
+App::$strings[" and "] = "i";
+App::$strings["public profile"] = "Perfil públic";
+App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s canviat %2\$s a &ldquo;%3\$s&rdquo;";
+App::$strings["Visit %1\$s's %2\$s"] = "Visita %1\$s en %2\$s";
+App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s Ha actualitzat %2\$s, canviant %3\$s.";
+App::$strings["Attachments:"] = "Adjuntat:";
+App::$strings["\$Projectname event notification:"] = "Notificació d'esdeveniment de \$Projectname";
 App::$strings["Delete this item?"] = "Esborrar aquest item?";
-App::$strings["[-] show less"] = "[-] mostra menys";
-App::$strings["[+] expand"] = "[+] expandeix";
-App::$strings["[-] collapse"] = "[-] colapsa";
+App::$strings["%s show less"] = "";
+App::$strings["%s expand"] = "";
+App::$strings["%s collapse"] = "";
 App::$strings["Password too short"] = "Contrasenya massa curta";
 App::$strings["Passwords do not match"] = "Les paraules de pas no coincideixen";
 App::$strings["everybody"] = "tothom";
@@ -2189,72 +2222,78 @@ App::$strings["__ctx:calendar__ month"] = "mes";
 App::$strings["__ctx:calendar__ week"] = "setmana";
 App::$strings["__ctx:calendar__ day"] = "dia";
 App::$strings["__ctx:calendar__ All day"] = "Tot el dia";
-App::$strings["view full size"] = "Veure a mida competa";
-App::$strings["No Subject"] = "Sense Assumpte";
-App::$strings["Friendica"] = "Friendica";
-App::$strings["OStatus"] = "OStatus";
-App::$strings["GNU-Social"] = "GNU-Social";
-App::$strings["RSS/Atom"] = "RSS/Atom";
-App::$strings["Diaspora"] = "Diaspora";
-App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot";
-App::$strings["LinkedIn"] = "LinkedIn";
-App::$strings["XMPP/IM"] = "XMPP/IM";
-App::$strings["MySpace"] = "MySpace";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "La imatge excedeix la mida limit pel lloc web en %lu bytes";
-App::$strings["Image file is empty."] = "El fitxer d'imatge esta buit.";
-App::$strings["Photo storage failed."] = "Fracassà l'emmagatzematge de la Foto";
-App::$strings["a new photo"] = "Una foto nova";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s enviat %2\$s a %3\$s";
-App::$strings["Upload New Photos"] = "Puja Noves Fotos";
+App::$strings["%d invitation available"] = array(
+	0 => "%d invitació disponible",
+	1 => "%d invitacions disponibles",
+);
+App::$strings["Find Channels"] = "Troba Canals";
+App::$strings["Enter name or interest"] = "Entra un nom o interes";
+App::$strings["Connect/Follow"] = "Conecta/Segueix";
+App::$strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Lionel Messi, Futbolista";
+App::$strings["Random Profile"] = "Perfil Aleatori";
+App::$strings["Invite Friends"] = "Convida Amics";
+App::$strings["Advanced example: name=fred and country=iceland"] = "Exemple avançat: nom=pep i pais=eire";
+App::$strings["%d connection in common"] = array(
+	0 => "%d connexió en comú",
+	1 => "%d connexions en comú",
+);
+App::$strings["show more"] = "mostrar més";
+App::$strings["Directory Options"] = "Opcions de Directori";
+App::$strings["Safe Mode"] = "Manera Segura";
+App::$strings["Public Forums Only"] = "Només Fòrums Públics";
+App::$strings["This Website Only"] = "Només Aquest Lloc Web";
+App::$strings["No recipient provided."] = "No s'ha proporcionat bústia.";
+App::$strings["[no subject]"] = "[no subject]";
+App::$strings["Unable to determine sender."] = "incapaç de determinar el remitent";
+App::$strings["Stored post could not be verified."] = "L'entrada guardada no pot ser verificada";
+App::$strings["Who can see this?"] = "Qui pot veure això?";
+App::$strings["Custom selection"] = "Selecció a mida";
+App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Selecciona \"Mostrar\" per permetre la visualització. \"No Mostrar\" et permet obviar i limitar l'abast de \"Mostrar\".";
+App::$strings["Show"] = "Mostra";
+App::$strings["Don't show"] = "No mostrar";
+App::$strings["Other networks and post services"] = "Altres xarxes i serveis de correu";
+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."] = "Els permisos d'entrada %s no poden esser canviats %s posteriorment a que una entrada ja està compartida. </br />Aquest ajust dels permisos indica qui pot veure l'entrada.";
+App::$strings["Birthday"] = "Aniversari";
+App::$strings["Age: "] = "Edat:";
+App::$strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD o MM-DD";
+App::$strings["never"] = "mai";
+App::$strings["less than a second ago"] = "fa menys d'un segon";
+App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "Fa %1\$d %2\$s";
+App::$strings["__ctx:relative_date__ year"] = array(
+	0 => "any",
+	1 => "anys",
+);
+App::$strings["__ctx:relative_date__ month"] = array(
+	0 => "mes",
+	1 => "mesos ",
+);
+App::$strings["__ctx:relative_date__ week"] = array(
+	0 => "setmana",
+	1 => "setmanes",
+);
+App::$strings["__ctx:relative_date__ day"] = array(
+	0 => "dia",
+	1 => "dies",
+);
+App::$strings["__ctx:relative_date__ hour"] = array(
+	0 => "hora",
+	1 => "hores",
+);
+App::$strings["__ctx:relative_date__ minute"] = array(
+	0 => "minut",
+	1 => "minuts",
+);
+App::$strings["__ctx:relative_date__ second"] = array(
+	0 => "segon",
+	1 => "segons",
+);
+App::$strings["%1\$s's birthday"] = "Aniversari de %1\$s";
+App::$strings["Happy Birthday %1\$s"] = "Feliç Aniversari %1\$s";
+App::$strings["Public Timeline"] = "Línia de Temps Pública";
 App::$strings["Invalid data packet"] = "paquet de dades invàlid";
 App::$strings["Unable to verify channel signature"] = "No es pot verificar la signatura del canal";
 App::$strings["Unable to verify site signature for %s"] = "No es pot verificar la signatura del lloc per %s";
 App::$strings["invalid target signature"] = "Signatura objectiu invàlida";
-App::$strings["New Page"] = "Pàgina Nova";
-App::$strings["Title"] = "Títol";
-App::$strings["Can view my normal stream and posts"] = "Pot veure el flux i entrades normals";
-App::$strings["Can view my default channel profile"] = "Pot veure el meu perfil del canal per defecte";
-App::$strings["Can view my connections"] = "Pot veure les meves connexions";
-App::$strings["Can view my file storage and photos"] = "Pot veure al meu magatzem d'arxius i fotos";
-App::$strings["Can view my webpages"] = "Pot veure les meves pàgines web";
-App::$strings["Can send me their channel stream and posts"] = "Pot enviar-me el flux i entrades del seu canal";
-App::$strings["Can post on my channel page (\"wall\")"] = "Pot fer entrades a la meva pàgina de canal (\"mur\")";
-App::$strings["Can comment on or like my posts"] = "Pot fer comentaris o dir si agrada en les meves entrades";
-App::$strings["Can send me private mail messages"] = "Pot enviar-me un missatge de correu privat";
-App::$strings["Can like/dislike stuff"] = "Pot dir si agrada/desagrada ";
-App::$strings["Profiles and things other than posts/comments"] = "Perfils i altres coses a més d'entrades/comentaris";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Ho pot enviar a tots els meus contactes del canal via entrades @mencions";
-App::$strings["Advanced - useful for creating group forum channels"] = "Avançat - capaç de crear canals de grups de foro";
-App::$strings["Can chat with me (when available)"] = "Pot xatejar amb mi (si estic disponible)";
-App::$strings["Can write to my file storage and photos"] = "Pot escriure al meu magatzem d'arxius i fotos";
-App::$strings["Can edit my webpages"] = "Pot editar les meves pàgines web";
-App::$strings["Can source my public posts in derived channels"] = "Pot mostrar l'origen de les meves entrades públiques en altres canals";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Quelcom avançat - molt útil en comunitats obertes";
-App::$strings["Can administer my channel resources"] = "Pot administrar els meus recursos del canal";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Extremadament avançat. No toquis res si no saps que estàs fent";
-App::$strings["Social Networking"] = "Xarxes Socials";
-App::$strings["Social - Mostly Public"] = "Social -  Principalment Públic";
-App::$strings["Social - Restricted"] = "Social - Restingit";
-App::$strings["Social - Private"] = "Social - Privat";
-App::$strings["Community Forum"] = "Foro de Comunitat";
-App::$strings["Forum - Mostly Public"] = "Fòrum - Principalment Públic";
-App::$strings["Forum - Restricted"] = "Fòrum - Restringit";
-App::$strings["Forum - Private"] = "Fòrum - Privat";
-App::$strings["Feed Republish"] = "Republicador";
-App::$strings["Feed - Mostly Public"] = "Realimentador - Públic Principalment";
-App::$strings["Feed - Restricted"] = "Retroalimentador - Restringit";
-App::$strings["Special Purpose"] = "Objectiu Especial";
-App::$strings["Special - Celebrity/Soapbox"] = "Espacial - Celebritat/Plataforma";
-App::$strings["Special - Group Repository"] = "Especial  - Repositori d'un Grup";
-App::$strings["Custom/Expert Mode"] = "Personalitzat/Manera Experta";
-App::$strings[" and "] = "i";
-App::$strings["public profile"] = "Perfil públic";
-App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s canviat %2\$s a &ldquo;%3\$s&rdquo;";
-App::$strings["Visit %1\$s's %2\$s"] = "Visita %1\$s en %2\$s";
-App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s Ha actualitzat %2\$s, canviant %3\$s.";
-App::$strings["Attachments:"] = "Adjuntat:";
-App::$strings["\$Projectname event notification:"] = "Notificació d'esdeveniment de \$Projectname";
 App::$strings["Focus (Hubzilla default)"] = "Focus (Hubzilla per defecte)";
 App::$strings["Theme settings"] = "Ajustos de tema";
 App::$strings["Select scheme"] = "Tria esquema";
@@ -2294,6 +2333,7 @@ App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["Update %s failed. See error logs."] = "L'actualització %s ha fallat. Mira el registre d'errors.";
 App::$strings["Update Error at %s"] = "Error d'Actualització a %s";
 App::$strings["Create an account to access services and applications within the Hubzilla"] = "Crea un compte per accedir als serveis i aplicacions dins de Hubzilla";
+App::$strings["Login/Email"] = "";
 App::$strings["Password"] = "Contrasenya";
 App::$strings["Remember me"] = "Recorda'm";
 App::$strings["Forgot your password?"] = "Has perdut la Contrasenya?";
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 26321ab3c..b68517e25 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -5,6 +5,7 @@
 nav .badge {
 	position: relative;
 	top: -49px;
+	left: 2px;
 	float: left;
 	font-size: 10px;
 	line-height: 20px;
@@ -59,7 +60,8 @@ aside .nav-pills > li > a,
 	padding: 6px 10px;
 }
 
-.wall-item-tools .dropdown-menu {
+.wall-item-tools .dropdown-menu,
+.section-title-wrapper .dropdown-menu {
 	min-width: auto;
 }
 
diff --git a/view/css/conversation.css b/view/css/conversation.css
index b6e316121..68aa8bfbe 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -121,7 +121,7 @@ a.wall-item-name-link {
 }
 
 .wall-item-content {
-	overflow: auto;
+	overflow: hidden;
 }
 
 .wall-item-content h1,
@@ -316,4 +316,4 @@ code.inline-code {
 img.smiley.emoji:hover {
 	width: 32px;
 	height: 32px;
-}
\ No newline at end of file
+}
diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css
index 9bfea856d..af89e597d 100644
--- a/view/css/mod_directory.css
+++ b/view/css/mod_directory.css
@@ -30,5 +30,5 @@
 }
 
 .directory-collapse {
-		overflow: auto;
+	overflow: hidden;
 }
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index e81d115d4..4236b3dff 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -7,5 +7,22 @@
 }
 
 .channel-menu {
-    margin-top: 24px;
+	margin-top: 24px;
+}
+
+.zat-example {
+	color: red;
+}
+
+#atoken-index {
+	width: 100%;
+}
+
+#atoken-index td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+	white-space: nowrap;
+}
+
+.atoken-index-tool {
+	padding: 7px 10px;
 }
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 38809896c..2a7c57f53 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -11,6 +11,7 @@
 	width: 100%;
 	border-top-right-radius: 0px;
 	border-bottom-right-radius: 0px;
+	border-right: 0px;
 }
 
 .tags {
diff --git a/view/de/hmessages.po b/view/de/hmessages.po
index 5c3b981ad..c160cd6bc 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-06-10 00:02-0700\n"
-"PO-Revision-Date: 2016-06-15 09:43+0000\n"
+"POT-Creation-Date: 2016-07-22 00:02-0700\n"
+"PO-Revision-Date: 2016-07-28 09:16+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"
@@ -33,11 +33,156 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../../Zotlabs/Access/PermissionRoles.php:182
+#: ../../include/permissions.php:904
+msgid "Social Networking"
+msgstr "Soziales Netzwerk"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:183
+#: ../../include/permissions.php:904
+msgid "Social - Mostly Public"
+msgstr "Soziales Netzwerk - Weitgehend öffentlich"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:184
+#: ../../include/permissions.php:904
+msgid "Social - Restricted"
+msgstr "Soziales Netzwerk - Beschränkt"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:185
+#: ../../include/permissions.php:904
+msgid "Social - Private"
+msgstr "Soziales Netzwerk - Privat"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:188
+#: ../../include/permissions.php:905
+msgid "Community Forum"
+msgstr "Forum"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:189
+#: ../../include/permissions.php:905
+msgid "Forum - Mostly Public"
+msgstr "Forum - Weitgehend öffentlich"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:190
+#: ../../include/permissions.php:905
+msgid "Forum - Restricted"
+msgstr "Forum - Beschränkt"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:191
+#: ../../include/permissions.php:905
+msgid "Forum - Private"
+msgstr "Forum - Privat"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:194
+#: ../../include/permissions.php:906
+msgid "Feed Republish"
+msgstr "Teilen von Feeds"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:195
+#: ../../include/permissions.php:906
+msgid "Feed - Mostly Public"
+msgstr "Feeds - Weitgehend öffentlich"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:196
+#: ../../include/permissions.php:906
+msgid "Feed - Restricted"
+msgstr "Feeds - Beschränkt"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:199
+#: ../../include/permissions.php:907
+msgid "Special Purpose"
+msgstr "Für besondere Zwecke"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:200
+#: ../../include/permissions.php:907
+msgid "Special - Celebrity/Soapbox"
+msgstr "Speziell - Mitteilungs-Kanal (keine Kommentare)"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:201
+#: ../../include/permissions.php:907
+msgid "Special - Group Repository"
+msgstr "Speziell - Gruppenarchiv"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:204 ../../include/selectors.php:49
+#: ../../include/selectors.php:66 ../../include/selectors.php:104
+#: ../../include/selectors.php:140 ../../include/permissions.php:908
+msgid "Other"
+msgstr "Andere"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:205
+#: ../../include/permissions.php:908
+msgid "Custom/Expert Mode"
+msgstr "Benutzerdefiniert/Expertenmodus"
+
+#: ../../Zotlabs/Access/Permissions.php:30
+msgid "Can view my channel stream and posts"
+msgstr "Kann meinen Kanal-Stream und meine Beiträge sehen"
+
+#: ../../Zotlabs/Access/Permissions.php:31 ../../include/permissions.php:33
+msgid "Can send me their channel stream and posts"
+msgstr "Kann mir die Beiträge aus seinem/ihrem Kanal schicken"
+
+#: ../../Zotlabs/Access/Permissions.php:32 ../../include/permissions.php:27
+msgid "Can view my default channel profile"
+msgstr "Kann mein Standardprofil sehen"
+
+#: ../../Zotlabs/Access/Permissions.php:33 ../../include/permissions.php:28
+msgid "Can view my connections"
+msgstr "Kann meine Verbindungen sehen"
+
+#: ../../Zotlabs/Access/Permissions.php:34 ../../include/permissions.php:29
+msgid "Can view my file storage and photos"
+msgstr "Kann meine Datei- und Bilderordner sehen"
+
+#: ../../Zotlabs/Access/Permissions.php:35
+msgid "Can upload/modify my file storage and photos"
+msgstr "Kann in meine Datei- und Bilderordner hochladen/ändern"
+
+#: ../../Zotlabs/Access/Permissions.php:36
+msgid "Can view my channel webpages"
+msgstr "Kann die Webseiten meines Kanals sehen"
+
+#: ../../Zotlabs/Access/Permissions.php:37
+msgid "Can create/edit my channel webpages"
+msgstr "Kann Webseiten in meinem Kanal erstellen/ändern"
+
+#: ../../Zotlabs/Access/Permissions.php:38
+msgid "Can post on my channel (wall) page"
+msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
+
+#: ../../Zotlabs/Access/Permissions.php:39 ../../include/permissions.php:35
+msgid "Can comment on or like my posts"
+msgstr "Darf meine Beiträge kommentieren und mögen/nicht mögen"
+
+#: ../../Zotlabs/Access/Permissions.php:40 ../../include/permissions.php:36
+msgid "Can send me private mail messages"
+msgstr "Kann mir private Nachrichten schicken"
+
+#: ../../Zotlabs/Access/Permissions.php:41
+msgid "Can like/dislike profiles and profile things"
+msgstr "Kann Profile und Profilsachen mögen/nicht mögen"
+
+#: ../../Zotlabs/Access/Permissions.php:42
+msgid "Can forward to all my channel connections via @+ mentions in posts"
+msgstr "Kann an alle meine Verbindungen via @-Erwähnungen Nachrichten weiterleiten"
+
+#: ../../Zotlabs/Access/Permissions.php:43
+msgid "Can chat with me"
+msgstr "Kann mit mir chatten"
+
+#: ../../Zotlabs/Access/Permissions.php:44 ../../include/permissions.php:44
+msgid "Can source my public posts in derived channels"
+msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden"
+
+#: ../../Zotlabs/Access/Permissions.php:45
+msgid "Can administer my channel"
+msgstr "Kann meinen Kanal administrieren"
+
 #: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
 msgid "parent"
 msgstr "Übergeordnetes Verzeichnis"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2620
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2605
 msgid "Collection"
 msgstr "Sammlung"
 
@@ -61,16 +206,17 @@ msgstr "Posteingang für überwachte Kalender"
 msgid "Schedule Outbox"
 msgstr "Postausgang für überwachte Kalender"
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
-#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486
-#: ../../Zotlabs/Lib/Apps.php:561 ../../include/widgets.php:1505
-#: ../../include/conversation.php:1032
+#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:796
+#: ../../Zotlabs/Module/Photos.php:1241
+#: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:490
+#: ../../Zotlabs/Lib/Apps.php:565 ../../include/conversation.php:1035
+#: ../../include/widgets.php:1599
 msgid "Unknown"
 msgstr "Unbekannt"
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93
-#: ../../include/conversation.php:1639
+#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:93
+#: ../../include/conversation.php:1654
 msgid "Files"
 msgstr "Dateien"
 
@@ -83,22 +229,23 @@ msgid "Shared"
 msgstr "Geteilt"
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
-#: ../../Zotlabs/Module/Webpages.php:186
+#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/New_channel.php:142
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Webpages.php:193
 msgid "Create"
 msgstr "Erstelle"
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1518
+#: ../../Zotlabs/Module/Photos.php:823 ../../Zotlabs/Module/Photos.php:1362
+#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1612
 msgid "Upload"
 msgstr "Hochladen"
 
 #: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:247
-#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:592
-#: ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:646
+#: ../../Zotlabs/Module/Settings.php:672
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr "Name"
@@ -108,7 +255,7 @@ msgid "Type"
 msgstr "Typ"
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1344
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1324
 msgid "Size"
 msgstr "Größe"
 
@@ -117,34 +264,32 @@ msgstr "Größe"
 msgid "Last Modified"
 msgstr "Zuletzt geändert"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Editpost.php:84
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Editlayout.php:113
-#: ../../Zotlabs/Module/Editwebpage.php:146
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:187
-#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Lib/ThreadItem.php:106
-#: ../../include/channel.php:937 ../../include/channel.php:941
-#: ../../include/menu.php:108 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36
+#: ../../Zotlabs/Module/Editlayout.php:114
+#: ../../Zotlabs/Module/Editwebpage.php:145
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Settings.php:706 ../../Zotlabs/Module/Thing.php:260
+#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/page_widgets.php:9
+#: ../../include/page_widgets.php:39 ../../include/channel.php:976
+#: ../../include/channel.php:980 ../../include/menu.php:108
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Connedit.php:572
-#: ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Connedit.php:602
 #: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Editlayout.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039
+#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Photos.php:1171 ../../Zotlabs/Module/Admin.php:1039
 #: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114
-#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261
-#: ../../Zotlabs/Module/Webpages.php:189 ../../Zotlabs/Lib/Apps.php:338
-#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:657
+#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Module/Settings.php:707 ../../Zotlabs/Module/Thing.php:261
+#: ../../Zotlabs/Module/Webpages.php:196 ../../Zotlabs/Lib/Apps.php:342
+#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660
 msgid "Delete"
 msgstr "Löschen"
 
@@ -170,74 +315,73 @@ msgstr "Neuen Ordner anlegen"
 msgid "Upload file"
 msgstr "Datei hochladen"
 
-#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:112
+#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Module/Import_items.php:114
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../include/items.php:385
+#: ../../include/items.php:384
 msgid "Permission denied"
 msgstr "Keine Berechtigung"
 
-#: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Channel.php:105
-#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:65
+#: ../../Zotlabs/Module/Achievements.php:34
+#: ../../Zotlabs/Module/Connedit.php:390 ../../Zotlabs/Module/Id.php:76
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Events.php:264
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Events.php:265
-#: ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Chat.php:100
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:69
-#: ../../Zotlabs/Module/Editwebpage.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Filestorage.php:24
-#: ../../Zotlabs/Module/Filestorage.php:79
-#: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:210
-#: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070
+#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:104
+#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Pdledit.php:26
+#: ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:93
+#: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
+#: ../../Zotlabs/Module/Item.php:213 ../../Zotlabs/Module/Item.php:221
+#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Photos.php:73
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:121
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Channel.php:104
+#: ../../Zotlabs/Module/Channel.php:225 ../../Zotlabs/Module/Channel.php:266
 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Notifications.php:70
-#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68
-#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203
-#: ../../Zotlabs/Module/Profiles.php:601
-#: ../../Zotlabs/Module/Profile_photo.php:256
-#: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Appman.php:75
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
+#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Profile_photo.php:265
+#: ../../Zotlabs/Module/Profile_photo.php:278
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Editblock.php:67
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
-#: ../../Zotlabs/Module/Sharedwithme.php:11
+#: ../../Zotlabs/Module/Settings.php:626 ../../Zotlabs/Module/Setup.php:215
+#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Thing.php:274
+#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:331
 #: ../../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:25
-#: ../../Zotlabs/Module/Viewconnections.php:30
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
-#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/items.php:3438
-#: ../../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/photos.php:27
+#: ../../Zotlabs/Module/Webpages.php:73
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Api.php:13
+#: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../include/photos.php:27 ../../include/attach.php:141
+#: ../../include/attach.php:189 ../../include/attach.php:252
+#: ../../include/attach.php:266 ../../include/attach.php:273
+#: ../../include/attach.php:338 ../../include/attach.php:352
+#: ../../include/attach.php:359 ../../include/attach.php:439
+#: ../../include/attach.php:901 ../../include/attach.php:972
+#: ../../include/attach.php:1124 ../../include/items.php:3448
 msgid "Permission denied."
 msgstr "Berechtigung verweigert."
 
@@ -245,9 +389,9 @@ msgstr "Berechtigung verweigert."
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
-#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97
-#: ../../Zotlabs/Module/Page.php:93
+#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Display.php:118
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Help.php:97
+#: ../../Zotlabs/Module/Block.php:79
 msgid "Page not found."
 msgstr "Seite nicht gefunden."
 
@@ -263,243 +407,20 @@ msgstr "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angeme
 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:31
-#: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../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/channel.php:837
+#: ../../Zotlabs/Module/Achievements.php:15
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Layouts.php:31
+#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:33
+#: ../../include/channel.php:876
 msgid "Requested profile is not available."
-msgstr "Erwünschte Profil ist nicht verfügbar."
+msgstr "Das angefragte Profil ist nicht verfügbar."
 
 #: ../../Zotlabs/Module/Achievements.php:38
 msgid "Some blurb about what to do when you're new here"
 msgstr "Ein Hinweis, was man tun kann, wenn man neu hier ist"
 
-#: ../../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:151 ../../include/text.php:2265
-msgid "Blocks"
-msgstr "Blöcke"
-
-#: ../../Zotlabs/Module/Blocks.php:153
-msgid "Block Title"
-msgstr "Titel des Blocks"
-
-#: ../../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: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:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
-#: ../../include/conversation.php:1208
-msgid "Share"
-msgstr "Teilen"
-
-#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193
-#: ../../include/page_widgets.php:39
-msgid "View"
-msgstr "Ansicht"
-
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Block.php:43
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
-msgid "Channel not found."
-msgstr "Kanal nicht gefunden."
-
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr "Berechtigung verweigert."
-
-#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
-msgid "l, F j"
-msgstr "l, j. F"
-
-#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
-#: ../../include/text.php:1732
-msgid "Link to Source"
-msgstr "Link zur Quelle"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Edit Event"
-msgstr "Termin bearbeiten"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Create Event"
-msgstr "Termin anlegen"
-
-#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
-#: ../../Zotlabs/Module/Photos.php:949
-msgid "Previous"
-msgstr "Voriges"
-
-#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
-#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
-msgid "Next"
-msgstr "Nächste"
-
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
-#: ../../include/widgets.php:755
-msgid "Export"
-msgstr "Exportieren"
-
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
-#: ../../include/widgets.php:756
-msgid "Import"
-msgstr "Import"
-
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Import.php:550
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Photos.php:677
-#: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
-#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032
-#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421
-#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733
-#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Appman.php:126
-#: ../../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:312
-#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
-#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:757
-#: ../../include/widgets.php:769 ../../include/js_strings.php:22
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Submit"
-msgstr "Bestätigen"
-
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
-msgid "Today"
-msgstr "Heute"
-
-#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
-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:41
-msgid "Posts and comments"
-msgstr "Beiträge und Kommentare"
-
-#: ../../Zotlabs/Module/Channel.php:42
-msgid "Only posts"
-msgstr "Nur Beiträge"
-
-#: ../../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/Chat.php:181
-msgid "Room not found"
-msgstr "Chatraum nicht gefunden"
-
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "Leave Room"
-msgstr "Raum verlassen"
-
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "Delete Room"
-msgstr "Raum löschen"
-
-#: ../../Zotlabs/Module/Chat.php:199
-msgid "I am away right now"
-msgstr "Ich bin gerade nicht da"
-
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "I am online"
-msgstr "Ich bin online"
-
-#: ../../Zotlabs/Module/Chat.php:202
-msgid "Bookmark this room"
-msgstr "Lesezeichen für diesen Raum setzen"
-
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
-#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176
-msgid "Please enter a link URL:"
-msgstr "Gib eine URL ein:"
-
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
-#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
-#: ../../include/conversation.php:1256
-msgid "Encrypt text"
-msgstr "Text verschlüsseln"
-
-#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143
-msgid "Insert web link"
-msgstr "Link einfügen"
-
-#: ../../Zotlabs/Module/Chat.php:218
-msgid "Feature disabled."
-msgstr "Funktion deaktiviert."
-
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "New Chatroom"
-msgstr "Neuer Chatraum"
-
-#: ../../Zotlabs/Module/Chat.php:233
-msgid "Chatroom name"
-msgstr "Chatraumname"
-
-#: ../../Zotlabs/Module/Chat.php:234
-msgid "Expiration of chats (minutes)"
-msgstr "Verfall von Chats (Minuten)"
-
-#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
-#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
-#: ../../include/acl_selectors.php:283
-msgid "Permissions"
-msgstr "Berechtigungen"
-
-#: ../../Zotlabs/Module/Chat.php:246
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "%1$ss Chaträume"
-
-#: ../../Zotlabs/Module/Chat.php:251
-msgid "No chatrooms available"
-msgstr "Keine Chaträume verfügbar"
-
-#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Create New"
-msgstr "Neu anlegen"
-
-#: ../../Zotlabs/Module/Chat.php:255
-msgid "Expiration"
-msgstr "Verfall"
-
-#: ../../Zotlabs/Module/Chat.php:256
-msgid "min"
-msgstr "min"
-
 #: ../../Zotlabs/Module/Chatsvc.php:117
 msgid "Away"
 msgstr "Abwesend"
@@ -508,65 +429,6 @@ msgstr "Abwesend"
 msgid "Online"
 msgstr "Online"
 
-#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40
-msgid "Invalid item."
-msgstr "Ungültiges Element."
-
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
-msgstr "Lesezeichen hinzugefügt"
-
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
-msgstr "Meine Lesezeichen"
-
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
-msgstr "Lesezeichen meiner Kontakte"
-
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
-msgstr "Fortfahren"
-
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
-msgstr "Premium-Kanal-Einrichtung"
-
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
-msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
-
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
-
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
-
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
-
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite."
-
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
-
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
-msgstr "Eingeschränkter oder Premium-Kanal"
-
 #: ../../Zotlabs/Module/Connedit.php:80
 msgid "Could not access contact record."
 msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
@@ -575,317 +437,350 @@ msgstr "Konnte nicht auf den Kontakteintrag zugreifen."
 msgid "Could not locate selected profile."
 msgstr "Gewähltes Profil nicht gefunden."
 
-#: ../../Zotlabs/Module/Connedit.php:227
+#: ../../Zotlabs/Module/Connedit.php:248
 msgid "Connection updated."
 msgstr "Verbindung aktualisiert."
 
-#: ../../Zotlabs/Module/Connedit.php:229
+#: ../../Zotlabs/Module/Connedit.php:250
 msgid "Failed to update connection record."
 msgstr "Konnte den Verbindungseintrag nicht aktualisieren."
 
-#: ../../Zotlabs/Module/Connedit.php:276
+#: ../../Zotlabs/Module/Connedit.php:300
 msgid "is now connected to"
 msgstr "ist jetzt verbunden mit"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89
-#: ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:459
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Connedit.php:685
+#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:459 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:89
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "No"
 msgstr "Nein"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
-#: ../../Zotlabs/Module/Api.php:88 ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:461
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:461 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:88
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../Zotlabs/Module/Connedit.php:411
+#: ../../Zotlabs/Module/Connedit.php:435
 msgid "Could not access address book record."
 msgstr "Konnte nicht auf den Adressbuch-Eintrag zugreifen."
 
-#: ../../Zotlabs/Module/Connedit.php:425
+#: ../../Zotlabs/Module/Connedit.php:455
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Aktualisierung fehlgeschlagen – der Kanal ist im Moment nicht erreichbar."
 
-#: ../../Zotlabs/Module/Connedit.php:440 ../../Zotlabs/Module/Connedit.php:449
-#: ../../Zotlabs/Module/Connedit.php:458 ../../Zotlabs/Module/Connedit.php:467
-#: ../../Zotlabs/Module/Connedit.php:480
+#: ../../Zotlabs/Module/Connedit.php:470 ../../Zotlabs/Module/Connedit.php:479
+#: ../../Zotlabs/Module/Connedit.php:488 ../../Zotlabs/Module/Connedit.php:497
+#: ../../Zotlabs/Module/Connedit.php:510
 msgid "Unable to set address book parameters."
 msgstr "Konnte die Adressbuch-Parameter nicht setzen."
 
-#: ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:533
 msgid "Connection has been removed."
 msgstr "Verbindung wurde gelöscht."
 
-#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219
-#: ../../include/nav.php:86 ../../include/conversation.php:954
+#: ../../Zotlabs/Module/Connedit.php:549 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:86 ../../include/conversation.php:957
 msgid "View Profile"
 msgstr "Profil ansehen"
 
-#: ../../Zotlabs/Module/Connedit.php:522
+#: ../../Zotlabs/Module/Connedit.php:552
 #, php-format
 msgid "View %s's profile"
 msgstr "%ss Profil ansehen"
 
-#: ../../Zotlabs/Module/Connedit.php:526
+#: ../../Zotlabs/Module/Connedit.php:556
 msgid "Refresh Permissions"
 msgstr "Zugriffsrechte neu laden"
 
-#: ../../Zotlabs/Module/Connedit.php:529
+#: ../../Zotlabs/Module/Connedit.php:559
 msgid "Fetch updated permissions"
 msgstr "Aktualisierte Zugriffsrechte abfragen"
 
-#: ../../Zotlabs/Module/Connedit.php:533
+#: ../../Zotlabs/Module/Connedit.php:563
 msgid "Recent Activity"
 msgstr "Kürzliche Aktivitäten"
 
-#: ../../Zotlabs/Module/Connedit.php:536
+#: ../../Zotlabs/Module/Connedit.php:566
 msgid "View recent posts and comments"
 msgstr "Betrachte die neuesten Beiträge und Kommentare"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1041
 msgid "Unblock"
 msgstr "Freigeben"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1040
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1040
 msgid "Block"
 msgstr "Blockieren"
 
-#: ../../Zotlabs/Module/Connedit.php:543
+#: ../../Zotlabs/Module/Connedit.php:573
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Jegliche Kommunikation mit dieser Verbindung blockieren/zulassen"
 
-#: ../../Zotlabs/Module/Connedit.php:544
+#: ../../Zotlabs/Module/Connedit.php:574
 msgid "This connection is blocked!"
 msgstr "Die Verbindung ist geblockt!"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 msgid "Unignore"
 msgstr "Nicht ignorieren"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 #: ../../Zotlabs/Module/Connections.php:277
 #: ../../Zotlabs/Module/Notifications.php:55
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../../Zotlabs/Module/Connedit.php:551
+#: ../../Zotlabs/Module/Connedit.php:581
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Jegliche eingehende Kommunikation von dieser Verbindung ignorieren/zulassen"
 
-#: ../../Zotlabs/Module/Connedit.php:552
+#: ../../Zotlabs/Module/Connedit.php:582
 msgid "This connection is ignored!"
 msgstr "Die Verbindung wird ignoriert!"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Unarchive"
 msgstr "Aus Archiv zurückholen"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Archive"
 msgstr "Archivieren"
 
-#: ../../Zotlabs/Module/Connedit.php:559
+#: ../../Zotlabs/Module/Connedit.php:589
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Verbindung archivieren/aus dem Archiv zurückholen (Archiv = Kanal als erloschen markieren, aber die Beiträge behalten)"
 
-#: ../../Zotlabs/Module/Connedit.php:560
+#: ../../Zotlabs/Module/Connedit.php:590
 msgid "This connection is archived!"
 msgstr "Die Verbindung ist archiviert!"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Unhide"
 msgstr "Wieder sichtbar machen"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Hide"
 msgstr "Verstecken"
 
-#: ../../Zotlabs/Module/Connedit.php:567
+#: ../../Zotlabs/Module/Connedit.php:597
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Diese Verbindung vor anderen Verbindungen verstecken/zeigen"
 
-#: ../../Zotlabs/Module/Connedit.php:568
+#: ../../Zotlabs/Module/Connedit.php:598
 msgid "This connection is hidden!"
 msgstr "Die Verbindung ist versteckt!"
 
-#: ../../Zotlabs/Module/Connedit.php:575
+#: ../../Zotlabs/Module/Connedit.php:605
 msgid "Delete this connection"
 msgstr "Verbindung löschen"
 
-#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493
+#: ../../Zotlabs/Module/Connedit.php:620 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Ich"
 
-#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494
+#: ../../Zotlabs/Module/Connedit.php:621 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Familie"
 
-#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342
-#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
-#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
-#: ../../include/widgets.php:495 ../../include/selectors.php:123
-#: ../../include/channel.php:389 ../../include/channel.php:390
-#: ../../include/channel.php:397
+#: ../../Zotlabs/Module/Connedit.php:622 ../../Zotlabs/Module/Settings.php:391
+#: ../../Zotlabs/Module/Settings.php:395 ../../Zotlabs/Module/Settings.php:396
+#: ../../Zotlabs/Module/Settings.php:399 ../../Zotlabs/Module/Settings.php:410
+#: ../../include/channel.php:402 ../../include/channel.php:403
+#: ../../include/channel.php:410 ../../include/selectors.php:123
+#: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "Freunde"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496
+#: ../../Zotlabs/Module/Connedit.php:623 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Bekannte"
 
-#: ../../Zotlabs/Module/Connedit.php:594
+#: ../../Zotlabs/Module/Connedit.php:624
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
 msgid "All"
 msgstr "Alle"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Approve this connection"
 msgstr "Verbindung genehmigen"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Accept connection to allow communication"
 msgstr "Akzeptiere die Verbindung, um Kommunikation zu ermöglichen"
 
-#: ../../Zotlabs/Module/Connedit.php:659
+#: ../../Zotlabs/Module/Connedit.php:690
 msgid "Set Affinity"
 msgstr "Beziehung festlegen"
 
-#: ../../Zotlabs/Module/Connedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:693
 msgid "Set Profile"
 msgstr "Profil festlegen"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Zotlabs/Module/Connedit.php:696
 msgid "Set Affinity & Profile"
 msgstr "Beziehung und Profile festlegen"
 
-#: ../../Zotlabs/Module/Connedit.php:698
+#: ../../Zotlabs/Module/Connedit.php:745
 msgid "none"
 msgstr "Keine"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/widgets.php:623
 msgid "Connection Default Permissions"
 msgstr "Standardzugriffsrechte für neue Verbindungen:"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3926
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/items.php:3935
 #, php-format
 msgid "Connection: %s"
 msgstr "Verbindung: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Apply these permissions automatically"
 msgstr "Diese Berechtigungen automatisch anwenden"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Connection requests will be approved without your interaction"
 msgstr "Verbindungsanfragen werden sofort bestätigt, ohne dass Deine aktive Zustimmung erforderlich ist."
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Zotlabs/Module/Connedit.php:752
 msgid "This connection's primary address is"
 msgstr "Die Hauptadresse der Verbindung ist"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:753
 msgid "Available locations:"
 msgstr "Verfügbare Klone:"
 
-#: ../../Zotlabs/Module/Connedit.php:710
+#: ../../Zotlabs/Module/Connedit.php:757
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Die auf dieser Seite angegebenen Berechtigungen werden auf alle neuen Verbindungen angewendet."
 
-#: ../../Zotlabs/Module/Connedit.php:711
+#: ../../Zotlabs/Module/Connedit.php:758
 msgid "Connection Tools"
 msgstr "Verbindungswerkzeuge"
 
-#: ../../Zotlabs/Module/Connedit.php:713
+#: ../../Zotlabs/Module/Connedit.php:760
 msgid "Slide to adjust your degree of friendship"
 msgstr "Verschieben, um den Grad der Freundschaft zu einzustellen"
 
-#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159
+#: ../../Zotlabs/Module/Connedit.php:761 ../../Zotlabs/Module/Rate.php:159
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Bewertung"
 
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Zotlabs/Module/Connedit.php:762
 msgid "Slide to adjust your rating"
 msgstr "Verschieben, um Deine Bewertung einzustellen"
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:763 ../../Zotlabs/Module/Connedit.php:768
 msgid "Optionally explain your rating"
 msgstr "Optional kannst Du Deine Bewertung begründen"
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Zotlabs/Module/Connedit.php:765
 msgid "Custom Filter"
 msgstr "Benutzerdefinierter Filter"
 
-#: ../../Zotlabs/Module/Connedit.php:719
+#: ../../Zotlabs/Module/Connedit.php:766
 msgid "Only import posts with this text"
 msgstr "Nur Beiträge mit diesem Text importieren"
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:766 ../../Zotlabs/Module/Connedit.php:767
 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:720
+#: ../../Zotlabs/Module/Connedit.php:767
 msgid "Do not import posts with this text"
 msgstr "Beiträge mit diesem Text nicht importieren"
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:769
 msgid "This information is public!"
 msgstr "Diese Information ist öffentlich!"
 
-#: ../../Zotlabs/Module/Connedit.php:727
+#: ../../Zotlabs/Module/Connedit.php:774
 msgid "Connection Pending Approval"
 msgstr "Verbindung wartet auf Bestätigung"
 
-#: ../../Zotlabs/Module/Connedit.php:730
+#: ../../Zotlabs/Module/Connedit.php:777
 msgid "inherited"
 msgstr "geerbt"
 
-#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Module/Connedit.php:778 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:238
+#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Pdledit.php:66
+#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Import.php:560
+#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Mail.php:370 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771
+#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1211
+#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Admin.php:1648
+#: ../../Zotlabs/Module/Admin.php:1733 ../../Zotlabs/Module/Admin.php:2116
+#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Settings.php:644
+#: ../../Zotlabs/Module/Settings.php:757 ../../Zotlabs/Module/Settings.php:806
+#: ../../Zotlabs/Module/Settings.php:832 ../../Zotlabs/Module/Settings.php:855
+#: ../../Zotlabs/Module/Settings.php:943
+#: ../../Zotlabs/Module/Settings.php:1129 ../../Zotlabs/Module/Setup.php:312
+#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Thing.php:316
+#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:763
+#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:99
+msgid "Submit"
+msgstr "Bestätigen"
+
+#: ../../Zotlabs/Module/Connedit.php:779
 #, 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:734
+#: ../../Zotlabs/Module/Connedit.php:781
 msgid "Their Settings"
 msgstr "Deren Einstellungen"
 
-#: ../../Zotlabs/Module/Connedit.php:735
+#: ../../Zotlabs/Module/Connedit.php:782
 msgid "My Settings"
 msgstr "Meine Einstellungen"
 
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:784
 msgid "Individual Permissions"
 msgstr "Individuelle Zugriffsrechte"
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Zotlabs/Module/Connedit.php:785
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -893,7 +788,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:739
+#: ../../Zotlabs/Module/Connedit.php:786
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -901,17 +796,121 @@ 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:740
+#: ../../Zotlabs/Module/Connedit.php:787
 msgid "Last update:"
 msgstr "Letzte Aktualisierung:"
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Directory.php:63
+#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:20
+#: ../../Zotlabs/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr "Öffentlichen Zugriff verweigert."
 
+#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:32
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
+#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3369
+msgid "Item not found."
+msgstr "Element nicht gefunden."
+
+#: ../../Zotlabs/Module/Id.php:13
+msgid "First Name"
+msgstr "Vorname"
+
+#: ../../Zotlabs/Module/Id.php:14
+msgid "Last Name"
+msgstr "Nachname"
+
+#: ../../Zotlabs/Module/Id.php:15
+msgid "Nickname"
+msgstr "Spitzname"
+
+#: ../../Zotlabs/Module/Id.php:16
+msgid "Full Name"
+msgstr "Voller Name"
+
+#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../include/network.php:2203
+msgid "Email"
+msgstr "E-Mail"
+
+#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
+#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:238
+msgid "Profile Photo"
+msgstr "Profilfoto"
+
+#: ../../Zotlabs/Module/Id.php:22
+msgid "Profile Photo 16px"
+msgstr "Profilfoto 16 px"
+
+#: ../../Zotlabs/Module/Id.php:23
+msgid "Profile Photo 32px"
+msgstr "Profilfoto 32 px"
+
+#: ../../Zotlabs/Module/Id.php:24
+msgid "Profile Photo 48px"
+msgstr "Profilfoto 48 px"
+
+#: ../../Zotlabs/Module/Id.php:25
+msgid "Profile Photo 64px"
+msgstr "Profilfoto 64 px"
+
+#: ../../Zotlabs/Module/Id.php:26
+msgid "Profile Photo 80px"
+msgstr "Profilfoto 80 px"
+
+#: ../../Zotlabs/Module/Id.php:27
+msgid "Profile Photo 128px"
+msgstr "Profilfoto 128 px"
+
+#: ../../Zotlabs/Module/Id.php:28
+msgid "Timezone"
+msgstr "Zeitzone"
+
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
+msgid "Homepage URL"
+msgstr "Homepage-URL"
+
+#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:236
+msgid "Language"
+msgstr "Sprache"
+
+#: ../../Zotlabs/Module/Id.php:31
+msgid "Birth Year"
+msgstr "Geburtsjahr"
+
+#: ../../Zotlabs/Module/Id.php:32
+msgid "Birth Month"
+msgstr "Geburtsmonat"
+
+#: ../../Zotlabs/Module/Id.php:33
+msgid "Birth Day"
+msgstr "Geburtstag"
+
+#: ../../Zotlabs/Module/Id.php:34
+msgid "Birthdate"
+msgstr "Geburtsdatum"
+
+#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
+msgid "Gender"
+msgstr "Geschlecht"
+
+#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Male"
+msgstr "Männlich"
+
+#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Female"
+msgstr "Weiblich"
+
+#: ../../Zotlabs/Module/Follow.php:34
+msgid "Channel added."
+msgstr "Kanal hinzugefügt."
+
 #: ../../Zotlabs/Module/Directory.php:243
 #, php-format
 msgid "%d rating"
@@ -931,12 +930,12 @@ msgstr "Status:"
 msgid "Homepage: "
 msgstr "Webseite:"
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1223
 msgid "Age:"
 msgstr "Alter:"
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
-#: ../../include/event.php:84 ../../include/channel.php:1027
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/channel.php:1066
+#: ../../include/event.php:52 ../../include/event.php:84
 #: ../../include/bb2diaspora.php:507
 msgid "Location:"
 msgstr "Ort:"
@@ -945,18 +944,18 @@ msgstr "Ort:"
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1239
 msgid "Hometown:"
 msgstr "Heimatstadt:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1247
 msgid "About:"
 msgstr "Über:"
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147
-#: ../../include/widgets.php:184 ../../include/connections.php:78
-#: ../../include/conversation.php:956 ../../include/channel.php:1012
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1051
+#: ../../include/connections.php:78 ../../include/conversation.php:959
+#: ../../include/widgets.php:147 ../../include/widgets.php:184
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1032,38 +1031,322 @@ msgstr "Älteste zuerst"
 msgid "No entries (some entries may be hidden)."
 msgstr "Keine Einträge gefunden (einige könnten versteckt sein)."
 
-#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
-#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3359
-msgid "Item not found."
-msgstr "Element nicht gefunden."
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
+msgstr "Fortfahren"
+
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
+msgstr "Premium-Kanal-Einrichtung"
+
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
+msgstr "Einschränkungen für einen Premium-Kanal aktivieren"
+
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc."
+
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig."
+
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:"
+
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite."
+
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)"
+
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
+msgstr "Eingeschränkter oder Premium-Kanal"
+
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
+msgstr "Kalendereinträge wurden importiert."
+
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+msgstr "Keine Kalendereinträge gefunden."
+
+#: ../../Zotlabs/Module/Events.php:104
+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
+msgid "Unable to generate preview."
+msgstr "Vorschau konnte nicht erzeugt werden."
+
+#: ../../Zotlabs/Module/Events.php:113
+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
+msgid "Event not found."
+msgstr "Termin nicht gefunden."
+
+#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:372
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
+#: ../../include/text.php:1924 ../../include/event.php:951
+msgid "event"
+msgstr "Termin"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Edit event title"
+msgstr "Termintitel bearbeiten"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Event title"
+msgstr "Termintitel"
+
+#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
+#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
+#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
+#: ../../include/datetime.php:245
+msgid "Required"
+msgstr "Benötigt"
+
+#: ../../Zotlabs/Module/Events.php:450
+msgid "Categories (comma-separated list)"
+msgstr "Kategorien (Kommagetrennte Liste)"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Edit Category"
+msgstr "Kategorie bearbeiten"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Category"
+msgstr "Kategorie"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Edit start date and time"
+msgstr "Startdatum und -zeit bearbeiten"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Start date and time"
+msgstr "Startdatum und -zeit"
+
+#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
+msgid "Finish date and time are not known or not relevant"
+msgstr "Enddatum und -zeit sind unbekannt oder irrelevant"
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Edit finish date and time"
+msgstr "Enddatum und -zeit bearbeiten"
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Finish date and time"
+msgstr "Enddatum und -zeit"
+
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+msgid "Adjust for viewer timezone"
+msgstr "An die Zeitzone des Betrachters anpassen"
+
+#: ../../Zotlabs/Module/Events.php:459
+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
+msgid "Edit Description"
+msgstr "Beschreibung bearbeiten"
+
+#: ../../Zotlabs/Module/Events.php:461 ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Rbmark.php:101
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Location"
+msgstr "Ort bearbeiten"
+
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Profiles.php:477
+#: ../../Zotlabs/Module/Profiles.php:698 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
+msgid "Location"
+msgstr "Ort"
+
+#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
+msgid "Share this event"
+msgstr "Den Termin teilen"
+
+#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1091
+#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Lib/ThreadItem.php:719
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1198
+msgid "Preview"
+msgstr "Vorschau"
+
+#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1247
+msgid "Permission settings"
+msgstr "Berechtigungs-Einstellungen"
+
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Advanced Options"
+msgstr "Weitere Optionen"
+
+#: ../../Zotlabs/Module/Events.php:587 ../../Zotlabs/Module/Cal.php:259
+msgid "l, F j"
+msgstr "l, j. F"
+
+#: ../../Zotlabs/Module/Events.php:609
+msgid "Edit event"
+msgstr "Termin bearbeiten"
+
+#: ../../Zotlabs/Module/Events.php:611
+msgid "Delete event"
+msgstr "Termin löschen"
+
+#: ../../Zotlabs/Module/Events.php:636 ../../Zotlabs/Module/Cal.php:308
+#: ../../include/text.php:1712
+msgid "Link to Source"
+msgstr "Link zur Quelle"
+
+#: ../../Zotlabs/Module/Events.php:645
+msgid "calendar"
+msgstr "Kalender"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Edit Event"
+msgstr "Termin bearbeiten"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Create Event"
+msgstr "Termin anlegen"
+
+#: ../../Zotlabs/Module/Events.php:665 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
+#: ../../Zotlabs/Module/Photos.php:947
+msgid "Previous"
+msgstr "Voriges"
+
+#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:675
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
+#: ../../Zotlabs/Module/Photos.php:956 ../../Zotlabs/Module/Setup.php:267
+msgid "Next"
+msgstr "Nächste"
+
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Cal.php:334
+msgid "Export"
+msgstr "Exportieren"
+
+#: ../../Zotlabs/Module/Events.php:670 ../../Zotlabs/Module/Layouts.php:197
+#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Webpages.php:200 ../../include/page_widgets.php:42
+msgid "View"
+msgstr "Ansicht"
+
+#: ../../Zotlabs/Module/Events.php:671
+msgid "Month"
+msgstr "Monat"
+
+#: ../../Zotlabs/Module/Events.php:672
+msgid "Week"
+msgstr "Woche"
+
+#: ../../Zotlabs/Module/Events.php:673
+msgid "Day"
+msgstr "Tag"
+
+#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:341
+msgid "Today"
+msgstr "Heute"
+
+#: ../../Zotlabs/Module/Events.php:707
+msgid "Event removed"
+msgstr "Termin gelöscht"
+
+#: ../../Zotlabs/Module/Events.php:710
+msgid "Failed to remove event"
+msgstr "Termin konnte nicht gelöscht werden"
+
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
+msgstr "Lesezeichen hinzugefügt"
+
+#: ../../Zotlabs/Module/Bookmarks.php:75
+msgid "My Bookmarks"
+msgstr "Meine Lesezeichen"
+
+#: ../../Zotlabs/Module/Bookmarks.php:86
+msgid "My Connections Bookmarks"
+msgstr "Lesezeichen meiner Kontakte"
 
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 #: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:81
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 msgid "Item not found"
 msgstr "Element nicht gefunden"
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228
-msgid "Title (optional)"
-msgstr "Titel (optional)"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
+msgstr "Element kann nicht bearbeitet werden."
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
-msgstr "Block bearbeiten"
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:134
+msgid "Edit post"
+msgstr "Bearbeite Beitrag"
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
-msgstr "Kein Kanal."
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222
+#: ../../include/nav.php:92 ../../include/conversation.php:1647
+msgid "Photos"
+msgstr "Fotos"
 
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
-msgstr "Gemeinsame Verbindungen"
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:645
+#: ../../Zotlabs/Module/Settings.php:671 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Wiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:202 ../../include/conversation.php:1235
+#: ../../include/conversation.php:1274
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
-msgstr "Keine gemeinsamen Verbindungen."
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
+msgstr "Ungültiges Element."
+
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Wall_upload.php:33
+msgid "Channel not found."
+msgstr "Kanal nicht gefunden."
+
+#: ../../Zotlabs/Module/Page.php:131
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
+" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Save to Folder:"
+msgstr "Speichern in Ordner:"
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "- select -"
+msgstr "– auswählen –"
+
+#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
+#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:926
+#: ../../include/text.php:938 ../../include/widgets.php:201
+msgid "Save"
+msgstr "Speichern"
 
 #: ../../Zotlabs/Module/Connections.php:56
 #: ../../Zotlabs/Module/Connections.php:161
@@ -1091,7 +1374,7 @@ msgstr "Archiviert"
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1535
+#: ../../include/conversation.php:1550
 msgid "New"
 msgstr "Neu"
 
@@ -1178,15 +1461,15 @@ msgstr "Verbindung ignorieren"
 msgid "Recent activity"
 msgstr "Kürzliche Aktivitäten"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
-#: ../../include/text.php:875 ../../include/nav.php:186
+#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209
+#: ../../include/nav.php:188 ../../include/text.php:855
 msgid "Connections"
 msgstr "Verbindungen"
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:228 ../../include/text.php:945
-#: ../../include/text.php:957 ../../include/nav.php:165
-#: ../../include/acl_selectors.php:276
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:167
+#: ../../include/text.php:925 ../../include/text.php:937
+#: ../../include/acl_selectors.php:274
 msgid "Search"
 msgstr "Suche"
 
@@ -1199,7 +1482,7 @@ msgid "Connections search"
 msgstr "Verbindung suchen"
 
 #: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:79
+#: ../../Zotlabs/Module/Profile_photo.php:61
 msgid "Image uploaded but image cropping failed."
 msgstr "Bild hochgeladen, aber das Zurechtschneiden schlug fehl."
 
@@ -1209,66 +1492,66 @@ msgid "Cover Photos"
 msgstr "Cover Foto"
 
 #: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:133
+#: ../../Zotlabs/Module/Profile_photo.php:135
 msgid "Image resize failed."
 msgstr "Bild-Anpassung fehlgeschlagen."
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144
+#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:148
 msgid "Unable to process image"
 msgstr "Kann Bild nicht verarbeiten"
 
 #: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:217
+#: ../../Zotlabs/Module/Profile_photo.php:223
 msgid "Image upload failed."
 msgstr "Hochladen des Bilds fehlgeschlagen."
 
 #: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:236
+#: ../../Zotlabs/Module/Profile_photo.php:242
 msgid "Unable to process image."
 msgstr "Kann Bild nicht verarbeiten."
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4270
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4283
 msgid "female"
 msgstr "weiblich"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4271
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4284
 #, 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:4272
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4285
 msgid "male"
 msgstr "männlich"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4273
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4286
 #, 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:4275
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4288
 #, 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/channel.php:1661
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1726
 msgid "cover photo"
 msgstr "Cover Foto"
 
 #: ../../Zotlabs/Module/Cover_photo.php:303
 #: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:283
-#: ../../Zotlabs/Module/Profile_photo.php:324
+#: ../../Zotlabs/Module/Profile_photo.php:300
+#: ../../Zotlabs/Module/Profile_photo.php:341
 msgid "Photo not available."
 msgstr "Foto nicht verfügbar."
 
 #: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:387
 msgid "Upload File:"
 msgstr "Datei hochladen:"
 
 #: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:366
+#: ../../Zotlabs/Module/Profile_photo.php:388
 msgid "Select a profile:"
 msgstr "Wähle ein Profil:"
 
@@ -1277,200 +1560,69 @@ msgid "Upload Cover Photo"
 msgstr "Cover Foto hochladen"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:985
+#: ../../Zotlabs/Module/Profile_photo.php:396
+#: ../../Zotlabs/Module/Settings.php:1080
 msgid "or"
 msgstr "oder"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "skip this step"
 msgstr "diesen Schritt überspringen"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "select a photo from your photo albums"
 msgstr "ein Foto aus meinen Fotoalben"
 
 #: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Profile_photo.php:415
 msgid "Crop Image"
 msgstr "Bild zuschneiden"
 
 #: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:391
+#: ../../Zotlabs/Module/Profile_photo.php:416
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Bitte schneide das Bild für eine optimale Anzeige passend zu."
 
 #: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:393
+#: ../../Zotlabs/Module/Profile_photo.php:418
 msgid "Done Editing"
 msgstr "Bearbeitung fertigstellen"
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
-msgstr "Element kann nicht bearbeitet werden."
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
+msgid "webpage"
+msgstr "Webseite"
 
-#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
-msgid "Edit post"
-msgstr "Bearbeite Beitrag"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
+msgid "block"
+msgstr "Block"
 
-#: ../../Zotlabs/Module/Events.php:26
-msgid "Calendar entries imported."
-msgstr "Kalendereinträge wurden importiert."
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
+msgid "layout"
+msgstr "Layout"
 
-#: ../../Zotlabs/Module/Events.php:28
-msgid "No calendar entries found."
-msgstr "Keine Kalendereinträge gefunden."
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
+msgid "menu"
+msgstr "Menü"
 
-#: ../../Zotlabs/Module/Events.php:105
-msgid "Event can not end before it has started."
-msgstr "Termin-Ende liegt vor dem Beginn."
+#: ../../Zotlabs/Module/Impel.php:187
+#, php-format
+msgid "%s element installed"
+msgstr "Element für %s installiert"
 
-#: ../../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/Impel.php:190
+#, php-format
+msgid "%s element installation failed"
+msgstr "Installation des Elements %s fehlgeschlagen"
 
-#: ../../Zotlabs/Module/Events.php:114
-msgid "Event title and start time are required."
-msgstr "Titel und Startzeit des Termins sind erforderlich."
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
+msgstr "Berechtigung verweigert."
 
-#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
-msgid "Event not found."
-msgstr "Termin nicht gefunden."
-
-#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949
-#: ../../include/text.php:1943 ../../include/conversation.php:123
-msgid "event"
-msgstr "Termin"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Edit event title"
-msgstr "Termintitel bearbeiten"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Event title"
-msgstr "Termintitel"
-
-#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
-#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
-#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
-#: ../../include/datetime.php:245
-msgid "Required"
-msgstr "Benötigt"
-
-#: ../../Zotlabs/Module/Events.php:451
-msgid "Categories (comma-separated list)"
-msgstr "Kategorien (Kommagetrennte Liste)"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Edit Category"
-msgstr "Kategorie bearbeiten"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Category"
-msgstr "Kategorie"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Edit start date and time"
-msgstr "Startdatum und -zeit bearbeiten"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Start date and time"
-msgstr "Startdatum und -zeit"
-
-#: ../../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:458
-msgid "Edit finish date and time"
-msgstr "Enddatum und -zeit bearbeiten"
-
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Finish date and time"
-msgstr "Enddatum und -zeit"
-
-#: ../../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: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:462
-msgid "Edit Description"
-msgstr "Beschreibung bearbeiten"
-
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117
-#: ../../Zotlabs/Module/Rbmark.php:101
-msgid "Description"
-msgstr "Beschreibung"
-
-#: ../../Zotlabs/Module/Events.php:464
-msgid "Edit Location"
-msgstr "Ort bearbeiten"
-
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
-#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
-msgid "Location"
-msgstr "Ort"
-
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
-msgid "Share this event"
-msgstr "Den Termin teilen"
-
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:719
-#: ../../include/conversation.php:1187 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr "Vorschau"
-
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232
-msgid "Permission settings"
-msgstr "Berechtigungs-Einstellungen"
-
-#: ../../Zotlabs/Module/Events.php:476
-msgid "Advanced Options"
-msgstr "Weitere Optionen"
-
-#: ../../Zotlabs/Module/Events.php:610
-msgid "Edit event"
-msgstr "Termin bearbeiten"
-
-#: ../../Zotlabs/Module/Events.php:612
-msgid "Delete event"
-msgstr "Termin löschen"
-
-#: ../../Zotlabs/Module/Events.php:646
-msgid "calendar"
-msgstr "Kalender"
-
-#: ../../Zotlabs/Module/Events.php:706
-msgid "Event removed"
-msgstr "Termin gelöscht"
-
-#: ../../Zotlabs/Module/Events.php:709
-msgid "Failed to remove event"
-msgstr "Termin konnte nicht gelöscht werden"
-
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220
-#: ../../include/nav.php:92 ../../include/conversation.php:1632
-msgid "Photos"
-msgstr "Fotos"
-
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591
-#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259
-msgid "Cancel"
-msgstr "Abbrechen"
+#: ../../Zotlabs/Module/Cal.php:337
+msgid "Import"
+msgstr "Import"
 
 #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
 msgid "This site is not a directory server"
@@ -1480,112 +1632,184 @@ msgstr "Diese Webseite ist kein Verzeichnisserver"
 msgid "This directory server requires an access token"
 msgstr "Dieser Verzeichnisserver benötigt einen Zugriffstoken"
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
-msgstr "Speichern in Ordner:"
+#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:28
+#: ../../Zotlabs/Module/Wiki.php:20
+msgid "You must be logged in to see this page."
+msgstr "Du musst angemeldet sein, um diese Seite betrachten zu können."
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
-msgstr "– auswählen –"
+#: ../../Zotlabs/Module/Chat.php:181
+msgid "Room not found"
+msgstr "Chatraum nicht gefunden"
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
-#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:946
-#: ../../include/text.php:958 ../../include/widgets.php:201
-msgid "Save"
-msgstr "Speichern"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "Leave Room"
+msgstr "Raum verlassen"
 
-#: ../../Zotlabs/Module/Dreport.php:27
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "Delete Room"
+msgstr "Raum löschen"
+
+#: ../../Zotlabs/Module/Chat.php:199
+msgid "I am away right now"
+msgstr "Ich bin gerade nicht da"
+
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "I am online"
+msgstr "Ich bin online"
+
+#: ../../Zotlabs/Module/Chat.php:202
+msgid "Bookmark this room"
+msgstr "Lesezeichen für diesen Raum setzen"
+
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:197
+#: ../../Zotlabs/Module/Mail.php:306 ../../include/conversation.php:1181
+msgid "Please enter a link URL:"
+msgstr "Gib eine URL ein:"
+
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:250
+#: ../../Zotlabs/Module/Mail.php:375 ../../Zotlabs/Lib/ThreadItem.php:722
+#: ../../include/conversation.php:1271
+msgid "Encrypt text"
+msgstr "Text verschlüsseln"
+
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editwebpage.php:146
+#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:369
+#: ../../Zotlabs/Module/Editblock.php:111 ../../include/conversation.php:1146
+msgid "Insert web link"
+msgstr "Link einfügen"
+
+#: ../../Zotlabs/Module/Chat.php:218
+msgid "Feature disabled."
+msgstr "Funktion deaktiviert."
+
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "New Chatroom"
+msgstr "Neuer Chatraum"
+
+#: ../../Zotlabs/Module/Chat.php:233
+msgid "Chatroom name"
+msgstr "Chatraumname"
+
+#: ../../Zotlabs/Module/Chat.php:234
+msgid "Expiration of chats (minutes)"
+msgstr "Verfall von Chats (Minuten)"
+
+#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
+#: ../../include/acl_selectors.php:281
+msgid "Permissions"
+msgstr "Berechtigungen"
+
+#: ../../Zotlabs/Module/Chat.php:246
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "%1$ss Chaträume"
+
+#: ../../Zotlabs/Module/Chat.php:251
+msgid "No chatrooms available"
+msgstr "Keine Chaträume verfügbar"
+
+#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create New"
+msgstr "Neu anlegen"
+
+#: ../../Zotlabs/Module/Chat.php:255
+msgid "Expiration"
+msgstr "Verfall"
+
+#: ../../Zotlabs/Module/Chat.php:256
+msgid "min"
+msgstr "min"
+
+#: ../../Zotlabs/Module/Dreport.php:44
 msgid "Invalid message"
 msgstr "Ungültige Beitrags-ID (mid)"
 
-#: ../../Zotlabs/Module/Dreport.php:59
+#: ../../Zotlabs/Module/Dreport.php:76
 msgid "no results"
 msgstr "keine Ergebnisse"
 
-#: ../../Zotlabs/Module/Dreport.php:64
+#: ../../Zotlabs/Module/Dreport.php:91
+msgid "channel sync processed"
+msgstr "Kanal-Sync verarbeitet"
+
+#: ../../Zotlabs/Module/Dreport.php:95
+msgid "queued"
+msgstr "zur Warteschlange hinzugefügt"
+
+#: ../../Zotlabs/Module/Dreport.php:99
+msgid "posted"
+msgstr "zugestellt"
+
+#: ../../Zotlabs/Module/Dreport.php:103
+msgid "accepted for delivery"
+msgstr "für Zustellung akzeptiert"
+
+#: ../../Zotlabs/Module/Dreport.php:107
+msgid "updated"
+msgstr "aktualisiert"
+
+#: ../../Zotlabs/Module/Dreport.php:110
+msgid "update ignored"
+msgstr "Aktualisierung ignoriert"
+
+#: ../../Zotlabs/Module/Dreport.php:113
+msgid "permission denied"
+msgstr "Zugriff verweigert"
+
+#: ../../Zotlabs/Module/Dreport.php:117
+msgid "recipient not found"
+msgstr "Empfänger nicht gefunden."
+
+#: ../../Zotlabs/Module/Dreport.php:120
+msgid "mail recalled"
+msgstr "Mail widerrufen"
+
+#: ../../Zotlabs/Module/Dreport.php:123
+msgid "duplicate mail received"
+msgstr "Doppelte Mail erhalten"
+
+#: ../../Zotlabs/Module/Dreport.php:126
+msgid "mail delivered"
+msgstr "Mail zugestellt"
+
+#: ../../Zotlabs/Module/Dreport.php:146
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Zustellungsbericht für %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "channel sync processed"
-msgstr "Kanal-Sync verarbeitet"
+#: ../../Zotlabs/Module/Dreport.php:149
+msgid "Options"
+msgstr "Optionen"
 
-#: ../../Zotlabs/Module/Dreport.php:82
-msgid "queued"
-msgstr "zur Warteschlange hinzugefügt"
+#: ../../Zotlabs/Module/Dreport.php:150
+msgid "Redeliver"
+msgstr "Erneut zustellen"
 
-#: ../../Zotlabs/Module/Dreport.php:86
-msgid "posted"
-msgstr "zugestellt"
-
-#: ../../Zotlabs/Module/Dreport.php:90
-msgid "accepted for delivery"
-msgstr "für Zustellung akzeptiert"
-
-#: ../../Zotlabs/Module/Dreport.php:94
-msgid "updated"
-msgstr "aktualisiert"
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "update ignored"
-msgstr "Aktualisierung ignoriert"
-
-#: ../../Zotlabs/Module/Dreport.php:100
-msgid "permission denied"
-msgstr "Zugriff verweigert"
-
-#: ../../Zotlabs/Module/Dreport.php:104
-msgid "recipient not found"
-msgstr "Empfänger nicht gefunden."
-
-#: ../../Zotlabs/Module/Dreport.php:107
-msgid "mail recalled"
-msgstr "Mail widerrufen"
-
-#: ../../Zotlabs/Module/Dreport.php:110
-msgid "duplicate mail received"
-msgstr "Doppelte Mail erhalten"
-
-#: ../../Zotlabs/Module/Dreport.php:113
-msgid "mail delivered"
-msgstr "Mail zugestellt"
-
-#: ../../Zotlabs/Module/Editlayout.php:126
-#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
+#: ../../Zotlabs/Module/Editlayout.php:127
+#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
 msgid "Layout Name"
 msgstr "Layout-Name"
 
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:130
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:131
 msgid "Layout Description (Optional)"
 msgstr "Layout-Beschreibung (optional)"
 
-#: ../../Zotlabs/Module/Editlayout.php:135
+#: ../../Zotlabs/Module/Editlayout.php:136
 msgid "Edit Layout"
 msgstr "Layout bearbeiten"
 
-#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Zotlabs/Module/Editwebpage.php:142
 msgid "Page link"
 msgstr "Seiten-Link"
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Editwebpage.php:168
 msgid "Edit Webpage"
 msgstr "Webseite bearbeiten"
 
-#: ../../Zotlabs/Module/Follow.php:34
-msgid "Channel added."
-msgstr "Kanal hinzugefügt."
-
-#: ../../Zotlabs/Module/Acl.php:227
-msgid "network"
-msgstr "Netzwerk"
-
-#: ../../Zotlabs/Module/Acl.php:237
-msgid "RSS"
-msgstr "RSS"
-
 #: ../../Zotlabs/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "Gruppe wurde erstellt."
@@ -1595,7 +1819,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:3893
+#: ../../include/items.php:3902
 msgid "Privacy group not found."
 msgstr "Gruppe nicht gefunden."
 
@@ -1639,31 +1863,57 @@ msgstr "Alle verbundenen Kanäle"
 msgid "Click on a channel to add or remove."
 msgstr "Wähle einen Kanal zum hinzufügen oder entfernen aus."
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
-msgid "Share content from Firefox to $Projectname"
-msgstr "Inhalte von Firefox nach $Projectname teilen"
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+msgid "App installed."
+msgstr "App installiert."
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
-msgid "Activate the Firefox $Projectname provider"
-msgstr "Aktiviert den $Projectname-Provider für firefox"
+#: ../../Zotlabs/Module/Appman.php:46
+msgid "Malformed app."
+msgstr "Fehlerhafte App."
 
-#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
-msgid "Authorize application connection"
-msgstr "Zugriff für die Anwendung autorisieren"
+#: ../../Zotlabs/Module/Appman.php:104
+msgid "Embed code"
+msgstr "Code einbetten"
 
-#: ../../Zotlabs/Module/Api.php:62
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:"
+#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
+msgid "Edit App"
+msgstr "App bearbeiten"
 
-#: ../../Zotlabs/Module/Api.php:72
-msgid "Please login to continue."
-msgstr "Zum Weitermachen, bitte einloggen."
+#: ../../Zotlabs/Module/Appman.php:110
+msgid "Create App"
+msgstr "App erstellen"
 
-#: ../../Zotlabs/Module/Api.php:87
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" 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:115
+msgid "Name of app"
+msgstr "Name der App"
+
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Location (URL) of app"
+msgstr "Ort (URL) der App"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Photo icon URL"
+msgstr "URL zum Icon"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "80 x 80 pixels - optional"
+msgstr "80 x 80 Pixel – optional"
+
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "Categories (optional, comma separated list)"
+msgstr "Kategorien (optional, kommagetrennte Liste)"
+
+#: ../../Zotlabs/Module/Appman.php:120
+msgid "Version ID"
+msgstr "Versions-ID"
+
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Price of app"
+msgstr "Preis der App"
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Location (URL) to purchase app"
+msgstr "Ort (URL), um die App zu kaufen"
 
 #: ../../Zotlabs/Module/Help.php:26
 msgid "Documentation Search"
@@ -1675,8 +1925,8 @@ msgid "Help:"
 msgstr "Hilfe:"
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223
-#: ../../include/nav.php:159
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/nav.php:161
 msgid "Help"
 msgstr "Hilfe"
 
@@ -1684,335 +1934,124 @@ msgstr "Hilfe"
 msgid "$Projectname Documentation"
 msgstr "$Projectname-Dokumentation"
 
-#: ../../Zotlabs/Module/Filestorage.php:88
-msgid "Permission Denied."
-msgstr "Zugriff verweigert."
-
-#: ../../Zotlabs/Module/Filestorage.php:104
-msgid "File not found."
-msgstr "Datei nicht gefunden."
-
-#: ../../Zotlabs/Module/Filestorage.php:147
-msgid "Edit file permissions"
-msgstr "Dateiberechtigungen bearbeiten"
-
-#: ../../Zotlabs/Module/Filestorage.php:156
-msgid "Set/edit permissions"
-msgstr "Berechtigungen setzen/ändern"
-
-#: ../../Zotlabs/Module/Filestorage.php:157
-msgid "Include all files and sub folders"
-msgstr "Alle Dateien und Unterverzeichnisse einbinden"
-
-#: ../../Zotlabs/Module/Filestorage.php:158
-msgid "Return to file list"
-msgstr "Zurück zur Dateiliste"
-
-#: ../../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: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:163
-msgid "Share this file"
-msgstr "Diese Datei freigeben"
-
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Show URL to this file"
-msgstr "URL zu dieser Datei anzeigen"
-
-#: ../../Zotlabs/Module/Filestorage.php:165
-msgid "Notify your contacts about this file"
-msgstr "Meine Kontakte über diese Datei benachrichtigen"
-
-#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
-#: ../../include/nav.php:163
-msgid "Apps"
-msgstr "Apps"
-
 #: ../../Zotlabs/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Element nicht verfügbar."
 
-#: ../../Zotlabs/Module/Import.php:32
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "Dein Vertrag erlaubt nur %d Kanäle."
+#: ../../Zotlabs/Module/Pdledit.php:18
+msgid "Layout updated."
+msgstr "Layout aktualisiert."
 
-#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
-msgstr "Nichts zu importieren."
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
+msgid "Edit System Page Description"
+msgstr "Systemseitenbeschreibung bearbeiten"
 
-#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
-msgstr "Daten können vom alten Server nicht heruntergeladen werden"
+#: ../../Zotlabs/Module/Pdledit.php:56
+msgid "Layout not found."
+msgstr "Layout nicht gefunden."
 
-#: ../../Zotlabs/Module/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
-msgstr "Die importierte Datei ist leer."
+#: ../../Zotlabs/Module/Pdledit.php:62
+msgid "Module Name:"
+msgstr "Modulname:"
 
-#: ../../Zotlabs/Module/Import.php:122
-#: ../../Zotlabs/Module/Import_items.php:86
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Achtung: Datenbankversionen unterscheiden sich um %1$d Aktualisierungen."
+#: ../../Zotlabs/Module/Pdledit.php:63
+msgid "Layout Help"
+msgstr "Layout-Hilfe"
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
-msgid "Cloned channel not found. Import failed."
-msgstr "Geklonter Kanal nicht gefunden. Import fehlgeschlagen."
+#: ../../Zotlabs/Module/Ffsapi.php:12
+msgid "Share content from Firefox to $Projectname"
+msgstr "Inhalte von Firefox nach $Projectname teilen"
 
-#: ../../Zotlabs/Module/Import.php:160
-msgid "No channel. Import failed."
-msgstr "Kein Kanal. Import fehlgeschlagen."
+#: ../../Zotlabs/Module/Ffsapi.php:15
+msgid "Activate the Firefox $Projectname provider"
+msgstr "Aktiviert den $Projectname-Provider für firefox"
 
-#: ../../Zotlabs/Module/Import.php:510
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
-msgstr "Import abgeschlossen."
+#: ../../Zotlabs/Module/Acl.php:312
+msgid "network"
+msgstr "Netzwerk"
 
-#: ../../Zotlabs/Module/Import.php:532
-msgid "You must be logged in to use this feature."
-msgstr "Du musst angemeldet sein um diese Funktion zu nutzen."
+#: ../../Zotlabs/Module/Acl.php:322
+msgid "RSS"
+msgstr "RSS"
 
-#: ../../Zotlabs/Module/Import.php:537
-msgid "Import Channel"
-msgstr "Kanal importieren"
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
+msgstr "Zugriff verweigert."
 
-#: ../../Zotlabs/Module/Import.php:538
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You"
-" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file."
-msgstr "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren."
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
+msgstr "Datei nicht gefunden."
 
-#: ../../Zotlabs/Module/Import.php:539
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "File to Upload"
-msgstr "Hochzuladende Datei:"
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
+msgstr "Dateiberechtigungen bearbeiten"
 
-#: ../../Zotlabs/Module/Import.php:540
-msgid "Or provide the old server/hub details"
-msgstr "Oder gib die Details Deines bisherigen $Projectname-Hubs ein"
+#: ../../Zotlabs/Module/Filestorage.php:155
+msgid "Set/edit permissions"
+msgstr "Berechtigungen setzen/ändern"
 
-#: ../../Zotlabs/Module/Import.php:541
-msgid "Your old identity address (xyz@example.com)"
-msgstr "Bisherige Kanal-Adresse (xyz@example.com)"
+#: ../../Zotlabs/Module/Filestorage.php:156
+msgid "Include all files and sub folders"
+msgstr "Alle Dateien und Unterverzeichnisse einbinden"
 
-#: ../../Zotlabs/Module/Import.php:542
-msgid "Your old login email address"
-msgstr "Deine alte Login-E-Mail-Adresse"
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Return to file list"
+msgstr "Zurück zur Dateiliste"
 
-#: ../../Zotlabs/Module/Import.php:543
-msgid "Your old login password"
-msgstr "Dein altes Passwort"
+#: ../../Zotlabs/Module/Filestorage.php:159
+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/Import.php:544
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be"
-" able to post from either location, but only one can be marked as the "
-"primary location for files, photos, and media."
-msgstr "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige $Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein."
+#: ../../Zotlabs/Module/Filestorage.php:160
+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/Import.php:545
-msgid "Make this hub my primary location"
-msgstr "Dieser $Pojectname-Hub ist mein primärer Hub."
+#: ../../Zotlabs/Module/Filestorage.php:162
+msgid "Share this file"
+msgstr "Diese Datei freigeben"
 
-#: ../../Zotlabs/Module/Import.php:546
-msgid ""
-"Import existing posts if possible (experimental - limited by available "
-"memory"
-msgstr "Importiere bestehende Beiträge falls möglich (experimentell - begrenzt durch zur Verfügung stehenden Speicher"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Show URL to this file"
+msgstr "URL zu dieser Datei anzeigen"
 
-#: ../../Zotlabs/Module/Import.php:547
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
-msgstr "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen."
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Notify your contacts about this file"
+msgstr "Meine Kontakte über diese Datei benachrichtigen"
 
-#: ../../Zotlabs/Module/Item.php:178
-msgid "Unable to locate original post."
-msgstr "Originalbeitrag nicht gefunden."
-
-#: ../../Zotlabs/Module/Item.php:427
-msgid "Empty post discarded."
-msgstr "Leeren Beitrag verworfen."
-
-#: ../../Zotlabs/Module/Item.php:467
-msgid "Executable content type not permitted to this channel."
-msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
-
-#: ../../Zotlabs/Module/Item.php:847
-msgid "Duplicate post suppressed."
-msgstr "Doppelter Beitrag unterdrückt."
-
-#: ../../Zotlabs/Module/Item.php:977
-msgid "System error. Post not saved."
-msgstr "Systemfehler. Beitrag nicht gespeichert."
-
-#: ../../Zotlabs/Module/Item.php:1241
-msgid "Unable to obtain post information from database."
-msgstr "Beitragsinformationen können nicht aus der Datenbank abgerufen werden."
-
-#: ../../Zotlabs/Module/Item.php:1248
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
-
-#: ../../Zotlabs/Module/Item.php:1255
-#, php-format
-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:181 ../../include/text.php:2267
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2240
 msgid "Layouts"
 msgstr "Layouts"
 
-#: ../../Zotlabs/Module/Layouts.php:183
+#: ../../Zotlabs/Module/Layouts.php:185
 msgid "Comanche page description language help"
 msgstr "Hilfe zur Comanche-Seitenbeschreibungssprache"
 
-#: ../../Zotlabs/Module/Layouts.php:187
+#: ../../Zotlabs/Module/Layouts.php:189
 msgid "Layout Description"
 msgstr "Layout-Beschreibung"
 
-#: ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:114
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Webpages.php:205
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr "Erstellt"
+
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:115
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Webpages.php:206
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+msgstr "Geändert"
+
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1070
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:195
+#: ../../include/conversation.php:1219
+msgid "Share"
+msgstr "Teilen"
+
+#: ../../Zotlabs/Module/Layouts.php:194
 msgid "Download PDL file"
 msgstr "PDL-Datei herunterladen"
 
-#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
-#: ../../Zotlabs/Module/Siteinfo.php:65
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../Zotlabs/Module/Home.php:79
-#, php-format
-msgid "Welcome to %s"
-msgstr "Willkommen auf %s"
-
-#: ../../Zotlabs/Module/Id.php:13
-msgid "First Name"
-msgstr "Vorname"
-
-#: ../../Zotlabs/Module/Id.php:14
-msgid "Last Name"
-msgstr "Nachname"
-
-#: ../../Zotlabs/Module/Id.php:15
-msgid "Nickname"
-msgstr "Spitzname"
-
-#: ../../Zotlabs/Module/Id.php:16
-msgid "Full Name"
-msgstr "Voller Name"
-
-#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
-#: ../../include/network.php:2151 ../../boot.php:1705
-msgid "Email"
-msgstr "E-Mail"
-
-#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236
-msgid "Profile Photo"
-msgstr "Profilfoto"
-
-#: ../../Zotlabs/Module/Id.php:22
-msgid "Profile Photo 16px"
-msgstr "Profilfoto 16 px"
-
-#: ../../Zotlabs/Module/Id.php:23
-msgid "Profile Photo 32px"
-msgstr "Profilfoto 32 px"
-
-#: ../../Zotlabs/Module/Id.php:24
-msgid "Profile Photo 48px"
-msgstr "Profilfoto 48 px"
-
-#: ../../Zotlabs/Module/Id.php:25
-msgid "Profile Photo 64px"
-msgstr "Profilfoto 64 px"
-
-#: ../../Zotlabs/Module/Id.php:26
-msgid "Profile Photo 80px"
-msgstr "Profilfoto 80 px"
-
-#: ../../Zotlabs/Module/Id.php:27
-msgid "Profile Photo 128px"
-msgstr "Profilfoto 128 px"
-
-#: ../../Zotlabs/Module/Id.php:28
-msgid "Timezone"
-msgstr "Zeitzone"
-
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
-msgid "Homepage URL"
-msgstr "Homepage-URL"
-
-#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234
-msgid "Language"
-msgstr "Sprache"
-
-#: ../../Zotlabs/Module/Id.php:31
-msgid "Birth Year"
-msgstr "Geburtsjahr"
-
-#: ../../Zotlabs/Module/Id.php:32
-msgid "Birth Month"
-msgstr "Geburtsmonat"
-
-#: ../../Zotlabs/Module/Id.php:33
-msgid "Birth Day"
-msgstr "Geburtstag"
-
-#: ../../Zotlabs/Module/Id.php:34
-msgid "Birthdate"
-msgstr "Geburtsdatum"
-
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
-msgid "Gender"
-msgstr "Geschlecht"
-
-#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Male"
-msgstr "Männlich"
-
-#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Female"
-msgstr "Weiblich"
-
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
-msgid "webpage"
-msgstr "Webseite"
-
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
-msgid "block"
-msgstr "Block"
-
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
-msgid "layout"
-msgstr "Layout"
-
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
-msgid "menu"
-msgstr "Menü"
-
-#: ../../Zotlabs/Module/Impel.php:196
-#, php-format
-msgid "%s element installed"
-msgstr "Element für %s installiert"
-
-#: ../../Zotlabs/Module/Impel.php:199
-#, php-format
-msgid "%s element installation failed"
-msgstr "Installation des Elements %s fehlgeschlagen"
-
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr "Mögen/Nicht mögen"
@@ -2048,1180 +2087,65 @@ msgstr "Kanal nicht vorhanden."
 msgid "Previous action reversed."
 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/text.php:1940
-#: ../../include/conversation.php:120
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
+#: ../../include/text.php:1921
 msgid "photo"
 msgstr "Foto"
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/text.php:1946 ../../include/conversation.php:148
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../include/conversation.php:148 ../../include/text.php:1927
 msgid "status"
 msgstr "Status"
 
-#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
+#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s gefällt %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s gefällt %2$ss %3$s nicht"
 
-#: ../../Zotlabs/Module/Like.php:424
+#: ../../Zotlabs/Module/Like.php:423
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s stimmt %2$ss %3$s zu"
 
-#: ../../Zotlabs/Module/Like.php:426
+#: ../../Zotlabs/Module/Like.php:425
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s lehnt %2$ss %3$s ab"
 
-#: ../../Zotlabs/Module/Like.php:428
+#: ../../Zotlabs/Module/Like.php:427
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s enthält sich zu %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:430
+#: ../../Zotlabs/Module/Like.php:429
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s nimmt an %2$ss %3$s teil"
 
-#: ../../Zotlabs/Module/Like.php:432
+#: ../../Zotlabs/Module/Like.php:431
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s nimmt an %2$ss %3$s nicht teil"
 
-#: ../../Zotlabs/Module/Like.php:434
+#: ../../Zotlabs/Module/Like.php:433
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s nimmt vielleicht an %2$ss %3$s teil"
 
-#: ../../Zotlabs/Module/Like.php:537
+#: ../../Zotlabs/Module/Like.php:536
 msgid "Action completed."
 msgstr "Aktion durchgeführt."
 
-#: ../../Zotlabs/Module/Like.php:538
+#: ../../Zotlabs/Module/Like.php:537
 msgid "Thank you."
 msgstr "Vielen Dank."
 
-#: ../../Zotlabs/Module/Import_items.php:102
-msgid "Import completed"
-msgstr "Import abgeschlossen"
-
-#: ../../Zotlabs/Module/Import_items.php:117
-msgid "Import Items"
-msgstr "Beiträge importieren"
-
-#: ../../Zotlabs/Module/Import_items.php:118
-msgid ""
-"Use this form to import existing posts and content from an export file."
-msgstr "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren."
-
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
-msgstr "Einladungslimit überschritten."
-
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : Keine gültige Email Adresse."
-
-#: ../../Zotlabs/Module/Invite.php:63
-msgid "Please join us on $Projectname"
-msgstr "Schließe Dich uns auf $Projectname an!"
-
-#: ../../Zotlabs/Module/Invite.php:74
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines $Projectname-Servers."
-
-#: ../../Zotlabs/Module/Invite.php:79
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Nachricht konnte nicht zugestellt werden."
-
-#: ../../Zotlabs/Module/Invite.php:83
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d Nachricht gesendet."
-msgstr[1] "%d Nachrichten gesendet."
-
-#: ../../Zotlabs/Module/Invite.php:102
-msgid "You have no more invitations available"
-msgstr "Du hast keine weiteren verfügbare Einladungen"
-
-#: ../../Zotlabs/Module/Invite.php:133
-msgid "Send invitations"
-msgstr "Einladungen senden"
-
-#: ../../Zotlabs/Module/Invite.php:134
-msgid "Enter email addresses, one per line:"
-msgstr "Email-Adressen eintragen, eine pro Zeile:"
-
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
-msgid "Your message:"
-msgstr "Deine Nachricht:"
-
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Please join my community on $Projectname."
-msgstr "Schließe Dich uns auf $Projectname an!"
-
-#: ../../Zotlabs/Module/Invite.php:138
-msgid "You will need to supply this invitation code:"
-msgstr "Bitte verwende bei der Registrierung den folgenden Einladungscode:"
-
-#: ../../Zotlabs/Module/Invite.php:139
-msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Registriere Dich auf einem beliebigen $Projectname-Hub (sie sind alle miteinander verbunden)"
-
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Gib meine $Projectname-Adresse im Suchfeld ein."
-
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "or visit"
-msgstr "oder besuche"
-
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "3. Click [Connect]"
-msgstr "3. Klicke auf [Verbinden]"
-
-#: ../../Zotlabs/Module/Lockview.php:61
-msgid "Remote privacy information not available."
-msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
-
-#: ../../Zotlabs/Module/Lockview.php:82
-msgid "Visible to:"
-msgstr "Sichtbar für:"
-
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
-msgstr "Klon nicht gefunden."
-
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
-msgstr "Nachschlagen des Kanal-Ortes fehlgeschlagen"
-
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary"
-" location."
-msgstr "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst."
-
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
-msgstr "Synchronisiere Klone"
-
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
-msgstr "Keine Klon-Adressen gefunden."
-
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
-msgstr "Klon-Adressen verwalten"
-
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470
-#: ../../Zotlabs/Module/Admin.php:1224
-msgid "Address"
-msgstr "Adresse"
-
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
-msgstr "Primär"
-
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
-msgid "Drop"
-msgstr "Löschen"
-
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
-msgstr "Jetzt synchronisieren"
-
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
-msgstr "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!"
-
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing"
-" your channel."
-msgstr "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst."
-
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
-msgstr "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt."
-
-#: ../../Zotlabs/Module/Magic.php:71
-msgid "Hub not found."
-msgstr "Server nicht gefunden."
-
-#: ../../Zotlabs/Module/Mail.php:38
-msgid "Unable to lookup recipient."
-msgstr "Konnte den Empfänger nicht finden."
-
-#: ../../Zotlabs/Module/Mail.php:45
-msgid "Unable to communicate with requested channel."
-msgstr "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen."
-
-#: ../../Zotlabs/Module/Mail.php:52
-msgid "Cannot verify requested channel."
-msgstr "Verifizierung des angeforderten Kanals fehlgeschlagen."
-
-#: ../../Zotlabs/Module/Mail.php:78
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen."
-
-#: ../../Zotlabs/Module/Mail.php:143
-msgid "Messages"
-msgstr "Nachrichten"
-
-#: ../../Zotlabs/Module/Mail.php:178
-msgid "Message recalled."
-msgstr "Nachricht widerrufen."
-
-#: ../../Zotlabs/Module/Mail.php:191
-msgid "Conversation removed."
-msgstr "Unterhaltung gelöscht."
-
-#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Verfällt YYYY-MM-DD HH;MM"
-
-#: ../../Zotlabs/Module/Mail.php:234
-msgid "Requested channel is not in this network"
-msgstr "Angeforderter Kanal ist nicht in diesem Netzwerk."
-
-#: ../../Zotlabs/Module/Mail.php:242
-msgid "Send Private Message"
-msgstr "Private Nachricht senden"
-
-#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
-msgid "To:"
-msgstr "An:"
-
-#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
-msgid "Subject:"
-msgstr "Betreff:"
-
-#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
-#: ../../include/conversation.php:1220
-msgid "Attach file"
-msgstr "Datei anhängen"
-
-#: ../../Zotlabs/Module/Mail.php:253
-msgid "Send"
-msgstr "Absenden"
-
-#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
-#: ../../include/conversation.php:1251
-msgid "Set expiration date"
-msgstr "Verfallsdatum"
-
-#: ../../Zotlabs/Module/Mail.php:340
-msgid "Delete message"
-msgstr "Nachricht löschen"
-
-#: ../../Zotlabs/Module/Mail.php:341
-msgid "Delivery report"
-msgstr "Zustellungsbericht"
-
-#: ../../Zotlabs/Module/Mail.php:342
-msgid "Recall message"
-msgstr "Nachricht widerrufen"
-
-#: ../../Zotlabs/Module/Mail.php:344
-msgid "Message has been recalled."
-msgstr "Die Nachricht wurde widerrufen."
-
-#: ../../Zotlabs/Module/Mail.php:361
-msgid "Delete Conversation"
-msgstr "Unterhaltung löschen"
-
-#: ../../Zotlabs/Module/Mail.php:363
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten."
-
-#: ../../Zotlabs/Module/Mail.php:367
-msgid "Send Reply"
-msgstr "Antwort senden"
-
-#: ../../Zotlabs/Module/Mail.php:372
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr "Deine Nachricht für %s (%s):"
-
-#: ../../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:143
-msgid "Create a new channel"
-msgstr "Neuen Kanal anlegen"
-
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
-#: ../../include/nav.php:206
-msgid "Channel Manager"
-msgstr "Kanal-Manager"
-
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
-msgstr "Aktueller Kanal"
-
-#: ../../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:168
-msgid "Default Channel"
-msgstr "Standard Kanal"
-
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
-msgstr "Zum Standard machen"
-
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
-msgstr "%d neue Nachrichten"
-
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
-msgstr "%d neue Vorstellungen"
-
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
-msgstr "Delegierte Kanäle"
-
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr "Kein gültiges Konto gefunden."
-
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."
-
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Nutzer (%s)"
-
-#: ../../Zotlabs/Module/Lostpass.php:44
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Passwort-Rücksetzung auf %s angefordert"
-
-#: ../../Zotlabs/Module/Lostpass.php:67
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"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:1711
-msgid "Password Reset"
-msgstr "Zurücksetzen des Kennworts"
-
-#: ../../Zotlabs/Module/Lostpass.php:91
-msgid "Your password has been reset as requested."
-msgstr "Dein Passwort wurde wie angefordert neu erstellt."
-
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your new password is"
-msgstr "Dein neues Passwort lautet"
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Save or copy your new password - and then"
-msgstr "Speichere oder kopiere Dein neues Passwort – und dann"
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "click here to login"
-msgstr "Klicke hier, um dich anzumelden"
-
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden."
-
-#: ../../Zotlabs/Module/Lostpass.php:112
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Auf %s wurde Dein Passwort geändert"
-
-#: ../../Zotlabs/Module/Lostpass.php:127
-msgid "Forgot your Password?"
-msgstr "Kennwort vergessen?"
-
-#: ../../Zotlabs/Module/Lostpass.php:128
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."
-
-#: ../../Zotlabs/Module/Lostpass.php:129
-msgid "Email Address"
-msgstr "E-Mail Adresse"
-
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Reset"
-msgstr "Zurücksetzen"
-
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
-msgstr "Kann Menü nicht aktualisieren."
-
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
-msgstr "Kann Menü nicht erstellen."
-
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
-msgstr "Name des Menüs"
-
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich"
-
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
-msgstr "Menütitel"
-
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Sichtbar auf der Webseite – für keinen Titel leer lassen"
-
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
-msgstr "Lesezeichen erlauben"
-
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
-msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
-
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
-msgstr "Absenden und fortfahren"
-
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2266
-msgid "Menus"
-msgstr "Menüs"
-
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
-msgstr "Lesezeichen erlaubt"
-
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
-msgstr "Lösche dieses Menü"
-
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
-msgstr "Bearbeite Menü Inhalte"
-
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
-msgstr "Dieses Menü bearbeiten"
-
-#: ../../Zotlabs/Module/Menu.php:136
-msgid "Menu could not be deleted."
-msgstr "Menü konnte nicht gelöscht werden."
-
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
-msgid "Menu not found."
-msgstr "Menü nicht gefunden"
-
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
-msgstr "Menü bearbeiten"
-
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
-msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
-msgstr "Menü Name"
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
-msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
-msgstr "Menü Titel"
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title as seen by others"
-msgstr "Menü Titel wie er von anderen gesehen wird"
-
-#: ../../Zotlabs/Module/Menu.php:157
-msgid "Allow bookmarks"
-msgstr "Erlaube Lesezeichen"
-
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
-msgstr "Nicht gefunden."
-
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr "%1$s ist %2$s"
-
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225
-msgid "Mood"
-msgstr "Laune"
-
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
-msgstr "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden"
-
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
-msgstr "Profil-Übereinstimmungen"
-
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu."
-
-#: ../../Zotlabs/Module/Match.php:67
-msgid "is interested in:"
-msgstr "interessiert sich für:"
-
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
-msgstr "Keine Übereinstimmungen"
-
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
-msgstr "Gruppe nicht gefunden"
-
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
-msgstr "Kanal nicht gefunden"
-
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
-msgstr "Forum"
-
-#: ../../Zotlabs/Module/Network.php:153
-msgid "Search Results For:"
-msgstr "Suchergebnisse für:"
-
-#: ../../Zotlabs/Module/Network.php:217
-msgid "Privacy group is empty"
-msgstr "Gruppe ist leer"
-
-#: ../../Zotlabs/Module/Network.php:226
-msgid "Privacy group: "
-msgstr "Gruppe:"
-
-#: ../../Zotlabs/Module/Network.php:252
-msgid "Invalid connection."
-msgstr "Ungültige Verbindung."
-
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:98
-msgid "No more system notifications."
-msgstr "Keine System-Benachrichtigungen mehr."
-
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:102
-msgid "System Notifications"
-msgstr "System-Benachrichtigungen"
-
-#: ../../Zotlabs/Module/Mitem.php:52
-msgid "Unable to create element."
-msgstr "Element konnte nicht erstellt werden."
-
-#: ../../Zotlabs/Module/Mitem.php:76
-msgid "Unable to update menu element."
-msgstr "Kann Menü-Element nicht aktualisieren."
-
-#: ../../Zotlabs/Module/Mitem.php:92
-msgid "Unable to add menu element."
-msgstr "Kann Menü-Bestandteil nicht hinzufügen."
-
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
-msgid "Menu Item Permissions"
-msgstr "Zugriffsrechte des Menü-Elements"
-
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1068
-msgid "(click to open/close)"
-msgstr "(zum öffnen/schließen anklicken)"
-
-#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
-msgid "Link Name"
-msgstr "Name des Links"
-
-#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
-msgid "Link or Submenu Target"
-msgstr "Ziel des Links oder Untermenüs"
-
-#: ../../Zotlabs/Module/Mitem.php:157
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen."
-
-#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
-msgid "Use magic-auth if available"
-msgstr "Magic-Auth verwenden, falls verfügbar"
-
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
-msgid "Open link in new window"
-msgstr "Öffne Link in neuem Fenster"
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Order in list"
-msgstr "Reihenfolge in der Liste"
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
-
-#: ../../Zotlabs/Module/Mitem.php:161
-msgid "Submit and finish"
-msgstr "Absenden und fertigstellen"
-
-#: ../../Zotlabs/Module/Mitem.php:162
-msgid "Submit and continue"
-msgstr "Absenden und fortfahren"
-
-#: ../../Zotlabs/Module/Mitem.php:170
-msgid "Menu:"
-msgstr "Menü:"
-
-#: ../../Zotlabs/Module/Mitem.php:173
-msgid "Link Target"
-msgstr "Ziel des Links"
-
-#: ../../Zotlabs/Module/Mitem.php:176
-msgid "Edit menu"
-msgstr "Menü bearbeiten"
-
-#: ../../Zotlabs/Module/Mitem.php:179
-msgid "Edit element"
-msgstr "Bestandteil bearbeiten"
-
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Drop element"
-msgstr "Bestandteil löschen"
-
-#: ../../Zotlabs/Module/Mitem.php:181
-msgid "New element"
-msgstr "Neues Bestandteil"
-
-#: ../../Zotlabs/Module/Mitem.php:182
-msgid "Edit this menu container"
-msgstr "Diesen Menü-Container bearbeiten"
-
-#: ../../Zotlabs/Module/Mitem.php:183
-msgid "Add menu element"
-msgstr "Menüelement hinzufügen"
-
-#: ../../Zotlabs/Module/Mitem.php:184
-msgid "Delete this menu item"
-msgstr "Lösche dieses Menü-Bestandteil"
-
-#: ../../Zotlabs/Module/Mitem.php:185
-msgid "Edit this menu item"
-msgstr "Bearbeite dieses Menü-Bestandteil"
-
-#: ../../Zotlabs/Module/Mitem.php:202
-msgid "Menu item not found."
-msgstr "Menü-Bestandteil nicht gefunden."
-
-#: ../../Zotlabs/Module/Mitem.php:215
-msgid "Menu item deleted."
-msgstr "Menü-Bestandteil gelöscht."
-
-#: ../../Zotlabs/Module/Mitem.php:217
-msgid "Menu item could not be deleted."
-msgstr "Menü-Bestandteil kann nicht gelöscht werden."
-
-#: ../../Zotlabs/Module/Mitem.php:224
-msgid "Edit Menu Element"
-msgstr "Bearbeite Menü-Bestandteil"
-
-#: ../../Zotlabs/Module/Mitem.php:230
-msgid "Link text"
-msgstr "Link Text"
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Name or caption"
-msgstr "Name oder Titel"
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
-msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-msgid "Choose a short nickname"
-msgstr "Wähle einen kurzen Spitznamen"
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-#, php-format
-msgid ""
-"Your nickname will be used to create an easy to remember channel address "
-"e.g. nickname%s"
-msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst, z.B. nickname%s"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Channel role and privacy"
-msgstr "Kanaltyp und Privatspäre-Einstellungen"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Select a channel role with your privacy requirements."
-msgstr "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre."
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Read more about roles"
-msgstr "Mehr Informationen über Rollen"
-
-#: ../../Zotlabs/Module/New_channel.php:135
-msgid "Create Channel"
-msgstr "Einen neuen Kanal anlegen"
-
-#: ../../Zotlabs/Module/New_channel.php:136
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
-msgstr "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen."
-
-#: ../../Zotlabs/Module/New_channel.php:137
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr "oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server."
-
-#: ../../Zotlabs/Module/Notifications.php:30
-msgid "Invalid request identifier."
-msgstr "Ungültiger Anfrage-Identifikator."
-
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "Discard"
-msgstr "Verwerfen"
-
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
-msgid "Mark all system notifications seen"
-msgstr "Markiere alle System-Benachrichtigungen als gesehen"
-
-#: ../../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:99 ../../Zotlabs/Module/Photos.php:743
-#: ../../Zotlabs/Module/Profile_photo.php:114
-#: ../../Zotlabs/Module/Profile_photo.php:206
-#: ../../Zotlabs/Module/Profile_photo.php:294
-#: ../../include/photo/photo_driver.php:718
-msgid "Profile Photos"
-msgstr "Profilfotos"
-
-#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
-msgid "Album not found."
-msgstr "Album nicht gefunden."
-
-#: ../../Zotlabs/Module/Photos.php:132
-msgid "Delete Album"
-msgstr "Album löschen"
-
-#: ../../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:210 ../../Zotlabs/Module/Photos.php:1053
-msgid "Delete Photo"
-msgstr "Foto löschen"
-
-#: ../../Zotlabs/Module/Photos.php:533
-msgid "No photos selected"
-msgstr "Keine Fotos ausgewählt"
-
-#: ../../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: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:624
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB Foto-Speicher belegt."
-
-#: ../../Zotlabs/Module/Photos.php:660
-msgid "Upload Photos"
-msgstr "Fotos hochladen"
-
-#: ../../Zotlabs/Module/Photos.php:664
-msgid "Enter an album name"
-msgstr "Namen für ein neues Album eingeben"
-
-#: ../../Zotlabs/Module/Photos.php:665
-msgid "or select an existing album (doubleclick)"
-msgstr "oder ein bereits vorhandenes auswählen (Doppelklick)"
-
-#: ../../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:667
-msgid "Caption (optional):"
-msgstr "Beschriftung (optional):"
-
-#: ../../Zotlabs/Module/Photos.php:668
-msgid "Description (optional):"
-msgstr "Beschreibung (optional):"
-
-#: ../../Zotlabs/Module/Photos.php:695
-msgid "Album name could not be decoded"
-msgstr "Albumname konnte nicht dekodiert werden"
-
-#: ../../Zotlabs/Module/Photos.php:743
-msgid "Contact Photos"
-msgstr "Kontakt-Bilder"
-
-#: ../../Zotlabs/Module/Photos.php:766
-msgid "Show Newest First"
-msgstr "Neueste zuerst anzeigen"
-
-#: ../../Zotlabs/Module/Photos.php:768
-msgid "Show Oldest First"
-msgstr "Älteste zuerst anzeigen"
-
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
-#: ../../include/widgets.php:1499
-msgid "View Photo"
-msgstr "Foto ansehen"
-
-#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1516
-msgid "Edit Album"
-msgstr "Album bearbeiten"
-
-#: ../../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:872
-msgid "Photo not available"
-msgstr "Foto nicht verfügbar"
-
-#: ../../Zotlabs/Module/Photos.php:930
-msgid "Use as profile photo"
-msgstr "Als Profilfoto verwenden"
-
-#: ../../Zotlabs/Module/Photos.php:931
-msgid "Use as cover photo"
-msgstr "Als Titelbild verwenden"
-
-#: ../../Zotlabs/Module/Photos.php:938
-msgid "Private Photo"
-msgstr "Privates Foto"
-
-#: ../../Zotlabs/Module/Photos.php:953
-msgid "View Full Size"
-msgstr "In voller Größe anzeigen"
-
-#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437
-#: ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr "Entfernen"
-
-#: ../../Zotlabs/Module/Photos.php:1032
-msgid "Edit photo"
-msgstr "Foto bearbeiten"
-
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Rotate CW (right)"
-msgstr "Drehen im UZS (rechts)"
-
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CCW (left)"
-msgstr "Drehen gegen UZS (links)"
-
-#: ../../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:1039
-msgid "or select an existing one (doubleclick)"
-msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)"
-
-#: ../../Zotlabs/Module/Photos.php:1042
-msgid "Caption"
-msgstr "Bildunterschrift"
-
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Add a Tag"
-msgstr "Schlagwort hinzufügen"
-
-#: ../../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:1051
-msgid "Flag as adult in album view"
-msgstr "In der Albumansicht als nicht jugendfrei markieren"
-
-#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
-msgid "I like this (toggle)"
-msgstr "Mir gefällt das (Umschalter)"
-
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
-msgid "I don't like this (toggle)"
-msgstr "Mir gefällt das nicht (Umschalter)"
-
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
-#: ../../include/conversation.php:740
-msgid "Please wait"
-msgstr "Bitte warten"
-
-#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../Zotlabs/Lib/ThreadItem.php:707
-msgid "This is you"
-msgstr "Das bist Du"
-
-#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
-msgid "Comment"
-msgstr "Kommentar"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Likes"
-msgstr "Gefällt mir"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Dislikes"
-msgstr "Gefällt mir nicht"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Agree"
-msgstr "Zustimmungen"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Disagree"
-msgstr "Ablehnungen"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Abstain"
-msgstr "Enthaltungen"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Attending"
-msgstr "Zusagen"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Not attending"
-msgstr "Absagen"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Might attend"
-msgstr "Vielleicht"
-
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
-#: ../../include/conversation.php:1717
-msgid "View all"
-msgstr "Alles anzeigen"
-
-#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1741
-#: ../../include/channel.php:1158
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Gefällt mir"
-msgstr[1] "Gefällt mir"
-
-#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/conversation.php:1744
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "Gefällt nicht"
-msgstr[1] "Gefällt nicht"
-
-#: ../../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:1249
-msgid "Map"
-msgstr "Karte"
-
-#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
-msgctxt "noun"
-msgid "Likes"
-msgstr "Gefällt mir"
-
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
-msgctxt "noun"
-msgid "Dislikes"
-msgstr "Gefällt nicht"
-
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
-#: ../../include/acl_selectors.php:285
-msgid "Close"
-msgstr "Schließen"
-
-#: ../../Zotlabs/Module/Photos.php:1337
-msgid "View Album"
-msgstr "Album ansehen"
-
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362
-msgid "Recent Photos"
-msgstr "Neueste Fotos"
-
-#: ../../Zotlabs/Module/Ping.php:265
-msgid "sent you a private message"
-msgstr "hat Dir eine private Nachricht geschickt"
-
-#: ../../Zotlabs/Module/Ping.php:313
-msgid "added your channel"
-msgstr "hat deinen Kanal hinzugefügt"
-
-#: ../../Zotlabs/Module/Ping.php:323
-msgid "g A l F d"
-msgstr "l, d. F, G:i \\U\\h\\r"
-
-#: ../../Zotlabs/Module/Ping.php:346
-msgid "[today]"
-msgstr "[Heute]"
-
-#: ../../Zotlabs/Module/Ping.php:355
-msgid "posted an event"
-msgstr "hat einen Termin veröffentlicht"
-
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr "Konnte Deinen Server nicht finden."
-
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr "Veröffentlichung erfolgreich."
-
-#: ../../Zotlabs/Module/Openid.php:30
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID Protokollfehler. Keine ID zurückgegeben."
-
-#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
-msgid "Login failed."
-msgstr "Login fehlgeschlagen."
-
-#: ../../Zotlabs/Module/Page.php:133
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
-" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert."
-
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
-msgstr "Konfigurationseditor"
-
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please"
-" leave this page unless you are comfortable with and knowledgeable about how"
-" to correctly use this feature."
-msgstr "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird."
-
-#: ../../Zotlabs/Module/Pdledit.php:18
-msgid "Layout updated."
-msgstr "Layout aktualisiert."
-
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
-msgid "Edit System Page Description"
-msgstr "Systemseitenbeschreibung bearbeiten"
-
-#: ../../Zotlabs/Module/Pdledit.php:56
-msgid "Layout not found."
-msgstr "Layout nicht gefunden."
-
-#: ../../Zotlabs/Module/Pdledit.php:62
-msgid "Module Name:"
-msgstr "Modulname:"
-
-#: ../../Zotlabs/Module/Pdledit.php:63
-msgid "Layout Help"
-msgstr "Layout-Hilfe"
-
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226
-#: ../../include/conversation.php:960
-msgid "Poke"
-msgstr "Anstupsen"
-
-#: ../../Zotlabs/Module/Poke.php:169
-msgid "Poke somebody"
-msgstr "Jemanden anstupsen"
-
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
-msgstr "Anstupsen/Knuffen"
-
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
-msgstr "Jemanden anstupsen, knuffen oder sonstiges"
-
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
-msgstr "Empfänger"
-
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
-msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst"
-
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
-msgstr "Diesen Beitrag privat machen"
-
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
-#, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr "Abrufen der URL gab einen Fehler zurück: %1$s"
-
 #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
 #: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
 msgid "Profile not found."
@@ -3291,6 +2215,11 @@ msgstr "Webseite"
 msgid "Interests"
 msgstr "Hobbys/Interessen"
 
+#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1224
+msgid "Address"
+msgstr "Adresse"
+
 #: ../../Zotlabs/Module/Profiles.php:560
 msgid "Profile updated."
 msgstr "Profil aktualisiert."
@@ -3308,7 +2237,7 @@ msgid "View this profile"
 msgstr "Dieses Profil ansehen"
 
 #: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
-#: ../../include/channel.php:959
+#: ../../include/channel.php:998
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
@@ -3320,7 +2249,7 @@ msgstr "Profilwerkzeuge"
 msgid "Change cover photo"
 msgstr "Titelbild ändern"
 
-#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:969
 msgid "Change profile photo"
 msgstr "Profilfoto ändern"
 
@@ -3340,8 +2269,8 @@ msgstr "Dieses Profil löschen"
 msgid "Add profile things"
 msgstr "Sachen zum Profil hinzufügen"
 
-#: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105
-#: ../../include/conversation.php:1526
+#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541
+#: ../../include/widgets.php:105
 msgid "Personal"
 msgstr "Persönlich"
 
@@ -3481,119 +2410,1097 @@ msgstr "Kontaktinformation und soziale Netzwerke"
 msgid "My other channels"
 msgstr "Meine anderen Kanäle"
 
-#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:994
 msgid "Profile Image"
 msgstr "Profilfoto:"
 
 #: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
-#: ../../include/channel.php:937
+#: ../../include/channel.php:976
 msgid "Edit Profiles"
 msgstr "Profile bearbeiten"
 
-#: ../../Zotlabs/Module/Profile_photo.php:179
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
-
-#: ../../Zotlabs/Module/Profile_photo.php:367
-msgid "Upload Profile Photo"
-msgstr "Lade neues Profilfoto hoch"
-
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr "Ungültiger Profil-Identifikator"
-
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
-msgstr "Profil-Sichtbarkeits-Editor"
-
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249
-msgid "Profile"
-msgstr "Profil"
-
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
-msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
-
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
-msgstr "Sichtbar für"
-
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1270
-msgid "Public Hubs"
-msgstr "Öffentliche Hubs"
-
-#: ../../Zotlabs/Module/Pubsites.php:25
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
-msgstr "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung im $Projectname Netzwerk. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen Seiten und Kanälen auf anderen Hubs ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den Seiten der einzelnen Hubs <strong>könnten</strong> jeweils nähere Informationen dazu stehen."
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Hub URL"
-msgstr "Hub-URL"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Access Type"
-msgstr "Zugriffstyp"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Registration Policy"
-msgstr "Registrierungsrichtlinien"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Stats"
-msgstr "Statistiken"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Software"
-msgstr "Software"
-
-#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:959
-msgid "Ratings"
-msgstr "Bewertungen"
-
-#: ../../Zotlabs/Module/Pubsites.php:38
-msgid "Rate"
-msgstr "Bewerten"
-
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Website:"
-msgstr "Webseite:"
-
-#: ../../Zotlabs/Module/Rate.php:163
+#: ../../Zotlabs/Module/Import.php:33
 #, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Kanal [%s] (auf diesem Server noch unbekannt)"
+msgid "Your service plan only allows %d channels."
+msgstr "Dein Vertrag erlaubt nur %d Kanäle."
 
-#: ../../Zotlabs/Module/Rate.php:164
-msgid "Rating (this information is public)"
-msgstr "Bewertung (öffentlich sichtbar)"
+#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42
+msgid "Nothing to import."
+msgstr "Nichts zu importieren."
 
-#: ../../Zotlabs/Module/Rate.php:165
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)"
+#: ../../Zotlabs/Module/Import.php:95 ../../Zotlabs/Module/Import_items.php:66
+msgid "Unable to download data from old server"
+msgstr "Daten können vom alten Server nicht heruntergeladen werden"
 
-#: ../../Zotlabs/Module/Ratings.php:73
-msgid "No ratings"
-msgstr "Keine Bewertungen"
+#: ../../Zotlabs/Module/Import.php:101
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Imported file is empty."
+msgstr "Die importierte Datei ist leer."
 
-#: ../../Zotlabs/Module/Ratings.php:104
-msgid "Rating: "
-msgstr "Bewertung: "
+#: ../../Zotlabs/Module/Import.php:123
+#: ../../Zotlabs/Module/Import_items.php:88
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Achtung: Datenbankversionen unterscheiden sich um %1$d Aktualisierungen."
 
-#: ../../Zotlabs/Module/Ratings.php:105
-msgid "Website: "
-msgstr "Webseite: "
+#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107
+msgid "Cloned channel not found. Import failed."
+msgstr "Geklonter Kanal nicht gefunden. Import fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Ratings.php:107
-msgid "Description: "
-msgstr "Beschreibung: "
+#: ../../Zotlabs/Module/Import.php:163
+msgid "No channel. Import failed."
+msgstr "Kein Kanal. Import fehlgeschlagen."
+
+#: ../../Zotlabs/Module/Import.php:520
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
+msgstr "Import abgeschlossen."
+
+#: ../../Zotlabs/Module/Import.php:542
+msgid "You must be logged in to use this feature."
+msgstr "Du musst angemeldet sein um diese Funktion zu nutzen."
+
+#: ../../Zotlabs/Module/Import.php:547
+msgid "Import Channel"
+msgstr "Kanal importieren"
+
+#: ../../Zotlabs/Module/Import.php:548
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file."
+msgstr "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren."
+
+#: ../../Zotlabs/Module/Import.php:549
+#: ../../Zotlabs/Module/Import_items.php:121
+msgid "File to Upload"
+msgstr "Hochzuladende Datei:"
+
+#: ../../Zotlabs/Module/Import.php:550
+msgid "Or provide the old server/hub details"
+msgstr "Oder gib die Details Deines bisherigen $Projectname-Hubs ein"
+
+#: ../../Zotlabs/Module/Import.php:551
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Bisherige Kanal-Adresse (xyz@example.com)"
+
+#: ../../Zotlabs/Module/Import.php:552
+msgid "Your old login email address"
+msgstr "Deine alte Login-E-Mail-Adresse"
+
+#: ../../Zotlabs/Module/Import.php:553
+msgid "Your old login password"
+msgstr "Dein altes Passwort"
+
+#: ../../Zotlabs/Module/Import.php:554
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige $Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein."
+
+#: ../../Zotlabs/Module/Import.php:555
+msgid "Make this hub my primary location"
+msgstr "Dieser $Pojectname-Hub ist mein primärer Hub."
+
+#: ../../Zotlabs/Module/Import.php:556
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importiere bestehende Beiträge falls möglich (experimentell - begrenzt durch zur Verfügung stehenden Speicher"
+
+#: ../../Zotlabs/Module/Import.php:557
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen."
+
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../Zotlabs/Module/Siteinfo.php:48
+msgid "$Projectname"
+msgstr "$Projectname"
+
+#: ../../Zotlabs/Module/Home.php:92
+#, php-format
+msgid "Welcome to %s"
+msgstr "Willkommen auf %s"
+
+#: ../../Zotlabs/Module/Item.php:179
+msgid "Unable to locate original post."
+msgstr "Originalbeitrag nicht gefunden."
+
+#: ../../Zotlabs/Module/Item.php:432
+msgid "Empty post discarded."
+msgstr "Leeren Beitrag verworfen."
+
+#: ../../Zotlabs/Module/Item.php:472
+msgid "Executable content type not permitted to this channel."
+msgstr "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben."
+
+#: ../../Zotlabs/Module/Item.php:856
+msgid "Duplicate post suppressed."
+msgstr "Doppelter Beitrag unterdrückt."
+
+#: ../../Zotlabs/Module/Item.php:989
+msgid "System error. Post not saved."
+msgstr "Systemfehler. Beitrag nicht gespeichert."
+
+#: ../../Zotlabs/Module/Item.php:1242
+msgid "Unable to obtain post information from database."
+msgstr "Beitragsinformationen können nicht aus der Datenbank abgerufen werden."
+
+#: ../../Zotlabs/Module/Item.php:1249
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht."
+
+#: ../../Zotlabs/Module/Item.php:1256
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht."
+
+#: ../../Zotlabs/Module/Photos.php:82
+msgid "Page owner information could not be retrieved."
+msgstr "Informationen über den Besitzer der Seite konnten nicht gefunden werden."
+
+#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:741
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:212
+#: ../../Zotlabs/Module/Profile_photo.php:311
+#: ../../include/photo/photo_driver.php:718
+msgid "Profile Photos"
+msgstr "Profilfotos"
+
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147
+msgid "Album not found."
+msgstr "Album nicht gefunden."
+
+#: ../../Zotlabs/Module/Photos.php:130
+msgid "Delete Album"
+msgstr "Album löschen"
+
+#: ../../Zotlabs/Module/Photos.php:151
+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:208 ../../Zotlabs/Module/Photos.php:1051
+msgid "Delete Photo"
+msgstr "Foto löschen"
+
+#: ../../Zotlabs/Module/Photos.php:531
+msgid "No photos selected"
+msgstr "Keine Fotos ausgewählt"
+
+#: ../../Zotlabs/Module/Photos.php:580
+msgid "Access to this item is restricted."
+msgstr "Der Zugriff auf dieses Foto ist eingeschränkt."
+
+#: ../../Zotlabs/Module/Photos.php:619
+#, 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:622
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB Foto-Speicher belegt."
+
+#: ../../Zotlabs/Module/Photos.php:658
+msgid "Upload Photos"
+msgstr "Fotos hochladen"
+
+#: ../../Zotlabs/Module/Photos.php:662
+msgid "Enter an album name"
+msgstr "Namen für ein neues Album eingeben"
+
+#: ../../Zotlabs/Module/Photos.php:663
+msgid "or select an existing album (doubleclick)"
+msgstr "oder ein bereits vorhandenes auswählen (Doppelklick)"
+
+#: ../../Zotlabs/Module/Photos.php:664
+msgid "Create a status post for this upload"
+msgstr "Einen Statusbeitrag für diesen Upload erzeugen"
+
+#: ../../Zotlabs/Module/Photos.php:665
+msgid "Caption (optional):"
+msgstr "Beschriftung (optional):"
+
+#: ../../Zotlabs/Module/Photos.php:666
+msgid "Description (optional):"
+msgstr "Beschreibung (optional):"
+
+#: ../../Zotlabs/Module/Photos.php:693
+msgid "Album name could not be decoded"
+msgstr "Albumname konnte nicht dekodiert werden"
+
+#: ../../Zotlabs/Module/Photos.php:741
+msgid "Contact Photos"
+msgstr "Kontakt-Bilder"
+
+#: ../../Zotlabs/Module/Photos.php:764
+msgid "Show Newest First"
+msgstr "Neueste zuerst anzeigen"
+
+#: ../../Zotlabs/Module/Photos.php:766
+msgid "Show Oldest First"
+msgstr "Älteste zuerst anzeigen"
+
+#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1329
+#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1593
+msgid "View Photo"
+msgstr "Foto ansehen"
+
+#: ../../Zotlabs/Module/Photos.php:821
+#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1610
+msgid "Edit Album"
+msgstr "Album bearbeiten"
+
+#: ../../Zotlabs/Module/Photos.php:868
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Berechtigung verweigert. Der Zugriff ist wahrscheinlich eingeschränkt worden."
+
+#: ../../Zotlabs/Module/Photos.php:870
+msgid "Photo not available"
+msgstr "Foto nicht verfügbar"
+
+#: ../../Zotlabs/Module/Photos.php:928
+msgid "Use as profile photo"
+msgstr "Als Profilfoto verwenden"
+
+#: ../../Zotlabs/Module/Photos.php:929
+msgid "Use as cover photo"
+msgstr "Als Titelbild verwenden"
+
+#: ../../Zotlabs/Module/Photos.php:936
+msgid "Private Photo"
+msgstr "Privates Foto"
+
+#: ../../Zotlabs/Module/Photos.php:951
+msgid "View Full Size"
+msgstr "In voller Größe anzeigen"
+
+#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Admin.php:1437
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../../Zotlabs/Module/Photos.php:1030
+msgid "Edit photo"
+msgstr "Foto bearbeiten"
+
+#: ../../Zotlabs/Module/Photos.php:1032
+msgid "Rotate CW (right)"
+msgstr "Drehen im UZS (rechts)"
+
+#: ../../Zotlabs/Module/Photos.php:1033
+msgid "Rotate CCW (left)"
+msgstr "Drehen gegen UZS (links)"
+
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "Enter a new album name"
+msgstr "Gib einen Namen für ein neues Album ein"
+
+#: ../../Zotlabs/Module/Photos.php:1037
+msgid "or select an existing one (doubleclick)"
+msgstr "oder wähle ein bereits vorhandenes aus (Doppelklick)"
+
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Caption"
+msgstr "Bildunterschrift"
+
+#: ../../Zotlabs/Module/Photos.php:1042
+msgid "Add a Tag"
+msgstr "Schlagwort hinzufügen"
+
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Beispiele: @ben, @Karl_Prester, @lieschen@example.com"
+
+#: ../../Zotlabs/Module/Photos.php:1049
+msgid "Flag as adult in album view"
+msgstr "In der Albumansicht als nicht jugendfrei markieren"
+
+#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Lib/ThreadItem.php:261
+msgid "I like this (toggle)"
+msgstr "Mir gefällt das (Umschalter)"
+
+#: ../../Zotlabs/Module/Photos.php:1069 ../../Zotlabs/Lib/ThreadItem.php:262
+msgid "I don't like this (toggle)"
+msgstr "Mir gefällt das nicht (Umschalter)"
+
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:397
+#: ../../include/conversation.php:743
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1205
+#: ../../Zotlabs/Lib/ThreadItem.php:707
+msgid "This is you"
+msgstr "Das bist Du"
+
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
+#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr "Kommentar"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
+msgstr "Gefällt mir"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
+msgstr "Gefällt mir nicht"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
+msgstr "Zustimmungen"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
+msgstr "Ablehnungen"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
+msgstr "Enthaltungen"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
+msgstr "Zusagen"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
+msgstr "Absagen"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
+msgstr "Vielleicht"
+
+#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1136
+#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../include/conversation.php:1738
+msgid "View all"
+msgstr "Alles anzeigen"
+
+#: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../include/taxonomy.php:403 ../../include/channel.php:1198
+#: ../../include/conversation.php:1762
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Gefällt mir"
+msgstr[1] "Gefällt mir"
+
+#: ../../Zotlabs/Module/Photos.php:1133 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/conversation.php:1765
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "Gefällt nicht"
+msgstr[1] "Gefällt nicht"
+
+#: ../../Zotlabs/Module/Photos.php:1233
+msgid "Photo Tools"
+msgstr "Fotowerkzeuge"
+
+#: ../../Zotlabs/Module/Photos.php:1242
+msgid "In This Photo:"
+msgstr "Auf diesem Foto:"
+
+#: ../../Zotlabs/Module/Photos.php:1247
+msgid "Map"
+msgstr "Karte"
+
+#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/ThreadItem.php:386
+msgctxt "noun"
+msgid "Likes"
+msgstr "Gefällt mir"
+
+#: ../../Zotlabs/Module/Photos.php:1256 ../../Zotlabs/Lib/ThreadItem.php:387
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "Gefällt nicht"
+
+#: ../../Zotlabs/Module/Photos.php:1261 ../../Zotlabs/Lib/ThreadItem.php:392
+#: ../../include/acl_selectors.php:283
+msgid "Close"
+msgstr "Schließen"
+
+#: ../../Zotlabs/Module/Photos.php:1335
+msgid "View Album"
+msgstr "Album ansehen"
+
+#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359
+#: ../../Zotlabs/Module/Photos.php:1360
+msgid "Recent Photos"
+msgstr "Neueste Fotos"
+
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
+msgstr "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar."
+
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
+msgstr "Sichtbar für:"
+
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
+msgstr "Import abgeschlossen"
+
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
+msgstr "Beiträge importieren"
+
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid ""
+"Use this form to import existing posts and content from an export file."
+msgstr "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren."
+
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
+msgstr "Einladungslimit überschritten."
+
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : Keine gültige Email Adresse."
+
+#: ../../Zotlabs/Module/Invite.php:63
+msgid "Please join us on $Projectname"
+msgstr "Schließe Dich uns auf $Projectname an!"
+
+#: ../../Zotlabs/Module/Invite.php:74
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines $Projectname-Servers."
+
+#: ../../Zotlabs/Module/Invite.php:79
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Nachricht konnte nicht zugestellt werden."
+
+#: ../../Zotlabs/Module/Invite.php:83
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d Nachricht gesendet."
+msgstr[1] "%d Nachrichten gesendet."
+
+#: ../../Zotlabs/Module/Invite.php:102
+msgid "You have no more invitations available"
+msgstr "Du hast keine weiteren verfügbare Einladungen"
+
+#: ../../Zotlabs/Module/Invite.php:133
+msgid "Send invitations"
+msgstr "Einladungen senden"
+
+#: ../../Zotlabs/Module/Invite.php:134
+msgid "Enter email addresses, one per line:"
+msgstr "Email-Adressen eintragen, eine pro Zeile:"
+
+#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:241
+msgid "Your message:"
+msgstr "Deine Nachricht:"
+
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Please join my community on $Projectname."
+msgstr "Schließe Dich uns auf $Projectname an!"
+
+#: ../../Zotlabs/Module/Invite.php:138
+msgid "You will need to supply this invitation code:"
+msgstr "Bitte verwende bei der Registrierung den folgenden Einladungscode:"
+
+#: ../../Zotlabs/Module/Invite.php:139
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Registriere Dich auf einem beliebigen $Projectname-Hub (sie sind alle miteinander verbunden)"
+
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Gib meine $Projectname-Adresse im Suchfeld ein."
+
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "or visit"
+msgstr "oder besuche"
+
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "3. Click [Connect]"
+msgstr "3. Klicke auf [Verbinden]"
+
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
+msgstr "Klon nicht gefunden."
+
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
+msgstr "Nachschlagen des Kanal-Ortes fehlgeschlagen"
+
+#: ../../Zotlabs/Module/Locs.php:66
+msgid ""
+"Please select another location to become primary before removing the primary"
+" location."
+msgstr "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst."
+
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
+msgstr "Synchronisiere Klone"
+
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
+msgstr "Keine Klon-Adressen gefunden."
+
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
+msgstr "Klon-Adressen verwalten"
+
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
+msgstr "Primär"
+
+#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+msgid "Drop"
+msgstr "Löschen"
+
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
+msgstr "Jetzt synchronisieren"
+
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
+msgstr "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!"
+
+#: ../../Zotlabs/Module/Locs.php:124
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing"
+" your channel."
+msgstr "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst."
+
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt."
+
+#: ../../Zotlabs/Module/Magic.php:71
+msgid "Hub not found."
+msgstr "Server nicht gefunden."
+
+#: ../../Zotlabs/Module/Mail.php:38
+msgid "Unable to lookup recipient."
+msgstr "Konnte den Empfänger nicht finden."
+
+#: ../../Zotlabs/Module/Mail.php:45
+msgid "Unable to communicate with requested channel."
+msgstr "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen."
+
+#: ../../Zotlabs/Module/Mail.php:52
+msgid "Cannot verify requested channel."
+msgstr "Verifizierung des angeforderten Kanals fehlgeschlagen."
+
+#: ../../Zotlabs/Module/Mail.php:70
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen."
+
+#: ../../Zotlabs/Module/Mail.php:135
+msgid "Messages"
+msgstr "Nachrichten"
+
+#: ../../Zotlabs/Module/Mail.php:170
+msgid "Message recalled."
+msgstr "Nachricht widerrufen."
+
+#: ../../Zotlabs/Module/Mail.php:183
+msgid "Conversation removed."
+msgstr "Unterhaltung gelöscht."
+
+#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Verfällt YYYY-MM-DD HH;MM"
+
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Requested channel is not in this network"
+msgstr "Angeforderter Kanal ist nicht in diesem Netzwerk."
+
+#: ../../Zotlabs/Module/Mail.php:234
+msgid "Send Private Message"
+msgstr "Private Nachricht senden"
+
+#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360
+msgid "To:"
+msgstr "An:"
+
+#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362
+msgid "Subject:"
+msgstr "Betreff:"
+
+#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
+#: ../../include/conversation.php:1231
+msgid "Attach file"
+msgstr "Datei anhängen"
+
+#: ../../Zotlabs/Module/Mail.php:245
+msgid "Send"
+msgstr "Absenden"
+
+#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373
+#: ../../include/conversation.php:1266
+msgid "Set expiration date"
+msgstr "Verfallsdatum"
+
+#: ../../Zotlabs/Module/Mail.php:332
+msgid "Delete message"
+msgstr "Nachricht löschen"
+
+#: ../../Zotlabs/Module/Mail.php:333
+msgid "Delivery report"
+msgstr "Zustellungsbericht"
+
+#: ../../Zotlabs/Module/Mail.php:334
+msgid "Recall message"
+msgstr "Nachricht widerrufen"
+
+#: ../../Zotlabs/Module/Mail.php:336
+msgid "Message has been recalled."
+msgstr "Die Nachricht wurde widerrufen."
+
+#: ../../Zotlabs/Module/Mail.php:353
+msgid "Delete Conversation"
+msgstr "Unterhaltung löschen"
+
+#: ../../Zotlabs/Module/Mail.php:355
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten."
+
+#: ../../Zotlabs/Module/Mail.php:359
+msgid "Send Reply"
+msgstr "Antwort senden"
+
+#: ../../Zotlabs/Module/Mail.php:364
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Deine Nachricht für %s (%s):"
+
+#: ../../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:143
+msgid "Create a new channel"
+msgstr "Neuen Kanal anlegen"
+
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214
+#: ../../include/nav.php:208
+msgid "Channel Manager"
+msgstr "Kanal-Manager"
+
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
+msgstr "Aktueller Kanal"
+
+#: ../../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:168
+msgid "Default Channel"
+msgstr "Standard Kanal"
+
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
+msgstr "Zum Standard machen"
+
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
+msgstr "%d neue Nachrichten"
+
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
+msgstr "%d neue Vorstellungen"
+
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
+msgstr "Delegierte Kanäle"
+
+#: ../../Zotlabs/Module/Menu.php:49
+msgid "Unable to update menu."
+msgstr "Kann Menü nicht aktualisieren."
+
+#: ../../Zotlabs/Module/Menu.php:60
+msgid "Unable to create menu."
+msgstr "Kann Menü nicht erstellen."
+
+#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+msgid "Menu Name"
+msgstr "Name des Menüs"
+
+#: ../../Zotlabs/Module/Menu.php:98
+msgid "Unique name (not visible on webpage) - required"
+msgstr "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich"
+
+#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+msgid "Menu Title"
+msgstr "Menütitel"
+
+#: ../../Zotlabs/Module/Menu.php:99
+msgid "Visible on webpage - leave empty for no title"
+msgstr "Sichtbar auf der Webseite – für keinen Titel leer lassen"
+
+#: ../../Zotlabs/Module/Menu.php:100
+msgid "Allow Bookmarks"
+msgstr "Lesezeichen erlauben"
+
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Im Menü können gespeicherte Lesezeichen abgelegt werden"
+
+#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+msgid "Submit and proceed"
+msgstr "Absenden und fortfahren"
+
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2239
+msgid "Menus"
+msgstr "Menüs"
+
+#: ../../Zotlabs/Module/Menu.php:117
+msgid "Bookmarks allowed"
+msgstr "Lesezeichen erlaubt"
+
+#: ../../Zotlabs/Module/Menu.php:119
+msgid "Delete this menu"
+msgstr "Lösche dieses Menü"
+
+#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+msgid "Edit menu contents"
+msgstr "Bearbeite Menü Inhalte"
+
+#: ../../Zotlabs/Module/Menu.php:121
+msgid "Edit this menu"
+msgstr "Dieses Menü bearbeiten"
+
+#: ../../Zotlabs/Module/Menu.php:136
+msgid "Menu could not be deleted."
+msgstr "Menü konnte nicht gelöscht werden."
+
+#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+msgid "Menu not found."
+msgstr "Menü nicht gefunden"
+
+#: ../../Zotlabs/Module/Menu.php:149
+msgid "Edit Menu"
+msgstr "Menü bearbeiten"
+
+#: ../../Zotlabs/Module/Menu.php:153
+msgid "Add or remove entries to this menu"
+msgstr "Einträge zu diesem Menü hinzufügen oder entfernen"
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Menu name"
+msgstr "Menü Name"
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Must be unique, only seen by you"
+msgstr "Muss eindeutig sein, ist aber nur für Dich sichtbar"
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title"
+msgstr "Menü Titel"
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title as seen by others"
+msgstr "Menü Titel wie er von anderen gesehen wird"
+
+#: ../../Zotlabs/Module/Menu.php:157
+msgid "Allow bookmarks"
+msgstr "Erlaube Lesezeichen"
+
+#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
+#: ../../Zotlabs/Module/Xchan.php:41
+msgid "Not found."
+msgstr "Nicht gefunden."
+
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
+msgstr "Kein gültiges Konto gefunden."
+
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails."
+
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Nutzer (%s)"
+
+#: ../../Zotlabs/Module/Lostpass.php:44
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Passwort-Rücksetzung auf %s angefordert"
+
+#: ../../Zotlabs/Module/Lostpass.php:67
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"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:1712
+msgid "Password Reset"
+msgstr "Zurücksetzen des Kennworts"
+
+#: ../../Zotlabs/Module/Lostpass.php:91
+msgid "Your password has been reset as requested."
+msgstr "Dein Passwort wurde wie angefordert neu erstellt."
+
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your new password is"
+msgstr "Dein neues Passwort lautet"
+
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Save or copy your new password - and then"
+msgstr "Speichere oder kopiere Dein neues Passwort – und dann"
+
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "click here to login"
+msgstr "Klicke hier, um dich anzumelden"
+
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden."
+
+#: ../../Zotlabs/Module/Lostpass.php:112
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Auf %s wurde Dein Passwort geändert"
+
+#: ../../Zotlabs/Module/Lostpass.php:127
+msgid "Forgot your Password?"
+msgstr "Kennwort vergessen?"
+
+#: ../../Zotlabs/Module/Lostpass.php:128
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail."
+
+#: ../../Zotlabs/Module/Lostpass.php:129
+msgid "Email Address"
+msgstr "E-Mail Adresse"
+
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr "%1$s ist %2$s"
+
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227
+msgid "Mood"
+msgstr "Laune"
+
+#: ../../Zotlabs/Module/Mood.php:136
+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:94
+msgid "No such group"
+msgstr "Gruppe nicht gefunden"
+
+#: ../../Zotlabs/Module/Network.php:134
+msgid "No such channel"
+msgstr "Kanal nicht gefunden"
+
+#: ../../Zotlabs/Module/Network.php:139
+msgid "forum"
+msgstr "Forum"
+
+#: ../../Zotlabs/Module/Network.php:151
+msgid "Search Results For:"
+msgstr "Suchergebnisse für:"
+
+#: ../../Zotlabs/Module/Network.php:215
+msgid "Privacy group is empty"
+msgstr "Gruppe ist leer"
+
+#: ../../Zotlabs/Module/Network.php:224
+msgid "Privacy group: "
+msgstr "Gruppe:"
+
+#: ../../Zotlabs/Module/Network.php:250
+msgid "Invalid connection."
+msgstr "Ungültige Verbindung."
+
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:98
+msgid "No more system notifications."
+msgstr "Keine System-Benachrichtigungen mehr."
+
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:102
+msgid "System Notifications"
+msgstr "System-Benachrichtigungen"
+
+#: ../../Zotlabs/Module/Match.php:26
+msgid "Profile Match"
+msgstr "Profil-Übereinstimmungen"
+
+#: ../../Zotlabs/Module/Match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu."
+
+#: ../../Zotlabs/Module/Match.php:67
+msgid "is interested in:"
+msgstr "interessiert sich für:"
+
+#: ../../Zotlabs/Module/Match.php:74
+msgid "No matches"
+msgstr "Keine Übereinstimmungen"
+
+#: ../../Zotlabs/Module/Channel.php:40
+msgid "Posts and comments"
+msgstr "Beiträge und Kommentare"
+
+#: ../../Zotlabs/Module/Channel.php:41
+msgid "Only posts"
+msgstr "Nur Beiträge"
+
+#: ../../Zotlabs/Module/Channel.php:101
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Unzureichende Zugriffsrechte. Die Anfrage wurde zur Profil-Seite umgeleitet."
+
+#: ../../Zotlabs/Module/Mitem.php:52
+msgid "Unable to create element."
+msgstr "Element konnte nicht erstellt werden."
+
+#: ../../Zotlabs/Module/Mitem.php:76
+msgid "Unable to update menu element."
+msgstr "Kann Menü-Element nicht aktualisieren."
+
+#: ../../Zotlabs/Module/Mitem.php:92
+msgid "Unable to add menu element."
+msgstr "Kann Menü-Bestandteil nicht hinzufügen."
+
+#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
+msgid "Menu Item Permissions"
+msgstr "Zugriffsrechte des Menü-Elements"
+
+#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
+#: ../../Zotlabs/Module/Settings.php:1163
+msgid "(click to open/close)"
+msgstr "(zum öffnen/schließen anklicken)"
+
+#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
+msgid "Link Name"
+msgstr "Name des Links"
+
+#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
+msgid "Link or Submenu Target"
+msgstr "Ziel des Links oder Untermenüs"
+
+#: ../../Zotlabs/Module/Mitem.php:157
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen."
+
+#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
+msgid "Use magic-auth if available"
+msgstr "Magic-Auth verwenden, falls verfügbar"
+
+#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
+msgid "Open link in new window"
+msgstr "Öffne Link in neuem Fenster"
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Order in list"
+msgstr "Reihenfolge in der Liste"
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Größere Nummern werden weiter unten in der Auflistung einsortiert"
+
+#: ../../Zotlabs/Module/Mitem.php:161
+msgid "Submit and finish"
+msgstr "Absenden und fertigstellen"
+
+#: ../../Zotlabs/Module/Mitem.php:162
+msgid "Submit and continue"
+msgstr "Absenden und fortfahren"
+
+#: ../../Zotlabs/Module/Mitem.php:170
+msgid "Menu:"
+msgstr "Menü:"
+
+#: ../../Zotlabs/Module/Mitem.php:173
+msgid "Link Target"
+msgstr "Ziel des Links"
+
+#: ../../Zotlabs/Module/Mitem.php:176
+msgid "Edit menu"
+msgstr "Menü bearbeiten"
+
+#: ../../Zotlabs/Module/Mitem.php:179
+msgid "Edit element"
+msgstr "Bestandteil bearbeiten"
+
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Drop element"
+msgstr "Bestandteil löschen"
+
+#: ../../Zotlabs/Module/Mitem.php:181
+msgid "New element"
+msgstr "Neues Bestandteil"
+
+#: ../../Zotlabs/Module/Mitem.php:182
+msgid "Edit this menu container"
+msgstr "Diesen Menü-Container bearbeiten"
+
+#: ../../Zotlabs/Module/Mitem.php:183
+msgid "Add menu element"
+msgstr "Menüelement hinzufügen"
+
+#: ../../Zotlabs/Module/Mitem.php:184
+msgid "Delete this menu item"
+msgstr "Lösche dieses Menü-Bestandteil"
+
+#: ../../Zotlabs/Module/Mitem.php:185
+msgid "Edit this menu item"
+msgstr "Bearbeite dieses Menü-Bestandteil"
+
+#: ../../Zotlabs/Module/Mitem.php:202
+msgid "Menu item not found."
+msgstr "Menü-Bestandteil nicht gefunden."
+
+#: ../../Zotlabs/Module/Mitem.php:215
+msgid "Menu item deleted."
+msgstr "Menü-Bestandteil gelöscht."
+
+#: ../../Zotlabs/Module/Mitem.php:217
+msgid "Menu item could not be deleted."
+msgstr "Menü-Bestandteil kann nicht gelöscht werden."
+
+#: ../../Zotlabs/Module/Mitem.php:224
+msgid "Edit Menu Element"
+msgstr "Bearbeite Menü-Bestandteil"
+
+#: ../../Zotlabs/Module/Mitem.php:230
+msgid "Link text"
+msgstr "Link Text"
 
 #: ../../Zotlabs/Module/Admin.php:77
 msgid "Theme settings updated."
@@ -3680,11 +3587,11 @@ msgstr "Repository-Version (dev)"
 msgid "Site settings updated."
 msgstr "Site-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2841
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2829
 msgid "Default"
 msgstr "Standard"
 
-#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:899
 msgid "mobile"
 msgstr "mobil"
 
@@ -3716,7 +3623,7 @@ msgstr "Meine Seite hat nur freien Zugriff"
 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:491 ../../include/widgets.php:1382
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1476
 msgid "Site"
 msgstr "Seite"
 
@@ -4004,12 +3911,12 @@ msgid "0 for no expiration of imported content"
 msgstr "0 = keine Löschung importierter Inhalte"
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "Off"
 msgstr "Aus"
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "On"
 msgstr "An"
 
@@ -4066,7 +3973,7 @@ msgid ""
 "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:1385
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1479
 msgid "Security"
 msgstr "Sicherheit"
 
@@ -4234,7 +4141,7 @@ msgid "Account '%s' unblocked"
 msgstr "Konto '%s' freigegeben"
 
 #: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
-#: ../../include/widgets.php:1383
+#: ../../include/widgets.php:1477
 msgid "Accounts"
 msgstr "Konten"
 
@@ -4340,7 +4247,7 @@ msgstr "Code für Kanal '%s' freigegeben"
 msgid "Channel '%s' code disallowed"
 msgstr "Code für Kanal '%s' gesperrt"
 
-#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1384
+#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1478
 msgid "Channels"
 msgstr "Kanäle"
 
@@ -4360,7 +4267,7 @@ msgstr "Code erlauben"
 msgid "Disallow Code"
 msgstr "Code sperren"
 
-#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1611
+#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626
 msgid "Channel"
 msgstr "Kanal"
 
@@ -4399,7 +4306,7 @@ msgid "Enable"
 msgstr "Aktivieren"
 
 #: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
-#: ../../include/widgets.php:1387
+#: ../../include/widgets.php:1481
 msgid "Plugins"
 msgstr "Plug-Ins"
 
@@ -4408,8 +4315,8 @@ msgid "Toggle"
 msgstr "Umschalten"
 
 #: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
-#: ../../Zotlabs/Lib/Apps.php:215 ../../include/widgets.php:638
-#: ../../include/nav.php:208
+#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:210
+#: ../../include/widgets.php:647
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -4465,7 +4372,7 @@ msgstr "Plugin-Repository herunterladen"
 msgid "Install new repo"
 msgstr "Neues Repository installieren"
 
-#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:334
 msgid "Install"
 msgstr "Installieren"
 
@@ -4481,8 +4388,8 @@ msgstr "Installierte Plugin-Repositorien"
 msgid "Install a New Plugin Repository"
 msgstr "Ein neues Plugin-Repository installieren"
 
-#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:72
+#: ../../Zotlabs/Module/Settings.php:670 ../../Zotlabs/Lib/Apps.php:334
 msgid "Update"
 msgstr "Aktualisieren"
 
@@ -4499,7 +4406,7 @@ msgid "Screenshot"
 msgstr "Bildschirmfoto"
 
 #: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
-#: ../../include/widgets.php:1388
+#: ../../include/widgets.php:1482
 msgid "Themes"
 msgstr "Themes"
 
@@ -4515,8 +4422,8 @@ msgstr "[Nicht unterstützt]"
 msgid "Log settings updated."
 msgstr "Protokoll-Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1409
-#: ../../include/widgets.php:1419
+#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1503
+#: ../../include/widgets.php:1513
 msgid "Logs"
 msgstr "Protokolle"
 
@@ -4582,7 +4489,7 @@ msgstr "Feld-Definition nicht gefunden"
 msgid "Edit Profile Field"
 msgstr "Profilfeld bearbeiten"
 
-#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1390
+#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1484
 msgid "Profile Fields"
 msgstr "Profil Felder"
 
@@ -4610,57 +4517,384 @@ msgstr "Benutzerdefinierte Felder"
 msgid "Create Custom Field"
 msgstr "Erstelle benutzerdefiniertes Feld"
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
-msgid "App installed."
-msgstr "App installiert."
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Name or caption"
+msgstr "Name oder Titel"
 
-#: ../../Zotlabs/Module/Appman.php:46
-msgid "Malformed app."
-msgstr "Fehlerhafte App."
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
+msgstr "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ "
 
-#: ../../Zotlabs/Module/Appman.php:104
-msgid "Embed code"
-msgstr "Code einbetten"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+msgid "Choose a short nickname"
+msgstr "Wähle einen kurzen Spitznamen"
 
-#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
-msgid "Edit App"
-msgstr "App bearbeiten"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+#, php-format
+msgid ""
+"Your nickname will be used to create an easy to remember channel address "
+"e.g. nickname%s"
+msgstr "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst, z.B. nickname%s"
 
-#: ../../Zotlabs/Module/Appman.php:110
-msgid "Create App"
-msgstr "App erstellen"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Channel role and privacy"
+msgstr "Kanaltyp und Privatspäre-Einstellungen"
 
-#: ../../Zotlabs/Module/Appman.php:115
-msgid "Name of app"
-msgstr "Name der App"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Select a channel role with your privacy requirements."
+msgstr "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre."
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Location (URL) of app"
-msgstr "Ort (URL) der App"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Read more about roles"
+msgstr "Mehr Informationen über Rollen"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "Photo icon URL"
-msgstr "URL zum Icon"
+#: ../../Zotlabs/Module/New_channel.php:135
+msgid "Create Channel"
+msgstr "Einen neuen Kanal anlegen"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "80 x 80 pixels - optional"
-msgstr "80 x 80 Pixel – optional"
+#: ../../Zotlabs/Module/New_channel.php:136
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
+msgstr "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen."
 
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Categories (optional, comma separated list)"
-msgstr "Kategorien (optional, kommagetrennte Liste)"
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr "oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server."
 
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Version ID"
-msgstr "Versions-ID"
+#: ../../Zotlabs/Module/Ping.php:265
+msgid "sent you a private message"
+msgstr "hat Dir eine private Nachricht geschickt"
 
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Price of app"
-msgstr "Preis der App"
+#: ../../Zotlabs/Module/Ping.php:313
+msgid "added your channel"
+msgstr "hat deinen Kanal hinzugefügt"
 
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Location (URL) to purchase app"
-msgstr "Ort (URL), um die App zu kaufen"
+#: ../../Zotlabs/Module/Ping.php:323
+msgid "g A l F d"
+msgstr "l, d. F, G:i \\U\\h\\r"
+
+#: ../../Zotlabs/Module/Ping.php:346
+msgid "[today]"
+msgstr "[Heute]"
+
+#: ../../Zotlabs/Module/Ping.php:355
+msgid "posted an event"
+msgstr "hat einen Termin veröffentlicht"
+
+#: ../../Zotlabs/Module/Notifications.php:30
+msgid "Invalid request identifier."
+msgstr "Ungültiger Anfrage-Identifikator."
+
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "Discard"
+msgstr "Verwerfen"
+
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:193
+msgid "Mark all system notifications seen"
+msgstr "Markiere alle System-Benachrichtigungen als gesehen"
+
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228
+#: ../../include/conversation.php:963
+msgid "Poke"
+msgstr "Anstupsen"
+
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
+msgstr "Jemanden anstupsen"
+
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
+msgstr "Anstupsen/Knuffen"
+
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
+msgstr "Jemanden anstupsen, knuffen oder sonstiges"
+
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
+msgstr "Empfänger"
+
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
+msgstr "Wähle, was Du mit dem/r Empfänger/in tun willst"
+
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
+msgstr "Diesen Beitrag privat machen"
+
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr "Konnte Deinen Server nicht finden."
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr "Veröffentlichung erfolgreich."
+
+#: ../../Zotlabs/Module/Openid.php:30
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID Protokollfehler. Keine ID zurückgegeben."
+
+#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:285
+msgid "Login failed."
+msgstr "Login fehlgeschlagen."
+
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr "Ungültiger Profil-Identifikator"
+
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
+msgstr "Profil-Sichtbarkeits-Editor"
+
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1290
+msgid "Profile"
+msgstr "Profil"
+
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
+msgstr "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen."
+
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
+msgstr "Sichtbar für"
+
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert."
+
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
+msgstr "Konfigurationseditor"
+
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird."
+
+#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "Abrufen der URL gab einen Fehler zurück: %1$s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:19
+#, php-format
+msgid "Version %s"
+msgstr "Version %s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Installed plugins/addons/apps:"
+msgstr "Installierte Plugins/Addons/Apps"
+
+#: ../../Zotlabs/Module/Siteinfo.php:36
+msgid "No installed plugins/addons/apps"
+msgstr "Keine installierten Plugins/Addons/Apps"
+
+#: ../../Zotlabs/Module/Siteinfo.php:49
+msgid ""
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Dieser Hub ist Teil von $Projectname – ein globales, kooperatives Netzwerk aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen."
+
+#: ../../Zotlabs/Module/Siteinfo.php:51
+msgid "Tag: "
+msgstr "Schlagwort: "
+
+#: ../../Zotlabs/Module/Siteinfo.php:53
+msgid "Last background fetch: "
+msgstr "Letzter Hintergrundabruf:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:55
+msgid "Current load average: "
+msgstr "Aktuelles Load Average:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:58
+msgid "Running at web location"
+msgstr "Erreichbar unter der Web-Adresse"
+
+#: ../../Zotlabs/Module/Siteinfo.php:59
+msgid ""
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr "Bitte besuchen Sie <a href=\"http://hubzilla.org\">hubzilla.org</a>, um mehr über $Projectname zu erfahren."
+
+#: ../../Zotlabs/Module/Siteinfo.php:60
+msgid "Bug reports and issues: please visit"
+msgstr "Probleme oder Fehler gefunden? Bitte besuche"
+
+#: ../../Zotlabs/Module/Siteinfo.php:62
+msgid "$projectname issues"
+msgstr "$projectname-Bugtracker"
+
+#: ../../Zotlabs/Module/Siteinfo.php:63
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
+
+#: ../../Zotlabs/Module/Siteinfo.php:65
+msgid "Site Administrators"
+msgstr "Administratoren"
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal."
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid "The error message was:"
+msgstr "Die Fehlermeldung war:"
+
+#: ../../Zotlabs/Module/Rmagic.php:48
+msgid "Authentication failed."
+msgstr "Authentifizierung fehlgeschlagen."
+
+#: ../../Zotlabs/Module/Rmagic.php:88
+msgid "Remote Authentication"
+msgstr "Entfernte Authentifizierung"
+
+#: ../../Zotlabs/Module/Rmagic.php:89
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
+
+#: ../../Zotlabs/Module/Rmagic.php:90
+msgid "Authenticate"
+msgstr "Authentifizieren"
+
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1337
+msgid "Public Hubs"
+msgstr "Öffentliche Hubs"
+
+#: ../../Zotlabs/Module/Pubsites.php:25
+msgid ""
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
+msgstr "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung im $Projectname Netzwerk. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen Seiten und Kanälen auf anderen Hubs ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den Seiten der einzelnen Hubs <strong>könnten</strong> jeweils nähere Informationen dazu stehen."
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Hub URL"
+msgstr "Hub-URL"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Access Type"
+msgstr "Zugriffstyp"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Registration Policy"
+msgstr "Registrierungsrichtlinien"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Stats"
+msgstr "Statistiken"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Software"
+msgstr "Software"
+
+#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
+#: ../../include/conversation.php:962
+msgid "Ratings"
+msgstr "Bewertungen"
+
+#: ../../Zotlabs/Module/Pubsites.php:38
+msgid "Rate"
+msgstr "Bewerten"
+
+#: ../../Zotlabs/Module/Profile_photo.php:186
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird."
+
+#: ../../Zotlabs/Module/Profile_photo.php:389
+msgid "Upload Profile Photo"
+msgstr "Lade neues Profilfoto hoch"
+
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Editblock.php:108
+msgid "Block Name"
+msgstr "Block-Name"
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2238
+msgid "Blocks"
+msgstr "Blöcke"
+
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr "Titel des Blocks"
+
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Website:"
+msgstr "Webseite:"
+
+#: ../../Zotlabs/Module/Rate.php:163
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Kanal [%s] (auf diesem Server noch unbekannt)"
+
+#: ../../Zotlabs/Module/Rate.php:164
+msgid "Rating (this information is public)"
+msgstr "Bewertung (öffentlich sichtbar)"
+
+#: ../../Zotlabs/Module/Rate.php:165
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)"
+
+#: ../../Zotlabs/Module/Ratings.php:73
+msgid "No ratings"
+msgstr "Keine Bewertungen"
+
+#: ../../Zotlabs/Module/Ratings.php:104
+msgid "Rating: "
+msgstr "Bewertung: "
+
+#: ../../Zotlabs/Module/Ratings.php:105
+msgid "Website: "
+msgstr "Webseite: "
+
+#: ../../Zotlabs/Module/Ratings.php:107
+msgid "Description: "
+msgstr "Beschreibung: "
+
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:165
+#: ../../include/widgets.php:102
+msgid "Apps"
+msgstr "Apps"
+
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243
+msgid "Title (optional)"
+msgstr "Titel (optional)"
+
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
+msgstr "Block bearbeiten"
+
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr "Kein Kanal."
+
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr "Gemeinsame Verbindungen"
+
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
+msgstr "Keine gemeinsamen Verbindungen."
 
 #: ../../Zotlabs/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
@@ -4765,120 +4999,154 @@ 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:147
-#: ../../boot.php:1685
+#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:149
+#: ../../boot.php:1686
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../../Zotlabs/Module/Register.php:262
-msgid "Proceed to create your first channel"
-msgstr "Fortfahren und Deinen ersten Kanal anlegen"
+#: ../../Zotlabs/Module/Register.php:263
+msgid ""
+"This site may require email verification after submitting this form. If you "
+"are returned to a login page, please check your email for instructions."
+msgstr "Diese Seite verlangt möglicherweise eine Emailbestätigung nach dem Ansenden des Formulars. Wenn Du auf eine Login-Seite zurückgeleitet wirst, prüfe bitte auf neue Mail mit entsprechenden Hinweisen."
 
 #: ../../Zotlabs/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Bitte melde dich an."
 
-#: ../../Zotlabs/Module/Removeaccount.php:34
+#: ../../Zotlabs/Module/Removeaccount.php:35
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt."
 
-#: ../../Zotlabs/Module/Removeaccount.php:56
+#: ../../Zotlabs/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Dieses Konto löschen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "WARNING: "
 msgstr "WARNUNG: "
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Dieses Konto mit all seinen Kanälen wird vollständig aus dem Netzwerk gelöscht."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This action is permanent and can not be undone!"
 msgstr "Dieser Schritt ist endgültig und kann nicht rückgängig gemacht werden!"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeme.php:62
 msgid "Please enter your password for verification:"
 msgstr "Bitte gib zur Bestätigung Dein Passwort ein:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Dieses Konto, all seine Kanäle sowie alle Kanal-Klone aus dem Netzwerk löschen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Standardmäßig werden nur die Kanalklone auf diesem $Projectname-Hub aus dem Netzwerk entfernt"
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
-#: ../../Zotlabs/Module/Settings.php:705
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings.php:759
 msgid "Remove Account"
 msgstr "Konto entfernen"
 
-#: ../../Zotlabs/Module/Removeme.php:33
+#: ../../Zotlabs/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Innerhalb von 48 Stunden nach einer Änderung des Passworts können keine Kanäle gelöscht werden."
 
-#: ../../Zotlabs/Module/Removeme.php:58
+#: ../../Zotlabs/Module/Removeme.php:60
 msgid "Remove This Channel"
 msgstr "Diesen Kanal löschen"
 
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This channel will be completely removed from the network. "
 msgstr "Dieser Kanal wird vollständig aus dem Netzwerk gelöscht."
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid "Remove this channel and all its clones from the network"
 msgstr "Lösche diesen Kanal und all seine Klone aus dem Netzwerk"
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "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:62 ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Removeme.php:64 ../../Zotlabs/Module/Settings.php:1219
 msgid "Remove Channel"
 msgstr "Kanal löschen"
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+msgid "Export Channel"
+msgstr "Kanal exportieren"
+
+#: ../../Zotlabs/Module/Uexport.php:57
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal."
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält."
 
-#: ../../Zotlabs/Module/Rmagic.php:44
-msgid "The error message was:"
-msgstr "Die Fehlermeldung war:"
+#: ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Content"
+msgstr "Kanal und Inhalte exportieren"
 
-#: ../../Zotlabs/Module/Rmagic.php:48
-msgid "Authentication failed."
-msgstr "Authentifizierung fehlgeschlagen."
+#: ../../Zotlabs/Module/Uexport.php:59
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet."
 
-#: ../../Zotlabs/Module/Rmagic.php:88
-msgid "Remote Authentication"
-msgstr "Entfernte Authentifizierung"
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export your posts from a given year."
+msgstr "Exportiert die Beiträge des angegebenen Jahres."
 
-#: ../../Zotlabs/Module/Rmagic.php:89
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Deine Kanal-Adresse (z. B. channel@example.com)"
+#: ../../Zotlabs/Module/Uexport.php:62
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne."
 
-#: ../../Zotlabs/Module/Rmagic.php:90
-msgid "Authenticate"
-msgstr "Authentifizieren"
+#: ../../Zotlabs/Module/Uexport.php:63
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a "
+"href=\"%1$s\">%2$s</a>"
+msgstr "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1$s\">%2$s</a>."
+
+#: ../../Zotlabs/Module/Uexport.php:64
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1$s\">%2$s</a>."
+
+#: ../../Zotlabs/Module/Uexport.php:65
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a "
+"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
+" please import or restore these in date order (oldest first)."
+msgstr "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1$s\">%2$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst."
 
 #: ../../Zotlabs/Module/Search.php:216
 #, php-format
@@ -4894,609 +5162,652 @@ msgstr "Suchergebnisse für: %s"
 msgid "No service class restrictions found."
 msgstr "Keine Dienstklassenbeschränkungen gefunden."
 
-#: ../../Zotlabs/Module/Settings.php:69
+#: ../../Zotlabs/Module/Settings.php:64
 msgid "Name is required"
 msgstr "Name ist erforderlich"
 
-#: ../../Zotlabs/Module/Settings.php:73
+#: ../../Zotlabs/Module/Settings.php:68
 msgid "Key and Secret are required"
 msgstr "Schlüssel und Geheimnis werden benötigt"
 
-#: ../../Zotlabs/Module/Settings.php:225
+#: ../../Zotlabs/Module/Settings.php:138
+#, php-format
+msgid "This channel is limited to %d tokens"
+msgstr "Dieser Kanal ist auf %d Token begrenzt"
+
+#: ../../Zotlabs/Module/Settings.php:144
+msgid "Name and Password are required."
+msgstr "Name und Passwort sind erforderlich."
+
+#: ../../Zotlabs/Module/Settings.php:168
+msgid "Token saved."
+msgstr "Token gespeichert."
+
+#: ../../Zotlabs/Module/Settings.php:274
 msgid "Not valid email."
 msgstr "Keine gültige E-Mail Adresse."
 
-#: ../../Zotlabs/Module/Settings.php:228
+#: ../../Zotlabs/Module/Settings.php:277
 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:237
+#: ../../Zotlabs/Module/Settings.php:286
 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:254
+#: ../../Zotlabs/Module/Settings.php:303
 msgid "Password verification failed."
 msgstr "Passwortüberprüfung fehlgeschlagen."
 
-#: ../../Zotlabs/Module/Settings.php:261
+#: ../../Zotlabs/Module/Settings.php:310
 msgid "Passwords do not match. Password unchanged."
 msgstr "Kennwörter stimmen nicht überein. Kennwort nicht verändert."
 
-#: ../../Zotlabs/Module/Settings.php:265
+#: ../../Zotlabs/Module/Settings.php:314
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Leere Kennwörter sind nicht erlaubt. Kennwort nicht verändert."
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Zotlabs/Module/Settings.php:328
 msgid "Password changed."
 msgstr "Kennwort geändert."
 
-#: ../../Zotlabs/Module/Settings.php:281
+#: ../../Zotlabs/Module/Settings.php:330
 msgid "Password update failed. Please try again."
 msgstr "Kennwortänderung fehlgeschlagen. Bitte versuche es noch einmal."
 
-#: ../../Zotlabs/Module/Settings.php:525
+#: ../../Zotlabs/Module/Settings.php:579
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
-#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
-#: ../../Zotlabs/Module/Settings.php:651
+#: ../../Zotlabs/Module/Settings.php:643 ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:705
 msgid "Add application"
 msgstr "Anwendung hinzufügen"
 
-#: ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:646
 msgid "Name of application"
 msgstr "Name der Anwendung"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:673
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:648
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatisch erzeugt – ändern, falls erwünscht. Maximale Länge 20"
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:648 ../../Zotlabs/Module/Settings.php:674
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
+#: ../../Zotlabs/Module/Settings.php:649 ../../Zotlabs/Module/Settings.php:675
 msgid "Redirect"
 msgstr "Umleitung"
 
-#: ../../Zotlabs/Module/Settings.php:595
+#: ../../Zotlabs/Module/Settings.php:649
 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:596 ../../Zotlabs/Module/Settings.php:622
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Settings.php:676
 msgid "Icon url"
 msgstr "Symbol-URL"
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Sources.php:112
 #: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr "Optional"
 
-#: ../../Zotlabs/Module/Settings.php:607
+#: ../../Zotlabs/Module/Settings.php:661
 msgid "Application not found."
 msgstr "Die Anwendung wurde nicht gefunden."
 
-#: ../../Zotlabs/Module/Settings.php:650
+#: ../../Zotlabs/Module/Settings.php:704
 msgid "Connected Apps"
 msgstr "Verbundene Apps"
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:708
 msgid "Client key starts with"
 msgstr "Client Key beginnt mit"
 
-#: ../../Zotlabs/Module/Settings.php:655
+#: ../../Zotlabs/Module/Settings.php:709
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../../Zotlabs/Module/Settings.php:656
+#: ../../Zotlabs/Module/Settings.php:710
 msgid "Remove authorization"
 msgstr "Authorisierung aufheben"
 
-#: ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:723
 msgid "No feature settings configured"
 msgstr "Keine Funktions-Einstellungen konfiguriert"
 
-#: ../../Zotlabs/Module/Settings.php:676
+#: ../../Zotlabs/Module/Settings.php:730
 msgid "Feature/Addon Settings"
 msgstr "Funktions-/Addon-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:753
 msgid "Account Settings"
 msgstr "Konto-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:754
 msgid "Current Password"
 msgstr "Aktuelles Passwort"
 
-#: ../../Zotlabs/Module/Settings.php:701
+#: ../../Zotlabs/Module/Settings.php:755
 msgid "Enter New Password"
 msgstr "Gib ein neues Passwort ein"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 msgid "Confirm New Password"
 msgstr "Bestätige das neue Passwort"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 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:704
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:758
+#: ../../Zotlabs/Module/Settings.php:1136
 msgid "Email Address:"
 msgstr "Email Adresse:"
 
-#: ../../Zotlabs/Module/Settings.php:706
+#: ../../Zotlabs/Module/Settings.php:760
 msgid "Remove this account including all its channels"
 msgstr "Dieses Konto inklusive all seiner Kanäle löschen"
 
-#: ../../Zotlabs/Module/Settings.php:729
+#: ../../Zotlabs/Module/Settings.php:789
+msgid ""
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in Access Control Lists and "
+"visitors may login using these credentials to access the private content."
+msgstr "Mit diesem Formular kannst Du temporäre Zugangs-IDs anlegen, um Inhalte mit Nicht-Mitgliedern zu teilen. Die IDs können in Berechtigungslisten (ACLs) verwendet werden, und Besucher können sich damit einloggen, um auf private Inhalte zuzugreifen."
+
+#: ../../Zotlabs/Module/Settings.php:791
+msgid ""
+"You may also provide <em>dropbox</em> style access links to friends and "
+"associates by adding the Login Password to any specific site URL as shown. "
+"Examples:"
+msgstr "Du kannst auch <em>Dropbox</em>-ähnliche Zugriffslinks an Andere weitergeben, indem du das Login-Passwort an eine entsprechende URL anhängst wie nachfolgend gezeigt. Beispiele:"
+
+#: ../../Zotlabs/Module/Settings.php:796 ../../include/widgets.php:614
+msgid "Guest Access Tokens"
+msgstr "Gastzugangstoken"
+
+#: ../../Zotlabs/Module/Settings.php:803
+msgid "Login Name"
+msgstr "Anmeldename"
+
+#: ../../Zotlabs/Module/Settings.php:804
+msgid "Login Password"
+msgstr "Anmeldepasswort"
+
+#: ../../Zotlabs/Module/Settings.php:805
+msgid "Expires (yyyy-mm-dd)"
+msgstr "Läuft ab (jjjj-mm-tt)"
+
+#: ../../Zotlabs/Module/Settings.php:830
 msgid "Additional Features"
 msgstr "Zusätzliche Funktionen"
 
-#: ../../Zotlabs/Module/Settings.php:753
+#: ../../Zotlabs/Module/Settings.php:854
 msgid "Connector Settings"
 msgstr "Connector-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:792
+#: ../../Zotlabs/Module/Settings.php:893
 msgid "No special theme for mobile devices"
 msgstr "Keine spezielle Theme für mobile Geräte"
 
-#: ../../Zotlabs/Module/Settings.php:795
+#: ../../Zotlabs/Module/Settings.php:896
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s – (experimentell)"
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:938
 msgid "Display Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:939
 msgid "Theme Settings"
 msgstr "Theme-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:839
+#: ../../Zotlabs/Module/Settings.php:940
 msgid "Custom Theme Settings"
 msgstr "Benutzerdefinierte Theme-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:840
+#: ../../Zotlabs/Module/Settings.php:941
 msgid "Content Settings"
 msgstr "Inhaltseinstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:947
 msgid "Display Theme:"
 msgstr "Anzeige-Theme:"
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:948
 msgid "Mobile Theme:"
 msgstr "Mobile Theme:"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 msgid "Preload images before rendering the page"
 msgstr "Bilder im voraus laden, bevor die Seite angezeigt wird"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 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:849
+#: ../../Zotlabs/Module/Settings.php:950
 msgid "Enable user zoom on mobile devices"
 msgstr "Zoom auf Mobilgeräten aktivieren"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Update browser every xx seconds"
 msgstr "Browser alle xx Sekunden aktualisieren"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 Sekunden, kein Maximum"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:952
 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:851
+#: ../../Zotlabs/Module/Settings.php:952
 msgid "Maximum of 100 items"
 msgstr "Maximum: 100 Beiträge"
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:953
 msgid "Show emoticons (smilies) as images"
 msgstr "Emoticons (Smilies) als Bilder anzeigen"
 
-#: ../../Zotlabs/Module/Settings.php:853
+#: ../../Zotlabs/Module/Settings.php:954
 msgid "Link post titles to source"
 msgstr "Beitragstitel zum Originalbeitrag verlinken"
 
-#: ../../Zotlabs/Module/Settings.php:854
+#: ../../Zotlabs/Module/Settings.php:955
 msgid "System Page Layout Editor - (advanced)"
 msgstr "System-Seitenlayout-Editor (für Experten)"
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:958
 msgid "Use blog/list mode on channel page"
 msgstr "Blog-/Listenmodus auf der Kanalseite verwenden"
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:958 ../../Zotlabs/Module/Settings.php:959
 msgid "(comments displayed separately)"
 msgstr "(Kommentare werden separat angezeigt)"
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:959
 msgid "Use blog/list mode on grid page"
 msgstr "Blog-/Listenmodus auf der Netzwerkseite verwenden"
 
-#: ../../Zotlabs/Module/Settings.php:859
+#: ../../Zotlabs/Module/Settings.php:960
 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:859 ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:960 ../../Zotlabs/Module/Settings.php:961
 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:860
+#: ../../Zotlabs/Module/Settings.php:961
 msgid "Grid page max height of content (in pixels)"
 msgstr "Maximale Höhe (in Pixel) des Inhalts der Netzwerkseite"
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Zotlabs/Module/Settings.php:990
 msgid "Nobody except yourself"
 msgstr "Niemand außer Dir selbst"
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:991
 msgid "Only those you specifically allow"
 msgstr "Nur die, denen Du es explizit erlaubst"
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:992
 msgid "Approved connections"
 msgstr "Angenommene Verbindungen"
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:993
 msgid "Any connections"
 msgstr "Beliebige Verbindungen"
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:994
 msgid "Anybody on this website"
 msgstr "Jeder auf dieser Website"
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:995
 msgid "Anybody in this network"
 msgstr "Alle $Projectname-Mitglieder"
 
-#: ../../Zotlabs/Module/Settings.php:900
+#: ../../Zotlabs/Module/Settings.php:996
 msgid "Anybody authenticated"
 msgstr "Jeder authentifizierte"
 
-#: ../../Zotlabs/Module/Settings.php:901
+#: ../../Zotlabs/Module/Settings.php:997
 msgid "Anybody on the internet"
 msgstr "Jeder im Internet"
 
-#: ../../Zotlabs/Module/Settings.php:976
+#: ../../Zotlabs/Module/Settings.php:1071
 msgid "Publish your default profile in the network directory"
 msgstr "Standard-Profil im Netzwerk-Verzeichnis veröffentlichen"
 
-#: ../../Zotlabs/Module/Settings.php:981
+#: ../../Zotlabs/Module/Settings.php:1076
 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:990
+#: ../../Zotlabs/Module/Settings.php:1085
 msgid "Your channel address is"
 msgstr "Deine Kanal-Adresse lautet"
 
-#: ../../Zotlabs/Module/Settings.php:1032
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Channel Settings"
 msgstr "Kanal-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:1134
 msgid "Basic Settings"
 msgstr "Grundeinstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140
+#: ../../Zotlabs/Module/Settings.php:1135 ../../include/channel.php:1180
 msgid "Full Name:"
 msgstr "Voller Name:"
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1137
 msgid "Your Timezone:"
 msgstr "Ihre Zeitzone:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Default Post Location:"
 msgstr "Standardstandort:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Geographical location to display on your posts"
 msgstr "Geografischer Ort, der bei Deinen Beiträgen angezeigt werden soll"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1139
 msgid "Use Browser Location:"
 msgstr "Standort des Browsers verwenden:"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 msgid "Adult Content"
 msgstr "Nicht jugendfreie Inhalte"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 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:1048
+#: ../../Zotlabs/Module/Settings.php:1143
 msgid "Security and Privacy Settings"
 msgstr "Sicherheits- und Datenschutz-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1146
 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:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 msgid "Hide my online presence"
 msgstr "Meine Online-Präsenz verbergen"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Verhindert die Anzeige Deines Online-Status in deinem Profil"
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Zotlabs/Module/Settings.php:1150
 msgid "Simple Privacy Settings:"
 msgstr "Einfache Privatsphäre-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1151
 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:1057
+#: ../../Zotlabs/Module/Settings.php:1152
 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:1058
+#: ../../Zotlabs/Module/Settings.php:1153
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privat – <em>Standard privat, nie offen oder öffentlich</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1154
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Blockiert – <em>Alle standardmäßig blockiert</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 msgid "Allow others to tag your posts"
 msgstr "Erlaube anderen, Deine Beiträge zu verschlagworten"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 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:1063
+#: ../../Zotlabs/Module/Settings.php:1158
 msgid "Advanced Privacy Settings"
 msgstr "Fortgeschrittene Privatsphäre-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 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:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "0 or blank to use the website limit."
 msgstr "0 oder leer lassen, um den voreingestellten Wert der Webseite zu verwenden."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Diese Webseite läuft nach %d Tagen ab."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "This website does not expire imported content."
 msgstr "Diese Webseite lässt importierte Inhalte nicht verfallen."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "Das Verfallslimit der Webseite hat Vorrang, wenn es niedriger als Deines hier ist."
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximale Kontaktanfragen pro Tag:"
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "May reduce spam activity"
 msgstr "Kann die Spam-Aktivität verringern"
 
-#: ../../Zotlabs/Module/Settings.php:1067
+#: ../../Zotlabs/Module/Settings.php:1162
 msgid "Default Post and Publish Permissions"
 msgstr "Standard-Berechtigungen für Beiträge und andere Inhalte"
 
-#: ../../Zotlabs/Module/Settings.php:1069
+#: ../../Zotlabs/Module/Settings.php:1164
 msgid "Use my default audience setting for the type of object published"
 msgstr "Verwende Deine eingestellte Standard-Zielgruppe des jeweiligen Inhaltstyps"
 
-#: ../../Zotlabs/Module/Settings.php:1072
+#: ../../Zotlabs/Module/Settings.php:1167
 msgid "Channel permissions category:"
 msgstr "Zugriffsrechte-Kategorie des Kanals:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximale Anzahl privater Nachrichten pro Tag von unbekannten Leuten:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Useful to reduce spamming"
 msgstr "Nützlich, um Spam zu verringern"
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1176
 msgid "Notification Settings"
 msgstr "Benachrichtigungs-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1177
 msgid "By default post a status message when:"
 msgstr "Sende standardmäßig Status-Nachrichten, wenn:"
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1178
 msgid "accepting a friend request"
 msgstr "Du eine Verbindungsanfrage annimmst"
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1179
 msgid "joining a forum/community"
 msgstr "Du einem Forum beitrittst"
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1180
 msgid "making an <em>interesting</em> profile change"
 msgstr "Du eine <em>interessante</em> Änderung an Deinem Profil vornimmst"
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1181
 msgid "Send a notification email when:"
 msgstr "Eine E-Mail-Benachrichtigung senden, wenn:"
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1182
 msgid "You receive a connection request"
 msgstr "Du eine Verbindungsanfrage erhältst"
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1183
 msgid "Your connections are confirmed"
 msgstr "Eine Verbindung bestätigt wurde"
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1184
 msgid "Someone writes on your profile wall"
 msgstr "Jemand auf Deine Pinnwand schreibt"
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1185
 msgid "Someone writes a followup comment"
 msgstr "Jemand einen Beitrag kommentiert"
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1186
 msgid "You receive a private message"
 msgstr "Du eine private Nachricht erhältst"
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1187
 msgid "You receive a friend suggestion"
 msgstr "Du einen Kontaktvorschlag erhältst"
 
-#: ../../Zotlabs/Module/Settings.php:1093
+#: ../../Zotlabs/Module/Settings.php:1188
 msgid "You are tagged in a post"
 msgstr "Du in einem Beitrag erwähnt wurdest"
 
-#: ../../Zotlabs/Module/Settings.php:1094
+#: ../../Zotlabs/Module/Settings.php:1189
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Du in einem Beitrag angestupst/geknufft/o.ä. wurdest"
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1192
 msgid "Show visual notifications including:"
 msgstr "Visuelle Benachrichtigungen anzeigen für:"
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1194
 msgid "Unseen grid activity"
 msgstr "Ungesehene Netzwerk-Aktivität"
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1195
 msgid "Unseen channel activity"
 msgstr "Ungesehene Kanal-Aktivität"
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1196
 msgid "Unseen private messages"
 msgstr "Ungelesene persönliche Nachrichten"
 
-#: ../../Zotlabs/Module/Settings.php:1101
-#: ../../Zotlabs/Module/Settings.php:1106
-#: ../../Zotlabs/Module/Settings.php:1107
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1196
+#: ../../Zotlabs/Module/Settings.php:1201
+#: ../../Zotlabs/Module/Settings.php:1202
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "Recommended"
 msgstr "Empfohlen"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1197
 msgid "Upcoming events"
 msgstr "Baldige Termine"
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1198
 msgid "Events today"
 msgstr "Heutige Termine"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Upcoming birthdays"
 msgstr "Baldige Geburtstage"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Not available in all themes"
 msgstr "Nicht in allen Themes verfügbar"
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1200
 msgid "System (personal) notifications"
 msgstr "System – (persönliche) Benachrichtigungen"
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1201
 msgid "System info messages"
 msgstr "System – Info-Nachrichten"
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1202
 msgid "System critical alerts"
 msgstr "System – kritische Warnungen"
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "New connections"
 msgstr "Neue Verbindungen"
 
-#: ../../Zotlabs/Module/Settings.php:1109
+#: ../../Zotlabs/Module/Settings.php:1204
 msgid "System Registrations"
 msgstr "System – Registrierungen"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1205
 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:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 msgid "Notify me of events this many days in advance"
 msgstr "Benachrichtige mich zu Terminen so viele Tage im Voraus"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 msgid "Must be greater than 0"
 msgstr "Muss größer als 0 sein"
 
-#: ../../Zotlabs/Module/Settings.php:1114
+#: ../../Zotlabs/Module/Settings.php:1209
 msgid "Advanced Account/Page Type Settings"
 msgstr "Erweiterte Account- und Seitenart-Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1115
+#: ../../Zotlabs/Module/Settings.php:1210
 msgid "Change the behaviour of this account for special situations"
 msgstr "Ändere das Verhalten dieses Accounts unter speziellen Umständen"
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1213
 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:1119
+#: ../../Zotlabs/Module/Settings.php:1214
 msgid "Miscellaneous Settings"
 msgstr "Sonstige Einstellungen"
 
-#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1215
 msgid "Default photo upload folder"
 msgstr "Voreingestellter Ordner für hochgeladene Fotos"
 
-#: ../../Zotlabs/Module/Settings.php:1120
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1215
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - aktuelles Jahr, %m -  aktueller Monat"
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "Default file upload folder"
 msgstr "Voreingestellter Ordner für hochgeladene Dateien"
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1218
 msgid "Personal menu to display in your channel pages"
 msgstr "Eigenes Menü zur Anzeige auf den Seiten deines Kanals"
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Zotlabs/Module/Settings.php:1220
 msgid "Remove this channel."
 msgstr "Diesen Kanal löschen"
 
-#: ../../Zotlabs/Module/Settings.php:1126
+#: ../../Zotlabs/Module/Settings.php:1221
 msgid "Firefox Share $Projectname provider"
 msgstr "$Projectname-Provider für Firefox Share"
 
-#: ../../Zotlabs/Module/Settings.php:1127
+#: ../../Zotlabs/Module/Settings.php:1222
 msgid "Start calendar week on monday"
 msgstr "Montag als erster Tag der Kalenderwoche"
 
@@ -5529,7 +5840,7 @@ msgid ""
 msgstr "Möglicherweise musst Du die Datei install/schema_xxx.sql manuell mit Hilfe eines Datenkbank-Clients importieren."
 
 #: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
-#: ../../Zotlabs/Module/Setup.php:721
+#: ../../Zotlabs/Module/Setup.php:722
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Lies die Datei \"install/INSTALL.txt\"."
 
@@ -5729,199 +6040,200 @@ msgid "mb_string PHP module"
 msgstr "mb_string-PHP-Modul"
 
 #: ../../Zotlabs/Module/Setup.php:496
-msgid "mcrypt PHP module"
-msgstr "mcrypt-PHP-Modul"
-
-#: ../../Zotlabs/Module/Setup.php:497
 msgid "xml PHP module"
 msgstr "xml-PHP-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:501 ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:500 ../../Zotlabs/Module/Setup.php:502
 msgid "Apache mod_rewrite module"
 msgstr "Apache-mod_rewrite-Modul"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Zotlabs/Module/Setup.php:500
 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:507 ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:506 ../../Zotlabs/Module/Setup.php:509
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Zotlabs/Module/Setup.php:506
 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:515
+#: ../../Zotlabs/Module/Setup.php:514
 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:519
+#: ../../Zotlabs/Module/Setup.php:518
 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:523
+#: ../../Zotlabs/Module/Setup.php:522
 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:527
+#: ../../Zotlabs/Module/Setup.php:526
 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:531
+#: ../../Zotlabs/Module/Setup.php:530
 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:535
-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:539
+#: ../../Zotlabs/Module/Setup.php:534
 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:557
+#: ../../Zotlabs/Module/Setup.php:552
 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:558
+#: ../../Zotlabs/Module/Setup.php:553
 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:559
+#: ../../Zotlabs/Module/Setup.php:554
 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:560
+#: ../../Zotlabs/Module/Setup.php:555
 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:563
+#: ../../Zotlabs/Module/Setup.php:558
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php ist beschreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Zotlabs/Module/Setup.php:572
 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:578
+#: ../../Zotlabs/Module/Setup.php:573
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr "Um diese kompilierten Vorlagen speichern zu können, braucht der Web-Server Schreibzugriff auf das Verzeichnis %s unterhalb des Hubzilla-Stammverzeichnisses."
 
-#: ../../Zotlabs/Module/Setup.php:579 ../../Zotlabs/Module/Setup.php:600
+#: ../../Zotlabs/Module/Setup.php:574 ../../Zotlabs/Module/Setup.php:595
 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:580
+#: ../../Zotlabs/Module/Setup.php:575
 #, 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:583
+#: ../../Zotlabs/Module/Setup.php:578
 #, php-format
 msgid "%s is writable"
 msgstr "%s ist beschreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Zotlabs/Module/Setup.php:594
 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"
+"This software 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 "Diese Software benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Hubzilla-Stammverzeichnisses"
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Zotlabs/Module/Setup.php:598
 msgid "store is writable"
 msgstr "store ist schreibbar"
 
-#: ../../Zotlabs/Module/Setup.php:636
+#: ../../Zotlabs/Module/Setup.php:631
 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:637
+#: ../../Zotlabs/Module/Setup.php:632
 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:638
+#: ../../Zotlabs/Module/Setup.php:633
 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:639
+#: ../../Zotlabs/Module/Setup.php:634
 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:640
+#: ../../Zotlabs/Module/Setup.php:635
 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:641
+#: ../../Zotlabs/Module/Setup.php:636
 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:643
+#: ../../Zotlabs/Module/Setup.php:638
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr "Wenn Du sicher bist, dass das Zertifikat gültig und von einer vertrauenswürdigen Zertifizierungsstelle signiert ist, prüfe auf ggf. noch zu installierende Zwischenzertifikate (intermediate). Diese werden nicht unbedingt von Browsern benötigt, aber sehr wohl für die Kommunikation zwischen Servern."
+
+#: ../../Zotlabs/Module/Setup.php:641
 msgid "SSL certificate validation"
 msgstr "SSL Zertifikatverifizierung"
 
-#: ../../Zotlabs/Module/Setup.php:649
+#: ../../Zotlabs/Module/Setup.php:647
 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:652
+#: ../../Zotlabs/Module/Setup.php:650
 msgid "Url rewrite is working"
 msgstr "Url rewrite funktioniert"
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:659
 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:685
+#: ../../Zotlabs/Module/Setup.php:683
 msgid "Errors encountered creating database tables."
 msgstr "Fehler beim Anlegen der Datenbank-Tabellen aufgetreten."
 
-#: ../../Zotlabs/Module/Setup.php:719
+#: ../../Zotlabs/Module/Setup.php:720
 msgid "<h1>What next</h1>"
 msgstr "<h1>Was als Nächstes</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:720
+#: ../../Zotlabs/Module/Setup.php:721
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -5943,64 +6255,62 @@ msgstr "Alle Dateien löschen"
 msgid "Remove this file"
 msgstr "Diese Datei löschen"
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Zotlabs/Module/Thing.php:114
+msgid "Thing updated"
+msgstr "Sache aktualisiert"
+
+#: ../../Zotlabs/Module/Thing.php:166
+msgid "Object store: failed"
+msgstr "Speichern des Objekts fehlgeschlagen"
+
+#: ../../Zotlabs/Module/Thing.php:170
+msgid "Thing added"
+msgstr "Sache hinzugefügt"
+
+#: ../../Zotlabs/Module/Thing.php:196
 #, php-format
-msgid "Version %s"
-msgstr "Version %s"
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:40
-msgid "Installed plugins/addons/apps:"
-msgstr "Installierte Plugins/Addons/Apps"
+#: ../../Zotlabs/Module/Thing.php:259
+msgid "Show Thing"
+msgstr "Sache anzeigen"
 
-#: ../../Zotlabs/Module/Siteinfo.php:53
-msgid "No installed plugins/addons/apps"
-msgstr "Keine installierten Plugins/Addons/Apps"
+#: ../../Zotlabs/Module/Thing.php:266
+msgid "item not found."
+msgstr "Eintrag nicht gefunden"
 
-#: ../../Zotlabs/Module/Siteinfo.php:66
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
-msgstr "Dieser Hub ist Teil von $Projectname – ein globales, kooperatives Netzwerk aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen."
+#: ../../Zotlabs/Module/Thing.php:299
+msgid "Edit Thing"
+msgstr "Sache bearbeiten"
 
-#: ../../Zotlabs/Module/Siteinfo.php:68
-msgid "Tag: "
-msgstr "Schlagwort: "
+#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
+msgid "Select a profile"
+msgstr "Wähle ein Profil"
 
-#: ../../Zotlabs/Module/Siteinfo.php:70
-msgid "Last background fetch: "
-msgstr "Letzter Hintergrundabruf:"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Post an activity"
+msgstr "Aktivitätsnachricht senden"
 
-#: ../../Zotlabs/Module/Siteinfo.php:72
-msgid "Current load average: "
-msgstr "Aktuelles Load Average:"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Nur an Betrachter des ausgewählten Profils senden"
 
-#: ../../Zotlabs/Module/Siteinfo.php:75
-msgid "Running at web location"
-msgstr "Erreichbar unter der Web-Adresse"
+#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
+msgid "Name of thing e.g. something"
+msgstr "Name der Sache, z. B. irgendwas"
 
-#: ../../Zotlabs/Module/Siteinfo.php:76
-msgid ""
-"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
-"about $Projectname."
-msgstr "Bitte besuchen Sie <a href=\"http://hubzilla.org\">hubzilla.org</a>, um mehr über $Projectname zu erfahren."
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
+msgid "URL of thing (optional)"
+msgstr "URL der Sache (optional)"
 
-#: ../../Zotlabs/Module/Siteinfo.php:77
-msgid "Bug reports and issues: please visit"
-msgstr "Probleme oder Fehler gefunden? Bitte besuche"
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
+msgid "URL for photo of thing (optional)"
+msgstr "URL eines Fotos der Sache (optional)"
 
-#: ../../Zotlabs/Module/Siteinfo.php:79
-msgid "$projectname issues"
-msgstr "$projectname-Bugtracker"
-
-#: ../../Zotlabs/Module/Siteinfo.php:80
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com"
-
-#: ../../Zotlabs/Module/Siteinfo.php:82
-msgid "Site Administrators"
-msgstr "Administratoren"
+#: ../../Zotlabs/Module/Thing.php:349
+msgid "Add Thing to your Profile"
+msgstr "Die Sache Deinem Profil hinzufügen"
 
 #: ../../Zotlabs/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
@@ -6018,8 +6328,8 @@ msgstr "Quelle aktualisiert."
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630
-#: ../../include/features.php:71
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:72
+#: ../../include/widgets.php:639
 msgid "Channel Sources"
 msgstr "Kanal-Quellen"
 
@@ -6095,12 +6405,12 @@ msgstr "Keine Vorschläge vorhanden. Wenn das ein neuer Server ist, versuche es
 msgid "Ignore/Hide"
 msgstr "Ignorieren/Verstecken"
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:263
 msgid "post"
 msgstr "Beitrag"
 
-#: ../../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:1929
 msgid "comment"
 msgstr "Kommentar"
 
@@ -6121,131 +6431,110 @@ msgstr "Schlagwort entfernen"
 msgid "Select a tag to remove: "
 msgstr "Schlagwort zum Entfernen auswählen:"
 
-#: ../../Zotlabs/Module/Thing.php:114
-msgid "Thing updated"
-msgstr "Sache aktualisiert"
+#: ../../Zotlabs/Module/Webpages.php:191 ../../Zotlabs/Lib/Apps.php:218
+#: ../../include/nav.php:106 ../../include/conversation.php:1700
+msgid "Webpages"
+msgstr "Webseiten"
 
-#: ../../Zotlabs/Module/Thing.php:166
-msgid "Object store: failed"
-msgstr "Speichern des Objekts fehlgeschlagen"
+#: ../../Zotlabs/Module/Webpages.php:202 ../../include/page_widgets.php:44
+msgid "Actions"
+msgstr "Aktionen"
 
-#: ../../Zotlabs/Module/Thing.php:170
-msgid "Thing added"
-msgstr "Sache hinzugefügt"
+#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:45
+msgid "Page Link"
+msgstr "Seiten-Link"
 
-#: ../../Zotlabs/Module/Thing.php:196
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr "OBJ: %1$s %2$s %3$s"
+#: ../../Zotlabs/Module/Webpages.php:204
+msgid "Page Title"
+msgstr "Seitentitel"
 
-#: ../../Zotlabs/Module/Thing.php:259
-msgid "Show Thing"
-msgstr "Sache anzeigen"
+#: ../../Zotlabs/Module/Wiki.php:34
+msgid "Not found"
+msgstr "Nicht gefunden"
 
-#: ../../Zotlabs/Module/Thing.php:266
-msgid "item not found."
-msgstr "Eintrag nicht gefunden"
+#: ../../Zotlabs/Module/Wiki.php:92 ../../Zotlabs/Lib/Apps.php:219
+#: ../../include/nav.php:108 ../../include/conversation.php:1710
+#: ../../include/conversation.php:1713 ../../include/features.php:55
+msgid "Wiki"
+msgstr "Wiki"
 
-#: ../../Zotlabs/Module/Thing.php:299
-msgid "Edit Thing"
-msgstr "Sache bearbeiten"
+#: ../../Zotlabs/Module/Wiki.php:93
+msgid "Sandbox"
+msgstr "Sandbox"
 
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
-msgid "Select a profile"
-msgstr "Wähle ein Profil"
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Post an activity"
-msgstr "Aktivitätsnachricht senden"
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Only sends to viewers of the applicable profile"
-msgstr "Nur an Betrachter des ausgewählten Profils senden"
-
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
-msgid "Name of thing e.g. something"
-msgstr "Name der Sache, z. B. irgendwas"
-
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
-msgid "URL of thing (optional)"
-msgstr "URL der Sache (optional)"
-
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
-msgid "URL for photo of thing (optional)"
-msgstr "URL eines Fotos der Sache (optional)"
-
-#: ../../Zotlabs/Module/Thing.php:349
-msgid "Add Thing to your Profile"
-msgstr "Die Sache Deinem Profil hinzufügen"
-
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
-msgid "Export Channel"
-msgstr "Kanal exportieren"
-
-#: ../../Zotlabs/Module/Uexport.php:57
+#: ../../Zotlabs/Module/Wiki.php:95
 msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
-msgstr "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält."
+"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be"
+" saved*.\""
+msgstr "\"# Wiki Sandkasten\\n\\nInhalte, die Du hier **veränderst** und **als Vorschau anzeigst**, *werden nicht gespeichert*.\""
 
-#: ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Content"
-msgstr "Kanal und Inhalte exportieren"
+#: ../../Zotlabs/Module/Wiki.php:164
+msgid "Revision Comparison"
+msgstr "Revisionsvergleich"
 
-#: ../../Zotlabs/Module/Uexport.php:59
-msgid ""
-"Export your channel information and recent content to a JSON backup that can"
-" be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for"
-" this download to begin."
-msgstr "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet."
+#: ../../Zotlabs/Module/Wiki.php:165
+msgid "Revert"
+msgstr "Rückgängig machen"
 
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export your posts from a given year."
-msgstr "Exportiert die Beiträge des angegebenen Jahres."
+#: ../../Zotlabs/Module/Wiki.php:192
+msgid "Enter the name of your new wiki:"
+msgstr "Gib einen Namen für Dein neues Wiki ein:"
 
-#: ../../Zotlabs/Module/Uexport.php:62
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
-msgstr "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne."
+#: ../../Zotlabs/Module/Wiki.php:193
+msgid "Enter the name of the new page:"
+msgstr "Geben Sie den Namen der neuen Seite ein:"
 
-#: ../../Zotlabs/Module/Uexport.php:63
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a "
-"href=\"%1$s\">%2$s</a>"
-msgstr "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1$s\">%2$s</a>."
+#: ../../Zotlabs/Module/Wiki.php:194
+msgid "Enter the new name:"
+msgstr "Geben Sie den neuen Namen ein:"
 
-#: ../../Zotlabs/Module/Uexport.php:64
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1$s\">%2$s</a>."
+#: ../../Zotlabs/Module/Wiki.php:200 ../../include/conversation.php:1150
+msgid "Embed image from photo albums"
+msgstr "Bild aus Fotoalben einbetten"
 
-#: ../../Zotlabs/Module/Uexport.php:65
-#, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a "
-"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
-" please import or restore these in date order (oldest first)."
-msgstr "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1$s\">%2$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst."
+#: ../../Zotlabs/Module/Wiki.php:201 ../../include/conversation.php:1234
+msgid "Embed an image from your albums"
+msgstr "Betten Sie ein Bild aus Ihren Alben ein"
 
-#: ../../Zotlabs/Module/Viewconnections.php:62
+#: ../../Zotlabs/Module/Wiki.php:203 ../../include/conversation.php:1236
+#: ../../include/conversation.php:1273
+msgid "OK"
+msgstr "Ok"
+
+#: ../../Zotlabs/Module/Wiki.php:204 ../../include/conversation.php:1186
+msgid "Choose images to embed"
+msgstr "Wählen Sie Bilder zum Einbetten aus"
+
+#: ../../Zotlabs/Module/Wiki.php:205 ../../include/conversation.php:1187
+msgid "Choose an album"
+msgstr "Wählen Sie ein Album aus"
+
+#: ../../Zotlabs/Module/Wiki.php:206 ../../include/conversation.php:1188
+msgid "Choose a different album..."
+msgstr "Wählen Sie ein anderes Album aus..."
+
+#: ../../Zotlabs/Module/Wiki.php:207 ../../include/conversation.php:1189
+msgid "Error getting album list"
+msgstr "Fehler beim Holen der Albenliste"
+
+#: ../../Zotlabs/Module/Wiki.php:208 ../../include/conversation.php:1190
+msgid "Error getting photo link"
+msgstr "Fehler beim Holen des Fotolinks"
+
+#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1191
+msgid "Error getting album"
+msgstr "Fehler beim Holen des Albums"
+
+#: ../../Zotlabs/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr "Keine Verbindungen."
 
-#: ../../Zotlabs/Module/Viewconnections.php:75
+#: ../../Zotlabs/Module/Viewconnections.php:78
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "%ss Profil [%s] besuchen"
 
-#: ../../Zotlabs/Module/Viewconnections.php:104
+#: ../../Zotlabs/Module/Viewconnections.php:107
 msgid "View Connections"
 msgstr "Verbindungen anzeigen"
 
@@ -6253,22 +6542,23 @@ msgstr "Verbindungen anzeigen"
 msgid "Source of Item"
 msgstr "Quelle des Elements"
 
-#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217
-#: ../../include/nav.php:106 ../../include/conversation.php:1685
-msgid "Webpages"
-msgstr "Webseiten"
+#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
+msgid "Authorize application connection"
+msgstr "Zugriff für die Anwendung autorisieren"
 
-#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
-msgid "Actions"
-msgstr "Aktionen"
+#: ../../Zotlabs/Module/Api.php:62
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Trage folgenden Sicherheitscode in der Anwendung ein:"
 
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
-msgid "Page Link"
-msgstr "Seiten-Link"
+#: ../../Zotlabs/Module/Api.php:72
+msgid "Please login to continue."
+msgstr "Zum Weitermachen, bitte einloggen."
 
-#: ../../Zotlabs/Module/Webpages.php:197
-msgid "Page Title"
-msgstr "Seitentitel"
+#: ../../Zotlabs/Module/Api.php:87
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" 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/Xchan.php:10
 msgid "Xchan Lookup"
@@ -6278,92 +6568,6 @@ msgstr "Xchan-Suche"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:"
 
-#: ../../Zotlabs/Lib/Apps.php:204
-msgid "Site Admin"
-msgstr "Hub-Administration"
-
-#: ../../Zotlabs/Lib/Apps.php:205
-msgid "Bug Report"
-msgstr "Fehler-Rückmeldung"
-
-#: ../../Zotlabs/Lib/Apps.php:206
-msgid "View Bookmarks"
-msgstr "Lesezeichen ansehen"
-
-#: ../../Zotlabs/Lib/Apps.php:207
-msgid "My Chatrooms"
-msgstr "Meine Chaträume"
-
-#: ../../Zotlabs/Lib/Apps.php:209
-msgid "Firefox Share"
-msgstr "Teilen-Knopf für Firefox"
-
-#: ../../Zotlabs/Lib/Apps.php:210
-msgid "Remote Diagnostics"
-msgstr "Ferndiagnose"
-
-#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
-msgid "Suggest Channels"
-msgstr "Kanäle vorschlagen"
-
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
-#: ../../boot.php:1703
-msgid "Login"
-msgstr "Anmelden"
-
-#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
-msgid "Grid"
-msgstr "Grid"
-
-#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182
-msgid "Channel Home"
-msgstr "Mein Kanal"
-
-#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:201
-#: ../../include/conversation.php:1649 ../../include/conversation.php:1652
-msgid "Events"
-msgstr "Termine"
-
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167
-msgid "Directory"
-msgstr "Verzeichnis"
-
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193
-msgid "Mail"
-msgstr "Mail"
-
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96
-msgid "Chat"
-msgstr "Chat"
-
-#: ../../Zotlabs/Lib/Apps.php:229
-msgid "Probe"
-msgstr "Testen"
-
-#: ../../Zotlabs/Lib/Apps.php:230
-msgid "Suggest"
-msgstr "Empfehlen"
-
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Random Channel"
-msgstr "Zufälliger Kanal"
-
-#: ../../Zotlabs/Lib/Apps.php:232
-msgid "Invite"
-msgstr "Einladen"
-
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1386
-msgid "Features"
-msgstr "Funktionen"
-
-#: ../../Zotlabs/Lib/Apps.php:235
-msgid "Post"
-msgstr "Beitrag schreiben"
-
-#: ../../Zotlabs/Lib/Apps.php:335
-msgid "Purchase"
-msgstr "Kaufen"
-
 #: ../../Zotlabs/Lib/Chatroom.php:27
 msgid "Missing room name"
 msgstr "Der Chatraum hat keinen Namen"
@@ -6384,19 +6588,19 @@ msgstr "Chatraum konnte nicht gefunden werden."
 msgid "Room is full"
 msgstr "Der Chatraum ist voll"
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1882
 msgid "$Projectname Notification"
 msgstr "$Projectname-Benachrichtigung"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1883
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1885
 msgid "Thank You,"
 msgstr "Danke."
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1887
 #, php-format
 msgid "%s Administrator"
 msgstr "der Administrator von %s"
@@ -6589,11 +6793,97 @@ msgstr "Neuer Beitrag wurde erzeugt"
 msgid "commented on %s's post"
 msgstr "hat %s's Beitrag kommentiert"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:664
+#: ../../Zotlabs/Lib/Apps.php:205
+msgid "Site Admin"
+msgstr "Hub-Administration"
+
+#: ../../Zotlabs/Lib/Apps.php:206
+msgid "Bug Report"
+msgstr "Fehler-Rückmeldung"
+
+#: ../../Zotlabs/Lib/Apps.php:207
+msgid "View Bookmarks"
+msgstr "Lesezeichen ansehen"
+
+#: ../../Zotlabs/Lib/Apps.php:208
+msgid "My Chatrooms"
+msgstr "Meine Chaträume"
+
+#: ../../Zotlabs/Lib/Apps.php:210
+msgid "Firefox Share"
+msgstr "Teilen-Knopf für Firefox"
+
+#: ../../Zotlabs/Lib/Apps.php:211
+msgid "Remote Diagnostics"
+msgstr "Ferndiagnose"
+
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:90
+msgid "Suggest Channels"
+msgstr "Kanäle vorschlagen"
+
+#: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:112
+#: ../../boot.php:1704
+msgid "Login"
+msgstr "Anmelden"
+
+#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:181
+msgid "Grid"
+msgstr "Grid"
+
+#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:184
+msgid "Channel Home"
+msgstr "Mein Kanal"
+
+#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:203
+#: ../../include/conversation.php:1664 ../../include/conversation.php:1667
+msgid "Events"
+msgstr "Termine"
+
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:169
+msgid "Directory"
+msgstr "Verzeichnis"
+
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:195
+msgid "Mail"
+msgstr "Mail"
+
+#: ../../Zotlabs/Lib/Apps.php:229 ../../include/nav.php:96
+msgid "Chat"
+msgstr "Chat"
+
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Probe"
+msgstr "Testen"
+
+#: ../../Zotlabs/Lib/Apps.php:232
+msgid "Suggest"
+msgstr "Empfehlen"
+
+#: ../../Zotlabs/Lib/Apps.php:233
+msgid "Random Channel"
+msgstr "Zufälliger Kanal"
+
+#: ../../Zotlabs/Lib/Apps.php:234
+msgid "Invite"
+msgstr "Einladen"
+
+#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1480
+msgid "Features"
+msgstr "Funktionen"
+
+#: ../../Zotlabs/Lib/Apps.php:237
+msgid "Post"
+msgstr "Beitrag schreiben"
+
+#: ../../Zotlabs/Lib/Apps.php:339
+msgid "Purchase"
+msgstr "Kaufen"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:667
 msgid "Private Message"
 msgstr "Private Nachricht"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:656
+#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:659
 msgid "Select"
 msgstr "Auswählen"
 
@@ -6641,11 +6931,11 @@ msgstr "Markierungsstatus (Stern) umschalten"
 msgid "starred"
 msgstr "markiert"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:671
+#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:674
 msgid "Message signature validated"
 msgstr "Signatur überprüft"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:672
+#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:675
 msgid "Message signature incorrect"
 msgstr "Signatur nicht korrekt"
 
@@ -6701,17 +6991,17 @@ msgstr "Wall-to-Wall"
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:719
+#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:722
 #, php-format
 msgid "from %s"
 msgstr "via %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:722
+#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:725
 #, php-format
 msgid "last edited: %s"
 msgstr "zuletzt bearbeitet: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:723
+#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:726
 #, php-format
 msgid "Expires: %s"
 msgstr "Verfällt: %s"
@@ -6729,26 +7019,27 @@ msgid "Mark all seen"
 msgstr "Alle als gelesen markieren"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
-msgid "[+] show all"
-msgstr "[+] Alle anzeigen"
+#, php-format
+msgid "%s show all"
+msgstr "%s mehr anzeigen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1215
+#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1226
 msgid "Bold"
 msgstr "Fett"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1216
+#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1227
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1217
+#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1228
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1218
+#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1229
 msgid "Quote"
 msgstr "Zitat"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1219
+#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1230
 msgid "Code"
 msgstr "Code"
 
@@ -6764,11 +7055,74 @@ msgstr "Link einfügen"
 msgid "Video"
 msgstr "Video"
 
+#: ../../Zotlabs/Lib/PermissionDescription.php:31
+#: ../../include/acl_selectors.php:230
+msgid "Visible to your default audience"
+msgstr "Standard-Sichtbarkeit gemäß Kanaleinstellungen"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:106
+#: ../../include/acl_selectors.php:266
+msgid "Only me"
+msgstr "Nur ich"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+msgid "Public"
+msgstr "Öffentlich"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Anybody in the $Projectname network"
+msgstr "Jeder innerhalb des $Projectname Netzwerks"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+#, php-format
+msgid "Any account on %s"
+msgstr "Jedes Nutzerkonto auf %s"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+msgid "Any of my connections"
+msgstr "Alle meine Verbindungen"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Only connections I specifically allow"
+msgstr "Nur Verbindungen, denen ich es explizit erlaube"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Jeder, der angemeldet ist (kann Besucher anderer Netzwerke beinhalten)"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Alle Verbindungen einschließlich der noch nicht bestätigten"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+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)."
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
+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."
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+msgid "This is your default setting for who can view your connections"
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Verbindungen."
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:155
+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."
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:156
+msgid "This is your default setting for the audience of your webpages"
+msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Webseiten."
+
 #: ../../include/Import/import_diaspora.php:16
 msgid "No username found in import file."
 msgstr "Kein Benutzername in der Importdatei gefunden."
 
-#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50
+#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:51
 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."
 
@@ -6777,6 +7131,291 @@ msgstr "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Im
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden"
 
+#: ../../include/photos.php:114
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Bild überschreitet das Webseitenlimit von %lu Bytes"
+
+#: ../../include/photos.php:121
+msgid "Image file is empty."
+msgstr "Bilddatei ist leer."
+
+#: ../../include/photos.php:259
+msgid "Photo storage failed."
+msgstr "Fotospeicherung fehlgeschlagen."
+
+#: ../../include/photos.php:299
+msgid "a new photo"
+msgstr "ein neues Foto"
+
+#: ../../include/photos.php:303
+#, 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"
+
+#: ../../include/photos.php:506 ../../include/conversation.php:1650
+msgid "Photo Albums"
+msgstr "Fotoalben"
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Neue Fotos hochladen"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1703
+msgid "Logout"
+msgstr "Abmelden"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115
+msgid "End this session"
+msgstr "Beende diese Sitzung"
+
+#: ../../include/nav.php:85 ../../include/nav.php:146
+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 ../../include/channel.php:980
+msgid "Edit Profile"
+msgstr "Profile bearbeiten"
+
+#: ../../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 ../../include/conversation.php:1690
+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:108
+msgid "Your wiki"
+msgstr "Dein Wiki"
+
+#: ../../include/nav.php:112
+msgid "Sign in"
+msgstr "Anmelden"
+
+#: ../../include/nav.php:129
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - Klick zum Abmelden"
+
+#: ../../include/nav.php:132
+msgid "Remote authentication"
+msgstr "Über Konto auf anderem Server einloggen"
+
+#: ../../include/nav.php:132
+msgid "Click to authenticate to your home hub"
+msgstr "Klicke, um Dich über Deinen Heimat-Server zu authentifizieren"
+
+#: ../../include/nav.php:146
+msgid "Home Page"
+msgstr "Homepage"
+
+#: ../../include/nav.php:149
+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:169
+msgid "Channel Directory"
+msgstr "Kanal-Verzeichnis"
+
+#: ../../include/nav.php:181
+msgid "Your grid"
+msgstr "Dein Grid"
+
+#: ../../include/nav.php:182
+msgid "Mark all grid notifications seen"
+msgstr "Alle Grid-Benachrichtigungen als angesehen markieren"
+
+#: ../../include/nav.php:184
+msgid "Channel home"
+msgstr "Mein Kanal"
+
+#: ../../include/nav.php:185
+msgid "Mark all channel notifications seen"
+msgstr "Markiere alle Kanal-Benachrichtigungen als angesehen"
+
+#: ../../include/nav.php:191
+msgid "Notices"
+msgstr "Benachrichtigungen"
+
+#: ../../include/nav.php:191
+msgid "Notifications"
+msgstr "Benachrichtigungen"
+
+#: ../../include/nav.php:192
+msgid "See all notifications"
+msgstr "Alle Benachrichtigungen ansehen"
+
+#: ../../include/nav.php:195
+msgid "Private mail"
+msgstr "Persönliche Mail"
+
+#: ../../include/nav.php:196
+msgid "See all private messages"
+msgstr "Alle persönlichen Nachrichten ansehen"
+
+#: ../../include/nav.php:197
+msgid "Mark all private messages seen"
+msgstr "Markiere alle persönlichen Nachrichten als gesehen"
+
+#: ../../include/nav.php:198 ../../include/widgets.php:667
+msgid "Inbox"
+msgstr "Eingang"
+
+#: ../../include/nav.php:199 ../../include/widgets.php:672
+msgid "Outbox"
+msgstr "Ausgang"
+
+#: ../../include/nav.php:200 ../../include/widgets.php:677
+msgid "New Message"
+msgstr "Neue Nachricht"
+
+#: ../../include/nav.php:203
+msgid "Event Calendar"
+msgstr "Terminkalender"
+
+#: ../../include/nav.php:204
+msgid "See all events"
+msgstr "Alle Termine ansehen"
+
+#: ../../include/nav.php:205
+msgid "Mark all events seen"
+msgstr "Markiere alle Termine als gesehen"
+
+#: ../../include/nav.php:208
+msgid "Manage Your Channels"
+msgstr "Verwalte Deine Kanäle"
+
+#: ../../include/nav.php:210
+msgid "Account/Channel Settings"
+msgstr "Konto-/Kanal-Einstellungen"
+
+#: ../../include/nav.php:218 ../../include/widgets.php:1510
+msgid "Admin"
+msgstr "Administration"
+
+#: ../../include/nav.php:218
+msgid "Site Setup and Configuration"
+msgstr "Seiten-Einrichtung und -Konfiguration"
+
+#: ../../include/nav.php:249 ../../include/conversation.php:854
+msgid "Loading..."
+msgstr "Lädt ..."
+
+#: ../../include/nav.php:254
+msgid "@name, #tag, ?doc, content"
+msgstr "@Name, #Schlagwort, ?Dokumentation, Inhalt"
+
+#: ../../include/nav.php:255
+msgid "Please wait..."
+msgstr "Bitte warten..."
+
+#: ../../include/network.php:704
+msgid "view full size"
+msgstr "In Vollbildansicht anschauen"
+
+#: ../../include/network.php:1930 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../../include/network.php:1944
+msgid "No Subject"
+msgstr "Kein Betreff"
+
+#: ../../include/network.php:2198 ../../include/network.php:2199
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/network.php:2200
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/network.php:2201
+msgid "GNU-Social"
+msgstr "GNU-Social"
+
+#: ../../include/network.php:2202
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/network.php:2204
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/network.php:2205
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/network.php:2206
+msgid "Zot"
+msgstr "Zot!"
+
+#: ../../include/network.php:2207
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/network.php:2208
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/network.php:2209
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/page_widgets.php:7
+msgid "New Page"
+msgstr "Neue Seite"
+
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr "Titel"
+
 #: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
 #: ../../include/widgets.php:46 ../../include/widgets.php:429
 #: ../../include/contact_widgets.php:91
@@ -6815,952 +7454,159 @@ msgstr "gefällt"
 msgid "dislikes"
 msgstr "missfällt"
 
-#: ../../include/event.php:22 ../../include/event.php:69
-#: ../../include/bb2diaspora.php:485
-msgid "l F d, Y \\@ g:i A"
-msgstr "l, d. F Y, H:i"
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
+msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
 
-#: ../../include/event.php:30 ../../include/event.php:73
-#: ../../include/bb2diaspora.php:491
-msgid "Starts:"
-msgstr "Beginnt:"
+#: ../../include/channel.php:67
+msgid "Empty name"
+msgstr "Namensfeld leer"
 
-#: ../../include/event.php:40 ../../include/event.php:77
-#: ../../include/bb2diaspora.php:499
-msgid "Finishes:"
-msgstr "Endet:"
+#: ../../include/channel.php:70
+msgid "Name too long"
+msgstr "Name ist zu lang"
 
-#: ../../include/event.php:812
-msgid "This event has been added to your calendar."
-msgstr "Dieser Termin wurde zu Deinem Kalender hinzugefügt"
+#: ../../include/channel.php:181
+msgid "No account identifier"
+msgstr "Keine Account-Kennung"
 
-#: ../../include/event.php:1012
-msgid "Not specified"
-msgstr "Keine Angabe"
+#: ../../include/channel.php:193
+msgid "Nickname is required."
+msgstr "Spitzname ist erforderlich."
 
-#: ../../include/event.php:1013
-msgid "Needs Action"
-msgstr "Aktion erforderlich"
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Reservierter Kurzname. Bitte wähle einen anderen."
 
-#: ../../include/event.php:1014
-msgid "Completed"
-msgstr "Abgeschlossen"
-
-#: ../../include/event.php:1015
-msgid "In Process"
-msgstr "In Bearbeitung"
-
-#: ../../include/event.php:1016
-msgid "Cancelled"
-msgstr "gestrichen"
-
-#: ../../include/import.php:29
+#: ../../include/channel.php:212
 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."
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
 
-#: ../../include/import.php:76
-msgid "Channel clone failed. Import failed."
-msgstr "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen."
+#: ../../include/channel.php:272
+msgid "Unable to retrieve created identity"
+msgstr "Kann die erstellte Identität nicht empfangen"
 
-#: ../../include/items.php:892 ../../include/items.php:937
-msgid "(Unknown)"
-msgstr "(Unbekannt)"
+#: ../../include/channel.php:341
+msgid "Default Profile"
+msgstr "Standard-Profil"
 
-#: ../../include/items.php:1136
-msgid "Visible to anybody on the internet."
-msgstr "Für jeden im Internet sichtbar."
+#: ../../include/channel.php:830
+msgid "Requested channel is not available."
+msgstr "Angeforderte Kanal nicht verfügbar."
 
-#: ../../include/items.php:1138
-msgid "Visible to you only."
-msgstr "Nur für Dich sichtbar."
+#: ../../include/channel.php:977
+msgid "Create New Profile"
+msgstr "Neues Profil erstellen"
 
-#: ../../include/items.php:1140
-msgid "Visible to anybody in this network."
-msgstr "Für jedes $Projectname-Mitglied sichtbar."
+#: ../../include/channel.php:997
+msgid "Visible to everybody"
+msgstr "Für jeden sichtbar"
 
-#: ../../include/items.php:1142
-msgid "Visible to anybody authenticated."
-msgstr "Für jeden sichtbar, der angemeldet ist."
+#: ../../include/channel.php:1070 ../../include/channel.php:1182
+msgid "Gender:"
+msgstr "Geschlecht:"
 
-#: ../../include/items.php:1144
+#: ../../include/channel.php:1071 ../../include/channel.php:1226
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../include/channel.php:1072 ../../include/channel.php:1237
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: ../../include/channel.php:1073
+msgid "Online Now"
+msgstr "gerade online"
+
+#: ../../include/channel.php:1187
+msgid "Like this channel"
+msgstr "Dieser Kanal gefällt mir"
+
+#: ../../include/channel.php:1211
+msgid "j F, Y"
+msgstr "j. F Y"
+
+#: ../../include/channel.php:1212
+msgid "j F"
+msgstr "j. F"
+
+#: ../../include/channel.php:1219
+msgid "Birthday:"
+msgstr "Geburtstag:"
+
+#: ../../include/channel.php:1232
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr "Für jeden auf %s sichtbar."
+msgid "for %1$d %2$s"
+msgstr "seit %1$d %2$s"
 
-#: ../../include/items.php:1146
-msgid "Visible to all connections."
-msgstr "Für alle Verbindungen sichtbar."
+#: ../../include/channel.php:1235
+msgid "Sexual Preference:"
+msgstr "Sexuelle Orientierung:"
 
-#: ../../include/items.php:1148
-msgid "Visible to approved connections."
-msgstr "Nur für akzeptierte Verbindungen sichtbar."
+#: ../../include/channel.php:1241
+msgid "Tags:"
+msgstr "Schlagworte:"
 
-#: ../../include/items.php:1150
-msgid "Visible to specific connections."
-msgstr "Sichtbar für bestimmte Verbindungen."
+#: ../../include/channel.php:1243
+msgid "Political Views:"
+msgstr "Politische Ansichten:"
 
-#: ../../include/items.php:3909
-msgid "Privacy group is empty."
-msgstr "Gruppe ist leer."
+#: ../../include/channel.php:1245
+msgid "Religion:"
+msgstr "Religion:"
 
-#: ../../include/items.php:3916
-#, php-format
-msgid "Privacy group: %s"
-msgstr "Gruppe: %s"
+#: ../../include/channel.php:1249
+msgid "Hobbies/Interests:"
+msgstr "Hobbys/Interessen:"
 
-#: ../../include/items.php:3928
-msgid "Connection not found."
-msgstr "Die Verbindung wurde nicht gefunden."
+#: ../../include/channel.php:1251
+msgid "Likes:"
+msgstr "Gefällt:"
 
-#: ../../include/items.php:4277
-msgid "profile photo"
-msgstr "Profilfoto"
+#: ../../include/channel.php:1253
+msgid "Dislikes:"
+msgstr "Gefällt nicht:"
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
-msgstr "Kein Empfänger angegeben"
+#: ../../include/channel.php:1255
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformation und soziale Netzwerke:"
 
-#: ../../include/message.php:25
-msgid "[no subject]"
-msgstr "[no subject]"
+#: ../../include/channel.php:1257
+msgid "My other channels:"
+msgstr "Meine anderen Kanäle:"
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "Kann Absender nicht bestimmen."
+#: ../../include/channel.php:1259
+msgid "Musical interests:"
+msgstr "Musikalische Interessen:"
 
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
-msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
+#: ../../include/channel.php:1261
+msgid "Books, literature:"
+msgstr "Bücher, Literatur:"
 
-#: ../../include/text.php:428
-msgid "prev"
-msgstr "vorherige"
+#: ../../include/channel.php:1263
+msgid "Television:"
+msgstr "Fernsehen:"
 
-#: ../../include/text.php:430
-msgid "first"
-msgstr "erste"
+#: ../../include/channel.php:1265
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/Tanz/Kultur/Unterhaltung:"
 
-#: ../../include/text.php:459
-msgid "last"
-msgstr "letzte"
+#: ../../include/channel.php:1267
+msgid "Love/Romance:"
+msgstr "Liebe/Romantik:"
 
-#: ../../include/text.php:462
-msgid "next"
-msgstr "nächste"
+#: ../../include/channel.php:1269
+msgid "Work/employment:"
+msgstr "Arbeit/Anstellung:"
 
-#: ../../include/text.php:472
-msgid "older"
-msgstr "älter"
+#: ../../include/channel.php:1271
+msgid "School/education:"
+msgstr "Schule/Ausbildung:"
 
-#: ../../include/text.php:474
-msgid "newer"
-msgstr "neuer"
-
-#: ../../include/text.php:863
-msgid "No connections"
-msgstr "Keine Verbindungen"
-
-#: ../../include/text.php:888
-#, php-format
-msgid "View all %s connections"
-msgstr "Alle Verbindungen von %s anzeigen"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-msgid "poke"
-msgstr "anstupsen"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-#: ../../include/conversation.php:243
-msgid "poked"
-msgstr "stupste"
-
-#: ../../include/text.php:1039
-msgid "ping"
-msgstr "anpingen"
-
-#: ../../include/text.php:1039
-msgid "pinged"
-msgstr "pingte"
-
-#: ../../include/text.php:1040
-msgid "prod"
-msgstr "knuffen"
-
-#: ../../include/text.php:1040
-msgid "prodded"
-msgstr "knuffte"
-
-#: ../../include/text.php:1041
-msgid "slap"
-msgstr "ohrfeigen"
-
-#: ../../include/text.php:1041
-msgid "slapped"
-msgstr "ohrfeigte"
-
-#: ../../include/text.php:1042
-msgid "finger"
-msgstr "befummeln"
-
-#: ../../include/text.php:1042
-msgid "fingered"
-msgstr "befummelte"
-
-#: ../../include/text.php:1043
-msgid "rebuff"
-msgstr "eine Abfuhr erteilen"
-
-#: ../../include/text.php:1043
-msgid "rebuffed"
-msgstr "zurückgewiesen"
-
-#: ../../include/text.php:1055
-msgid "happy"
-msgstr "glücklich"
-
-#: ../../include/text.php:1056
-msgid "sad"
-msgstr "traurig"
-
-#: ../../include/text.php:1057
-msgid "mellow"
-msgstr "sanft"
-
-#: ../../include/text.php:1058
-msgid "tired"
-msgstr "müde"
-
-#: ../../include/text.php:1059
-msgid "perky"
-msgstr "frech"
-
-#: ../../include/text.php:1060
-msgid "angry"
-msgstr "sauer"
-
-#: ../../include/text.php:1061
-msgid "stupefied"
-msgstr "verblüfft"
-
-#: ../../include/text.php:1062
-msgid "puzzled"
-msgstr "verwirrt"
-
-#: ../../include/text.php:1063
-msgid "interested"
-msgstr "interessiert"
-
-#: ../../include/text.php:1064
-msgid "bitter"
-msgstr "verbittert"
-
-#: ../../include/text.php:1065
-msgid "cheerful"
-msgstr "fröhlich"
-
-#: ../../include/text.php:1066
-msgid "alive"
-msgstr "lebendig"
-
-#: ../../include/text.php:1067
-msgid "annoyed"
-msgstr "verärgert"
-
-#: ../../include/text.php:1068
-msgid "anxious"
-msgstr "unruhig"
-
-#: ../../include/text.php:1069
-msgid "cranky"
-msgstr "schrullig"
-
-#: ../../include/text.php:1070
-msgid "disturbed"
-msgstr "verstört"
-
-#: ../../include/text.php:1071
-msgid "frustrated"
-msgstr "frustriert"
-
-#: ../../include/text.php:1072
-msgid "depressed"
-msgstr "deprimiert"
-
-#: ../../include/text.php:1073
-msgid "motivated"
-msgstr "motiviert"
-
-#: ../../include/text.php:1074
-msgid "relaxed"
-msgstr "entspannt"
-
-#: ../../include/text.php:1075
-msgid "surprised"
-msgstr "überrascht"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:70
-msgid "Monday"
-msgstr "Montag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:71
-msgid "Tuesday"
-msgstr "Dienstag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:72
-msgid "Wednesday"
-msgstr "Mittwoch"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:73
-msgid "Thursday"
-msgstr "Donnerstag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:74
-msgid "Friday"
-msgstr "Freitag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:75
-msgid "Saturday"
-msgstr "Samstag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:69
-msgid "Sunday"
-msgstr "Sonntag"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:45
-msgid "January"
-msgstr "Januar"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:46
-msgid "February"
-msgstr "Februar"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:47
-msgid "March"
-msgstr "März"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:48
-msgid "April"
-msgstr "April"
-
-#: ../../include/text.php:1261
-msgid "May"
-msgstr "Mai"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:50
-msgid "June"
-msgstr "Juni"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:51
-msgid "July"
-msgstr "Juli"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:52
-msgid "August"
-msgstr "August"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:53
-msgid "September"
-msgstr "September"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:54
-msgid "October"
-msgstr "Oktober"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:55
-msgid "November"
-msgstr "November"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:56
-msgid "December"
-msgstr "Dezember"
-
-#: ../../include/text.php:1338 ../../include/text.php:1342
-msgid "Unknown Attachment"
-msgstr "Unbekannter Anhang"
-
-#: ../../include/text.php:1344
-msgid "unknown"
-msgstr "unbekannt"
-
-#: ../../include/text.php:1380
-msgid "remove category"
-msgstr "Kategorie entfernen"
-
-#: ../../include/text.php:1457
-msgid "remove from file"
-msgstr "aus der Datei entfernen"
-
-#: ../../include/text.php:1753 ../../include/text.php:1824
-msgid "default"
-msgstr "Standard"
-
-#: ../../include/text.php:1761
-msgid "Page layout"
-msgstr "Seiten-Layout"
-
-#: ../../include/text.php:1761
-msgid "You can create your own with the layouts tool"
-msgstr "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen"
-
-#: ../../include/text.php:1803
-msgid "Page content type"
-msgstr "Art des Seiteninhalts"
-
-#: ../../include/text.php:1836
-msgid "Select an alternate language"
-msgstr "Wähle eine alternative Sprache"
-
-#: ../../include/text.php:1953
-msgid "activity"
-msgstr "Aktivität"
-
-#: ../../include/text.php:2262
-msgid "Design Tools"
-msgstr "Gestaltungswerkzeuge"
-
-#: ../../include/text.php:2268
-msgid "Pages"
-msgstr "Seiten"
-
-#: ../../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:310 ../../include/contact_widgets.php:53
-#: ../../include/features.php:98
-msgid "Saved Folders"
-msgstr "Gespeicherte Ordner"
-
-#: ../../include/widgets.php:313 ../../include/widgets.php:432
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-msgid "Everything"
-msgstr "Alles"
-
-#: ../../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:842 ../../include/conversation.php:1662
-#: ../../include/conversation.php:1665
-msgid "Chatrooms"
-msgstr "Chaträume"
-
-#: ../../include/widgets.php:846
-msgid "Overview"
-msgstr "Übersicht"
-
-#: ../../include/widgets.php:853
-msgid "Chat Members"
-msgstr "Chatmitglieder"
-
-#: ../../include/widgets.php:876
-msgid "Bookmarked Chatrooms"
-msgstr "Gespeicherte Chatrooms"
-
-#: ../../include/widgets.php:899
-msgid "Suggested Chatrooms"
-msgstr "Chatraum-Vorschläge"
-
-#: ../../include/widgets.php:1044 ../../include/widgets.php:1156
-msgid "photo/image"
-msgstr "Foto/Bild"
-
-#: ../../include/widgets.php:1099
-msgid "Click to show more"
-msgstr "Klick, um mehr anzuzeigen"
-
-#: ../../include/widgets.php:1250
-msgid "Rating Tools"
-msgstr "Bewertungswerkzeuge"
-
-#: ../../include/widgets.php:1254 ../../include/widgets.php:1256
-msgid "Rate Me"
-msgstr "Bewerte mich"
-
-#: ../../include/widgets.php:1259
-msgid "View Ratings"
-msgstr "Bewertungen ansehen"
-
-#: ../../include/widgets.php:1316
-msgid "Forums"
-msgstr "Foren"
-
-#: ../../include/widgets.php:1345
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#: ../../include/widgets.php:1354
-msgid "Documentation"
-msgstr "Dokumentation"
-
-#: ../../include/widgets.php:1356
-msgid "Project/Site Information"
-msgstr "Informationen über das Projekt und diesen Hub"
-
-#: ../../include/widgets.php:1357
-msgid "For Members"
-msgstr "Für Mitglieder"
-
-#: ../../include/widgets.php:1358
-msgid "For Administrators"
-msgstr "Für Administratoren"
-
-#: ../../include/widgets.php:1359
-msgid "For Developers"
-msgstr "Für Entwickler"
-
-#: ../../include/widgets.php:1383 ../../include/widgets.php:1421
-msgid "Member registrations waiting for confirmation"
-msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
-
-#: ../../include/widgets.php:1389
-msgid "Inspect queue"
-msgstr "Warteschlange kontrollieren"
-
-#: ../../include/widgets.php:1391
-msgid "DB updates"
-msgstr "DB-Aktualisierungen"
-
-#: ../../include/widgets.php:1416 ../../include/nav.php:216
-msgid "Admin"
-msgstr "Administration"
-
-#: ../../include/widgets.php:1417
-msgid "Plugin Features"
-msgstr "Plug-In Funktionen"
-
-#: ../../include/follow.php:27
-msgid "Channel is blocked on this site."
-msgstr "Der Kanal ist auf dieser Seite blockiert "
-
-#: ../../include/follow.php:32
-msgid "Channel location missing."
-msgstr "Adresse des Kanals fehlt."
-
-#: ../../include/follow.php:81
-msgid "Response from remote channel was incomplete."
-msgstr "Antwort des entfernten Kanals war unvollständig."
-
-#: ../../include/follow.php:98
-msgid "Channel was deleted and no longer exists."
-msgstr "Kanal wurde gelöscht und existiert nicht mehr."
-
-#: ../../include/follow.php:154 ../../include/follow.php:190
-msgid "Protocol disabled."
-msgstr "Protokoll deaktiviert."
-
-#: ../../include/follow.php:178
-msgid "Channel discovery failed."
-msgstr "Kanalsuche fehlgeschlagen"
-
-#: ../../include/follow.php:216
-msgid "Cannot connect to yourself."
-msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
-
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "%1$ss Lesezeichen"
-
-#: ../../include/api.php:1336
-msgid "Public Timeline"
-msgstr "Öffentliche Zeitleiste"
-
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:844
-#: ../../include/bbcode.php:847 ../../include/bbcode.php:852
-#: ../../include/bbcode.php:855 ../../include/bbcode.php:858
-#: ../../include/bbcode.php:861 ../../include/bbcode.php:866
-#: ../../include/bbcode.php:869 ../../include/bbcode.php:874
-#: ../../include/bbcode.php:877 ../../include/bbcode.php:880
-#: ../../include/bbcode.php:883
-msgid "Image/photo"
-msgstr "Bild/Foto"
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:894
-msgid "Encrypted content"
-msgstr "Verschlüsselter Inhalt"
-
-#: ../../include/bbcode.php:178
-#, php-format
-msgid "Install %s element: "
-msgstr "Element %s installieren: "
-
-#: ../../include/bbcode.php:182
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren."
-
-#: ../../include/bbcode.php:254
-#, 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:331 ../../include/bbcode.php:339
-msgid "Click to open/close"
-msgstr "Klicke zum Öffnen/Schließen"
-
-#: ../../include/bbcode.php:339
-msgid "spoiler"
-msgstr "Spoiler"
-
-#: ../../include/bbcode.php:585
-msgid "Different viewers will see this text differently"
-msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
-
-#: ../../include/bbcode.php:832
-msgid "$1 wrote:"
-msgstr "$1 schrieb:"
-
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr "Verzeichnisoptionen"
-
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr "Sicherer Modus"
-
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr "Nur öffentliche Foren"
-
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr "Nur dieser Hub"
-
-#: ../../include/security.php:383
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "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/nav.php:82 ../../include/nav.php:113 ../../boot.php:1702
-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 ../../include/channel.php:941
-msgid "Edit Profile"
-msgstr "Profile bearbeiten"
-
-#: ../../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 ../../include/conversation.php:1675
-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
-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
-msgid "Channel Directory"
-msgstr "Kanal-Verzeichnis"
-
-#: ../../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
-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
-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
-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:851
-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/channel.php:1292
+msgid "Like this thing"
+msgstr "Gefällt mir"
 
 #: ../../include/connections.php:95
 msgid "New window"
@@ -7775,52 +7621,6 @@ msgstr "Öffne die markierte Adresse in einem neuen Browserfenster oder Tab"
 msgid "User '%s' deleted"
 msgstr "Benutzer '%s' gelöscht"
 
-#: ../../include/contact_widgets.php:11
-#, 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:19
-msgid "Find Channels"
-msgstr "Finde Kanäle"
-
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
-msgstr "Name oder Interessen eingeben"
-
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
-msgstr "Verbinden/Folgen"
-
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Beispiele: Robert Morgenstein, Angeln"
-
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
-msgstr "Zufallsprofil"
-
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
-msgstr "Lade Freunde ein"
-
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Fortgeschrittenes Beispiel: name=fred and country=iceland"
-
-#: ../../include/contact_widgets.php:122
-#, 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:127
-msgid "show more"
-msgstr "mehr zeigen"
-
 #: ../../include/conversation.php:204
 #, php-format
 msgid "%1$s is now connected with %2$s"
@@ -7831,258 +7631,269 @@ msgstr "%1$s ist jetzt mit %2$s verbunden"
 msgid "%1$s poked %2$s"
 msgstr "%1$s stupste %2$s an"
 
-#: ../../include/conversation.php:691
+#: ../../include/conversation.php:243 ../../include/text.php:1013
+#: ../../include/text.php:1018
+msgid "poked"
+msgstr "stupste"
+
+#: ../../include/conversation.php:694
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "%ss Profil auf %s ansehen"
 
-#: ../../include/conversation.php:710
+#: ../../include/conversation.php:713
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: ../../include/conversation.php:711
+#: ../../include/conversation.php:714
 msgid "Filed under:"
 msgstr "Gespeichert unter:"
 
-#: ../../include/conversation.php:738
+#: ../../include/conversation.php:741
 msgid "View in context"
 msgstr "Im Zusammenhang anschauen"
 
-#: ../../include/conversation.php:847
+#: ../../include/conversation.php:850
 msgid "remove"
 msgstr "lösche"
 
-#: ../../include/conversation.php:852
+#: ../../include/conversation.php:855
 msgid "Delete Selected Items"
 msgstr "Lösche die ausgewählten Elemente"
 
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:951
 msgid "View Source"
 msgstr "Quelle anzeigen"
 
-#: ../../include/conversation.php:949
+#: ../../include/conversation.php:952
 msgid "Follow Thread"
 msgstr "Unterhaltung folgen"
 
-#: ../../include/conversation.php:950
+#: ../../include/conversation.php:953
 msgid "Unfollow Thread"
 msgstr "Unterhaltung nicht mehr folgen"
 
-#: ../../include/conversation.php:955
+#: ../../include/conversation.php:958
 msgid "Activity/Posts"
 msgstr "Aktivitäten/Beiträge"
 
-#: ../../include/conversation.php:957
+#: ../../include/conversation.php:960
 msgid "Edit Connection"
 msgstr "Verbindung bearbeiten"
 
-#: ../../include/conversation.php:958
+#: ../../include/conversation.php:961
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s likes this."
 msgstr "%s gefällt das."
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s gefällt das nicht."
 
-#: ../../include/conversation.php:1079
+#: ../../include/conversation.php:1082
 #, 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:1081
+#: ../../include/conversation.php:1084
 #, 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:1087
+#: ../../include/conversation.php:1090
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:1090
+#: ../../include/conversation.php:1093
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ""
 msgstr[1] ", und %d andere"
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s like this."
 msgstr "%s gefällt das."
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s don't like this."
 msgstr "%s gefällt das nicht."
 
-#: ../../include/conversation.php:1130
+#: ../../include/conversation.php:1133
 msgid "Set your location"
 msgstr "Standort"
 
-#: ../../include/conversation.php:1131
+#: ../../include/conversation.php:1134
 msgid "Clear browser location"
 msgstr "Browser-Standort löschen"
 
-#: ../../include/conversation.php:1177
+#: ../../include/conversation.php:1182
 msgid "Tag term:"
 msgstr "Schlagwort:"
 
-#: ../../include/conversation.php:1178
+#: ../../include/conversation.php:1183
 msgid "Where are you right now?"
 msgstr "Wo bist Du jetzt grade?"
 
-#: ../../include/conversation.php:1210
+#: ../../include/conversation.php:1221
 msgid "Page link name"
 msgstr "Link zur Seite"
 
-#: ../../include/conversation.php:1213
+#: ../../include/conversation.php:1224
 msgid "Post as"
 msgstr "Veröffentlichen als"
 
-#: ../../include/conversation.php:1223
+#: ../../include/conversation.php:1238
 msgid "Toggle voting"
 msgstr "Umfragewerkzeug aktivieren"
 
-#: ../../include/conversation.php:1231
+#: ../../include/conversation.php:1246
 msgid "Categories (optional, comma-separated list)"
 msgstr "Kategorien (optional, kommagetrennte Liste)"
 
-#: ../../include/conversation.php:1254
+#: ../../include/conversation.php:1269
 msgid "Set publish date"
 msgstr "Veröffentlichungsdatum festlegen"
 
-#: ../../include/conversation.php:1258
-msgid "OK"
-msgstr "Ok"
-
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1518
 msgid "Discover"
 msgstr "Entdecken"
 
-#: ../../include/conversation.php:1506
+#: ../../include/conversation.php:1521
 msgid "Imported public streams"
 msgstr "Importierte öffentliche Beiträge"
 
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1526
 msgid "Commented Order"
 msgstr "Neueste Kommentare"
 
-#: ../../include/conversation.php:1514
+#: ../../include/conversation.php:1529
 msgid "Sort by Comment Date"
 msgstr "Nach Kommentardatum sortiert"
 
-#: ../../include/conversation.php:1518
+#: ../../include/conversation.php:1533
 msgid "Posted Order"
 msgstr "Neueste Beiträge"
 
-#: ../../include/conversation.php:1521
+#: ../../include/conversation.php:1536
 msgid "Sort by Post Date"
 msgstr "Nach Beitragsdatum sortiert"
 
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1544
 msgid "Posts that mention or involve you"
 msgstr "Beiträge mit Beteiligung Deinerseits"
 
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1553
 msgid "Activity Stream - by date"
 msgstr "Activity Stream – nach Datum sortiert"
 
-#: ../../include/conversation.php:1544
+#: ../../include/conversation.php:1559
 msgid "Starred"
 msgstr "Markiert"
 
-#: ../../include/conversation.php:1547
+#: ../../include/conversation.php:1562
 msgid "Favourite Posts"
 msgstr "Markierte Beiträge"
 
-#: ../../include/conversation.php:1554
+#: ../../include/conversation.php:1569
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1557
+#: ../../include/conversation.php:1572
 msgid "Posts flagged as SPAM"
 msgstr "Nachrichten, die als SPAM markiert wurden"
 
-#: ../../include/conversation.php:1614
+#: ../../include/conversation.php:1629
 msgid "Status Messages and Posts"
 msgstr "Statusnachrichten und Beiträge"
 
-#: ../../include/conversation.php:1623
+#: ../../include/conversation.php:1638
 msgid "About"
 msgstr "Über"
 
-#: ../../include/conversation.php:1626
+#: ../../include/conversation.php:1641
 msgid "Profile Details"
 msgstr "Profil-Details"
 
-#: ../../include/conversation.php:1635 ../../include/photos.php:502
-msgid "Photo Albums"
-msgstr "Fotoalben"
-
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1657
 msgid "Files and Storage"
 msgstr "Dateien und Speicher"
 
-#: ../../include/conversation.php:1678
+#: ../../include/conversation.php:1677 ../../include/conversation.php:1680
+#: ../../include/widgets.php:836
+msgid "Chatrooms"
+msgstr "Chaträume"
+
+#: ../../include/conversation.php:1693
 msgid "Saved Bookmarks"
 msgstr "Gespeicherte Lesezeichen"
 
-#: ../../include/conversation.php:1688
+#: ../../include/conversation.php:1703
 msgid "Manage Webpages"
 msgstr "Webseiten verwalten"
 
-#: ../../include/conversation.php:1747
+#: ../../include/conversation.php:1768
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Zusage"
 msgstr[1] "Zusagen"
 
-#: ../../include/conversation.php:1750
+#: ../../include/conversation.php:1771
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Absage"
 msgstr[1] "Absagen"
 
-#: ../../include/conversation.php:1753
+#: ../../include/conversation.php:1774
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] " Unentschlossen"
 msgstr[1] "Unentschlossene"
 
-#: ../../include/conversation.php:1756
+#: ../../include/conversation.php:1777
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "Zustimmung"
 msgstr[1] "Zustimmungen"
 
-#: ../../include/conversation.php:1759
+#: ../../include/conversation.php:1780
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "Ablehnung"
 msgstr[1] "Ablehnungen"
 
-#: ../../include/conversation.php:1762
+#: ../../include/conversation.php:1783
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "Enthaltung"
 msgstr[1] "Enthaltungen"
 
+#: ../../include/import.php:30
+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:97
+msgid "Channel clone failed. Import failed."
+msgstr "Klonen des Kanals fehlgeschlagen. Import fehlgeschlagen."
+
 #: ../../include/selectors.php:30
 msgid "Frequently"
 msgstr "Häufig"
@@ -8147,12 +7958,6 @@ msgstr "Geschlechtslos"
 msgid "Non-specific"
 msgstr "unklar"
 
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-#: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:881
-msgid "Other"
-msgstr "Andere"
-
 #: ../../include/selectors.php:49
 msgid "Undecided"
 msgstr "Unentschieden"
@@ -8329,361 +8134,366 @@ msgstr "Interessiert mich nicht"
 msgid "Ask me"
 msgstr "Frag mich mal"
 
-#: ../../include/PermissionDescription.php:31
-#: ../../include/acl_selectors.php:232
-msgid "Visible to your default audience"
-msgstr "Standard-Sichtbarkeit gemäß Kanaleinstellungen"
-
-#: ../../include/PermissionDescription.php:115
-#: ../../include/acl_selectors.php:268
-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
+#: ../../include/bookmarks.php:35
 #, php-format
-msgid "Any account on %s"
-msgstr "Jedes Nutzerkonto auf %s"
+msgid "%1$s's bookmarks"
+msgstr "%1$ss Lesezeichen"
 
-#: ../../include/PermissionDescription.php:119
-msgid "Any of my connections"
-msgstr "Alle meine Verbindungen"
+#: ../../include/security.php:109
+msgid "guest:"
+msgstr "Gast:"
 
-#: ../../include/PermissionDescription.php:120
-msgid "Only connections I specifically allow"
-msgstr "Nur Verbindungen, denen ich es explizit erlaube"
-
-#: ../../include/PermissionDescription.php:121
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr "Jeder, der angemeldet ist (kann Besucher anderer Netzwerke beinhalten)"
-
-#: ../../include/PermissionDescription.php:122
-msgid "Any connections including those who haven't yet been approved"
-msgstr "Alle Verbindungen einschließlich der noch nicht bestätigten"
-
-#: ../../include/PermissionDescription.php:161
+#: ../../include/security.php:427
 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)."
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "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/PermissionDescription.php:162
+#: ../../include/text.php:404
+msgid "prev"
+msgstr "vorherige"
+
+#: ../../include/text.php:406
+msgid "first"
+msgstr "erste"
+
+#: ../../include/text.php:435
+msgid "last"
+msgstr "letzte"
+
+#: ../../include/text.php:438
+msgid "next"
+msgstr "nächste"
+
+#: ../../include/text.php:448
+msgid "older"
+msgstr "älter"
+
+#: ../../include/text.php:450
+msgid "newer"
+msgstr "neuer"
+
+#: ../../include/text.php:843
+msgid "No connections"
+msgstr "Keine Verbindungen"
+
+#: ../../include/text.php:868
+#, php-format
+msgid "View all %s connections"
+msgstr "Alle Verbindungen von %s anzeigen"
+
+#: ../../include/text.php:1013 ../../include/text.php:1018
+msgid "poke"
+msgstr "anstupsen"
+
+#: ../../include/text.php:1019
+msgid "ping"
+msgstr "anpingen"
+
+#: ../../include/text.php:1019
+msgid "pinged"
+msgstr "pingte"
+
+#: ../../include/text.php:1020
+msgid "prod"
+msgstr "knuffen"
+
+#: ../../include/text.php:1020
+msgid "prodded"
+msgstr "knuffte"
+
+#: ../../include/text.php:1021
+msgid "slap"
+msgstr "ohrfeigen"
+
+#: ../../include/text.php:1021
+msgid "slapped"
+msgstr "ohrfeigte"
+
+#: ../../include/text.php:1022
+msgid "finger"
+msgstr "befummeln"
+
+#: ../../include/text.php:1022
+msgid "fingered"
+msgstr "befummelte"
+
+#: ../../include/text.php:1023
+msgid "rebuff"
+msgstr "eine Abfuhr erteilen"
+
+#: ../../include/text.php:1023
+msgid "rebuffed"
+msgstr "zurückgewiesen"
+
+#: ../../include/text.php:1035
+msgid "happy"
+msgstr "glücklich"
+
+#: ../../include/text.php:1036
+msgid "sad"
+msgstr "traurig"
+
+#: ../../include/text.php:1037
+msgid "mellow"
+msgstr "sanft"
+
+#: ../../include/text.php:1038
+msgid "tired"
+msgstr "müde"
+
+#: ../../include/text.php:1039
+msgid "perky"
+msgstr "frech"
+
+#: ../../include/text.php:1040
+msgid "angry"
+msgstr "sauer"
+
+#: ../../include/text.php:1041
+msgid "stupefied"
+msgstr "verblüfft"
+
+#: ../../include/text.php:1042
+msgid "puzzled"
+msgstr "verwirrt"
+
+#: ../../include/text.php:1043
+msgid "interested"
+msgstr "interessiert"
+
+#: ../../include/text.php:1044
+msgid "bitter"
+msgstr "verbittert"
+
+#: ../../include/text.php:1045
+msgid "cheerful"
+msgstr "fröhlich"
+
+#: ../../include/text.php:1046
+msgid "alive"
+msgstr "lebendig"
+
+#: ../../include/text.php:1047
+msgid "annoyed"
+msgstr "verärgert"
+
+#: ../../include/text.php:1048
+msgid "anxious"
+msgstr "unruhig"
+
+#: ../../include/text.php:1049
+msgid "cranky"
+msgstr "schrullig"
+
+#: ../../include/text.php:1050
+msgid "disturbed"
+msgstr "verstört"
+
+#: ../../include/text.php:1051
+msgid "frustrated"
+msgstr "frustriert"
+
+#: ../../include/text.php:1052
+msgid "depressed"
+msgstr "deprimiert"
+
+#: ../../include/text.php:1053
+msgid "motivated"
+msgstr "motiviert"
+
+#: ../../include/text.php:1054
+msgid "relaxed"
+msgstr "entspannt"
+
+#: ../../include/text.php:1055
+msgid "surprised"
+msgstr "überrascht"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "Montag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "Freitag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "Samstag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:45
+msgid "January"
+msgstr "Januar"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:46
+msgid "February"
+msgstr "Februar"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:47
+msgid "March"
+msgstr "März"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:48
+msgid "April"
+msgstr "April"
+
+#: ../../include/text.php:1241
+msgid "May"
+msgstr "Mai"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:50
+msgid "June"
+msgstr "Juni"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:51
+msgid "July"
+msgstr "Juli"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:52
+msgid "August"
+msgstr "August"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:53
+msgid "September"
+msgstr "September"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:54
+msgid "October"
+msgstr "Oktober"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:55
+msgid "November"
+msgstr "November"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:56
+msgid "December"
+msgstr "Dezember"
+
+#: ../../include/text.php:1318 ../../include/text.php:1322
+msgid "Unknown Attachment"
+msgstr "Unbekannter Anhang"
+
+#: ../../include/text.php:1324
+msgid "unknown"
+msgstr "unbekannt"
+
+#: ../../include/text.php:1360
+msgid "remove category"
+msgstr "Kategorie entfernen"
+
+#: ../../include/text.php:1437
+msgid "remove from file"
+msgstr "aus der Datei entfernen"
+
+#: ../../include/text.php:1734 ../../include/text.php:1805
+msgid "default"
+msgstr "Standard"
+
+#: ../../include/text.php:1742
+msgid "Page layout"
+msgstr "Seiten-Layout"
+
+#: ../../include/text.php:1742
+msgid "You can create your own with the layouts tool"
+msgstr "Mit dem Gestaltungswerkzeug kannst Du Deine eigenen Layouts erstellen"
+
+#: ../../include/text.php:1784
+msgid "Page content type"
+msgstr "Art des Seiteninhalts"
+
+#: ../../include/text.php:1817
+msgid "Select an alternate language"
+msgstr "Wähle eine alternative Sprache"
+
+#: ../../include/text.php:1934
+msgid "activity"
+msgstr "Aktivität"
+
+#: ../../include/text.php:2235
+msgid "Design Tools"
+msgstr "Gestaltungswerkzeuge"
+
+#: ../../include/text.php:2241
+msgid "Pages"
+msgstr "Seiten"
+
+#: ../../include/auth.php:147
+msgid "Logged out."
+msgstr "Ausgeloggt."
+
+#: ../../include/auth.php:274
+msgid "Failed authentication"
+msgstr "Authentifizierung fehlgeschlagen"
+
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
+msgstr "Kann meine normalen Beiträge sehen"
+
+#: ../../include/permissions.php:30
+msgid "Can view my webpages"
+msgstr "Kann meine Webseiten sehen"
+
+#: ../../include/permissions.php:34
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
+
+#: ../../include/permissions.php:37
+msgid "Can like/dislike stuff"
+msgstr "Kann andere Elemente mögen/nicht mögen"
+
+#: ../../include/permissions.php:37
+msgid "Profiles and things other than posts/comments"
+msgstr "Profile und alles außer Beiträge und Kommentare"
+
+#: ../../include/permissions.php:39
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
+
+#: ../../include/permissions.php:39
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
+
+#: ../../include/permissions.php:40
+msgid "Can chat with me (when available)"
+msgstr "Kann mit mir chatten (wenn verfügbar)"
+
+#: ../../include/permissions.php:41
+msgid "Can write to my file storage and photos"
+msgstr "Kann in meine Datei- und Bilderordner schreiben"
+
+#: ../../include/permissions.php:42
+msgid "Can edit my webpages"
+msgstr "Kann meine Webseiten bearbeiten"
+
+#: ../../include/permissions.php:44
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften"
+
+#: ../../include/permissions.php:46
+msgid "Can administer my channel resources"
+msgstr "Kann meine Kanäle administrieren"
+
+#: ../../include/permissions.php:46
 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:163
-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:164
-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:165
-msgid "This is your default setting for the audience of your webpages"
-msgstr "Dies ist Deine Voreinstellung für die Sichtbarkeit Deiner Webseiten."
-
-#: ../../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:1871
-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:723 ../../include/account.php:725
-msgid "Click here to upgrade."
-msgstr "Klicke hier, um das Upgrade durchzuführen."
-
-#: ../../include/account.php:731
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
-
-#: ../../include/account.php:736
-msgid "This action is not available under your subscription plan."
-msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
-
-#: ../../include/attach.php:247 ../../include/attach.php:333
-msgid "Item was not found."
-msgstr "Beitrag wurde nicht gefunden."
-
-#: ../../include/attach.php:497
-msgid "No source file."
-msgstr "Keine Quelldatei."
-
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
-msgstr "Kann Datei zum Ersetzen nicht finden"
-
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
-msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
-
-#: ../../include/attach.php:672
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Datei überschreitet das Größen-Limit von %d"
-
-#: ../../include/attach.php:686
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
-
-#: ../../include/attach.php:842
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
-
-#: ../../include/attach.php:855
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
-
-#: ../../include/attach.php:909 ../../include/attach.php:925
-msgid "Path not available."
-msgstr "Pfad nicht verfügbar."
-
-#: ../../include/attach.php:971 ../../include/attach.php:1123
-msgid "Empty pathname"
-msgstr "Leere Pfadangabe"
-
-#: ../../include/attach.php:997
-msgid "duplicate filename or path"
-msgstr "doppelter Dateiname oder Pfad"
-
-#: ../../include/attach.php:1019
-msgid "Path not found."
-msgstr "Pfad nicht gefunden."
-
-#: ../../include/attach.php:1077
-msgid "mkdir failed."
-msgstr "mkdir fehlgeschlagen."
-
-#: ../../include/attach.php:1081
-msgid "database storage failed."
-msgstr "Speichern in der Datenbank fehlgeschlagen."
-
-#: ../../include/attach.php:1129
-msgid "Empty path"
-msgstr "Leere Pfadangabe"
-
-#: ../../include/channel.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "Kann keine Identitäts-Informationen aus Datenbank beziehen"
-
-#: ../../include/channel.php:66
-msgid "Empty name"
-msgstr "Namensfeld leer"
-
-#: ../../include/channel.php:69
-msgid "Name too long"
-msgstr "Name ist zu lang"
-
-#: ../../include/channel.php:180
-msgid "No account identifier"
-msgstr "Keine Account-Kennung"
-
-#: ../../include/channel.php:192
-msgid "Nickname is required."
-msgstr "Spitzname ist erforderlich."
-
-#: ../../include/channel.php:206
-msgid "Reserved nickname. Please choose another."
-msgstr "Reservierter Kurzname. Bitte wähle einen anderen."
-
-#: ../../include/channel.php:211
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt."
-
-#: ../../include/channel.php:287
-msgid "Unable to retrieve created identity"
-msgstr "Kann die erstellte Identität nicht empfangen"
-
-#: ../../include/channel.php:345
-msgid "Default Profile"
-msgstr "Standard-Profil"
-
-#: ../../include/channel.php:791
-msgid "Requested channel is not available."
-msgstr "Angeforderte Kanal nicht verfügbar."
-
-#: ../../include/channel.php:938
-msgid "Create New Profile"
-msgstr "Neues Profil erstellen"
-
-#: ../../include/channel.php:958
-msgid "Visible to everybody"
-msgstr "Für jeden sichtbar"
-
-#: ../../include/channel.php:1031 ../../include/channel.php:1142
-msgid "Gender:"
-msgstr "Geschlecht:"
-
-#: ../../include/channel.php:1032 ../../include/channel.php:1186
-msgid "Status:"
-msgstr "Status:"
-
-#: ../../include/channel.php:1033 ../../include/channel.php:1197
-msgid "Homepage:"
-msgstr "Homepage:"
-
-#: ../../include/channel.php:1034
-msgid "Online Now"
-msgstr "gerade online"
-
-#: ../../include/channel.php:1147
-msgid "Like this channel"
-msgstr "Dieser Kanal gefällt mir"
-
-#: ../../include/channel.php:1171
-msgid "j F, Y"
-msgstr "j. F Y"
-
-#: ../../include/channel.php:1172
-msgid "j F"
-msgstr "j. F"
-
-#: ../../include/channel.php:1179
-msgid "Birthday:"
-msgstr "Geburtstag:"
-
-#: ../../include/channel.php:1192
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "seit %1$d %2$s"
-
-#: ../../include/channel.php:1195
-msgid "Sexual Preference:"
-msgstr "Sexuelle Orientierung:"
-
-#: ../../include/channel.php:1201
-msgid "Tags:"
-msgstr "Schlagworte:"
-
-#: ../../include/channel.php:1203
-msgid "Political Views:"
-msgstr "Politische Ansichten:"
-
-#: ../../include/channel.php:1205
-msgid "Religion:"
-msgstr "Religion:"
-
-#: ../../include/channel.php:1209
-msgid "Hobbies/Interests:"
-msgstr "Hobbys/Interessen:"
-
-#: ../../include/channel.php:1211
-msgid "Likes:"
-msgstr "Gefällt:"
-
-#: ../../include/channel.php:1213
-msgid "Dislikes:"
-msgstr "Gefällt nicht:"
-
-#: ../../include/channel.php:1215
-msgid "Contact information and Social Networks:"
-msgstr "Kontaktinformation und soziale Netzwerke:"
-
-#: ../../include/channel.php:1217
-msgid "My other channels:"
-msgstr "Meine anderen Kanäle:"
-
-#: ../../include/channel.php:1219
-msgid "Musical interests:"
-msgstr "Musikalische Interessen:"
-
-#: ../../include/channel.php:1221
-msgid "Books, literature:"
-msgstr "Bücher, Literatur:"
-
-#: ../../include/channel.php:1223
-msgid "Television:"
-msgstr "Fernsehen:"
-
-#: ../../include/channel.php:1225
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/Tanz/Kultur/Unterhaltung:"
-
-#: ../../include/channel.php:1227
-msgid "Love/Romance:"
-msgstr "Liebe/Romantik:"
-
-#: ../../include/channel.php:1229
-msgid "Work/employment:"
-msgstr "Arbeit/Anstellung:"
-
-#: ../../include/channel.php:1231
-msgid "School/education:"
-msgstr "Schule/Ausbildung:"
-
-#: ../../include/channel.php:1251
-msgid "Like this thing"
-msgstr "Gefällt mir"
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
 
 #: ../../include/features.php:48
 msgid "General Features"
@@ -8730,378 +8540,257 @@ msgid "Provide managed web pages on your channel"
 msgstr "Ermöglicht das Erstellen von Webseiten in Deinem Kanal"
 
 #: ../../include/features.php:55
+msgid "Provide a wiki for your channel"
+msgstr "Stelle ein Wiki in Deinem Kanal zur Verfügung"
+
+#: ../../include/features.php:56
 msgid "Hide Rating"
 msgstr "Bewertung verbergen"
 
-#: ../../include/features.php:55
+#: ../../include/features.php:56
 msgid ""
 "Hide the rating buttons on your channel and profile pages. Note: People can "
 "still rate you somewhere else."
 msgstr "Verberge die Buttons zur Bewertung auf deiner Profil-Seite und deinem Kanal. Hinweis: Leute können dich weiterhin andernorts bewerten."
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Private Notes"
 msgstr "Private Notizen"
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr "Aktiviert ein Werkzeug mit dem Notizen und Erinnerungen gespeichert werden können (Hinweis: nicht verschlüsselt)"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Navigation Channel Select"
 msgstr "Kanal-Auswahl in der Navigationsleiste"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Ermöglicht den direkten Wechsel zu anderen Kanälen über das Navigationsmenü"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "Photo Location"
 msgstr "Aufnahmeort"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr "Verlinkt den Aufnahmeort von Fotos (falls verfügbar) auf einer Karte"
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Access Controlled Chatrooms"
 msgstr "Zugriffskontrollierte Chaträume"
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Provide chatrooms and chat services with access control."
 msgstr "Bieten Sie Chaträume und Chatdienste mit Zugriffskontrolle an."
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid "Smart Birthdays"
 msgstr "Smarte Geburtstage"
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid ""
 "Make birthday events timezone aware in case your friends are scattered "
 "across the planet."
 msgstr "Stellt für Geburtstage einen Zeitzonenbezug her, falls deine Freunde über den ganzen Planeten verstreut sind."
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Expert Mode"
 msgstr "Expertenmodus"
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr "Aktiviert den Expertenmodus, der fortgeschrittene Konfigurationsoptionen zur Verfügung stellt"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid "Premium Channel"
 msgstr "Premium-Kanal"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr "Ermöglicht es, Einschränkungen und Bedingungen für Verbindungen dieses Kanals festzulegen"
 
-#: ../../include/features.php:67
+#: ../../include/features.php:68
 msgid "Post Composition Features"
 msgstr "Nachbearbeitungsfunktionen"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Large Photos"
 msgstr "Große Fotos"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr "Große Vorschaubilder (1024px) in Beiträgen anzeigen. Falls nicht aktiviert, werden kleine Vorschaubilder (640px) verwendet."
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Automatically import channel content from other channels or feeds"
 msgstr "Ermöglicht den automatischen Import von Inhalten für diesen Kanal von anderen Kanälen oder Feeds"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Even More Encryption"
 msgstr "Noch mehr Verschlüsselung"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr "Ermöglicht optional die zusätzliche Verschlüsselung von Inhalten (Ende-zu-Ende mit geteiltem Schlüssel)"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Enable Voting Tools"
 msgstr "Umfragewerkzeuge aktivieren"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Provide a class of post which others can vote on"
 msgstr "Aktiviert die Umfragewerkzeuge, um anderen die Möglichkeit zu geben, einem Beitrag zuzustimmen, ihn abzulehnen oder sich zu enthalten. (Muss im Beitrag selbst noch aktiviert werden.)"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Delayed Posting"
 msgstr "Verzögertes Senden"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Allow posts to be published at a later date"
 msgstr "Ermöglicht es, Beiträge zu einem späteren Zeitpunkt zu veröffentlichen"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Suppress Duplicate Posts/Comments"
 msgstr "Doppelte Beiträge unterdrücken"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr "Verhindert, dass innerhalb von zwei Minuten Beiträge mit identischem Inhalt veröffentlicht werden."
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Network and Stream Filtering"
 msgstr "Netzwerk- und Stream-Filter"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Search by Date"
 msgstr "Suche nach Datum"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to select posts by date ranges"
 msgstr "Möglichkeit, Beiträge nach Zeiträumen auszuwählen"
 
-#: ../../include/features.php:83 ../../include/group.php:311
+#: ../../include/features.php:84 ../../include/group.php:311
 msgid "Privacy Groups"
 msgstr "Gruppen"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Enable management and selection of privacy groups"
 msgstr "Auswahl und Verwaltung von Gruppen für Kanäle aktivieren"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85 ../../include/widgets.php:281
+msgid "Saved Searches"
+msgstr "Gespeicherte Suchanfragen"
+
+#: ../../include/features.php:85
 msgid "Save search terms for re-use"
 msgstr "Ermöglicht das Abspeichern von Suchbegriffen zur Wiederverwendung"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Network Personal Tab"
 msgstr "Persönlicher Netzwerkreiter"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Aktiviert einen Reiter in der Grid-Ansicht, der nur Netzwerk-Beiträge anzeigt, mit denen Du interagiert hast"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Network New Tab"
 msgstr "Netzwerkreiter Neu"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Enable tab to display all new Network activity"
 msgstr "Aktiviert einen Reiter in der Grid-Ansicht, der alle neuen Netzwerkaktivitäten anzeigt"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Affinity Tool"
 msgstr "Beziehungs-Tool"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Filter stream activity by depth of relationships"
 msgstr "Aktiviert ein Werkzeug in der Grid-Ansicht, das den Stream nach Grad der Beziehung filtern kann"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Connection Filtering"
 msgstr "Filter für Verbindungen"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 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:90
 msgid "Show channel suggestions"
 msgstr "Kanalvorschläge anzeigen"
 
-#: ../../include/features.php:94
+#: ../../include/features.php:95
 msgid "Post/Comment Tools"
 msgstr "Beitrag-/Kommentar-Tools"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Community Tagging"
 msgstr "Gemeinschaftliches Verschlagworten"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Ability to tag existing posts"
 msgstr "Ermöglicht das Verschlagworten existierender Beiträge"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Post Categories"
 msgstr "Beitrags-Kategorien"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Add categories to your posts"
 msgstr "Aktiviert Kategorien für Beiträge"
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Emoji Reactions"
 msgstr "Emoji Reaktionen"
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Add emoji reaction ability to posts"
 msgstr "Aktiviert Emoji-Reaktionen für Beiträge"
 
-#: ../../include/features.php:98
+#: ../../include/features.php:99 ../../include/widgets.php:310
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Gespeicherte Ordner"
+
+#: ../../include/features.php:99
 msgid "Ability to file posts under folders"
 msgstr "Möglichkeit, Beiträge in Verzeichnissen zu sammeln"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Dislike Posts"
 msgstr "Gefällt-mir-nicht-Beiträge"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Ability to dislike posts/comments"
 msgstr "Aktiviert die „Gefällt mir nicht“-Schaltfläche"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Star Posts"
 msgstr "Beiträge mit Sternchen versehen"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Ermöglicht die lokale Markierung spezieller Beiträge mit einem Sternchen-Symbol"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Tag Cloud"
 msgstr "Schlagwort-Wolke"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Aktiviert die Anzeige einer Schlagwort-Wolke (Tag Cloud) auf Deiner Kanal-Seite"
 
-#: ../../include/oembed.php:324
-msgid "Embedded content"
-msgstr "Eingebetteter Inhalt"
-
-#: ../../include/oembed.php:333
-msgid "Embedding disabled"
-msgstr "Einbetten ausgeschaltet"
-
-#: ../../include/acl_selectors.php:271
-msgid "Who can see this?"
-msgstr "Wer kann das sehen?"
-
-#: ../../include/acl_selectors.php:272
-msgid "Custom selection"
-msgstr "Benutzerdefinierte Auswahl"
-
-#: ../../include/acl_selectors.php:273
-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/acl_selectors.php:274
-msgid "Show"
-msgstr "Anzeigen"
-
-#: ../../include/acl_selectors.php:275
-msgid "Don't show"
-msgstr "Nicht anzeigen"
-
-#: ../../include/acl_selectors.php:281
-msgid "Other networks and post services"
-msgstr "Andere Netzwerke und Platformen"
-
-#: ../../include/acl_selectors.php:311
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These"
-" permissions set who is allowed to view the post."
-msgstr "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.<br />Diese Berechtigungen bestimmen, wer den Beitrag sehen kann."
-
-#: ../../include/auth.php:105
-msgid "Logged out."
-msgstr "Ausgeloggt."
-
-#: ../../include/auth.php:212
-msgid "Failed authentication"
-msgstr "Authentifizierung fehlgeschlagen"
-
-#: ../../include/datetime.php:135
-msgid "Birthday"
-msgstr "Geburtstag"
-
-#: ../../include/datetime.php:137
-msgid "Age: "
-msgstr "Alter:"
-
-#: ../../include/datetime.php:139
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "JJJJ-MM-TT oder MM-TT"
-
-#: ../../include/datetime.php:272 ../../boot.php:2470
-msgid "never"
-msgstr "Nie"
-
-#: ../../include/datetime.php:278
-msgid "less than a second ago"
-msgstr "Vor weniger als einer Sekunde"
-
-#: ../../include/datetime.php:296
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "vor %1$d %2$s"
-
-#: ../../include/datetime.php:307
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] "Jahr"
-msgstr[1] "Jahre"
-
-#: ../../include/datetime.php:310
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] "Monat"
-msgstr[1] "Monate"
-
-#: ../../include/datetime.php:313
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "Woche"
-msgstr[1] "Wochen"
-
-#: ../../include/datetime.php:316
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] "Tag"
-msgstr[1] "Tage"
-
-#: ../../include/datetime.php:319
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "Stunde"
-msgstr[1] "Stunden"
-
-#: ../../include/datetime.php:322
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "Minute"
-msgstr[1] "Minuten"
-
-#: ../../include/datetime.php:325
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "Sekunde"
-msgstr[1] "Sekunden"
-
-#: ../../include/datetime.php:562
-#, php-format
-msgid "%1$s's birthday"
-msgstr "%1$ss Geburtstag"
-
-#: ../../include/datetime.php:563
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr "Alles Gute zum Geburtstag, %1$s"
-
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -9129,21 +8818,583 @@ 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/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:485
+msgid "l F d, Y \\@ g:i A"
+msgstr "l, d. F Y, H:i"
+
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:491
+msgid "Starts:"
+msgstr "Beginnt:"
+
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:499
+msgid "Finishes:"
+msgstr "Endet:"
+
+#: ../../include/event.php:814
+msgid "This event has been added to your calendar."
+msgstr "Dieser Termin wurde zu Deinem Kalender hinzugefügt"
+
+#: ../../include/event.php:1014
+msgid "Not specified"
+msgstr "Keine Angabe"
+
+#: ../../include/event.php:1015
+msgid "Needs Action"
+msgstr "Aktion erforderlich"
+
+#: ../../include/event.php:1016
+msgid "Completed"
+msgstr "Abgeschlossen"
+
+#: ../../include/event.php:1017
+msgid "In Process"
+msgstr "In Bearbeitung"
+
+#: ../../include/event.php:1018
+msgid "Cancelled"
+msgstr "gestrichen"
+
+#: ../../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:739 ../../include/account.php:741
+msgid "Click here to upgrade."
+msgstr "Klicke hier, um das Upgrade durchzuführen."
+
+#: ../../include/account.php:747
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Diese Aktion überschreitet die Grenzen Ihres Abonnements."
+
+#: ../../include/account.php:752
+msgid "This action is not available under your subscription plan."
+msgstr "Diese Aktion ist in Ihrem Abonnement nicht verfügbar."
+
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
+msgstr "Der Kanal ist auf dieser Seite blockiert "
+
+#: ../../include/follow.php:32
+msgid "Channel location missing."
+msgstr "Adresse des Kanals fehlt."
+
+#: ../../include/follow.php:80
+msgid "Response from remote channel was incomplete."
+msgstr "Antwort des entfernten Kanals war unvollständig."
+
+#: ../../include/follow.php:97
+msgid "Channel was deleted and no longer exists."
+msgstr "Kanal wurde gelöscht und existiert nicht mehr."
+
+#: ../../include/follow.php:147 ../../include/follow.php:183
+msgid "Protocol disabled."
+msgstr "Protokoll deaktiviert."
+
+#: ../../include/follow.php:171
+msgid "Channel discovery failed."
+msgstr "Kanalsuche fehlgeschlagen"
+
+#: ../../include/follow.php:210
+msgid "Cannot connect to yourself."
+msgstr "Du kannst Dich nicht mit Dir selbst verbinden."
+
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
+msgstr "Beitrag wurde nicht gefunden."
+
+#: ../../include/attach.php:499
+msgid "No source file."
+msgstr "Keine Quelldatei."
+
+#: ../../include/attach.php:521
+msgid "Cannot locate file to replace"
+msgstr "Kann Datei zum Ersetzen nicht finden"
+
+#: ../../include/attach.php:539
+msgid "Cannot locate file to revise/update"
+msgstr "Kann Datei zum Prüfen/Aktualisieren nicht finden"
+
+#: ../../include/attach.php:674
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Datei überschreitet das Größen-Limit von %d"
+
+#: ../../include/attach.php:688
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht."
+
+#: ../../include/attach.php:846
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess."
+
+#: ../../include/attach.php:859
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen."
+
+#: ../../include/attach.php:915 ../../include/attach.php:931
+msgid "Path not available."
+msgstr "Pfad nicht verfügbar."
+
+#: ../../include/attach.php:977 ../../include/attach.php:1129
+msgid "Empty pathname"
+msgstr "Leere Pfadangabe"
+
+#: ../../include/attach.php:1003
+msgid "duplicate filename or path"
+msgstr "doppelter Dateiname oder Pfad"
+
+#: ../../include/attach.php:1025
+msgid "Path not found."
+msgstr "Pfad nicht gefunden."
+
+#: ../../include/attach.php:1083
+msgid "mkdir failed."
+msgstr "mkdir fehlgeschlagen."
+
+#: ../../include/attach.php:1087
+msgid "database storage failed."
+msgstr "Speichern in der Datenbank fehlgeschlagen."
+
+#: ../../include/attach.php:1135
+msgid "Empty path"
+msgstr "Leere Pfadangabe"
+
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:878
+#: ../../include/bbcode.php:881 ../../include/bbcode.php:886
+#: ../../include/bbcode.php:889 ../../include/bbcode.php:892
+#: ../../include/bbcode.php:895 ../../include/bbcode.php:900
+#: ../../include/bbcode.php:903 ../../include/bbcode.php:908
+#: ../../include/bbcode.php:911 ../../include/bbcode.php:914
+#: ../../include/bbcode.php:917
+msgid "Image/photo"
+msgstr "Bild/Foto"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:928
+msgid "Encrypted content"
+msgstr "Verschlüsselter Inhalt"
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr "Element %s installieren: "
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Dieser Beitrag beinhaltet ein installierbares %s Element, aber Du hast nicht die nötigen Rechte, um es auf diesem Hub zu installieren."
+
+#: ../../include/bbcode.php:261
+#, 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:338 ../../include/bbcode.php:346
+msgid "Click to open/close"
+msgstr "Klicke zum Öffnen/Schließen"
+
+#: ../../include/bbcode.php:346
+msgid "spoiler"
+msgstr "Spoiler"
+
+#: ../../include/bbcode.php:619
+msgid "Different viewers will see this text differently"
+msgstr "Verschiedene Betrachter werden diesen Text unterschiedlich sehen"
+
+#: ../../include/bbcode.php:866
+msgid "$1 wrote:"
+msgstr "$1 schrieb:"
+
+#: ../../include/items.php:897 ../../include/items.php:942
+msgid "(Unknown)"
+msgstr "(Unbekannt)"
+
+#: ../../include/items.php:1141
+msgid "Visible to anybody on the internet."
+msgstr "Für jeden im Internet sichtbar."
+
+#: ../../include/items.php:1143
+msgid "Visible to you only."
+msgstr "Nur für Dich sichtbar."
+
+#: ../../include/items.php:1145
+msgid "Visible to anybody in this network."
+msgstr "Für jedes $Projectname-Mitglied sichtbar."
+
+#: ../../include/items.php:1147
+msgid "Visible to anybody authenticated."
+msgstr "Für jeden sichtbar, der angemeldet ist."
+
+#: ../../include/items.php:1149
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Für jeden auf %s sichtbar."
+
+#: ../../include/items.php:1151
+msgid "Visible to all connections."
+msgstr "Für alle Verbindungen sichtbar."
+
+#: ../../include/items.php:1153
+msgid "Visible to approved connections."
+msgstr "Nur für akzeptierte Verbindungen sichtbar."
+
+#: ../../include/items.php:1155
+msgid "Visible to specific connections."
+msgstr "Sichtbar für bestimmte Verbindungen."
+
+#: ../../include/items.php:3918
+msgid "Privacy group is empty."
+msgstr "Gruppe ist leer."
+
+#: ../../include/items.php:3925
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Gruppe: %s"
+
+#: ../../include/items.php:3937
+msgid "Connection not found."
+msgstr "Die Verbindung wurde nicht gefunden."
+
+#: ../../include/items.php:4290
+msgid "profile photo"
+msgstr "Profilfoto"
+
+#: ../../include/oembed.php:336
+msgid "Embedded content"
+msgstr "Eingebetteter Inhalt"
+
+#: ../../include/oembed.php:345
+msgid "Embedding disabled"
+msgstr "Einbetten ausgeschaltet"
+
+#: ../../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:313 ../../include/widgets.php:432
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
+msgstr "Alles"
+
+#: ../../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:631
+msgid "Premium Channel Settings"
+msgstr "Premium-Kanal-Einstellungen"
+
+#: ../../include/widgets.php:660
+msgid "Private Mail Menu"
+msgstr "Private Nachrichten"
+
+#: ../../include/widgets.php:662
+msgid "Combined View"
+msgstr "Kombinierte Anzeige"
+
+#: ../../include/widgets.php:694 ../../include/widgets.php:706
+msgid "Conversations"
+msgstr "Konversationen"
+
+#: ../../include/widgets.php:698
+msgid "Received Messages"
+msgstr "Erhaltene Nachrichten"
+
+#: ../../include/widgets.php:702
+msgid "Sent Messages"
+msgstr "Gesendete Nachrichten"
+
+#: ../../include/widgets.php:716
+msgid "No messages."
+msgstr "Keine Nachrichten."
+
+#: ../../include/widgets.php:734
+msgid "Delete conversation"
+msgstr "Unterhaltung löschen"
+
+#: ../../include/widgets.php:760
+msgid "Events Tools"
+msgstr "Kalenderwerkzeuge"
+
+#: ../../include/widgets.php:761
+msgid "Export Calendar"
+msgstr "Kalender exportieren"
+
+#: ../../include/widgets.php:762
+msgid "Import Calendar"
+msgstr "Kalender importieren"
+
+#: ../../include/widgets.php:840
+msgid "Overview"
+msgstr "Übersicht"
+
+#: ../../include/widgets.php:847
+msgid "Chat Members"
+msgstr "Chatmitglieder"
+
+#: ../../include/widgets.php:869
+msgid "Wiki List"
+msgstr "Wikiliste"
+
+#: ../../include/widgets.php:907
+msgid "Wiki Pages"
+msgstr "Wikiseiten"
+
+#: ../../include/widgets.php:942
+msgid "Bookmarked Chatrooms"
+msgstr "Gespeicherte Chatrooms"
+
+#: ../../include/widgets.php:965
+msgid "Suggested Chatrooms"
+msgstr "Chatraum-Vorschläge"
+
+#: ../../include/widgets.php:1111 ../../include/widgets.php:1223
+msgid "photo/image"
+msgstr "Foto/Bild"
+
+#: ../../include/widgets.php:1166
+msgid "Click to show more"
+msgstr "Klick, um mehr anzuzeigen"
+
+#: ../../include/widgets.php:1317
+msgid "Rating Tools"
+msgstr "Bewertungswerkzeuge"
+
+#: ../../include/widgets.php:1321 ../../include/widgets.php:1323
+msgid "Rate Me"
+msgstr "Bewerte mich"
+
+#: ../../include/widgets.php:1326
+msgid "View Ratings"
+msgstr "Bewertungen ansehen"
+
+#: ../../include/widgets.php:1410
+msgid "Forums"
+msgstr "Foren"
+
+#: ../../include/widgets.php:1439
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: ../../include/widgets.php:1448
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: ../../include/widgets.php:1450
+msgid "Project/Site Information"
+msgstr "Informationen über das Projekt und diesen Hub"
+
+#: ../../include/widgets.php:1451
+msgid "For Members"
+msgstr "Für Mitglieder"
+
+#: ../../include/widgets.php:1452
+msgid "For Administrators"
+msgstr "Für Administratoren"
+
+#: ../../include/widgets.php:1453
+msgid "For Developers"
+msgstr "Für Entwickler"
+
+#: ../../include/widgets.php:1477 ../../include/widgets.php:1515
+msgid "Member registrations waiting for confirmation"
+msgstr "Nutzer-Anmeldungen, die auf Bestätigung warten"
+
+#: ../../include/widgets.php:1483
+msgid "Inspect queue"
+msgstr "Warteschlange kontrollieren"
+
+#: ../../include/widgets.php:1485
+msgid "DB updates"
+msgstr "DB-Aktualisierungen"
+
+#: ../../include/widgets.php:1511
+msgid "Plugin Features"
+msgstr "Plug-In Funktionen"
+
+#: ../../include/activities.php:41
+msgid " and "
+msgstr "und"
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr "öffentliches Profil"
+
+#: ../../include/activities.php:58
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s hat %2$s auf &ldquo;%3$s&rdquo; geändert"
+
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Besuche %1$s's %2$s"
+
+#: ../../include/activities.php:62
+#, php-format
+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/bb2diaspora.php:398
+msgid "Attachments:"
+msgstr "Anhänge:"
+
+#: ../../include/bb2diaspora.php:487
+msgid "$Projectname event notification:"
+msgstr "$Projectname-Terminbenachrichtigung:"
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "Dieses Element löschen?"
 
 #: ../../include/js_strings.php:8
-msgid "[-] show less"
-msgstr "[-] Weniger anzeigen"
+#, php-format
+msgid "%s show less"
+msgstr "%s weniger anzeigen"
 
 #: ../../include/js_strings.php:9
-msgid "[+] expand"
-msgstr "[+] aufklappen"
+#, php-format
+msgid "%s expand"
+msgstr "%s aufklappen"
 
 #: ../../include/js_strings.php:10
-msgid "[-] collapse"
-msgstr "[-] einklappen"
+#, php-format
+msgid "%s collapse"
+msgstr "%s einklappen"
 
 #: ../../include/js_strings.php:11
 msgid "Password too short"
@@ -9373,278 +9624,223 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "Ganztägig"
 
-#: ../../include/network.php:657
-msgid "view full size"
-msgstr "In Vollbildansicht anschauen"
-
-#: ../../include/network.php:1885
-msgid "No Subject"
-msgstr "Kein Betreff"
-
-#: ../../include/network.php:2146 ../../include/network.php:2147
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/network.php:2148
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/network.php:2149
-msgid "GNU-Social"
-msgstr "GNU-Social"
-
-#: ../../include/network.php:2150
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/network.php:2152
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/network.php:2153
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/network.php:2154
-msgid "Zot"
-msgstr "Zot!"
-
-#: ../../include/network.php:2155
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ../../include/network.php:2156
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: ../../include/network.php:2157
-msgid "MySpace"
-msgstr "MySpace"
-
-#: ../../include/photos.php:110
+#: ../../include/contact_widgets.php:11
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Bild überschreitet das Webseitenlimit von %lu Bytes"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d Einladung verfügbar"
+msgstr[1] "%d Einladungen verfügbar"
 
-#: ../../include/photos.php:117
-msgid "Image file is empty."
-msgstr "Bilddatei ist leer."
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
+msgstr "Finde Kanäle"
 
-#: ../../include/photos.php:255
-msgid "Photo storage failed."
-msgstr "Fotospeicherung fehlgeschlagen."
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
+msgstr "Name oder Interessen eingeben"
 
-#: ../../include/photos.php:295
-msgid "a new photo"
-msgstr "ein neues Foto"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
+msgstr "Verbinden/Folgen"
 
-#: ../../include/photos.php:299
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Beispiele: Robert Morgenstein, Angeln"
+
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
+msgstr "Zufallsprofil"
+
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
+msgstr "Lade Freunde ein"
+
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Fortgeschrittenes Beispiel: name=fred and country=iceland"
+
+#: ../../include/contact_widgets.php:122
 #, 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 "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d gemeinsame Verbindung"
+msgstr[1] "%d gemeinsame Verbindungen"
 
-#: ../../include/photos.php:506
-msgid "Upload New Photos"
-msgstr "Neue Fotos hochladen"
+#: ../../include/contact_widgets.php:127
+msgid "show more"
+msgstr "mehr zeigen"
 
-#: ../../include/zot.php:699
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr "Verzeichnisoptionen"
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr "Sicherer Modus"
+
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr "Nur öffentliche Foren"
+
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr "Nur dieser Hub"
+
+#: ../../include/message.php:20
+msgid "No recipient provided."
+msgstr "Kein Empfänger angegeben"
+
+#: ../../include/message.php:25
+msgid "[no subject]"
+msgstr "[no subject]"
+
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
+msgstr "Kann Absender nicht bestimmen."
+
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
+msgstr "Gespeicherter Beitrag konnten nicht überprüft werden."
+
+#: ../../include/acl_selectors.php:269
+msgid "Who can see this?"
+msgstr "Wer kann das sehen?"
+
+#: ../../include/acl_selectors.php:270
+msgid "Custom selection"
+msgstr "Benutzerdefinierte Auswahl"
+
+#: ../../include/acl_selectors.php:271
+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/acl_selectors.php:272
+msgid "Show"
+msgstr "Anzeigen"
+
+#: ../../include/acl_selectors.php:273
+msgid "Don't show"
+msgstr "Nicht anzeigen"
+
+#: ../../include/acl_selectors.php:279
+msgid "Other networks and post services"
+msgstr "Andere Netzwerke und Platformen"
+
+#: ../../include/acl_selectors.php:309
+#, php-format
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These"
+" permissions set who is allowed to view the post."
+msgstr "Beitragsberechtigungen %s können nicht geändert werden %s, nachdem der Beitrag gesendet wurde.<br />Diese Berechtigungen bestimmen, wer den Beitrag sehen kann."
+
+#: ../../include/datetime.php:135
+msgid "Birthday"
+msgstr "Geburtstag"
+
+#: ../../include/datetime.php:137
+msgid "Age: "
+msgstr "Alter:"
+
+#: ../../include/datetime.php:139
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "JJJJ-MM-TT oder MM-TT"
+
+#: ../../include/datetime.php:272 ../../boot.php:2479
+msgid "never"
+msgstr "Nie"
+
+#: ../../include/datetime.php:278
+msgid "less than a second ago"
+msgstr "Vor weniger als einer Sekunde"
+
+#: ../../include/datetime.php:296
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr "vor %1$d %2$s"
+
+#: ../../include/datetime.php:307
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] "Jahr"
+msgstr[1] "Jahre"
+
+#: ../../include/datetime.php:310
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] "Monat"
+msgstr[1] "Monate"
+
+#: ../../include/datetime.php:313
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "Woche"
+msgstr[1] "Wochen"
+
+#: ../../include/datetime.php:316
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "Tag"
+msgstr[1] "Tage"
+
+#: ../../include/datetime.php:319
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "Stunde"
+msgstr[1] "Stunden"
+
+#: ../../include/datetime.php:322
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "Minute"
+msgstr[1] "Minuten"
+
+#: ../../include/datetime.php:325
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "Sekunde"
+msgstr[1] "Sekunden"
+
+#: ../../include/datetime.php:562
+#, php-format
+msgid "%1$s's birthday"
+msgstr "%1$ss Geburtstag"
+
+#: ../../include/datetime.php:563
+#, php-format
+msgid "Happy Birthday %1$s"
+msgstr "Alles Gute zum Geburtstag, %1$s"
+
+#: ../../include/api.php:1327
+msgid "Public Timeline"
+msgstr "Öffentliche Zeitleiste"
+
+#: ../../include/zot.php:697
 msgid "Invalid data packet"
 msgstr "Ungültiges Datenpaket"
 
-#: ../../include/zot.php:715
+#: ../../include/zot.php:713
 msgid "Unable to verify channel signature"
 msgstr "Konnte die Signatur des Kanals nicht verifizieren"
 
-#: ../../include/zot.php:2363
+#: ../../include/zot.php:2326
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Kann die Signatur der Seite von %s nicht verifizieren"
 
-#: ../../include/zot.php:3712
+#: ../../include/zot.php:3703
 msgid "invalid target signature"
 msgstr "Ungültige Signatur des Ziels"
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Neue Seite"
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr "Titel"
-
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
-msgstr "Kann meine normalen Beiträge sehen"
-
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
-msgstr "Kann mein Standardprofil sehen"
-
-#: ../../include/permissions.php:28
-msgid "Can view my connections"
-msgstr "Kann meine Verbindungen sehen"
-
-#: ../../include/permissions.php:29
-msgid "Can view my file storage and photos"
-msgstr "Kann meine Datei- und Bilderordner sehen"
-
-#: ../../include/permissions.php:30
-msgid "Can view my webpages"
-msgstr "Kann meine Webseiten sehen"
-
-#: ../../include/permissions.php:33
-msgid "Can send me their channel stream and posts"
-msgstr "Kann mir die Beiträge aus seinem/ihrem Kanal schicken"
-
-#: ../../include/permissions.php:34
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen"
-
-#: ../../include/permissions.php:35
-msgid "Can comment on or like my posts"
-msgstr "Darf meine Beiträge kommentieren und mögen/nicht mögen"
-
-#: ../../include/permissions.php:36
-msgid "Can send me private mail messages"
-msgstr "Kann mir private Nachrichten schicken"
-
-#: ../../include/permissions.php:37
-msgid "Can like/dislike stuff"
-msgstr "Kann andere Elemente mögen/nicht mögen"
-
-#: ../../include/permissions.php:37
-msgid "Profiles and things other than posts/comments"
-msgstr "Profile und alles außer Beiträge und Kommentare"
-
-#: ../../include/permissions.php:39
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Kann an alle meine Kontakte via @-Erwähnung Nachrichten weiterleiten"
-
-#: ../../include/permissions.php:39
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Fortgeschritten - sinnvoll, um Gruppen-Kanäle/-Foren zu erstellen"
-
-#: ../../include/permissions.php:40
-msgid "Can chat with me (when available)"
-msgstr "Kann mit mir chatten (wenn verfügbar)"
-
-#: ../../include/permissions.php:41
-msgid "Can write to my file storage and photos"
-msgstr "Kann in meine Datei- und Bilderordner schreiben"
-
-#: ../../include/permissions.php:42
-msgid "Can edit my webpages"
-msgstr "Kann meine Webseiten bearbeiten"
-
-#: ../../include/permissions.php:44
-msgid "Can source my public posts in derived channels"
-msgstr "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden"
-
-#: ../../include/permissions.php:44
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Etwas fortgeschritten – sehr nützlich in offenen Gemeinschaften"
-
-#: ../../include/permissions.php:46
-msgid "Can administer my channel resources"
-msgstr "Kann meine Kanäle administrieren"
-
-#: ../../include/permissions.php:46
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Sehr fortgeschritten. Bearbeite das nur, wenn Du genau weißt, was Du tust"
-
-#: ../../include/permissions.php:877
-msgid "Social Networking"
-msgstr "Soziales Netzwerk"
-
-#: ../../include/permissions.php:877
-msgid "Social - Mostly Public"
-msgstr "Soziales Netzwerk - Weitgehend öffentlich"
-
-#: ../../include/permissions.php:877
-msgid "Social - Restricted"
-msgstr "Soziales Netzwerk - Beschränkt"
-
-#: ../../include/permissions.php:877
-msgid "Social - Private"
-msgstr "Soziales Netzwerk - Privat"
-
-#: ../../include/permissions.php:878
-msgid "Community Forum"
-msgstr "Forum"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Mostly Public"
-msgstr "Forum - Weitgehend öffentlich"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Restricted"
-msgstr "Forum - Beschränkt"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Private"
-msgstr "Forum - Privat"
-
-#: ../../include/permissions.php:879
-msgid "Feed Republish"
-msgstr "Teilen von Feeds"
-
-#: ../../include/permissions.php:879
-msgid "Feed - Mostly Public"
-msgstr "Feeds - Weitgehend öffentlich"
-
-#: ../../include/permissions.php:879
-msgid "Feed - Restricted"
-msgstr "Feeds - Beschränkt"
-
-#: ../../include/permissions.php:880
-msgid "Special Purpose"
-msgstr "Für besondere Zwecke"
-
-#: ../../include/permissions.php:880
-msgid "Special - Celebrity/Soapbox"
-msgstr "Speziell - Mitteilungs-Kanal (keine Kommentare)"
-
-#: ../../include/permissions.php:880
-msgid "Special - Group Repository"
-msgstr "Speziell - Gruppenarchiv"
-
-#: ../../include/permissions.php:881
-msgid "Custom/Expert Mode"
-msgstr "Benutzerdefiniert/Expertenmodus"
-
-#: ../../include/activities.php:41
-msgid " and "
-msgstr "und"
-
-#: ../../include/activities.php:49
-msgid "public profile"
-msgstr "öffentliches Profil"
-
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s hat %2$s auf &ldquo;%3$s&rdquo; geändert"
-
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Besuche %1$s's %2$s"
-
-#: ../../include/activities.php:62
-#, php-format
-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/bb2diaspora.php:398
-msgid "Attachments:"
-msgstr "Anhänge:"
-
-#: ../../include/bb2diaspora.php:487
-msgid "$Projectname event notification:"
-msgstr "$Projectname-Terminbenachrichtigung:"
-
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (Voreinstellung für Hubzilla)"
@@ -9781,62 +9977,66 @@ msgstr "Größe der Avatare von Themenstartern"
 msgid "Set size of followup author photos"
 msgstr "Größe der Avatare von Kommentatoren"
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr "Suche %1$s (%2$s)"
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../boot.php:1480
+#: ../../boot.php:1481
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen."
 
-#: ../../boot.php:1483
+#: ../../boot.php:1484
 #, php-format
 msgid "Update Error at %s"
 msgstr "Aktualisierungsfehler auf %s"
 
-#: ../../boot.php:1684
+#: ../../boot.php:1685
 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:1706
+msgid "Login/Email"
+msgstr "Anmelden/E-Mail"
+
+#: ../../boot.php:1707
 msgid "Password"
 msgstr "Kennwort"
 
-#: ../../boot.php:1707
+#: ../../boot.php:1708
 msgid "Remember me"
 msgstr "Angaben speichern"
 
-#: ../../boot.php:1710
+#: ../../boot.php:1711
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:2276
+#: ../../boot.php:2277
 msgid "toggle mobile"
 msgstr "auf/von mobile Ansicht wechseln"
 
-#: ../../boot.php:2425
+#: ../../boot.php:2432
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Das SSL-Zertifikat der Website ist nicht gültig. Bitte beheben."
 
-#: ../../boot.php:2428
+#: ../../boot.php:2435
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Website-SSL-Fehler für %s"
 
-#: ../../boot.php:2469
+#: ../../boot.php:2478
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron-Aufgaben laufen nicht."
 
-#: ../../boot.php:2473
+#: ../../boot.php:2482
 #, 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 eea433fac..6d6fd4ebe 100644
--- a/view/de/hstrings.php
+++ b/view/de/hstrings.php
@@ -4,7 +4,39 @@ if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	return ($n != 1);;
 }}
-;
+App::$rtl = 0;
+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["Other"] = "Andere";
+App::$strings["Custom/Expert Mode"] = "Benutzerdefiniert/Expertenmodus";
+App::$strings["Can view my channel stream and posts"] = "Kann meinen Kanal-Stream und meine Beiträge sehen";
+App::$strings["Can send me their channel stream and posts"] = "Kann mir die Beiträge aus seinem/ihrem Kanal schicken";
+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 upload/modify my file storage and photos"] = "Kann in meine Datei- und Bilderordner hochladen/ändern";
+App::$strings["Can view my channel webpages"] = "Kann die Webseiten meines Kanals sehen";
+App::$strings["Can create/edit my channel webpages"] = "Kann Webseiten in meinem Kanal erstellen/ändern";
+App::$strings["Can post on my channel (wall) page"] = "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 profiles and profile things"] = "Kann Profile und Profilsachen mögen/nicht mögen";
+App::$strings["Can forward to all my channel connections via @+ mentions in posts"] = "Kann an alle meine Verbindungen via @-Erwähnungen Nachrichten weiterleiten";
+App::$strings["Can chat with me"] = "Kann mit mir chatten";
+App::$strings["Can source my public posts in derived channels"] = "Kann meine öffentlichen Beiträge als Quellen für Kanäle verwenden";
+App::$strings["Can administer my channel"] = "Kann meinen Kanal administrieren";
 App::$strings["parent"] = "Übergeordnetes Verzeichnis";
 App::$strings["Collection"] = "Sammlung";
 App::$strings["Principal"] = "Prinzipal";
@@ -35,65 +67,10 @@ App::$strings["Not Found"] = "Nicht gefunden";
 App::$strings["Page not found."] = "Seite nicht gefunden.";
 App::$strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "Fern-Authentifizierung blockiert. Du bist lokal auf diesem Server angemeldet. Bitte melde Dich ab und versuche es erneut.";
 App::$strings["Welcome %s. Remote authentication successful."] = "Willkommen %s. Entfernte Authentifizierung erfolgreich.";
-App::$strings["Requested profile is not available."] = "Erwünschte Profil ist nicht verfügbar.";
+App::$strings["Requested profile is not available."] = "Das angefragte Profil ist nicht verfügbar.";
 App::$strings["Some blurb about what to do when you're new here"] = "Ein Hinweis, was man tun kann, wenn man neu hier ist";
-App::$strings["Block Name"] = "Block-Name";
-App::$strings["Blocks"] = "Blöcke";
-App::$strings["Block Title"] = "Titel des Blocks";
-App::$strings["Created"] = "Erstellt";
-App::$strings["Edited"] = "Geändert";
-App::$strings["Share"] = "Teilen";
-App::$strings["View"] = "Ansicht";
-App::$strings["Channel not found."] = "Kanal nicht gefunden.";
-App::$strings["Permissions denied."] = "Berechtigung verweigert.";
-App::$strings["l, F j"] = "l, j. F";
-App::$strings["Link to Source"] = "Link zur Quelle";
-App::$strings["Edit Event"] = "Termin bearbeiten";
-App::$strings["Create Event"] = "Termin anlegen";
-App::$strings["Previous"] = "Voriges";
-App::$strings["Next"] = "Nächste";
-App::$strings["Export"] = "Exportieren";
-App::$strings["Import"] = "Import";
-App::$strings["Submit"] = "Bestätigen";
-App::$strings["Today"] = "Heute";
-App::$strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können.";
-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["Room not found"] = "Chatraum nicht gefunden";
-App::$strings["Leave Room"] = "Raum verlassen";
-App::$strings["Delete Room"] = "Raum löschen";
-App::$strings["I am away right now"] = "Ich bin gerade nicht da";
-App::$strings["I am online"] = "Ich bin online";
-App::$strings["Bookmark this room"] = "Lesezeichen für diesen Raum setzen";
-App::$strings["Please enter a link URL:"] = "Gib eine URL ein:";
-App::$strings["Encrypt text"] = "Text verschlüsseln";
-App::$strings["Insert web link"] = "Link einfügen";
-App::$strings["Feature disabled."] = "Funktion deaktiviert.";
-App::$strings["New Chatroom"] = "Neuer Chatraum";
-App::$strings["Chatroom name"] = "Chatraumname";
-App::$strings["Expiration of chats (minutes)"] = "Verfall von Chats (Minuten)";
-App::$strings["Permissions"] = "Berechtigungen";
-App::$strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume";
-App::$strings["No chatrooms available"] = "Keine Chaträume verfügbar";
-App::$strings["Create New"] = "Neu anlegen";
-App::$strings["Expiration"] = "Verfall";
-App::$strings["min"] = "min";
 App::$strings["Away"] = "Abwesend";
 App::$strings["Online"] = "Online";
-App::$strings["Invalid item."] = "Ungültiges Element.";
-App::$strings["Bookmark added"] = "Lesezeichen hinzugefügt";
-App::$strings["My Bookmarks"] = "Meine Lesezeichen";
-App::$strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
-App::$strings["Continue"] = "Fortfahren";
-App::$strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung";
-App::$strings["Enable premium channel connection restrictions"] = "Einschränkungen für einen Premium-Kanal aktivieren";
-App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc.";
-App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig.";
-App::$strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:";
-App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite.";
-App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)";
-App::$strings["Restricted or Premium Channel"] = "Eingeschränkter oder Premium-Kanal";
 App::$strings["Could not access contact record."] = "Konnte nicht auf den Kontakteintrag zugreifen.";
 App::$strings["Could not locate selected profile."] = "Gewähltes Profil nicht gefunden.";
 App::$strings["Connection updated."] = "Verbindung aktualisiert.";
@@ -158,6 +135,7 @@ App::$strings["Do not import posts with this text"] = "Beiträge mit diesem Text
 App::$strings["This information is public!"] = "Diese Information ist öffentlich!";
 App::$strings["Connection Pending Approval"] = "Verbindung wartet auf Bestätigung";
 App::$strings["inherited"] = "geerbt";
+App::$strings["Submit"] = "Bestätigen";
 App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle ein Profil, das wir %s zeigen sollen, wenn Deine Profilseite über eine verifizierte Verbindung aufgerufen wird.";
 App::$strings["Their Settings"] = "Deren Einstellungen";
 App::$strings["My Settings"] = "Meine Einstellungen";
@@ -166,6 +144,30 @@ App::$strings["Some permissions may be inherited from your channel's <a href=\"s
 App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "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.";
 App::$strings["Last update:"] = "Letzte Aktualisierung:";
 App::$strings["Public access denied."] = "Öffentlichen Zugriff verweigert.";
+App::$strings["Item not found."] = "Element nicht gefunden.";
+App::$strings["First Name"] = "Vorname";
+App::$strings["Last Name"] = "Nachname";
+App::$strings["Nickname"] = "Spitzname";
+App::$strings["Full Name"] = "Voller Name";
+App::$strings["Email"] = "E-Mail";
+App::$strings["Profile Photo"] = "Profilfoto";
+App::$strings["Profile Photo 16px"] = "Profilfoto 16 px";
+App::$strings["Profile Photo 32px"] = "Profilfoto 32 px";
+App::$strings["Profile Photo 48px"] = "Profilfoto 48 px";
+App::$strings["Profile Photo 64px"] = "Profilfoto 64 px";
+App::$strings["Profile Photo 80px"] = "Profilfoto 80 px";
+App::$strings["Profile Photo 128px"] = "Profilfoto 128 px";
+App::$strings["Timezone"] = "Zeitzone";
+App::$strings["Homepage URL"] = "Homepage-URL";
+App::$strings["Language"] = "Sprache";
+App::$strings["Birth Year"] = "Geburtsjahr";
+App::$strings["Birth Month"] = "Geburtsmonat";
+App::$strings["Birth Day"] = "Geburtstag";
+App::$strings["Birthdate"] = "Geburtsdatum";
+App::$strings["Gender"] = "Geschlecht";
+App::$strings["Male"] = "Männlich";
+App::$strings["Female"] = "Weiblich";
+App::$strings["Channel added."] = "Kanal hinzugefügt.";
 App::$strings["%d rating"] = array(
 	0 => "%d Bewertung",
 	1 => "%d Bewertungen",
@@ -196,13 +198,74 @@ App::$strings["Reverse Alphabetic"] = "Entgegengesetzt alphabetisch";
 App::$strings["Newest to Oldest"] = "Neueste zuerst";
 App::$strings["Oldest to Newest"] = "Älteste zuerst";
 App::$strings["No entries (some entries may be hidden)."] = "Keine Einträge gefunden (einige könnten versteckt sein).";
-App::$strings["Item not found."] = "Element nicht gefunden.";
+App::$strings["Continue"] = "Fortfahren";
+App::$strings["Premium Channel Setup"] = "Premium-Kanal-Einrichtung";
+App::$strings["Enable premium channel connection restrictions"] = "Einschränkungen für einen Premium-Kanal aktivieren";
+App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Bitte gib Deine Nutzungsbedingungen ein, z.B. Paypal-Quittung, Richtlinien etc.";
+App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Unter Umständen sind weitere Schritte oder die Bestätigung der folgenden Bedingungen vor dem Verbinden mit diesem Kanal nötig.";
+App::$strings["Potential connections will then see the following text before proceeding:"] = "Potentielle Kontakte werden den folgenden Text sehen, bevor fortgefahren wird:";
+App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Indem ich fortfahre, bestätige ich die Erfüllung aller Anweisungen auf dieser Seite.";
+App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Der Kanal-Besitzer hat keine speziellen Anweisungen hinterlegt.)";
+App::$strings["Restricted or Premium Channel"] = "Eingeschränkter oder Premium-Kanal";
+App::$strings["Calendar entries imported."] = "Kalendereinträge wurden importiert.";
+App::$strings["No calendar entries found."] = "Keine Kalendereinträge gefunden.";
+App::$strings["Event can not end before it has started."] = "Termin-Ende liegt vor dem Beginn.";
+App::$strings["Unable to generate preview."] = "Vorschau konnte nicht erzeugt werden.";
+App::$strings["Event title and start time are required."] = "Titel und Startzeit des Termins sind erforderlich.";
+App::$strings["Event not found."] = "Termin nicht gefunden.";
+App::$strings["event"] = "Termin";
+App::$strings["Edit event title"] = "Termintitel bearbeiten";
+App::$strings["Event title"] = "Termintitel";
+App::$strings["Required"] = "Benötigt";
+App::$strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
+App::$strings["Edit Category"] = "Kategorie bearbeiten";
+App::$strings["Category"] = "Kategorie";
+App::$strings["Edit start date and time"] = "Startdatum und -zeit bearbeiten";
+App::$strings["Start date and time"] = "Startdatum und -zeit";
+App::$strings["Finish date and time are not known or not relevant"] = "Enddatum und -zeit sind unbekannt oder irrelevant";
+App::$strings["Edit finish date and time"] = "Enddatum und -zeit bearbeiten";
+App::$strings["Finish date and time"] = "Enddatum und -zeit";
+App::$strings["Adjust for viewer timezone"] = "An die Zeitzone des Betrachters anpassen";
+App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien.";
+App::$strings["Edit Description"] = "Beschreibung bearbeiten";
+App::$strings["Description"] = "Beschreibung";
+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["l, F j"] = "l, j. F";
+App::$strings["Edit event"] = "Termin bearbeiten";
+App::$strings["Delete event"] = "Termin löschen";
+App::$strings["Link to Source"] = "Link zur Quelle";
+App::$strings["calendar"] = "Kalender";
+App::$strings["Edit Event"] = "Termin bearbeiten";
+App::$strings["Create Event"] = "Termin anlegen";
+App::$strings["Previous"] = "Voriges";
+App::$strings["Next"] = "Nächste";
+App::$strings["Export"] = "Exportieren";
+App::$strings["View"] = "Ansicht";
+App::$strings["Month"] = "Monat";
+App::$strings["Week"] = "Woche";
+App::$strings["Day"] = "Tag";
+App::$strings["Today"] = "Heute";
+App::$strings["Event removed"] = "Termin gelöscht";
+App::$strings["Failed to remove event"] = "Termin konnte nicht gelöscht werden";
+App::$strings["Bookmark added"] = "Lesezeichen hinzugefügt";
+App::$strings["My Bookmarks"] = "Meine Lesezeichen";
+App::$strings["My Connections Bookmarks"] = "Lesezeichen meiner Kontakte";
 App::$strings["Item not found"] = "Element nicht gefunden";
-App::$strings["Title (optional)"] = "Titel (optional)";
-App::$strings["Edit Block"] = "Block bearbeiten";
-App::$strings["No channel."] = "Kein Kanal.";
-App::$strings["Common connections"] = "Gemeinsame Verbindungen";
-App::$strings["No connections in common."] = "Keine gemeinsamen Verbindungen.";
+App::$strings["Item is not editable"] = "Element kann nicht bearbeitet werden.";
+App::$strings["Edit post"] = "Bearbeite Beitrag";
+App::$strings["Photos"] = "Fotos";
+App::$strings["Cancel"] = "Abbrechen";
+App::$strings["Invalid item."] = "Ungültiges Element.";
+App::$strings["Channel not found."] = "Kanal nicht gefunden.";
+App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+App::$strings["Save to Folder:"] = "Speichern in Ordner:";
+App::$strings["- select -"] = "– auswählen –";
+App::$strings["Save"] = "Speichern";
 App::$strings["Blocked"] = "Blockiert";
 App::$strings["Ignored"] = "Ignoriert";
 App::$strings["Hidden"] = "Versteckt";
@@ -254,51 +317,38 @@ 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["Item is not editable"] = "Element kann nicht bearbeitet werden.";
-App::$strings["Edit post"] = "Bearbeite Beitrag";
-App::$strings["Calendar entries imported."] = "Kalendereinträge wurden importiert.";
-App::$strings["No calendar entries found."] = "Keine Kalendereinträge gefunden.";
-App::$strings["Event can not end before it has started."] = "Termin-Ende liegt vor dem Beginn.";
-App::$strings["Unable to generate preview."] = "Vorschau konnte nicht erzeugt werden.";
-App::$strings["Event title and start time are required."] = "Titel und Startzeit des Termins sind erforderlich.";
-App::$strings["Event not found."] = "Termin nicht gefunden.";
-App::$strings["event"] = "Termin";
-App::$strings["Edit event title"] = "Termintitel bearbeiten";
-App::$strings["Event title"] = "Termintitel";
-App::$strings["Required"] = "Benötigt";
-App::$strings["Categories (comma-separated list)"] = "Kategorien (Kommagetrennte Liste)";
-App::$strings["Edit Category"] = "Kategorie bearbeiten";
-App::$strings["Category"] = "Kategorie";
-App::$strings["Edit start date and time"] = "Startdatum und -zeit bearbeiten";
-App::$strings["Start date and time"] = "Startdatum und -zeit";
-App::$strings["Finish date and time are not known or not relevant"] = "Enddatum und -zeit sind unbekannt oder irrelevant";
-App::$strings["Edit finish date and time"] = "Enddatum und -zeit bearbeiten";
-App::$strings["Finish date and time"] = "Enddatum und -zeit";
-App::$strings["Adjust for viewer timezone"] = "An die Zeitzone des Betrachters anpassen";
-App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Wichtig für Veranstaltungen die an bestimmten Orten stattfinden. Nicht sinnvoll für globale Feiertage / Ferien.";
-App::$strings["Edit Description"] = "Beschreibung bearbeiten";
-App::$strings["Description"] = "Beschreibung";
-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";
-App::$strings["calendar"] = "Kalender";
-App::$strings["Event removed"] = "Termin gelöscht";
-App::$strings["Failed to remove event"] = "Termin konnte nicht gelöscht werden";
-App::$strings["Photos"] = "Fotos";
-App::$strings["Cancel"] = "Abbrechen";
+App::$strings["webpage"] = "Webseite";
+App::$strings["block"] = "Block";
+App::$strings["layout"] = "Layout";
+App::$strings["menu"] = "Menü";
+App::$strings["%s element installed"] = "Element für %s installiert";
+App::$strings["%s element installation failed"] = "Installation des Elements %s fehlgeschlagen";
+App::$strings["Permissions denied."] = "Berechtigung verweigert.";
+App::$strings["Import"] = "Import";
 App::$strings["This site is not a directory server"] = "Diese Webseite ist kein Verzeichnisserver";
 App::$strings["This directory server requires an access token"] = "Dieser Verzeichnisserver benötigt einen Zugriffstoken";
-App::$strings["Save to Folder:"] = "Speichern in Ordner:";
-App::$strings["- select -"] = "– auswählen –";
-App::$strings["Save"] = "Speichern";
+App::$strings["You must be logged in to see this page."] = "Du musst angemeldet sein, um diese Seite betrachten zu können.";
+App::$strings["Room not found"] = "Chatraum nicht gefunden";
+App::$strings["Leave Room"] = "Raum verlassen";
+App::$strings["Delete Room"] = "Raum löschen";
+App::$strings["I am away right now"] = "Ich bin gerade nicht da";
+App::$strings["I am online"] = "Ich bin online";
+App::$strings["Bookmark this room"] = "Lesezeichen für diesen Raum setzen";
+App::$strings["Please enter a link URL:"] = "Gib eine URL ein:";
+App::$strings["Encrypt text"] = "Text verschlüsseln";
+App::$strings["Insert web link"] = "Link einfügen";
+App::$strings["Feature disabled."] = "Funktion deaktiviert.";
+App::$strings["New Chatroom"] = "Neuer Chatraum";
+App::$strings["Chatroom name"] = "Chatraumname";
+App::$strings["Expiration of chats (minutes)"] = "Verfall von Chats (Minuten)";
+App::$strings["Permissions"] = "Berechtigungen";
+App::$strings["%1\$s's Chatrooms"] = "%1\$ss Chaträume";
+App::$strings["No chatrooms available"] = "Keine Chaträume verfügbar";
+App::$strings["Create New"] = "Neu anlegen";
+App::$strings["Expiration"] = "Verfall";
+App::$strings["min"] = "min";
 App::$strings["Invalid message"] = "Ungültige Beitrags-ID (mid)";
 App::$strings["no results"] = "keine Ergebnisse";
-App::$strings["Delivery report for %1\$s"] = "Zustellungsbericht für %1\$s";
 App::$strings["channel sync processed"] = "Kanal-Sync verarbeitet";
 App::$strings["queued"] = "zur Warteschlange hinzugefügt";
 App::$strings["posted"] = "zugestellt";
@@ -310,14 +360,14 @@ App::$strings["recipient not found"] = "Empfänger nicht gefunden.";
 App::$strings["mail recalled"] = "Mail widerrufen";
 App::$strings["duplicate mail received"] = "Doppelte Mail erhalten";
 App::$strings["mail delivered"] = "Mail zugestellt";
+App::$strings["Delivery report for %1\$s"] = "Zustellungsbericht für %1\$s";
+App::$strings["Options"] = "Optionen";
+App::$strings["Redeliver"] = "Erneut zustellen";
 App::$strings["Layout Name"] = "Layout-Name";
 App::$strings["Layout Description (Optional)"] = "Layout-Beschreibung (optional)";
 App::$strings["Edit Layout"] = "Layout bearbeiten";
 App::$strings["Page link"] = "Seiten-Link";
 App::$strings["Edit Webpage"] = "Webseite bearbeiten";
-App::$strings["Channel added."] = "Kanal hinzugefügt.";
-App::$strings["network"] = "Netzwerk";
-App::$strings["RSS"] = "RSS";
 App::$strings["Privacy group created."] = "Gruppe wurde erstellt.";
 App::$strings["Could not create privacy group."] = "Gruppe konnte nicht erstellt werden.";
 App::$strings["Privacy group not found."] = "Gruppe nicht gefunden.";
@@ -331,16 +381,33 @@ App::$strings["Privacy group editor"] = "Gruppeneditor";
 App::$strings["Members"] = "Mitglieder";
 App::$strings["All Connected Channels"] = "Alle verbundenen Kanäle";
 App::$strings["Click on a channel to add or remove."] = "Wähle einen Kanal zum hinzufügen oder entfernen aus.";
-App::$strings["Share content from Firefox to \$Projectname"] = "Inhalte von Firefox nach \$Projectname teilen";
-App::$strings["Activate the Firefox \$Projectname provider"] = "Aktiviert den \$Projectname-Provider für firefox";
-App::$strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren";
-App::$strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode in der Anwendung ein:";
-App::$strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen.";
-App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?";
+App::$strings["App installed."] = "App installiert.";
+App::$strings["Malformed app."] = "Fehlerhafte App.";
+App::$strings["Embed code"] = "Code einbetten";
+App::$strings["Edit App"] = "App bearbeiten";
+App::$strings["Create App"] = "App erstellen";
+App::$strings["Name of app"] = "Name der App";
+App::$strings["Location (URL) of app"] = "Ort (URL) der App";
+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";
 App::$strings["Documentation Search"] = "Suche in der Dokumentation";
 App::$strings["Help:"] = "Hilfe:";
 App::$strings["Help"] = "Hilfe";
 App::$strings["\$Projectname Documentation"] = "\$Projectname-Dokumentation";
+App::$strings["Item not available."] = "Element nicht verfügbar.";
+App::$strings["Layout updated."] = "Layout aktualisiert.";
+App::$strings["Edit System Page Description"] = "Systemseitenbeschreibung bearbeiten";
+App::$strings["Layout not found."] = "Layout nicht gefunden.";
+App::$strings["Module Name:"] = "Modulname:";
+App::$strings["Layout Help"] = "Layout-Hilfe";
+App::$strings["Share content from Firefox to \$Projectname"] = "Inhalte von Firefox nach \$Projectname teilen";
+App::$strings["Activate the Firefox \$Projectname provider"] = "Aktiviert den \$Projectname-Provider für firefox";
+App::$strings["network"] = "Netzwerk";
+App::$strings["RSS"] = "RSS";
 App::$strings["Permission Denied."] = "Zugriff verweigert.";
 App::$strings["File not found."] = "Datei nicht gefunden.";
 App::$strings["Edit file permissions"] = "Dateiberechtigungen bearbeiten";
@@ -352,70 +419,13 @@ App::$strings["Copy/paste this URL to link file from a web page"] = "Diese URL v
 App::$strings["Share this file"] = "Diese Datei freigeben";
 App::$strings["Show URL to this file"] = "URL zu dieser Datei anzeigen";
 App::$strings["Notify your contacts about this file"] = "Meine Kontakte über diese Datei benachrichtigen";
-App::$strings["Apps"] = "Apps";
-App::$strings["Item not available."] = "Element nicht verfügbar.";
-App::$strings["Your service plan only allows %d channels."] = "Dein Vertrag erlaubt nur %d Kanäle.";
-App::$strings["Nothing to import."] = "Nichts zu importieren.";
-App::$strings["Unable to download data from old server"] = "Daten können vom alten Server nicht heruntergeladen werden";
-App::$strings["Imported file is empty."] = "Die importierte Datei ist leer.";
-App::$strings["Warning: Database versions differ by %1\$d updates."] = "Achtung: Datenbankversionen unterscheiden sich um %1\$d Aktualisierungen.";
-App::$strings["Cloned channel not found. Import failed."] = "Geklonter Kanal nicht gefunden. Import fehlgeschlagen.";
-App::$strings["No channel. Import failed."] = "Kein Kanal. Import fehlgeschlagen.";
-App::$strings["Import completed."] = "Import abgeschlossen.";
-App::$strings["You must be logged in to use this feature."] = "Du musst angemeldet sein um diese Funktion zu nutzen.";
-App::$strings["Import Channel"] = "Kanal importieren";
-App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren.";
-App::$strings["File to Upload"] = "Hochzuladende Datei:";
-App::$strings["Or provide the old server/hub details"] = "Oder gib die Details Deines bisherigen \$Projectname-Hubs ein";
-App::$strings["Your old identity address (xyz@example.com)"] = "Bisherige Kanal-Adresse (xyz@example.com)";
-App::$strings["Your old login email address"] = "Deine alte Login-E-Mail-Adresse";
-App::$strings["Your old login password"] = "Dein altes Passwort";
-App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige \$Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein.";
-App::$strings["Make this hub my primary location"] = "Dieser $Pojectname-Hub ist mein primärer Hub.";
-App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importiere bestehende Beiträge falls möglich (experimentell - begrenzt durch zur Verfügung stehenden Speicher";
-App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen.";
-App::$strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
-App::$strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
-App::$strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
-App::$strings["Duplicate post suppressed."] = "Doppelter Beitrag unterdrückt.";
-App::$strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
-App::$strings["Unable to obtain post information from database."] = "Beitragsinformationen können nicht aus der Datenbank abgerufen werden.";
-App::$strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
-App::$strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
 App::$strings["Layouts"] = "Layouts";
 App::$strings["Comanche page description language help"] = "Hilfe zur Comanche-Seitenbeschreibungssprache";
 App::$strings["Layout Description"] = "Layout-Beschreibung";
+App::$strings["Created"] = "Erstellt";
+App::$strings["Edited"] = "Geändert";
+App::$strings["Share"] = "Teilen";
 App::$strings["Download PDL file"] = "PDL-Datei herunterladen";
-App::$strings["\$Projectname"] = "\$Projectname";
-App::$strings["Welcome to %s"] = "Willkommen auf %s";
-App::$strings["First Name"] = "Vorname";
-App::$strings["Last Name"] = "Nachname";
-App::$strings["Nickname"] = "Spitzname";
-App::$strings["Full Name"] = "Voller Name";
-App::$strings["Email"] = "E-Mail";
-App::$strings["Profile Photo"] = "Profilfoto";
-App::$strings["Profile Photo 16px"] = "Profilfoto 16 px";
-App::$strings["Profile Photo 32px"] = "Profilfoto 32 px";
-App::$strings["Profile Photo 48px"] = "Profilfoto 48 px";
-App::$strings["Profile Photo 64px"] = "Profilfoto 64 px";
-App::$strings["Profile Photo 80px"] = "Profilfoto 80 px";
-App::$strings["Profile Photo 128px"] = "Profilfoto 128 px";
-App::$strings["Timezone"] = "Zeitzone";
-App::$strings["Homepage URL"] = "Homepage-URL";
-App::$strings["Language"] = "Sprache";
-App::$strings["Birth Year"] = "Geburtsjahr";
-App::$strings["Birth Month"] = "Geburtsmonat";
-App::$strings["Birth Day"] = "Geburtstag";
-App::$strings["Birthdate"] = "Geburtsdatum";
-App::$strings["Gender"] = "Geschlecht";
-App::$strings["Male"] = "Männlich";
-App::$strings["Female"] = "Weiblich";
-App::$strings["webpage"] = "Webseite";
-App::$strings["block"] = "Block";
-App::$strings["layout"] = "Layout";
-App::$strings["menu"] = "Menü";
-App::$strings["%s element installed"] = "Element für %s installiert";
-App::$strings["%s element installation failed"] = "Installation des Elements %s fehlgeschlagen";
 App::$strings["Like/Dislike"] = "Mögen/Nicht mögen";
 App::$strings["This action is restricted to members."] = "Diese Aktion kann nur von Mitgliedern ausgeführt werden.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Um fortzufahren <a href=\"rmagic\">melde Dich bitte mit Deiner \$Projectname-ID an</a> oder <a href=\"register\">registriere Dich als neues \$Projectname-Mitglied</a>.";
@@ -436,175 +446,103 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %
 App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt vielleicht an %2\$ss %3\$s teil";
 App::$strings["Action completed."] = "Aktion durchgeführt.";
 App::$strings["Thank you."] = "Vielen Dank.";
-App::$strings["Import completed"] = "Import abgeschlossen";
-App::$strings["Import Items"] = "Beiträge importieren";
-App::$strings["Use this form to import existing posts and content from an export file."] = "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren.";
-App::$strings["Total invitation limit exceeded."] = "Einladungslimit überschritten.";
-App::$strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse.";
-App::$strings["Please join us on \$Projectname"] = "Schließe Dich uns auf \$Projectname an!";
-App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines \$Projectname-Servers.";
-App::$strings["%s : Message delivery failed."] = "%s : Nachricht konnte nicht zugestellt werden.";
-App::$strings["%d message sent."] = array(
-	0 => "%d Nachricht gesendet.",
-	1 => "%d Nachrichten gesendet.",
-);
-App::$strings["You have no more invitations available"] = "Du hast keine weiteren verfügbare Einladungen";
-App::$strings["Send invitations"] = "Einladungen senden";
-App::$strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
-App::$strings["Your message:"] = "Deine Nachricht:";
-App::$strings["Please join my community on \$Projectname."] = "Schließe Dich uns auf \$Projectname an!";
-App::$strings["You will need to supply this invitation code:"] = "Bitte verwende bei der Registrierung den folgenden Einladungscode:";
-App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registriere Dich auf einem beliebigen \$Projectname-Hub (sie sind alle miteinander verbunden)";
-App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Gib meine \$Projectname-Adresse im Suchfeld ein.";
-App::$strings["or visit"] = "oder besuche";
-App::$strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]";
-App::$strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar.";
-App::$strings["Visible to:"] = "Sichtbar für:";
-App::$strings["Location not found."] = "Klon nicht gefunden.";
-App::$strings["Location lookup failed."] = "Nachschlagen des Kanal-Ortes fehlgeschlagen";
-App::$strings["Please select another location to become primary before removing the primary location."] = "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst.";
-App::$strings["Syncing locations"] = "Synchronisiere Klone";
-App::$strings["No locations found."] = "Keine Klon-Adressen gefunden.";
-App::$strings["Manage Channel Locations"] = "Klon-Adressen verwalten";
+App::$strings["Profile not found."] = "Profil nicht gefunden.";
+App::$strings["Profile deleted."] = "Profil gelöscht.";
+App::$strings["Profile-"] = "Profil-";
+App::$strings["New profile created."] = "Neues Profil erstellt.";
+App::$strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden.";
+App::$strings["Profile unavailable to export."] = "Dieses Profil kann nicht exportiert werden.";
+App::$strings["Profile Name is required."] = "Profil-Name erforderlich.";
+App::$strings["Marital Status"] = "Familienstand";
+App::$strings["Romantic Partner"] = "Romantische Partner";
+App::$strings["Likes"] = "Gefällt";
+App::$strings["Dislikes"] = "Gefällt nicht";
+App::$strings["Work/Employment"] = "Arbeit/Anstellung";
+App::$strings["Religion"] = "Religion";
+App::$strings["Political Views"] = "Politische Ansichten";
+App::$strings["Sexual Preference"] = "Sexuelle Orientierung";
+App::$strings["Homepage"] = "Webseite";
+App::$strings["Interests"] = "Hobbys/Interessen";
 App::$strings["Address"] = "Adresse";
-App::$strings["Primary"] = "Primär";
-App::$strings["Drop"] = "Löschen";
-App::$strings["Sync Now"] = "Jetzt synchronisieren";
-App::$strings["Please wait several minutes between consecutive operations."] = "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!";
-App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst.";
-App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt.";
-App::$strings["Hub not found."] = "Server nicht gefunden.";
-App::$strings["Unable to lookup recipient."] = "Konnte den Empfänger nicht finden.";
-App::$strings["Unable to communicate with requested channel."] = "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen.";
-App::$strings["Cannot verify requested channel."] = "Verifizierung des angeforderten Kanals fehlgeschlagen.";
-App::$strings["Selected channel has private message restrictions. Send failed."] = "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen.";
-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";
-App::$strings["Message has been recalled."] = "Die Nachricht wurde widerrufen.";
-App::$strings["Delete Conversation"] = "Unterhaltung löschen";
-App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten.";
-App::$strings["Send Reply"] = "Antwort senden";
-App::$strings["Your message for %s (%s):"] = "Deine Nachricht für %s (%s):";
-App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet.";
-App::$strings["Create a new channel"] = "Neuen Kanal anlegen";
-App::$strings["Channel Manager"] = "Kanal-Manager";
-App::$strings["Current Channel"] = "Aktueller Kanal";
-App::$strings["Switch to one of your channels by selecting it."] = "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst.";
-App::$strings["Default Channel"] = "Standard Kanal";
-App::$strings["Make Default"] = "Zum Standard machen";
-App::$strings["%d new messages"] = "%d neue Nachrichten";
-App::$strings["%d new introductions"] = "%d neue Vorstellungen";
-App::$strings["Delegated Channel"] = "Delegierte Kanäle";
-App::$strings["No valid account found."] = "Kein gültiges Konto gefunden.";
-App::$strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails.";
-App::$strings["Site Member (%s)"] = "Nutzer (%s)";
-App::$strings["Password reset requested at %s"] = "Passwort-Rücksetzung auf %s angefordert";
-App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen.";
-App::$strings["Password Reset"] = "Zurücksetzen des Kennworts";
-App::$strings["Your password has been reset as requested."] = "Dein Passwort wurde wie angefordert neu erstellt.";
-App::$strings["Your new password is"] = "Dein neues Passwort lautet";
-App::$strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort – und dann";
-App::$strings["click here to login"] = "Klicke hier, um dich anzumelden";
-App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden.";
-App::$strings["Your password has changed at %s"] = "Auf %s wurde Dein Passwort geändert";
-App::$strings["Forgot your Password?"] = "Kennwort vergessen?";
-App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail.";
-App::$strings["Email Address"] = "E-Mail Adresse";
-App::$strings["Reset"] = "Zurücksetzen";
-App::$strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
-App::$strings["Unable to create menu."] = "Kann Menü nicht erstellen.";
-App::$strings["Menu Name"] = "Name des Menüs";
-App::$strings["Unique name (not visible on webpage) - required"] = "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich";
-App::$strings["Menu Title"] = "Menütitel";
-App::$strings["Visible on webpage - leave empty for no title"] = "Sichtbar auf der Webseite – für keinen Titel leer lassen";
-App::$strings["Allow Bookmarks"] = "Lesezeichen erlauben";
-App::$strings["Menu may be used to store saved bookmarks"] = "Im Menü können gespeicherte Lesezeichen abgelegt werden";
-App::$strings["Submit and proceed"] = "Absenden und fortfahren";
-App::$strings["Menus"] = "Menüs";
-App::$strings["Bookmarks allowed"] = "Lesezeichen erlaubt";
-App::$strings["Delete this menu"] = "Lösche dieses Menü";
-App::$strings["Edit menu contents"] = "Bearbeite Menü Inhalte";
-App::$strings["Edit this menu"] = "Dieses Menü bearbeiten";
-App::$strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden.";
-App::$strings["Menu not found."] = "Menü nicht gefunden";
-App::$strings["Edit Menu"] = "Menü bearbeiten";
-App::$strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen";
-App::$strings["Menu name"] = "Menü Name";
-App::$strings["Must be unique, only seen by you"] = "Muss eindeutig sein, ist aber nur für Dich sichtbar";
-App::$strings["Menu title"] = "Menü Titel";
-App::$strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird";
-App::$strings["Allow bookmarks"] = "Erlaube Lesezeichen";
-App::$strings["Not found."] = "Nicht gefunden.";
-App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s ist %2\$s";
-App::$strings["Mood"] = "Laune";
-App::$strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden";
-App::$strings["Profile Match"] = "Profil-Übereinstimmungen";
-App::$strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu.";
-App::$strings["is interested in:"] = "interessiert sich für:";
-App::$strings["No matches"] = "Keine Übereinstimmungen";
-App::$strings["No such group"] = "Gruppe nicht gefunden";
-App::$strings["No such channel"] = "Kanal nicht gefunden";
-App::$strings["forum"] = "Forum";
-App::$strings["Search Results For:"] = "Suchergebnisse für:";
-App::$strings["Privacy group is empty"] = "Gruppe ist leer";
-App::$strings["Privacy group: "] = "Gruppe:";
-App::$strings["Invalid connection."] = "Ungültige Verbindung.";
-App::$strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr.";
-App::$strings["System Notifications"] = "System-Benachrichtigungen";
-App::$strings["Unable to create element."] = "Element konnte nicht erstellt werden.";
-App::$strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
-App::$strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen.";
-App::$strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
-App::$strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
-App::$strings["Link Name"] = "Name des Links";
-App::$strings["Link or Submenu Target"] = "Ziel des Links oder Untermenüs";
-App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen.";
-App::$strings["Use magic-auth if available"] = "Magic-Auth verwenden, falls verfügbar";
-App::$strings["Open link in new window"] = "Öffne Link in neuem Fenster";
-App::$strings["Order in list"] = "Reihenfolge in der Liste";
-App::$strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert";
-App::$strings["Submit and finish"] = "Absenden und fertigstellen";
-App::$strings["Submit and continue"] = "Absenden und fortfahren";
-App::$strings["Menu:"] = "Menü:";
-App::$strings["Link Target"] = "Ziel des Links";
-App::$strings["Edit menu"] = "Menü bearbeiten";
-App::$strings["Edit element"] = "Bestandteil bearbeiten";
-App::$strings["Drop element"] = "Bestandteil löschen";
-App::$strings["New element"] = "Neues Bestandteil";
-App::$strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten";
-App::$strings["Add menu element"] = "Menüelement hinzufügen";
-App::$strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
-App::$strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
-App::$strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
-App::$strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
-App::$strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
-App::$strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
-App::$strings["Link text"] = "Link Text";
-App::$strings["Name or caption"] = "Name oder Titel";
-App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ ";
-App::$strings["Choose a short nickname"] = "Wähle einen kurzen Spitznamen";
-App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst, z.B. nickname%s";
-App::$strings["Channel role and privacy"] = "Kanaltyp und Privatspäre-Einstellungen";
-App::$strings["Select a channel role with your privacy requirements."] = "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre.";
-App::$strings["Read more about roles"] = "Mehr Informationen über Rollen";
-App::$strings["Create Channel"] = "Einen neuen Kanal anlegen";
-App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen.";
-App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server.";
-App::$strings["Invalid request identifier."] = "Ungültiger Anfrage-Identifikator.";
-App::$strings["Discard"] = "Verwerfen";
-App::$strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gesehen";
+App::$strings["Profile updated."] = "Profil aktualisiert.";
+App::$strings["Hide your connections list from viewers of this profile"] = "Deine Verbindungen vor Betrachtern dieses Profils verbergen";
+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";
+App::$strings["Clone this profile"] = "Dieses Profil klonen";
+App::$strings["Delete this profile"] = "Dieses Profil löschen";
+App::$strings["Add profile things"] = "Sachen zum Profil hinzufügen";
+App::$strings["Personal"] = "Persönlich";
+App::$strings["Relation"] = "Beziehung";
+App::$strings["Miscellaneous"] = "Verschiedenes";
+App::$strings["Import profile from file"] = "Profil aus einer Datei importieren";
+App::$strings["Export profile to file"] = "Profil in eine Datei exportieren";
+App::$strings["Your gender"] = "Dein Geschlecht";
+App::$strings["Marital status"] = "Familienstand";
+App::$strings["Sexual preference"] = "Sexuelle Orientierung";
+App::$strings["Profile name"] = "Profilname";
+App::$strings["This is your default profile."] = "Das ist Dein Standardprofil.";
+App::$strings["Your full name"] = "Dein voller Name";
+App::$strings["Title/Description"] = "Titel/Beschreibung";
+App::$strings["Street address"] = "Straße und Hausnummer";
+App::$strings["Locality/City"] = "Wohnort";
+App::$strings["Region/State"] = "Region/Bundesstaat";
+App::$strings["Postal/Zip code"] = "Postleitzahl";
+App::$strings["Country"] = "Land";
+App::$strings["Who (if applicable)"] = "Wer (falls anwendbar)";
+App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
+App::$strings["Since (date)"] = "Seit (Datum)";
+App::$strings["Tell us about yourself"] = "Erzähle uns ein wenig von Dir";
+App::$strings["Hometown"] = "Heimatort";
+App::$strings["Political views"] = "Politische Ansichten";
+App::$strings["Religious views"] = "Religiöse Ansichten";
+App::$strings["Keywords used in directory listings"] = "Schlüsselwörter, die in Verzeichnis-Auflistungen verwendet werden";
+App::$strings["Example: fishing photography software"] = "Beispiel: Angeln Fotografie Software";
+App::$strings["Musical interests"] = "Musikalische Interessen";
+App::$strings["Books, literature"] = "Bücher, Literatur";
+App::$strings["Television"] = "Fernsehen";
+App::$strings["Film/Dance/Culture/Entertainment"] = "Film/Tanz/Kultur/Unterhaltung";
+App::$strings["Hobbies/Interests"] = "Hobbys/Interessen";
+App::$strings["Love/Romance"] = "Liebe/Romantik";
+App::$strings["School/Education"] = "Schule/Ausbildung";
+App::$strings["Contact information and social networks"] = "Kontaktinformation und soziale Netzwerke";
+App::$strings["My other channels"] = "Meine anderen Kanäle";
+App::$strings["Profile Image"] = "Profilfoto:";
+App::$strings["Edit Profiles"] = "Profile bearbeiten";
+App::$strings["Your service plan only allows %d channels."] = "Dein Vertrag erlaubt nur %d Kanäle.";
+App::$strings["Nothing to import."] = "Nichts zu importieren.";
+App::$strings["Unable to download data from old server"] = "Daten können vom alten Server nicht heruntergeladen werden";
+App::$strings["Imported file is empty."] = "Die importierte Datei ist leer.";
+App::$strings["Warning: Database versions differ by %1\$d updates."] = "Achtung: Datenbankversionen unterscheiden sich um %1\$d Aktualisierungen.";
+App::$strings["Cloned channel not found. Import failed."] = "Geklonter Kanal nicht gefunden. Import fehlgeschlagen.";
+App::$strings["No channel. Import failed."] = "Kein Kanal. Import fehlgeschlagen.";
+App::$strings["Import completed."] = "Import abgeschlossen.";
+App::$strings["You must be logged in to use this feature."] = "Du musst angemeldet sein um diese Funktion zu nutzen.";
+App::$strings["Import Channel"] = "Kanal importieren";
+App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Verwende dieses Formular, um einen existierenden Kanal von einem anderen Hub zu importieren. Du kannst den Kanal direkt vom bisherigen Hub über das Netzwerk  oder aus einer exportierten Sicherheitskopie importieren.";
+App::$strings["File to Upload"] = "Hochzuladende Datei:";
+App::$strings["Or provide the old server/hub details"] = "Oder gib die Details Deines bisherigen \$Projectname-Hubs ein";
+App::$strings["Your old identity address (xyz@example.com)"] = "Bisherige Kanal-Adresse (xyz@example.com)";
+App::$strings["Your old login email address"] = "Deine alte Login-E-Mail-Adresse";
+App::$strings["Your old login password"] = "Dein altes Passwort";
+App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Egal, welche Option Du wählst – bitte lege fest, ob dieser Server die neue primäre Adresse dieses Kanals sein soll, oder ob der bisherige \$Projectname-Hub diese Rolle weiterhin wahrnimmt. Du kannst von beiden Servern aus posten, aber nur einer kann der primäre Ort Deiner Dateien, Fotos und Medien sein.";
+App::$strings["Make this hub my primary location"] = "Dieser $Pojectname-Hub ist mein primärer Hub.";
+App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importiere bestehende Beiträge falls möglich (experimentell - begrenzt durch zur Verfügung stehenden Speicher";
+App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dieser Vorgang kann einige Minuten dauern. Bitte sende das Formular nur einmal ab und lasse diese Seite bis zur Fertigstellung offen.";
+App::$strings["\$Projectname"] = "\$Projectname";
+App::$strings["Welcome to %s"] = "Willkommen auf %s";
+App::$strings["Unable to locate original post."] = "Originalbeitrag nicht gefunden.";
+App::$strings["Empty post discarded."] = "Leeren Beitrag verworfen.";
+App::$strings["Executable content type not permitted to this channel."] = "Ausführbarer Content-Typ ist für diesen Kanal nicht freigegeben.";
+App::$strings["Duplicate post suppressed."] = "Doppelter Beitrag unterdrückt.";
+App::$strings["System error. Post not saved."] = "Systemfehler. Beitrag nicht gespeichert.";
+App::$strings["Unable to obtain post information from database."] = "Beitragsinformationen können nicht aus der Datenbank abgerufen werden.";
+App::$strings["You have reached your limit of %1$.0f top level posts."] = "Du hast die maximale Anzahl von %1$.0f Beiträgen erreicht.";
+App::$strings["You have reached your limit of %1$.0f webpages."] = "Du hast die maximale Anzahl von %1$.0f Webseiten erreicht.";
 App::$strings["Page owner information could not be retrieved."] = "Informationen über den Besitzer der Seite konnten nicht gefunden werden.";
 App::$strings["Profile Photos"] = "Profilfotos";
 App::$strings["Album not found."] = "Album nicht gefunden.";
@@ -673,122 +611,164 @@ App::$strings["__ctx:noun__ Dislikes"] = "Gefällt nicht";
 App::$strings["Close"] = "Schließen";
 App::$strings["View Album"] = "Album ansehen";
 App::$strings["Recent Photos"] = "Neueste Fotos";
-App::$strings["sent you a private message"] = "hat Dir eine private Nachricht geschickt";
-App::$strings["added your channel"] = "hat deinen Kanal hinzugefügt";
-App::$strings["g A l F d"] = "l, d. F, G:i \\U\\h\\r";
-App::$strings["[today]"] = "[Heute]";
-App::$strings["posted an event"] = "hat einen Termin veröffentlicht";
-App::$strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden.";
-App::$strings["Post successful."] = "Veröffentlichung erfolgreich.";
-App::$strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
-App::$strings["Login failed."] = "Login fehlgeschlagen.";
-App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-App::$strings["This setting requires special processing and editing has been blocked."] = "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert.";
-App::$strings["Configuration Editor"] = "Konfigurationseditor";
-App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird.";
-App::$strings["Layout updated."] = "Layout aktualisiert.";
-App::$strings["Edit System Page Description"] = "Systemseitenbeschreibung bearbeiten";
-App::$strings["Layout not found."] = "Layout nicht gefunden.";
-App::$strings["Module Name:"] = "Modulname:";
-App::$strings["Layout Help"] = "Layout-Hilfe";
-App::$strings["Poke"] = "Anstupsen";
-App::$strings["Poke somebody"] = "Jemanden anstupsen";
-App::$strings["Poke/Prod"] = "Anstupsen/Knuffen";
-App::$strings["Poke, prod or do other things to somebody"] = "Jemanden anstupsen, knuffen oder sonstiges";
-App::$strings["Recipient"] = "Empfänger";
-App::$strings["Choose what you wish to do to recipient"] = "Wähle, was Du mit dem/r Empfänger/in tun willst";
-App::$strings["Make this post private"] = "Diesen Beitrag privat machen";
-App::$strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s";
-App::$strings["Profile not found."] = "Profil nicht gefunden.";
-App::$strings["Profile deleted."] = "Profil gelöscht.";
-App::$strings["Profile-"] = "Profil-";
-App::$strings["New profile created."] = "Neues Profil erstellt.";
-App::$strings["Profile unavailable to clone."] = "Profil kann nicht geklont werden.";
-App::$strings["Profile unavailable to export."] = "Dieses Profil kann nicht exportiert werden.";
-App::$strings["Profile Name is required."] = "Profil-Name erforderlich.";
-App::$strings["Marital Status"] = "Familienstand";
-App::$strings["Romantic Partner"] = "Romantische Partner";
-App::$strings["Likes"] = "Gefällt";
-App::$strings["Dislikes"] = "Gefällt nicht";
-App::$strings["Work/Employment"] = "Arbeit/Anstellung";
-App::$strings["Religion"] = "Religion";
-App::$strings["Political Views"] = "Politische Ansichten";
-App::$strings["Sexual Preference"] = "Sexuelle Orientierung";
-App::$strings["Homepage"] = "Webseite";
-App::$strings["Interests"] = "Hobbys/Interessen";
-App::$strings["Profile updated."] = "Profil aktualisiert.";
-App::$strings["Hide your connections list from viewers of this profile"] = "Deine Verbindungen vor Betrachtern dieses Profils verbergen";
-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";
-App::$strings["Clone this profile"] = "Dieses Profil klonen";
-App::$strings["Delete this profile"] = "Dieses Profil löschen";
-App::$strings["Add profile things"] = "Sachen zum Profil hinzufügen";
-App::$strings["Personal"] = "Persönlich";
-App::$strings["Relation"] = "Beziehung";
-App::$strings["Miscellaneous"] = "Verschiedenes";
-App::$strings["Import profile from file"] = "Profil aus einer Datei importieren";
-App::$strings["Export profile to file"] = "Profil in eine Datei exportieren";
-App::$strings["Your gender"] = "Dein Geschlecht";
-App::$strings["Marital status"] = "Familienstand";
-App::$strings["Sexual preference"] = "Sexuelle Orientierung";
-App::$strings["Profile name"] = "Profilname";
-App::$strings["This is your default profile."] = "Das ist Dein Standardprofil.";
-App::$strings["Your full name"] = "Dein voller Name";
-App::$strings["Title/Description"] = "Titel/Beschreibung";
-App::$strings["Street address"] = "Straße und Hausnummer";
-App::$strings["Locality/City"] = "Wohnort";
-App::$strings["Region/State"] = "Region/Bundesstaat";
-App::$strings["Postal/Zip code"] = "Postleitzahl";
-App::$strings["Country"] = "Land";
-App::$strings["Who (if applicable)"] = "Wer (falls anwendbar)";
-App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiele: cathy123, Cathy Williams, cathy@example.com";
-App::$strings["Since (date)"] = "Seit (Datum)";
-App::$strings["Tell us about yourself"] = "Erzähle uns ein wenig von Dir";
-App::$strings["Hometown"] = "Heimatort";
-App::$strings["Political views"] = "Politische Ansichten";
-App::$strings["Religious views"] = "Religiöse Ansichten";
-App::$strings["Keywords used in directory listings"] = "Schlüsselwörter, die in Verzeichnis-Auflistungen verwendet werden";
-App::$strings["Example: fishing photography software"] = "Beispiel: Angeln Fotografie Software";
-App::$strings["Musical interests"] = "Musikalische Interessen";
-App::$strings["Books, literature"] = "Bücher, Literatur";
-App::$strings["Television"] = "Fernsehen";
-App::$strings["Film/Dance/Culture/Entertainment"] = "Film/Tanz/Kultur/Unterhaltung";
-App::$strings["Hobbies/Interests"] = "Hobbys/Interessen";
-App::$strings["Love/Romance"] = "Liebe/Romantik";
-App::$strings["School/Education"] = "Schule/Ausbildung";
-App::$strings["Contact information and social networks"] = "Kontaktinformation und soziale Netzwerke";
-App::$strings["My other channels"] = "Meine anderen Kanäle";
-App::$strings["Profile Image"] = "Profilfoto:";
-App::$strings["Edit Profiles"] = "Profile bearbeiten";
-App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird.";
-App::$strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch";
-App::$strings["Invalid profile identifier."] = "Ungültiger Profil-Identifikator";
-App::$strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits-Editor";
-App::$strings["Profile"] = "Profil";
-App::$strings["Click on a contact to add or remove."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen.";
-App::$strings["Visible To"] = "Sichtbar für";
-App::$strings["Public Hubs"] = "Öffentliche Hubs";
-App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung im \$Projectname Netzwerk. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen Seiten und Kanälen auf anderen Hubs ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den Seiten der einzelnen Hubs <strong>könnten</strong> jeweils nähere Informationen dazu stehen.";
-App::$strings["Hub URL"] = "Hub-URL";
-App::$strings["Access Type"] = "Zugriffstyp";
-App::$strings["Registration Policy"] = "Registrierungsrichtlinien";
-App::$strings["Stats"] = "Statistiken";
-App::$strings["Software"] = "Software";
-App::$strings["Ratings"] = "Bewertungen";
-App::$strings["Rate"] = "Bewerten";
-App::$strings["Website:"] = "Webseite:";
-App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Kanal [%s] (auf diesem Server noch unbekannt)";
-App::$strings["Rating (this information is public)"] = "Bewertung (öffentlich sichtbar)";
-App::$strings["Optionally explain your rating (this information is public)"] = "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)";
-App::$strings["No ratings"] = "Keine Bewertungen";
-App::$strings["Rating: "] = "Bewertung: ";
-App::$strings["Website: "] = "Webseite: ";
-App::$strings["Description: "] = "Beschreibung: ";
+App::$strings["Remote privacy information not available."] = "Privatsphäre-Einstellungen anderer Nutzer sind nicht verfügbar.";
+App::$strings["Visible to:"] = "Sichtbar für:";
+App::$strings["Import completed"] = "Import abgeschlossen";
+App::$strings["Import Items"] = "Beiträge importieren";
+App::$strings["Use this form to import existing posts and content from an export file."] = "Mit diesem Formular kannst Du existierende Beiträge und Inhalte aus einer Sicherungsdatei importieren.";
+App::$strings["Total invitation limit exceeded."] = "Einladungslimit überschritten.";
+App::$strings["%s : Not a valid email address."] = "%s : Keine gültige Email Adresse.";
+App::$strings["Please join us on \$Projectname"] = "Schließe Dich uns auf \$Projectname an!";
+App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Einladungslimit überschritten. Bitte kontaktiere den Administrator Deines \$Projectname-Servers.";
+App::$strings["%s : Message delivery failed."] = "%s : Nachricht konnte nicht zugestellt werden.";
+App::$strings["%d message sent."] = array(
+	0 => "%d Nachricht gesendet.",
+	1 => "%d Nachrichten gesendet.",
+);
+App::$strings["You have no more invitations available"] = "Du hast keine weiteren verfügbare Einladungen";
+App::$strings["Send invitations"] = "Einladungen senden";
+App::$strings["Enter email addresses, one per line:"] = "Email-Adressen eintragen, eine pro Zeile:";
+App::$strings["Your message:"] = "Deine Nachricht:";
+App::$strings["Please join my community on \$Projectname."] = "Schließe Dich uns auf \$Projectname an!";
+App::$strings["You will need to supply this invitation code:"] = "Bitte verwende bei der Registrierung den folgenden Einladungscode:";
+App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registriere Dich auf einem beliebigen \$Projectname-Hub (sie sind alle miteinander verbunden)";
+App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Gib meine \$Projectname-Adresse im Suchfeld ein.";
+App::$strings["or visit"] = "oder besuche";
+App::$strings["3. Click [Connect]"] = "3. Klicke auf [Verbinden]";
+App::$strings["Location not found."] = "Klon nicht gefunden.";
+App::$strings["Location lookup failed."] = "Nachschlagen des Kanal-Ortes fehlgeschlagen";
+App::$strings["Please select another location to become primary before removing the primary location."] = "Bitte mache einen anderen Kanal-Ort zum primären Ort, bevor Du den primären Ort löschst.";
+App::$strings["Syncing locations"] = "Synchronisiere Klone";
+App::$strings["No locations found."] = "Keine Klon-Adressen gefunden.";
+App::$strings["Manage Channel Locations"] = "Klon-Adressen verwalten";
+App::$strings["Primary"] = "Primär";
+App::$strings["Drop"] = "Löschen";
+App::$strings["Sync Now"] = "Jetzt synchronisieren";
+App::$strings["Please wait several minutes between consecutive operations."] = "Bitte warte mehrere Minuten zwischen dem Ausführen zweier Operationen!";
+App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wenn möglich, lösche einen Klon, indem Du Dich auf dem jeweiligen Hub einloggst und den Kanal dort löschst.";
+App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Benutze dieses Formular zum Löschen eines Klons, wenn es den Hub nicht mehr gibt.";
+App::$strings["Hub not found."] = "Server nicht gefunden.";
+App::$strings["Unable to lookup recipient."] = "Konnte den Empfänger nicht finden.";
+App::$strings["Unable to communicate with requested channel."] = "Die Kommunikation mit dem ausgewählten Kanal ist fehlgeschlagen.";
+App::$strings["Cannot verify requested channel."] = "Verifizierung des angeforderten Kanals fehlgeschlagen.";
+App::$strings["Selected channel has private message restrictions. Send failed."] = "Der ausgewählte Kanal hat Einschränkungen bzgl. privater Nachrichten. Senden fehlgeschlagen.";
+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";
+App::$strings["Message has been recalled."] = "Die Nachricht wurde widerrufen.";
+App::$strings["Delete Conversation"] = "Unterhaltung löschen";
+App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Keine sichere Kommunikation verfügbar. <strong>Eventuell</strong> kannst Du auf der Profilseite des Absenders antworten.";
+App::$strings["Send Reply"] = "Antwort senden";
+App::$strings["Your message for %s (%s):"] = "Deine Nachricht für %s (%s):";
+App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Du hast %1$.0f von maximal %2$.0f erlaubten Kanälen eingerichtet.";
+App::$strings["Create a new channel"] = "Neuen Kanal anlegen";
+App::$strings["Channel Manager"] = "Kanal-Manager";
+App::$strings["Current Channel"] = "Aktueller Kanal";
+App::$strings["Switch to one of your channels by selecting it."] = "Wechsle zu einem Deiner Kanäle, indem Du auf ihn klickst.";
+App::$strings["Default Channel"] = "Standard Kanal";
+App::$strings["Make Default"] = "Zum Standard machen";
+App::$strings["%d new messages"] = "%d neue Nachrichten";
+App::$strings["%d new introductions"] = "%d neue Vorstellungen";
+App::$strings["Delegated Channel"] = "Delegierte Kanäle";
+App::$strings["Unable to update menu."] = "Kann Menü nicht aktualisieren.";
+App::$strings["Unable to create menu."] = "Kann Menü nicht erstellen.";
+App::$strings["Menu Name"] = "Name des Menüs";
+App::$strings["Unique name (not visible on webpage) - required"] = "Eindeutiger Name (nicht sichtbar auf der Webseite) – erforderlich";
+App::$strings["Menu Title"] = "Menütitel";
+App::$strings["Visible on webpage - leave empty for no title"] = "Sichtbar auf der Webseite – für keinen Titel leer lassen";
+App::$strings["Allow Bookmarks"] = "Lesezeichen erlauben";
+App::$strings["Menu may be used to store saved bookmarks"] = "Im Menü können gespeicherte Lesezeichen abgelegt werden";
+App::$strings["Submit and proceed"] = "Absenden und fortfahren";
+App::$strings["Menus"] = "Menüs";
+App::$strings["Bookmarks allowed"] = "Lesezeichen erlaubt";
+App::$strings["Delete this menu"] = "Lösche dieses Menü";
+App::$strings["Edit menu contents"] = "Bearbeite Menü Inhalte";
+App::$strings["Edit this menu"] = "Dieses Menü bearbeiten";
+App::$strings["Menu could not be deleted."] = "Menü konnte nicht gelöscht werden.";
+App::$strings["Menu not found."] = "Menü nicht gefunden";
+App::$strings["Edit Menu"] = "Menü bearbeiten";
+App::$strings["Add or remove entries to this menu"] = "Einträge zu diesem Menü hinzufügen oder entfernen";
+App::$strings["Menu name"] = "Menü Name";
+App::$strings["Must be unique, only seen by you"] = "Muss eindeutig sein, ist aber nur für Dich sichtbar";
+App::$strings["Menu title"] = "Menü Titel";
+App::$strings["Menu title as seen by others"] = "Menü Titel wie er von anderen gesehen wird";
+App::$strings["Allow bookmarks"] = "Erlaube Lesezeichen";
+App::$strings["Not found."] = "Nicht gefunden.";
+App::$strings["No valid account found."] = "Kein gültiges Konto gefunden.";
+App::$strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Schau in Deine E-Mails.";
+App::$strings["Site Member (%s)"] = "Nutzer (%s)";
+App::$strings["Password reset requested at %s"] = "Passwort-Rücksetzung auf %s angefordert";
+App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Die Anfrage konnte nicht verifiziert werden. (Vielleicht hast Du schon einmal auf den Link in der E-Mail geklickt?) Passwort-Rücksetzung fehlgeschlagen.";
+App::$strings["Password Reset"] = "Zurücksetzen des Kennworts";
+App::$strings["Your password has been reset as requested."] = "Dein Passwort wurde wie angefordert neu erstellt.";
+App::$strings["Your new password is"] = "Dein neues Passwort lautet";
+App::$strings["Save or copy your new password - and then"] = "Speichere oder kopiere Dein neues Passwort – und dann";
+App::$strings["click here to login"] = "Klicke hier, um dich anzumelden";
+App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Dein Passwort kann unter <em>Einstellungen</em> nach einer erfolgreichen Anmeldung geändert werden.";
+App::$strings["Your password has changed at %s"] = "Auf %s wurde Dein Passwort geändert";
+App::$strings["Forgot your Password?"] = "Kennwort vergessen?";
+App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse ein, um Dein Passwort zurücksetzen zu lassen. Du erhältst dann weitere Anweisungen per E-Mail.";
+App::$strings["Email Address"] = "E-Mail Adresse";
+App::$strings["Reset"] = "Zurücksetzen";
+App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s ist %2\$s";
+App::$strings["Mood"] = "Laune";
+App::$strings["Set your current mood and tell your friends"] = "Wähle Deine aktuelle Stimmung und teile sie mit Deinen Freunden";
+App::$strings["No such group"] = "Gruppe nicht gefunden";
+App::$strings["No such channel"] = "Kanal nicht gefunden";
+App::$strings["forum"] = "Forum";
+App::$strings["Search Results For:"] = "Suchergebnisse für:";
+App::$strings["Privacy group is empty"] = "Gruppe ist leer";
+App::$strings["Privacy group: "] = "Gruppe:";
+App::$strings["Invalid connection."] = "Ungültige Verbindung.";
+App::$strings["No more system notifications."] = "Keine System-Benachrichtigungen mehr.";
+App::$strings["System Notifications"] = "System-Benachrichtigungen";
+App::$strings["Profile Match"] = "Profil-Übereinstimmungen";
+App::$strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter für den Abgleich gefunden. Bitte füge Schlüsselwörter zu Deinem Standardprofil hinzu.";
+App::$strings["is interested in:"] = "interessiert sich für:";
+App::$strings["No matches"] = "Keine Übereinstimmungen";
+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["Unable to create element."] = "Element konnte nicht erstellt werden.";
+App::$strings["Unable to update menu element."] = "Kann Menü-Element nicht aktualisieren.";
+App::$strings["Unable to add menu element."] = "Kann Menü-Bestandteil nicht hinzufügen.";
+App::$strings["Menu Item Permissions"] = "Zugriffsrechte des Menü-Elements";
+App::$strings["(click to open/close)"] = "(zum öffnen/schließen anklicken)";
+App::$strings["Link Name"] = "Name des Links";
+App::$strings["Link or Submenu Target"] = "Ziel des Links oder Untermenüs";
+App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "URL des Links eingeben oder Menünamen wählen, um ein Untermenü anzulegen.";
+App::$strings["Use magic-auth if available"] = "Magic-Auth verwenden, falls verfügbar";
+App::$strings["Open link in new window"] = "Öffne Link in neuem Fenster";
+App::$strings["Order in list"] = "Reihenfolge in der Liste";
+App::$strings["Higher numbers will sink to bottom of listing"] = "Größere Nummern werden weiter unten in der Auflistung einsortiert";
+App::$strings["Submit and finish"] = "Absenden und fertigstellen";
+App::$strings["Submit and continue"] = "Absenden und fortfahren";
+App::$strings["Menu:"] = "Menü:";
+App::$strings["Link Target"] = "Ziel des Links";
+App::$strings["Edit menu"] = "Menü bearbeiten";
+App::$strings["Edit element"] = "Bestandteil bearbeiten";
+App::$strings["Drop element"] = "Bestandteil löschen";
+App::$strings["New element"] = "Neues Bestandteil";
+App::$strings["Edit this menu container"] = "Diesen Menü-Container bearbeiten";
+App::$strings["Add menu element"] = "Menüelement hinzufügen";
+App::$strings["Delete this menu item"] = "Lösche dieses Menü-Bestandteil";
+App::$strings["Edit this menu item"] = "Bearbeite dieses Menü-Bestandteil";
+App::$strings["Menu item not found."] = "Menü-Bestandteil nicht gefunden.";
+App::$strings["Menu item deleted."] = "Menü-Bestandteil gelöscht.";
+App::$strings["Menu item could not be deleted."] = "Menü-Bestandteil kann nicht gelöscht werden.";
+App::$strings["Edit Menu Element"] = "Bearbeite Menü-Bestandteil";
+App::$strings["Link text"] = "Link Text";
 App::$strings["Theme settings updated."] = "Theme-Einstellungen aktualisiert.";
 App::$strings["# Accounts"] = "Anzahl der Konten";
 App::$strings["# blocked accounts"] = "Anzahl der blockierten Konten";
@@ -1031,19 +1011,91 @@ App::$strings["(In addition to basic fields)"] = "(zusätzlich zu notwendige Fel
 App::$strings["All available fields"] = "Alle verfügbaren Felder";
 App::$strings["Custom Fields"] = "Benutzerdefinierte Felder";
 App::$strings["Create Custom Field"] = "Erstelle benutzerdefiniertes Feld";
-App::$strings["App installed."] = "App installiert.";
-App::$strings["Malformed app."] = "Fehlerhafte App.";
-App::$strings["Embed code"] = "Code einbetten";
-App::$strings["Edit App"] = "App bearbeiten";
-App::$strings["Create App"] = "App erstellen";
-App::$strings["Name of app"] = "Name der App";
-App::$strings["Location (URL) of app"] = "Ort (URL) der App";
-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";
+App::$strings["Name or caption"] = "Name oder Titel";
+App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Beispiele: „Horst Weidinger“, „Lisa und ihr Meerschweinchen“, „Fußball“, „Segelflieger-Forum“ ";
+App::$strings["Choose a short nickname"] = "Wähle einen kurzen Spitznamen";
+App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Dein Spitzname wird verwendet, um eine leicht zu merkende Kanal-Adresse (ähnlich einer E-Mail-Adresse) zu erzeugen, die Du mit anderen austauschen kannst, z.B. nickname%s";
+App::$strings["Channel role and privacy"] = "Kanaltyp und Privatspäre-Einstellungen";
+App::$strings["Select a channel role with your privacy requirements."] = "Wähle einen passenden Kanaltyp mit den zugehörigen Voreinstellungen zur Privatsphäre.";
+App::$strings["Read more about roles"] = "Mehr Informationen über Rollen";
+App::$strings["Create Channel"] = "Einen neuen Kanal anlegen";
+App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Ein Kanal ist Deine Identität in diesem Netzwerk. Er kann eine Person, ein Blog oder ein Forum repräsentieren, nur um ein paar Beispiele zu nennen. Kanäle können Verbindungen miteinander eingehen, um Informationen zu teilen, jeweils basierend auf sehr detaillierten Berechtigungseinstellungen.";
+App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "oder <a href=\"import\">importiere einen bestehenden Kanal</a> von einem anderen Server.";
+App::$strings["sent you a private message"] = "hat Dir eine private Nachricht geschickt";
+App::$strings["added your channel"] = "hat deinen Kanal hinzugefügt";
+App::$strings["g A l F d"] = "l, d. F, G:i \\U\\h\\r";
+App::$strings["[today]"] = "[Heute]";
+App::$strings["posted an event"] = "hat einen Termin veröffentlicht";
+App::$strings["Invalid request identifier."] = "Ungültiger Anfrage-Identifikator.";
+App::$strings["Discard"] = "Verwerfen";
+App::$strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gesehen";
+App::$strings["Poke"] = "Anstupsen";
+App::$strings["Poke somebody"] = "Jemanden anstupsen";
+App::$strings["Poke/Prod"] = "Anstupsen/Knuffen";
+App::$strings["Poke, prod or do other things to somebody"] = "Jemanden anstupsen, knuffen oder sonstiges";
+App::$strings["Recipient"] = "Empfänger";
+App::$strings["Choose what you wish to do to recipient"] = "Wähle, was Du mit dem/r Empfänger/in tun willst";
+App::$strings["Make this post private"] = "Diesen Beitrag privat machen";
+App::$strings["Unable to find your hub."] = "Konnte Deinen Server nicht finden.";
+App::$strings["Post successful."] = "Veröffentlichung erfolgreich.";
+App::$strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
+App::$strings["Login failed."] = "Login fehlgeschlagen.";
+App::$strings["Invalid profile identifier."] = "Ungültiger Profil-Identifikator";
+App::$strings["Profile Visibility Editor"] = "Profil-Sichtbarkeits-Editor";
+App::$strings["Profile"] = "Profil";
+App::$strings["Click on a contact to add or remove."] = "Klicke auf einen Kontakt, um ihn hinzuzufügen oder zu entfernen.";
+App::$strings["Visible To"] = "Sichtbar für";
+App::$strings["This setting requires special processing and editing has been blocked."] = "Diese Einstellung erfordert eine besondere Verarbeitung und ist blockiert.";
+App::$strings["Configuration Editor"] = "Konfigurationseditor";
+App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Warnung: Einige Einstellungen können Deinen Kanal funktionsunfähig machen. Bitte verlasse diese Seite, es sei denn Du bist vertraut damit, wie dieses Feature korrekt verwendet wird.";
+App::$strings["Fetching URL returns error: %1\$s"] = "Abrufen der URL gab einen Fehler zurück: %1\$s";
+App::$strings["Version %s"] = "Version %s";
+App::$strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
+App::$strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
+App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Dieser Hub ist Teil von \$Projectname – ein globales, kooperatives Netzwerk aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen.";
+App::$strings["Tag: "] = "Schlagwort: ";
+App::$strings["Last background fetch: "] = "Letzter Hintergrundabruf:";
+App::$strings["Current load average: "] = "Aktuelles Load Average:";
+App::$strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
+App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Bitte besuchen Sie <a href=\"http://hubzilla.org\">hubzilla.org</a>, um mehr über \$Projectname zu erfahren.";
+App::$strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
+App::$strings["\$projectname issues"] = "\$projectname-Bugtracker";
+App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com";
+App::$strings["Site Administrators"] = "Administratoren";
+App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal.";
+App::$strings["The error message was:"] = "Die Fehlermeldung war:";
+App::$strings["Authentication failed."] = "Authentifizierung fehlgeschlagen.";
+App::$strings["Remote Authentication"] = "Entfernte Authentifizierung";
+App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)";
+App::$strings["Authenticate"] = "Authentifizieren";
+App::$strings["Public Hubs"] = "Öffentliche Hubs";
+App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Die hier aufgeführten Hubs sind öffentlich und erlauben die Registrierung im \$Projectname Netzwerk. Alle Hubs dieses Netzwerks sind miteinander verbunden, so dass die Mitgliedschaft auf einem Hub die Verbindung zu beliebigen Seiten und Kanälen auf anderen Hubs ermöglicht. Es könnte sein, dass einige dieser Hubs kostenpflichtig sind oder abgestufte, je nach Umfang kostenpflichtige Mitgliedschaften anbieten. Auf den Seiten der einzelnen Hubs <strong>könnten</strong> jeweils nähere Informationen dazu stehen.";
+App::$strings["Hub URL"] = "Hub-URL";
+App::$strings["Access Type"] = "Zugriffstyp";
+App::$strings["Registration Policy"] = "Registrierungsrichtlinien";
+App::$strings["Stats"] = "Statistiken";
+App::$strings["Software"] = "Software";
+App::$strings["Ratings"] = "Bewertungen";
+App::$strings["Rate"] = "Bewerten";
+App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Leere den Browser Cache oder nutze Umschalten-Neu Laden, falls das neue Foto nicht sofort angezeigt wird.";
+App::$strings["Upload Profile Photo"] = "Lade neues Profilfoto hoch";
+App::$strings["Block Name"] = "Block-Name";
+App::$strings["Blocks"] = "Blöcke";
+App::$strings["Block Title"] = "Titel des Blocks";
+App::$strings["Website:"] = "Webseite:";
+App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Kanal [%s] (auf diesem Server noch unbekannt)";
+App::$strings["Rating (this information is public)"] = "Bewertung (öffentlich sichtbar)";
+App::$strings["Optionally explain your rating (this information is public)"] = "Optional kannst du deine Bewertung erklären (öffentlich sichtbar)";
+App::$strings["No ratings"] = "Keine Bewertungen";
+App::$strings["Rating: "] = "Bewertung: ";
+App::$strings["Website: "] = "Webseite: ";
+App::$strings["Description: "] = "Beschreibung: ";
+App::$strings["Apps"] = "Apps";
+App::$strings["Title (optional)"] = "Titel (optional)";
+App::$strings["Edit Block"] = "Block bearbeiten";
+App::$strings["No channel."] = "Kein Kanal.";
+App::$strings["Common connections"] = "Gemeinsame Verbindungen";
+App::$strings["No connections in common."] = "Keine gemeinsamen Verbindungen.";
 App::$strings["Select a bookmark folder"] = "Lesezeichenordner wählen";
 App::$strings["Save Bookmark"] = "Lesezeichen speichern";
 App::$strings["URL of bookmark"] = "URL des Lesezeichens";
@@ -1069,7 +1121,7 @@ App::$strings["no"] = "nein";
 App::$strings["yes"] = "ja";
 App::$strings["Membership on this site is by invitation only."] = "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich.";
 App::$strings["Register"] = "Registrieren";
-App::$strings["Proceed to create your first channel"] = "Fortfahren und Deinen ersten Kanal anlegen";
+App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "Diese Seite verlangt möglicherweise eine Emailbestätigung nach dem Ansenden des Formulars. Wenn Du auf eine Login-Seite zurückgeleitet wirst, prüfe bitte auf neue Mail mit entsprechenden Hinweisen.";
 App::$strings["Please login."] = "Bitte melde dich an.";
 App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Das Löschen von Konten innerhalb 48 Stunden nachdem deren Passwort geändert wurde ist nicht erlaubt.";
 App::$strings["Remove This Account"] = "Dieses Konto löschen";
@@ -1086,17 +1138,23 @@ App::$strings["This channel will be completely removed from the network. "] = "D
 App::$strings["Remove this channel and all its clones from the network"] = "Lösche diesen Kanal und all seine Klone aus dem Netzwerk";
 App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standardmäßig wird der Kanal nur auf diesem Server gelöscht, seine Klone verbleiben im Netzwerk";
 App::$strings["Remove Channel"] = "Kanal löschen";
-App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Wir haben ein Problem mit der OpenID festgestellt, mit der Du Dich anmelden wolltest. Bitte überprüfe sie noch einmal.";
-App::$strings["The error message was:"] = "Die Fehlermeldung war:";
-App::$strings["Authentication failed."] = "Authentifizierung fehlgeschlagen.";
-App::$strings["Remote Authentication"] = "Entfernte Authentifizierung";
-App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Deine Kanal-Adresse (z. B. channel@example.com)";
-App::$strings["Authenticate"] = "Authentifizieren";
+App::$strings["Export Channel"] = "Kanal exportieren";
+App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält.";
+App::$strings["Export Content"] = "Kanal und Inhalte exportieren";
+App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet.";
+App::$strings["Export your posts from a given year."] = "Exportiert die Beiträge des angegebenen Jahres.";
+App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne.";
+App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1\$s\">%2\$s</a>.";
+App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1\$s\">%2\$s</a>.";
+App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1\$s\">%2\$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst.";
 App::$strings["Items tagged with: %s"] = "Beiträge mit Schlagwort: %s";
 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["This channel is limited to %d tokens"] = "Dieser Kanal ist auf %d Token begrenzt";
+App::$strings["Name and Password are required."] = "Name und Passwort sind erforderlich.";
+App::$strings["Token saved."] = "Token gespeichert.";
 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.";
@@ -1129,6 +1187,12 @@ App::$strings["Confirm New Password"] = "Bestätige das neue Passwort";
 App::$strings["Leave password fields blank unless changing"] = "Lasse die Passwort-Felder leer, außer Du möchtest das Passwort ändern";
 App::$strings["Email Address:"] = "Email Adresse:";
 App::$strings["Remove this account including all its channels"] = "Dieses Konto inklusive all seiner Kanäle löschen";
+App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content."] = "Mit diesem Formular kannst Du temporäre Zugangs-IDs anlegen, um Inhalte mit Nicht-Mitgliedern zu teilen. Die IDs können in Berechtigungslisten (ACLs) verwendet werden, und Besucher können sich damit einloggen, um auf private Inhalte zuzugreifen.";
+App::$strings["You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "Du kannst auch <em>Dropbox</em>-ähnliche Zugriffslinks an Andere weitergeben, indem du das Login-Passwort an eine entsprechende URL anhängst wie nachfolgend gezeigt. Beispiele:";
+App::$strings["Guest Access Tokens"] = "Gastzugangstoken";
+App::$strings["Login Name"] = "Anmeldename";
+App::$strings["Login Password"] = "Anmeldepasswort";
+App::$strings["Expires (yyyy-mm-dd)"] = "Läuft ab (jjjj-mm-tt)";
 App::$strings["Additional Features"] = "Zusätzliche Funktionen";
 App::$strings["Connector Settings"] = "Connector-Einstellungen";
 App::$strings["No special theme for mobile devices"] = "Keine spezielle Theme für mobile Geräte";
@@ -1291,7 +1355,6 @@ App::$strings["GD graphics PHP module"] = "GD-Grafik-PHP-Modul";
 App::$strings["OpenSSL PHP module"] = "OpenSSL-PHP-Modul";
 App::$strings["mysqli or postgres PHP module"] = "mysqli oder postgres PHP-Modul";
 App::$strings["mb_string PHP module"] = "mb_string-PHP-Modul";
-App::$strings["mcrypt PHP module"] = "mcrypt-PHP-Modul";
 App::$strings["xml PHP module"] = "xml-PHP-Modul";
 App::$strings["Apache mod_rewrite module"] = "Apache-mod_rewrite-Modul";
 App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, ist aber nicht installiert.";
@@ -1302,7 +1365,6 @@ App::$strings["Error: GD graphics PHP module with JPEG support required but not
 App::$strings["Error: openssl PHP module required but not installed."] = "Fehler: Das PHP-Modul openssl wird benötigt, ist aber nicht installiert.";
 App::$strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Fehler: Das mysqli oder postgres PHP-Modul ist erforderlich, aber keines von beiden ist installiert.";
 App::$strings["Error: mb_string PHP module required but not installed."] = "Fehler: Das PHP-Modul mb_string wird benötigt, ist aber nicht installiert.";
-App::$strings["Error: mcrypt PHP module required but not installed."] = "Fehler: Das PHP-Modul mcrypt wird benötigt, ist aber nicht installiert.";
 App::$strings["Error: xml PHP module required for DAV but not installed."] = "Fehler: Das xml-PHP-Modul wird für DAV benötigt, ist aber nicht installiert.";
 App::$strings["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."] = "Der Installations-Assistent muss in der Lage sein, die Datei \".htconfig.php\" im Stammverzeichnis des Web-Servers anzulegen, ist er aber nicht.";
 App::$strings["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."] = "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.";
@@ -1314,7 +1376,7 @@ App::$strings["In order to store these compiled templates, the web server needs
 App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Bitte stelle sicher, dass der Nutzer, unter dem der Web-Server läuft (z.B. www-data), Schreibzugriff auf dieses Verzeichnis hat.";
 App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Hinweis: Aus Sicherheitsgründen sollte der Web-Server nur auf %s Schreibrechte haben, nicht auf die Template-Dateien (.tpl), die das Verzeichnis enthält.";
 App::$strings["%s is writable"] = "%s ist beschreibbar";
-App::$strings["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"] = "\$Projectname benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Webserver benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Red-Stammverzeichnisses";
+App::$strings["This software 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"] = "Diese Software benutzt das Verzeichnis store, um hochgeladene Dateien zu speichern. Der Web-Server benötigt Schreibrechte für dieses Verzeichnis direkt unterhalb des Hubzilla-Stammverzeichnisses";
 App::$strings["store is writable"] = "store ist schreibbar";
 App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Das SSL-Zertifikat konnte nicht validiert werden. Korrigiere das Zertifikat oder deaktiviere den HTTPS-Zugriff auf diesen Server.";
 App::$strings["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!"] = "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.";
@@ -1322,6 +1384,7 @@ App::$strings["This restriction is incorporated because public posts from you ma
 App::$strings["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."] = "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).";
 App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Dies kann Probleme für andere Nutzer (nicht nur auf Deinem eigenen Server) verursachen, so dass wir auf dieser Forderung bestehen müssen.";
 App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Es gibt einige Zertifizierungsstellen (CAs), bei denen solche Zertifikate kostenlos zu haben sind.";
+App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "Wenn Du sicher bist, dass das Zertifikat gültig und von einer vertrauenswürdigen Zertifizierungsstelle signiert ist, prüfe auf ggf. noch zu installierende Zwischenzertifikate (intermediate). Diese werden nicht unbedingt von Browsern benötigt, aber sehr wohl für die Kommunikation zwischen Servern.";
 App::$strings["SSL certificate validation"] = "SSL Zertifikatverifizierung";
 App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Das Umschreiben von URLs (rewrite) per .htaccess funktioniert nicht. Bitte prüfe die Server-Konfiguration. Test:";
 App::$strings["Url rewrite is working"] = "Url rewrite funktioniert";
@@ -1333,19 +1396,20 @@ App::$strings["Files: shared with me"] = "Dateien, die mit mir geteilt wurden";
 App::$strings["NEW"] = "NEU";
 App::$strings["Remove all files"] = "Alle Dateien löschen";
 App::$strings["Remove this file"] = "Diese Datei löschen";
-App::$strings["Version %s"] = "Version %s";
-App::$strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Addons/Apps";
-App::$strings["No installed plugins/addons/apps"] = "Keine installierten Plugins/Addons/Apps";
-App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Dieser Hub ist Teil von \$Projectname – ein globales, kooperatives Netzwerk aus dezentralen Websites, die Rücksicht auf Deine Privatsphäre nehmen.";
-App::$strings["Tag: "] = "Schlagwort: ";
-App::$strings["Last background fetch: "] = "Letzter Hintergrundabruf:";
-App::$strings["Current load average: "] = "Aktuelles Load Average:";
-App::$strings["Running at web location"] = "Erreichbar unter der Web-Adresse";
-App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Bitte besuchen Sie <a href=\"http://hubzilla.org\">hubzilla.org</a>, um mehr über \$Projectname zu erfahren.";
-App::$strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche";
-App::$strings["\$projectname issues"] = "\$projectname-Bugtracker";
-App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Vorschläge, Lob, usw.: E-Mail an 'redmatrix' at librelist - dot - com";
-App::$strings["Site Administrators"] = "Administratoren";
+App::$strings["Thing updated"] = "Sache aktualisiert";
+App::$strings["Object store: failed"] = "Speichern des Objekts fehlgeschlagen";
+App::$strings["Thing added"] = "Sache hinzugefügt";
+App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+App::$strings["Show Thing"] = "Sache anzeigen";
+App::$strings["item not found."] = "Eintrag nicht gefunden";
+App::$strings["Edit Thing"] = "Sache bearbeiten";
+App::$strings["Select a profile"] = "Wähle ein Profil";
+App::$strings["Post an activity"] = "Aktivitätsnachricht senden";
+App::$strings["Only sends to viewers of the applicable profile"] = "Nur an Betrachter des ausgewählten Profils senden";
+App::$strings["Name of thing e.g. something"] = "Name der Sache, z. B. irgendwas";
+App::$strings["URL of thing (optional)"] = "URL der Sache (optional)";
+App::$strings["URL for photo of thing (optional)"] = "URL eines Fotos der Sache (optional)";
+App::$strings["Add Thing to your Profile"] = "Die Sache Deinem Profil hinzufügen";
 App::$strings["Failed to create source. No channel selected."] = "Konnte die Quelle nicht anlegen. Kein Kanal ausgewählt.";
 App::$strings["Source created."] = "Quelle erstellt.";
 App::$strings["Source updated."] = "Quelle aktualisiert.";
@@ -1373,60 +1437,38 @@ App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s
 App::$strings["Tag removed"] = "Schlagwort entfernt";
 App::$strings["Remove Item Tag"] = "Schlagwort entfernen";
 App::$strings["Select a tag to remove: "] = "Schlagwort zum Entfernen auswählen:";
-App::$strings["Thing updated"] = "Sache aktualisiert";
-App::$strings["Object store: failed"] = "Speichern des Objekts fehlgeschlagen";
-App::$strings["Thing added"] = "Sache hinzugefügt";
-App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-App::$strings["Show Thing"] = "Sache anzeigen";
-App::$strings["item not found."] = "Eintrag nicht gefunden";
-App::$strings["Edit Thing"] = "Sache bearbeiten";
-App::$strings["Select a profile"] = "Wähle ein Profil";
-App::$strings["Post an activity"] = "Aktivitätsnachricht senden";
-App::$strings["Only sends to viewers of the applicable profile"] = "Nur an Betrachter des ausgewählten Profils senden";
-App::$strings["Name of thing e.g. something"] = "Name der Sache, z. B. irgendwas";
-App::$strings["URL of thing (optional)"] = "URL der Sache (optional)";
-App::$strings["URL for photo of thing (optional)"] = "URL eines Fotos der Sache (optional)";
-App::$strings["Add Thing to your Profile"] = "Die Sache Deinem Profil hinzufügen";
-App::$strings["Export Channel"] = "Kanal exportieren";
-App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportiert die grundlegenden Kanal-Informationen in eine kleine Datei. Diese stellt eine Sicherung Deiner Verbindungen, Berechtigungen, Profile und Basisdaten bereit, die für den Import auf einem anderen Hub verwendet werden kann, aber nicht die Beiträge Deines Kanals enthält.";
-App::$strings["Export Content"] = "Kanal und Inhalte exportieren";
-App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportiert Deine Kanal-Informationen sowie alle zugehörigen Inhalte in eine JSON-Sicherungsdatei. Die sichert alle Verbindungen, Berechtigungen, Profildaten und Deine Beiträge aus mehreren Monaten. Diese Datei kann SEHR groß werden! Bitte habe ein wenig Geduld – es kann mehrere Minuten dauern, bis der Download startet.";
-App::$strings["Export your posts from a given year."] = "Exportiert die Beiträge des angegebenen Jahres.";
-App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Du kannst auch die Beiträge und Konversationen eines bestimmten Jahres oder Monats exportieren. Ändere das Datum in der Adresszeile Deines Browsers, um andere Zeiträume zu wählen. Falls der Export fehlschlägt (vermutlich, weil auf diesem Hub nicht genügend Speicher zur Verfügung steht), versuche es noch einmal mit einer kleineren Zeitspanne.";
-App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Jahres, zum Beispiel dieses Jahres, auszuwählen, klicke <a href=\"%1\$s\">%2\$s</a>.";
-App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Um alle Beiträge eines bestimmten Monats auszuwählen, zum Beispiel vom Januar diesen Jahres, klicke <a href=\"%1\$s\">%2\$s</a>.";
-App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Diese Inhalts-Sicherungen können wiederhergestellt werden, indem Du <a href=\"%1\$s\">%2\$s</a> auf jeglichem Hub besuchst, der diesen Kanal enthält. Das funktioniert am besten, wenn Du dabei die zeitliche Reihenfolge einhältst, also die Sicherungen für den ältesten Zeitraum zuerst importierst.";
-App::$strings["No connections."] = "Keine Verbindungen.";
-App::$strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen";
-App::$strings["View Connections"] = "Verbindungen anzeigen";
-App::$strings["Source of Item"] = "Quelle des Elements";
 App::$strings["Webpages"] = "Webseiten";
 App::$strings["Actions"] = "Aktionen";
 App::$strings["Page Link"] = "Seiten-Link";
 App::$strings["Page Title"] = "Seitentitel";
+App::$strings["Not found"] = "Nicht gefunden";
+App::$strings["Wiki"] = "Wiki";
+App::$strings["Sandbox"] = "Sandbox";
+App::$strings["\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be saved*.\""] = "\"# Wiki Sandkasten\\n\\nInhalte, die Du hier **veränderst** und **als Vorschau anzeigst**, *werden nicht gespeichert*.\"";
+App::$strings["Revision Comparison"] = "Revisionsvergleich";
+App::$strings["Revert"] = "Rückgängig machen";
+App::$strings["Enter the name of your new wiki:"] = "Gib einen Namen für Dein neues Wiki ein:";
+App::$strings["Enter the name of the new page:"] = "Geben Sie den Namen der neuen Seite ein:";
+App::$strings["Enter the new name:"] = "Geben Sie den neuen Namen ein:";
+App::$strings["Embed image from photo albums"] = "Bild aus Fotoalben einbetten";
+App::$strings["Embed an image from your albums"] = "Betten Sie ein Bild aus Ihren Alben ein";
+App::$strings["OK"] = "Ok";
+App::$strings["Choose images to embed"] = "Wählen Sie Bilder zum Einbetten aus";
+App::$strings["Choose an album"] = "Wählen Sie ein Album aus";
+App::$strings["Choose a different album..."] = "Wählen Sie ein anderes Album aus...";
+App::$strings["Error getting album list"] = "Fehler beim Holen der Albenliste";
+App::$strings["Error getting photo link"] = "Fehler beim Holen des Fotolinks";
+App::$strings["Error getting album"] = "Fehler beim Holen des Albums";
+App::$strings["No connections."] = "Keine Verbindungen.";
+App::$strings["Visit %s's profile [%s]"] = "%ss Profil [%s] besuchen";
+App::$strings["View Connections"] = "Verbindungen anzeigen";
+App::$strings["Source of Item"] = "Quelle des Elements";
+App::$strings["Authorize application connection"] = "Zugriff für die Anwendung autorisieren";
+App::$strings["Return to your app and insert this Securty Code:"] = "Trage folgenden Sicherheitscode in der Anwendung ein:";
+App::$strings["Please login to continue."] = "Zum Weitermachen, bitte einloggen.";
+App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Möchtest Du dieser Anwendung erlauben, Deine Nachrichten und Kontakte abzurufen und/oder neue Nachrichten für Dich zu erstellen?";
 App::$strings["Xchan Lookup"] = "Xchan-Suche";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Nach xchans oder Webbies (Kanal-Adressen) suchen, die wie folgt beginnen:";
-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["Suggest Channels"] = "Kanäle vorschlagen";
-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["Purchase"] = "Kaufen";
 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.";
@@ -1474,6 +1516,27 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Bitte b
 App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Benachrichtigung]";
 App::$strings["created a new post"] = "Neuer Beitrag wurde erzeugt";
 App::$strings["commented on %s's post"] = "hat %s's Beitrag kommentiert";
+App::$strings["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["Suggest Channels"] = "Kanäle vorschlagen";
+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["Purchase"] = "Kaufen";
 App::$strings["Private Message"] = "Private Nachricht";
 App::$strings["Select"] = "Auswählen";
 App::$strings["Save to Folder"] = "In Ordner speichern";
@@ -1510,7 +1573,7 @@ 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["%s show all"] = "%s mehr anzeigen";
 App::$strings["Bold"] = "Fett";
 App::$strings["Italic"] = "Kursiv";
 App::$strings["Underline"] = "Unterstrichen";
@@ -1519,9 +1582,93 @@ App::$strings["Code"] = "Code";
 App::$strings["Image"] = "Bild";
 App::$strings["Insert Link"] = "Link einfügen";
 App::$strings["Video"] = "Video";
+App::$strings["Visible to your default audience"] = "Standard-Sichtbarkeit gemäß Kanaleinstellungen";
+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 connections I specifically allow"] = "Nur Verbindungen, denen ich es explizit erlaube";
+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["No username found in import file."] = "Kein Benutzername in der Importdatei gefunden.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "Es war nicht möglich, eine eindeutige Kanal-Adresse zu erzeugen. Der Import ist fehlgeschlagen.";
 App::$strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS-Informationen für den Datenbank-Server '%s' nicht finden";
+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["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 Profile"] = "Profile bearbeiten";
+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["Bookmarks"] = "Lesezeichen";
+App::$strings["Your bookmarks"] = "Deine Lesezeichen";
+App::$strings["Your webpages"] = "Deine Webseiten";
+App::$strings["Your wiki"] = "Dein Wiki";
+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["Inbox"] = "Eingang";
+App::$strings["Outbox"] = "Ausgang";
+App::$strings["New Message"] = "Neue Nachricht";
+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["Admin"] = "Administration";
+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["Administrator"] = "Administrator";
+App::$strings["No Subject"] = "Kein Betreff";
+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["New Page"] = "Neue Seite";
+App::$strings["Title"] = "Titel";
 App::$strings["Categories"] = "Kategorien";
 App::$strings["Tags"] = "Schlagwörter";
 App::$strings["Keywords"] = "Schlüsselwörter";
@@ -1531,34 +1678,196 @@ App::$strings["want"] = "will";
 App::$strings["wants"] = "will";
 App::$strings["likes"] = "gefällt";
 App::$strings["dislikes"] = "missfällt";
-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["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
+App::$strings["Empty name"] = "Namensfeld leer";
+App::$strings["Name too long"] = "Name ist zu lang";
+App::$strings["No account identifier"] = "Keine Account-Kennung";
+App::$strings["Nickname is required."] = "Spitzname ist erforderlich.";
+App::$strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen.";
+App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
+App::$strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
+App::$strings["Default Profile"] = "Standard-Profil";
+App::$strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
+App::$strings["Create New Profile"] = "Neues Profil erstellen";
+App::$strings["Visible to everybody"] = "Für jeden sichtbar";
+App::$strings["Gender:"] = "Geschlecht:";
+App::$strings["Status:"] = "Status:";
+App::$strings["Homepage:"] = "Homepage:";
+App::$strings["Online Now"] = "gerade online";
+App::$strings["Like this channel"] = "Dieser Kanal gefällt mir";
+App::$strings["j F, Y"] = "j. F Y";
+App::$strings["j F"] = "j. F";
+App::$strings["Birthday:"] = "Geburtstag:";
+App::$strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
+App::$strings["Sexual Preference:"] = "Sexuelle Orientierung:";
+App::$strings["Tags:"] = "Schlagworte:";
+App::$strings["Political Views:"] = "Politische Ansichten:";
+App::$strings["Religion:"] = "Religion:";
+App::$strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
+App::$strings["Likes:"] = "Gefällt:";
+App::$strings["Dislikes:"] = "Gefällt nicht:";
+App::$strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
+App::$strings["My other channels:"] = "Meine anderen Kanäle:";
+App::$strings["Musical interests:"] = "Musikalische Interessen:";
+App::$strings["Books, literature:"] = "Bücher, Literatur:";
+App::$strings["Television:"] = "Fernsehen:";
+App::$strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
+App::$strings["Love/Romance:"] = "Liebe/Romantik:";
+App::$strings["Work/employment:"] = "Arbeit/Anstellung:";
+App::$strings["School/education:"] = "Schule/Ausbildung:";
+App::$strings["Like this thing"] = "Gefällt mir";
+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["%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["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["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["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["(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["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["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["Currently Male"] = "Momentan männlich";
+App::$strings["Currently Female"] = "Momentan weiblich";
+App::$strings["Mostly Male"] = "Größtenteils männlich";
+App::$strings["Mostly Female"] = "Größtenteils weiblich";
+App::$strings["Transgender"] = "Transsexuell";
+App::$strings["Intersex"] = "Zwischengeschlechtlich";
+App::$strings["Transsexual"] = "Transsexuell";
+App::$strings["Hermaphrodite"] = "Zwitter";
+App::$strings["Neuter"] = "Geschlechtslos";
+App::$strings["Non-specific"] = "unklar";
+App::$strings["Undecided"] = "Unentschieden";
+App::$strings["Males"] = "Männer";
+App::$strings["Females"] = "Frauen";
+App::$strings["Gay"] = "Schwul";
+App::$strings["Lesbian"] = "Lesbisch";
+App::$strings["No Preference"] = "Keine Bevorzugung";
+App::$strings["Bisexual"] = "Bisexuell";
+App::$strings["Autosexual"] = "Autosexuell";
+App::$strings["Abstinent"] = "Enthaltsam";
+App::$strings["Virgin"] = "Jungfräulich";
+App::$strings["Deviant"] = "Abweichend";
+App::$strings["Fetish"] = "Fetisch";
+App::$strings["Oodles"] = "Unmengen";
+App::$strings["Nonsexual"] = "Sexlos";
+App::$strings["Single"] = "Single";
+App::$strings["Lonely"] = "Einsam";
+App::$strings["Available"] = "Verfügbar";
+App::$strings["Unavailable"] = "Nicht verfügbar";
+App::$strings["Has crush"] = "Verguckt";
+App::$strings["Infatuated"] = "Verknallt";
+App::$strings["Dating"] = "Lerne gerade jemanden kennen";
+App::$strings["Unfaithful"] = "Treulos";
+App::$strings["Sex Addict"] = "Sexabhängig";
+App::$strings["Friends/Benefits"] = "Freunde/Begünstigte";
+App::$strings["Casual"] = "Lose";
+App::$strings["Engaged"] = "Verlobt";
+App::$strings["Married"] = "Verheiratet";
+App::$strings["Imaginarily married"] = "Gewissermaßen verheiratet";
+App::$strings["Partners"] = "Partner";
+App::$strings["Cohabiting"] = "Lebensgemeinschaft";
+App::$strings["Common law"] = "Informelle Ehe";
+App::$strings["Happy"] = "Glücklich";
+App::$strings["Not looking"] = "Nicht Ausschau haltend";
+App::$strings["Swinger"] = "Swinger";
+App::$strings["Betrayed"] = "Betrogen";
+App::$strings["Separated"] = "Getrennt";
+App::$strings["Unstable"] = "Labil";
+App::$strings["Divorced"] = "Geschieden";
+App::$strings["Imaginarily divorced"] = "Gewissermaßen geschieden";
+App::$strings["Widowed"] = "Verwitwet";
+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["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
+App::$strings["guest:"] = "Gast:";
+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["prev"] = "vorherige";
 App::$strings["first"] = "erste";
 App::$strings["last"] = "letzte";
@@ -1568,7 +1877,6 @@ App::$strings["newer"] = "neuer";
 App::$strings["No connections"] = "Keine Verbindungen";
 App::$strings["View all %s connections"] = "Alle Verbindungen von %s anzeigen";
 App::$strings["poke"] = "anstupsen";
-App::$strings["poked"] = "stupste";
 App::$strings["ping"] = "anpingen";
 App::$strings["pinged"] = "pingte";
 App::$strings["prod"] = "knuffen";
@@ -1631,385 +1939,21 @@ 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["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["Saved Folders"] = "Gespeicherte Ordner";
-App::$strings["Everything"] = "Alles";
-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["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["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert ";
-App::$strings["Channel location missing."] = "Adresse des Kanals fehlt.";
-App::$strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
-App::$strings["Channel was deleted and no longer exists."] = "Kanal wurde gelöscht und existiert nicht mehr.";
-App::$strings["Protocol disabled."] = "Protokoll deaktiviert.";
-App::$strings["Channel discovery failed."] = "Kanalsuche fehlgeschlagen";
-App::$strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden.";
-App::$strings["%1\$s's bookmarks"] = "%1\$ss Lesezeichen";
-App::$strings["Public Timeline"] = "Öffentliche Zeitleiste";
-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["Directory Options"] = "Verzeichnisoptionen";
-App::$strings["Safe Mode"] = "Sicherer Modus";
-App::$strings["Public Forums Only"] = "Nur öffentliche Foren";
-App::$strings["This Website Only"] = "Nur dieser Hub";
-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["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 Profile"] = "Profile bearbeiten";
-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["Bookmarks"] = "Lesezeichen";
-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["Loading..."] = "Lädt ...";
-App::$strings["@name, #tag, ?doc, content"] = "@Name, #Schlagwort, ?Dokumentation, Inhalt";
-App::$strings["Please wait..."] = "Bitte warten...";
-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["%d invitation available"] = array(
-	0 => "%d Einladung verfügbar",
-	1 => "%d Einladungen verfügbar",
-);
-App::$strings["Find Channels"] = "Finde Kanäle";
-App::$strings["Enter name or interest"] = "Name oder Interessen eingeben";
-App::$strings["Connect/Follow"] = "Verbinden/Folgen";
-App::$strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln";
-App::$strings["Random Profile"] = "Zufallsprofil";
-App::$strings["Invite Friends"] = "Lade Freunde ein";
-App::$strings["Advanced example: name=fred and country=iceland"] = "Fortgeschrittenes Beispiel: name=fred and country=iceland";
-App::$strings["%d connection in common"] = array(
-	0 => "%d gemeinsame Verbindung",
-	1 => "%d gemeinsame Verbindungen",
-);
-App::$strings["show more"] = "mehr zeigen";
-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["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["Photo Albums"] = "Fotoalben";
-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["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["Currently Male"] = "Momentan männlich";
-App::$strings["Currently Female"] = "Momentan weiblich";
-App::$strings["Mostly Male"] = "Größtenteils männlich";
-App::$strings["Mostly Female"] = "Größtenteils weiblich";
-App::$strings["Transgender"] = "Transsexuell";
-App::$strings["Intersex"] = "Zwischengeschlechtlich";
-App::$strings["Transsexual"] = "Transsexuell";
-App::$strings["Hermaphrodite"] = "Zwitter";
-App::$strings["Neuter"] = "Geschlechtslos";
-App::$strings["Non-specific"] = "unklar";
-App::$strings["Other"] = "Andere";
-App::$strings["Undecided"] = "Unentschieden";
-App::$strings["Males"] = "Männer";
-App::$strings["Females"] = "Frauen";
-App::$strings["Gay"] = "Schwul";
-App::$strings["Lesbian"] = "Lesbisch";
-App::$strings["No Preference"] = "Keine Bevorzugung";
-App::$strings["Bisexual"] = "Bisexuell";
-App::$strings["Autosexual"] = "Autosexuell";
-App::$strings["Abstinent"] = "Enthaltsam";
-App::$strings["Virgin"] = "Jungfräulich";
-App::$strings["Deviant"] = "Abweichend";
-App::$strings["Fetish"] = "Fetisch";
-App::$strings["Oodles"] = "Unmengen";
-App::$strings["Nonsexual"] = "Sexlos";
-App::$strings["Single"] = "Single";
-App::$strings["Lonely"] = "Einsam";
-App::$strings["Available"] = "Verfügbar";
-App::$strings["Unavailable"] = "Nicht verfügbar";
-App::$strings["Has crush"] = "Verguckt";
-App::$strings["Infatuated"] = "Verknallt";
-App::$strings["Dating"] = "Lerne gerade jemanden kennen";
-App::$strings["Unfaithful"] = "Treulos";
-App::$strings["Sex Addict"] = "Sexabhängig";
-App::$strings["Friends/Benefits"] = "Freunde/Begünstigte";
-App::$strings["Casual"] = "Lose";
-App::$strings["Engaged"] = "Verlobt";
-App::$strings["Married"] = "Verheiratet";
-App::$strings["Imaginarily married"] = "Gewissermaßen verheiratet";
-App::$strings["Partners"] = "Partner";
-App::$strings["Cohabiting"] = "Lebensgemeinschaft";
-App::$strings["Common law"] = "Informelle Ehe";
-App::$strings["Happy"] = "Glücklich";
-App::$strings["Not looking"] = "Nicht Ausschau haltend";
-App::$strings["Swinger"] = "Swinger";
-App::$strings["Betrayed"] = "Betrogen";
-App::$strings["Separated"] = "Getrennt";
-App::$strings["Unstable"] = "Labil";
-App::$strings["Divorced"] = "Geschieden";
-App::$strings["Imaginarily divorced"] = "Gewissermaßen geschieden";
-App::$strings["Widowed"] = "Verwitwet";
-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["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 connections I specifically allow"] = "Nur Verbindungen, denen ich es explizit erlaube";
-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["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["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";
-App::$strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
-App::$strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
-App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht.";
-App::$strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
-App::$strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
-App::$strings["Path not available."] = "Pfad nicht verfügbar.";
-App::$strings["Empty pathname"] = "Leere Pfadangabe";
-App::$strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
-App::$strings["Path not found."] = "Pfad nicht gefunden.";
-App::$strings["mkdir failed."] = "mkdir fehlgeschlagen.";
-App::$strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
-App::$strings["Empty path"] = "Leere Pfadangabe";
-App::$strings["Unable to obtain identity information from database"] = "Kann keine Identitäts-Informationen aus Datenbank beziehen";
-App::$strings["Empty name"] = "Namensfeld leer";
-App::$strings["Name too long"] = "Name ist zu lang";
-App::$strings["No account identifier"] = "Keine Account-Kennung";
-App::$strings["Nickname is required."] = "Spitzname ist erforderlich.";
-App::$strings["Reserved nickname. Please choose another."] = "Reservierter Kurzname. Bitte wähle einen anderen.";
-App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Der Spitzname enthält nicht-unterstütze Zeichen oder wird bereits auf dieser Seite genutzt.";
-App::$strings["Unable to retrieve created identity"] = "Kann die erstellte Identität nicht empfangen";
-App::$strings["Default Profile"] = "Standard-Profil";
-App::$strings["Requested channel is not available."] = "Angeforderte Kanal nicht verfügbar.";
-App::$strings["Create New Profile"] = "Neues Profil erstellen";
-App::$strings["Visible to everybody"] = "Für jeden sichtbar";
-App::$strings["Gender:"] = "Geschlecht:";
-App::$strings["Status:"] = "Status:";
-App::$strings["Homepage:"] = "Homepage:";
-App::$strings["Online Now"] = "gerade online";
-App::$strings["Like this channel"] = "Dieser Kanal gefällt mir";
-App::$strings["j F, Y"] = "j. F Y";
-App::$strings["j F"] = "j. F";
-App::$strings["Birthday:"] = "Geburtstag:";
-App::$strings["for %1\$d %2\$s"] = "seit %1\$d %2\$s";
-App::$strings["Sexual Preference:"] = "Sexuelle Orientierung:";
-App::$strings["Tags:"] = "Schlagworte:";
-App::$strings["Political Views:"] = "Politische Ansichten:";
-App::$strings["Religion:"] = "Religion:";
-App::$strings["Hobbies/Interests:"] = "Hobbys/Interessen:";
-App::$strings["Likes:"] = "Gefällt:";
-App::$strings["Dislikes:"] = "Gefällt nicht:";
-App::$strings["Contact information and Social Networks:"] = "Kontaktinformation und soziale Netzwerke:";
-App::$strings["My other channels:"] = "Meine anderen Kanäle:";
-App::$strings["Musical interests:"] = "Musikalische Interessen:";
-App::$strings["Books, literature:"] = "Bücher, Literatur:";
-App::$strings["Television:"] = "Fernsehen:";
-App::$strings["Film/dance/culture/entertainment:"] = "Film/Tanz/Kultur/Unterhaltung:";
-App::$strings["Love/Romance:"] = "Liebe/Romantik:";
-App::$strings["Work/employment:"] = "Arbeit/Anstellung:";
-App::$strings["School/education:"] = "Schule/Ausbildung:";
-App::$strings["Like this thing"] = "Gefällt mir";
+App::$strings["Logged out."] = "Ausgeloggt.";
+App::$strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
+App::$strings["Can view my normal stream and posts"] = "Kann meine normalen Beiträge sehen";
+App::$strings["Can view my webpages"] = "Kann meine Webseiten sehen";
+App::$strings["Can post on my channel page (\"wall\")"] = "Kann auf meiner Kanal-Seite (\"wall\") Beiträge veröffentlichen";
+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["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["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.";
@@ -2021,6 +1965,7 @@ App::$strings["Profile Import/Export"] = "Profil-Import/Export";
 App::$strings["Save and load profile details across sites/channels"] = "Ermöglicht das Speichern von Profilen, um sie in einen anderen Kanal zu importieren";
 App::$strings["Web Pages"] = "Webseiten";
 App::$strings["Provide managed web pages on your channel"] = "Ermöglicht das Erstellen von Webseiten in Deinem Kanal";
+App::$strings["Provide a wiki for your channel"] = "Stelle ein Wiki in Deinem Kanal zur Verfügung";
 App::$strings["Hide Rating"] = "Bewertung verbergen";
 App::$strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Verberge die Buttons zur Bewertung auf deiner Profil-Seite und deinem Kanal. Hinweis: Leute können dich weiterhin andernorts bewerten.";
 App::$strings["Private Notes"] = "Private Notizen";
@@ -2054,6 +1999,7 @@ 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";
@@ -2071,6 +2017,7 @@ App::$strings["Post Categories"] = "Beitrags-Kategorien";
 App::$strings["Add categories to your posts"] = "Aktiviert Kategorien für Beiträge";
 App::$strings["Emoji Reactions"] = "Emoji Reaktionen";
 App::$strings["Add emoji reaction ability to posts"] = "Aktiviert Emoji-Reaktionen für Beiträge";
+App::$strings["Saved Folders"] = "Gespeicherte Ordner";
 App::$strings["Ability to file posts under folders"] = "Möglichkeit, Beiträge in Verzeichnissen zu sammeln";
 App::$strings["Dislike Posts"] = "Gefällt-mir-nicht-Beiträge";
 App::$strings["Ability to dislike posts/comments"] = "Aktiviert die „Gefällt mir nicht“-Schaltfläche";
@@ -2078,63 +2025,149 @@ App::$strings["Star Posts"] = "Beiträge mit Sternchen versehen";
 App::$strings["Ability to mark special posts with a star indicator"] = "Ermöglicht die lokale Markierung spezieller Beiträge mit einem Sternchen-Symbol";
 App::$strings["Tag Cloud"] = "Schlagwort-Wolke";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Aktiviert die Anzeige einer Schlagwort-Wolke (Tag Cloud) auf Deiner Kanal-Seite";
-App::$strings["Embedded content"] = "Eingebetteter Inhalt";
-App::$strings["Embedding disabled"] = "Einbetten ausgeschaltet";
-App::$strings["Who can see this?"] = "Wer kann das sehen?";
-App::$strings["Custom selection"] = "Benutzerdefinierte Auswahl";
-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["Logged out."] = "Ausgeloggt.";
-App::$strings["Failed authentication"] = "Authentifizierung fehlgeschlagen";
-App::$strings["Birthday"] = "Geburtstag";
-App::$strings["Age: "] = "Alter:";
-App::$strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-TT oder MM-TT";
-App::$strings["never"] = "Nie";
-App::$strings["less than a second ago"] = "Vor weniger als einer Sekunde";
-App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "vor %1\$d %2\$s";
-App::$strings["__ctx:relative_date__ year"] = array(
-	0 => "Jahr",
-	1 => "Jahre",
-);
-App::$strings["__ctx:relative_date__ month"] = array(
-	0 => "Monat",
-	1 => "Monate",
-);
-App::$strings["__ctx:relative_date__ week"] = array(
-	0 => "Woche",
-	1 => "Wochen",
-);
-App::$strings["__ctx:relative_date__ day"] = array(
-	0 => "Tag",
-	1 => "Tage",
-);
-App::$strings["__ctx:relative_date__ hour"] = array(
-	0 => "Stunde",
-	1 => "Stunden",
-);
-App::$strings["__ctx:relative_date__ minute"] = array(
-	0 => "Minute",
-	1 => "Minuten",
-);
-App::$strings["__ctx:relative_date__ second"] = array(
-	0 => "Sekunde",
-	1 => "Sekunden",
-);
-App::$strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
-App::$strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Es hat früher schon einmal eine Gruppe mit diesem Namen existiert, die gelöscht wurde. Es <strong>könnten</strong> von damals noch Elemente (Beiträge, Dateien etc.) vorhanden sein, die allen jetzigen und zukünftigen Mitgliedern dieser Gruppe den Zugriff erlauben. Wenn das nicht Deine Absicht ist, erstelle bitte eine neue Gruppe mit einem anderen Namen.";
 App::$strings["Add new connections to this privacy group"] = "Neue Verbindung zu dieser Gruppe hinzufügen";
 App::$strings["edit"] = "Bearbeiten";
 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["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["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["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["Channel is blocked on this site."] = "Der Kanal ist auf dieser Seite blockiert ";
+App::$strings["Channel location missing."] = "Adresse des Kanals fehlt.";
+App::$strings["Response from remote channel was incomplete."] = "Antwort des entfernten Kanals war unvollständig.";
+App::$strings["Channel was deleted and no longer exists."] = "Kanal wurde gelöscht und existiert nicht mehr.";
+App::$strings["Protocol disabled."] = "Protokoll deaktiviert.";
+App::$strings["Channel discovery failed."] = "Kanalsuche fehlgeschlagen";
+App::$strings["Cannot connect to yourself."] = "Du kannst Dich nicht mit Dir selbst verbinden.";
+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";
+App::$strings["Cannot locate file to revise/update"] = "Kann Datei zum Prüfen/Aktualisieren nicht finden";
+App::$strings["File exceeds size limit of %d"] = "Datei überschreitet das Größen-Limit von %d";
+App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Die Größe Deiner Datei-Anhänge hat das Maximum von %1$.0f MByte erreicht.";
+App::$strings["File upload failed. Possible system limit or action terminated."] = "Datei-Upload fehlgeschlagen. Mögliche Systembegrenzung oder abgebrochener Prozess.";
+App::$strings["Stored file could not be verified. Upload failed."] = "Gespeichert Datei konnte nicht verifiziert werden. Upload abgebrochen.";
+App::$strings["Path not available."] = "Pfad nicht verfügbar.";
+App::$strings["Empty pathname"] = "Leere Pfadangabe";
+App::$strings["duplicate filename or path"] = "doppelter Dateiname oder Pfad";
+App::$strings["Path not found."] = "Pfad nicht gefunden.";
+App::$strings["mkdir failed."] = "mkdir fehlgeschlagen.";
+App::$strings["database storage failed."] = "Speichern in der Datenbank fehlgeschlagen.";
+App::$strings["Empty path"] = "Leere Pfadangabe";
+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["(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["Embedded content"] = "Eingebetteter Inhalt";
+App::$strings["Embedding disabled"] = "Einbetten ausgeschaltet";
+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["Everything"] = "Alles";
+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["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 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["Wiki List"] = "Wikiliste";
+App::$strings["Wiki Pages"] = "Wikiseiten";
+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["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["Plugin Features"] = "Plug-In Funktionen";
+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["Attachments:"] = "Anhänge:";
+App::$strings["\$Projectname event notification:"] = "\$Projectname-Terminbenachrichtigung:";
 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["%s show less"] = "%s weniger anzeigen";
+App::$strings["%s expand"] = "%s aufklappen";
+App::$strings["%s collapse"] = "%s einklappen";
 App::$strings["Password too short"] = "Kennwort zu kurz";
 App::$strings["Passwords do not match"] = "Kennwörter stimmen nicht überein";
 App::$strings["everybody"] = "alle";
@@ -2189,72 +2222,78 @@ 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["view full size"] = "In Vollbildansicht anschauen";
-App::$strings["No Subject"] = "Kein Betreff";
-App::$strings["Friendica"] = "Friendica";
-App::$strings["OStatus"] = "OStatus";
-App::$strings["GNU-Social"] = "GNU-Social";
-App::$strings["RSS/Atom"] = "RSS/Atom";
-App::$strings["Diaspora"] = "Diaspora";
-App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot!";
-App::$strings["LinkedIn"] = "LinkedIn";
-App::$strings["XMPP/IM"] = "XMPP/IM";
-App::$strings["MySpace"] = "MySpace";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "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["%d invitation available"] = array(
+	0 => "%d Einladung verfügbar",
+	1 => "%d Einladungen verfügbar",
+);
+App::$strings["Find Channels"] = "Finde Kanäle";
+App::$strings["Enter name or interest"] = "Name oder Interessen eingeben";
+App::$strings["Connect/Follow"] = "Verbinden/Folgen";
+App::$strings["Examples: Robert Morgenstein, Fishing"] = "Beispiele: Robert Morgenstein, Angeln";
+App::$strings["Random Profile"] = "Zufallsprofil";
+App::$strings["Invite Friends"] = "Lade Freunde ein";
+App::$strings["Advanced example: name=fred and country=iceland"] = "Fortgeschrittenes Beispiel: name=fred and country=iceland";
+App::$strings["%d connection in common"] = array(
+	0 => "%d gemeinsame Verbindung",
+	1 => "%d gemeinsame Verbindungen",
+);
+App::$strings["show more"] = "mehr zeigen";
+App::$strings["Directory Options"] = "Verzeichnisoptionen";
+App::$strings["Safe Mode"] = "Sicherer Modus";
+App::$strings["Public Forums Only"] = "Nur öffentliche Foren";
+App::$strings["This Website Only"] = "Nur dieser Hub";
+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["Who can see this?"] = "Wer kann das sehen?";
+App::$strings["Custom selection"] = "Benutzerdefinierte Auswahl";
+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["Birthday"] = "Geburtstag";
+App::$strings["Age: "] = "Alter:";
+App::$strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-TT oder MM-TT";
+App::$strings["never"] = "Nie";
+App::$strings["less than a second ago"] = "Vor weniger als einer Sekunde";
+App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "vor %1\$d %2\$s";
+App::$strings["__ctx:relative_date__ year"] = array(
+	0 => "Jahr",
+	1 => "Jahre",
+);
+App::$strings["__ctx:relative_date__ month"] = array(
+	0 => "Monat",
+	1 => "Monate",
+);
+App::$strings["__ctx:relative_date__ week"] = array(
+	0 => "Woche",
+	1 => "Wochen",
+);
+App::$strings["__ctx:relative_date__ day"] = array(
+	0 => "Tag",
+	1 => "Tage",
+);
+App::$strings["__ctx:relative_date__ hour"] = array(
+	0 => "Stunde",
+	1 => "Stunden",
+);
+App::$strings["__ctx:relative_date__ minute"] = array(
+	0 => "Minute",
+	1 => "Minuten",
+);
+App::$strings["__ctx:relative_date__ second"] = array(
+	0 => "Sekunde",
+	1 => "Sekunden",
+);
+App::$strings["%1\$s's birthday"] = "%1\$ss Geburtstag";
+App::$strings["Happy Birthday %1\$s"] = "Alles Gute zum Geburtstag, %1\$s";
+App::$strings["Public Timeline"] = "Öffentliche Zeitleiste";
 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["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[" 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["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";
@@ -2294,6 +2333,7 @@ App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["Update %s failed. See error logs."] = "Aktualisierung %s fehlgeschlagen. Details in den Fehlerprotokollen.";
 App::$strings["Update Error at %s"] = "Aktualisierungsfehler auf %s";
 App::$strings["Create an account to access services and applications within the Hubzilla"] = "Erstelle ein Konto, um Anwendungen und Dienste innerhalb von Hubzilla nutzen zu können.";
+App::$strings["Login/Email"] = "Anmelden/E-Mail";
 App::$strings["Password"] = "Kennwort";
 App::$strings["Remember me"] = "Angaben speichern";
 App::$strings["Forgot your password?"] = "Passwort vergessen?";
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index d7a918c55..8cad587d6 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-10 00:02-0700\n"
-"PO-Revision-Date: 2016-06-10 18:33+0000\n"
-"Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n"
+"POT-Creation-Date: 2016-07-22 00:02-0700\n"
+"PO-Revision-Date: 2016-07-25 08:54+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/red-matrix/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,11 +23,156 @@ msgstr ""
 "Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../../Zotlabs/Access/PermissionRoles.php:182
+#: ../../include/permissions.php:904
+msgid "Social Networking"
+msgstr "Redes sociales"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:183
+#: ../../include/permissions.php:904
+msgid "Social - Mostly Public"
+msgstr "Social - Público en su mayor parte"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:184
+#: ../../include/permissions.php:904
+msgid "Social - Restricted"
+msgstr "Social - Restringido"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:185
+#: ../../include/permissions.php:904
+msgid "Social - Private"
+msgstr "Social - Privado"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:188
+#: ../../include/permissions.php:905
+msgid "Community Forum"
+msgstr "Foro de discusión"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:189
+#: ../../include/permissions.php:905
+msgid "Forum - Mostly Public"
+msgstr "Foro - Público en su mayor parte"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:190
+#: ../../include/permissions.php:905
+msgid "Forum - Restricted"
+msgstr "Foro - Restringido"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:191
+#: ../../include/permissions.php:905
+msgid "Forum - Private"
+msgstr "Foro - Privado"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:194
+#: ../../include/permissions.php:906
+msgid "Feed Republish"
+msgstr "Republicar un \"feed\""
+
+#: ../../Zotlabs/Access/PermissionRoles.php:195
+#: ../../include/permissions.php:906
+msgid "Feed - Mostly Public"
+msgstr "Feed - Público en su mayor parte"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:196
+#: ../../include/permissions.php:906
+msgid "Feed - Restricted"
+msgstr "Feed - Restringido"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:199
+#: ../../include/permissions.php:907
+msgid "Special Purpose"
+msgstr "Propósito especial"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:200
+#: ../../include/permissions.php:907
+msgid "Special - Celebrity/Soapbox"
+msgstr "Especial - Celebridad / Tribuna improvisada"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:201
+#: ../../include/permissions.php:907
+msgid "Special - Group Repository"
+msgstr "Especial - Repositorio de grupo"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:204 ../../include/selectors.php:49
+#: ../../include/selectors.php:66 ../../include/selectors.php:104
+#: ../../include/selectors.php:140 ../../include/permissions.php:908
+msgid "Other"
+msgstr "Otro"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:205
+#: ../../include/permissions.php:908
+msgid "Custom/Expert Mode"
+msgstr "Modo personalizado/experto"
+
+#: ../../Zotlabs/Access/Permissions.php:30
+msgid "Can view my channel stream and posts"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:31 ../../include/permissions.php:33
+msgid "Can send me their channel stream and posts"
+msgstr "Se me pueden enviar entradas y contenido de un canal"
+
+#: ../../Zotlabs/Access/Permissions.php:32 ../../include/permissions.php:27
+msgid "Can view my default channel profile"
+msgstr "Puede verse mi perfil de canal predeterminado."
+
+#: ../../Zotlabs/Access/Permissions.php:33 ../../include/permissions.php:28
+msgid "Can view my connections"
+msgstr "Pueden verse mis conexiones"
+
+#: ../../Zotlabs/Access/Permissions.php:34 ../../include/permissions.php:29
+msgid "Can view my file storage and photos"
+msgstr "Pueden verse mi repositorio de ficheros y mis fotos"
+
+#: ../../Zotlabs/Access/Permissions.php:35
+msgid "Can upload/modify my file storage and photos"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:36
+msgid "Can view my channel webpages"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:37
+msgid "Can create/edit my channel webpages"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:38
+msgid "Can post on my channel (wall) page"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:39 ../../include/permissions.php:35
+msgid "Can comment on or like my posts"
+msgstr "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'."
+
+#: ../../Zotlabs/Access/Permissions.php:40 ../../include/permissions.php:36
+msgid "Can send me private mail messages"
+msgstr "Se me pueden enviar mensajes privados"
+
+#: ../../Zotlabs/Access/Permissions.php:41
+msgid "Can like/dislike profiles and profile things"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:42
+msgid "Can forward to all my channel connections via @+ mentions in posts"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:43
+msgid "Can chat with me"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:44 ../../include/permissions.php:44
+msgid "Can source my public posts in derived channels"
+msgstr "Pueden utilizarse mis publicaciones públicas como origen de contenidos  en canales derivados"
+
+#: ../../Zotlabs/Access/Permissions.php:45
+msgid "Can administer my channel"
+msgstr ""
+
 #: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
 msgid "parent"
 msgstr "padre"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2620
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2605
 msgid "Collection"
 msgstr "Colección"
 
@@ -51,16 +196,17 @@ msgstr "Programar bandeja de entrada"
 msgid "Schedule Outbox"
 msgstr "Programar bandeja de salida"
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
-#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486
-#: ../../Zotlabs/Lib/Apps.php:561 ../../include/widgets.php:1505
-#: ../../include/conversation.php:1032
+#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:796
+#: ../../Zotlabs/Module/Photos.php:1241
+#: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:490
+#: ../../Zotlabs/Lib/Apps.php:565 ../../include/conversation.php:1035
+#: ../../include/widgets.php:1599
 msgid "Unknown"
 msgstr "Desconocido"
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93
-#: ../../include/conversation.php:1639
+#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:93
+#: ../../include/conversation.php:1654
 msgid "Files"
 msgstr "Ficheros"
 
@@ -73,22 +219,23 @@ msgid "Shared"
 msgstr "Compartido"
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
-#: ../../Zotlabs/Module/Webpages.php:186
+#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/New_channel.php:142
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Webpages.php:193
 msgid "Create"
 msgstr "Crear"
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1518
+#: ../../Zotlabs/Module/Photos.php:823 ../../Zotlabs/Module/Photos.php:1362
+#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1612
 msgid "Upload"
 msgstr "Subir"
 
 #: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:247
-#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:592
-#: ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:646
+#: ../../Zotlabs/Module/Settings.php:672
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr "Nombre"
@@ -98,7 +245,7 @@ msgid "Type"
 msgstr "Tipo"
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1344
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1324
 msgid "Size"
 msgstr "Tamaño"
 
@@ -107,34 +254,32 @@ msgstr "Tamaño"
 msgid "Last Modified"
 msgstr "Última modificación"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Editpost.php:84
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Editlayout.php:113
-#: ../../Zotlabs/Module/Editwebpage.php:146
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:187
-#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Lib/ThreadItem.php:106
-#: ../../include/channel.php:937 ../../include/channel.php:941
-#: ../../include/menu.php:108 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36
+#: ../../Zotlabs/Module/Editlayout.php:114
+#: ../../Zotlabs/Module/Editwebpage.php:145
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Settings.php:706 ../../Zotlabs/Module/Thing.php:260
+#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/page_widgets.php:9
+#: ../../include/page_widgets.php:39 ../../include/channel.php:976
+#: ../../include/channel.php:980 ../../include/menu.php:108
 msgid "Edit"
 msgstr "Editar"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Connedit.php:572
-#: ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Connedit.php:602
 #: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Editlayout.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039
+#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Photos.php:1171 ../../Zotlabs/Module/Admin.php:1039
 #: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114
-#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261
-#: ../../Zotlabs/Module/Webpages.php:189 ../../Zotlabs/Lib/Apps.php:338
-#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:657
+#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Module/Settings.php:707 ../../Zotlabs/Module/Thing.php:261
+#: ../../Zotlabs/Module/Webpages.php:196 ../../Zotlabs/Lib/Apps.php:342
+#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -160,74 +305,73 @@ msgstr "Crear nueva carpeta"
 msgid "Upload file"
 msgstr "Subir fichero"
 
-#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:112
+#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Module/Import_items.php:114
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../include/items.php:385
+#: ../../include/items.php:384
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Channel.php:105
-#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:65
+#: ../../Zotlabs/Module/Achievements.php:34
+#: ../../Zotlabs/Module/Connedit.php:390 ../../Zotlabs/Module/Id.php:76
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Events.php:264
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Events.php:265
-#: ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Chat.php:100
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:69
-#: ../../Zotlabs/Module/Editwebpage.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Filestorage.php:24
-#: ../../Zotlabs/Module/Filestorage.php:79
-#: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:210
-#: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070
+#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:104
+#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Pdledit.php:26
+#: ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:93
+#: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
+#: ../../Zotlabs/Module/Item.php:213 ../../Zotlabs/Module/Item.php:221
+#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Photos.php:73
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:121
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Channel.php:104
+#: ../../Zotlabs/Module/Channel.php:225 ../../Zotlabs/Module/Channel.php:266
 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Notifications.php:70
-#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68
-#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203
-#: ../../Zotlabs/Module/Profiles.php:601
-#: ../../Zotlabs/Module/Profile_photo.php:256
-#: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Appman.php:75
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
+#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Profile_photo.php:265
+#: ../../Zotlabs/Module/Profile_photo.php:278
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Editblock.php:67
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
-#: ../../Zotlabs/Module/Sharedwithme.php:11
+#: ../../Zotlabs/Module/Settings.php:626 ../../Zotlabs/Module/Setup.php:215
+#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Thing.php:274
+#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:331
 #: ../../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:25
-#: ../../Zotlabs/Module/Viewconnections.php:30
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
-#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/items.php:3438
-#: ../../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/photos.php:27
+#: ../../Zotlabs/Module/Webpages.php:73
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Api.php:13
+#: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../include/photos.php:27 ../../include/attach.php:141
+#: ../../include/attach.php:189 ../../include/attach.php:252
+#: ../../include/attach.php:266 ../../include/attach.php:273
+#: ../../include/attach.php:338 ../../include/attach.php:352
+#: ../../include/attach.php:359 ../../include/attach.php:439
+#: ../../include/attach.php:901 ../../include/attach.php:972
+#: ../../include/attach.php:1124 ../../include/items.php:3448
 msgid "Permission denied."
 msgstr "Acceso denegado."
 
@@ -235,9 +379,9 @@ msgstr "Acceso denegado."
 msgid "Not Found"
 msgstr "No encontrado"
 
-#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97
-#: ../../Zotlabs/Module/Page.php:93
+#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Display.php:118
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Help.php:97
+#: ../../Zotlabs/Module/Block.php:79
 msgid "Page not found."
 msgstr "Página no encontrada."
 
@@ -253,13 +397,13 @@ msgstr "La autenticación desde su servidor está bloqueada. Ha iniciado sesión
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."
 
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../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/channel.php:837
+#: ../../Zotlabs/Module/Achievements.php:15
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Layouts.php:31
+#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:33
+#: ../../include/channel.php:876
 msgid "Requested profile is not available."
 msgstr "El perfil solicitado no está disponible."
 
@@ -267,229 +411,6 @@ msgstr "El perfil solicitado no está disponible."
 msgid "Some blurb about what to do when you're new here"
 msgstr "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí"
 
-#: ../../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:151 ../../include/text.php:2265
-msgid "Blocks"
-msgstr "Bloques"
-
-#: ../../Zotlabs/Module/Blocks.php:153
-msgid "Block Title"
-msgstr "Título del bloque"
-
-#: ../../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: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:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
-#: ../../include/conversation.php:1208
-msgid "Share"
-msgstr "Compartir"
-
-#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193
-#: ../../include/page_widgets.php:39
-msgid "View"
-msgstr "Ver"
-
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Block.php:43
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
-msgid "Channel not found."
-msgstr "Canal no encontrado."
-
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr "Permisos denegados."
-
-#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
-msgid "l, F j"
-msgstr "l j F"
-
-#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
-#: ../../include/text.php:1732
-msgid "Link to Source"
-msgstr "Enlazar con la entrada en su ubicación original"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Edit Event"
-msgstr "Editar el evento"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Create Event"
-msgstr "Crear un evento"
-
-#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
-#: ../../Zotlabs/Module/Photos.php:949
-msgid "Previous"
-msgstr "Anterior"
-
-#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
-#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
-msgid "Next"
-msgstr "Siguiente"
-
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
-#: ../../include/widgets.php:755
-msgid "Export"
-msgstr "Exportar"
-
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
-#: ../../include/widgets.php:756
-msgid "Import"
-msgstr "Importar"
-
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Import.php:550
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Photos.php:677
-#: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
-#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032
-#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421
-#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733
-#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Appman.php:126
-#: ../../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:312
-#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
-#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:757
-#: ../../include/widgets.php:769 ../../include/js_strings.php:22
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Submit"
-msgstr "Enviar"
-
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
-msgid "Today"
-msgstr "Hoy"
-
-#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
-msgid "You must be logged in to see this page."
-msgstr "Debe haber iniciado sesión para poder ver esta página."
-
-#: ../../Zotlabs/Module/Channel.php:41
-msgid "Posts and comments"
-msgstr "Publicaciones y comentarios"
-
-#: ../../Zotlabs/Module/Channel.php:42
-msgid "Only posts"
-msgstr "Solo publicaciones"
-
-#: ../../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/Chat.php:181
-msgid "Room not found"
-msgstr "Sala no encontrada"
-
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "Leave Room"
-msgstr "Abandonar la sala"
-
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "Delete Room"
-msgstr "Eliminar esta sala"
-
-#: ../../Zotlabs/Module/Chat.php:199
-msgid "I am away right now"
-msgstr "Estoy ausente momentáneamente"
-
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "I am online"
-msgstr "Estoy conectado/a"
-
-#: ../../Zotlabs/Module/Chat.php:202
-msgid "Bookmark this room"
-msgstr "Añadir esta sala a Marcadores"
-
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
-#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176
-msgid "Please enter a link URL:"
-msgstr "Por favor, introduzca la dirección del enlace:"
-
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
-#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
-#: ../../include/conversation.php:1256
-msgid "Encrypt text"
-msgstr "Cifrar texto"
-
-#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143
-msgid "Insert web link"
-msgstr "Insertar enlace web"
-
-#: ../../Zotlabs/Module/Chat.php:218
-msgid "Feature disabled."
-msgstr "Funcionalidad deshabilitada."
-
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "New Chatroom"
-msgstr "Nueva sala de chat"
-
-#: ../../Zotlabs/Module/Chat.php:233
-msgid "Chatroom name"
-msgstr "Nombre de la sala de chat"
-
-#: ../../Zotlabs/Module/Chat.php:234
-msgid "Expiration of chats (minutes)"
-msgstr "Caducidad de los mensajes en los chats (en minutos)"
-
-#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
-#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
-#: ../../include/acl_selectors.php:283
-msgid "Permissions"
-msgstr "Permisos"
-
-#: ../../Zotlabs/Module/Chat.php:246
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "Salas de chat de %1$s"
-
-#: ../../Zotlabs/Module/Chat.php:251
-msgid "No chatrooms available"
-msgstr "No hay salas de chat disponibles"
-
-#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Create New"
-msgstr "Crear"
-
-#: ../../Zotlabs/Module/Chat.php:255
-msgid "Expiration"
-msgstr "Caducidad"
-
-#: ../../Zotlabs/Module/Chat.php:256
-msgid "min"
-msgstr "min"
-
 #: ../../Zotlabs/Module/Chatsvc.php:117
 msgid "Away"
 msgstr "Ausente"
@@ -498,65 +419,6 @@ msgstr "Ausente"
 msgid "Online"
 msgstr "Conectado/a"
 
-#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40
-msgid "Invalid item."
-msgstr "Elemento no válido."
-
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
-msgstr "Marcador añadido"
-
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
-msgstr "Mis marcadores"
-
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
-msgstr "Marcadores de mis conexiones"
-
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
-msgstr "Continuar"
-
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
-msgstr "Configuración del canal premium"
-
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
-msgstr "Habilitar restricciones de conexión del canal premium"
-
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Por favor introduzca sus restricciones o condiciones, como recibo de paypal, normas de uso, etc."
-
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Este canal puede requerir antes de conectar unos pasos adicionales o el conocimiento de las siguientes condiciones:"
-
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Las posibles conexiones verán, por tanto, el siguiente texto antes de proceder:"
-
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "Al continuar, certifico que he cumplido con todas las instrucciones proporcionadas en esta página."
-
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(No ha sido proporcionada ninguna instrucción específica por el propietario del canal.)"
-
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
-msgstr "Canal premium o restringido"
-
 #: ../../Zotlabs/Module/Connedit.php:80
 msgid "Could not access contact record."
 msgstr "No se ha podido acceder al registro de contacto."
@@ -565,317 +427,350 @@ msgstr "No se ha podido acceder al registro de contacto."
 msgid "Could not locate selected profile."
 msgstr "No se ha podido localizar el perfil seleccionado."
 
-#: ../../Zotlabs/Module/Connedit.php:227
+#: ../../Zotlabs/Module/Connedit.php:248
 msgid "Connection updated."
 msgstr "Conexión actualizada."
 
-#: ../../Zotlabs/Module/Connedit.php:229
+#: ../../Zotlabs/Module/Connedit.php:250
 msgid "Failed to update connection record."
 msgstr "Error al actualizar el registro de la conexión."
 
-#: ../../Zotlabs/Module/Connedit.php:276
+#: ../../Zotlabs/Module/Connedit.php:300
 msgid "is now connected to"
 msgstr "ahora está conectado/a"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89
-#: ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:459
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Connedit.php:685
+#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:459 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:89
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "No"
 msgstr "No"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
-#: ../../Zotlabs/Module/Api.php:88 ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:461
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:461 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:88
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "Yes"
 msgstr "Sí"
 
-#: ../../Zotlabs/Module/Connedit.php:411
+#: ../../Zotlabs/Module/Connedit.php:435
 msgid "Could not access address book record."
 msgstr "No se pudo acceder al registro en su libreta de direcciones."
 
-#: ../../Zotlabs/Module/Connedit.php:425
+#: ../../Zotlabs/Module/Connedit.php:455
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Recarga fallida - no se puede encontrar el canal en este momento."
 
-#: ../../Zotlabs/Module/Connedit.php:440 ../../Zotlabs/Module/Connedit.php:449
-#: ../../Zotlabs/Module/Connedit.php:458 ../../Zotlabs/Module/Connedit.php:467
-#: ../../Zotlabs/Module/Connedit.php:480
+#: ../../Zotlabs/Module/Connedit.php:470 ../../Zotlabs/Module/Connedit.php:479
+#: ../../Zotlabs/Module/Connedit.php:488 ../../Zotlabs/Module/Connedit.php:497
+#: ../../Zotlabs/Module/Connedit.php:510
 msgid "Unable to set address book parameters."
 msgstr "No ha sido posible establecer los parámetros de la libreta de direcciones."
 
-#: ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:533
 msgid "Connection has been removed."
 msgstr "La conexión ha sido eliminada."
 
-#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219
-#: ../../include/nav.php:86 ../../include/conversation.php:954
+#: ../../Zotlabs/Module/Connedit.php:549 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:86 ../../include/conversation.php:957
 msgid "View Profile"
 msgstr "Ver el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:522
+#: ../../Zotlabs/Module/Connedit.php:552
 #, php-format
 msgid "View %s's profile"
 msgstr "Ver el perfil de %s"
 
-#: ../../Zotlabs/Module/Connedit.php:526
+#: ../../Zotlabs/Module/Connedit.php:556
 msgid "Refresh Permissions"
 msgstr "Recargar los permisos"
 
-#: ../../Zotlabs/Module/Connedit.php:529
+#: ../../Zotlabs/Module/Connedit.php:559
 msgid "Fetch updated permissions"
 msgstr "Obtener los permisos actualizados"
 
-#: ../../Zotlabs/Module/Connedit.php:533
+#: ../../Zotlabs/Module/Connedit.php:563
 msgid "Recent Activity"
 msgstr "Actividad reciente"
 
-#: ../../Zotlabs/Module/Connedit.php:536
+#: ../../Zotlabs/Module/Connedit.php:566
 msgid "View recent posts and comments"
 msgstr "Ver publicaciones y comentarios recientes"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1041
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1040
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1040
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../../Zotlabs/Module/Connedit.php:543
+#: ../../Zotlabs/Module/Connedit.php:573
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Bloquear (o desbloquear) todas las comunicaciones con esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:544
+#: ../../Zotlabs/Module/Connedit.php:574
 msgid "This connection is blocked!"
 msgstr "¡Esta conexión está bloqueada!"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 #: ../../Zotlabs/Module/Connections.php:277
 #: ../../Zotlabs/Module/Notifications.php:55
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../../Zotlabs/Module/Connedit.php:551
+#: ../../Zotlabs/Module/Connedit.php:581
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignorar (o dejar de ignorar) todas las comunicaciones entrantes de esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:552
+#: ../../Zotlabs/Module/Connedit.php:582
 msgid "This connection is ignored!"
 msgstr "¡Esta conexión es ignorada!"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Unarchive"
 msgstr "Desarchivar"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Archive"
 msgstr "Archivar"
 
-#: ../../Zotlabs/Module/Connedit.php:559
+#: ../../Zotlabs/Module/Connedit.php:589
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos"
 
-#: ../../Zotlabs/Module/Connedit.php:560
+#: ../../Zotlabs/Module/Connedit.php:590
 msgid "This connection is archived!"
 msgstr "¡Esta conexión esta archivada!"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Unhide"
 msgstr "Mostrar"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Hide"
 msgstr "Ocultar"
 
-#: ../../Zotlabs/Module/Connedit.php:567
+#: ../../Zotlabs/Module/Connedit.php:597
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Ocultar o mostrar esta conexión a sus otras conexiones"
 
-#: ../../Zotlabs/Module/Connedit.php:568
+#: ../../Zotlabs/Module/Connedit.php:598
 msgid "This connection is hidden!"
 msgstr "¡Esta conexión está oculta!"
 
-#: ../../Zotlabs/Module/Connedit.php:575
+#: ../../Zotlabs/Module/Connedit.php:605
 msgid "Delete this connection"
 msgstr "Eliminar esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493
+#: ../../Zotlabs/Module/Connedit.php:620 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Yo"
 
-#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494
+#: ../../Zotlabs/Module/Connedit.php:621 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Familia"
 
-#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342
-#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
-#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
-#: ../../include/widgets.php:495 ../../include/selectors.php:123
-#: ../../include/channel.php:389 ../../include/channel.php:390
-#: ../../include/channel.php:397
+#: ../../Zotlabs/Module/Connedit.php:622 ../../Zotlabs/Module/Settings.php:391
+#: ../../Zotlabs/Module/Settings.php:395 ../../Zotlabs/Module/Settings.php:396
+#: ../../Zotlabs/Module/Settings.php:399 ../../Zotlabs/Module/Settings.php:410
+#: ../../include/channel.php:402 ../../include/channel.php:403
+#: ../../include/channel.php:410 ../../include/selectors.php:123
+#: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "Amigos/as"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496
+#: ../../Zotlabs/Module/Connedit.php:623 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Conocidos/as"
 
-#: ../../Zotlabs/Module/Connedit.php:594
+#: ../../Zotlabs/Module/Connedit.php:624
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
 msgid "All"
 msgstr "Todos/as"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Approve this connection"
 msgstr "Aprobar esta conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Accept connection to allow communication"
 msgstr "Aceptar la conexión para permitir la comunicación"
 
-#: ../../Zotlabs/Module/Connedit.php:659
+#: ../../Zotlabs/Module/Connedit.php:690
 msgid "Set Affinity"
 msgstr "Ajustar la afinidad"
 
-#: ../../Zotlabs/Module/Connedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:693
 msgid "Set Profile"
 msgstr "Ajustar el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Zotlabs/Module/Connedit.php:696
 msgid "Set Affinity & Profile"
 msgstr "Ajustar la afinidad y el perfil"
 
-#: ../../Zotlabs/Module/Connedit.php:698
+#: ../../Zotlabs/Module/Connedit.php:745
 msgid "none"
 msgstr "-"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/widgets.php:623
 msgid "Connection Default Permissions"
 msgstr "Permisos predeterminados de conexión"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3926
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/items.php:3935
 #, php-format
 msgid "Connection: %s"
 msgstr "Conexión: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Apply these permissions automatically"
 msgstr "Aplicar estos permisos automaticamente"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Connection requests will be approved without your interaction"
 msgstr "Las solicitudes de conexión serán aprobadas sin su intervención"
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Zotlabs/Module/Connedit.php:752
 msgid "This connection's primary address is"
 msgstr "La dirección primaria de esta conexión es"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:753
 msgid "Available locations:"
 msgstr "Ubicaciones disponibles:"
 
-#: ../../Zotlabs/Module/Connedit.php:710
+#: ../../Zotlabs/Module/Connedit.php:757
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Los permisos indicados en esta página serán aplicados en todas las nuevas conexiones."
 
-#: ../../Zotlabs/Module/Connedit.php:711
+#: ../../Zotlabs/Module/Connedit.php:758
 msgid "Connection Tools"
 msgstr "Gestión de las conexiones"
 
-#: ../../Zotlabs/Module/Connedit.php:713
+#: ../../Zotlabs/Module/Connedit.php:760
 msgid "Slide to adjust your degree of friendship"
 msgstr "Deslizar para ajustar el grado de amistad"
 
-#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159
+#: ../../Zotlabs/Module/Connedit.php:761 ../../Zotlabs/Module/Rate.php:159
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Zotlabs/Module/Connedit.php:762
 msgid "Slide to adjust your rating"
 msgstr "Deslizar para ajustar su valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:763 ../../Zotlabs/Module/Connedit.php:768
 msgid "Optionally explain your rating"
 msgstr "Opcionalmente, puede explicar su valoración"
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Zotlabs/Module/Connedit.php:765
 msgid "Custom Filter"
 msgstr "Filtro personalizado"
 
-#: ../../Zotlabs/Module/Connedit.php:719
+#: ../../Zotlabs/Module/Connedit.php:766
 msgid "Only import posts with this text"
 msgstr "Importar solo entradas que contengan este texto"
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:766 ../../Zotlabs/Module/Connedit.php:767
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "Una sola opción por línea: palabras, #etiquetas,  /patrones/ o lang=xx. Dejar en blanco para importarlo todo"
 
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:767
 msgid "Do not import posts with this text"
 msgstr "No importar entradas que contengan este texto"
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:769
 msgid "This information is public!"
 msgstr "¡Esta información es pública!"
 
-#: ../../Zotlabs/Module/Connedit.php:727
+#: ../../Zotlabs/Module/Connedit.php:774
 msgid "Connection Pending Approval"
 msgstr "Conexión pendiente de aprobación"
 
-#: ../../Zotlabs/Module/Connedit.php:730
+#: ../../Zotlabs/Module/Connedit.php:777
 msgid "inherited"
 msgstr "heredado"
 
-#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Module/Connedit.php:778 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:238
+#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Pdledit.php:66
+#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Import.php:560
+#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Mail.php:370 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771
+#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1211
+#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Admin.php:1648
+#: ../../Zotlabs/Module/Admin.php:1733 ../../Zotlabs/Module/Admin.php:2116
+#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Settings.php:644
+#: ../../Zotlabs/Module/Settings.php:757 ../../Zotlabs/Module/Settings.php:806
+#: ../../Zotlabs/Module/Settings.php:832 ../../Zotlabs/Module/Settings.php:855
+#: ../../Zotlabs/Module/Settings.php:943
+#: ../../Zotlabs/Module/Settings.php:1129 ../../Zotlabs/Module/Setup.php:312
+#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Thing.php:316
+#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:763
+#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:99
+msgid "Submit"
+msgstr "Enviar"
+
+#: ../../Zotlabs/Module/Connedit.php:779
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura."
 
-#: ../../Zotlabs/Module/Connedit.php:734
+#: ../../Zotlabs/Module/Connedit.php:781
 msgid "Their Settings"
 msgstr "Sus ajustes"
 
-#: ../../Zotlabs/Module/Connedit.php:735
+#: ../../Zotlabs/Module/Connedit.php:782
 msgid "My Settings"
 msgstr "Mis ajustes"
 
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:784
 msgid "Individual Permissions"
 msgstr "Permisos individuales"
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Zotlabs/Module/Connedit.php:785
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -883,7 +778,7 @@ msgid ""
 " settings here."
 msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. <strong>No</strong> puede cambiar estos ajustes aquí."
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Zotlabs/Module/Connedit.php:786
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -891,17 +786,121 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados."
 
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Connedit.php:787
 msgid "Last update:"
 msgstr "Última actualización:"
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Directory.php:63
+#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:20
+#: ../../Zotlabs/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr "Acceso público denegado."
 
+#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:32
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
+#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3369
+msgid "Item not found."
+msgstr "Elemento no encontrado."
+
+#: ../../Zotlabs/Module/Id.php:13
+msgid "First Name"
+msgstr "Nombre"
+
+#: ../../Zotlabs/Module/Id.php:14
+msgid "Last Name"
+msgstr "Apellido"
+
+#: ../../Zotlabs/Module/Id.php:15
+msgid "Nickname"
+msgstr "Sobrenombre o Alias"
+
+#: ../../Zotlabs/Module/Id.php:16
+msgid "Full Name"
+msgstr "Nombre completo"
+
+#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../include/network.php:2203
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
+#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:238
+msgid "Profile Photo"
+msgstr "Foto del perfil"
+
+#: ../../Zotlabs/Module/Id.php:22
+msgid "Profile Photo 16px"
+msgstr "Foto del perfil 16px"
+
+#: ../../Zotlabs/Module/Id.php:23
+msgid "Profile Photo 32px"
+msgstr "Foto del perfil 32px"
+
+#: ../../Zotlabs/Module/Id.php:24
+msgid "Profile Photo 48px"
+msgstr "Foto del perfil 48px"
+
+#: ../../Zotlabs/Module/Id.php:25
+msgid "Profile Photo 64px"
+msgstr "Foto del perfil 64px"
+
+#: ../../Zotlabs/Module/Id.php:26
+msgid "Profile Photo 80px"
+msgstr "Foto del perfil 80px"
+
+#: ../../Zotlabs/Module/Id.php:27
+msgid "Profile Photo 128px"
+msgstr "Foto del perfil 128px"
+
+#: ../../Zotlabs/Module/Id.php:28
+msgid "Timezone"
+msgstr "Huso horario"
+
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
+msgid "Homepage URL"
+msgstr "Dirección de la página personal"
+
+#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:236
+msgid "Language"
+msgstr "Idioma"
+
+#: ../../Zotlabs/Module/Id.php:31
+msgid "Birth Year"
+msgstr "Año de nacimiento"
+
+#: ../../Zotlabs/Module/Id.php:32
+msgid "Birth Month"
+msgstr "Mes de nacimiento"
+
+#: ../../Zotlabs/Module/Id.php:33
+msgid "Birth Day"
+msgstr "Día de nacimiento"
+
+#: ../../Zotlabs/Module/Id.php:34
+msgid "Birthdate"
+msgstr "Fecha de nacimiento"
+
+#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
+msgid "Gender"
+msgstr "Género"
+
+#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Male"
+msgstr "Hombre"
+
+#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Female"
+msgstr "Mujer"
+
+#: ../../Zotlabs/Module/Follow.php:34
+msgid "Channel added."
+msgstr "Canal añadido."
+
 #: ../../Zotlabs/Module/Directory.php:243
 #, php-format
 msgid "%d rating"
@@ -921,12 +920,12 @@ msgstr "Estado:"
 msgid "Homepage: "
 msgstr "Página personal:"
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1223
 msgid "Age:"
 msgstr "Edad:"
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
-#: ../../include/event.php:84 ../../include/channel.php:1027
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/channel.php:1066
+#: ../../include/event.php:52 ../../include/event.php:84
 #: ../../include/bb2diaspora.php:507
 msgid "Location:"
 msgstr "Ubicación:"
@@ -935,18 +934,18 @@ msgstr "Ubicación:"
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1239
 msgid "Hometown:"
 msgstr "Lugar de nacimiento:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1247
 msgid "About:"
 msgstr "Sobre mí:"
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147
-#: ../../include/widgets.php:184 ../../include/connections.php:78
-#: ../../include/conversation.php:956 ../../include/channel.php:1012
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1051
+#: ../../include/connections.php:78 ../../include/conversation.php:959
+#: ../../include/widgets.php:147 ../../include/widgets.php:184
 msgid "Connect"
 msgstr "Conectar"
 
@@ -1022,38 +1021,322 @@ msgstr "De más antiguo a más nuevo"
 msgid "No entries (some entries may be hidden)."
 msgstr "Sin entradas (algunas entradas pueden estar ocultas)."
 
-#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
-#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3359
-msgid "Item not found."
-msgstr "Elemento no encontrado."
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
+msgstr "Continuar"
+
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
+msgstr "Configuración del canal premium"
+
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
+msgstr "Habilitar restricciones de conexión del canal premium"
+
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Por favor introduzca sus restricciones o condiciones, como recibo de paypal, normas de uso, etc."
+
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Este canal puede requerir antes de conectar unos pasos adicionales o el conocimiento de las siguientes condiciones:"
+
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Las posibles conexiones verán, por tanto, el siguiente texto antes de proceder:"
+
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Al continuar, certifico que he cumplido con todas las instrucciones proporcionadas en esta página."
+
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(No ha sido proporcionada ninguna instrucción específica por el propietario del canal.)"
+
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
+msgstr "Canal premium o restringido"
+
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
+msgstr "Entradas de calendario importadas."
+
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+msgstr "No se han encontrado entradas de calendario."
+
+#: ../../Zotlabs/Module/Events.php:104
+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
+msgid "Unable to generate preview."
+msgstr "No se puede crear la vista previa."
+
+#: ../../Zotlabs/Module/Events.php:113
+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
+msgid "Event not found."
+msgstr "Evento no encontrado."
+
+#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:372
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
+#: ../../include/text.php:1924 ../../include/event.php:951
+msgid "event"
+msgstr "evento"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Edit event title"
+msgstr "Editar el título del evento"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Event title"
+msgstr "Título del evento"
+
+#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
+#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
+#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
+#: ../../include/datetime.php:245
+msgid "Required"
+msgstr "Obligatorio"
+
+#: ../../Zotlabs/Module/Events.php:450
+msgid "Categories (comma-separated list)"
+msgstr "Categorías (lista separada por comas)"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Edit Category"
+msgstr "Editar la categoría"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Category"
+msgstr "Categoría"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Edit start date and time"
+msgstr "Modificar la fecha y hora de comienzo"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Start date and time"
+msgstr "Fecha y hora de comienzo"
+
+#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
+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
+msgid "Edit finish date and time"
+msgstr "Modificar la fecha y hora de terminación"
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Finish date and time"
+msgstr "Fecha y hora de terminación"
+
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+msgid "Adjust for viewer timezone"
+msgstr "Ajustar para obtener el visor de los husos horarios"
+
+#: ../../Zotlabs/Module/Events.php:459
+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
+msgid "Edit Description"
+msgstr "Editar la descripción"
+
+#: ../../Zotlabs/Module/Events.php:461 ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Rbmark.php:101
+msgid "Description"
+msgstr "Descripción"
+
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Location"
+msgstr "Modificar la dirección"
+
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Profiles.php:477
+#: ../../Zotlabs/Module/Profiles.php:698 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
+msgid "Location"
+msgstr "Ubicación"
+
+#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
+msgid "Share this event"
+msgstr "Compartir este evento"
+
+#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1091
+#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Lib/ThreadItem.php:719
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1198
+msgid "Preview"
+msgstr "Previsualizar"
+
+#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1247
+msgid "Permission settings"
+msgstr "Configuración de permisos"
+
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Advanced Options"
+msgstr "Opciones avanzadas"
+
+#: ../../Zotlabs/Module/Events.php:587 ../../Zotlabs/Module/Cal.php:259
+msgid "l, F j"
+msgstr "l j F"
+
+#: ../../Zotlabs/Module/Events.php:609
+msgid "Edit event"
+msgstr "Editar evento"
+
+#: ../../Zotlabs/Module/Events.php:611
+msgid "Delete event"
+msgstr "Borrar evento"
+
+#: ../../Zotlabs/Module/Events.php:636 ../../Zotlabs/Module/Cal.php:308
+#: ../../include/text.php:1712
+msgid "Link to Source"
+msgstr "Enlazar con la entrada en su ubicación original"
+
+#: ../../Zotlabs/Module/Events.php:645
+msgid "calendar"
+msgstr "calendario"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Edit Event"
+msgstr "Editar el evento"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Create Event"
+msgstr "Crear un evento"
+
+#: ../../Zotlabs/Module/Events.php:665 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
+#: ../../Zotlabs/Module/Photos.php:947
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:675
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
+#: ../../Zotlabs/Module/Photos.php:956 ../../Zotlabs/Module/Setup.php:267
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Cal.php:334
+msgid "Export"
+msgstr "Exportar"
+
+#: ../../Zotlabs/Module/Events.php:670 ../../Zotlabs/Module/Layouts.php:197
+#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Webpages.php:200 ../../include/page_widgets.php:42
+msgid "View"
+msgstr "Ver"
+
+#: ../../Zotlabs/Module/Events.php:671
+msgid "Month"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:672
+msgid "Week"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:673
+msgid "Day"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:341
+msgid "Today"
+msgstr "Hoy"
+
+#: ../../Zotlabs/Module/Events.php:707
+msgid "Event removed"
+msgstr "Evento borrado"
+
+#: ../../Zotlabs/Module/Events.php:710
+msgid "Failed to remove event"
+msgstr "Error al eliminar el evento"
+
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
+msgstr "Marcador añadido"
+
+#: ../../Zotlabs/Module/Bookmarks.php:75
+msgid "My Bookmarks"
+msgstr "Mis marcadores"
+
+#: ../../Zotlabs/Module/Bookmarks.php:86
+msgid "My Connections Bookmarks"
+msgstr "Marcadores de mis conexiones"
 
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 #: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:81
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 msgid "Item not found"
 msgstr "Elemento no encontrado"
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228
-msgid "Title (optional)"
-msgstr "Título (opcional)"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
+msgstr "El elemento no es editable"
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
-msgstr "Modificar este bloque"
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:134
+msgid "Edit post"
+msgstr "Editar la entrada"
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
-msgstr "Ningún canal."
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222
+#: ../../include/nav.php:92 ../../include/conversation.php:1647
+msgid "Photos"
+msgstr "Fotos"
 
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
-msgstr "Conexiones comunes"
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:645
+#: ../../Zotlabs/Module/Settings.php:671 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Wiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:202 ../../include/conversation.php:1235
+#: ../../include/conversation.php:1274
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
-msgstr "Ninguna  conexión en común."
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
+msgstr "Elemento no válido."
+
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Wall_upload.php:33
+msgid "Channel not found."
+msgstr "Canal no encontrado."
+
+#: ../../Zotlabs/Module/Page.php:131
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
+" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Save to Folder:"
+msgstr "Guardar en carpeta:"
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "- select -"
+msgstr "- seleccionar -"
+
+#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
+#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:926
+#: ../../include/text.php:938 ../../include/widgets.php:201
+msgid "Save"
+msgstr "Guardar"
 
 #: ../../Zotlabs/Module/Connections.php:56
 #: ../../Zotlabs/Module/Connections.php:161
@@ -1081,7 +1364,7 @@ msgstr "Archivadas"
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1535
+#: ../../include/conversation.php:1550
 msgid "New"
 msgstr "Nuevas"
 
@@ -1168,15 +1451,15 @@ msgstr "Ignorar esta conexión"
 msgid "Recent activity"
 msgstr "Actividad reciente"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
-#: ../../include/text.php:875 ../../include/nav.php:186
+#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209
+#: ../../include/nav.php:188 ../../include/text.php:855
 msgid "Connections"
 msgstr "Conexiones"
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:228 ../../include/text.php:945
-#: ../../include/text.php:957 ../../include/nav.php:165
-#: ../../include/acl_selectors.php:276
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:167
+#: ../../include/text.php:925 ../../include/text.php:937
+#: ../../include/acl_selectors.php:274
 msgid "Search"
 msgstr "Buscar"
 
@@ -1189,7 +1472,7 @@ msgid "Connections search"
 msgstr "Buscar conexiones"
 
 #: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:79
+#: ../../Zotlabs/Module/Profile_photo.php:61
 msgid "Image uploaded but image cropping failed."
 msgstr "Imagen actualizada, pero el recorte de la imagen ha fallado. "
 
@@ -1199,66 +1482,66 @@ msgid "Cover Photos"
 msgstr "Imágenes de portada del perfil"
 
 #: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:133
+#: ../../Zotlabs/Module/Profile_photo.php:135
 msgid "Image resize failed."
 msgstr "El ajuste del tamaño de la imagen ha fallado."
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144
+#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:148
 msgid "Unable to process image"
 msgstr "No ha sido posible procesar la imagen"
 
 #: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:217
+#: ../../Zotlabs/Module/Profile_photo.php:223
 msgid "Image upload failed."
 msgstr "La carga de la imagen ha fallado."
 
 #: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:236
+#: ../../Zotlabs/Module/Profile_photo.php:242
 msgid "Unable to process image."
 msgstr "No ha sido posible procesar la imagen."
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4270
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4283
 msgid "female"
 msgstr "mujer"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4271
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4284
 #, 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:4272
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4285
 msgid "male"
 msgstr "hombre"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4273
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4286
 #, 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:4275
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4288
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s ha actualizado su %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1661
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1726
 msgid "cover photo"
 msgstr "Imagen de portada del perfil"
 
 #: ../../Zotlabs/Module/Cover_photo.php:303
 #: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:283
-#: ../../Zotlabs/Module/Profile_photo.php:324
+#: ../../Zotlabs/Module/Profile_photo.php:300
+#: ../../Zotlabs/Module/Profile_photo.php:341
 msgid "Photo not available."
 msgstr "Foto no disponible."
 
 #: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:387
 msgid "Upload File:"
 msgstr "Subir fichero:"
 
 #: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:366
+#: ../../Zotlabs/Module/Profile_photo.php:388
 msgid "Select a profile:"
 msgstr "Seleccionar un perfil:"
 
@@ -1267,200 +1550,69 @@ msgid "Upload Cover Photo"
 msgstr "Subir imagen de portada del perfil"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:985
+#: ../../Zotlabs/Module/Profile_photo.php:396
+#: ../../Zotlabs/Module/Settings.php:1080
 msgid "or"
 msgstr "o"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "skip this step"
 msgstr "Omitir este paso"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "select a photo from your photo albums"
 msgstr "Seleccione una foto de sus álbumes de fotos"
 
 #: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Profile_photo.php:415
 msgid "Crop Image"
 msgstr "Recortar imagen"
 
 #: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:391
+#: ../../Zotlabs/Module/Profile_photo.php:416
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Por favor ajuste el recorte de la imagen para una visión óptima."
 
 #: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:393
+#: ../../Zotlabs/Module/Profile_photo.php:418
 msgid "Done Editing"
 msgstr "Edición completada"
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
-msgstr "El elemento no es editable"
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
+msgid "webpage"
+msgstr "página web"
 
-#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
-msgid "Edit post"
-msgstr "Editar la entrada"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
+msgid "block"
+msgstr "bloque"
 
-#: ../../Zotlabs/Module/Events.php:26
-msgid "Calendar entries imported."
-msgstr "Entradas de calendario importadas."
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
+msgid "layout"
+msgstr "plantilla"
 
-#: ../../Zotlabs/Module/Events.php:28
-msgid "No calendar entries found."
-msgstr "No se han encontrado entradas de calendario."
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
+msgid "menu"
+msgstr "menú"
 
-#: ../../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/Impel.php:187
+#, php-format
+msgid "%s element installed"
+msgstr "%s elemento instalado"
 
-#: ../../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/Impel.php:190
+#, php-format
+msgid "%s element installation failed"
+msgstr "Elemento con instalación fallida: %s"
 
-#: ../../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/Cal.php:69
+msgid "Permissions denied."
+msgstr "Permisos denegados."
 
-#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
-msgid "Event not found."
-msgstr "Evento no encontrado."
-
-#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949
-#: ../../include/text.php:1943 ../../include/conversation.php:123
-msgid "event"
-msgstr "evento"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Edit event title"
-msgstr "Editar el título del evento"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Event title"
-msgstr "Título del evento"
-
-#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
-#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
-#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
-#: ../../include/datetime.php:245
-msgid "Required"
-msgstr "Obligatorio"
-
-#: ../../Zotlabs/Module/Events.php:451
-msgid "Categories (comma-separated list)"
-msgstr "Categorías (lista separada por comas)"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Edit Category"
-msgstr "Editar la categoría"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Category"
-msgstr "Categoría"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Edit start date and time"
-msgstr "Modificar la fecha y hora de comienzo"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Start date and time"
-msgstr "Fecha y hora de comienzo"
-
-#: ../../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:458
-msgid "Edit finish date and time"
-msgstr "Modificar la fecha y hora de terminación"
-
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Finish date and time"
-msgstr "Fecha y hora de terminación"
-
-#: ../../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: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:462
-msgid "Edit Description"
-msgstr "Editar la descripción"
-
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117
-#: ../../Zotlabs/Module/Rbmark.php:101
-msgid "Description"
-msgstr "Descripción"
-
-#: ../../Zotlabs/Module/Events.php:464
-msgid "Edit Location"
-msgstr "Modificar la dirección"
-
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
-#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
-msgid "Location"
-msgstr "Ubicación"
-
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
-msgid "Share this event"
-msgstr "Compartir este evento"
-
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:719
-#: ../../include/conversation.php:1187 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr "Previsualizar"
-
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232
-msgid "Permission settings"
-msgstr "Configuración de permisos"
-
-#: ../../Zotlabs/Module/Events.php:476
-msgid "Advanced Options"
-msgstr "Opciones avanzadas"
-
-#: ../../Zotlabs/Module/Events.php:610
-msgid "Edit event"
-msgstr "Editar evento"
-
-#: ../../Zotlabs/Module/Events.php:612
-msgid "Delete event"
-msgstr "Borrar evento"
-
-#: ../../Zotlabs/Module/Events.php:646
-msgid "calendar"
-msgstr "calendario"
-
-#: ../../Zotlabs/Module/Events.php:706
-msgid "Event removed"
-msgstr "Evento borrado"
-
-#: ../../Zotlabs/Module/Events.php:709
-msgid "Failed to remove event"
-msgstr "Error al eliminar el evento"
-
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220
-#: ../../include/nav.php:92 ../../include/conversation.php:1632
-msgid "Photos"
-msgstr "Fotos"
-
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591
-#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../../Zotlabs/Module/Cal.php:337
+msgid "Import"
+msgstr "Importar"
 
 #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
 msgid "This site is not a directory server"
@@ -1470,112 +1622,184 @@ msgstr "Este sitio no es un servidor de directorio"
 msgid "This directory server requires an access token"
 msgstr "El servidor de este directorio necesita un \"token\" de acceso"
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
-msgstr "Guardar en carpeta:"
+#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:28
+#: ../../Zotlabs/Module/Wiki.php:20
+msgid "You must be logged in to see this page."
+msgstr "Debe haber iniciado sesión para poder ver esta página."
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
-msgstr "- seleccionar -"
+#: ../../Zotlabs/Module/Chat.php:181
+msgid "Room not found"
+msgstr "Sala no encontrada"
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
-#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:946
-#: ../../include/text.php:958 ../../include/widgets.php:201
-msgid "Save"
-msgstr "Guardar"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "Leave Room"
+msgstr "Abandonar la sala"
 
-#: ../../Zotlabs/Module/Dreport.php:27
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "Delete Room"
+msgstr "Eliminar esta sala"
+
+#: ../../Zotlabs/Module/Chat.php:199
+msgid "I am away right now"
+msgstr "Estoy ausente momentáneamente"
+
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "I am online"
+msgstr "Estoy conectado/a"
+
+#: ../../Zotlabs/Module/Chat.php:202
+msgid "Bookmark this room"
+msgstr "Añadir esta sala a Marcadores"
+
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:197
+#: ../../Zotlabs/Module/Mail.php:306 ../../include/conversation.php:1181
+msgid "Please enter a link URL:"
+msgstr "Por favor, introduzca la dirección del enlace:"
+
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:250
+#: ../../Zotlabs/Module/Mail.php:375 ../../Zotlabs/Lib/ThreadItem.php:722
+#: ../../include/conversation.php:1271
+msgid "Encrypt text"
+msgstr "Cifrar texto"
+
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editwebpage.php:146
+#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:369
+#: ../../Zotlabs/Module/Editblock.php:111 ../../include/conversation.php:1146
+msgid "Insert web link"
+msgstr "Insertar enlace web"
+
+#: ../../Zotlabs/Module/Chat.php:218
+msgid "Feature disabled."
+msgstr "Funcionalidad deshabilitada."
+
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "New Chatroom"
+msgstr "Nueva sala de chat"
+
+#: ../../Zotlabs/Module/Chat.php:233
+msgid "Chatroom name"
+msgstr "Nombre de la sala de chat"
+
+#: ../../Zotlabs/Module/Chat.php:234
+msgid "Expiration of chats (minutes)"
+msgstr "Caducidad de los mensajes en los chats (en minutos)"
+
+#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
+#: ../../include/acl_selectors.php:281
+msgid "Permissions"
+msgstr "Permisos"
+
+#: ../../Zotlabs/Module/Chat.php:246
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "Salas de chat de %1$s"
+
+#: ../../Zotlabs/Module/Chat.php:251
+msgid "No chatrooms available"
+msgstr "No hay salas de chat disponibles"
+
+#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create New"
+msgstr "Crear"
+
+#: ../../Zotlabs/Module/Chat.php:255
+msgid "Expiration"
+msgstr "Caducidad"
+
+#: ../../Zotlabs/Module/Chat.php:256
+msgid "min"
+msgstr "min"
+
+#: ../../Zotlabs/Module/Dreport.php:44
 msgid "Invalid message"
 msgstr "Mensaje no válido"
 
-#: ../../Zotlabs/Module/Dreport.php:59
+#: ../../Zotlabs/Module/Dreport.php:76
 msgid "no results"
 msgstr "sin resultados"
 
-#: ../../Zotlabs/Module/Dreport.php:64
+#: ../../Zotlabs/Module/Dreport.php:91
+msgid "channel sync processed"
+msgstr "se ha realizado la sincronización del canal"
+
+#: ../../Zotlabs/Module/Dreport.php:95
+msgid "queued"
+msgstr "encolado"
+
+#: ../../Zotlabs/Module/Dreport.php:99
+msgid "posted"
+msgstr "enviado"
+
+#: ../../Zotlabs/Module/Dreport.php:103
+msgid "accepted for delivery"
+msgstr "aceptado para el envío"
+
+#: ../../Zotlabs/Module/Dreport.php:107
+msgid "updated"
+msgstr "actualizado"
+
+#: ../../Zotlabs/Module/Dreport.php:110
+msgid "update ignored"
+msgstr "actualización ignorada"
+
+#: ../../Zotlabs/Module/Dreport.php:113
+msgid "permission denied"
+msgstr "permiso denegado"
+
+#: ../../Zotlabs/Module/Dreport.php:117
+msgid "recipient not found"
+msgstr "destinatario no encontrado"
+
+#: ../../Zotlabs/Module/Dreport.php:120
+msgid "mail recalled"
+msgstr "mensaje de correo revocado"
+
+#: ../../Zotlabs/Module/Dreport.php:123
+msgid "duplicate mail received"
+msgstr "se ha recibido mensaje duplicado"
+
+#: ../../Zotlabs/Module/Dreport.php:126
+msgid "mail delivered"
+msgstr "correo enviado"
+
+#: ../../Zotlabs/Module/Dreport.php:146
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Informe de entrega para %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "channel sync processed"
-msgstr "se ha realizado la sincronización del canal"
+#: ../../Zotlabs/Module/Dreport.php:149
+msgid "Options"
+msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:82
-msgid "queued"
-msgstr "encolado"
+#: ../../Zotlabs/Module/Dreport.php:150
+msgid "Redeliver"
+msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:86
-msgid "posted"
-msgstr "enviado"
-
-#: ../../Zotlabs/Module/Dreport.php:90
-msgid "accepted for delivery"
-msgstr "aceptado para el envío"
-
-#: ../../Zotlabs/Module/Dreport.php:94
-msgid "updated"
-msgstr "actualizado"
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "update ignored"
-msgstr "actualización ignorada"
-
-#: ../../Zotlabs/Module/Dreport.php:100
-msgid "permission denied"
-msgstr "permiso denegado"
-
-#: ../../Zotlabs/Module/Dreport.php:104
-msgid "recipient not found"
-msgstr "destinatario no encontrado"
-
-#: ../../Zotlabs/Module/Dreport.php:107
-msgid "mail recalled"
-msgstr "mensaje de correo revocado"
-
-#: ../../Zotlabs/Module/Dreport.php:110
-msgid "duplicate mail received"
-msgstr "se ha recibido mensaje duplicado"
-
-#: ../../Zotlabs/Module/Dreport.php:113
-msgid "mail delivered"
-msgstr "correo enviado"
-
-#: ../../Zotlabs/Module/Editlayout.php:126
-#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
+#: ../../Zotlabs/Module/Editlayout.php:127
+#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
 msgid "Layout Name"
 msgstr "Nombre de la plantilla"
 
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:130
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:131
 msgid "Layout Description (Optional)"
 msgstr "Descripción de la plantilla (opcional)"
 
-#: ../../Zotlabs/Module/Editlayout.php:135
+#: ../../Zotlabs/Module/Editlayout.php:136
 msgid "Edit Layout"
 msgstr "Modificar la plantilla"
 
-#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Zotlabs/Module/Editwebpage.php:142
 msgid "Page link"
 msgstr "Enlace de la página"
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Editwebpage.php:168
 msgid "Edit Webpage"
 msgstr "Editar la página web"
 
-#: ../../Zotlabs/Module/Follow.php:34
-msgid "Channel added."
-msgstr "Canal añadido."
-
-#: ../../Zotlabs/Module/Acl.php:227
-msgid "network"
-msgstr "red"
-
-#: ../../Zotlabs/Module/Acl.php:237
-msgid "RSS"
-msgstr "RSS"
-
 #: ../../Zotlabs/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "El grupo de canales ha sido creado."
@@ -1585,7 +1809,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:3893
+#: ../../include/items.php:3902
 msgid "Privacy group not found."
 msgstr "Grupo de canales no encontrado."
 
@@ -1629,31 +1853,57 @@ msgstr "Todos los canales conectados"
 msgid "Click on a channel to add or remove."
 msgstr "Haga clic en un canal para agregarlo o quitarlo."
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
-msgid "Share content from Firefox to $Projectname"
-msgstr "Compartir contenido desde Firefox a $Projectname"
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+msgid "App installed."
+msgstr "Aplicación instalada."
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
-msgid "Activate the Firefox $Projectname provider"
-msgstr "Servicio de compartición de Firefox: activar el proveedor $Projectname "
+#: ../../Zotlabs/Module/Appman.php:46
+msgid "Malformed app."
+msgstr "Aplicación con errores"
 
-#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
-msgid "Authorize application connection"
-msgstr "Autorizar una conexión de aplicación"
+#: ../../Zotlabs/Module/Appman.php:104
+msgid "Embed code"
+msgstr "Código incorporado"
 
-#: ../../Zotlabs/Module/Api.php:62
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Volver a su aplicación e introducir este código de seguridad:"
+#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
+msgid "Edit App"
+msgstr "Modificar la aplicación"
 
-#: ../../Zotlabs/Module/Api.php:72
-msgid "Please login to continue."
-msgstr "Por favor inicie sesión para continuar."
+#: ../../Zotlabs/Module/Appman.php:110
+msgid "Create App"
+msgstr "Crear una aplicación"
 
-#: ../../Zotlabs/Module/Api.php:87
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" 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:115
+msgid "Name of app"
+msgstr "Nombre de la aplicación"
+
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Location (URL) of app"
+msgstr "Dirección (URL) de la aplicación"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Photo icon URL"
+msgstr "Dirección del icono"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "80 x 80 pixels - optional"
+msgstr "80 x 80 pixels - opcional"
+
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "Categories (optional, comma separated list)"
+msgstr "Categorías (opcional, lista separada por comas)"
+
+#: ../../Zotlabs/Module/Appman.php:120
+msgid "Version ID"
+msgstr "Versión"
+
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Price of app"
+msgstr "Precio de la aplicación"
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Location (URL) to purchase app"
+msgstr "Dirección (URL) donde adquirir la aplicación"
 
 #: ../../Zotlabs/Module/Help.php:26
 msgid "Documentation Search"
@@ -1665,8 +1915,8 @@ msgid "Help:"
 msgstr "Ayuda:"
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223
-#: ../../include/nav.php:159
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/nav.php:161
 msgid "Help"
 msgstr "Ayuda"
 
@@ -1674,335 +1924,124 @@ msgstr "Ayuda"
 msgid "$Projectname Documentation"
 msgstr "Documentación de $Projectname"
 
-#: ../../Zotlabs/Module/Filestorage.php:88
-msgid "Permission Denied."
-msgstr "Permiso denegado"
-
-#: ../../Zotlabs/Module/Filestorage.php:104
-msgid "File not found."
-msgstr "Fichero no encontrado."
-
-#: ../../Zotlabs/Module/Filestorage.php:147
-msgid "Edit file permissions"
-msgstr "Modificar los permisos del fichero"
-
-#: ../../Zotlabs/Module/Filestorage.php:156
-msgid "Set/edit permissions"
-msgstr "Establecer/editar los permisos"
-
-#: ../../Zotlabs/Module/Filestorage.php:157
-msgid "Include all files and sub folders"
-msgstr "Incluir todos los ficheros y subcarpetas"
-
-#: ../../Zotlabs/Module/Filestorage.php:158
-msgid "Return to file list"
-msgstr "Volver a la lista de ficheros"
-
-#: ../../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: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:163
-msgid "Share this file"
-msgstr "Compartir este fichero"
-
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Show URL to this file"
-msgstr "Mostrar la dirección de este fichero"
-
-#: ../../Zotlabs/Module/Filestorage.php:165
-msgid "Notify your contacts about this file"
-msgstr "Avisar a sus contactos sobre este fichero"
-
-#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
-#: ../../include/nav.php:163
-msgid "Apps"
-msgstr "Aplicaciones (apps)"
-
 #: ../../Zotlabs/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Elemento no disponible"
 
-#: ../../Zotlabs/Module/Import.php:32
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "Su paquete de servicios solo permite %d canales."
+#: ../../Zotlabs/Module/Pdledit.php:18
+msgid "Layout updated."
+msgstr "Plantilla actualizada."
 
-#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
-msgstr "No hay nada para importar."
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
+msgid "Edit System Page Description"
+msgstr "Editor del Sistema de Descripción de Páginas"
 
-#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
-msgstr "No se han podido descargar datos de su antiguo servidor"
+#: ../../Zotlabs/Module/Pdledit.php:56
+msgid "Layout not found."
+msgstr "Plantilla no encontrada"
 
-#: ../../Zotlabs/Module/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
-msgstr "El fichero importado está vacío."
+#: ../../Zotlabs/Module/Pdledit.php:62
+msgid "Module Name:"
+msgstr "Nombre del módulo:"
 
-#: ../../Zotlabs/Module/Import.php:122
-#: ../../Zotlabs/Module/Import_items.php:86
-#, php-format
-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/Pdledit.php:63
+msgid "Layout Help"
+msgstr "Ayuda para el diseño de plantillas de página"
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
-msgid "Cloned channel not found. Import failed."
-msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
+#: ../../Zotlabs/Module/Ffsapi.php:12
+msgid "Share content from Firefox to $Projectname"
+msgstr "Compartir contenido desde Firefox a $Projectname"
 
-#: ../../Zotlabs/Module/Import.php:160
-msgid "No channel. Import failed."
-msgstr "No hay canal. La importación ha fallado"
+#: ../../Zotlabs/Module/Ffsapi.php:15
+msgid "Activate the Firefox $Projectname provider"
+msgstr "Servicio de compartición de Firefox: activar el proveedor $Projectname "
 
-#: ../../Zotlabs/Module/Import.php:510
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
-msgstr "Importación completada."
+#: ../../Zotlabs/Module/Acl.php:312
+msgid "network"
+msgstr "red"
 
-#: ../../Zotlabs/Module/Import.php:532
-msgid "You must be logged in to use this feature."
-msgstr "Debe estar registrado para poder usar esta funcionalidad."
+#: ../../Zotlabs/Module/Acl.php:322
+msgid "RSS"
+msgstr "RSS"
 
-#: ../../Zotlabs/Module/Import.php:537
-msgid "Import Channel"
-msgstr "Importar canal"
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
+msgstr "Permiso denegado"
 
-#: ../../Zotlabs/Module/Import.php:538
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You"
-" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file."
-msgstr "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación."
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
+msgstr "Fichero no encontrado."
 
-#: ../../Zotlabs/Module/Import.php:539
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "File to Upload"
-msgstr "Fichero para subir"
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
+msgstr "Modificar los permisos del fichero"
 
-#: ../../Zotlabs/Module/Import.php:540
-msgid "Or provide the old server/hub details"
-msgstr "O proporcione los detalles de su antiguo servidor/hub"
+#: ../../Zotlabs/Module/Filestorage.php:155
+msgid "Set/edit permissions"
+msgstr "Establecer/editar los permisos"
 
-#: ../../Zotlabs/Module/Import.php:541
-msgid "Your old identity address (xyz@example.com)"
-msgstr "Su identidad en el antiguo servidor  (canal@ejemplo.com)"
+#: ../../Zotlabs/Module/Filestorage.php:156
+msgid "Include all files and sub folders"
+msgstr "Incluir todos los ficheros y subcarpetas"
 
-#: ../../Zotlabs/Module/Import.php:542
-msgid "Your old login email address"
-msgstr "Su antigua dirección de correo electrónico"
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Return to file list"
+msgstr "Volver a la lista de ficheros"
 
-#: ../../Zotlabs/Module/Import.php:543
-msgid "Your old login password"
-msgstr "Su antigua contraseña"
+#: ../../Zotlabs/Module/Filestorage.php:159
+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/Import.php:544
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be"
-" able to post from either location, but only one can be marked as the "
-"primary location for files, photos, and media."
-msgstr "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos."
+#: ../../Zotlabs/Module/Filestorage.php:160
+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/Import.php:545
-msgid "Make this hub my primary location"
-msgstr "Convertir este servidor en mi ubicación primaria"
+#: ../../Zotlabs/Module/Filestorage.php:162
+msgid "Share this file"
+msgstr "Compartir este fichero"
 
-#: ../../Zotlabs/Module/Import.php:546
-msgid ""
-"Import existing posts if possible (experimental - limited by available "
-"memory"
-msgstr "Importar el contenido publicado si es posible (experimental - limitado por la memoria disponible"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Show URL to this file"
+msgstr "Mostrar la dirección de este fichero"
 
-#: ../../Zotlabs/Module/Import.php:547
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
-msgstr "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine."
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Notify your contacts about this file"
+msgstr "Avisar a sus contactos sobre este fichero"
 
-#: ../../Zotlabs/Module/Item.php:178
-msgid "Unable to locate original post."
-msgstr "No ha sido posible encontrar la entrada original."
-
-#: ../../Zotlabs/Module/Item.php:427
-msgid "Empty post discarded."
-msgstr "La entrada vacía ha sido desechada."
-
-#: ../../Zotlabs/Module/Item.php:467
-msgid "Executable content type not permitted to this channel."
-msgstr "Contenido de tipo ejecutable no permitido en este canal."
-
-#: ../../Zotlabs/Module/Item.php:847
-msgid "Duplicate post suppressed."
-msgstr "Se ha suprimido la entrada duplicada."
-
-#: ../../Zotlabs/Module/Item.php:977
-msgid "System error. Post not saved."
-msgstr "Error del sistema. La entrada no se ha podido salvar."
-
-#: ../../Zotlabs/Module/Item.php:1241
-msgid "Unable to obtain post information from database."
-msgstr "No ha sido posible obtener información de la entrada en la base de datos."
-
-#: ../../Zotlabs/Module/Item.php:1248
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
-
-#: ../../Zotlabs/Module/Item.php:1255
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Ha alcanzado su límite de %1$.0f páginas web."
-
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2267
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2240
 msgid "Layouts"
 msgstr "Plantillas"
 
-#: ../../Zotlabs/Module/Layouts.php:183
+#: ../../Zotlabs/Module/Layouts.php:185
 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:187
+#: ../../Zotlabs/Module/Layouts.php:189
 msgid "Layout Description"
 msgstr "Descripción de la plantilla"
 
-#: ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:114
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Webpages.php:205
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr "Creado"
+
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:115
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Webpages.php:206
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+msgstr "Editado"
+
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1070
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:195
+#: ../../include/conversation.php:1219
+msgid "Share"
+msgstr "Compartir"
+
+#: ../../Zotlabs/Module/Layouts.php:194
 msgid "Download PDL file"
 msgstr "Descargar el fichero PDL"
 
-#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
-#: ../../Zotlabs/Module/Siteinfo.php:65
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../Zotlabs/Module/Home.php:79
-#, php-format
-msgid "Welcome to %s"
-msgstr "Bienvenido a %s"
-
-#: ../../Zotlabs/Module/Id.php:13
-msgid "First Name"
-msgstr "Nombre"
-
-#: ../../Zotlabs/Module/Id.php:14
-msgid "Last Name"
-msgstr "Apellido"
-
-#: ../../Zotlabs/Module/Id.php:15
-msgid "Nickname"
-msgstr "Sobrenombre o Alias"
-
-#: ../../Zotlabs/Module/Id.php:16
-msgid "Full Name"
-msgstr "Nombre completo"
-
-#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
-#: ../../include/network.php:2151 ../../boot.php:1705
-msgid "Email"
-msgstr "Correo electrónico"
-
-#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236
-msgid "Profile Photo"
-msgstr "Foto del perfil"
-
-#: ../../Zotlabs/Module/Id.php:22
-msgid "Profile Photo 16px"
-msgstr "Foto del perfil 16px"
-
-#: ../../Zotlabs/Module/Id.php:23
-msgid "Profile Photo 32px"
-msgstr "Foto del perfil 32px"
-
-#: ../../Zotlabs/Module/Id.php:24
-msgid "Profile Photo 48px"
-msgstr "Foto del perfil 48px"
-
-#: ../../Zotlabs/Module/Id.php:25
-msgid "Profile Photo 64px"
-msgstr "Foto del perfil 64px"
-
-#: ../../Zotlabs/Module/Id.php:26
-msgid "Profile Photo 80px"
-msgstr "Foto del perfil 80px"
-
-#: ../../Zotlabs/Module/Id.php:27
-msgid "Profile Photo 128px"
-msgstr "Foto del perfil 128px"
-
-#: ../../Zotlabs/Module/Id.php:28
-msgid "Timezone"
-msgstr "Huso horario"
-
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
-msgid "Homepage URL"
-msgstr "Dirección de la página personal"
-
-#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234
-msgid "Language"
-msgstr "Idioma"
-
-#: ../../Zotlabs/Module/Id.php:31
-msgid "Birth Year"
-msgstr "Año de nacimiento"
-
-#: ../../Zotlabs/Module/Id.php:32
-msgid "Birth Month"
-msgstr "Mes de nacimiento"
-
-#: ../../Zotlabs/Module/Id.php:33
-msgid "Birth Day"
-msgstr "Día de nacimiento"
-
-#: ../../Zotlabs/Module/Id.php:34
-msgid "Birthdate"
-msgstr "Fecha de nacimiento"
-
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
-msgid "Gender"
-msgstr "Género"
-
-#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Male"
-msgstr "Hombre"
-
-#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Female"
-msgstr "Mujer"
-
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
-msgid "webpage"
-msgstr "página web"
-
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
-msgid "block"
-msgstr "bloque"
-
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
-msgid "layout"
-msgstr "plantilla"
-
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
-msgid "menu"
-msgstr "menú"
-
-#: ../../Zotlabs/Module/Impel.php:196
-#, php-format
-msgid "%s element installed"
-msgstr "%s elemento instalado"
-
-#: ../../Zotlabs/Module/Impel.php:199
-#, php-format
-msgid "%s element installation failed"
-msgstr "Elemento con instalación fallida: %s"
-
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr "Me gusta/No me gusta"
@@ -2038,1180 +2077,65 @@ msgstr "Canal no disponible."
 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/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
+#: ../../include/text.php:1921
 msgid "photo"
 msgstr "foto"
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/text.php:1946 ../../include/conversation.php:148
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../include/conversation.php:148 ../../include/text.php:1927
 msgid "status"
 msgstr "el mensaje de estado"
 
-#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
+#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "A %1$s le gusta %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "A %1$s no le gusta %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:424
+#: ../../Zotlabs/Module/Like.php:423
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s está de acuerdo"
 
-#: ../../Zotlabs/Module/Like.php:426
+#: ../../Zotlabs/Module/Like.php:425
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s no está de acuerdo"
 
-#: ../../Zotlabs/Module/Like.php:428
+#: ../../Zotlabs/Module/Like.php:427
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s se abstiene"
 
-#: ../../Zotlabs/Module/Like.php:430
+#: ../../Zotlabs/Module/Like.php:429
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s participa"
 
-#: ../../Zotlabs/Module/Like.php:432
+#: ../../Zotlabs/Module/Like.php:431
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s no participa"
 
-#: ../../Zotlabs/Module/Like.php:434
+#: ../../Zotlabs/Module/Like.php:433
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%3$s de %2$s: %1$s quizá participe"
 
-#: ../../Zotlabs/Module/Like.php:537
+#: ../../Zotlabs/Module/Like.php:536
 msgid "Action completed."
 msgstr "Acción completada."
 
-#: ../../Zotlabs/Module/Like.php:538
+#: ../../Zotlabs/Module/Like.php:537
 msgid "Thank you."
 msgstr "Gracias."
 
-#: ../../Zotlabs/Module/Import_items.php:102
-msgid "Import completed"
-msgstr "Importación completada"
-
-#: ../../Zotlabs/Module/Import_items.php:117
-msgid "Import Items"
-msgstr "Importar elementos"
-
-#: ../../Zotlabs/Module/Import_items.php:118
-msgid ""
-"Use this form to import existing posts and content from an export file."
-msgstr "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación."
-
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
-msgstr "Se ha superado el límite máximo de invitaciones."
-
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : No es una dirección de correo electrónico válida. "
-
-#: ../../Zotlabs/Module/Invite.php:63
-msgid "Please join us on $Projectname"
-msgstr "Únase a nosotros en $Projectname"
-
-#: ../../Zotlabs/Module/Invite.php:74
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio."
-
-#: ../../Zotlabs/Module/Invite.php:79
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s : Falló el envío del mensaje."
-
-#: ../../Zotlabs/Module/Invite.php:83
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d mensajes enviados."
-msgstr[1] "%d mensajes enviados."
-
-#: ../../Zotlabs/Module/Invite.php:102
-msgid "You have no more invitations available"
-msgstr "No tiene más invitaciones disponibles"
-
-#: ../../Zotlabs/Module/Invite.php:133
-msgid "Send invitations"
-msgstr "Enviar invitaciones"
-
-#: ../../Zotlabs/Module/Invite.php:134
-msgid "Enter email addresses, one per line:"
-msgstr "Introduzca las direcciones de correo electrónico, una por línea:"
-
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
-msgid "Your message:"
-msgstr "Su mensaje:"
-
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Please join my community on $Projectname."
-msgstr "Por favor, únase a mi comunidad en $Projectname."
-
-#: ../../Zotlabs/Module/Invite.php:138
-msgid "You will need to supply this invitation code:"
-msgstr "Tendrá que suministrar este código de invitación:"
-
-#: ../../Zotlabs/Module/Invite.php:139
-msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Regístrese en cualquier sitio de $Projectname (están todos interconectados)"
-
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Introduzca mi dirección $Projectname en la caja de búsqueda del sitio."
-
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "or visit"
-msgstr "o visitar"
-
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "3. Click [Connect]"
-msgstr "3. Pulse [conectar]"
-
-#: ../../Zotlabs/Module/Lockview.php:61
-msgid "Remote privacy information not available."
-msgstr "La información privada remota no está disponible."
-
-#: ../../Zotlabs/Module/Lockview.php:82
-msgid "Visible to:"
-msgstr "Visible para:"
-
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
-msgstr "Dirección no encontrada."
-
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
-msgstr "Ha fallado la búsqueda de la dirección."
-
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary"
-" location."
-msgstr "Por favor, seleccione una copia de su canal (un clon) para convertirlo en primario antes de eliminar su canal principal."
-
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
-msgstr "Sincronización de ubicaciones"
-
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
-msgstr "No encontrada ninguna dirección."
-
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
-msgstr "Gestionar las direcciones del canal"
-
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470
-#: ../../Zotlabs/Module/Admin.php:1224
-msgid "Address"
-msgstr "Dirección"
-
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
-msgstr "Primario"
-
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
-msgid "Drop"
-msgstr "Eliminar"
-
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
-msgstr "Sincronizar ahora"
-
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
-msgstr "Por favor, espere algunos minutos entre operaciones consecutivas."
-
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing"
-" your channel."
-msgstr "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal."
-
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
-msgstr "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo."
-
-#: ../../Zotlabs/Module/Magic.php:71
-msgid "Hub not found."
-msgstr "Servidor no encontrado"
-
-#: ../../Zotlabs/Module/Mail.php:38
-msgid "Unable to lookup recipient."
-msgstr "Imposible asociar a un destinatario."
-
-#: ../../Zotlabs/Module/Mail.php:45
-msgid "Unable to communicate with requested channel."
-msgstr "Imposible comunicar con el canal solicitado."
-
-#: ../../Zotlabs/Module/Mail.php:52
-msgid "Cannot verify requested channel."
-msgstr "No se puede verificar el canal solicitado."
-
-#: ../../Zotlabs/Module/Mail.php:78
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
-
-#: ../../Zotlabs/Module/Mail.php:143
-msgid "Messages"
-msgstr "Mensajes"
-
-#: ../../Zotlabs/Module/Mail.php:178
-msgid "Message recalled."
-msgstr "Mensaje revocado."
-
-#: ../../Zotlabs/Module/Mail.php:191
-msgid "Conversation removed."
-msgstr "Conversación eliminada."
-
-#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Caduca YYYY-MM-DD HH:MM"
-
-#: ../../Zotlabs/Module/Mail.php:234
-msgid "Requested channel is not in this network"
-msgstr "El canal solicitado no existe en esta red"
-
-#: ../../Zotlabs/Module/Mail.php:242
-msgid "Send Private Message"
-msgstr "Enviar un mensaje privado"
-
-#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
-msgid "To:"
-msgstr "Para:"
-
-#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
-msgid "Subject:"
-msgstr "Asunto:"
-
-#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
-#: ../../include/conversation.php:1220
-msgid "Attach file"
-msgstr "Adjuntar fichero"
-
-#: ../../Zotlabs/Module/Mail.php:253
-msgid "Send"
-msgstr "Enviar"
-
-#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
-#: ../../include/conversation.php:1251
-msgid "Set expiration date"
-msgstr "Configurar fecha de caducidad"
-
-#: ../../Zotlabs/Module/Mail.php:340
-msgid "Delete message"
-msgstr "Borrar mensaje"
-
-#: ../../Zotlabs/Module/Mail.php:341
-msgid "Delivery report"
-msgstr "Informe de transmisión"
-
-#: ../../Zotlabs/Module/Mail.php:342
-msgid "Recall message"
-msgstr "Revocar el mensaje"
-
-#: ../../Zotlabs/Module/Mail.php:344
-msgid "Message has been recalled."
-msgstr "El mensaje ha sido revocado."
-
-#: ../../Zotlabs/Module/Mail.php:361
-msgid "Delete Conversation"
-msgstr "Eliminar conversación"
-
-#: ../../Zotlabs/Module/Mail.php:363
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
-
-#: ../../Zotlabs/Module/Mail.php:367
-msgid "Send Reply"
-msgstr "Responder"
-
-#: ../../Zotlabs/Module/Mail.php:372
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr "Su mensaje para %s (%s):"
-
-#: ../../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:143
-msgid "Create a new channel"
-msgstr "Crear un nuevo canal"
-
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
-#: ../../include/nav.php:206
-msgid "Channel Manager"
-msgstr "Administración de canales"
-
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
-msgstr "Canal actual"
-
-#: ../../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:168
-msgid "Default Channel"
-msgstr "Canal principal"
-
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
-msgstr "Convertir en predeterminado"
-
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
-msgstr "%d mensajes nuevos"
-
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
-msgstr "%d nuevas isolicitudes de conexión"
-
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
-msgstr "Canal delegado"
-
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr "No se ha encontrado una cuenta válida."
-
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico."
-
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Usuario del sitio (%s)"
-
-#: ../../Zotlabs/Module/Lostpass.php:44
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Se ha solicitado restablecer la contraseña en %s"
-
-#: ../../Zotlabs/Module/Lostpass.php:67
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
-
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1711
-msgid "Password Reset"
-msgstr "Restablecer la contraseña"
-
-#: ../../Zotlabs/Module/Lostpass.php:91
-msgid "Your password has been reset as requested."
-msgstr "Su contraseña ha sido restablecida según lo solicitó."
-
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your new password is"
-msgstr "Su nueva contraseña es"
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Save or copy your new password - and then"
-msgstr "Guarde o copie su nueva contraseña - y después"
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "click here to login"
-msgstr "pulse aquí para conectarse"
-
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión."
-
-#: ../../Zotlabs/Module/Lostpass.php:112
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Su contraseña en %s ha sido cambiada"
-
-#: ../../Zotlabs/Module/Lostpass.php:127
-msgid "Forgot your Password?"
-msgstr "¿Ha olvidado su contraseña?"
-
-#: ../../Zotlabs/Module/Lostpass.php:128
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones."
-
-#: ../../Zotlabs/Module/Lostpass.php:129
-msgid "Email Address"
-msgstr "Dirección de correo electrónico"
-
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Reset"
-msgstr "Reiniciar"
-
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
-msgstr "No se puede actualizar el menú."
-
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
-msgstr "No se puede crear el menú."
-
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
-msgstr "Nombre del menú"
-
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Nombre único (no será visible en la página web) - requerido"
-
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
-msgstr "Título del menú"
-
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Visible en la página web - no ponga nada si no desea un título"
-
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
-msgstr "Permitir marcadores"
-
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
-msgstr "El menú se puede usar para guardar marcadores"
-
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
-msgstr "Enviar y proceder"
-
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2266
-msgid "Menus"
-msgstr "Menús"
-
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
-msgstr "Marcadores permitidos"
-
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
-msgstr "Borrar este menú"
-
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
-msgstr "Editar los contenidos del menú"
-
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
-msgstr "Modificar este menú"
-
-#: ../../Zotlabs/Module/Menu.php:136
-msgid "Menu could not be deleted."
-msgstr "El menú no puede ser eliminado."
-
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
-msgid "Menu not found."
-msgstr "Menú no encontrado"
-
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
-msgstr "Modificar el menú"
-
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
-msgstr "Añadir o quitar entradas en este menú"
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
-msgstr "Nombre del menú"
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
-msgstr "Debe ser único, solo será visible para usted"
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
-msgstr "Título del menú"
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title as seen by others"
-msgstr "El título del menú tal como será visto por los demás"
-
-#: ../../Zotlabs/Module/Menu.php:157
-msgid "Allow bookmarks"
-msgstr "Permitir marcadores"
-
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
-msgstr "No encontrado."
-
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr "%1$s está %2$s"
-
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225
-msgid "Mood"
-msgstr "Estado de ánimo"
-
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
-msgstr "Describir su estado de ánimo para comunicárselo a sus amigos"
-
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
-msgstr "Perfil compatible"
-
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "No hay palabras clave en el perfil principal para poder encontrar perfiles compatibles. Por favor, añada palabras clave a su perfil principal."
-
-#: ../../Zotlabs/Module/Match.php:67
-msgid "is interested in:"
-msgstr "está interesado en:"
-
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
-msgstr "No se han encontrado perfiles compatibles"
-
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
-msgstr "No se encuentra el grupo"
-
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
-msgstr "No se encuentra el  canal"
-
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
-msgstr "foro"
-
-#: ../../Zotlabs/Module/Network.php:153
-msgid "Search Results For:"
-msgstr "Buscar resultados para:"
-
-#: ../../Zotlabs/Module/Network.php:217
-msgid "Privacy group is empty"
-msgstr "El grupo de canales está vacío"
-
-#: ../../Zotlabs/Module/Network.php:226
-msgid "Privacy group: "
-msgstr "Grupo de canales: "
-
-#: ../../Zotlabs/Module/Network.php:252
-msgid "Invalid connection."
-msgstr "Conexión no válida."
-
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:98
-msgid "No more system notifications."
-msgstr "No hay más notificaciones del sistema"
-
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:102
-msgid "System Notifications"
-msgstr "Notificaciones del sistema"
-
-#: ../../Zotlabs/Module/Mitem.php:52
-msgid "Unable to create element."
-msgstr "Imposible crear el elemento."
-
-#: ../../Zotlabs/Module/Mitem.php:76
-msgid "Unable to update menu element."
-msgstr "No es posible actualizar el elemento del menú."
-
-#: ../../Zotlabs/Module/Mitem.php:92
-msgid "Unable to add menu element."
-msgstr "No es posible añadir el elemento al menú"
-
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
-msgid "Menu Item Permissions"
-msgstr "Permisos del elemento del menú"
-
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1068
-msgid "(click to open/close)"
-msgstr "(pulsar para abrir o cerrar)"
-
-#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
-msgid "Link Name"
-msgstr "Nombre del enlace"
-
-#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
-msgid "Link or Submenu Target"
-msgstr "Destino del enlace o submenú"
-
-#: ../../Zotlabs/Module/Mitem.php:157
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "Introducir la dirección del enlace o seleccionar el nombre de un submenú"
-
-#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
-msgid "Use magic-auth if available"
-msgstr "Usar la autenticación mágica si está disponible"
-
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
-msgid "Open link in new window"
-msgstr "Abrir el enlace en una nueva ventana"
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Order in list"
-msgstr "Orden en la lista"
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Los números más altos irán al final de la lista"
-
-#: ../../Zotlabs/Module/Mitem.php:161
-msgid "Submit and finish"
-msgstr "Enviar y terminar"
-
-#: ../../Zotlabs/Module/Mitem.php:162
-msgid "Submit and continue"
-msgstr "Enviar y continuar"
-
-#: ../../Zotlabs/Module/Mitem.php:170
-msgid "Menu:"
-msgstr "Menú:"
-
-#: ../../Zotlabs/Module/Mitem.php:173
-msgid "Link Target"
-msgstr "Destino del enlace"
-
-#: ../../Zotlabs/Module/Mitem.php:176
-msgid "Edit menu"
-msgstr "Editar menú"
-
-#: ../../Zotlabs/Module/Mitem.php:179
-msgid "Edit element"
-msgstr "Editar el elemento"
-
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Drop element"
-msgstr "Eliminar el elemento"
-
-#: ../../Zotlabs/Module/Mitem.php:181
-msgid "New element"
-msgstr "Nuevo elemento"
-
-#: ../../Zotlabs/Module/Mitem.php:182
-msgid "Edit this menu container"
-msgstr "Modificar el contenedor del menú"
-
-#: ../../Zotlabs/Module/Mitem.php:183
-msgid "Add menu element"
-msgstr "Añadir un elemento al menú"
-
-#: ../../Zotlabs/Module/Mitem.php:184
-msgid "Delete this menu item"
-msgstr "Eliminar este elemento del menú"
-
-#: ../../Zotlabs/Module/Mitem.php:185
-msgid "Edit this menu item"
-msgstr "Modificar este elemento del menú"
-
-#: ../../Zotlabs/Module/Mitem.php:202
-msgid "Menu item not found."
-msgstr "Este elemento del menú no se ha encontrado"
-
-#: ../../Zotlabs/Module/Mitem.php:215
-msgid "Menu item deleted."
-msgstr "Este elemento del menú ha sido borrado"
-
-#: ../../Zotlabs/Module/Mitem.php:217
-msgid "Menu item could not be deleted."
-msgstr "Este elemento del menú no puede ser borrado."
-
-#: ../../Zotlabs/Module/Mitem.php:224
-msgid "Edit Menu Element"
-msgstr "Editar elemento del menú"
-
-#: ../../Zotlabs/Module/Mitem.php:230
-msgid "Link text"
-msgstr "Texto del enlace"
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Name or caption"
-msgstr "Nombre o descripción"
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
-msgstr "Ejemplos: \"Juan García\", \"Luisa y sus caballos\", \"Fútbol\", \"Grupo de aviación\""
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-msgid "Choose a short nickname"
-msgstr "Elija un alias corto"
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-#, php-format
-msgid ""
-"Your nickname will be used to create an easy to remember channel address "
-"e.g. nickname%s"
-msgstr "Su alias se usará para crear una dirección de canal fácil de recordar, p. ej.: alias%s"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Channel role and privacy"
-msgstr "Clase de canal y privacidad"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Select a channel role with your privacy requirements."
-msgstr "Seleccione un tipo de canal con sus requisitos de privacidad"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Read more about roles"
-msgstr "Leer más sobre los roles"
-
-#: ../../Zotlabs/Module/New_channel.php:135
-msgid "Create Channel"
-msgstr "Crear un canal"
-
-#: ../../Zotlabs/Module/New_channel.php:136
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
-msgstr "Un canal es su identidad en esta red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con una gama de permisos extremadamente detallada."
-
-#: ../../Zotlabs/Module/New_channel.php:137
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr "O <a href=\"import\">importar un canal existente</a> desde otro lugar."
-
-#: ../../Zotlabs/Module/Notifications.php:30
-msgid "Invalid request identifier."
-msgstr "Petición inválida del identificador."
-
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "Discard"
-msgstr "Descartar"
-
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
-msgid "Mark all system notifications seen"
-msgstr "Marcar todas las notificaciones de sistema como leídas"
-
-#: ../../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:99 ../../Zotlabs/Module/Photos.php:743
-#: ../../Zotlabs/Module/Profile_photo.php:114
-#: ../../Zotlabs/Module/Profile_photo.php:206
-#: ../../Zotlabs/Module/Profile_photo.php:294
-#: ../../include/photo/photo_driver.php:718
-msgid "Profile Photos"
-msgstr "Fotos del perfil"
-
-#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
-msgid "Album not found."
-msgstr "Álbum no encontrado."
-
-#: ../../Zotlabs/Module/Photos.php:132
-msgid "Delete Album"
-msgstr "Borrar álbum"
-
-#: ../../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:210 ../../Zotlabs/Module/Photos.php:1053
-msgid "Delete Photo"
-msgstr "Borrar foto"
-
-#: ../../Zotlabs/Module/Photos.php:533
-msgid "No photos selected"
-msgstr "No hay fotos seleccionadas"
-
-#: ../../Zotlabs/Module/Photos.php:582
-msgid "Access to this item is restricted."
-msgstr "El acceso a este elemento está restringido."
-
-#: ../../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:624
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
-
-#: ../../Zotlabs/Module/Photos.php:660
-msgid "Upload Photos"
-msgstr "Subir fotos"
-
-#: ../../Zotlabs/Module/Photos.php:664
-msgid "Enter an album name"
-msgstr "Introducir un nombre de álbum"
-
-#: ../../Zotlabs/Module/Photos.php:665
-msgid "or select an existing album (doubleclick)"
-msgstr "o seleccionar uno existente (doble click)"
-
-#: ../../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:667
-msgid "Caption (optional):"
-msgstr "Título (opcional):"
-
-#: ../../Zotlabs/Module/Photos.php:668
-msgid "Description (optional):"
-msgstr "Descripción (opcional):"
-
-#: ../../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:743
-msgid "Contact Photos"
-msgstr "Fotos de contacto"
-
-#: ../../Zotlabs/Module/Photos.php:766
-msgid "Show Newest First"
-msgstr "Mostrar lo más reciente primero"
-
-#: ../../Zotlabs/Module/Photos.php:768
-msgid "Show Oldest First"
-msgstr "Mostrar lo más antiguo primero"
-
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
-#: ../../include/widgets.php:1499
-msgid "View Photo"
-msgstr "Ver foto"
-
-#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1516
-msgid "Edit Album"
-msgstr "Editar álbum"
-
-#: ../../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:872
-msgid "Photo not available"
-msgstr "Foto no disponible"
-
-#: ../../Zotlabs/Module/Photos.php:930
-msgid "Use as profile photo"
-msgstr "Usar como foto del perfil"
-
-#: ../../Zotlabs/Module/Photos.php:931
-msgid "Use as cover photo"
-msgstr "Usar como imagen de portada del perfil"
-
-#: ../../Zotlabs/Module/Photos.php:938
-msgid "Private Photo"
-msgstr "Foto privada"
-
-#: ../../Zotlabs/Module/Photos.php:953
-msgid "View Full Size"
-msgstr "Ver tamaño completo"
-
-#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437
-#: ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr "Eliminar"
-
-#: ../../Zotlabs/Module/Photos.php:1032
-msgid "Edit photo"
-msgstr "Editar foto"
-
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Rotate CW (right)"
-msgstr "Girar CW (a la derecha)"
-
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CCW (left)"
-msgstr "Girar CCW (a la izquierda)"
-
-#: ../../Zotlabs/Module/Photos.php:1038
-msgid "Enter a new album name"
-msgstr "Introducir un nuevo nombre de álbum"
-
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "or select an existing one (doubleclick)"
-msgstr "o seleccionar uno (doble click) existente"
-
-#: ../../Zotlabs/Module/Photos.php:1042
-msgid "Caption"
-msgstr "Título"
-
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Add a Tag"
-msgstr "Añadir una etiqueta"
-
-#: ../../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:1051
-msgid "Flag as adult in album view"
-msgstr "Marcar como \"solo para adultos\" en el álbum"
-
-#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
-msgid "I like this (toggle)"
-msgstr "Me gusta (cambiar)"
-
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
-msgid "I don't like this (toggle)"
-msgstr "No me gusta esto (cambiar)"
-
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
-#: ../../include/conversation.php:740
-msgid "Please wait"
-msgstr "Espere por favor"
-
-#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../Zotlabs/Lib/ThreadItem.php:707
-msgid "This is you"
-msgstr "Este es usted"
-
-#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
-msgid "Comment"
-msgstr "Comentar"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Likes"
-msgstr "Me gusta"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Dislikes"
-msgstr "No me gusta"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Agree"
-msgstr "De acuerdo"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Disagree"
-msgstr "En desacuerdo"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Abstain"
-msgstr "Abstención"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Attending"
-msgstr "Participaré"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Not attending"
-msgstr "No participaré"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Might attend"
-msgstr "Quizá participe"
-
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
-#: ../../include/conversation.php:1717
-msgid "View all"
-msgstr "Ver todo"
-
-#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1741
-#: ../../include/channel.php:1158
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Me gusta"
-msgstr[1] "Me gusta"
-
-#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/conversation.php:1744
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "No me gusta"
-msgstr[1] "No me gusta"
-
-#: ../../Zotlabs/Module/Photos.php:1235
-msgid "Photo Tools"
-msgstr "Gestión de las fotos"
-
-#: ../../Zotlabs/Module/Photos.php:1244
-msgid "In This Photo:"
-msgstr "En esta foto:"
-
-#: ../../Zotlabs/Module/Photos.php:1249
-msgid "Map"
-msgstr "Mapa"
-
-#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
-msgctxt "noun"
-msgid "Likes"
-msgstr "Me gusta"
-
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
-msgctxt "noun"
-msgid "Dislikes"
-msgstr "No me gusta"
-
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
-#: ../../include/acl_selectors.php:285
-msgid "Close"
-msgstr "Cerrar"
-
-#: ../../Zotlabs/Module/Photos.php:1337
-msgid "View Album"
-msgstr "Ver álbum"
-
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362
-msgid "Recent Photos"
-msgstr "Fotos recientes"
-
-#: ../../Zotlabs/Module/Ping.php:265
-msgid "sent you a private message"
-msgstr "le ha enviado un mensaje privado"
-
-#: ../../Zotlabs/Module/Ping.php:313
-msgid "added your channel"
-msgstr "añadió este canal a sus conexiones"
-
-#: ../../Zotlabs/Module/Ping.php:323
-msgid "g A l F d"
-msgstr "g A l d F"
-
-#: ../../Zotlabs/Module/Ping.php:346
-msgid "[today]"
-msgstr "[hoy]"
-
-#: ../../Zotlabs/Module/Ping.php:355
-msgid "posted an event"
-msgstr "publicó un evento"
-
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr "No se puede encontrar su servidor."
-
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr "Enviado con éxito."
-
-#: ../../Zotlabs/Module/Openid.php:30
-msgid "OpenID protocol error. No ID returned."
-msgstr "Error del protocolo OpenID. Ningún ID recibido como respuesta."
-
-#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
-msgid "Login failed."
-msgstr "El acceso ha fallado."
-
-#: ../../Zotlabs/Module/Page.php:133
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
-" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada."
-
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
-msgstr "Editor de configuración"
-
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please"
-" leave this page unless you are comfortable with and knowledgeable about how"
-" to correctly use this feature."
-msgstr "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica."
-
-#: ../../Zotlabs/Module/Pdledit.php:18
-msgid "Layout updated."
-msgstr "Plantilla actualizada."
-
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
-msgid "Edit System Page Description"
-msgstr "Editor del Sistema de Descripción de Páginas"
-
-#: ../../Zotlabs/Module/Pdledit.php:56
-msgid "Layout not found."
-msgstr "Plantilla no encontrada"
-
-#: ../../Zotlabs/Module/Pdledit.php:62
-msgid "Module Name:"
-msgstr "Nombre del módulo:"
-
-#: ../../Zotlabs/Module/Pdledit.php:63
-msgid "Layout Help"
-msgstr "Ayuda para el diseño de plantillas de página"
-
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226
-#: ../../include/conversation.php:960
-msgid "Poke"
-msgstr "Toques y otras cosas"
-
-#: ../../Zotlabs/Module/Poke.php:169
-msgid "Poke somebody"
-msgstr "Dar un toque a alguien"
-
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
-msgstr "Toque/Incitación"
-
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
-msgstr "Dar un toque, incitar o hacer otras cosas a alguien"
-
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
-msgstr "Destinatario"
-
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
-msgstr "Elegir qué desea enviar al destinatario"
-
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
-msgstr "Convertir en privado este envío"
-
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
-#, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr "Al intentar obtener la dirección, retorna el error: %1$s"
-
 #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
 #: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
 msgid "Profile not found."
@@ -3281,6 +2205,11 @@ msgstr "Página personal"
 msgid "Interests"
 msgstr "Intereses"
 
+#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1224
+msgid "Address"
+msgstr "Dirección"
+
 #: ../../Zotlabs/Module/Profiles.php:560
 msgid "Profile updated."
 msgstr "Perfil actualizado."
@@ -3298,7 +2227,7 @@ msgid "View this profile"
 msgstr "Ver este perfil"
 
 #: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
-#: ../../include/channel.php:959
+#: ../../include/channel.php:998
 msgid "Edit visibility"
 msgstr "Editar visibilidad"
 
@@ -3310,7 +2239,7 @@ msgstr "Gestión del perfil"
 msgid "Change cover photo"
 msgstr "Cambiar la imagen de portada del perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:969
 msgid "Change profile photo"
 msgstr "Cambiar la foto del perfil"
 
@@ -3330,8 +2259,8 @@ msgstr "Eliminar este perfil"
 msgid "Add profile things"
 msgstr "Añadir cosas al perfil"
 
-#: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105
-#: ../../include/conversation.php:1526
+#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541
+#: ../../include/widgets.php:105
 msgid "Personal"
 msgstr "Personales"
 
@@ -3471,119 +2400,1097 @@ msgstr "Información de contacto y redes sociales"
 msgid "My other channels"
 msgstr "Mis otros canales"
 
-#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:994
 msgid "Profile Image"
 msgstr "Imagen del perfil"
 
 #: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
-#: ../../include/channel.php:937
+#: ../../include/channel.php:976
 msgid "Edit Profiles"
 msgstr "Editar perfiles"
 
-#: ../../Zotlabs/Module/Profile_photo.php:179
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente."
-
-#: ../../Zotlabs/Module/Profile_photo.php:367
-msgid "Upload Profile Photo"
-msgstr "Subir foto de perfil"
-
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr "Identificador del perfil no válido"
-
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
-msgstr "Editor de visibilidad del perfil"
-
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249
-msgid "Profile"
-msgstr "Perfil"
-
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
-msgstr "Pulsar en un contacto para añadirlo o eliminarlo."
-
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
-msgstr "Visible para"
-
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1270
-msgid "Public Hubs"
-msgstr "Servidores públicos"
-
-#: ../../Zotlabs/Module/Pubsites.php:25
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
-msgstr "Los sitios listados permiten el registro público en la red $Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los mismos hubs <strong>pueden</strong> proporcionar detalles adicionales."
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Hub URL"
-msgstr "Dirección del hub"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Access Type"
-msgstr "Tipo de acceso"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Registration Policy"
-msgstr "Normas de registro"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Stats"
-msgstr "Estadísticas"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Software"
-msgstr "Software"
-
-#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:959
-msgid "Ratings"
-msgstr "Valoraciones"
-
-#: ../../Zotlabs/Module/Pubsites.php:38
-msgid "Rate"
-msgstr "Valorar"
-
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Website:"
-msgstr "Sitio web:"
-
-#: ../../Zotlabs/Module/Rate.php:163
+#: ../../Zotlabs/Module/Import.php:33
 #, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Canal remoto [%s] (aún no es conocido en este sitio)"
+msgid "Your service plan only allows %d channels."
+msgstr "Su paquete de servicios solo permite %d canales."
 
-#: ../../Zotlabs/Module/Rate.php:164
-msgid "Rating (this information is public)"
-msgstr "Valoración (esta información es pública)"
+#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42
+msgid "Nothing to import."
+msgstr "No hay nada para importar."
 
-#: ../../Zotlabs/Module/Rate.php:165
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Opcionalmente puede explicar su valoración (esta información es pública)"
+#: ../../Zotlabs/Module/Import.php:95 ../../Zotlabs/Module/Import_items.php:66
+msgid "Unable to download data from old server"
+msgstr "No se han podido descargar datos de su antiguo servidor"
 
-#: ../../Zotlabs/Module/Ratings.php:73
-msgid "No ratings"
-msgstr "Ninguna valoración"
+#: ../../Zotlabs/Module/Import.php:101
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Imported file is empty."
+msgstr "El fichero importado está vacío."
 
-#: ../../Zotlabs/Module/Ratings.php:104
-msgid "Rating: "
-msgstr "Valoración:"
+#: ../../Zotlabs/Module/Import.php:123
+#: ../../Zotlabs/Module/Import_items.php:88
+#, php-format
+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/Ratings.php:105
-msgid "Website: "
-msgstr "Sitio web:"
+#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107
+msgid "Cloned channel not found. Import failed."
+msgstr "No se ha podido importar el canal porque el canal clonado no se ha encontrado."
 
-#: ../../Zotlabs/Module/Ratings.php:107
-msgid "Description: "
-msgstr "Descripción:"
+#: ../../Zotlabs/Module/Import.php:163
+msgid "No channel. Import failed."
+msgstr "No hay canal. La importación ha fallado"
+
+#: ../../Zotlabs/Module/Import.php:520
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
+msgstr "Importación completada."
+
+#: ../../Zotlabs/Module/Import.php:542
+msgid "You must be logged in to use this feature."
+msgstr "Debe estar registrado para poder usar esta funcionalidad."
+
+#: ../../Zotlabs/Module/Import.php:547
+msgid "Import Channel"
+msgstr "Importar canal"
+
+#: ../../Zotlabs/Module/Import.php:548
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file."
+msgstr "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación."
+
+#: ../../Zotlabs/Module/Import.php:549
+#: ../../Zotlabs/Module/Import_items.php:121
+msgid "File to Upload"
+msgstr "Fichero para subir"
+
+#: ../../Zotlabs/Module/Import.php:550
+msgid "Or provide the old server/hub details"
+msgstr "O proporcione los detalles de su antiguo servidor/hub"
+
+#: ../../Zotlabs/Module/Import.php:551
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Su identidad en el antiguo servidor  (canal@ejemplo.com)"
+
+#: ../../Zotlabs/Module/Import.php:552
+msgid "Your old login email address"
+msgstr "Su antigua dirección de correo electrónico"
+
+#: ../../Zotlabs/Module/Import.php:553
+msgid "Your old login password"
+msgstr "Su antigua contraseña"
+
+#: ../../Zotlabs/Module/Import.php:554
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos."
+
+#: ../../Zotlabs/Module/Import.php:555
+msgid "Make this hub my primary location"
+msgstr "Convertir este servidor en mi ubicación primaria"
+
+#: ../../Zotlabs/Module/Import.php:556
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importar el contenido publicado si es posible (experimental - limitado por la memoria disponible"
+
+#: ../../Zotlabs/Module/Import.php:557
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine."
+
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../Zotlabs/Module/Siteinfo.php:48
+msgid "$Projectname"
+msgstr "$Projectname"
+
+#: ../../Zotlabs/Module/Home.php:92
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bienvenido a %s"
+
+#: ../../Zotlabs/Module/Item.php:179
+msgid "Unable to locate original post."
+msgstr "No ha sido posible encontrar la entrada original."
+
+#: ../../Zotlabs/Module/Item.php:432
+msgid "Empty post discarded."
+msgstr "La entrada vacía ha sido desechada."
+
+#: ../../Zotlabs/Module/Item.php:472
+msgid "Executable content type not permitted to this channel."
+msgstr "Contenido de tipo ejecutable no permitido en este canal."
+
+#: ../../Zotlabs/Module/Item.php:856
+msgid "Duplicate post suppressed."
+msgstr "Se ha suprimido la entrada duplicada."
+
+#: ../../Zotlabs/Module/Item.php:989
+msgid "System error. Post not saved."
+msgstr "Error del sistema. La entrada no se ha podido salvar."
+
+#: ../../Zotlabs/Module/Item.php:1242
+msgid "Unable to obtain post information from database."
+msgstr "No ha sido posible obtener información de la entrada en la base de datos."
+
+#: ../../Zotlabs/Module/Item.php:1249
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Ha alcanzado su límite de %1$.0f entradas en la página principal."
+
+#: ../../Zotlabs/Module/Item.php:1256
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Ha alcanzado su límite de %1$.0f páginas web."
+
+#: ../../Zotlabs/Module/Photos.php:82
+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:97 ../../Zotlabs/Module/Photos.php:741
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:212
+#: ../../Zotlabs/Module/Profile_photo.php:311
+#: ../../include/photo/photo_driver.php:718
+msgid "Profile Photos"
+msgstr "Fotos del perfil"
+
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147
+msgid "Album not found."
+msgstr "Álbum no encontrado."
+
+#: ../../Zotlabs/Module/Photos.php:130
+msgid "Delete Album"
+msgstr "Borrar álbum"
+
+#: ../../Zotlabs/Module/Photos.php:151
+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:208 ../../Zotlabs/Module/Photos.php:1051
+msgid "Delete Photo"
+msgstr "Borrar foto"
+
+#: ../../Zotlabs/Module/Photos.php:531
+msgid "No photos selected"
+msgstr "No hay fotos seleccionadas"
+
+#: ../../Zotlabs/Module/Photos.php:580
+msgid "Access to this item is restricted."
+msgstr "El acceso a este elemento está restringido."
+
+#: ../../Zotlabs/Module/Photos.php:619
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB de %2$.2f MB de almacenamiento de fotos utilizado."
+
+#: ../../Zotlabs/Module/Photos.php:622
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB de almacenamiento de fotos utilizado."
+
+#: ../../Zotlabs/Module/Photos.php:658
+msgid "Upload Photos"
+msgstr "Subir fotos"
+
+#: ../../Zotlabs/Module/Photos.php:662
+msgid "Enter an album name"
+msgstr "Introducir un nombre de álbum"
+
+#: ../../Zotlabs/Module/Photos.php:663
+msgid "or select an existing album (doubleclick)"
+msgstr "o seleccionar uno existente (doble click)"
+
+#: ../../Zotlabs/Module/Photos.php:664
+msgid "Create a status post for this upload"
+msgstr "Crear un mensaje de estado para esta subida"
+
+#: ../../Zotlabs/Module/Photos.php:665
+msgid "Caption (optional):"
+msgstr "Título (opcional):"
+
+#: ../../Zotlabs/Module/Photos.php:666
+msgid "Description (optional):"
+msgstr "Descripción (opcional):"
+
+#: ../../Zotlabs/Module/Photos.php:693
+msgid "Album name could not be decoded"
+msgstr "El nombre del álbum no ha podido ser descifrado"
+
+#: ../../Zotlabs/Module/Photos.php:741
+msgid "Contact Photos"
+msgstr "Fotos de contacto"
+
+#: ../../Zotlabs/Module/Photos.php:764
+msgid "Show Newest First"
+msgstr "Mostrar lo más reciente primero"
+
+#: ../../Zotlabs/Module/Photos.php:766
+msgid "Show Oldest First"
+msgstr "Mostrar lo más antiguo primero"
+
+#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1329
+#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1593
+msgid "View Photo"
+msgstr "Ver foto"
+
+#: ../../Zotlabs/Module/Photos.php:821
+#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1610
+msgid "Edit Album"
+msgstr "Editar álbum"
+
+#: ../../Zotlabs/Module/Photos.php:868
+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:870
+msgid "Photo not available"
+msgstr "Foto no disponible"
+
+#: ../../Zotlabs/Module/Photos.php:928
+msgid "Use as profile photo"
+msgstr "Usar como foto del perfil"
+
+#: ../../Zotlabs/Module/Photos.php:929
+msgid "Use as cover photo"
+msgstr "Usar como imagen de portada del perfil"
+
+#: ../../Zotlabs/Module/Photos.php:936
+msgid "Private Photo"
+msgstr "Foto privada"
+
+#: ../../Zotlabs/Module/Photos.php:951
+msgid "View Full Size"
+msgstr "Ver tamaño completo"
+
+#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Admin.php:1437
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../../Zotlabs/Module/Photos.php:1030
+msgid "Edit photo"
+msgstr "Editar foto"
+
+#: ../../Zotlabs/Module/Photos.php:1032
+msgid "Rotate CW (right)"
+msgstr "Girar CW (a la derecha)"
+
+#: ../../Zotlabs/Module/Photos.php:1033
+msgid "Rotate CCW (left)"
+msgstr "Girar CCW (a la izquierda)"
+
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "Enter a new album name"
+msgstr "Introducir un nuevo nombre de álbum"
+
+#: ../../Zotlabs/Module/Photos.php:1037
+msgid "or select an existing one (doubleclick)"
+msgstr "o seleccionar uno (doble click) existente"
+
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Caption"
+msgstr "Título"
+
+#: ../../Zotlabs/Module/Photos.php:1042
+msgid "Add a Tag"
+msgstr "Añadir una etiqueta"
+
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Ejemplos: @eva, @Carmen_Osuna, @jaime@ejemplo.com"
+
+#: ../../Zotlabs/Module/Photos.php:1049
+msgid "Flag as adult in album view"
+msgstr "Marcar como \"solo para adultos\" en el álbum"
+
+#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Lib/ThreadItem.php:261
+msgid "I like this (toggle)"
+msgstr "Me gusta (cambiar)"
+
+#: ../../Zotlabs/Module/Photos.php:1069 ../../Zotlabs/Lib/ThreadItem.php:262
+msgid "I don't like this (toggle)"
+msgstr "No me gusta esto (cambiar)"
+
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:397
+#: ../../include/conversation.php:743
+msgid "Please wait"
+msgstr "Espere por favor"
+
+#: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1205
+#: ../../Zotlabs/Lib/ThreadItem.php:707
+msgid "This is you"
+msgstr "Este es usted"
+
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
+#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr "Comentar"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
+msgstr "Me gusta"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
+msgstr "No me gusta"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
+msgstr "De acuerdo"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
+msgstr "En desacuerdo"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
+msgstr "Abstención"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
+msgstr "Participaré"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
+msgstr "No participaré"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
+msgstr "Quizá participe"
+
+#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1136
+#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../include/conversation.php:1738
+msgid "View all"
+msgstr "Ver todo"
+
+#: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../include/taxonomy.php:403 ../../include/channel.php:1198
+#: ../../include/conversation.php:1762
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Me gusta"
+msgstr[1] "Me gusta"
+
+#: ../../Zotlabs/Module/Photos.php:1133 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/conversation.php:1765
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "No me gusta"
+msgstr[1] "No me gusta"
+
+#: ../../Zotlabs/Module/Photos.php:1233
+msgid "Photo Tools"
+msgstr "Gestión de las fotos"
+
+#: ../../Zotlabs/Module/Photos.php:1242
+msgid "In This Photo:"
+msgstr "En esta foto:"
+
+#: ../../Zotlabs/Module/Photos.php:1247
+msgid "Map"
+msgstr "Mapa"
+
+#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/ThreadItem.php:386
+msgctxt "noun"
+msgid "Likes"
+msgstr "Me gusta"
+
+#: ../../Zotlabs/Module/Photos.php:1256 ../../Zotlabs/Lib/ThreadItem.php:387
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "No me gusta"
+
+#: ../../Zotlabs/Module/Photos.php:1261 ../../Zotlabs/Lib/ThreadItem.php:392
+#: ../../include/acl_selectors.php:283
+msgid "Close"
+msgstr "Cerrar"
+
+#: ../../Zotlabs/Module/Photos.php:1335
+msgid "View Album"
+msgstr "Ver álbum"
+
+#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359
+#: ../../Zotlabs/Module/Photos.php:1360
+msgid "Recent Photos"
+msgstr "Fotos recientes"
+
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
+msgstr "La información privada remota no está disponible."
+
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
+msgstr "Visible para:"
+
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
+msgstr "Importación completada"
+
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
+msgstr "Importar elementos"
+
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid ""
+"Use this form to import existing posts and content from an export file."
+msgstr "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación."
+
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
+msgstr "Se ha superado el límite máximo de invitaciones."
+
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : No es una dirección de correo electrónico válida. "
+
+#: ../../Zotlabs/Module/Invite.php:63
+msgid "Please join us on $Projectname"
+msgstr "Únase a nosotros en $Projectname"
+
+#: ../../Zotlabs/Module/Invite.php:74
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio."
+
+#: ../../Zotlabs/Module/Invite.php:79
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s : Falló el envío del mensaje."
+
+#: ../../Zotlabs/Module/Invite.php:83
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d mensajes enviados."
+msgstr[1] "%d mensajes enviados."
+
+#: ../../Zotlabs/Module/Invite.php:102
+msgid "You have no more invitations available"
+msgstr "No tiene más invitaciones disponibles"
+
+#: ../../Zotlabs/Module/Invite.php:133
+msgid "Send invitations"
+msgstr "Enviar invitaciones"
+
+#: ../../Zotlabs/Module/Invite.php:134
+msgid "Enter email addresses, one per line:"
+msgstr "Introduzca las direcciones de correo electrónico, una por línea:"
+
+#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:241
+msgid "Your message:"
+msgstr "Su mensaje:"
+
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Please join my community on $Projectname."
+msgstr "Por favor, únase a mi comunidad en $Projectname."
+
+#: ../../Zotlabs/Module/Invite.php:138
+msgid "You will need to supply this invitation code:"
+msgstr "Tendrá que suministrar este código de invitación:"
+
+#: ../../Zotlabs/Module/Invite.php:139
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Regístrese en cualquier sitio de $Projectname (están todos interconectados)"
+
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Introduzca mi dirección $Projectname en la caja de búsqueda del sitio."
+
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "or visit"
+msgstr "o visitar"
+
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "3. Click [Connect]"
+msgstr "3. Pulse [conectar]"
+
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
+msgstr "Dirección no encontrada."
+
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
+msgstr "Ha fallado la búsqueda de la dirección."
+
+#: ../../Zotlabs/Module/Locs.php:66
+msgid ""
+"Please select another location to become primary before removing the primary"
+" location."
+msgstr "Por favor, seleccione una copia de su canal (un clon) para convertirlo en primario antes de eliminar su canal principal."
+
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
+msgstr "Sincronización de ubicaciones"
+
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
+msgstr "No encontrada ninguna dirección."
+
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
+msgstr "Gestionar las direcciones del canal"
+
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
+msgstr "Primario"
+
+#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+msgid "Drop"
+msgstr "Eliminar"
+
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
+msgstr "Sincronizar ahora"
+
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
+msgstr "Por favor, espere algunos minutos entre operaciones consecutivas."
+
+#: ../../Zotlabs/Module/Locs.php:124
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing"
+" your channel."
+msgstr "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal."
+
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo."
+
+#: ../../Zotlabs/Module/Magic.php:71
+msgid "Hub not found."
+msgstr "Servidor no encontrado"
+
+#: ../../Zotlabs/Module/Mail.php:38
+msgid "Unable to lookup recipient."
+msgstr "Imposible asociar a un destinatario."
+
+#: ../../Zotlabs/Module/Mail.php:45
+msgid "Unable to communicate with requested channel."
+msgstr "Imposible comunicar con el canal solicitado."
+
+#: ../../Zotlabs/Module/Mail.php:52
+msgid "Cannot verify requested channel."
+msgstr "No se puede verificar el canal solicitado."
+
+#: ../../Zotlabs/Module/Mail.php:70
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló."
+
+#: ../../Zotlabs/Module/Mail.php:135
+msgid "Messages"
+msgstr "Mensajes"
+
+#: ../../Zotlabs/Module/Mail.php:170
+msgid "Message recalled."
+msgstr "Mensaje revocado."
+
+#: ../../Zotlabs/Module/Mail.php:183
+msgid "Conversation removed."
+msgstr "Conversación eliminada."
+
+#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Caduca YYYY-MM-DD HH:MM"
+
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Requested channel is not in this network"
+msgstr "El canal solicitado no existe en esta red"
+
+#: ../../Zotlabs/Module/Mail.php:234
+msgid "Send Private Message"
+msgstr "Enviar un mensaje privado"
+
+#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360
+msgid "To:"
+msgstr "Para:"
+
+#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362
+msgid "Subject:"
+msgstr "Asunto:"
+
+#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
+#: ../../include/conversation.php:1231
+msgid "Attach file"
+msgstr "Adjuntar fichero"
+
+#: ../../Zotlabs/Module/Mail.php:245
+msgid "Send"
+msgstr "Enviar"
+
+#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373
+#: ../../include/conversation.php:1266
+msgid "Set expiration date"
+msgstr "Configurar fecha de caducidad"
+
+#: ../../Zotlabs/Module/Mail.php:332
+msgid "Delete message"
+msgstr "Borrar mensaje"
+
+#: ../../Zotlabs/Module/Mail.php:333
+msgid "Delivery report"
+msgstr "Informe de transmisión"
+
+#: ../../Zotlabs/Module/Mail.php:334
+msgid "Recall message"
+msgstr "Revocar el mensaje"
+
+#: ../../Zotlabs/Module/Mail.php:336
+msgid "Message has been recalled."
+msgstr "El mensaje ha sido revocado."
+
+#: ../../Zotlabs/Module/Mail.php:353
+msgid "Delete Conversation"
+msgstr "Eliminar conversación"
+
+#: ../../Zotlabs/Module/Mail.php:355
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente."
+
+#: ../../Zotlabs/Module/Mail.php:359
+msgid "Send Reply"
+msgstr "Responder"
+
+#: ../../Zotlabs/Module/Mail.php:364
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Su mensaje para %s (%s):"
+
+#: ../../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:143
+msgid "Create a new channel"
+msgstr "Crear un nuevo canal"
+
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214
+#: ../../include/nav.php:208
+msgid "Channel Manager"
+msgstr "Administración de canales"
+
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
+msgstr "Canal actual"
+
+#: ../../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:168
+msgid "Default Channel"
+msgstr "Canal principal"
+
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
+msgstr "Convertir en predeterminado"
+
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
+msgstr "%d mensajes nuevos"
+
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
+msgstr "%d nuevas isolicitudes de conexión"
+
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
+msgstr "Canal delegado"
+
+#: ../../Zotlabs/Module/Menu.php:49
+msgid "Unable to update menu."
+msgstr "No se puede actualizar el menú."
+
+#: ../../Zotlabs/Module/Menu.php:60
+msgid "Unable to create menu."
+msgstr "No se puede crear el menú."
+
+#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+msgid "Menu Name"
+msgstr "Nombre del menú"
+
+#: ../../Zotlabs/Module/Menu.php:98
+msgid "Unique name (not visible on webpage) - required"
+msgstr "Nombre único (no será visible en la página web) - requerido"
+
+#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+msgid "Menu Title"
+msgstr "Título del menú"
+
+#: ../../Zotlabs/Module/Menu.php:99
+msgid "Visible on webpage - leave empty for no title"
+msgstr "Visible en la página web - no ponga nada si no desea un título"
+
+#: ../../Zotlabs/Module/Menu.php:100
+msgid "Allow Bookmarks"
+msgstr "Permitir marcadores"
+
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+msgid "Menu may be used to store saved bookmarks"
+msgstr "El menú se puede usar para guardar marcadores"
+
+#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+msgid "Submit and proceed"
+msgstr "Enviar y proceder"
+
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2239
+msgid "Menus"
+msgstr "Menús"
+
+#: ../../Zotlabs/Module/Menu.php:117
+msgid "Bookmarks allowed"
+msgstr "Marcadores permitidos"
+
+#: ../../Zotlabs/Module/Menu.php:119
+msgid "Delete this menu"
+msgstr "Borrar este menú"
+
+#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+msgid "Edit menu contents"
+msgstr "Editar los contenidos del menú"
+
+#: ../../Zotlabs/Module/Menu.php:121
+msgid "Edit this menu"
+msgstr "Modificar este menú"
+
+#: ../../Zotlabs/Module/Menu.php:136
+msgid "Menu could not be deleted."
+msgstr "El menú no puede ser eliminado."
+
+#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+msgid "Menu not found."
+msgstr "Menú no encontrado"
+
+#: ../../Zotlabs/Module/Menu.php:149
+msgid "Edit Menu"
+msgstr "Modificar el menú"
+
+#: ../../Zotlabs/Module/Menu.php:153
+msgid "Add or remove entries to this menu"
+msgstr "Añadir o quitar entradas en este menú"
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Menu name"
+msgstr "Nombre del menú"
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Must be unique, only seen by you"
+msgstr "Debe ser único, solo será visible para usted"
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title"
+msgstr "Título del menú"
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title as seen by others"
+msgstr "El título del menú tal como será visto por los demás"
+
+#: ../../Zotlabs/Module/Menu.php:157
+msgid "Allow bookmarks"
+msgstr "Permitir marcadores"
+
+#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
+#: ../../Zotlabs/Module/Xchan.php:41
+msgid "Not found."
+msgstr "No encontrado."
+
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
+msgstr "No se ha encontrado una cuenta válida."
+
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico."
+
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Usuario del sitio (%s)"
+
+#: ../../Zotlabs/Module/Lostpass.php:44
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Se ha solicitado restablecer la contraseña en %s"
+
+#: ../../Zotlabs/Module/Lostpass.php:67
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado."
+
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1712
+msgid "Password Reset"
+msgstr "Restablecer la contraseña"
+
+#: ../../Zotlabs/Module/Lostpass.php:91
+msgid "Your password has been reset as requested."
+msgstr "Su contraseña ha sido restablecida según lo solicitó."
+
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your new password is"
+msgstr "Su nueva contraseña es"
+
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Save or copy your new password - and then"
+msgstr "Guarde o copie su nueva contraseña - y después"
+
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "click here to login"
+msgstr "pulse aquí para conectarse"
+
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión."
+
+#: ../../Zotlabs/Module/Lostpass.php:112
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Su contraseña en %s ha sido cambiada"
+
+#: ../../Zotlabs/Module/Lostpass.php:127
+msgid "Forgot your Password?"
+msgstr "¿Ha olvidado su contraseña?"
+
+#: ../../Zotlabs/Module/Lostpass.php:128
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones."
+
+#: ../../Zotlabs/Module/Lostpass.php:129
+msgid "Email Address"
+msgstr "Dirección de correo electrónico"
+
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Reset"
+msgstr "Reiniciar"
+
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr "%1$s está %2$s"
+
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227
+msgid "Mood"
+msgstr "Estado de ánimo"
+
+#: ../../Zotlabs/Module/Mood.php:136
+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:94
+msgid "No such group"
+msgstr "No se encuentra el grupo"
+
+#: ../../Zotlabs/Module/Network.php:134
+msgid "No such channel"
+msgstr "No se encuentra el  canal"
+
+#: ../../Zotlabs/Module/Network.php:139
+msgid "forum"
+msgstr "foro"
+
+#: ../../Zotlabs/Module/Network.php:151
+msgid "Search Results For:"
+msgstr "Buscar resultados para:"
+
+#: ../../Zotlabs/Module/Network.php:215
+msgid "Privacy group is empty"
+msgstr "El grupo de canales está vacío"
+
+#: ../../Zotlabs/Module/Network.php:224
+msgid "Privacy group: "
+msgstr "Grupo de canales: "
+
+#: ../../Zotlabs/Module/Network.php:250
+msgid "Invalid connection."
+msgstr "Conexión no válida."
+
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:98
+msgid "No more system notifications."
+msgstr "No hay más notificaciones del sistema"
+
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:102
+msgid "System Notifications"
+msgstr "Notificaciones del sistema"
+
+#: ../../Zotlabs/Module/Match.php:26
+msgid "Profile Match"
+msgstr "Perfil compatible"
+
+#: ../../Zotlabs/Module/Match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "No hay palabras clave en el perfil principal para poder encontrar perfiles compatibles. Por favor, añada palabras clave a su perfil principal."
+
+#: ../../Zotlabs/Module/Match.php:67
+msgid "is interested in:"
+msgstr "está interesado en:"
+
+#: ../../Zotlabs/Module/Match.php:74
+msgid "No matches"
+msgstr "No se han encontrado perfiles compatibles"
+
+#: ../../Zotlabs/Module/Channel.php:40
+msgid "Posts and comments"
+msgstr "Publicaciones y comentarios"
+
+#: ../../Zotlabs/Module/Channel.php:41
+msgid "Only posts"
+msgstr "Solo publicaciones"
+
+#: ../../Zotlabs/Module/Channel.php:101
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Permisos insuficientes. Petición redirigida a la página del perfil."
+
+#: ../../Zotlabs/Module/Mitem.php:52
+msgid "Unable to create element."
+msgstr "Imposible crear el elemento."
+
+#: ../../Zotlabs/Module/Mitem.php:76
+msgid "Unable to update menu element."
+msgstr "No es posible actualizar el elemento del menú."
+
+#: ../../Zotlabs/Module/Mitem.php:92
+msgid "Unable to add menu element."
+msgstr "No es posible añadir el elemento al menú"
+
+#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
+msgid "Menu Item Permissions"
+msgstr "Permisos del elemento del menú"
+
+#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
+#: ../../Zotlabs/Module/Settings.php:1163
+msgid "(click to open/close)"
+msgstr "(pulsar para abrir o cerrar)"
+
+#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
+msgid "Link Name"
+msgstr "Nombre del enlace"
+
+#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
+msgid "Link or Submenu Target"
+msgstr "Destino del enlace o submenú"
+
+#: ../../Zotlabs/Module/Mitem.php:157
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "Introducir la dirección del enlace o seleccionar el nombre de un submenú"
+
+#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
+msgid "Use magic-auth if available"
+msgstr "Usar la autenticación mágica si está disponible"
+
+#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
+msgid "Open link in new window"
+msgstr "Abrir el enlace en una nueva ventana"
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Order in list"
+msgstr "Orden en la lista"
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Los números más altos irán al final de la lista"
+
+#: ../../Zotlabs/Module/Mitem.php:161
+msgid "Submit and finish"
+msgstr "Enviar y terminar"
+
+#: ../../Zotlabs/Module/Mitem.php:162
+msgid "Submit and continue"
+msgstr "Enviar y continuar"
+
+#: ../../Zotlabs/Module/Mitem.php:170
+msgid "Menu:"
+msgstr "Menú:"
+
+#: ../../Zotlabs/Module/Mitem.php:173
+msgid "Link Target"
+msgstr "Destino del enlace"
+
+#: ../../Zotlabs/Module/Mitem.php:176
+msgid "Edit menu"
+msgstr "Editar menú"
+
+#: ../../Zotlabs/Module/Mitem.php:179
+msgid "Edit element"
+msgstr "Editar el elemento"
+
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Drop element"
+msgstr "Eliminar el elemento"
+
+#: ../../Zotlabs/Module/Mitem.php:181
+msgid "New element"
+msgstr "Nuevo elemento"
+
+#: ../../Zotlabs/Module/Mitem.php:182
+msgid "Edit this menu container"
+msgstr "Modificar el contenedor del menú"
+
+#: ../../Zotlabs/Module/Mitem.php:183
+msgid "Add menu element"
+msgstr "Añadir un elemento al menú"
+
+#: ../../Zotlabs/Module/Mitem.php:184
+msgid "Delete this menu item"
+msgstr "Eliminar este elemento del menú"
+
+#: ../../Zotlabs/Module/Mitem.php:185
+msgid "Edit this menu item"
+msgstr "Modificar este elemento del menú"
+
+#: ../../Zotlabs/Module/Mitem.php:202
+msgid "Menu item not found."
+msgstr "Este elemento del menú no se ha encontrado"
+
+#: ../../Zotlabs/Module/Mitem.php:215
+msgid "Menu item deleted."
+msgstr "Este elemento del menú ha sido borrado"
+
+#: ../../Zotlabs/Module/Mitem.php:217
+msgid "Menu item could not be deleted."
+msgstr "Este elemento del menú no puede ser borrado."
+
+#: ../../Zotlabs/Module/Mitem.php:224
+msgid "Edit Menu Element"
+msgstr "Editar elemento del menú"
+
+#: ../../Zotlabs/Module/Mitem.php:230
+msgid "Link text"
+msgstr "Texto del enlace"
 
 #: ../../Zotlabs/Module/Admin.php:77
 msgid "Theme settings updated."
@@ -3670,11 +3577,11 @@ msgstr "Versión del repositorio (dev)"
 msgid "Site settings updated."
 msgstr "Ajustes del sitio actualizados."
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2841
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2829
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:899
 msgid "mobile"
 msgstr "móvil"
 
@@ -3706,7 +3613,7 @@ msgstr "Mi sitio es un servicio gratuito"
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mi sitio ofrece cuentas gratuitas con opciones extra de pago"
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1382
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1476
 msgid "Site"
 msgstr "Sitio"
 
@@ -3994,12 +3901,12 @@ msgid "0 for no expiration of imported content"
 msgstr "0 para que no caduque el contenido importado"
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "Off"
 msgstr "Desactivado"
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "On"
 msgstr "Activado"
 
@@ -4056,7 +3963,7 @@ msgid ""
 "embedded content from that site is explicitly blocked."
 msgstr "El resto del contenido incrustado se filtrará, <strong>excepto</ strong> si el contenido incorporado desde ese sitio está bloqueado de forma explícita."
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1385
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1479
 msgid "Security"
 msgstr "Seguridad"
 
@@ -4224,7 +4131,7 @@ msgid "Account '%s' unblocked"
 msgstr "La cuenta '%s' ha sido desbloqueada"
 
 #: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
-#: ../../include/widgets.php:1383
+#: ../../include/widgets.php:1477
 msgid "Accounts"
 msgstr "Cuentas"
 
@@ -4330,7 +4237,7 @@ msgstr "Código permitido al canal '%s'"
 msgid "Channel '%s' code disallowed"
 msgstr "Código no permitido al canal '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1384
+#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1478
 msgid "Channels"
 msgstr "Canales"
 
@@ -4350,7 +4257,7 @@ msgstr "Permitir código"
 msgid "Disallow Code"
 msgstr "No permitir código"
 
-#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1611
+#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626
 msgid "Channel"
 msgstr "Canal"
 
@@ -4389,7 +4296,7 @@ msgid "Enable"
 msgstr "Activar"
 
 #: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
-#: ../../include/widgets.php:1387
+#: ../../include/widgets.php:1481
 msgid "Plugins"
 msgstr "Extensiones (plugins)"
 
@@ -4398,8 +4305,8 @@ msgid "Toggle"
 msgstr "Cambiar"
 
 #: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
-#: ../../Zotlabs/Lib/Apps.php:215 ../../include/widgets.php:638
-#: ../../include/nav.php:208
+#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:210
+#: ../../include/widgets.php:647
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -4455,7 +4362,7 @@ msgstr "Descargar el repositorio"
 msgid "Install new repo"
 msgstr "Instalar un nuevo repositorio"
 
-#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:334
 msgid "Install"
 msgstr "Instalar"
 
@@ -4471,8 +4378,8 @@ msgstr "Repositorios de los plugins instalados"
 msgid "Install a New Plugin Repository"
 msgstr "Instalar un nuevo repositorio de plugins"
 
-#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:72
+#: ../../Zotlabs/Module/Settings.php:670 ../../Zotlabs/Lib/Apps.php:334
 msgid "Update"
 msgstr "Actualizar"
 
@@ -4489,7 +4396,7 @@ msgid "Screenshot"
 msgstr "Instantánea de pantalla"
 
 #: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
-#: ../../include/widgets.php:1388
+#: ../../include/widgets.php:1482
 msgid "Themes"
 msgstr "Temas"
 
@@ -4505,8 +4412,8 @@ msgstr "[No soportado]"
 msgid "Log settings updated."
 msgstr "Actualizado el informe de configuraciones."
 
-#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1409
-#: ../../include/widgets.php:1419
+#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1503
+#: ../../include/widgets.php:1513
 msgid "Logs"
 msgstr "Informes"
 
@@ -4572,7 +4479,7 @@ msgstr "Definición del campo no encontrada"
 msgid "Edit Profile Field"
 msgstr "Modificar el campo del perfil"
 
-#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1390
+#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1484
 msgid "Profile Fields"
 msgstr "Campos del perfil"
 
@@ -4600,57 +4507,384 @@ msgstr "Campos personalizados"
 msgid "Create Custom Field"
 msgstr "Crear un campo personalizado"
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
-msgid "App installed."
-msgstr "Aplicación instalada."
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Name or caption"
+msgstr "Nombre o descripción"
 
-#: ../../Zotlabs/Module/Appman.php:46
-msgid "Malformed app."
-msgstr "Aplicación con errores"
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
+msgstr "Ejemplos: \"Juan García\", \"Luisa y sus caballos\", \"Fútbol\", \"Grupo de aviación\""
 
-#: ../../Zotlabs/Module/Appman.php:104
-msgid "Embed code"
-msgstr "Código incorporado"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+msgid "Choose a short nickname"
+msgstr "Elija un alias corto"
 
-#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
-msgid "Edit App"
-msgstr "Modificar la aplicación"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+#, php-format
+msgid ""
+"Your nickname will be used to create an easy to remember channel address "
+"e.g. nickname%s"
+msgstr "Su alias se usará para crear una dirección de canal fácil de recordar, p. ej.: alias%s"
 
-#: ../../Zotlabs/Module/Appman.php:110
-msgid "Create App"
-msgstr "Crear una aplicación"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Channel role and privacy"
+msgstr "Clase de canal y privacidad"
 
-#: ../../Zotlabs/Module/Appman.php:115
-msgid "Name of app"
-msgstr "Nombre de la aplicación"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Select a channel role with your privacy requirements."
+msgstr "Seleccione un tipo de canal con sus requisitos de privacidad"
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Location (URL) of app"
-msgstr "Dirección (URL) de la aplicación"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Read more about roles"
+msgstr "Leer más sobre los roles"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "Photo icon URL"
-msgstr "Dirección del icono"
+#: ../../Zotlabs/Module/New_channel.php:135
+msgid "Create Channel"
+msgstr "Crear un canal"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "80 x 80 pixels - optional"
-msgstr "80 x 80 pixels - opcional"
+#: ../../Zotlabs/Module/New_channel.php:136
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
+msgstr "Un canal es su identidad en esta red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con una gama de permisos extremadamente detallada."
 
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Categories (optional, comma separated list)"
-msgstr "Categorías (opcional, lista separada por comas)"
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr "O <a href=\"import\">importar un canal existente</a> desde otro lugar."
 
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Version ID"
-msgstr "Versión"
+#: ../../Zotlabs/Module/Ping.php:265
+msgid "sent you a private message"
+msgstr "le ha enviado un mensaje privado"
 
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Price of app"
-msgstr "Precio de la aplicación"
+#: ../../Zotlabs/Module/Ping.php:313
+msgid "added your channel"
+msgstr "añadió este canal a sus conexiones"
 
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Location (URL) to purchase app"
-msgstr "Dirección (URL) donde adquirir la aplicación"
+#: ../../Zotlabs/Module/Ping.php:323
+msgid "g A l F d"
+msgstr "g A l d F"
+
+#: ../../Zotlabs/Module/Ping.php:346
+msgid "[today]"
+msgstr "[hoy]"
+
+#: ../../Zotlabs/Module/Ping.php:355
+msgid "posted an event"
+msgstr "publicó un evento"
+
+#: ../../Zotlabs/Module/Notifications.php:30
+msgid "Invalid request identifier."
+msgstr "Petición inválida del identificador."
+
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "Discard"
+msgstr "Descartar"
+
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:193
+msgid "Mark all system notifications seen"
+msgstr "Marcar todas las notificaciones de sistema como leídas"
+
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228
+#: ../../include/conversation.php:963
+msgid "Poke"
+msgstr "Toques y otras cosas"
+
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
+msgstr "Dar un toque a alguien"
+
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
+msgstr "Toque/Incitación"
+
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
+msgstr "Dar un toque, incitar o hacer otras cosas a alguien"
+
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
+msgstr "Destinatario"
+
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
+msgstr "Elegir qué desea enviar al destinatario"
+
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
+msgstr "Convertir en privado este envío"
+
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr "No se puede encontrar su servidor."
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr "Enviado con éxito."
+
+#: ../../Zotlabs/Module/Openid.php:30
+msgid "OpenID protocol error. No ID returned."
+msgstr "Error del protocolo OpenID. Ningún ID recibido como respuesta."
+
+#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:285
+msgid "Login failed."
+msgstr "El acceso ha fallado."
+
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr "Identificador del perfil no válido"
+
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
+msgstr "Editor de visibilidad del perfil"
+
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1290
+msgid "Profile"
+msgstr "Perfil"
+
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
+msgstr "Pulsar en un contacto para añadirlo o eliminarlo."
+
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
+msgstr "Visible para"
+
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada."
+
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
+msgstr "Editor de configuración"
+
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica."
+
+#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "Al intentar obtener la dirección, retorna el error: %1$s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:19
+#, php-format
+msgid "Version %s"
+msgstr "Versión %s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Installed plugins/addons/apps:"
+msgstr "Extensiones (plugins), complementos o aplicaciones (apps) instaladas:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:36
+msgid "No installed plugins/addons/apps"
+msgstr "No hay instalada ninguna extensión (plugin), complemento o aplicación (app)"
+
+#: ../../Zotlabs/Module/Siteinfo.php:49
+msgid ""
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Este es un sitio integrado en $Projectname - una red cooperativa mundial de sitios web descentralizados de privacidad mejorada."
+
+#: ../../Zotlabs/Module/Siteinfo.php:51
+msgid "Tag: "
+msgstr "Etiqueta:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:53
+msgid "Last background fetch: "
+msgstr "Última actualización en segundo plano:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:55
+msgid "Current load average: "
+msgstr "Carga media actual:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:58
+msgid "Running at web location"
+msgstr "Corriendo en el sitio web"
+
+#: ../../Zotlabs/Module/Siteinfo.php:59
+msgid ""
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para más información sobre $Projectname."
+
+#: ../../Zotlabs/Module/Siteinfo.php:60
+msgid "Bug reports and issues: please visit"
+msgstr "Informes de errores e incidencias: por favor visite"
+
+#: ../../Zotlabs/Module/Siteinfo.php:62
+msgid "$projectname issues"
+msgstr "Problemas en $projectname"
+
+#: ../../Zotlabs/Module/Siteinfo.php:63
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com"
+
+#: ../../Zotlabs/Module/Siteinfo.php:65
+msgid "Site Administrators"
+msgstr "Administradores del sitio"
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Encontramos un problema durante el inicio de sesión con la OpenID que proporcionó. Por favor, compruebe que la ID está correctamente escrita."
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid "The error message was:"
+msgstr "El mensaje de error fue:"
+
+#: ../../Zotlabs/Module/Rmagic.php:48
+msgid "Authentication failed."
+msgstr "Falló la autenticación."
+
+#: ../../Zotlabs/Module/Rmagic.php:88
+msgid "Remote Authentication"
+msgstr "Acceso desde su servidor"
+
+#: ../../Zotlabs/Module/Rmagic.php:89
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)"
+
+#: ../../Zotlabs/Module/Rmagic.php:90
+msgid "Authenticate"
+msgstr "Acceder"
+
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1337
+msgid "Public Hubs"
+msgstr "Servidores públicos"
+
+#: ../../Zotlabs/Module/Pubsites.php:25
+msgid ""
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
+msgstr "Los sitios listados permiten el registro público en la red $Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los mismos hubs <strong>pueden</strong> proporcionar detalles adicionales."
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Hub URL"
+msgstr "Dirección del hub"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Access Type"
+msgstr "Tipo de acceso"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Registration Policy"
+msgstr "Normas de registro"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Stats"
+msgstr "Estadísticas"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Software"
+msgstr "Software"
+
+#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
+#: ../../include/conversation.php:962
+msgid "Ratings"
+msgstr "Valoraciones"
+
+#: ../../Zotlabs/Module/Pubsites.php:38
+msgid "Rate"
+msgstr "Valorar"
+
+#: ../../Zotlabs/Module/Profile_photo.php:186
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente."
+
+#: ../../Zotlabs/Module/Profile_photo.php:389
+msgid "Upload Profile Photo"
+msgstr "Subir foto de perfil"
+
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Editblock.php:108
+msgid "Block Name"
+msgstr "Nombre del bloque"
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2238
+msgid "Blocks"
+msgstr "Bloques"
+
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr "Título del bloque"
+
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Website:"
+msgstr "Sitio web:"
+
+#: ../../Zotlabs/Module/Rate.php:163
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Canal remoto [%s] (aún no es conocido en este sitio)"
+
+#: ../../Zotlabs/Module/Rate.php:164
+msgid "Rating (this information is public)"
+msgstr "Valoración (esta información es pública)"
+
+#: ../../Zotlabs/Module/Rate.php:165
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Opcionalmente puede explicar su valoración (esta información es pública)"
+
+#: ../../Zotlabs/Module/Ratings.php:73
+msgid "No ratings"
+msgstr "Ninguna valoración"
+
+#: ../../Zotlabs/Module/Ratings.php:104
+msgid "Rating: "
+msgstr "Valoración:"
+
+#: ../../Zotlabs/Module/Ratings.php:105
+msgid "Website: "
+msgstr "Sitio web:"
+
+#: ../../Zotlabs/Module/Ratings.php:107
+msgid "Description: "
+msgstr "Descripción:"
+
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:165
+#: ../../include/widgets.php:102
+msgid "Apps"
+msgstr "Aplicaciones (apps)"
+
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243
+msgid "Title (optional)"
+msgstr "Título (opcional)"
+
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
+msgstr "Modificar este bloque"
+
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr "Ningún canal."
+
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr "Conexiones comunes"
+
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
+msgstr "Ninguna  conexión en común."
 
 #: ../../Zotlabs/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
@@ -4755,120 +4989,154 @@ msgstr "sí"
 msgid "Membership on this site is by invitation only."
 msgstr "Para registrarse en este sitio es necesaria una invitación."
 
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
-#: ../../boot.php:1685
+#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:149
+#: ../../boot.php:1686
 msgid "Register"
 msgstr "Registrarse"
 
-#: ../../Zotlabs/Module/Register.php:262
-msgid "Proceed to create your first channel"
-msgstr "Crear su primer canal"
+#: ../../Zotlabs/Module/Register.php:263
+msgid ""
+"This site may require email verification after submitting this form. If you "
+"are returned to a login page, please check your email for instructions."
+msgstr ""
 
 #: ../../Zotlabs/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Por favor, inicie sesión."
 
-#: ../../Zotlabs/Module/Removeaccount.php:34
+#: ../../Zotlabs/Module/Removeaccount.php:35
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "La eliminación de cuentas no está permitida hasta después de que hayan transcurrido 48 horas desde el último cambio de contraseña."
 
-#: ../../Zotlabs/Module/Removeaccount.php:56
+#: ../../Zotlabs/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Eliminar esta cuenta"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "WARNING: "
 msgstr "ATENCIÓN:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Esta cuenta y todos sus canales van a ser eliminados de la red."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This action is permanent and can not be undone!"
 msgstr "¡Esta acción tiene carácter definitivo y no se puede deshacer!"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeme.php:62
 msgid "Please enter your password for verification:"
 msgstr "Por favor, introduzca su contraseña para su verificación:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Remover esta cuenta, todos sus canales y clones de la red"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Por defecto, solo las instancias de los canales ubicados en este servidor serán eliminados de la red"
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
-#: ../../Zotlabs/Module/Settings.php:705
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings.php:759
 msgid "Remove Account"
 msgstr "Eliminar cuenta"
 
-#: ../../Zotlabs/Module/Removeme.php:33
+#: ../../Zotlabs/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "La eliminación de canales no está permitida hasta pasadas 48 horas desde el último cambio de contraseña."
 
-#: ../../Zotlabs/Module/Removeme.php:58
+#: ../../Zotlabs/Module/Removeme.php:60
 msgid "Remove This Channel"
 msgstr "Eliminar este canal"
 
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This channel will be completely removed from the network. "
 msgstr "Este canal va a ser completamente eliminado de la red."
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid "Remove this channel and all its clones from the network"
 msgstr "Eliminar este canal y todos sus clones de la red"
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red"
 
-#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Removeme.php:64 ../../Zotlabs/Module/Settings.php:1219
 msgid "Remove Channel"
 msgstr "Eliminar el canal"
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+msgid "Export Channel"
+msgstr "Exportar el canal"
+
+#: ../../Zotlabs/Module/Uexport.php:57
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Encontramos un problema durante el inicio de sesión con la OpenID que proporcionó. Por favor, compruebe que la ID está correctamente escrita."
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido."
 
-#: ../../Zotlabs/Module/Rmagic.php:44
-msgid "The error message was:"
-msgstr "El mensaje de error fue:"
+#: ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Content"
+msgstr "Exportar contenidos"
 
-#: ../../Zotlabs/Module/Rmagic.php:48
-msgid "Authentication failed."
-msgstr "Falló la autenticación."
+#: ../../Zotlabs/Module/Uexport.php:59
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Exportar la información sobre su canal y el contenido reciente a un fichero de respaldo JSON, que puede ser restaurado o importado a otro servidor. Este fichero incluye todas sus conexiones, permisos, datos del perfil y publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea paciente, la descarga puede tardar varios minutos en comenzar."
 
-#: ../../Zotlabs/Module/Rmagic.php:88
-msgid "Remote Authentication"
-msgstr "Acceso desde su servidor"
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export your posts from a given year."
+msgstr "Exporta sus publicaciones de un año dado."
 
-#: ../../Zotlabs/Module/Rmagic.php:89
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)"
+#: ../../Zotlabs/Module/Uexport.php:62
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "También puede exportar sus mensajes y conversaciones durante un año o mes en particular. Ajuste la fecha en la barra de direcciones del navegador para seleccionar otras fechas. Si la exportación falla (posiblemente debido al agotamiento de la memoria del servidor hub), por favor, intente de nuevo la selección de un rango de fechas más pequeño."
 
-#: ../../Zotlabs/Module/Rmagic.php:90
-msgid "Authenticate"
-msgstr "Acceder"
+#: ../../Zotlabs/Module/Uexport.php:63
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a "
+"href=\"%1$s\">%2$s</a>"
+msgstr "Para seleccionar todos los mensajes de un año determinado, como este año, visite <a href=\"%1$s\">%2$s</a>"
+
+#: ../../Zotlabs/Module/Uexport.php:64
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite <a href=\"%1$s\">%2$s</a>"
+
+#: ../../Zotlabs/Module/Uexport.php:65
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a "
+"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
+" please import or restore these in date order (oldest first)."
+msgstr "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1$s\">%2$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero)."
 
 #: ../../Zotlabs/Module/Search.php:216
 #, php-format
@@ -4884,609 +5152,652 @@ 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:69
+#: ../../Zotlabs/Module/Settings.php:64
 msgid "Name is required"
 msgstr "El nombre es obligatorio"
 
-#: ../../Zotlabs/Module/Settings.php:73
+#: ../../Zotlabs/Module/Settings.php:68
 msgid "Key and Secret are required"
 msgstr "\"Key\" y \"Secret\" son obligatorios"
 
-#: ../../Zotlabs/Module/Settings.php:225
+#: ../../Zotlabs/Module/Settings.php:138
+#, php-format
+msgid "This channel is limited to %d tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:144
+msgid "Name and Password are required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:168
+msgid "Token saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:274
 msgid "Not valid email."
 msgstr "Correo electrónico no válido."
 
-#: ../../Zotlabs/Module/Settings.php:228
+#: ../../Zotlabs/Module/Settings.php:277
 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:237
+#: ../../Zotlabs/Module/Settings.php:286
 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:254
+#: ../../Zotlabs/Module/Settings.php:303
 msgid "Password verification failed."
 msgstr "La comprobación de la contraseña ha fallado."
 
-#: ../../Zotlabs/Module/Settings.php:261
+#: ../../Zotlabs/Module/Settings.php:310
 msgid "Passwords do not match. Password unchanged."
 msgstr "Las contraseñas no coinciden. La contraseña no se ha cambiado."
 
-#: ../../Zotlabs/Module/Settings.php:265
+#: ../../Zotlabs/Module/Settings.php:314
 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:279
+#: ../../Zotlabs/Module/Settings.php:328
 msgid "Password changed."
 msgstr "Contraseña cambiada."
 
-#: ../../Zotlabs/Module/Settings.php:281
+#: ../../Zotlabs/Module/Settings.php:330
 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:525
+#: ../../Zotlabs/Module/Settings.php:579
 msgid "Settings updated."
 msgstr "Ajustes actualizados."
 
-#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
-#: ../../Zotlabs/Module/Settings.php:651
+#: ../../Zotlabs/Module/Settings.php:643 ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:705
 msgid "Add application"
 msgstr "Añadir aplicación"
 
-#: ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:646
 msgid "Name of application"
 msgstr "Nombre de la aplicación"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:673
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:648
 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:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:648 ../../Zotlabs/Module/Settings.php:674
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
+#: ../../Zotlabs/Module/Settings.php:649 ../../Zotlabs/Module/Settings.php:675
 msgid "Redirect"
 msgstr "Redirigir"
 
-#: ../../Zotlabs/Module/Settings.php:595
+#: ../../Zotlabs/Module/Settings.php:649
 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:596 ../../Zotlabs/Module/Settings.php:622
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Settings.php:676
 msgid "Icon url"
 msgstr "Dirección del icono"
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Sources.php:112
 #: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr "Opcional"
 
-#: ../../Zotlabs/Module/Settings.php:607
+#: ../../Zotlabs/Module/Settings.php:661
 msgid "Application not found."
 msgstr "Aplicación no encontrada."
 
-#: ../../Zotlabs/Module/Settings.php:650
+#: ../../Zotlabs/Module/Settings.php:704
 msgid "Connected Apps"
 msgstr "Aplicaciones (apps) conectadas"
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:708
 msgid "Client key starts with"
 msgstr "La \"client key\" empieza por"
 
-#: ../../Zotlabs/Module/Settings.php:655
+#: ../../Zotlabs/Module/Settings.php:709
 msgid "No name"
 msgstr "Sin nombre"
 
-#: ../../Zotlabs/Module/Settings.php:656
+#: ../../Zotlabs/Module/Settings.php:710
 msgid "Remove authorization"
 msgstr "Eliminar autorización"
 
-#: ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:723
 msgid "No feature settings configured"
 msgstr "No se ha establecido la configuración de los complementos"
 
-#: ../../Zotlabs/Module/Settings.php:676
+#: ../../Zotlabs/Module/Settings.php:730
 msgid "Feature/Addon Settings"
 msgstr "Ajustes de los complementos"
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:753
 msgid "Account Settings"
 msgstr "Configuración de la cuenta"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:754
 msgid "Current Password"
 msgstr "Contraseña actual"
 
-#: ../../Zotlabs/Module/Settings.php:701
+#: ../../Zotlabs/Module/Settings.php:755
 msgid "Enter New Password"
 msgstr "Escribir una nueva contraseña"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 msgid "Confirm New Password"
 msgstr "Confirmar la nueva contraseña"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 msgid "Leave password fields blank unless changing"
 msgstr "Dejar en blanco la contraseña a menos que desee cambiarla."
 
-#: ../../Zotlabs/Module/Settings.php:704
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:758
+#: ../../Zotlabs/Module/Settings.php:1136
 msgid "Email Address:"
 msgstr "Dirección de correo electrónico:"
 
-#: ../../Zotlabs/Module/Settings.php:706
+#: ../../Zotlabs/Module/Settings.php:760
 msgid "Remove this account including all its channels"
 msgstr "Eliminar esta cuenta incluyendo todos sus canales"
 
-#: ../../Zotlabs/Module/Settings.php:729
+#: ../../Zotlabs/Module/Settings.php:789
+msgid ""
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in Access Control Lists and "
+"visitors may login using these credentials to access the private content."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:791
+msgid ""
+"You may also provide <em>dropbox</em> style access links to friends and "
+"associates by adding the Login Password to any specific site URL as shown. "
+"Examples:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:796 ../../include/widgets.php:614
+msgid "Guest Access Tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:803
+msgid "Login Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:804
+msgid "Login Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:805
+msgid "Expires (yyyy-mm-dd)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:830
 msgid "Additional Features"
 msgstr "Funcionalidades"
 
-#: ../../Zotlabs/Module/Settings.php:753
+#: ../../Zotlabs/Module/Settings.php:854
 msgid "Connector Settings"
 msgstr "Configuración del conector"
 
-#: ../../Zotlabs/Module/Settings.php:792
+#: ../../Zotlabs/Module/Settings.php:893
 msgid "No special theme for mobile devices"
 msgstr "Sin tema especial para dispositivos móviles"
 
-#: ../../Zotlabs/Module/Settings.php:795
+#: ../../Zotlabs/Module/Settings.php:896
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Experimental)"
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:938
 msgid "Display Settings"
 msgstr "Ajustes de visualización"
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:939
 msgid "Theme Settings"
 msgstr "Ajustes del tema"
 
-#: ../../Zotlabs/Module/Settings.php:839
+#: ../../Zotlabs/Module/Settings.php:940
 msgid "Custom Theme Settings"
 msgstr "Ajustes personalizados del tema"
 
-#: ../../Zotlabs/Module/Settings.php:840
+#: ../../Zotlabs/Module/Settings.php:941
 msgid "Content Settings"
 msgstr "Ajustes del contenido"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:947
 msgid "Display Theme:"
 msgstr "Tema gráfico del perfil:"
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:948
 msgid "Mobile Theme:"
 msgstr "Tema para el móvil:"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 msgid "Preload images before rendering the page"
 msgstr "Carga previa de las imágenes antes de generar la página"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 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:849
+#: ../../Zotlabs/Module/Settings.php:950
 msgid "Enable user zoom on mobile devices"
 msgstr "Habilitar zoom de usuario en dispositivos móviles"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Update browser every xx seconds"
 msgstr "Actualizar navegador cada xx segundos"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Mínimo de 10 segundos, sin máximo"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:952
 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:851
+#: ../../Zotlabs/Module/Settings.php:952
 msgid "Maximum of 100 items"
 msgstr "Máximo de 100 elementos"
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:953
 msgid "Show emoticons (smilies) as images"
 msgstr "Mostrar emoticonos (smilies) como imágenes"
 
-#: ../../Zotlabs/Module/Settings.php:853
+#: ../../Zotlabs/Module/Settings.php:954
 msgid "Link post titles to source"
 msgstr "Enlazar título de la publicación a la fuente original"
 
-#: ../../Zotlabs/Module/Settings.php:854
+#: ../../Zotlabs/Module/Settings.php:955
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Editor de plantilla de página del sistema - (avanzado)"
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:958
 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:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:958 ../../Zotlabs/Module/Settings.php:959
 msgid "(comments displayed separately)"
 msgstr "(comentarios mostrados de forma separada)"
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:959
 msgid "Use blog/list mode on grid page"
 msgstr "Mostrar mi red en modo blog"
 
-#: ../../Zotlabs/Module/Settings.php:859
+#: ../../Zotlabs/Module/Settings.php:960
 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:859 ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:960 ../../Zotlabs/Module/Settings.php:961
 msgid "click to expand content exceeding this height"
 msgstr "Pulsar para expandir el contenido que exceda de esta altura"
 
-#: ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:961
 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:894
+#: ../../Zotlabs/Module/Settings.php:990
 msgid "Nobody except yourself"
 msgstr "Nadie excepto usted"
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:991
 msgid "Only those you specifically allow"
 msgstr "Solo aquellos a los que usted permita explícitamente"
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:992
 msgid "Approved connections"
 msgstr "Conexiones aprobadas"
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:993
 msgid "Any connections"
 msgstr "Cualquier conexión"
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:994
 msgid "Anybody on this website"
 msgstr "Cualquiera en este sitio web"
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:995
 msgid "Anybody in this network"
 msgstr "Cualquiera en esta red"
 
-#: ../../Zotlabs/Module/Settings.php:900
+#: ../../Zotlabs/Module/Settings.php:996
 msgid "Anybody authenticated"
 msgstr "Cualquiera que esté autenticado"
 
-#: ../../Zotlabs/Module/Settings.php:901
+#: ../../Zotlabs/Module/Settings.php:997
 msgid "Anybody on the internet"
 msgstr "Cualquiera en internet"
 
-#: ../../Zotlabs/Module/Settings.php:976
+#: ../../Zotlabs/Module/Settings.php:1071
 msgid "Publish your default profile in the network directory"
 msgstr "Publicar su perfil principal en el directorio de la red"
 
-#: ../../Zotlabs/Module/Settings.php:981
+#: ../../Zotlabs/Module/Settings.php:1076
 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:990
+#: ../../Zotlabs/Module/Settings.php:1085
 msgid "Your channel address is"
 msgstr "Su dirección de canal es"
 
-#: ../../Zotlabs/Module/Settings.php:1032
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Channel Settings"
 msgstr "Ajustes del canal"
 
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:1134
 msgid "Basic Settings"
 msgstr "Configuración básica"
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140
+#: ../../Zotlabs/Module/Settings.php:1135 ../../include/channel.php:1180
 msgid "Full Name:"
 msgstr "Nombre completo:"
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1137
 msgid "Your Timezone:"
 msgstr "Su huso horario:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Default Post Location:"
 msgstr "Localización geográfica predeterminada para sus publicaciones:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Geographical location to display on your posts"
 msgstr "Localización geográfica que debe mostrarse en sus publicaciones"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1139
 msgid "Use Browser Location:"
 msgstr "Usar la localización geográfica del navegador:"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 msgid "Adult Content"
 msgstr "Contenido solo para adultos"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 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:1048
+#: ../../Zotlabs/Module/Settings.php:1143
 msgid "Security and Privacy Settings"
 msgstr "Configuración de seguridad y privacidad"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1146
 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:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 msgid "Hide my online presence"
 msgstr "Ocultar mi presencia en línea"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 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:1055
+#: ../../Zotlabs/Module/Settings.php:1150
 msgid "Simple Privacy Settings:"
 msgstr "Configuración de privacidad sencilla:"
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1151
 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:1057
+#: ../../Zotlabs/Module/Settings.php:1152
 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:1058
+#: ../../Zotlabs/Module/Settings.php:1153
 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:1059
+#: ../../Zotlabs/Module/Settings.php:1154
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Bloqueado - <em>por defecto, bloqueado/a para cualquiera</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 msgid "Allow others to tag your posts"
 msgstr "Permitir a otros etiquetar sus publicaciones"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 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:1063
+#: ../../Zotlabs/Module/Settings.php:1158
 msgid "Advanced Privacy Settings"
 msgstr "Configuración de privacidad avanzada"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 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:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "0 or blank to use the website limit."
 msgstr "0 o en blanco para usar el límite del sitio web."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Este sitio web caduca después de %d días."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "This website does not expire imported content."
 msgstr "Este sitio web no caduca el contenido importado."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "El límite del sitio web tiene prioridad si es inferior a su propio límite."
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "Maximum Friend Requests/Day:"
 msgstr "Máximo de solicitudes de amistad por día:"
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "May reduce spam activity"
 msgstr "Podría reducir la actividad de spam"
 
-#: ../../Zotlabs/Module/Settings.php:1067
+#: ../../Zotlabs/Module/Settings.php:1162
 msgid "Default Post and Publish Permissions"
 msgstr "Permisos predeterminados de entradas y publicaciones"
 
-#: ../../Zotlabs/Module/Settings.php:1069
+#: ../../Zotlabs/Module/Settings.php:1164
 msgid "Use my default audience setting for the type of object published"
 msgstr "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación"
 
-#: ../../Zotlabs/Module/Settings.php:1072
+#: ../../Zotlabs/Module/Settings.php:1167
 msgid "Channel permissions category:"
 msgstr "Categoría de permisos del canal:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 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:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Useful to reduce spamming"
 msgstr "Útil para reducir el envío de correo no deseado"
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1176
 msgid "Notification Settings"
 msgstr "Configuración de las notificaciones"
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1177
 msgid "By default post a status message when:"
 msgstr "Por defecto, enviar un mensaje de estado cuando:"
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1178
 msgid "accepting a friend request"
 msgstr "Acepte una solicitud de amistad"
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1179
 msgid "joining a forum/community"
 msgstr "al unirse a un foro o comunidad"
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1180
 msgid "making an <em>interesting</em> profile change"
 msgstr "Realice un cambio <em>interesante</em> en su perfil"
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1181
 msgid "Send a notification email when:"
 msgstr "Enviar una notificación por correo electrónico cuando:"
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1182
 msgid "You receive a connection request"
 msgstr "Reciba una solicitud de conexión"
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1183
 msgid "Your connections are confirmed"
 msgstr "Sus conexiones hayan sido confirmadas"
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1184
 msgid "Someone writes on your profile wall"
 msgstr "Alguien escriba en la página de su perfil (\"muro\")"
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1185
 msgid "Someone writes a followup comment"
 msgstr "Alguien escriba un comentario sobre sus publicaciones"
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1186
 msgid "You receive a private message"
 msgstr "Reciba un mensaje privado"
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1187
 msgid "You receive a friend suggestion"
 msgstr "Reciba una sugerencia de amistad"
 
-#: ../../Zotlabs/Module/Settings.php:1093
+#: ../../Zotlabs/Module/Settings.php:1188
 msgid "You are tagged in a post"
 msgstr "Usted sea etiquetado en una publicación"
 
-#: ../../Zotlabs/Module/Settings.php:1094
+#: ../../Zotlabs/Module/Settings.php:1189
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Reciba un toque o incitación en una publicación"
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1192
 msgid "Show visual notifications including:"
 msgstr "Mostrar notificaciones visuales que incluyan:"
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1194
 msgid "Unseen grid activity"
 msgstr "Nueva actividad en la red"
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1195
 msgid "Unseen channel activity"
 msgstr "Actividad no vista en el canal"
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1196
 msgid "Unseen private messages"
 msgstr "Mensajes privados no leídos"
 
-#: ../../Zotlabs/Module/Settings.php:1101
-#: ../../Zotlabs/Module/Settings.php:1106
-#: ../../Zotlabs/Module/Settings.php:1107
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1196
+#: ../../Zotlabs/Module/Settings.php:1201
+#: ../../Zotlabs/Module/Settings.php:1202
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "Recommended"
 msgstr "Recomendado"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1197
 msgid "Upcoming events"
 msgstr "Próximos eventos"
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1198
 msgid "Events today"
 msgstr "Eventos de hoy"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Upcoming birthdays"
 msgstr "Próximos cumpleaños"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Not available in all themes"
 msgstr "No disponible en todos los temas"
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1200
 msgid "System (personal) notifications"
 msgstr "Notificaciones del sistema (personales)"
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1201
 msgid "System info messages"
 msgstr "Mensajes de información del sistema"
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1202
 msgid "System critical alerts"
 msgstr "Alertas críticas del sistema"
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "New connections"
 msgstr "Nuevas conexiones"
 
-#: ../../Zotlabs/Module/Settings.php:1109
+#: ../../Zotlabs/Module/Settings.php:1204
 msgid "System Registrations"
 msgstr "Registros del sistema"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1205
 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:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 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:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 msgid "Must be greater than 0"
 msgstr "Debe ser mayor que 0"
 
-#: ../../Zotlabs/Module/Settings.php:1114
+#: ../../Zotlabs/Module/Settings.php:1209
 msgid "Advanced Account/Page Type Settings"
 msgstr "Ajustes avanzados de la cuenta y de los tipos de página"
 
-#: ../../Zotlabs/Module/Settings.php:1115
+#: ../../Zotlabs/Module/Settings.php:1210
 msgid "Change the behaviour of this account for special situations"
 msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales"
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1213
 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:1119
+#: ../../Zotlabs/Module/Settings.php:1214
 msgid "Miscellaneous Settings"
 msgstr "Ajustes diversos"
 
-#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1215
 msgid "Default photo upload folder"
 msgstr "Carpeta por defecto de las fotos subidas"
 
-#: ../../Zotlabs/Module/Settings.php:1120
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1215
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - año en curso, %m - mes actual"
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "Default file upload folder"
 msgstr "Carpeta por defecto de los archivos subidos"
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1218
 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:1125
+#: ../../Zotlabs/Module/Settings.php:1220
 msgid "Remove this channel."
 msgstr "Eliminar este canal."
 
-#: ../../Zotlabs/Module/Settings.php:1126
+#: ../../Zotlabs/Module/Settings.php:1221
 msgid "Firefox Share $Projectname provider"
 msgstr "Servicio de compartición de Firefox: proveedor $Projectname"
 
-#: ../../Zotlabs/Module/Settings.php:1127
+#: ../../Zotlabs/Module/Settings.php:1222
 msgid "Start calendar week on monday"
 msgstr "Comenzar el calendario semanal por el lunes"
 
@@ -5519,7 +5830,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:204 ../../Zotlabs/Module/Setup.php:266
-#: ../../Zotlabs/Module/Setup.php:721
+#: ../../Zotlabs/Module/Setup.php:722
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Por favor, lea el fichero \"install/INSTALL.txt\"."
 
@@ -5719,199 +6030,200 @@ msgid "mb_string PHP module"
 msgstr "módulo PHP mb_string"
 
 #: ../../Zotlabs/Module/Setup.php:496
-msgid "mcrypt PHP module"
-msgstr "módulo PHP mcrypt "
-
-#: ../../Zotlabs/Module/Setup.php:497
 msgid "xml PHP module"
 msgstr "módulo PHP xml"
 
-#: ../../Zotlabs/Module/Setup.php:501 ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:500 ../../Zotlabs/Module/Setup.php:502
 msgid "Apache mod_rewrite module"
 msgstr "módulo Apache mod_rewrite "
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Zotlabs/Module/Setup.php:500
 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:507 ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:506 ../../Zotlabs/Module/Setup.php:509
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Zotlabs/Module/Setup.php:506
 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:515
+#: ../../Zotlabs/Module/Setup.php:514
 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:519
+#: ../../Zotlabs/Module/Setup.php:518
 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:523
+#: ../../Zotlabs/Module/Setup.php:522
 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:527
+#: ../../Zotlabs/Module/Setup.php:526
 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:531
+#: ../../Zotlabs/Module/Setup.php:530
 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:535
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Error: el módulo PHP mcrypt es necesario, pero no está instalado."
-
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Zotlabs/Module/Setup.php:534
 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:557
+#: ../../Zotlabs/Module/Setup.php:552
 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:558
+#: ../../Zotlabs/Module/Setup.php:553
 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:559
+#: ../../Zotlabs/Module/Setup.php:554
 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:560
+#: ../../Zotlabs/Module/Setup.php:555
 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:563
+#: ../../Zotlabs/Module/Setup.php:558
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Zotlabs/Module/Setup.php:572
 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:578
+#: ../../Zotlabs/Module/Setup.php:573
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr "Para poder guardar las plantillas compiladas, el servidor web necesita permisos para acceder al directorio %s en la carpeta web principal."
 
-#: ../../Zotlabs/Module/Setup.php:579 ../../Zotlabs/Module/Setup.php:600
+#: ../../Zotlabs/Module/Setup.php:574 ../../Zotlabs/Module/Setup.php:595
 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:580
+#: ../../Zotlabs/Module/Setup.php:575
 #, 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:583
+#: ../../Zotlabs/Module/Setup.php:578
 #, php-format
 msgid "%s is writable"
 msgstr "%s tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Zotlabs/Module/Setup.php:594
 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."
+"This software 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Zotlabs/Module/Setup.php:598
 msgid "store is writable"
 msgstr "\"store\" tiene permisos de escritura"
 
-#: ../../Zotlabs/Module/Setup.php:636
+#: ../../Zotlabs/Module/Setup.php:631
 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:637
+#: ../../Zotlabs/Module/Setup.php:632
 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:638
+#: ../../Zotlabs/Module/Setup.php:633
 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:639
+#: ../../Zotlabs/Module/Setup.php:634
 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:640
+#: ../../Zotlabs/Module/Setup.php:635
 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:641
+#: ../../Zotlabs/Module/Setup.php:636
 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:643
+#: ../../Zotlabs/Module/Setup.php:638
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:641
 msgid "SSL certificate validation"
 msgstr "validación del certificado SSL"
 
-#: ../../Zotlabs/Module/Setup.php:649
+#: ../../Zotlabs/Module/Setup.php:647
 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:652
+#: ../../Zotlabs/Module/Setup.php:650
 msgid "Url rewrite is working"
 msgstr "La reescritura de las direcciones funciona correctamente"
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:659
 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:685
+#: ../../Zotlabs/Module/Setup.php:683
 msgid "Errors encountered creating database tables."
 msgstr "Se han encontrado errores al crear las tablas de la base de datos."
 
-#: ../../Zotlabs/Module/Setup.php:719
+#: ../../Zotlabs/Module/Setup.php:720
 msgid "<h1>What next</h1>"
 msgstr "<h1>Siguiente paso</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:720
+#: ../../Zotlabs/Module/Setup.php:721
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -5933,64 +6245,62 @@ msgstr "Eliminar todos los ficheros"
 msgid "Remove this file"
 msgstr "Eliminar este fichero"
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Zotlabs/Module/Thing.php:114
+msgid "Thing updated"
+msgstr "Elemento actualizado."
+
+#: ../../Zotlabs/Module/Thing.php:166
+msgid "Object store: failed"
+msgstr "Guardar objeto: ha fallado"
+
+#: ../../Zotlabs/Module/Thing.php:170
+msgid "Thing added"
+msgstr "Elemento añadido"
+
+#: ../../Zotlabs/Module/Thing.php:196
 #, php-format
-msgid "Version %s"
-msgstr "Versión %s"
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:40
-msgid "Installed plugins/addons/apps:"
-msgstr "Extensiones (plugins), complementos o aplicaciones (apps) instaladas:"
+#: ../../Zotlabs/Module/Thing.php:259
+msgid "Show Thing"
+msgstr "Mostrar elemento"
 
-#: ../../Zotlabs/Module/Siteinfo.php:53
-msgid "No installed plugins/addons/apps"
-msgstr "No hay instalada ninguna extensión (plugin), complemento o aplicación (app)"
+#: ../../Zotlabs/Module/Thing.php:266
+msgid "item not found."
+msgstr "elemento no encontrado."
 
-#: ../../Zotlabs/Module/Siteinfo.php:66
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
-msgstr "Este es un sitio integrado en $Projectname - una red cooperativa mundial de sitios web descentralizados de privacidad mejorada."
+#: ../../Zotlabs/Module/Thing.php:299
+msgid "Edit Thing"
+msgstr "Editar elemento"
 
-#: ../../Zotlabs/Module/Siteinfo.php:68
-msgid "Tag: "
-msgstr "Etiqueta:"
+#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
+msgid "Select a profile"
+msgstr "Seleccionar un perfil"
 
-#: ../../Zotlabs/Module/Siteinfo.php:70
-msgid "Last background fetch: "
-msgstr "Última actualización en segundo plano:"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Post an activity"
+msgstr "Publicar una actividad"
 
-#: ../../Zotlabs/Module/Siteinfo.php:72
-msgid "Current load average: "
-msgstr "Carga media actual:"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Sólo enviar a espectadores del perfil pertinente."
 
-#: ../../Zotlabs/Module/Siteinfo.php:75
-msgid "Running at web location"
-msgstr "Corriendo en el sitio web"
+#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
+msgid "Name of thing e.g. something"
+msgstr "Nombre del elemento, p. ej.:. \"algo\""
 
-#: ../../Zotlabs/Module/Siteinfo.php:76
-msgid ""
-"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
-"about $Projectname."
-msgstr "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para más información sobre $Projectname."
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
+msgid "URL of thing (optional)"
+msgstr "Dirección del elemento (opcional)"
 
-#: ../../Zotlabs/Module/Siteinfo.php:77
-msgid "Bug reports and issues: please visit"
-msgstr "Informes de errores e incidencias: por favor visite"
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
+msgid "URL for photo of thing (optional)"
+msgstr "Dirección para la foto o elemento (opcional)"
 
-#: ../../Zotlabs/Module/Siteinfo.php:79
-msgid "$projectname issues"
-msgstr "Problemas en $projectname"
-
-#: ../../Zotlabs/Module/Siteinfo.php:80
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com"
-
-#: ../../Zotlabs/Module/Siteinfo.php:82
-msgid "Site Administrators"
-msgstr "Administradores del sitio"
+#: ../../Zotlabs/Module/Thing.php:349
+msgid "Add Thing to your Profile"
+msgstr "Añadir alguna cosa a su perfil"
 
 #: ../../Zotlabs/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
@@ -6008,8 +6318,8 @@ msgstr "Fuente actualizada."
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630
-#: ../../include/features.php:71
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:72
+#: ../../include/widgets.php:639
 msgid "Channel Sources"
 msgstr "Orígenes de los contenidos del canal"
 
@@ -6085,12 +6395,12 @@ msgstr "No hay sugerencias disponibles. Si es un sitio nuevo, espere 24 horas y
 msgid "Ignore/Hide"
 msgstr "Ignorar/Ocultar"
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:263
 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:1929
 msgid "comment"
 msgstr "el comentario"
 
@@ -6111,131 +6421,110 @@ msgstr "Eliminar etiqueta del elemento."
 msgid "Select a tag to remove: "
 msgstr "Seleccionar una etiqueta para eliminar:"
 
-#: ../../Zotlabs/Module/Thing.php:114
-msgid "Thing updated"
-msgstr "Elemento actualizado."
+#: ../../Zotlabs/Module/Webpages.php:191 ../../Zotlabs/Lib/Apps.php:218
+#: ../../include/nav.php:106 ../../include/conversation.php:1700
+msgid "Webpages"
+msgstr "Páginas web"
 
-#: ../../Zotlabs/Module/Thing.php:166
-msgid "Object store: failed"
-msgstr "Guardar objeto: ha fallado"
+#: ../../Zotlabs/Module/Webpages.php:202 ../../include/page_widgets.php:44
+msgid "Actions"
+msgstr "Acciones"
 
-#: ../../Zotlabs/Module/Thing.php:170
-msgid "Thing added"
-msgstr "Elemento añadido"
+#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:45
+msgid "Page Link"
+msgstr "Vínculo de la página"
 
-#: ../../Zotlabs/Module/Thing.php:196
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr "OBJ: %1$s %2$s %3$s"
+#: ../../Zotlabs/Module/Webpages.php:204
+msgid "Page Title"
+msgstr "Título de página"
 
-#: ../../Zotlabs/Module/Thing.php:259
-msgid "Show Thing"
-msgstr "Mostrar elemento"
+#: ../../Zotlabs/Module/Wiki.php:34
+msgid "Not found"
+msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:266
-msgid "item not found."
-msgstr "elemento no encontrado."
+#: ../../Zotlabs/Module/Wiki.php:92 ../../Zotlabs/Lib/Apps.php:219
+#: ../../include/nav.php:108 ../../include/conversation.php:1710
+#: ../../include/conversation.php:1713 ../../include/features.php:55
+msgid "Wiki"
+msgstr "Wiki"
 
-#: ../../Zotlabs/Module/Thing.php:299
-msgid "Edit Thing"
-msgstr "Editar elemento"
+#: ../../Zotlabs/Module/Wiki.php:93
+msgid "Sandbox"
+msgstr "Entorno de edición"
 
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
-msgid "Select a profile"
-msgstr "Seleccionar un perfil"
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Post an activity"
-msgstr "Publicar una actividad"
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Only sends to viewers of the applicable profile"
-msgstr "Sólo enviar a espectadores del perfil pertinente."
-
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
-msgid "Name of thing e.g. something"
-msgstr "Nombre del elemento, p. ej.:. \"algo\""
-
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
-msgid "URL of thing (optional)"
-msgstr "Dirección del elemento (opcional)"
-
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
-msgid "URL for photo of thing (optional)"
-msgstr "Dirección para la foto o elemento (opcional)"
-
-#: ../../Zotlabs/Module/Thing.php:349
-msgid "Add Thing to your Profile"
-msgstr "Añadir alguna cosa a su perfil"
-
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
-msgid "Export Channel"
-msgstr "Exportar el canal"
-
-#: ../../Zotlabs/Module/Uexport.php:57
+#: ../../Zotlabs/Module/Wiki.php:95
 msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
-msgstr "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido."
+"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be"
+" saved*.\""
+msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Content"
-msgstr "Exportar contenidos"
+#: ../../Zotlabs/Module/Wiki.php:164
+msgid "Revision Comparison"
+msgstr "Comparación de revisiones"
 
-#: ../../Zotlabs/Module/Uexport.php:59
-msgid ""
-"Export your channel information and recent content to a JSON backup that can"
-" be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for"
-" this download to begin."
-msgstr "Exportar la información sobre su canal y el contenido reciente a un fichero de respaldo JSON, que puede ser restaurado o importado a otro servidor. Este fichero incluye todas sus conexiones, permisos, datos del perfil y publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea paciente, la descarga puede tardar varios minutos en comenzar."
+#: ../../Zotlabs/Module/Wiki.php:165
+msgid "Revert"
+msgstr "Revertir"
 
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export your posts from a given year."
-msgstr "Exporta sus publicaciones de un año dado."
+#: ../../Zotlabs/Module/Wiki.php:192
+msgid "Enter the name of your new wiki:"
+msgstr "Nombre de su nuevo wiki:"
 
-#: ../../Zotlabs/Module/Uexport.php:62
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
-msgstr "También puede exportar sus mensajes y conversaciones durante un año o mes en particular. Ajuste la fecha en la barra de direcciones del navegador para seleccionar otras fechas. Si la exportación falla (posiblemente debido al agotamiento de la memoria del servidor hub), por favor, intente de nuevo la selección de un rango de fechas más pequeño."
+#: ../../Zotlabs/Module/Wiki.php:193
+msgid "Enter the name of the new page:"
+msgstr "Nombre de la nueva página:"
 
-#: ../../Zotlabs/Module/Uexport.php:63
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a "
-"href=\"%1$s\">%2$s</a>"
-msgstr "Para seleccionar todos los mensajes de un año determinado, como este año, visite <a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Wiki.php:194
+msgid "Enter the new name:"
+msgstr "Nuevo nombre:"
 
-#: ../../Zotlabs/Module/Uexport.php:64
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite <a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Wiki.php:200 ../../include/conversation.php:1150
+msgid "Embed image from photo albums"
+msgstr "Incluir una imagen de los álbumes de fotos"
 
-#: ../../Zotlabs/Module/Uexport.php:65
-#, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a "
-"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
-" please import or restore these in date order (oldest first)."
-msgstr "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1$s\">%2$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero)."
+#: ../../Zotlabs/Module/Wiki.php:201 ../../include/conversation.php:1234
+msgid "Embed an image from your albums"
+msgstr "Incluir una imagen de sus álbumes"
 
-#: ../../Zotlabs/Module/Viewconnections.php:62
+#: ../../Zotlabs/Module/Wiki.php:203 ../../include/conversation.php:1236
+#: ../../include/conversation.php:1273
+msgid "OK"
+msgstr "OK"
+
+#: ../../Zotlabs/Module/Wiki.php:204 ../../include/conversation.php:1186
+msgid "Choose images to embed"
+msgstr "Elegir imágenes para incluir"
+
+#: ../../Zotlabs/Module/Wiki.php:205 ../../include/conversation.php:1187
+msgid "Choose an album"
+msgstr "Elegir un álbum"
+
+#: ../../Zotlabs/Module/Wiki.php:206 ../../include/conversation.php:1188
+msgid "Choose a different album..."
+msgstr "Elegir un álbum diferente..."
+
+#: ../../Zotlabs/Module/Wiki.php:207 ../../include/conversation.php:1189
+msgid "Error getting album list"
+msgstr "Error al obtener la lista de álbumes"
+
+#: ../../Zotlabs/Module/Wiki.php:208 ../../include/conversation.php:1190
+msgid "Error getting photo link"
+msgstr "Error al obtener el enlace de la foto"
+
+#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1191
+msgid "Error getting album"
+msgstr "Error al obtener el álbum"
+
+#: ../../Zotlabs/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr "Sin conexiones."
 
-#: ../../Zotlabs/Module/Viewconnections.php:75
+#: ../../Zotlabs/Module/Viewconnections.php:78
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Visitar el perfil de %s [%s]"
 
-#: ../../Zotlabs/Module/Viewconnections.php:104
+#: ../../Zotlabs/Module/Viewconnections.php:107
 msgid "View Connections"
 msgstr "Ver conexiones"
 
@@ -6243,22 +6532,23 @@ msgstr "Ver conexiones"
 msgid "Source of Item"
 msgstr "Origen del elemento"
 
-#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217
-#: ../../include/nav.php:106 ../../include/conversation.php:1685
-msgid "Webpages"
-msgstr "Páginas web"
+#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
+msgid "Authorize application connection"
+msgstr "Autorizar una conexión de aplicación"
 
-#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
-msgid "Actions"
-msgstr "Acciones"
+#: ../../Zotlabs/Module/Api.php:62
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Volver a su aplicación e introducir este código de seguridad:"
 
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
-msgid "Page Link"
-msgstr "Vínculo de la página"
+#: ../../Zotlabs/Module/Api.php:72
+msgid "Please login to continue."
+msgstr "Por favor inicie sesión para continuar."
 
-#: ../../Zotlabs/Module/Webpages.php:197
-msgid "Page Title"
-msgstr "Título de página"
+#: ../../Zotlabs/Module/Api.php:87
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" 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/Xchan.php:10
 msgid "Xchan Lookup"
@@ -6268,92 +6558,6 @@ msgstr "Búsqueda de canales"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Buscar un canal (o un \"webbie\") que comience por:"
 
-#: ../../Zotlabs/Lib/Apps.php:204
-msgid "Site Admin"
-msgstr "Administrador del sitio"
-
-#: ../../Zotlabs/Lib/Apps.php:205
-msgid "Bug Report"
-msgstr "Informe de errores"
-
-#: ../../Zotlabs/Lib/Apps.php:206
-msgid "View Bookmarks"
-msgstr "Ver los marcadores"
-
-#: ../../Zotlabs/Lib/Apps.php:207
-msgid "My Chatrooms"
-msgstr "Mis salas de chat"
-
-#: ../../Zotlabs/Lib/Apps.php:209
-msgid "Firefox Share"
-msgstr "Servicio de compartición de Firefox"
-
-#: ../../Zotlabs/Lib/Apps.php:210
-msgid "Remote Diagnostics"
-msgstr "Diagnóstico remoto"
-
-#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
-msgid "Suggest Channels"
-msgstr "Sugerir canales"
-
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
-#: ../../boot.php:1703
-msgid "Login"
-msgstr "Iniciar sesión"
-
-#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
-msgid "Grid"
-msgstr "Red"
-
-#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182
-msgid "Channel Home"
-msgstr "Mi canal"
-
-#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:201
-#: ../../include/conversation.php:1649 ../../include/conversation.php:1652
-msgid "Events"
-msgstr "Eventos"
-
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167
-msgid "Directory"
-msgstr "Directorio"
-
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193
-msgid "Mail"
-msgstr "Correo"
-
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96
-msgid "Chat"
-msgstr "Chat"
-
-#: ../../Zotlabs/Lib/Apps.php:229
-msgid "Probe"
-msgstr "Probar"
-
-#: ../../Zotlabs/Lib/Apps.php:230
-msgid "Suggest"
-msgstr "Sugerir"
-
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Random Channel"
-msgstr "Canal aleatorio"
-
-#: ../../Zotlabs/Lib/Apps.php:232
-msgid "Invite"
-msgstr "Invitar"
-
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1386
-msgid "Features"
-msgstr "Funcionalidades"
-
-#: ../../Zotlabs/Lib/Apps.php:235
-msgid "Post"
-msgstr "Publicación"
-
-#: ../../Zotlabs/Lib/Apps.php:335
-msgid "Purchase"
-msgstr "Comprar"
-
 #: ../../Zotlabs/Lib/Chatroom.php:27
 msgid "Missing room name"
 msgstr "Sala de chat sin nombre"
@@ -6374,19 +6578,19 @@ msgstr "Sala no encontrada."
 msgid "Room is full"
 msgstr "La sala está llena."
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1882
 msgid "$Projectname Notification"
 msgstr "Notificación de $Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1883
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1885
 msgid "Thank You,"
 msgstr "Gracias,"
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1887
 #, php-format
 msgid "%s Administrator"
 msgstr "%s Administrador"
@@ -6579,11 +6783,97 @@ msgstr "ha creado una nueva entrada"
 msgid "commented on %s's post"
 msgstr "ha comentado la entrada de %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:664
+#: ../../Zotlabs/Lib/Apps.php:205
+msgid "Site Admin"
+msgstr "Administrador del sitio"
+
+#: ../../Zotlabs/Lib/Apps.php:206
+msgid "Bug Report"
+msgstr "Informe de errores"
+
+#: ../../Zotlabs/Lib/Apps.php:207
+msgid "View Bookmarks"
+msgstr "Ver los marcadores"
+
+#: ../../Zotlabs/Lib/Apps.php:208
+msgid "My Chatrooms"
+msgstr "Mis salas de chat"
+
+#: ../../Zotlabs/Lib/Apps.php:210
+msgid "Firefox Share"
+msgstr "Servicio de compartición de Firefox"
+
+#: ../../Zotlabs/Lib/Apps.php:211
+msgid "Remote Diagnostics"
+msgstr "Diagnóstico remoto"
+
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:90
+msgid "Suggest Channels"
+msgstr "Sugerir canales"
+
+#: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:112
+#: ../../boot.php:1704
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:181
+msgid "Grid"
+msgstr "Red"
+
+#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:184
+msgid "Channel Home"
+msgstr "Mi canal"
+
+#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:203
+#: ../../include/conversation.php:1664 ../../include/conversation.php:1667
+msgid "Events"
+msgstr "Eventos"
+
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:169
+msgid "Directory"
+msgstr "Directorio"
+
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:195
+msgid "Mail"
+msgstr "Correo"
+
+#: ../../Zotlabs/Lib/Apps.php:229 ../../include/nav.php:96
+msgid "Chat"
+msgstr "Chat"
+
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Probe"
+msgstr "Probar"
+
+#: ../../Zotlabs/Lib/Apps.php:232
+msgid "Suggest"
+msgstr "Sugerir"
+
+#: ../../Zotlabs/Lib/Apps.php:233
+msgid "Random Channel"
+msgstr "Canal aleatorio"
+
+#: ../../Zotlabs/Lib/Apps.php:234
+msgid "Invite"
+msgstr "Invitar"
+
+#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1480
+msgid "Features"
+msgstr "Funcionalidades"
+
+#: ../../Zotlabs/Lib/Apps.php:237
+msgid "Post"
+msgstr "Publicación"
+
+#: ../../Zotlabs/Lib/Apps.php:339
+msgid "Purchase"
+msgstr "Comprar"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:667
 msgid "Private Message"
 msgstr "Mensaje Privado"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:656
+#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:659
 msgid "Select"
 msgstr "Seleccionar"
 
@@ -6631,11 +6921,11 @@ msgstr "Activar o desactivar el estado de entrada preferida"
 msgid "starred"
 msgstr "preferidas"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:671
+#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:674
 msgid "Message signature validated"
 msgstr "Firma de mensaje validada"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:672
+#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:675
 msgid "Message signature incorrect"
 msgstr "Firma de mensaje incorrecta"
 
@@ -6691,17 +6981,17 @@ msgstr "De página del perfil a página del perfil (de \"muro\" a \"muro\")"
 msgid "via Wall-To-Wall:"
 msgstr "Mediante el procedimiento página del perfil a página del perfil (de \"muro\" a \"muro\")"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:719
+#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:722
 #, php-format
 msgid "from %s"
 msgstr "desde %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:722
+#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:725
 #, php-format
 msgid "last edited: %s"
 msgstr "último cambio: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:723
+#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:726
 #, php-format
 msgid "Expires: %s"
 msgstr "Caduca: %s"
@@ -6719,26 +7009,27 @@ msgid "Mark all seen"
 msgstr "Marcar todo como visto"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
-msgid "[+] show all"
-msgstr "[+] mostrar todo:"
+#, php-format
+msgid "%s show all"
+msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1215
+#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1226
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1216
+#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1227
 msgid "Italic"
 msgstr "Itálico "
 
-#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1217
+#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1228
 msgid "Underline"
 msgstr "Subrayar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1218
+#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1229
 msgid "Quote"
 msgstr "Citar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1219
+#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1230
 msgid "Code"
 msgstr "Código"
 
@@ -6754,11 +7045,74 @@ msgstr "Insertar enlace"
 msgid "Video"
 msgstr "Vídeo"
 
+#: ../../Zotlabs/Lib/PermissionDescription.php:31
+#: ../../include/acl_selectors.php:230
+msgid "Visible to your default audience"
+msgstr "Visible para su público predeterminado."
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:106
+#: ../../include/acl_selectors.php:266
+msgid "Only me"
+msgstr "Sólo yo"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+msgid "Public"
+msgstr "Público"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Anybody in the $Projectname network"
+msgstr "Cualquiera en la red $Projectname"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+#, php-format
+msgid "Any account on %s"
+msgstr "Cualquier cuenta en %s"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+msgid "Any of my connections"
+msgstr "Cualquiera de mis conexiones"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Only connections I specifically allow"
+msgstr "Sólo las conexiones que yo permita de forma explícita"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Cualquiera que esté autenticado (podría incluir a los visitantes de otras redes)"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Cualquier conexión incluyendo aquellas que aún no han sido aprobadas"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+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."
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
+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"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+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"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:155
+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"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:156
+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/Import/import_diaspora.php:16
 msgid "No username found in import file."
 msgstr "No se ha encontrado el nombre de usuario en el fichero importado."
 
-#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50
+#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:51
 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."
 
@@ -6767,6 +7121,291 @@ msgstr "No se ha podido crear una dirección de canal única. Ha fallado la impo
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "No se ha podido localizar información de DNS para el servidor de base de datos “%s”"
 
+#: ../../include/photos.php:114
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "La imagen excede el límite de %lu bytes del sitio"
+
+#: ../../include/photos.php:121
+msgid "Image file is empty."
+msgstr "El fichero de imagen está vacío. "
+
+#: ../../include/photos.php:259
+msgid "Photo storage failed."
+msgstr "La foto no ha podido ser guardada."
+
+#: ../../include/photos.php:299
+msgid "a new photo"
+msgstr "una nueva foto"
+
+#: ../../include/photos.php:303
+#, 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:1650
+msgid "Photo Albums"
+msgstr "Álbumes de fotos"
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Subir nuevas fotos"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1703
+msgid "Logout"
+msgstr "Finalizar sesión"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115
+msgid "End this session"
+msgstr "Finalizar esta sesión"
+
+#: ../../include/nav.php:85 ../../include/nav.php:146
+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 ../../include/channel.php:980
+msgid "Edit Profile"
+msgstr "Editar el perfil"
+
+#: ../../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 ../../include/conversation.php:1690
+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:108
+msgid "Your wiki"
+msgstr ""
+
+#: ../../include/nav.php:112
+msgid "Sign in"
+msgstr "Acceder"
+
+#: ../../include/nav.php:129
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - pulsar para finalizar sesión"
+
+#: ../../include/nav.php:132
+msgid "Remote authentication"
+msgstr "Acceder desde su servidor"
+
+#: ../../include/nav.php:132
+msgid "Click to authenticate to your home hub"
+msgstr "Pulsar para identificarse en su servidor de inicio"
+
+#: ../../include/nav.php:146
+msgid "Home Page"
+msgstr "Página de inicio"
+
+#: ../../include/nav.php:149
+msgid "Create an account"
+msgstr "Crear una cuenta"
+
+#: ../../include/nav.php:161
+msgid "Help and documentation"
+msgstr "Ayuda y documentación"
+
+#: ../../include/nav.php:165
+msgid "Applications, utilities, links, games"
+msgstr "Aplicaciones, utilidades, enlaces, juegos"
+
+#: ../../include/nav.php:167
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Buscar en el sitio por @nombre, #etiqueta, ?ayuda o contenido"
+
+#: ../../include/nav.php:169
+msgid "Channel Directory"
+msgstr "Directorio de canales"
+
+#: ../../include/nav.php:181
+msgid "Your grid"
+msgstr "Mi red"
+
+#: ../../include/nav.php:182
+msgid "Mark all grid notifications seen"
+msgstr "Marcar todas las notificaciones de la red como vistas"
+
+#: ../../include/nav.php:184
+msgid "Channel home"
+msgstr "Mi canal"
+
+#: ../../include/nav.php:185
+msgid "Mark all channel notifications seen"
+msgstr "Marcar todas las notificaciones del canal como leídas"
+
+#: ../../include/nav.php:191
+msgid "Notices"
+msgstr "Avisos"
+
+#: ../../include/nav.php:191
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: ../../include/nav.php:192
+msgid "See all notifications"
+msgstr "Ver todas las notificaciones"
+
+#: ../../include/nav.php:195
+msgid "Private mail"
+msgstr "Correo privado"
+
+#: ../../include/nav.php:196
+msgid "See all private messages"
+msgstr "Ver todas los mensajes privados"
+
+#: ../../include/nav.php:197
+msgid "Mark all private messages seen"
+msgstr "Marcar todos los mensajes privados como leídos"
+
+#: ../../include/nav.php:198 ../../include/widgets.php:667
+msgid "Inbox"
+msgstr "Bandeja de entrada"
+
+#: ../../include/nav.php:199 ../../include/widgets.php:672
+msgid "Outbox"
+msgstr "Bandeja de salida"
+
+#: ../../include/nav.php:200 ../../include/widgets.php:677
+msgid "New Message"
+msgstr "Nuevo mensaje"
+
+#: ../../include/nav.php:203
+msgid "Event Calendar"
+msgstr "Calendario de eventos"
+
+#: ../../include/nav.php:204
+msgid "See all events"
+msgstr "Ver todos los eventos"
+
+#: ../../include/nav.php:205
+msgid "Mark all events seen"
+msgstr "Marcar todos los eventos como leidos"
+
+#: ../../include/nav.php:208
+msgid "Manage Your Channels"
+msgstr "Gestionar sus canales"
+
+#: ../../include/nav.php:210
+msgid "Account/Channel Settings"
+msgstr "Ajustes de cuenta/canales"
+
+#: ../../include/nav.php:218 ../../include/widgets.php:1510
+msgid "Admin"
+msgstr "Administrador"
+
+#: ../../include/nav.php:218
+msgid "Site Setup and Configuration"
+msgstr "Ajustes y configuración del sitio"
+
+#: ../../include/nav.php:249 ../../include/conversation.php:854
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: ../../include/nav.php:254
+msgid "@name, #tag, ?doc, content"
+msgstr "@nombre, #etiqueta, ?ayuda, contenido"
+
+#: ../../include/nav.php:255
+msgid "Please wait..."
+msgstr "Espere por favor…"
+
+#: ../../include/network.php:704
+msgid "view full size"
+msgstr "Ver en el tamaño original"
+
+#: ../../include/network.php:1930 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr "Administrador"
+
+#: ../../include/network.php:1944
+msgid "No Subject"
+msgstr "Sin asunto"
+
+#: ../../include/network.php:2198 ../../include/network.php:2199
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/network.php:2200
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/network.php:2201
+msgid "GNU-Social"
+msgstr "GNU Social"
+
+#: ../../include/network.php:2202
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/network.php:2204
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/network.php:2205
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/network.php:2206
+msgid "Zot"
+msgstr "Zot"
+
+#: ../../include/network.php:2207
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/network.php:2208
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/network.php:2209
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/page_widgets.php:7
+msgid "New Page"
+msgstr "Nueva página"
+
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr "Título"
+
 #: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
 #: ../../include/widgets.php:46 ../../include/widgets.php:429
 #: ../../include/contact_widgets.php:91
@@ -6805,952 +7444,159 @@ msgstr "gusta de"
 msgid "dislikes"
 msgstr "no gusta de"
 
-#: ../../include/event.php:22 ../../include/event.php:69
-#: ../../include/bb2diaspora.php:485
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d de F, Y \\@ G:i"
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
+msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
 
-#: ../../include/event.php:30 ../../include/event.php:73
-#: ../../include/bb2diaspora.php:491
-msgid "Starts:"
-msgstr "Comienza:"
+#: ../../include/channel.php:67
+msgid "Empty name"
+msgstr "Nombre vacío"
 
-#: ../../include/event.php:40 ../../include/event.php:77
-#: ../../include/bb2diaspora.php:499
-msgid "Finishes:"
-msgstr "Finaliza:"
+#: ../../include/channel.php:70
+msgid "Name too long"
+msgstr "Nombre demasiado largo"
 
-#: ../../include/event.php:812
-msgid "This event has been added to your calendar."
-msgstr "Este evento ha sido añadido a su calendario."
+#: ../../include/channel.php:181
+msgid "No account identifier"
+msgstr "Ningún identificador de la cuenta"
 
-#: ../../include/event.php:1012
-msgid "Not specified"
-msgstr "Sin especificar"
+#: ../../include/channel.php:193
+msgid "Nickname is required."
+msgstr "Se requiere un sobrenombre (alias)."
 
-#: ../../include/event.php:1013
-msgid "Needs Action"
-msgstr "Necesita de una intervención"
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Sobrenombre en uso. Por favor, elija otro."
 
-#: ../../include/event.php:1014
-msgid "Completed"
-msgstr "Completado/a"
-
-#: ../../include/event.php:1015
-msgid "In Process"
-msgstr "En proceso"
-
-#: ../../include/event.php:1016
-msgid "Cancelled"
-msgstr "Cancelado/a"
-
-#: ../../include/import.php:29
+#: ../../include/channel.php:212
 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."
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio."
 
-#: ../../include/import.php:76
-msgid "Channel clone failed. Import failed."
-msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
+#: ../../include/channel.php:272
+msgid "Unable to retrieve created identity"
+msgstr "No ha sido posible recuperar la identidad creada"
 
-#: ../../include/items.php:892 ../../include/items.php:937
-msgid "(Unknown)"
-msgstr "(Desconocido)"
+#: ../../include/channel.php:341
+msgid "Default Profile"
+msgstr "Perfil principal"
 
-#: ../../include/items.php:1136
-msgid "Visible to anybody on the internet."
-msgstr "Visible para cualquiera en internet."
+#: ../../include/channel.php:830
+msgid "Requested channel is not available."
+msgstr "El canal solicitado no está disponible."
 
-#: ../../include/items.php:1138
-msgid "Visible to you only."
-msgstr "Visible sólo para usted."
+#: ../../include/channel.php:977
+msgid "Create New Profile"
+msgstr "Crear un nuevo perfil"
 
-#: ../../include/items.php:1140
-msgid "Visible to anybody in this network."
-msgstr "Visible para cualquiera en esta red."
+#: ../../include/channel.php:997
+msgid "Visible to everybody"
+msgstr "Visible para todos"
 
-#: ../../include/items.php:1142
-msgid "Visible to anybody authenticated."
-msgstr "Visible para cualquiera que esté autenticado."
+#: ../../include/channel.php:1070 ../../include/channel.php:1182
+msgid "Gender:"
+msgstr "Género:"
 
-#: ../../include/items.php:1144
+#: ../../include/channel.php:1071 ../../include/channel.php:1226
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../../include/channel.php:1072 ../../include/channel.php:1237
+msgid "Homepage:"
+msgstr "Página personal:"
+
+#: ../../include/channel.php:1073
+msgid "Online Now"
+msgstr "Ahora en línea"
+
+#: ../../include/channel.php:1187
+msgid "Like this channel"
+msgstr "Me gusta este canal"
+
+#: ../../include/channel.php:1211
+msgid "j F, Y"
+msgstr "j F Y"
+
+#: ../../include/channel.php:1212
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/channel.php:1219
+msgid "Birthday:"
+msgstr "Cumpleaños:"
+
+#: ../../include/channel.php:1232
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visible para cualquiera en %s."
+msgid "for %1$d %2$s"
+msgstr "por %1$d %2$s"
 
-#: ../../include/items.php:1146
-msgid "Visible to all connections."
-msgstr "Visible para todas las conexiones."
+#: ../../include/channel.php:1235
+msgid "Sexual Preference:"
+msgstr "Orientación sexual:"
 
-#: ../../include/items.php:1148
-msgid "Visible to approved connections."
-msgstr "Visible para las conexiones permitidas."
+#: ../../include/channel.php:1241
+msgid "Tags:"
+msgstr "Etiquetas:"
 
-#: ../../include/items.php:1150
-msgid "Visible to specific connections."
-msgstr "Visible para conexiones específicas."
+#: ../../include/channel.php:1243
+msgid "Political Views:"
+msgstr "Posición política:"
 
-#: ../../include/items.php:3909
-msgid "Privacy group is empty."
-msgstr "El grupo de canales está vacío."
+#: ../../include/channel.php:1245
+msgid "Religion:"
+msgstr "Religión:"
 
-#: ../../include/items.php:3916
-#, php-format
-msgid "Privacy group: %s"
-msgstr "Grupo de canales: %s"
+#: ../../include/channel.php:1249
+msgid "Hobbies/Interests:"
+msgstr "Aficciones o intereses:"
 
-#: ../../include/items.php:3928
-msgid "Connection not found."
-msgstr "Conexión no encontrada"
+#: ../../include/channel.php:1251
+msgid "Likes:"
+msgstr "Me gusta:"
 
-#: ../../include/items.php:4277
-msgid "profile photo"
-msgstr "foto del perfil"
+#: ../../include/channel.php:1253
+msgid "Dislikes:"
+msgstr "No me gusta:"
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
-msgstr "No se ha especificado ningún destinatario."
+#: ../../include/channel.php:1255
+msgid "Contact information and Social Networks:"
+msgstr "Información de contacto y redes sociales:"
 
-#: ../../include/message.php:25
-msgid "[no subject]"
-msgstr "[sin asunto]"
+#: ../../include/channel.php:1257
+msgid "My other channels:"
+msgstr "Mis otros canales:"
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "No ha sido posible determinar el remitente. "
+#: ../../include/channel.php:1259
+msgid "Musical interests:"
+msgstr "Preferencias musicales:"
 
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
-msgstr "No se han podido verificar las publicaciones guardadas."
+#: ../../include/channel.php:1261
+msgid "Books, literature:"
+msgstr "Libros, literatura:"
 
-#: ../../include/text.php:428
-msgid "prev"
-msgstr "anterior"
+#: ../../include/channel.php:1263
+msgid "Television:"
+msgstr "Televisión:"
 
-#: ../../include/text.php:430
-msgid "first"
-msgstr "primera"
+#: ../../include/channel.php:1265
+msgid "Film/dance/culture/entertainment:"
+msgstr "Cine, danza, cultura, entretenimiento:"
 
-#: ../../include/text.php:459
-msgid "last"
-msgstr "última"
+#: ../../include/channel.php:1267
+msgid "Love/Romance:"
+msgstr "Vida sentimental o amorosa:"
 
-#: ../../include/text.php:462
-msgid "next"
-msgstr "próxima"
+#: ../../include/channel.php:1269
+msgid "Work/employment:"
+msgstr "Trabajo:"
 
-#: ../../include/text.php:472
-msgid "older"
-msgstr "más antiguas"
+#: ../../include/channel.php:1271
+msgid "School/education:"
+msgstr "Estudios:"
 
-#: ../../include/text.php:474
-msgid "newer"
-msgstr "más recientes"
-
-#: ../../include/text.php:863
-msgid "No connections"
-msgstr "Sin conexiones"
-
-#: ../../include/text.php:888
-#, php-format
-msgid "View all %s connections"
-msgstr "Ver todas las %s conexiones"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-msgid "poke"
-msgstr "un toque"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-#: ../../include/conversation.php:243
-msgid "poked"
-msgstr "ha dado un toque a"
-
-#: ../../include/text.php:1039
-msgid "ping"
-msgstr "un \"ping\""
-
-#: ../../include/text.php:1039
-msgid "pinged"
-msgstr "ha enviado un \"ping\" a"
-
-#: ../../include/text.php:1040
-msgid "prod"
-msgstr "una incitación "
-
-#: ../../include/text.php:1040
-msgid "prodded"
-msgstr "ha incitado a "
-
-#: ../../include/text.php:1041
-msgid "slap"
-msgstr "una bofetada "
-
-#: ../../include/text.php:1041
-msgid "slapped"
-msgstr "ha abofeteado a "
-
-#: ../../include/text.php:1042
-msgid "finger"
-msgstr "un \"finger\" "
-
-#: ../../include/text.php:1042
-msgid "fingered"
-msgstr "envió un \"finger\" a"
-
-#: ../../include/text.php:1043
-msgid "rebuff"
-msgstr "un reproche"
-
-#: ../../include/text.php:1043
-msgid "rebuffed"
-msgstr "ha hecho un reproche a "
-
-#: ../../include/text.php:1055
-msgid "happy"
-msgstr "feliz "
-
-#: ../../include/text.php:1056
-msgid "sad"
-msgstr "triste "
-
-#: ../../include/text.php:1057
-msgid "mellow"
-msgstr "tranquilo/a"
-
-#: ../../include/text.php:1058
-msgid "tired"
-msgstr "cansado/a "
-
-#: ../../include/text.php:1059
-msgid "perky"
-msgstr "vivaz"
-
-#: ../../include/text.php:1060
-msgid "angry"
-msgstr "enfadado/a"
-
-#: ../../include/text.php:1061
-msgid "stupefied"
-msgstr "asombrado/a"
-
-#: ../../include/text.php:1062
-msgid "puzzled"
-msgstr "perplejo/a"
-
-#: ../../include/text.php:1063
-msgid "interested"
-msgstr "interesado/a"
-
-#: ../../include/text.php:1064
-msgid "bitter"
-msgstr "amargado/a"
-
-#: ../../include/text.php:1065
-msgid "cheerful"
-msgstr "alegre"
-
-#: ../../include/text.php:1066
-msgid "alive"
-msgstr "animado/a"
-
-#: ../../include/text.php:1067
-msgid "annoyed"
-msgstr "molesto/a"
-
-#: ../../include/text.php:1068
-msgid "anxious"
-msgstr "ansioso/a"
-
-#: ../../include/text.php:1069
-msgid "cranky"
-msgstr "de mal humor"
-
-#: ../../include/text.php:1070
-msgid "disturbed"
-msgstr "perturbado/a"
-
-#: ../../include/text.php:1071
-msgid "frustrated"
-msgstr "frustrado/a"
-
-#: ../../include/text.php:1072
-msgid "depressed"
-msgstr "deprimido/a"
-
-#: ../../include/text.php:1073
-msgid "motivated"
-msgstr "motivado/a"
-
-#: ../../include/text.php:1074
-msgid "relaxed"
-msgstr "relajado/a"
-
-#: ../../include/text.php:1075
-msgid "surprised"
-msgstr "sorprendido/a"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:70
-msgid "Monday"
-msgstr "lunes"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:71
-msgid "Tuesday"
-msgstr "martes"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:72
-msgid "Wednesday"
-msgstr "miércoles"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:73
-msgid "Thursday"
-msgstr "jueves"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:74
-msgid "Friday"
-msgstr "viernes"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:75
-msgid "Saturday"
-msgstr "sábado"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:69
-msgid "Sunday"
-msgstr "domingo"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:45
-msgid "January"
-msgstr "enero"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:46
-msgid "February"
-msgstr "febrero"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:47
-msgid "March"
-msgstr "marzo"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:48
-msgid "April"
-msgstr "abril"
-
-#: ../../include/text.php:1261
-msgid "May"
-msgstr "mayo"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:50
-msgid "June"
-msgstr "junio"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:51
-msgid "July"
-msgstr "julio"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:52
-msgid "August"
-msgstr "agosto"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:53
-msgid "September"
-msgstr "septiembre"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:54
-msgid "October"
-msgstr "octubre"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:55
-msgid "November"
-msgstr "noviembre"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:56
-msgid "December"
-msgstr "diciembre"
-
-#: ../../include/text.php:1338 ../../include/text.php:1342
-msgid "Unknown Attachment"
-msgstr "Adjunto no reconocido"
-
-#: ../../include/text.php:1344
-msgid "unknown"
-msgstr "desconocido"
-
-#: ../../include/text.php:1380
-msgid "remove category"
-msgstr "eliminar categoría"
-
-#: ../../include/text.php:1457
-msgid "remove from file"
-msgstr "eliminar del fichero"
-
-#: ../../include/text.php:1753 ../../include/text.php:1824
-msgid "default"
-msgstr "por defecto"
-
-#: ../../include/text.php:1761
-msgid "Page layout"
-msgstr "Plantilla de la página"
-
-#: ../../include/text.php:1761
-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:1803
-msgid "Page content type"
-msgstr "Tipo de contenido de la página"
-
-#: ../../include/text.php:1836
-msgid "Select an alternate language"
-msgstr "Seleccionar un idioma alternativo"
-
-#: ../../include/text.php:1953
-msgid "activity"
-msgstr "la actividad"
-
-#: ../../include/text.php:2262
-msgid "Design Tools"
-msgstr "Herramientas de diseño web"
-
-#: ../../include/text.php:2268
-msgid "Pages"
-msgstr "Páginas"
-
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr "Sistema"
-
-#: ../../include/widgets.php:106
-msgid "New App"
-msgstr "Nueva aplicación (app)"
-
-#: ../../include/widgets.php:154
-msgid "Suggestions"
-msgstr "Sugerencias"
-
-#: ../../include/widgets.php:155
-msgid "See more..."
-msgstr "Ver más..."
-
-#: ../../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/widgets.php:181
-msgid "Add New Connection"
-msgstr "Añadir nueva conexión"
-
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr "Dirección del canal"
-
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen"
-
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr "Notas"
-
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr "Eliminar término"
-
-#: ../../include/widgets.php:281 ../../include/features.php:84
-msgid "Saved Searches"
-msgstr "Búsquedas guardadas"
-
-#: ../../include/widgets.php:282 ../../include/group.php:316
-msgid "add"
-msgstr "añadir"
-
-#: ../../include/widgets.php:310 ../../include/contact_widgets.php:53
-#: ../../include/features.php:98
-msgid "Saved Folders"
-msgstr "Carpetas guardadas"
-
-#: ../../include/widgets.php:313 ../../include/widgets.php:432
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-msgid "Everything"
-msgstr "Todo"
-
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr "Hemeroteca"
-
-#: ../../include/widgets.php:516
-msgid "Refresh"
-msgstr "Recargar"
-
-#: ../../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/widgets.php:578
-msgid "Feature/Addon settings"
-msgstr "Complementos"
-
-#: ../../include/widgets.php:584
-msgid "Display settings"
-msgstr "Ajustes de visualización"
-
-#: ../../include/widgets.php:591
-msgid "Manage locations"
-msgstr "Gestión de ubicaciones (clones) del canal"
-
-#: ../../include/widgets.php:600
-msgid "Export channel"
-msgstr "Exportar canal"
-
-#: ../../include/widgets.php:607
-msgid "Connected apps"
-msgstr "Aplicaciones (apps) conectadas"
-
-#: ../../include/widgets.php:622
-msgid "Premium Channel Settings"
-msgstr "Configuración del canal premium"
-
-#: ../../include/widgets.php:651
-msgid "Private Mail Menu"
-msgstr "Menú de correo privado"
-
-#: ../../include/widgets.php:653
-msgid "Combined View"
-msgstr "Vista combinada"
-
-#: ../../include/widgets.php:658 ../../include/nav.php:196
-msgid "Inbox"
-msgstr "Bandeja de entrada"
-
-#: ../../include/widgets.php:663 ../../include/nav.php:197
-msgid "Outbox"
-msgstr "Bandeja de salida"
-
-#: ../../include/widgets.php:668 ../../include/nav.php:198
-msgid "New Message"
-msgstr "Nuevo mensaje"
-
-#: ../../include/widgets.php:685 ../../include/widgets.php:697
-msgid "Conversations"
-msgstr "Conversaciones"
-
-#: ../../include/widgets.php:689
-msgid "Received Messages"
-msgstr "Mensajes recibidos"
-
-#: ../../include/widgets.php:693
-msgid "Sent Messages"
-msgstr "Enviar mensajes"
-
-#: ../../include/widgets.php:707
-msgid "No messages."
-msgstr "Sin mensajes."
-
-#: ../../include/widgets.php:725
-msgid "Delete conversation"
-msgstr "Eliminar conversación"
-
-#: ../../include/widgets.php:751
-msgid "Events Menu"
-msgstr "Menú de eventos"
-
-#: ../../include/widgets.php:752
-msgid "Day View"
-msgstr "Eventos del día"
-
-#: ../../include/widgets.php:753
-msgid "Week View"
-msgstr "Eventos de la semana"
-
-#: ../../include/widgets.php:754
-msgid "Month View"
-msgstr "Eventos del mes"
-
-#: ../../include/widgets.php:766
-msgid "Events Tools"
-msgstr "Gestión de eventos"
-
-#: ../../include/widgets.php:767
-msgid "Export Calendar"
-msgstr "Exportar el calendario"
-
-#: ../../include/widgets.php:768
-msgid "Import Calendar"
-msgstr "Importar un calendario"
-
-#: ../../include/widgets.php:842 ../../include/conversation.php:1662
-#: ../../include/conversation.php:1665
-msgid "Chatrooms"
-msgstr "Salas de chat"
-
-#: ../../include/widgets.php:846
-msgid "Overview"
-msgstr "Resumen"
-
-#: ../../include/widgets.php:853
-msgid "Chat Members"
-msgstr "Miembros del chat"
-
-#: ../../include/widgets.php:876
-msgid "Bookmarked Chatrooms"
-msgstr "Salas de chat preferidas"
-
-#: ../../include/widgets.php:899
-msgid "Suggested Chatrooms"
-msgstr "Salas de chat sugeridas"
-
-#: ../../include/widgets.php:1044 ../../include/widgets.php:1156
-msgid "photo/image"
-msgstr "foto/imagen"
-
-#: ../../include/widgets.php:1099
-msgid "Click to show more"
-msgstr "Hacer clic para ver más"
-
-#: ../../include/widgets.php:1250
-msgid "Rating Tools"
-msgstr "Valoraciones"
-
-#: ../../include/widgets.php:1254 ../../include/widgets.php:1256
-msgid "Rate Me"
-msgstr "Valorar este canal"
-
-#: ../../include/widgets.php:1259
-msgid "View Ratings"
-msgstr "Mostrar las valoraciones"
-
-#: ../../include/widgets.php:1316
-msgid "Forums"
-msgstr "Foros"
-
-#: ../../include/widgets.php:1345
-msgid "Tasks"
-msgstr "Tareas"
-
-#: ../../include/widgets.php:1354
-msgid "Documentation"
-msgstr "Documentación"
-
-#: ../../include/widgets.php:1356
-msgid "Project/Site Information"
-msgstr "Información sobre el proyecto o sitio"
-
-#: ../../include/widgets.php:1357
-msgid "For Members"
-msgstr "Para los miembros"
-
-#: ../../include/widgets.php:1358
-msgid "For Administrators"
-msgstr "Para los administradores"
-
-#: ../../include/widgets.php:1359
-msgid "For Developers"
-msgstr "Para los desarrolladores"
-
-#: ../../include/widgets.php:1383 ../../include/widgets.php:1421
-msgid "Member registrations waiting for confirmation"
-msgstr "Inscripciones de nuevos miembros pendientes de aprobación"
-
-#: ../../include/widgets.php:1389
-msgid "Inspect queue"
-msgstr "Examinar la cola"
-
-#: ../../include/widgets.php:1391
-msgid "DB updates"
-msgstr "Actualizaciones de la base de datos"
-
-#: ../../include/widgets.php:1416 ../../include/nav.php:216
-msgid "Admin"
-msgstr "Administrador"
-
-#: ../../include/widgets.php:1417
-msgid "Plugin Features"
-msgstr "Extensiones"
-
-#: ../../include/follow.php:27
-msgid "Channel is blocked on this site."
-msgstr "El canal está bloqueado en este sitio."
-
-#: ../../include/follow.php:32
-msgid "Channel location missing."
-msgstr "Falta la dirección del canal."
-
-#: ../../include/follow.php:81
-msgid "Response from remote channel was incomplete."
-msgstr "Respuesta incompleta del canal."
-
-#: ../../include/follow.php:98
-msgid "Channel was deleted and no longer exists."
-msgstr "El canal ha sido eliminado y ya no existe."
-
-#: ../../include/follow.php:154 ../../include/follow.php:190
-msgid "Protocol disabled."
-msgstr "Protocolo deshabilitado."
-
-#: ../../include/follow.php:178
-msgid "Channel discovery failed."
-msgstr "El intento de acceder al canal ha fallado."
-
-#: ../../include/follow.php:216
-msgid "Cannot connect to yourself."
-msgstr "No puede conectarse consigo mismo."
-
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "Marcadores de %1$s"
-
-#: ../../include/api.php:1336
-msgid "Public Timeline"
-msgstr "Cronología pública"
-
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:844
-#: ../../include/bbcode.php:847 ../../include/bbcode.php:852
-#: ../../include/bbcode.php:855 ../../include/bbcode.php:858
-#: ../../include/bbcode.php:861 ../../include/bbcode.php:866
-#: ../../include/bbcode.php:869 ../../include/bbcode.php:874
-#: ../../include/bbcode.php:877 ../../include/bbcode.php:880
-#: ../../include/bbcode.php:883
-msgid "Image/photo"
-msgstr "Imagen/foto"
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:894
-msgid "Encrypted content"
-msgstr "Contenido cifrado"
-
-#: ../../include/bbcode.php:178
-#, php-format
-msgid "Install %s element: "
-msgstr "Instalar el elemento %s:"
-
-#: ../../include/bbcode.php:182
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."
-
-#: ../../include/bbcode.php:254
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s escribió %2$s siguiente %3$s"
-
-#: ../../include/bbcode.php:331 ../../include/bbcode.php:339
-msgid "Click to open/close"
-msgstr "Pulsar para abrir/cerrar"
-
-#: ../../include/bbcode.php:339
-msgid "spoiler"
-msgstr "spoiler"
-
-#: ../../include/bbcode.php:585
-msgid "Different viewers will see this text differently"
-msgstr "Visitantes diferentes verán este texto de forma distinta"
-
-#: ../../include/bbcode.php:832
-msgid "$1 wrote:"
-msgstr "$1 escribió:"
-
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr "Opciones del directorio"
-
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr "Modo seguro"
-
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr "Solo foros públicos"
-
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr "Solo este sitio web"
-
-#: ../../include/security.php:383
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1702
-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 ../../include/channel.php:941
-msgid "Edit Profile"
-msgstr "Editar el perfil"
-
-#: ../../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 ../../include/conversation.php:1675
-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
-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:247 ../../include/conversation.php:851
-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/channel.php:1292
+msgid "Like this thing"
+msgstr "Me gusta esto"
 
 #: ../../include/connections.php:95
 msgid "New window"
@@ -7765,52 +7611,6 @@ msgstr "Abrir la dirección seleccionada en una ventana o pestaña aparte"
 msgid "User '%s' deleted"
 msgstr "El usuario '%s' ha sido eliminado"
 
-#: ../../include/contact_widgets.php:11
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invitación pendiente"
-msgstr[1] "%d invitaciones disponibles"
-
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
-msgstr "Encontrar canales"
-
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
-msgstr "Introducir nombre o interés"
-
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
-msgstr "Conectar/Seguir"
-
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Ejemplos: José Fernández, Pesca"
-
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
-msgstr "Perfil aleatorio"
-
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
-msgstr "Invitar a amigos"
-
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Ejemplo avanzado: nombre=juan y país=españa"
-
-#: ../../include/contact_widgets.php:122
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d conexión en común"
-msgstr[1] "%d conexiones en común"
-
-#: ../../include/contact_widgets.php:127
-msgid "show more"
-msgstr "mostrar más"
-
 #: ../../include/conversation.php:204
 #, php-format
 msgid "%1$s is now connected with %2$s"
@@ -7821,258 +7621,269 @@ msgstr "%1$s ahora está conectado/a con %2$s"
 msgid "%1$s poked %2$s"
 msgstr "%1$s ha dado un toque a %2$s"
 
-#: ../../include/conversation.php:691
+#: ../../include/conversation.php:243 ../../include/text.php:1013
+#: ../../include/text.php:1018
+msgid "poked"
+msgstr "ha dado un toque a"
+
+#: ../../include/conversation.php:694
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Ver el perfil @ %s de %s"
 
-#: ../../include/conversation.php:710
+#: ../../include/conversation.php:713
 msgid "Categories:"
 msgstr "Categorías:"
 
-#: ../../include/conversation.php:711
+#: ../../include/conversation.php:714
 msgid "Filed under:"
 msgstr "Archivado bajo:"
 
-#: ../../include/conversation.php:738
+#: ../../include/conversation.php:741
 msgid "View in context"
 msgstr "Mostrar en su contexto"
 
-#: ../../include/conversation.php:847
+#: ../../include/conversation.php:850
 msgid "remove"
 msgstr "eliminar"
 
-#: ../../include/conversation.php:852
+#: ../../include/conversation.php:855
 msgid "Delete Selected Items"
 msgstr "Eliminar elementos seleccionados"
 
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:951
 msgid "View Source"
 msgstr "Ver el código fuente de la entrada"
 
-#: ../../include/conversation.php:949
+#: ../../include/conversation.php:952
 msgid "Follow Thread"
 msgstr "Seguir este hilo"
 
-#: ../../include/conversation.php:950
+#: ../../include/conversation.php:953
 msgid "Unfollow Thread"
 msgstr "Dejar de seguir este hilo"
 
-#: ../../include/conversation.php:955
+#: ../../include/conversation.php:958
 msgid "Activity/Posts"
 msgstr "Actividad y publicaciones"
 
-#: ../../include/conversation.php:957
+#: ../../include/conversation.php:960
 msgid "Edit Connection"
 msgstr "Editar conexión"
 
-#: ../../include/conversation.php:958
+#: ../../include/conversation.php:961
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s likes this."
 msgstr "A %s le gusta esto."
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s doesn't like this."
 msgstr "A %s no le gusta esto."
 
-#: ../../include/conversation.php:1079
+#: ../../include/conversation.php:1082
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] "a <span %1$s>%2$d personas</span> le gusta esto."
 msgstr[1] "A <span  %1$s>%2$d personas</span> les gusta esto."
 
-#: ../../include/conversation.php:1081
+#: ../../include/conversation.php:1084
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] "a <span %1$s>%2$d personas</span> no les gusta esto."
 msgstr[1] "A <span  %1$s>%2$d personas</span> no les gusta esto."
 
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1090
 msgid "and"
 msgstr "y"
 
-#: ../../include/conversation.php:1090
+#: ../../include/conversation.php:1093
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ", y %d persona más"
 msgstr[1] ", y %d personas más"
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s like this."
 msgstr "A %s le gusta esto."
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s don't like this."
 msgstr "A %s no le gusta esto."
 
-#: ../../include/conversation.php:1130
+#: ../../include/conversation.php:1133
 msgid "Set your location"
 msgstr "Establecer su ubicación"
 
-#: ../../include/conversation.php:1131
+#: ../../include/conversation.php:1134
 msgid "Clear browser location"
 msgstr "Eliminar los datos de localización geográfica del navegador"
 
-#: ../../include/conversation.php:1177
+#: ../../include/conversation.php:1182
 msgid "Tag term:"
 msgstr "Término de la etiqueta:"
 
-#: ../../include/conversation.php:1178
+#: ../../include/conversation.php:1183
 msgid "Where are you right now?"
 msgstr "¿Donde está ahora?"
 
-#: ../../include/conversation.php:1210
+#: ../../include/conversation.php:1221
 msgid "Page link name"
 msgstr "Nombre del enlace de la página"
 
-#: ../../include/conversation.php:1213
+#: ../../include/conversation.php:1224
 msgid "Post as"
 msgstr "Publicar como"
 
-#: ../../include/conversation.php:1223
+#: ../../include/conversation.php:1238
 msgid "Toggle voting"
 msgstr "Cambiar votación"
 
-#: ../../include/conversation.php:1231
+#: ../../include/conversation.php:1246
 msgid "Categories (optional, comma-separated list)"
 msgstr "Categorías (opcional, lista separada por comas)"
 
-#: ../../include/conversation.php:1254
+#: ../../include/conversation.php:1269
 msgid "Set publish date"
 msgstr "Establecer la fecha de publicación"
 
-#: ../../include/conversation.php:1258
-msgid "OK"
-msgstr "OK"
-
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1518
 msgid "Discover"
 msgstr "Descubrir"
 
-#: ../../include/conversation.php:1506
+#: ../../include/conversation.php:1521
 msgid "Imported public streams"
 msgstr "Contenidos públicos importados"
 
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1526
 msgid "Commented Order"
 msgstr "Comentarios recientes"
 
-#: ../../include/conversation.php:1514
+#: ../../include/conversation.php:1529
 msgid "Sort by Comment Date"
 msgstr "Ordenar por fecha de comentario"
 
-#: ../../include/conversation.php:1518
+#: ../../include/conversation.php:1533
 msgid "Posted Order"
 msgstr "Publicaciones recientes"
 
-#: ../../include/conversation.php:1521
+#: ../../include/conversation.php:1536
 msgid "Sort by Post Date"
 msgstr "Ordenar por fecha de publicación"
 
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1544
 msgid "Posts that mention or involve you"
 msgstr "Publicaciones que le mencionan o involucran"
 
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1553
 msgid "Activity Stream - by date"
 msgstr "Contenido - por fecha"
 
-#: ../../include/conversation.php:1544
+#: ../../include/conversation.php:1559
 msgid "Starred"
 msgstr "Preferidas"
 
-#: ../../include/conversation.php:1547
+#: ../../include/conversation.php:1562
 msgid "Favourite Posts"
 msgstr "Publicaciones favoritas"
 
-#: ../../include/conversation.php:1554
+#: ../../include/conversation.php:1569
 msgid "Spam"
 msgstr "Correo basura"
 
-#: ../../include/conversation.php:1557
+#: ../../include/conversation.php:1572
 msgid "Posts flagged as SPAM"
 msgstr "Publicaciones marcadas como basura"
 
-#: ../../include/conversation.php:1614
+#: ../../include/conversation.php:1629
 msgid "Status Messages and Posts"
 msgstr "Mensajes de estado y publicaciones"
 
-#: ../../include/conversation.php:1623
+#: ../../include/conversation.php:1638
 msgid "About"
 msgstr "Mi perfil"
 
-#: ../../include/conversation.php:1626
+#: ../../include/conversation.php:1641
 msgid "Profile Details"
 msgstr "Detalles del perfil"
 
-#: ../../include/conversation.php:1635 ../../include/photos.php:502
-msgid "Photo Albums"
-msgstr "Álbumes de fotos"
-
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1657
 msgid "Files and Storage"
 msgstr "Ficheros y repositorio"
 
-#: ../../include/conversation.php:1678
+#: ../../include/conversation.php:1677 ../../include/conversation.php:1680
+#: ../../include/widgets.php:836
+msgid "Chatrooms"
+msgstr "Salas de chat"
+
+#: ../../include/conversation.php:1693
 msgid "Saved Bookmarks"
 msgstr "Marcadores guardados"
 
-#: ../../include/conversation.php:1688
+#: ../../include/conversation.php:1703
 msgid "Manage Webpages"
 msgstr "Administrar páginas web"
 
-#: ../../include/conversation.php:1747
+#: ../../include/conversation.php:1768
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Participaré"
 msgstr[1] "Participaré"
 
-#: ../../include/conversation.php:1750
+#: ../../include/conversation.php:1771
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "No participaré"
 msgstr[1] "No participaré"
 
-#: ../../include/conversation.php:1753
+#: ../../include/conversation.php:1774
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indeciso/a"
 msgstr[1] "Indecisos/as"
 
-#: ../../include/conversation.php:1756
+#: ../../include/conversation.php:1777
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "De acuerdo"
 msgstr[1] "De acuerdo"
 
-#: ../../include/conversation.php:1759
+#: ../../include/conversation.php:1780
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "En desacuerdo"
 msgstr[1] "En desacuerdo"
 
-#: ../../include/conversation.php:1762
+#: ../../include/conversation.php:1783
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "se abstiene"
 msgstr[1] "Se abstienen"
 
+#: ../../include/import.php:30
+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:97
+msgid "Channel clone failed. Import failed."
+msgstr "La clonación del canal no ha salido bien. La importación ha fallado."
+
 #: ../../include/selectors.php:30
 msgid "Frequently"
 msgstr "Frecuentemente"
@@ -8137,12 +7948,6 @@ msgstr "Neutral"
 msgid "Non-specific"
 msgstr "No especificado"
 
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-#: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:881
-msgid "Other"
-msgstr "Otro"
-
 #: ../../include/selectors.php:49
 msgid "Undecided"
 msgstr "Indeciso/a"
@@ -8319,361 +8124,366 @@ msgstr "No me importa"
 msgid "Ask me"
 msgstr "Pregúnteme"
 
-#: ../../include/PermissionDescription.php:31
-#: ../../include/acl_selectors.php:232
-msgid "Visible to your default audience"
-msgstr "Visible para su público predeterminado."
-
-#: ../../include/PermissionDescription.php:115
-#: ../../include/acl_selectors.php:268
-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
+#: ../../include/bookmarks.php:35
 #, php-format
-msgid "Any account on %s"
-msgstr "Cualquier cuenta en %s"
+msgid "%1$s's bookmarks"
+msgstr "Marcadores de %1$s"
 
-#: ../../include/PermissionDescription.php:119
-msgid "Any of my connections"
-msgstr "Cualquiera de mis conexiones"
+#: ../../include/security.php:109
+msgid "guest:"
+msgstr ""
 
-#: ../../include/PermissionDescription.php:120
-msgid "Only connections I specifically allow"
-msgstr "Sólo las conexiones que yo permita de forma explícita"
-
-#: ../../include/PermissionDescription.php:121
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr "Cualquiera que esté autenticado (podría incluir a los visitantes de otras redes)"
-
-#: ../../include/PermissionDescription.php:122
-msgid "Any connections including those who haven't yet been approved"
-msgstr "Cualquier conexión incluyendo aquellas que aún no han sido aprobadas"
-
-#: ../../include/PermissionDescription.php:161
+#: ../../include/security.php:427
 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."
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "El \"token\" de seguridad del formulario no es correcto. Esto ha ocurrido probablemente porque el formulario ha estado abierto demasiado tiempo (>3 horas) antes de ser enviado"
 
-#: ../../include/PermissionDescription.php:162
+#: ../../include/text.php:404
+msgid "prev"
+msgstr "anterior"
+
+#: ../../include/text.php:406
+msgid "first"
+msgstr "primera"
+
+#: ../../include/text.php:435
+msgid "last"
+msgstr "última"
+
+#: ../../include/text.php:438
+msgid "next"
+msgstr "próxima"
+
+#: ../../include/text.php:448
+msgid "older"
+msgstr "más antiguas"
+
+#: ../../include/text.php:450
+msgid "newer"
+msgstr "más recientes"
+
+#: ../../include/text.php:843
+msgid "No connections"
+msgstr "Sin conexiones"
+
+#: ../../include/text.php:868
+#, php-format
+msgid "View all %s connections"
+msgstr "Ver todas las %s conexiones"
+
+#: ../../include/text.php:1013 ../../include/text.php:1018
+msgid "poke"
+msgstr "un toque"
+
+#: ../../include/text.php:1019
+msgid "ping"
+msgstr "un \"ping\""
+
+#: ../../include/text.php:1019
+msgid "pinged"
+msgstr "ha enviado un \"ping\" a"
+
+#: ../../include/text.php:1020
+msgid "prod"
+msgstr "una incitación "
+
+#: ../../include/text.php:1020
+msgid "prodded"
+msgstr "ha incitado a "
+
+#: ../../include/text.php:1021
+msgid "slap"
+msgstr "una bofetada "
+
+#: ../../include/text.php:1021
+msgid "slapped"
+msgstr "ha abofeteado a "
+
+#: ../../include/text.php:1022
+msgid "finger"
+msgstr "un \"finger\" "
+
+#: ../../include/text.php:1022
+msgid "fingered"
+msgstr "envió un \"finger\" a"
+
+#: ../../include/text.php:1023
+msgid "rebuff"
+msgstr "un reproche"
+
+#: ../../include/text.php:1023
+msgid "rebuffed"
+msgstr "ha hecho un reproche a "
+
+#: ../../include/text.php:1035
+msgid "happy"
+msgstr "feliz "
+
+#: ../../include/text.php:1036
+msgid "sad"
+msgstr "triste "
+
+#: ../../include/text.php:1037
+msgid "mellow"
+msgstr "tranquilo/a"
+
+#: ../../include/text.php:1038
+msgid "tired"
+msgstr "cansado/a "
+
+#: ../../include/text.php:1039
+msgid "perky"
+msgstr "vivaz"
+
+#: ../../include/text.php:1040
+msgid "angry"
+msgstr "enfadado/a"
+
+#: ../../include/text.php:1041
+msgid "stupefied"
+msgstr "asombrado/a"
+
+#: ../../include/text.php:1042
+msgid "puzzled"
+msgstr "perplejo/a"
+
+#: ../../include/text.php:1043
+msgid "interested"
+msgstr "interesado/a"
+
+#: ../../include/text.php:1044
+msgid "bitter"
+msgstr "amargado/a"
+
+#: ../../include/text.php:1045
+msgid "cheerful"
+msgstr "alegre"
+
+#: ../../include/text.php:1046
+msgid "alive"
+msgstr "animado/a"
+
+#: ../../include/text.php:1047
+msgid "annoyed"
+msgstr "molesto/a"
+
+#: ../../include/text.php:1048
+msgid "anxious"
+msgstr "ansioso/a"
+
+#: ../../include/text.php:1049
+msgid "cranky"
+msgstr "de mal humor"
+
+#: ../../include/text.php:1050
+msgid "disturbed"
+msgstr "perturbado/a"
+
+#: ../../include/text.php:1051
+msgid "frustrated"
+msgstr "frustrado/a"
+
+#: ../../include/text.php:1052
+msgid "depressed"
+msgstr "deprimido/a"
+
+#: ../../include/text.php:1053
+msgid "motivated"
+msgstr "motivado/a"
+
+#: ../../include/text.php:1054
+msgid "relaxed"
+msgstr "relajado/a"
+
+#: ../../include/text.php:1055
+msgid "surprised"
+msgstr "sorprendido/a"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "lunes"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "martes"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "miércoles"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "jueves"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "viernes"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "sábado"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "domingo"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:45
+msgid "January"
+msgstr "enero"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:46
+msgid "February"
+msgstr "febrero"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:47
+msgid "March"
+msgstr "marzo"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:48
+msgid "April"
+msgstr "abril"
+
+#: ../../include/text.php:1241
+msgid "May"
+msgstr "mayo"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:50
+msgid "June"
+msgstr "junio"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:51
+msgid "July"
+msgstr "julio"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:52
+msgid "August"
+msgstr "agosto"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:53
+msgid "September"
+msgstr "septiembre"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:54
+msgid "October"
+msgstr "octubre"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:55
+msgid "November"
+msgstr "noviembre"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:56
+msgid "December"
+msgstr "diciembre"
+
+#: ../../include/text.php:1318 ../../include/text.php:1322
+msgid "Unknown Attachment"
+msgstr "Adjunto no reconocido"
+
+#: ../../include/text.php:1324
+msgid "unknown"
+msgstr "desconocido"
+
+#: ../../include/text.php:1360
+msgid "remove category"
+msgstr "eliminar categoría"
+
+#: ../../include/text.php:1437
+msgid "remove from file"
+msgstr "eliminar del fichero"
+
+#: ../../include/text.php:1734 ../../include/text.php:1805
+msgid "default"
+msgstr "por defecto"
+
+#: ../../include/text.php:1742
+msgid "Page layout"
+msgstr "Plantilla de la página"
+
+#: ../../include/text.php:1742
+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:1784
+msgid "Page content type"
+msgstr "Tipo de contenido de la página"
+
+#: ../../include/text.php:1817
+msgid "Select an alternate language"
+msgstr "Seleccionar un idioma alternativo"
+
+#: ../../include/text.php:1934
+msgid "activity"
+msgstr "la actividad"
+
+#: ../../include/text.php:2235
+msgid "Design Tools"
+msgstr "Herramientas de diseño web"
+
+#: ../../include/text.php:2241
+msgid "Pages"
+msgstr "Páginas"
+
+#: ../../include/auth.php:147
+msgid "Logged out."
+msgstr "Desconectado/a."
+
+#: ../../include/auth.php:274
+msgid "Failed authentication"
+msgstr "Autenticación fallida."
+
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
+msgstr "Pueden verse mi actividad y publicaciones normales"
+
+#: ../../include/permissions.php:30
+msgid "Can view my webpages"
+msgstr "Pueden verse mis páginas web"
+
+#: ../../include/permissions.php:34
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Pueden crearse entradas en mi página de inicio del canal (“muro”)"
+
+#: ../../include/permissions.php:37
+msgid "Can like/dislike stuff"
+msgstr "Puede marcarse contenido como me gusta/no me gusta"
+
+#: ../../include/permissions.php:37
+msgid "Profiles and things other than posts/comments"
+msgstr "Perfiles y otras cosas aparte de publicaciones/comentarios"
+
+#: ../../include/permissions.php:39
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención"
+
+#: ../../include/permissions.php:39
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Avanzado - útil para crear canales de foros de discusión o grupos"
+
+#: ../../include/permissions.php:40
+msgid "Can chat with me (when available)"
+msgstr "Se puede charlar conmigo (cuando esté disponible)"
+
+#: ../../include/permissions.php:41
+msgid "Can write to my file storage and photos"
+msgstr "Puede escribirse en mi repositorio de ficheros y fotos"
+
+#: ../../include/permissions.php:42
+msgid "Can edit my webpages"
+msgstr "Pueden editarse mis páginas web"
+
+#: ../../include/permissions.php:44
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Algo avanzado - muy útil en comunidades abiertas"
+
+#: ../../include/permissions.php:46
+msgid "Can administer my channel resources"
+msgstr "Pueden administrarse mis recursos del canal"
+
+#: ../../include/permissions.php:46
 msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr "Esta es su configuración por defecto para establecer quién puede ver su perfil del canal predeterminado"
-
-#: ../../include/PermissionDescription.php:163
-msgid "This is your default setting for who can view your connections"
-msgstr "Este es su ajuste predeterminado para establecer quién puede ver sus conexiones"
-
-#: ../../include/PermissionDescription.php:164
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr "Este es su ajuste predeterminado para establecer quién puede ver su repositorio de ficheros y sus fotos"
-
-#: ../../include/PermissionDescription.php:165
-msgid "This is your default setting for the audience of your webpages"
-msgstr "Este es el ajuste predeterminado para establecer la audiencia de sus páginas web"
-
-#: ../../include/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:1871
-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:723 ../../include/account.php:725
-msgid "Click here to upgrade."
-msgstr "Pulse aquí para actualizar"
-
-#: ../../include/account.php:731
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Esta acción supera los límites establecidos por su plan de suscripción "
-
-#: ../../include/account.php:736
-msgid "This action is not available under your subscription plan."
-msgstr "Esta acción no está disponible en su plan de suscripción."
-
-#: ../../include/attach.php:247 ../../include/attach.php:333
-msgid "Item was not found."
-msgstr "Elemento no encontrado."
-
-#: ../../include/attach.php:497
-msgid "No source file."
-msgstr "Ningún fichero de origen"
-
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
-msgstr "No se puede localizar el fichero que va a ser sustituido."
-
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
-msgstr "No se puede localizar el fichero para revisar/actualizar"
-
-#: ../../include/attach.php:672
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "El fichero supera el limite de tamaño de %d"
-
-#: ../../include/attach.php:686
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
-
-#: ../../include/attach.php:842
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado."
-
-#: ../../include/attach.php:855
-msgid "Stored file could not be verified. Upload failed."
-msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
-
-#: ../../include/attach.php:909 ../../include/attach.php:925
-msgid "Path not available."
-msgstr "Ruta no disponible."
-
-#: ../../include/attach.php:971 ../../include/attach.php:1123
-msgid "Empty pathname"
-msgstr "Ruta vacía"
-
-#: ../../include/attach.php:997
-msgid "duplicate filename or path"
-msgstr "Nombre duplicado de ruta o fichero"
-
-#: ../../include/attach.php:1019
-msgid "Path not found."
-msgstr "Ruta no encontrada"
-
-#: ../../include/attach.php:1077
-msgid "mkdir failed."
-msgstr "mkdir ha fallado."
-
-#: ../../include/attach.php:1081
-msgid "database storage failed."
-msgstr "el almacenamiento en la base de datos ha fallado."
-
-#: ../../include/attach.php:1129
-msgid "Empty path"
-msgstr "Ruta vacía"
-
-#: ../../include/channel.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "No ha sido posible obtener información sobre la identidad desde la base de datos"
-
-#: ../../include/channel.php:66
-msgid "Empty name"
-msgstr "Nombre vacío"
-
-#: ../../include/channel.php:69
-msgid "Name too long"
-msgstr "Nombre demasiado largo"
-
-#: ../../include/channel.php:180
-msgid "No account identifier"
-msgstr "Ningún identificador de la cuenta"
-
-#: ../../include/channel.php:192
-msgid "Nickname is required."
-msgstr "Se requiere un sobrenombre (alias)."
-
-#: ../../include/channel.php:206
-msgid "Reserved nickname. Please choose another."
-msgstr "Sobrenombre en uso. Por favor, elija otro."
-
-#: ../../include/channel.php:211
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio."
-
-#: ../../include/channel.php:287
-msgid "Unable to retrieve created identity"
-msgstr "No ha sido posible recuperar la identidad creada"
-
-#: ../../include/channel.php:345
-msgid "Default Profile"
-msgstr "Perfil principal"
-
-#: ../../include/channel.php:791
-msgid "Requested channel is not available."
-msgstr "El canal solicitado no está disponible."
-
-#: ../../include/channel.php:938
-msgid "Create New Profile"
-msgstr "Crear un nuevo perfil"
-
-#: ../../include/channel.php:958
-msgid "Visible to everybody"
-msgstr "Visible para todos"
-
-#: ../../include/channel.php:1031 ../../include/channel.php:1142
-msgid "Gender:"
-msgstr "Género:"
-
-#: ../../include/channel.php:1032 ../../include/channel.php:1186
-msgid "Status:"
-msgstr "Estado:"
-
-#: ../../include/channel.php:1033 ../../include/channel.php:1197
-msgid "Homepage:"
-msgstr "Página personal:"
-
-#: ../../include/channel.php:1034
-msgid "Online Now"
-msgstr "Ahora en línea"
-
-#: ../../include/channel.php:1147
-msgid "Like this channel"
-msgstr "Me gusta este canal"
-
-#: ../../include/channel.php:1171
-msgid "j F, Y"
-msgstr "j F Y"
-
-#: ../../include/channel.php:1172
-msgid "j F"
-msgstr "j F"
-
-#: ../../include/channel.php:1179
-msgid "Birthday:"
-msgstr "Cumpleaños:"
-
-#: ../../include/channel.php:1192
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "por %1$d %2$s"
-
-#: ../../include/channel.php:1195
-msgid "Sexual Preference:"
-msgstr "Orientación sexual:"
-
-#: ../../include/channel.php:1201
-msgid "Tags:"
-msgstr "Etiquetas:"
-
-#: ../../include/channel.php:1203
-msgid "Political Views:"
-msgstr "Posición política:"
-
-#: ../../include/channel.php:1205
-msgid "Religion:"
-msgstr "Religión:"
-
-#: ../../include/channel.php:1209
-msgid "Hobbies/Interests:"
-msgstr "Aficciones o intereses:"
-
-#: ../../include/channel.php:1211
-msgid "Likes:"
-msgstr "Me gusta:"
-
-#: ../../include/channel.php:1213
-msgid "Dislikes:"
-msgstr "No me gusta:"
-
-#: ../../include/channel.php:1215
-msgid "Contact information and Social Networks:"
-msgstr "Información de contacto y redes sociales:"
-
-#: ../../include/channel.php:1217
-msgid "My other channels:"
-msgstr "Mis otros canales:"
-
-#: ../../include/channel.php:1219
-msgid "Musical interests:"
-msgstr "Preferencias musicales:"
-
-#: ../../include/channel.php:1221
-msgid "Books, literature:"
-msgstr "Libros, literatura:"
-
-#: ../../include/channel.php:1223
-msgid "Television:"
-msgstr "Televisión:"
-
-#: ../../include/channel.php:1225
-msgid "Film/dance/culture/entertainment:"
-msgstr "Cine, danza, cultura, entretenimiento:"
-
-#: ../../include/channel.php:1227
-msgid "Love/Romance:"
-msgstr "Vida sentimental o amorosa:"
-
-#: ../../include/channel.php:1229
-msgid "Work/employment:"
-msgstr "Trabajo:"
-
-#: ../../include/channel.php:1231
-msgid "School/education:"
-msgstr "Estudios:"
-
-#: ../../include/channel.php:1251
-msgid "Like this thing"
-msgstr "Me gusta esto"
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo."
 
 #: ../../include/features.php:48
 msgid "General Features"
@@ -8720,378 +8530,257 @@ msgid "Provide managed web pages on your channel"
 msgstr "Proveer páginas web gestionadas en su canal"
 
 #: ../../include/features.php:55
+msgid "Provide a wiki for your channel"
+msgstr ""
+
+#: ../../include/features.php:56
 msgid "Hide Rating"
 msgstr "Ocultar las valoraciones"
 
-#: ../../include/features.php:55
+#: ../../include/features.php:56
 msgid ""
 "Hide the rating buttons on your channel and profile pages. Note: People can "
 "still rate you somewhere else."
 msgstr "Ocultar los botones de valoración en su canal y página de perfil. Tenga en cuenta, sin embargo, que la gente podrá expresar su valoración en otros lugares."
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Private Notes"
 msgstr "Notas privadas"
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr "Habilita una herramienta para guardar notas y recordatorios (advertencia: las notas no estarán cifradas)"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Navigation Channel Select"
 msgstr "Navegación por el selector de canales"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Cambiar de canales directamente desde el menú de navegación desplegable"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "Photo Location"
 msgstr "Ubicación de las fotos"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr "Si los datos de ubicación están disponibles en las fotos subidas, enlazar estas a un mapa."
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Access Controlled Chatrooms"
 msgstr "Salas de chat moderadas"
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Provide chatrooms and chat services with access control."
 msgstr "Proporcionar salas y servicios de chat moderados."
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid "Smart Birthdays"
 msgstr "Cumpleaños inteligentes"
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid ""
 "Make birthday events timezone aware in case your friends are scattered "
 "across the planet."
 msgstr "Enlazar los eventos de cumpleaños con el huso horario en el caso de que sus amigos estén dispersos por el mundo."
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Expert Mode"
 msgstr "Modo de experto"
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr "Habilitar el modo de experto para acceder a opciones avanzadas de configuración"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid "Premium Channel"
 msgstr "Canal premium"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr "Le permite configurar restricciones y normas de uso a aquellos que conectan con su canal"
 
-#: ../../include/features.php:67
+#: ../../include/features.php:68
 msgid "Post Composition Features"
 msgstr "Opciones para la redacción de entradas"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Large Photos"
 msgstr "Fotos de gran tamaño"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr "Incluir miniaturas de fotos grandes (1024px) en publicaciones. Si no está habilitado, usar miniaturas pequeñas (640px)"
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Automatically import channel content from other channels or feeds"
 msgstr "Importar automáticamente contenido de otros canales o \"feeds\""
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Even More Encryption"
 msgstr "Más cifrado todavía"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr "Permitir cifrado adicional de contenido \"punto-a-punto\" con una clave secreta compartida."
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Enable Voting Tools"
 msgstr "Permitir entradas con votación"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Provide a class of post which others can vote on"
 msgstr "Proveer una clase de publicación en la que otros puedan votar"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Delayed Posting"
 msgstr "Publicación aplazada"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Allow posts to be published at a later date"
 msgstr "Permitir mensajes que se publicarán en una fecha posterior"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Suppress Duplicate Posts/Comments"
 msgstr "Prevenir entradas o comentarios duplicados"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr "Prevenir que entradas con contenido idéntico se publiquen con menos de dos minutos de intervalo."
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Network and Stream Filtering"
 msgstr "Filtrado del contenido"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Search by Date"
 msgstr "Buscar por fecha"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to select posts by date ranges"
 msgstr "Capacidad de seleccionar entradas por rango de fechas"
 
-#: ../../include/features.php:83 ../../include/group.php:311
+#: ../../include/features.php:84 ../../include/group.php:311
 msgid "Privacy Groups"
 msgstr "Grupos de canales"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 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/features.php:85 ../../include/widgets.php:281
+msgid "Saved Searches"
+msgstr "Búsquedas guardadas"
+
+#: ../../include/features.php:85
 msgid "Save search terms for re-use"
 msgstr "Guardar términos de búsqueda para su reutilización"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Network Personal Tab"
 msgstr "Actividad personal"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Habilitar una pestaña en la cual se muestren solo las entradas en las que ha participado."
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Network New Tab"
 msgstr "Contenido nuevo"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Enable tab to display all new Network activity"
 msgstr "Habilitar una pestaña en la que se muestre solo el contenido nuevo"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Affinity Tool"
 msgstr "Herramienta de afinidad"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filtrar el contenido según la profundidad de las relaciones"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Connection Filtering"
 msgstr "Filtrado de conexiones"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 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:90
 msgid "Show channel suggestions"
 msgstr "Mostrar sugerencias de canales"
 
-#: ../../include/features.php:94
+#: ../../include/features.php:95
 msgid "Post/Comment Tools"
 msgstr "Gestión de entradas y comentarios"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Community Tagging"
 msgstr "Etiquetas de la comunidad"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Ability to tag existing posts"
 msgstr "Capacidad de etiquetar entradas existentes"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Post Categories"
 msgstr "Categorías de entradas"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Add categories to your posts"
 msgstr "Añadir categorías a sus publicaciones"
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Emoji Reactions"
 msgstr "Emoticonos \"emoji\""
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Add emoji reaction ability to posts"
 msgstr "Activar la capacidad de añadir un emoticono \"emoji\" a las entradas"
 
-#: ../../include/features.php:98
+#: ../../include/features.php:99 ../../include/widgets.php:310
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Carpetas guardadas"
+
+#: ../../include/features.php:99
 msgid "Ability to file posts under folders"
 msgstr "Capacidad de archivar entradas en carpetas"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Dislike Posts"
 msgstr "Desagrado de publicaciones"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Ability to dislike posts/comments"
 msgstr "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Star Posts"
 msgstr "Entradas destacadas"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Capacidad de marcar entradas destacadas con un indicador de estrella"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Tag Cloud"
 msgstr "Nube de etiquetas"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Proveer nube de etiquetas personal en su página de canal"
 
-#: ../../include/oembed.php:324
-msgid "Embedded content"
-msgstr "Contenido incorporado"
-
-#: ../../include/oembed.php:333
-msgid "Embedding disabled"
-msgstr "Incrustación deshabilitada"
-
-#: ../../include/acl_selectors.php:271
-msgid "Who can see this?"
-msgstr "¿Quién puede ver esto?"
-
-#: ../../include/acl_selectors.php:272
-msgid "Custom selection"
-msgstr "Selección personalizada"
-
-#: ../../include/acl_selectors.php:273
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
-" the scope of \"Show\"."
-msgstr "Seleccione \"Mostrar\" para permitir la visualización. La opción \"No mostrar\" le permite anular y limitar el alcance de \"Mostrar\"."
-
-#: ../../include/acl_selectors.php:274
-msgid "Show"
-msgstr "Mostrar"
-
-#: ../../include/acl_selectors.php:275
-msgid "Don't show"
-msgstr "No mostrar"
-
-#: ../../include/acl_selectors.php:281
-msgid "Other networks and post services"
-msgstr "Otras redes y servicios de publicación"
-
-#: ../../include/acl_selectors.php:311
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These"
-" permissions set who is allowed to view the post."
-msgstr "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje."
-
-#: ../../include/auth.php:105
-msgid "Logged out."
-msgstr "Desconectado/a."
-
-#: ../../include/auth.php:212
-msgid "Failed authentication"
-msgstr "Autenticación fallida."
-
-#: ../../include/datetime.php:135
-msgid "Birthday"
-msgstr "Cumpleaños"
-
-#: ../../include/datetime.php:137
-msgid "Age: "
-msgstr "Edad:"
-
-#: ../../include/datetime.php:139
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "AAAA-MM-DD o MM-DD"
-
-#: ../../include/datetime.php:272 ../../boot.php:2470
-msgid "never"
-msgstr "nunca"
-
-#: ../../include/datetime.php:278
-msgid "less than a second ago"
-msgstr "hace un instante"
-
-#: ../../include/datetime.php:296
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "hace %1$d %2$s"
-
-#: ../../include/datetime.php:307
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] "año"
-msgstr[1] "años"
-
-#: ../../include/datetime.php:310
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] "mes"
-msgstr[1] "meses"
-
-#: ../../include/datetime.php:313
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "semana"
-msgstr[1] "semanas"
-
-#: ../../include/datetime.php:316
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] "día"
-msgstr[1] "días"
-
-#: ../../include/datetime.php:319
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "hora"
-msgstr[1] "horas"
-
-#: ../../include/datetime.php:322
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuto"
-msgstr[1] "minutos"
-
-#: ../../include/datetime.php:325
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "segundo"
-msgstr[1] "segundos"
-
-#: ../../include/datetime.php:562
-#, php-format
-msgid "%1$s's birthday"
-msgstr "Cumpleaños de %1$s"
-
-#: ../../include/datetime.php:563
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr "Feliz cumpleaños %1$s"
-
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -9119,21 +8808,583 @@ 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/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:485
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d de F, Y \\@ G:i"
+
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:491
+msgid "Starts:"
+msgstr "Comienza:"
+
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:499
+msgid "Finishes:"
+msgstr "Finaliza:"
+
+#: ../../include/event.php:814
+msgid "This event has been added to your calendar."
+msgstr "Este evento ha sido añadido a su calendario."
+
+#: ../../include/event.php:1014
+msgid "Not specified"
+msgstr "Sin especificar"
+
+#: ../../include/event.php:1015
+msgid "Needs Action"
+msgstr "Necesita de una intervención"
+
+#: ../../include/event.php:1016
+msgid "Completed"
+msgstr "Completado/a"
+
+#: ../../include/event.php:1017
+msgid "In Process"
+msgstr "En proceso"
+
+#: ../../include/event.php:1018
+msgid "Cancelled"
+msgstr "Cancelado/a"
+
+#: ../../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:739 ../../include/account.php:741
+msgid "Click here to upgrade."
+msgstr "Pulse aquí para actualizar"
+
+#: ../../include/account.php:747
+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:752
+msgid "This action is not available under your subscription plan."
+msgstr "Esta acción no está disponible en su plan de suscripción."
+
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
+msgstr "El canal está bloqueado en este sitio."
+
+#: ../../include/follow.php:32
+msgid "Channel location missing."
+msgstr "Falta la dirección del canal."
+
+#: ../../include/follow.php:80
+msgid "Response from remote channel was incomplete."
+msgstr "Respuesta incompleta del canal."
+
+#: ../../include/follow.php:97
+msgid "Channel was deleted and no longer exists."
+msgstr "El canal ha sido eliminado y ya no existe."
+
+#: ../../include/follow.php:147 ../../include/follow.php:183
+msgid "Protocol disabled."
+msgstr "Protocolo deshabilitado."
+
+#: ../../include/follow.php:171
+msgid "Channel discovery failed."
+msgstr "El intento de acceder al canal ha fallado."
+
+#: ../../include/follow.php:210
+msgid "Cannot connect to yourself."
+msgstr "No puede conectarse consigo mismo."
+
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
+msgstr "Elemento no encontrado."
+
+#: ../../include/attach.php:499
+msgid "No source file."
+msgstr "Ningún fichero de origen"
+
+#: ../../include/attach.php:521
+msgid "Cannot locate file to replace"
+msgstr "No se puede localizar el fichero que va a ser sustituido."
+
+#: ../../include/attach.php:539
+msgid "Cannot locate file to revise/update"
+msgstr "No se puede localizar el fichero para revisar/actualizar"
+
+#: ../../include/attach.php:674
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "El fichero supera el limite de tamaño de %d"
+
+#: ../../include/attach.php:688
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos."
+
+#: ../../include/attach.php:846
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado."
+
+#: ../../include/attach.php:859
+msgid "Stored file could not be verified. Upload failed."
+msgstr "El fichero almacenado no ha podido ser verificado. El envío ha fallado."
+
+#: ../../include/attach.php:915 ../../include/attach.php:931
+msgid "Path not available."
+msgstr "Ruta no disponible."
+
+#: ../../include/attach.php:977 ../../include/attach.php:1129
+msgid "Empty pathname"
+msgstr "Ruta vacía"
+
+#: ../../include/attach.php:1003
+msgid "duplicate filename or path"
+msgstr "Nombre duplicado de ruta o fichero"
+
+#: ../../include/attach.php:1025
+msgid "Path not found."
+msgstr "Ruta no encontrada"
+
+#: ../../include/attach.php:1083
+msgid "mkdir failed."
+msgstr "mkdir ha fallado."
+
+#: ../../include/attach.php:1087
+msgid "database storage failed."
+msgstr "el almacenamiento en la base de datos ha fallado."
+
+#: ../../include/attach.php:1135
+msgid "Empty path"
+msgstr "Ruta vacía"
+
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:878
+#: ../../include/bbcode.php:881 ../../include/bbcode.php:886
+#: ../../include/bbcode.php:889 ../../include/bbcode.php:892
+#: ../../include/bbcode.php:895 ../../include/bbcode.php:900
+#: ../../include/bbcode.php:903 ../../include/bbcode.php:908
+#: ../../include/bbcode.php:911 ../../include/bbcode.php:914
+#: ../../include/bbcode.php:917
+msgid "Image/photo"
+msgstr "Imagen/foto"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:928
+msgid "Encrypted content"
+msgstr "Contenido cifrado"
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr "Instalar el elemento %s:"
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio."
+
+#: ../../include/bbcode.php:261
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s escribió %2$s siguiente %3$s"
+
+#: ../../include/bbcode.php:338 ../../include/bbcode.php:346
+msgid "Click to open/close"
+msgstr "Pulsar para abrir/cerrar"
+
+#: ../../include/bbcode.php:346
+msgid "spoiler"
+msgstr "spoiler"
+
+#: ../../include/bbcode.php:619
+msgid "Different viewers will see this text differently"
+msgstr "Visitantes diferentes verán este texto de forma distinta"
+
+#: ../../include/bbcode.php:866
+msgid "$1 wrote:"
+msgstr "$1 escribió:"
+
+#: ../../include/items.php:897 ../../include/items.php:942
+msgid "(Unknown)"
+msgstr "(Desconocido)"
+
+#: ../../include/items.php:1141
+msgid "Visible to anybody on the internet."
+msgstr "Visible para cualquiera en internet."
+
+#: ../../include/items.php:1143
+msgid "Visible to you only."
+msgstr "Visible sólo para usted."
+
+#: ../../include/items.php:1145
+msgid "Visible to anybody in this network."
+msgstr "Visible para cualquiera en esta red."
+
+#: ../../include/items.php:1147
+msgid "Visible to anybody authenticated."
+msgstr "Visible para cualquiera que esté autenticado."
+
+#: ../../include/items.php:1149
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Visible para cualquiera en %s."
+
+#: ../../include/items.php:1151
+msgid "Visible to all connections."
+msgstr "Visible para todas las conexiones."
+
+#: ../../include/items.php:1153
+msgid "Visible to approved connections."
+msgstr "Visible para las conexiones permitidas."
+
+#: ../../include/items.php:1155
+msgid "Visible to specific connections."
+msgstr "Visible para conexiones específicas."
+
+#: ../../include/items.php:3918
+msgid "Privacy group is empty."
+msgstr "El grupo de canales está vacío."
+
+#: ../../include/items.php:3925
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Grupo de canales: %s"
+
+#: ../../include/items.php:3937
+msgid "Connection not found."
+msgstr "Conexión no encontrada"
+
+#: ../../include/items.php:4290
+msgid "profile photo"
+msgstr "foto del perfil"
+
+#: ../../include/oembed.php:336
+msgid "Embedded content"
+msgstr "Contenido incorporado"
+
+#: ../../include/oembed.php:345
+msgid "Embedding disabled"
+msgstr "Incrustación deshabilitada"
+
+#: ../../include/widgets.php:103
+msgid "System"
+msgstr "Sistema"
+
+#: ../../include/widgets.php:106
+msgid "New App"
+msgstr "Nueva aplicación (app)"
+
+#: ../../include/widgets.php:154
+msgid "Suggestions"
+msgstr "Sugerencias"
+
+#: ../../include/widgets.php:155
+msgid "See more..."
+msgstr "Ver más..."
+
+#: ../../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/widgets.php:181
+msgid "Add New Connection"
+msgstr "Añadir nueva conexión"
+
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
+msgstr "Dirección del canal"
+
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Ejemplos: manuel@ejemplo.com, https://ejemplo.com/carmen"
+
+#: ../../include/widgets.php:199
+msgid "Notes"
+msgstr "Notas"
+
+#: ../../include/widgets.php:273
+msgid "Remove term"
+msgstr "Eliminar término"
+
+#: ../../include/widgets.php:313 ../../include/widgets.php:432
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
+msgstr "Todo"
+
+#: ../../include/widgets.php:354
+msgid "Archives"
+msgstr "Hemeroteca"
+
+#: ../../include/widgets.php:516
+msgid "Refresh"
+msgstr "Recargar"
+
+#: ../../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/widgets.php:578
+msgid "Feature/Addon settings"
+msgstr "Complementos"
+
+#: ../../include/widgets.php:584
+msgid "Display settings"
+msgstr "Ajustes de visualización"
+
+#: ../../include/widgets.php:591
+msgid "Manage locations"
+msgstr "Gestión de ubicaciones (clones) del canal"
+
+#: ../../include/widgets.php:600
+msgid "Export channel"
+msgstr "Exportar canal"
+
+#: ../../include/widgets.php:607
+msgid "Connected apps"
+msgstr "Aplicaciones (apps) conectadas"
+
+#: ../../include/widgets.php:631
+msgid "Premium Channel Settings"
+msgstr "Configuración del canal premium"
+
+#: ../../include/widgets.php:660
+msgid "Private Mail Menu"
+msgstr "Menú de correo privado"
+
+#: ../../include/widgets.php:662
+msgid "Combined View"
+msgstr "Vista combinada"
+
+#: ../../include/widgets.php:694 ../../include/widgets.php:706
+msgid "Conversations"
+msgstr "Conversaciones"
+
+#: ../../include/widgets.php:698
+msgid "Received Messages"
+msgstr "Mensajes recibidos"
+
+#: ../../include/widgets.php:702
+msgid "Sent Messages"
+msgstr "Enviar mensajes"
+
+#: ../../include/widgets.php:716
+msgid "No messages."
+msgstr "Sin mensajes."
+
+#: ../../include/widgets.php:734
+msgid "Delete conversation"
+msgstr "Eliminar conversación"
+
+#: ../../include/widgets.php:760
+msgid "Events Tools"
+msgstr "Gestión de eventos"
+
+#: ../../include/widgets.php:761
+msgid "Export Calendar"
+msgstr "Exportar el calendario"
+
+#: ../../include/widgets.php:762
+msgid "Import Calendar"
+msgstr "Importar un calendario"
+
+#: ../../include/widgets.php:840
+msgid "Overview"
+msgstr "Resumen"
+
+#: ../../include/widgets.php:847
+msgid "Chat Members"
+msgstr "Miembros del chat"
+
+#: ../../include/widgets.php:869
+msgid "Wiki List"
+msgstr "Lista de wikis"
+
+#: ../../include/widgets.php:907
+msgid "Wiki Pages"
+msgstr "Páginas del wiki"
+
+#: ../../include/widgets.php:942
+msgid "Bookmarked Chatrooms"
+msgstr "Salas de chat preferidas"
+
+#: ../../include/widgets.php:965
+msgid "Suggested Chatrooms"
+msgstr "Salas de chat sugeridas"
+
+#: ../../include/widgets.php:1111 ../../include/widgets.php:1223
+msgid "photo/image"
+msgstr "foto/imagen"
+
+#: ../../include/widgets.php:1166
+msgid "Click to show more"
+msgstr "Hacer clic para ver más"
+
+#: ../../include/widgets.php:1317
+msgid "Rating Tools"
+msgstr "Valoraciones"
+
+#: ../../include/widgets.php:1321 ../../include/widgets.php:1323
+msgid "Rate Me"
+msgstr "Valorar este canal"
+
+#: ../../include/widgets.php:1326
+msgid "View Ratings"
+msgstr "Mostrar las valoraciones"
+
+#: ../../include/widgets.php:1410
+msgid "Forums"
+msgstr "Foros"
+
+#: ../../include/widgets.php:1439
+msgid "Tasks"
+msgstr "Tareas"
+
+#: ../../include/widgets.php:1448
+msgid "Documentation"
+msgstr "Documentación"
+
+#: ../../include/widgets.php:1450
+msgid "Project/Site Information"
+msgstr "Información sobre el proyecto o sitio"
+
+#: ../../include/widgets.php:1451
+msgid "For Members"
+msgstr "Para los miembros"
+
+#: ../../include/widgets.php:1452
+msgid "For Administrators"
+msgstr "Para los administradores"
+
+#: ../../include/widgets.php:1453
+msgid "For Developers"
+msgstr "Para los desarrolladores"
+
+#: ../../include/widgets.php:1477 ../../include/widgets.php:1515
+msgid "Member registrations waiting for confirmation"
+msgstr "Inscripciones de nuevos miembros pendientes de aprobación"
+
+#: ../../include/widgets.php:1483
+msgid "Inspect queue"
+msgstr "Examinar la cola"
+
+#: ../../include/widgets.php:1485
+msgid "DB updates"
+msgstr "Actualizaciones de la base de datos"
+
+#: ../../include/widgets.php:1511
+msgid "Plugin Features"
+msgstr "Extensiones"
+
+#: ../../include/activities.php:41
+msgid " and "
+msgstr "  y "
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr "el perfil público"
+
+#: ../../include/activities.php:58
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s ha cambiado %2$s a &ldquo;%3$s&rdquo;"
+
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Visitar %2$s de %1$s"
+
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s ha actualizado %2$s, cambiando %3$s."
+
+#: ../../include/bb2diaspora.php:398
+msgid "Attachments:"
+msgstr "Ficheros adjuntos:"
+
+#: ../../include/bb2diaspora.php:487
+msgid "$Projectname event notification:"
+msgstr "Notificación de eventos de $Projectname:"
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "¿Borrar este elemento?"
 
 #: ../../include/js_strings.php:8
-msgid "[-] show less"
-msgstr "[-] mostrar menos"
+#, php-format
+msgid "%s show less"
+msgstr ""
 
 #: ../../include/js_strings.php:9
-msgid "[+] expand"
-msgstr "[+] expandir"
+#, php-format
+msgid "%s expand"
+msgstr ""
 
 #: ../../include/js_strings.php:10
-msgid "[-] collapse"
-msgstr "[-] contraer"
+#, php-format
+msgid "%s collapse"
+msgstr ""
 
 #: ../../include/js_strings.php:11
 msgid "Password too short"
@@ -9363,278 +9614,223 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "Todos los días"
 
-#: ../../include/network.php:657
-msgid "view full size"
-msgstr "Ver en el tamaño original"
-
-#: ../../include/network.php:1885
-msgid "No Subject"
-msgstr "Sin asunto"
-
-#: ../../include/network.php:2146 ../../include/network.php:2147
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/network.php:2148
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/network.php:2149
-msgid "GNU-Social"
-msgstr "GNU Social"
-
-#: ../../include/network.php:2150
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/network.php:2152
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/network.php:2153
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/network.php:2154
-msgid "Zot"
-msgstr "Zot"
-
-#: ../../include/network.php:2155
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ../../include/network.php:2156
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: ../../include/network.php:2157
-msgid "MySpace"
-msgstr "MySpace"
-
-#: ../../include/photos.php:110
+#: ../../include/contact_widgets.php:11
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "La imagen excede el límite de %lu bytes del sitio"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitación pendiente"
+msgstr[1] "%d invitaciones disponibles"
 
-#: ../../include/photos.php:117
-msgid "Image file is empty."
-msgstr "El fichero de imagen está vacío. "
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
+msgstr "Encontrar canales"
 
-#: ../../include/photos.php:255
-msgid "Photo storage failed."
-msgstr "La foto no ha podido ser guardada."
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
+msgstr "Introducir nombre o interés"
 
-#: ../../include/photos.php:295
-msgid "a new photo"
-msgstr "una nueva foto"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
+msgstr "Conectar/Seguir"
 
-#: ../../include/photos.php:299
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Ejemplos: José Fernández, Pesca"
+
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
+msgstr "Perfil aleatorio"
+
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
+msgstr "Invitar a amigos"
+
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Ejemplo avanzado: nombre=juan y país=españa"
+
+#: ../../include/contact_widgets.php:122
 #, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s ha publicado %2$s en %3$s"
+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/photos.php:506
-msgid "Upload New Photos"
-msgstr "Subir nuevas fotos"
+#: ../../include/contact_widgets.php:127
+msgid "show more"
+msgstr "mostrar más"
 
-#: ../../include/zot.php:699
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr "Opciones del directorio"
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr "Modo seguro"
+
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr "Solo foros públicos"
+
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr "Solo este sitio web"
+
+#: ../../include/message.php:20
+msgid "No recipient provided."
+msgstr "No se ha especificado ningún destinatario."
+
+#: ../../include/message.php:25
+msgid "[no subject]"
+msgstr "[sin asunto]"
+
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
+msgstr "No ha sido posible determinar el remitente. "
+
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
+msgstr "No se han podido verificar las publicaciones guardadas."
+
+#: ../../include/acl_selectors.php:269
+msgid "Who can see this?"
+msgstr "¿Quién puede ver esto?"
+
+#: ../../include/acl_selectors.php:270
+msgid "Custom selection"
+msgstr "Selección personalizada"
+
+#: ../../include/acl_selectors.php:271
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
+" the scope of \"Show\"."
+msgstr "Seleccione \"Mostrar\" para permitir la visualización. La opción \"No mostrar\" le permite anular y limitar el alcance de \"Mostrar\"."
+
+#: ../../include/acl_selectors.php:272
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../../include/acl_selectors.php:273
+msgid "Don't show"
+msgstr "No mostrar"
+
+#: ../../include/acl_selectors.php:279
+msgid "Other networks and post services"
+msgstr "Otras redes y servicios de publicación"
+
+#: ../../include/acl_selectors.php:309
+#, php-format
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These"
+" permissions set who is allowed to view the post."
+msgstr "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje."
+
+#: ../../include/datetime.php:135
+msgid "Birthday"
+msgstr "Cumpleaños"
+
+#: ../../include/datetime.php:137
+msgid "Age: "
+msgstr "Edad:"
+
+#: ../../include/datetime.php:139
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "AAAA-MM-DD o MM-DD"
+
+#: ../../include/datetime.php:272 ../../boot.php:2479
+msgid "never"
+msgstr "nunca"
+
+#: ../../include/datetime.php:278
+msgid "less than a second ago"
+msgstr "hace un instante"
+
+#: ../../include/datetime.php:296
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr "hace %1$d %2$s"
+
+#: ../../include/datetime.php:307
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] "año"
+msgstr[1] "años"
+
+#: ../../include/datetime.php:310
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] "mes"
+msgstr[1] "meses"
+
+#: ../../include/datetime.php:313
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "semana"
+msgstr[1] "semanas"
+
+#: ../../include/datetime.php:316
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "día"
+msgstr[1] "días"
+
+#: ../../include/datetime.php:319
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "horas"
+
+#: ../../include/datetime.php:322
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuto"
+msgstr[1] "minutos"
+
+#: ../../include/datetime.php:325
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "segundo"
+msgstr[1] "segundos"
+
+#: ../../include/datetime.php:562
+#, php-format
+msgid "%1$s's birthday"
+msgstr "Cumpleaños de %1$s"
+
+#: ../../include/datetime.php:563
+#, php-format
+msgid "Happy Birthday %1$s"
+msgstr "Feliz cumpleaños %1$s"
+
+#: ../../include/api.php:1327
+msgid "Public Timeline"
+msgstr "Cronología pública"
+
+#: ../../include/zot.php:697
 msgid "Invalid data packet"
 msgstr "Paquete de datos no válido"
 
-#: ../../include/zot.php:715
+#: ../../include/zot.php:713
 msgid "Unable to verify channel signature"
 msgstr "No ha sido posible de verificar la firma del canal"
 
-#: ../../include/zot.php:2363
+#: ../../include/zot.php:2326
 #, 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:3712
+#: ../../include/zot.php:3703
 msgid "invalid target signature"
 msgstr "La firma recibida no es válida"
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Nueva página"
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr "Título"
-
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
-msgstr "Pueden verse mi actividad y publicaciones normales"
-
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
-msgstr "Puede verse mi perfil de canal predeterminado."
-
-#: ../../include/permissions.php:28
-msgid "Can view my connections"
-msgstr "Pueden verse mis conexiones"
-
-#: ../../include/permissions.php:29
-msgid "Can view my file storage and photos"
-msgstr "Pueden verse mi repositorio de ficheros y mis fotos"
-
-#: ../../include/permissions.php:30
-msgid "Can view my webpages"
-msgstr "Pueden verse mis páginas web"
-
-#: ../../include/permissions.php:33
-msgid "Can send me their channel stream and posts"
-msgstr "Me pueden enviar sus entradas y contenidos del canal"
-
-#: ../../include/permissions.php:34
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Pueden crearse entradas en mi página de inicio del canal (“muro”)"
-
-#: ../../include/permissions.php:35
-msgid "Can comment on or like my posts"
-msgstr "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'."
-
-#: ../../include/permissions.php:36
-msgid "Can send me private mail messages"
-msgstr "Se me pueden enviar mensajes privados"
-
-#: ../../include/permissions.php:37
-msgid "Can like/dislike stuff"
-msgstr "Puede marcarse contenido como me gusta/no me gusta"
-
-#: ../../include/permissions.php:37
-msgid "Profiles and things other than posts/comments"
-msgstr "Perfiles y otras cosas aparte de publicaciones/comentarios"
-
-#: ../../include/permissions.php:39
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención"
-
-#: ../../include/permissions.php:39
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Avanzado - útil para crear canales de foros de discusión o grupos"
-
-#: ../../include/permissions.php:40
-msgid "Can chat with me (when available)"
-msgstr "Se puede charlar conmigo (cuando esté disponible)"
-
-#: ../../include/permissions.php:41
-msgid "Can write to my file storage and photos"
-msgstr "Puede escribirse en mi repositorio de ficheros y fotos"
-
-#: ../../include/permissions.php:42
-msgid "Can edit my webpages"
-msgstr "Pueden editarse mis páginas web"
-
-#: ../../include/permissions.php:44
-msgid "Can source my public posts in derived channels"
-msgstr "Pueden utilizarse mis publicaciones públicas como origen de contenidos  en canales derivados"
-
-#: ../../include/permissions.php:44
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Algo avanzado - muy útil en comunidades abiertas"
-
-#: ../../include/permissions.php:46
-msgid "Can administer my channel resources"
-msgstr "Pueden administrarse mis recursos del canal"
-
-#: ../../include/permissions.php:46
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo."
-
-#: ../../include/permissions.php:877
-msgid "Social Networking"
-msgstr "Redes sociales"
-
-#: ../../include/permissions.php:877
-msgid "Social - Mostly Public"
-msgstr "Social - Público en su mayor parte"
-
-#: ../../include/permissions.php:877
-msgid "Social - Restricted"
-msgstr "Social - Restringido"
-
-#: ../../include/permissions.php:877
-msgid "Social - Private"
-msgstr "Social - Privado"
-
-#: ../../include/permissions.php:878
-msgid "Community Forum"
-msgstr "Foro de discusión"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Mostly Public"
-msgstr "Foro - Público en su mayor parte"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Restricted"
-msgstr "Foro - Restringido"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Private"
-msgstr "Foro - Privado"
-
-#: ../../include/permissions.php:879
-msgid "Feed Republish"
-msgstr "Republicar un \"feed\""
-
-#: ../../include/permissions.php:879
-msgid "Feed - Mostly Public"
-msgstr "Feed - Público en su mayor parte"
-
-#: ../../include/permissions.php:879
-msgid "Feed - Restricted"
-msgstr "Feed - Restringido"
-
-#: ../../include/permissions.php:880
-msgid "Special Purpose"
-msgstr "Propósito especial"
-
-#: ../../include/permissions.php:880
-msgid "Special - Celebrity/Soapbox"
-msgstr "Especial - Celebridad / Tribuna improvisada"
-
-#: ../../include/permissions.php:880
-msgid "Special - Group Repository"
-msgstr "Especial - Repositorio de grupo"
-
-#: ../../include/permissions.php:881
-msgid "Custom/Expert Mode"
-msgstr "Modo personalizado/experto"
-
-#: ../../include/activities.php:41
-msgid " and "
-msgstr "  y "
-
-#: ../../include/activities.php:49
-msgid "public profile"
-msgstr "el perfil público"
-
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s ha cambiado %2$s a &ldquo;%3$s&rdquo;"
-
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Visitar %2$s de %1$s"
-
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s ha actualizado %2$s, cambiando %3$s."
-
-#: ../../include/bb2diaspora.php:398
-msgid "Attachments:"
-msgstr "Ficheros adjuntos:"
-
-#: ../../include/bb2diaspora.php:487
-msgid "$Projectname event notification:"
-msgstr "Notificación de eventos de $Projectname:"
-
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (predefinido)"
@@ -9771,62 +9967,66 @@ msgstr "Ajustar el tamaño de la foto del autor de la conversación"
 msgid "Set size of followup author photos"
 msgstr "Ajustar el tamaño de foto de los seguidores del autor"
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr "Buscar %1$s (%2$s)"
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../boot.php:1480
+#: ../../boot.php:1481
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La actualización %s ha fallado. Mire el informe de errores."
 
-#: ../../boot.php:1483
+#: ../../boot.php:1484
 #, php-format
 msgid "Update Error at %s"
 msgstr "Error de actualización en %s"
 
-#: ../../boot.php:1684
+#: ../../boot.php:1685
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla"
 
 #: ../../boot.php:1706
+msgid "Login/Email"
+msgstr ""
+
+#: ../../boot.php:1707
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../../boot.php:1707
+#: ../../boot.php:1708
 msgid "Remember me"
 msgstr "Recordarme"
 
-#: ../../boot.php:1710
+#: ../../boot.php:1711
 msgid "Forgot your password?"
 msgstr "¿Olvidó su contraseña?"
 
-#: ../../boot.php:2276
+#: ../../boot.php:2277
 msgid "toggle mobile"
 msgstr "cambiar a modo móvil"
 
-#: ../../boot.php:2425
+#: ../../boot.php:2432
 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:2428
+#: ../../boot.php:2435
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Error SSL del sitio web en %s"
 
-#: ../../boot.php:2469
+#: ../../boot.php:2478
 msgid "Cron/Scheduled tasks not running."
 msgstr "Las tareas del Planificador/Cron no están funcionando."
 
-#: ../../boot.php:2473
+#: ../../boot.php:2482
 #, 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 22c81e350..0a6812ec4 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -4,7 +4,39 @@ if(! function_exists("string_plural_select_es_es")) {
 function string_plural_select_es_es($n){
 	return ($n != 1);;
 }}
-;
+App::$rtl = 0;
+App::$strings["Social Networking"] = "Redes sociales";
+App::$strings["Social - Mostly Public"] = "Social - Público en su mayor parte";
+App::$strings["Social - Restricted"] = "Social - Restringido";
+App::$strings["Social - Private"] = "Social - Privado";
+App::$strings["Community Forum"] = "Foro de discusión";
+App::$strings["Forum - Mostly Public"] = "Foro - Público en su mayor parte";
+App::$strings["Forum - Restricted"] = "Foro - Restringido";
+App::$strings["Forum - Private"] = "Foro - Privado";
+App::$strings["Feed Republish"] = "Republicar un \"feed\"";
+App::$strings["Feed - Mostly Public"] = "Feed - Público en su mayor parte";
+App::$strings["Feed - Restricted"] = "Feed - Restringido";
+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["Other"] = "Otro";
+App::$strings["Custom/Expert Mode"] = "Modo personalizado/experto";
+App::$strings["Can view my channel stream and posts"] = "";
+App::$strings["Can send me their channel stream and posts"] = "Se me pueden enviar entradas y contenido de un canal";
+App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado.";
+App::$strings["Can view my connections"] = "Pueden verse mis conexiones";
+App::$strings["Can view my file storage and photos"] = "Pueden verse mi repositorio de ficheros y mis fotos";
+App::$strings["Can upload/modify my file storage and photos"] = "";
+App::$strings["Can view my channel webpages"] = "";
+App::$strings["Can create/edit my channel webpages"] = "";
+App::$strings["Can post on my channel (wall) page"] = "";
+App::$strings["Can comment on or like my posts"] = "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'.";
+App::$strings["Can send me private mail messages"] = "Se me pueden enviar mensajes privados";
+App::$strings["Can like/dislike profiles and profile things"] = "";
+App::$strings["Can forward to all my channel connections via @+ mentions in posts"] = "";
+App::$strings["Can chat with me"] = "";
+App::$strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis publicaciones públicas como origen de contenidos  en canales derivados";
+App::$strings["Can administer my channel"] = "";
 App::$strings["parent"] = "padre";
 App::$strings["Collection"] = "Colección";
 App::$strings["Principal"] = "Principal";
@@ -37,63 +69,8 @@ App::$strings["Remote authentication blocked. You are logged into this site loca
 App::$strings["Welcome %s. Remote authentication successful."] = "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente.";
 App::$strings["Requested profile is not available."] = "El perfil solicitado no está disponible.";
 App::$strings["Some blurb about what to do when you're new here"] = "Algunas propuestas para el nuevo usuario sobre qué se puede hacer aquí";
-App::$strings["Block Name"] = "Nombre del bloque";
-App::$strings["Blocks"] = "Bloques";
-App::$strings["Block Title"] = "Título del bloque";
-App::$strings["Created"] = "Creado";
-App::$strings["Edited"] = "Editado";
-App::$strings["Share"] = "Compartir";
-App::$strings["View"] = "Ver";
-App::$strings["Channel not found."] = "Canal no encontrado.";
-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";
-App::$strings["Edit Event"] = "Editar el evento";
-App::$strings["Create Event"] = "Crear un evento";
-App::$strings["Previous"] = "Anterior";
-App::$strings["Next"] = "Siguiente";
-App::$strings["Export"] = "Exportar";
-App::$strings["Import"] = "Importar";
-App::$strings["Submit"] = "Enviar";
-App::$strings["Today"] = "Hoy";
-App::$strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página.";
-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["Room not found"] = "Sala no encontrada";
-App::$strings["Leave Room"] = "Abandonar la sala";
-App::$strings["Delete Room"] = "Eliminar esta sala";
-App::$strings["I am away right now"] = "Estoy ausente momentáneamente";
-App::$strings["I am online"] = "Estoy conectado/a";
-App::$strings["Bookmark this room"] = "Añadir esta sala a Marcadores";
-App::$strings["Please enter a link URL:"] = "Por favor, introduzca la dirección del enlace:";
-App::$strings["Encrypt text"] = "Cifrar texto";
-App::$strings["Insert web link"] = "Insertar enlace web";
-App::$strings["Feature disabled."] = "Funcionalidad deshabilitada.";
-App::$strings["New Chatroom"] = "Nueva sala de chat";
-App::$strings["Chatroom name"] = "Nombre de la sala de chat";
-App::$strings["Expiration of chats (minutes)"] = "Caducidad de los mensajes en los chats (en minutos)";
-App::$strings["Permissions"] = "Permisos";
-App::$strings["%1\$s's Chatrooms"] = "Salas de chat de %1\$s";
-App::$strings["No chatrooms available"] = "No hay salas de chat disponibles";
-App::$strings["Create New"] = "Crear";
-App::$strings["Expiration"] = "Caducidad";
-App::$strings["min"] = "min";
 App::$strings["Away"] = "Ausente";
 App::$strings["Online"] = "Conectado/a";
-App::$strings["Invalid item."] = "Elemento no válido.";
-App::$strings["Bookmark added"] = "Marcador añadido";
-App::$strings["My Bookmarks"] = "Mis marcadores";
-App::$strings["My Connections Bookmarks"] = "Marcadores de mis conexiones";
-App::$strings["Continue"] = "Continuar";
-App::$strings["Premium Channel Setup"] = "Configuración del canal premium";
-App::$strings["Enable premium channel connection restrictions"] = "Habilitar restricciones de conexión del canal premium";
-App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Por favor introduzca sus restricciones o condiciones, como recibo de paypal, normas de uso, etc.";
-App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Este canal puede requerir antes de conectar unos pasos adicionales o el conocimiento de las siguientes condiciones:";
-App::$strings["Potential connections will then see the following text before proceeding:"] = "Las posibles conexiones verán, por tanto, el siguiente texto antes de proceder:";
-App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Al continuar, certifico que he cumplido con todas las instrucciones proporcionadas en esta página.";
-App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(No ha sido proporcionada ninguna instrucción específica por el propietario del canal.)";
-App::$strings["Restricted or Premium Channel"] = "Canal premium o restringido";
 App::$strings["Could not access contact record."] = "No se ha podido acceder al registro de contacto.";
 App::$strings["Could not locate selected profile."] = "No se ha podido localizar el perfil seleccionado.";
 App::$strings["Connection updated."] = "Conexión actualizada.";
@@ -158,6 +135,7 @@ App::$strings["Do not import posts with this text"] = "No importar entradas que
 App::$strings["This information is public!"] = "¡Esta información es pública!";
 App::$strings["Connection Pending Approval"] = "Conexión pendiente de aprobación";
 App::$strings["inherited"] = "heredado";
+App::$strings["Submit"] = "Enviar";
 App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Por favor, escoja el perfil que quiere mostrar a %s cuando esté viendo su perfil de forma segura.";
 App::$strings["Their Settings"] = "Sus ajustes";
 App::$strings["My Settings"] = "Mis ajustes";
@@ -166,6 +144,30 @@ App::$strings["Some permissions may be inherited from your channel's <a href=\"s
 App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Algunos permisos pueden ser heredados de los <a href=\"settings\"><strong>ajustes de privacidad</strong></a> de sus canales, los cuales tienen una prioridad más alta que los ajustes individuales. Puede cambiar estos ajustes aquí, pero no tendrán ningún consecuencia hasta que cambie los ajustes heredados.";
 App::$strings["Last update:"] = "Última actualización:";
 App::$strings["Public access denied."] = "Acceso público denegado.";
+App::$strings["Item not found."] = "Elemento no encontrado.";
+App::$strings["First Name"] = "Nombre";
+App::$strings["Last Name"] = "Apellido";
+App::$strings["Nickname"] = "Sobrenombre o Alias";
+App::$strings["Full Name"] = "Nombre completo";
+App::$strings["Email"] = "Correo electrónico";
+App::$strings["Profile Photo"] = "Foto del perfil";
+App::$strings["Profile Photo 16px"] = "Foto del perfil 16px";
+App::$strings["Profile Photo 32px"] = "Foto del perfil 32px";
+App::$strings["Profile Photo 48px"] = "Foto del perfil 48px";
+App::$strings["Profile Photo 64px"] = "Foto del perfil 64px";
+App::$strings["Profile Photo 80px"] = "Foto del perfil 80px";
+App::$strings["Profile Photo 128px"] = "Foto del perfil 128px";
+App::$strings["Timezone"] = "Huso horario";
+App::$strings["Homepage URL"] = "Dirección de la página personal";
+App::$strings["Language"] = "Idioma";
+App::$strings["Birth Year"] = "Año de nacimiento";
+App::$strings["Birth Month"] = "Mes de nacimiento";
+App::$strings["Birth Day"] = "Día de nacimiento";
+App::$strings["Birthdate"] = "Fecha de nacimiento";
+App::$strings["Gender"] = "Género";
+App::$strings["Male"] = "Hombre";
+App::$strings["Female"] = "Mujer";
+App::$strings["Channel added."] = "Canal añadido.";
 App::$strings["%d rating"] = array(
 	0 => "%d valoración",
 	1 => "%d valoraciones",
@@ -196,13 +198,74 @@ App::$strings["Reverse Alphabetic"] = "Alfabético inverso";
 App::$strings["Newest to Oldest"] = "De más nuevo a más antiguo";
 App::$strings["Oldest to Newest"] = "De más antiguo a más nuevo";
 App::$strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas entradas pueden estar ocultas).";
-App::$strings["Item not found."] = "Elemento no encontrado.";
+App::$strings["Continue"] = "Continuar";
+App::$strings["Premium Channel Setup"] = "Configuración del canal premium";
+App::$strings["Enable premium channel connection restrictions"] = "Habilitar restricciones de conexión del canal premium";
+App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Por favor introduzca sus restricciones o condiciones, como recibo de paypal, normas de uso, etc.";
+App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Este canal puede requerir antes de conectar unos pasos adicionales o el conocimiento de las siguientes condiciones:";
+App::$strings["Potential connections will then see the following text before proceeding:"] = "Las posibles conexiones verán, por tanto, el siguiente texto antes de proceder:";
+App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Al continuar, certifico que he cumplido con todas las instrucciones proporcionadas en esta página.";
+App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(No ha sido proporcionada ninguna instrucción específica por el propietario del canal.)";
+App::$strings["Restricted or Premium Channel"] = "Canal premium o restringido";
+App::$strings["Calendar entries imported."] = "Entradas de calendario importadas.";
+App::$strings["No calendar entries found."] = "No se han encontrado entradas de calendario.";
+App::$strings["Event can not end before it has started."] = "Un evento no puede terminar antes de que haya comenzado.";
+App::$strings["Unable to generate preview."] = "No se puede crear la vista previa.";
+App::$strings["Event title and start time are required."] = "Se requieren el título del evento y su hora de inicio.";
+App::$strings["Event not found."] = "Evento no encontrado.";
+App::$strings["event"] = "evento";
+App::$strings["Edit event title"] = "Editar el título del evento";
+App::$strings["Event title"] = "Título del evento";
+App::$strings["Required"] = "Obligatorio";
+App::$strings["Categories (comma-separated list)"] = "Categorías (lista separada por comas)";
+App::$strings["Edit Category"] = "Editar la categoría";
+App::$strings["Category"] = "Categoría";
+App::$strings["Edit start date and time"] = "Modificar la fecha y hora de comienzo";
+App::$strings["Start date and time"] = "Fecha y hora de comienzo";
+App::$strings["Finish date and time are not known or not relevant"] = "La fecha y hora de terminación no se conocen o no son relevantes";
+App::$strings["Edit finish date and time"] = "Modificar la fecha y hora de terminación";
+App::$strings["Finish date and time"] = "Fecha y hora de terminación";
+App::$strings["Adjust for viewer timezone"] = "Ajustar para obtener el visor de los husos horarios";
+App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales.";
+App::$strings["Edit Description"] = "Editar la descripción";
+App::$strings["Description"] = "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["l, F j"] = "l j F";
+App::$strings["Edit event"] = "Editar evento";
+App::$strings["Delete event"] = "Borrar evento";
+App::$strings["Link to Source"] = "Enlazar con la entrada en su ubicación original";
+App::$strings["calendar"] = "calendario";
+App::$strings["Edit Event"] = "Editar el evento";
+App::$strings["Create Event"] = "Crear un evento";
+App::$strings["Previous"] = "Anterior";
+App::$strings["Next"] = "Siguiente";
+App::$strings["Export"] = "Exportar";
+App::$strings["View"] = "Ver";
+App::$strings["Month"] = "";
+App::$strings["Week"] = "";
+App::$strings["Day"] = "";
+App::$strings["Today"] = "Hoy";
+App::$strings["Event removed"] = "Evento borrado";
+App::$strings["Failed to remove event"] = "Error al eliminar el evento";
+App::$strings["Bookmark added"] = "Marcador añadido";
+App::$strings["My Bookmarks"] = "Mis marcadores";
+App::$strings["My Connections Bookmarks"] = "Marcadores de mis conexiones";
 App::$strings["Item not found"] = "Elemento no encontrado";
-App::$strings["Title (optional)"] = "Título (opcional)";
-App::$strings["Edit Block"] = "Modificar este bloque";
-App::$strings["No channel."] = "Ningún canal.";
-App::$strings["Common connections"] = "Conexiones comunes";
-App::$strings["No connections in common."] = "Ninguna  conexión en común.";
+App::$strings["Item is not editable"] = "El elemento no es editable";
+App::$strings["Edit post"] = "Editar la entrada";
+App::$strings["Photos"] = "Fotos";
+App::$strings["Cancel"] = "Cancelar";
+App::$strings["Invalid item."] = "Elemento no válido.";
+App::$strings["Channel not found."] = "Canal no encontrado.";
+App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+App::$strings["Save to Folder:"] = "Guardar en carpeta:";
+App::$strings["- select -"] = "- seleccionar -";
+App::$strings["Save"] = "Guardar";
 App::$strings["Blocked"] = "Bloqueadas";
 App::$strings["Ignored"] = "Ignoradas";
 App::$strings["Hidden"] = "Ocultas";
@@ -254,51 +317,38 @@ 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["Item is not editable"] = "El elemento no es editable";
-App::$strings["Edit post"] = "Editar la entrada";
-App::$strings["Calendar entries imported."] = "Entradas de calendario importadas.";
-App::$strings["No calendar entries found."] = "No se han encontrado entradas de calendario.";
-App::$strings["Event can not end before it has started."] = "Un evento no puede terminar antes de que haya comenzado.";
-App::$strings["Unable to generate preview."] = "No se puede crear la vista previa.";
-App::$strings["Event title and start time are required."] = "Se requieren el título del evento y su hora de inicio.";
-App::$strings["Event not found."] = "Evento no encontrado.";
-App::$strings["event"] = "evento";
-App::$strings["Edit event title"] = "Editar el título del evento";
-App::$strings["Event title"] = "Título del evento";
-App::$strings["Required"] = "Obligatorio";
-App::$strings["Categories (comma-separated list)"] = "Categorías (lista separada por comas)";
-App::$strings["Edit Category"] = "Editar la categoría";
-App::$strings["Category"] = "Categoría";
-App::$strings["Edit start date and time"] = "Modificar la fecha y hora de comienzo";
-App::$strings["Start date and time"] = "Fecha y hora de comienzo";
-App::$strings["Finish date and time are not known or not relevant"] = "La fecha y hora de terminación no se conocen o no son relevantes";
-App::$strings["Edit finish date and time"] = "Modificar la fecha y hora de terminación";
-App::$strings["Finish date and time"] = "Fecha y hora de terminación";
-App::$strings["Adjust for viewer timezone"] = "Ajustar para obtener el visor de los husos horarios";
-App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante para los eventos que suceden en un lugar determinado. No es práctico para los globales.";
-App::$strings["Edit Description"] = "Editar la descripción";
-App::$strings["Description"] = "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";
-App::$strings["calendar"] = "calendario";
-App::$strings["Event removed"] = "Evento borrado";
-App::$strings["Failed to remove event"] = "Error al eliminar el evento";
-App::$strings["Photos"] = "Fotos";
-App::$strings["Cancel"] = "Cancelar";
+App::$strings["webpage"] = "página web";
+App::$strings["block"] = "bloque";
+App::$strings["layout"] = "plantilla";
+App::$strings["menu"] = "menú";
+App::$strings["%s element installed"] = "%s elemento instalado";
+App::$strings["%s element installation failed"] = "Elemento con instalación fallida: %s";
+App::$strings["Permissions denied."] = "Permisos denegados.";
+App::$strings["Import"] = "Importar";
 App::$strings["This site is not a directory server"] = "Este sitio no es un servidor de directorio";
 App::$strings["This directory server requires an access token"] = "El servidor de este directorio necesita un \"token\" de acceso";
-App::$strings["Save to Folder:"] = "Guardar en carpeta:";
-App::$strings["- select -"] = "- seleccionar -";
-App::$strings["Save"] = "Guardar";
+App::$strings["You must be logged in to see this page."] = "Debe haber iniciado sesión para poder ver esta página.";
+App::$strings["Room not found"] = "Sala no encontrada";
+App::$strings["Leave Room"] = "Abandonar la sala";
+App::$strings["Delete Room"] = "Eliminar esta sala";
+App::$strings["I am away right now"] = "Estoy ausente momentáneamente";
+App::$strings["I am online"] = "Estoy conectado/a";
+App::$strings["Bookmark this room"] = "Añadir esta sala a Marcadores";
+App::$strings["Please enter a link URL:"] = "Por favor, introduzca la dirección del enlace:";
+App::$strings["Encrypt text"] = "Cifrar texto";
+App::$strings["Insert web link"] = "Insertar enlace web";
+App::$strings["Feature disabled."] = "Funcionalidad deshabilitada.";
+App::$strings["New Chatroom"] = "Nueva sala de chat";
+App::$strings["Chatroom name"] = "Nombre de la sala de chat";
+App::$strings["Expiration of chats (minutes)"] = "Caducidad de los mensajes en los chats (en minutos)";
+App::$strings["Permissions"] = "Permisos";
+App::$strings["%1\$s's Chatrooms"] = "Salas de chat de %1\$s";
+App::$strings["No chatrooms available"] = "No hay salas de chat disponibles";
+App::$strings["Create New"] = "Crear";
+App::$strings["Expiration"] = "Caducidad";
+App::$strings["min"] = "min";
 App::$strings["Invalid message"] = "Mensaje no válido";
 App::$strings["no results"] = "sin resultados";
-App::$strings["Delivery report for %1\$s"] = "Informe de entrega para %1\$s";
 App::$strings["channel sync processed"] = "se ha realizado la sincronización del canal";
 App::$strings["queued"] = "encolado";
 App::$strings["posted"] = "enviado";
@@ -310,14 +360,14 @@ App::$strings["recipient not found"] = "destinatario no encontrado";
 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["Delivery report for %1\$s"] = "Informe de entrega para %1\$s";
+App::$strings["Options"] = "";
+App::$strings["Redeliver"] = "";
 App::$strings["Layout Name"] = "Nombre de la plantilla";
 App::$strings["Layout Description (Optional)"] = "Descripción de la plantilla (opcional)";
 App::$strings["Edit Layout"] = "Modificar la plantilla";
 App::$strings["Page link"] = "Enlace de la página";
 App::$strings["Edit Webpage"] = "Editar la página web";
-App::$strings["Channel added."] = "Canal añadido.";
-App::$strings["network"] = "red";
-App::$strings["RSS"] = "RSS";
 App::$strings["Privacy group created."] = "El grupo de canales ha sido creado.";
 App::$strings["Could not create privacy group."] = "No se puede crear el grupo de canales";
 App::$strings["Privacy group not found."] = "Grupo de canales no encontrado.";
@@ -331,16 +381,33 @@ App::$strings["Privacy group editor"] = "Editor de grupos de canales";
 App::$strings["Members"] = "Miembros";
 App::$strings["All Connected Channels"] = "Todos los canales conectados";
 App::$strings["Click on a channel to add or remove."] = "Haga clic en un canal para agregarlo o quitarlo.";
-App::$strings["Share content from Firefox to \$Projectname"] = "Compartir contenido desde Firefox a \$Projectname";
-App::$strings["Activate the Firefox \$Projectname provider"] = "Servicio de compartición de Firefox: activar el proveedor \$Projectname ";
-App::$strings["Authorize application connection"] = "Autorizar una conexión de aplicación";
-App::$strings["Return to your app and insert this Securty Code:"] = "Volver a su aplicación e introducir este código de seguridad:";
-App::$strings["Please login to continue."] = "Por favor inicie sesión para continuar.";
-App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y contactos, y/o crear nuevas publicaciones por usted?";
+App::$strings["App installed."] = "Aplicación instalada.";
+App::$strings["Malformed app."] = "Aplicación con errores";
+App::$strings["Embed code"] = "Código incorporado";
+App::$strings["Edit App"] = "Modificar la aplicación";
+App::$strings["Create App"] = "Crear una aplicación";
+App::$strings["Name of app"] = "Nombre de la aplicación";
+App::$strings["Location (URL) of app"] = "Dirección (URL) de la aplicació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["Documentation Search"] = "Búsqueda de Documentación";
 App::$strings["Help:"] = "Ayuda:";
 App::$strings["Help"] = "Ayuda";
 App::$strings["\$Projectname Documentation"] = "Documentación de \$Projectname";
+App::$strings["Item not available."] = "Elemento no disponible";
+App::$strings["Layout updated."] = "Plantilla actualizada.";
+App::$strings["Edit System Page Description"] = "Editor del Sistema de Descripción de Páginas";
+App::$strings["Layout not found."] = "Plantilla no encontrada";
+App::$strings["Module Name:"] = "Nombre del módulo:";
+App::$strings["Layout Help"] = "Ayuda para el diseño de plantillas de página";
+App::$strings["Share content from Firefox to \$Projectname"] = "Compartir contenido desde Firefox a \$Projectname";
+App::$strings["Activate the Firefox \$Projectname provider"] = "Servicio de compartición de Firefox: activar el proveedor \$Projectname ";
+App::$strings["network"] = "red";
+App::$strings["RSS"] = "RSS";
 App::$strings["Permission Denied."] = "Permiso denegado";
 App::$strings["File not found."] = "Fichero no encontrado.";
 App::$strings["Edit file permissions"] = "Modificar los permisos del fichero";
@@ -352,70 +419,13 @@ App::$strings["Copy/paste this URL to link file from a web page"] = "Copiar/pega
 App::$strings["Share this file"] = "Compartir este fichero";
 App::$strings["Show URL to this file"] = "Mostrar la dirección de este fichero";
 App::$strings["Notify your contacts about this file"] = "Avisar a sus contactos sobre este fichero";
-App::$strings["Apps"] = "Aplicaciones (apps)";
-App::$strings["Item not available."] = "Elemento no disponible";
-App::$strings["Your service plan only allows %d channels."] = "Su paquete de servicios solo permite %d canales.";
-App::$strings["Nothing to import."] = "No hay nada para importar.";
-App::$strings["Unable to download data from old server"] = "No se han podido descargar datos de su antiguo servidor";
-App::$strings["Imported file is empty."] = "El fichero importado está vacío.";
-App::$strings["Warning: Database versions differ by %1\$d updates."] = "Atención: Las versiones de la base de datos difieren en %1\$d actualizaciones.";
-App::$strings["Cloned channel not found. Import failed."] = "No se ha podido importar el canal porque el canal clonado no se ha encontrado.";
-App::$strings["No channel. Import failed."] = "No hay canal. La importación ha fallado";
-App::$strings["Import completed."] = "Importación completada.";
-App::$strings["You must be logged in to use this feature."] = "Debe estar registrado para poder usar esta funcionalidad.";
-App::$strings["Import Channel"] = "Importar canal";
-App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación.";
-App::$strings["File to Upload"] = "Fichero para subir";
-App::$strings["Or provide the old server/hub details"] = "O proporcione los detalles de su antiguo servidor/hub";
-App::$strings["Your old identity address (xyz@example.com)"] = "Su identidad en el antiguo servidor  (canal@ejemplo.com)";
-App::$strings["Your old login email address"] = "Su antigua dirección de correo electrónico";
-App::$strings["Your old login password"] = "Su antigua contraseña";
-App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos.";
-App::$strings["Make this hub my primary location"] = "Convertir este servidor en mi ubicación primaria";
-App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importar el contenido publicado si es posible (experimental - limitado por la memoria disponible";
-App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine.";
-App::$strings["Unable to locate original post."] = "No ha sido posible encontrar la entrada original.";
-App::$strings["Empty post discarded."] = "La entrada vacía ha sido desechada.";
-App::$strings["Executable content type not permitted to this channel."] = "Contenido de tipo ejecutable no permitido en este canal.";
-App::$strings["Duplicate post suppressed."] = "Se ha suprimido la entrada duplicada.";
-App::$strings["System error. Post not saved."] = "Error del sistema. La entrada no se ha podido salvar.";
-App::$strings["Unable to obtain post information from database."] = "No ha sido posible obtener información de la entrada en la base de datos.";
-App::$strings["You have reached your limit of %1$.0f top level posts."] = "Ha alcanzado su límite de %1$.0f entradas en la página principal.";
-App::$strings["You have reached your limit of %1$.0f webpages."] = "Ha alcanzado su límite de %1$.0f páginas web.";
 App::$strings["Layouts"] = "Plantillas";
 App::$strings["Comanche page description language help"] = "Página de ayuda del lenguaje de descripción de páginas (PDL) Comanche";
 App::$strings["Layout Description"] = "Descripción de la plantilla";
+App::$strings["Created"] = "Creado";
+App::$strings["Edited"] = "Editado";
+App::$strings["Share"] = "Compartir";
 App::$strings["Download PDL file"] = "Descargar el fichero PDL";
-App::$strings["\$Projectname"] = "\$Projectname";
-App::$strings["Welcome to %s"] = "Bienvenido a %s";
-App::$strings["First Name"] = "Nombre";
-App::$strings["Last Name"] = "Apellido";
-App::$strings["Nickname"] = "Sobrenombre o Alias";
-App::$strings["Full Name"] = "Nombre completo";
-App::$strings["Email"] = "Correo electrónico";
-App::$strings["Profile Photo"] = "Foto del perfil";
-App::$strings["Profile Photo 16px"] = "Foto del perfil 16px";
-App::$strings["Profile Photo 32px"] = "Foto del perfil 32px";
-App::$strings["Profile Photo 48px"] = "Foto del perfil 48px";
-App::$strings["Profile Photo 64px"] = "Foto del perfil 64px";
-App::$strings["Profile Photo 80px"] = "Foto del perfil 80px";
-App::$strings["Profile Photo 128px"] = "Foto del perfil 128px";
-App::$strings["Timezone"] = "Huso horario";
-App::$strings["Homepage URL"] = "Dirección de la página personal";
-App::$strings["Language"] = "Idioma";
-App::$strings["Birth Year"] = "Año de nacimiento";
-App::$strings["Birth Month"] = "Mes de nacimiento";
-App::$strings["Birth Day"] = "Día de nacimiento";
-App::$strings["Birthdate"] = "Fecha de nacimiento";
-App::$strings["Gender"] = "Género";
-App::$strings["Male"] = "Hombre";
-App::$strings["Female"] = "Mujer";
-App::$strings["webpage"] = "página web";
-App::$strings["block"] = "bloque";
-App::$strings["layout"] = "plantilla";
-App::$strings["menu"] = "menú";
-App::$strings["%s element installed"] = "%s elemento instalado";
-App::$strings["%s element installation failed"] = "Elemento con instalación fallida: %s";
 App::$strings["Like/Dislike"] = "Me gusta/No me gusta";
 App::$strings["This action is restricted to members."] = "Esta acción está restringida solo para miembros.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Por favor, <a href=\"rmagic\">identifíquese con su \$Projectname ID</a> o <a href=\"register\">rregístrese como un nuevo \$Projectname member</a> para continuar.";
@@ -436,175 +446,103 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s n
 App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%3\$s de %2\$s: %1\$s quizá participe";
 App::$strings["Action completed."] = "Acción completada.";
 App::$strings["Thank you."] = "Gracias.";
-App::$strings["Import completed"] = "Importación completada";
-App::$strings["Import Items"] = "Importar elementos";
-App::$strings["Use this form to import existing posts and content from an export file."] = "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación.";
-App::$strings["Total invitation limit exceeded."] = "Se ha superado el límite máximo de invitaciones.";
-App::$strings["%s : Not a valid email address."] = "%s : No es una dirección de correo electrónico válida. ";
-App::$strings["Please join us on \$Projectname"] = "Únase a nosotros en \$Projectname";
-App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio.";
-App::$strings["%s : Message delivery failed."] = "%s : Falló el envío del mensaje.";
-App::$strings["%d message sent."] = array(
-	0 => "%d mensajes enviados.",
-	1 => "%d mensajes enviados.",
-);
-App::$strings["You have no more invitations available"] = "No tiene más invitaciones disponibles";
-App::$strings["Send invitations"] = "Enviar invitaciones";
-App::$strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónico, una por línea:";
-App::$strings["Your message:"] = "Su mensaje:";
-App::$strings["Please join my community on \$Projectname."] = "Por favor, únase a mi comunidad en \$Projectname.";
-App::$strings["You will need to supply this invitation code:"] = "Tendrá que suministrar este código de invitación:";
-App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Regístrese en cualquier sitio de \$Projectname (están todos interconectados)";
-App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Introduzca mi dirección \$Projectname en la caja de búsqueda del sitio.";
-App::$strings["or visit"] = "o visitar";
-App::$strings["3. Click [Connect]"] = "3. Pulse [conectar]";
-App::$strings["Remote privacy information not available."] = "La información privada remota no está disponible.";
-App::$strings["Visible to:"] = "Visible para:";
-App::$strings["Location not found."] = "Dirección no encontrada.";
-App::$strings["Location lookup failed."] = "Ha fallado la búsqueda de la dirección.";
-App::$strings["Please select another location to become primary before removing the primary location."] = "Por favor, seleccione una copia de su canal (un clon) para convertirlo en primario antes de eliminar su canal principal.";
-App::$strings["Syncing locations"] = "Sincronización de ubicaciones";
-App::$strings["No locations found."] = "No encontrada ninguna dirección.";
-App::$strings["Manage Channel Locations"] = "Gestionar las direcciones del canal";
+App::$strings["Profile not found."] = "Perfil no encontrado.";
+App::$strings["Profile deleted."] = "Perfil eliminado.";
+App::$strings["Profile-"] = "Perfil-";
+App::$strings["New profile created."] = "El nuevo perfil ha sido creado.";
+App::$strings["Profile unavailable to clone."] = "Perfil no disponible para clonar.";
+App::$strings["Profile unavailable to export."] = "Perfil no disponible para exportar.";
+App::$strings["Profile Name is required."] = "Se necesita el nombre del perfil.";
+App::$strings["Marital Status"] = "Estado civil";
+App::$strings["Romantic Partner"] = "Pareja sentimental";
+App::$strings["Likes"] = "Me gusta";
+App::$strings["Dislikes"] = "No me gusta";
+App::$strings["Work/Employment"] = "Trabajo:";
+App::$strings["Religion"] = "Religión";
+App::$strings["Political Views"] = "Ideas políticas";
+App::$strings["Sexual Preference"] = "Preferencia sexual";
+App::$strings["Homepage"] = "Página personal";
+App::$strings["Interests"] = "Intereses";
 App::$strings["Address"] = "Dirección";
-App::$strings["Primary"] = "Primario";
-App::$strings["Drop"] = "Eliminar";
-App::$strings["Sync Now"] = "Sincronizar ahora";
-App::$strings["Please wait several minutes between consecutive operations."] = "Por favor, espere algunos minutos entre operaciones consecutivas.";
-App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal.";
-App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo.";
-App::$strings["Hub not found."] = "Servidor no encontrado";
-App::$strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
-App::$strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
-App::$strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
-App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
-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";
-App::$strings["Message has been recalled."] = "El mensaje ha sido revocado.";
-App::$strings["Delete Conversation"] = "Eliminar conversación";
-App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente.";
-App::$strings["Send Reply"] = "Responder";
-App::$strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):";
-App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Ha creado %1$.0f de %2$.0f canales permitidos.";
-App::$strings["Create a new channel"] = "Crear un nuevo canal";
-App::$strings["Channel Manager"] = "Administración de canales";
-App::$strings["Current Channel"] = "Canal actual";
-App::$strings["Switch to one of your channels by selecting it."] = "Cambiar a uno de sus canales seleccionándolo.";
-App::$strings["Default Channel"] = "Canal principal";
-App::$strings["Make Default"] = "Convertir en predeterminado";
-App::$strings["%d new messages"] = "%d mensajes nuevos";
-App::$strings["%d new introductions"] = "%d nuevas isolicitudes de conexión";
-App::$strings["Delegated Channel"] = "Canal delegado";
-App::$strings["No valid account found."] = "No se ha encontrado una cuenta válida.";
-App::$strings["Password reset request issued. Check your email."] = "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico.";
-App::$strings["Site Member (%s)"] = "Usuario del sitio (%s)";
-App::$strings["Password reset requested at %s"] = "Se ha solicitado restablecer la contraseña en %s";
-App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado.";
-App::$strings["Password Reset"] = "Restablecer la contraseña";
-App::$strings["Your password has been reset as requested."] = "Su contraseña ha sido restablecida según lo solicitó.";
-App::$strings["Your new password is"] = "Su nueva contraseña es";
-App::$strings["Save or copy your new password - and then"] = "Guarde o copie su nueva contraseña - y después";
-App::$strings["click here to login"] = "pulse aquí para conectarse";
-App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión.";
-App::$strings["Your password has changed at %s"] = "Su contraseña en %s ha sido cambiada";
-App::$strings["Forgot your Password?"] = "¿Ha olvidado su contraseña?";
-App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones.";
-App::$strings["Email Address"] = "Dirección de correo electrónico";
-App::$strings["Reset"] = "Reiniciar";
-App::$strings["Unable to update menu."] = "No se puede actualizar el menú.";
-App::$strings["Unable to create menu."] = "No se puede crear el menú.";
-App::$strings["Menu Name"] = "Nombre del menú";
-App::$strings["Unique name (not visible on webpage) - required"] = "Nombre único (no será visible en la página web) - requerido";
-App::$strings["Menu Title"] = "Título del menú";
-App::$strings["Visible on webpage - leave empty for no title"] = "Visible en la página web - no ponga nada si no desea un título";
-App::$strings["Allow Bookmarks"] = "Permitir marcadores";
-App::$strings["Menu may be used to store saved bookmarks"] = "El menú se puede usar para guardar marcadores";
-App::$strings["Submit and proceed"] = "Enviar y proceder";
-App::$strings["Menus"] = "Menús";
-App::$strings["Bookmarks allowed"] = "Marcadores permitidos";
-App::$strings["Delete this menu"] = "Borrar este menú";
-App::$strings["Edit menu contents"] = "Editar los contenidos del menú";
-App::$strings["Edit this menu"] = "Modificar este menú";
-App::$strings["Menu could not be deleted."] = "El menú no puede ser eliminado.";
-App::$strings["Menu not found."] = "Menú no encontrado";
-App::$strings["Edit Menu"] = "Modificar el menú";
-App::$strings["Add or remove entries to this menu"] = "Añadir o quitar entradas en este menú";
-App::$strings["Menu name"] = "Nombre del menú";
-App::$strings["Must be unique, only seen by you"] = "Debe ser único, solo será visible para usted";
-App::$strings["Menu title"] = "Título del menú";
-App::$strings["Menu title as seen by others"] = "El título del menú tal como será visto por los demás";
-App::$strings["Allow bookmarks"] = "Permitir marcadores";
-App::$strings["Not found."] = "No encontrado.";
-App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s";
-App::$strings["Mood"] = "Estado de ánimo";
-App::$strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos";
-App::$strings["Profile Match"] = "Perfil compatible";
-App::$strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave en el perfil principal para poder encontrar perfiles compatibles. Por favor, añada palabras clave a su perfil principal.";
-App::$strings["is interested in:"] = "está interesado en:";
-App::$strings["No matches"] = "No se han encontrado perfiles compatibles";
-App::$strings["No such group"] = "No se encuentra el grupo";
-App::$strings["No such channel"] = "No se encuentra el  canal";
-App::$strings["forum"] = "foro";
-App::$strings["Search Results For:"] = "Buscar resultados para:";
-App::$strings["Privacy group is empty"] = "El grupo de canales está vacío";
-App::$strings["Privacy group: "] = "Grupo de canales: ";
-App::$strings["Invalid connection."] = "Conexión no válida.";
-App::$strings["No more system notifications."] = "No hay más notificaciones del sistema";
-App::$strings["System Notifications"] = "Notificaciones del sistema";
-App::$strings["Unable to create element."] = "Imposible crear el elemento.";
-App::$strings["Unable to update menu element."] = "No es posible actualizar el elemento del menú.";
-App::$strings["Unable to add menu element."] = "No es posible añadir el elemento al menú";
-App::$strings["Menu Item Permissions"] = "Permisos del elemento del menú";
-App::$strings["(click to open/close)"] = "(pulsar para abrir o cerrar)";
-App::$strings["Link Name"] = "Nombre del enlace";
-App::$strings["Link or Submenu Target"] = "Destino del enlace o submenú";
-App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Introducir la dirección del enlace o seleccionar el nombre de un submenú";
-App::$strings["Use magic-auth if available"] = "Usar la autenticación mágica si está disponible";
-App::$strings["Open link in new window"] = "Abrir el enlace en una nueva ventana";
-App::$strings["Order in list"] = "Orden en la lista";
-App::$strings["Higher numbers will sink to bottom of listing"] = "Los números más altos irán al final de la lista";
-App::$strings["Submit and finish"] = "Enviar y terminar";
-App::$strings["Submit and continue"] = "Enviar y continuar";
-App::$strings["Menu:"] = "Menú:";
-App::$strings["Link Target"] = "Destino del enlace";
-App::$strings["Edit menu"] = "Editar menú";
-App::$strings["Edit element"] = "Editar el elemento";
-App::$strings["Drop element"] = "Eliminar el elemento";
-App::$strings["New element"] = "Nuevo elemento";
-App::$strings["Edit this menu container"] = "Modificar el contenedor del menú";
-App::$strings["Add menu element"] = "Añadir un elemento al menú";
-App::$strings["Delete this menu item"] = "Eliminar este elemento del menú";
-App::$strings["Edit this menu item"] = "Modificar este elemento del menú";
-App::$strings["Menu item not found."] = "Este elemento del menú no se ha encontrado";
-App::$strings["Menu item deleted."] = "Este elemento del menú ha sido borrado";
-App::$strings["Menu item could not be deleted."] = "Este elemento del menú no puede ser borrado.";
-App::$strings["Edit Menu Element"] = "Editar elemento del menú";
-App::$strings["Link text"] = "Texto del enlace";
-App::$strings["Name or caption"] = "Nombre o descripción";
-App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Ejemplos: \"Juan García\", \"Luisa y sus caballos\", \"Fútbol\", \"Grupo de aviación\"";
-App::$strings["Choose a short nickname"] = "Elija un alias corto";
-App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Su alias se usará para crear una dirección de canal fácil de recordar, p. ej.: alias%s";
-App::$strings["Channel role and privacy"] = "Clase de canal y privacidad";
-App::$strings["Select a channel role with your privacy requirements."] = "Seleccione un tipo de canal con sus requisitos de privacidad";
-App::$strings["Read more about roles"] = "Leer más sobre los roles";
-App::$strings["Create Channel"] = "Crear un canal";
-App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canal es su identidad en esta red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con una gama de permisos extremadamente detallada.";
-App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "O <a href=\"import\">importar un canal existente</a> desde otro lugar.";
-App::$strings["Invalid request identifier."] = "Petición inválida del identificador.";
-App::$strings["Discard"] = "Descartar";
-App::$strings["Mark all system notifications seen"] = "Marcar todas las notificaciones de sistema como leídas";
+App::$strings["Profile updated."] = "Perfil actualizado.";
+App::$strings["Hide your connections list from viewers of this profile"] = "Ocultar la lista de conexiones a los visitantes del perfil";
+App::$strings["Edit Profile Details"] = "Modificar los detalles de este perfil";
+App::$strings["View this profile"] = "Ver este perfil";
+App::$strings["Edit visibility"] = "Editar visibilidad";
+App::$strings["Profile Tools"] = "Gestión del perfil";
+App::$strings["Change cover photo"] = "Cambiar la imagen de portada del perfil";
+App::$strings["Change profile photo"] = "Cambiar la foto del perfil";
+App::$strings["Create a new profile using these settings"] = "Crear un nuevo perfil usando estos ajustes";
+App::$strings["Clone this profile"] = "Clonar este perfil";
+App::$strings["Delete this profile"] = "Eliminar este perfil";
+App::$strings["Add profile things"] = "Añadir cosas al perfil";
+App::$strings["Personal"] = "Personales";
+App::$strings["Relation"] = "Relación";
+App::$strings["Miscellaneous"] = "Varios";
+App::$strings["Import profile from file"] = "Importar perfil desde un fichero";
+App::$strings["Export profile to file"] = "Exportar perfil a un fichero";
+App::$strings["Your gender"] = "Género";
+App::$strings["Marital status"] = "Estado civil";
+App::$strings["Sexual preference"] = "Preferencia sexual";
+App::$strings["Profile name"] = "Nombre del perfil";
+App::$strings["This is your default profile."] = "Este es su perfil principal.";
+App::$strings["Your full name"] = "Nombre completo";
+App::$strings["Title/Description"] = "Título o descripción";
+App::$strings["Street address"] = "Dirección";
+App::$strings["Locality/City"] = "Ciudad";
+App::$strings["Region/State"] = "Región o Estado";
+App::$strings["Postal/Zip code"] = "Código postal";
+App::$strings["Country"] = "País";
+App::$strings["Who (if applicable)"] = "Quién (si es pertinente)";
+App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Por ejemplo: ana123, María González, sara@ejemplo.com";
+App::$strings["Since (date)"] = "Desde (fecha)";
+App::$strings["Tell us about yourself"] = "Háblenos de usted";
+App::$strings["Hometown"] = "Lugar de nacimiento";
+App::$strings["Political views"] = "Ideas políticas";
+App::$strings["Religious views"] = "Creencias religiosas";
+App::$strings["Keywords used in directory listings"] = "Palabras clave utilizadas en los listados de directorios";
+App::$strings["Example: fishing photography software"] = "Por ejemplo: software de fotografía submarina";
+App::$strings["Musical interests"] = "Preferencias musicales";
+App::$strings["Books, literature"] = "Libros, literatura";
+App::$strings["Television"] = "Televisión";
+App::$strings["Film/Dance/Culture/Entertainment"] = "Cine, danza, cultura, entretenimiento";
+App::$strings["Hobbies/Interests"] = "Aficiones o intereses";
+App::$strings["Love/Romance"] = "Vida sentimental o amorosa";
+App::$strings["School/Education"] = "Estudios";
+App::$strings["Contact information and social networks"] = "Información de contacto y redes sociales";
+App::$strings["My other channels"] = "Mis otros canales";
+App::$strings["Profile Image"] = "Imagen del perfil";
+App::$strings["Edit Profiles"] = "Editar perfiles";
+App::$strings["Your service plan only allows %d channels."] = "Su paquete de servicios solo permite %d canales.";
+App::$strings["Nothing to import."] = "No hay nada para importar.";
+App::$strings["Unable to download data from old server"] = "No se han podido descargar datos de su antiguo servidor";
+App::$strings["Imported file is empty."] = "El fichero importado está vacío.";
+App::$strings["Warning: Database versions differ by %1\$d updates."] = "Atención: Las versiones de la base de datos difieren en %1\$d actualizaciones.";
+App::$strings["Cloned channel not found. Import failed."] = "No se ha podido importar el canal porque el canal clonado no se ha encontrado.";
+App::$strings["No channel. Import failed."] = "No hay canal. La importación ha fallado";
+App::$strings["Import completed."] = "Importación completada.";
+App::$strings["You must be logged in to use this feature."] = "Debe estar registrado para poder usar esta funcionalidad.";
+App::$strings["Import Channel"] = "Importar canal";
+App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Emplee este formulario para importar un canal desde un servidor/hub diferente. Puede recuperar el canal desde el antiguo servidor/hub a través de la red o proporcionando un fichero de exportación.";
+App::$strings["File to Upload"] = "Fichero para subir";
+App::$strings["Or provide the old server/hub details"] = "O proporcione los detalles de su antiguo servidor/hub";
+App::$strings["Your old identity address (xyz@example.com)"] = "Su identidad en el antiguo servidor  (canal@ejemplo.com)";
+App::$strings["Your old login email address"] = "Su antigua dirección de correo electrónico";
+App::$strings["Your old login password"] = "Su antigua contraseña";
+App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Para cualquiera de las opciones, elija si hacer de este servidor su nueva dirección primaria, o si su antigua dirección debe continuar con este papel. Usted podrá publicar desde cualquier ubicación, pero sólo una puede estar marcada como la ubicación principal para los ficheros, fotos y otras imágenes o vídeos.";
+App::$strings["Make this hub my primary location"] = "Convertir este servidor en mi ubicación primaria";
+App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importar el contenido publicado si es posible (experimental - limitado por la memoria disponible";
+App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Este proceso puede tardar varios minutos en completarse. Por favor envíe el formulario una sola vez y mantenga esta página abierta hasta que termine.";
+App::$strings["\$Projectname"] = "\$Projectname";
+App::$strings["Welcome to %s"] = "Bienvenido a %s";
+App::$strings["Unable to locate original post."] = "No ha sido posible encontrar la entrada original.";
+App::$strings["Empty post discarded."] = "La entrada vacía ha sido desechada.";
+App::$strings["Executable content type not permitted to this channel."] = "Contenido de tipo ejecutable no permitido en este canal.";
+App::$strings["Duplicate post suppressed."] = "Se ha suprimido la entrada duplicada.";
+App::$strings["System error. Post not saved."] = "Error del sistema. La entrada no se ha podido salvar.";
+App::$strings["Unable to obtain post information from database."] = "No ha sido posible obtener información de la entrada en la base de datos.";
+App::$strings["You have reached your limit of %1$.0f top level posts."] = "Ha alcanzado su límite de %1$.0f entradas en la página principal.";
+App::$strings["You have reached your limit of %1$.0f webpages."] = "Ha alcanzado su límite de %1$.0f páginas web.";
 App::$strings["Page owner information could not be retrieved."] = "La información del propietario de la página no pudo ser recuperada.";
 App::$strings["Profile Photos"] = "Fotos del perfil";
 App::$strings["Album not found."] = "Álbum no encontrado.";
@@ -673,122 +611,164 @@ App::$strings["__ctx:noun__ Dislikes"] = "No me gusta";
 App::$strings["Close"] = "Cerrar";
 App::$strings["View Album"] = "Ver álbum";
 App::$strings["Recent Photos"] = "Fotos recientes";
-App::$strings["sent you a private message"] = "le ha enviado un mensaje privado";
-App::$strings["added your channel"] = "añadió este canal a sus conexiones";
-App::$strings["g A l F d"] = "g A l d F";
-App::$strings["[today]"] = "[hoy]";
-App::$strings["posted an event"] = "publicó un evento";
-App::$strings["Unable to find your hub."] = "No se puede encontrar su servidor.";
-App::$strings["Post successful."] = "Enviado con éxito.";
-App::$strings["OpenID protocol error. No ID returned."] = "Error del protocolo OpenID. Ningún ID recibido como respuesta.";
-App::$strings["Login failed."] = "El acceso ha fallado.";
-App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-App::$strings["This setting requires special processing and editing has been blocked."] = "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada.";
-App::$strings["Configuration Editor"] = "Editor de configuración";
-App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica.";
-App::$strings["Layout updated."] = "Plantilla actualizada.";
-App::$strings["Edit System Page Description"] = "Editor del Sistema de Descripción de Páginas";
-App::$strings["Layout not found."] = "Plantilla no encontrada";
-App::$strings["Module Name:"] = "Nombre del módulo:";
-App::$strings["Layout Help"] = "Ayuda para el diseño de plantillas de página";
-App::$strings["Poke"] = "Toques y otras cosas";
-App::$strings["Poke somebody"] = "Dar un toque a alguien";
-App::$strings["Poke/Prod"] = "Toque/Incitación";
-App::$strings["Poke, prod or do other things to somebody"] = "Dar un toque, incitar o hacer otras cosas a alguien";
-App::$strings["Recipient"] = "Destinatario";
-App::$strings["Choose what you wish to do to recipient"] = "Elegir qué desea enviar al destinatario";
-App::$strings["Make this post private"] = "Convertir en privado este envío";
-App::$strings["Fetching URL returns error: %1\$s"] = "Al intentar obtener la dirección, retorna el error: %1\$s";
-App::$strings["Profile not found."] = "Perfil no encontrado.";
-App::$strings["Profile deleted."] = "Perfil eliminado.";
-App::$strings["Profile-"] = "Perfil-";
-App::$strings["New profile created."] = "El nuevo perfil ha sido creado.";
-App::$strings["Profile unavailable to clone."] = "Perfil no disponible para clonar.";
-App::$strings["Profile unavailable to export."] = "Perfil no disponible para exportar.";
-App::$strings["Profile Name is required."] = "Se necesita el nombre del perfil.";
-App::$strings["Marital Status"] = "Estado civil";
-App::$strings["Romantic Partner"] = "Pareja sentimental";
-App::$strings["Likes"] = "Me gusta";
-App::$strings["Dislikes"] = "No me gusta";
-App::$strings["Work/Employment"] = "Trabajo:";
-App::$strings["Religion"] = "Religión";
-App::$strings["Political Views"] = "Ideas políticas";
-App::$strings["Sexual Preference"] = "Preferencia sexual";
-App::$strings["Homepage"] = "Página personal";
-App::$strings["Interests"] = "Intereses";
-App::$strings["Profile updated."] = "Perfil actualizado.";
-App::$strings["Hide your connections list from viewers of this profile"] = "Ocultar la lista de conexiones a los visitantes del perfil";
-App::$strings["Edit Profile Details"] = "Modificar los detalles de este perfil";
-App::$strings["View this profile"] = "Ver este perfil";
-App::$strings["Edit visibility"] = "Editar visibilidad";
-App::$strings["Profile Tools"] = "Gestión del perfil";
-App::$strings["Change cover photo"] = "Cambiar la imagen de portada del perfil";
-App::$strings["Change profile photo"] = "Cambiar la foto del perfil";
-App::$strings["Create a new profile using these settings"] = "Crear un nuevo perfil usando estos ajustes";
-App::$strings["Clone this profile"] = "Clonar este perfil";
-App::$strings["Delete this profile"] = "Eliminar este perfil";
-App::$strings["Add profile things"] = "Añadir cosas al perfil";
-App::$strings["Personal"] = "Personales";
-App::$strings["Relation"] = "Relación";
-App::$strings["Miscellaneous"] = "Varios";
-App::$strings["Import profile from file"] = "Importar perfil desde un fichero";
-App::$strings["Export profile to file"] = "Exportar perfil a un fichero";
-App::$strings["Your gender"] = "Género";
-App::$strings["Marital status"] = "Estado civil";
-App::$strings["Sexual preference"] = "Preferencia sexual";
-App::$strings["Profile name"] = "Nombre del perfil";
-App::$strings["This is your default profile."] = "Este es su perfil principal.";
-App::$strings["Your full name"] = "Nombre completo";
-App::$strings["Title/Description"] = "Título o descripción";
-App::$strings["Street address"] = "Dirección";
-App::$strings["Locality/City"] = "Ciudad";
-App::$strings["Region/State"] = "Región o Estado";
-App::$strings["Postal/Zip code"] = "Código postal";
-App::$strings["Country"] = "País";
-App::$strings["Who (if applicable)"] = "Quién (si es pertinente)";
-App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Por ejemplo: ana123, María González, sara@ejemplo.com";
-App::$strings["Since (date)"] = "Desde (fecha)";
-App::$strings["Tell us about yourself"] = "Háblenos de usted";
-App::$strings["Hometown"] = "Lugar de nacimiento";
-App::$strings["Political views"] = "Ideas políticas";
-App::$strings["Religious views"] = "Creencias religiosas";
-App::$strings["Keywords used in directory listings"] = "Palabras clave utilizadas en los listados de directorios";
-App::$strings["Example: fishing photography software"] = "Por ejemplo: software de fotografía submarina";
-App::$strings["Musical interests"] = "Preferencias musicales";
-App::$strings["Books, literature"] = "Libros, literatura";
-App::$strings["Television"] = "Televisión";
-App::$strings["Film/Dance/Culture/Entertainment"] = "Cine, danza, cultura, entretenimiento";
-App::$strings["Hobbies/Interests"] = "Aficiones o intereses";
-App::$strings["Love/Romance"] = "Vida sentimental o amorosa";
-App::$strings["School/Education"] = "Estudios";
-App::$strings["Contact information and social networks"] = "Información de contacto y redes sociales";
-App::$strings["My other channels"] = "Mis otros canales";
-App::$strings["Profile Image"] = "Imagen del perfil";
-App::$strings["Edit Profiles"] = "Editar perfiles";
-App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente.";
-App::$strings["Upload Profile Photo"] = "Subir foto de perfil";
-App::$strings["Invalid profile identifier."] = "Identificador del perfil no válido";
-App::$strings["Profile Visibility Editor"] = "Editor de visibilidad del perfil";
-App::$strings["Profile"] = "Perfil";
-App::$strings["Click on a contact to add or remove."] = "Pulsar en un contacto para añadirlo o eliminarlo.";
-App::$strings["Visible To"] = "Visible para";
-App::$strings["Public Hubs"] = "Servidores públicos";
-App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Los sitios listados permiten el registro público en la red \$Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los mismos hubs <strong>pueden</strong> proporcionar detalles adicionales.";
-App::$strings["Hub URL"] = "Dirección del hub";
-App::$strings["Access Type"] = "Tipo de acceso";
-App::$strings["Registration Policy"] = "Normas de registro";
-App::$strings["Stats"] = "Estadísticas";
-App::$strings["Software"] = "Software";
-App::$strings["Ratings"] = "Valoraciones";
-App::$strings["Rate"] = "Valorar";
-App::$strings["Website:"] = "Sitio web:";
-App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Canal remoto [%s] (aún no es conocido en este sitio)";
-App::$strings["Rating (this information is public)"] = "Valoración (esta información es pública)";
-App::$strings["Optionally explain your rating (this information is public)"] = "Opcionalmente puede explicar su valoración (esta información es pública)";
-App::$strings["No ratings"] = "Ninguna valoración";
-App::$strings["Rating: "] = "Valoración:";
-App::$strings["Website: "] = "Sitio web:";
-App::$strings["Description: "] = "Descripción:";
+App::$strings["Remote privacy information not available."] = "La información privada remota no está disponible.";
+App::$strings["Visible to:"] = "Visible para:";
+App::$strings["Import completed"] = "Importación completada";
+App::$strings["Import Items"] = "Importar elementos";
+App::$strings["Use this form to import existing posts and content from an export file."] = "Utilice este formulario para importar entradas existentes y contenido desde un archivo de exportación.";
+App::$strings["Total invitation limit exceeded."] = "Se ha superado el límite máximo de invitaciones.";
+App::$strings["%s : Not a valid email address."] = "%s : No es una dirección de correo electrónico válida. ";
+App::$strings["Please join us on \$Projectname"] = "Únase a nosotros en \$Projectname";
+App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Excedido el límite de invitaciones. Por favor, contacte con el Administrador de su sitio.";
+App::$strings["%s : Message delivery failed."] = "%s : Falló el envío del mensaje.";
+App::$strings["%d message sent."] = array(
+	0 => "%d mensajes enviados.",
+	1 => "%d mensajes enviados.",
+);
+App::$strings["You have no more invitations available"] = "No tiene más invitaciones disponibles";
+App::$strings["Send invitations"] = "Enviar invitaciones";
+App::$strings["Enter email addresses, one per line:"] = "Introduzca las direcciones de correo electrónico, una por línea:";
+App::$strings["Your message:"] = "Su mensaje:";
+App::$strings["Please join my community on \$Projectname."] = "Por favor, únase a mi comunidad en \$Projectname.";
+App::$strings["You will need to supply this invitation code:"] = "Tendrá que suministrar este código de invitación:";
+App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Regístrese en cualquier sitio de \$Projectname (están todos interconectados)";
+App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Introduzca mi dirección \$Projectname en la caja de búsqueda del sitio.";
+App::$strings["or visit"] = "o visitar";
+App::$strings["3. Click [Connect]"] = "3. Pulse [conectar]";
+App::$strings["Location not found."] = "Dirección no encontrada.";
+App::$strings["Location lookup failed."] = "Ha fallado la búsqueda de la dirección.";
+App::$strings["Please select another location to become primary before removing the primary location."] = "Por favor, seleccione una copia de su canal (un clon) para convertirlo en primario antes de eliminar su canal principal.";
+App::$strings["Syncing locations"] = "Sincronización de ubicaciones";
+App::$strings["No locations found."] = "No encontrada ninguna dirección.";
+App::$strings["Manage Channel Locations"] = "Gestionar las direcciones del canal";
+App::$strings["Primary"] = "Primario";
+App::$strings["Drop"] = "Eliminar";
+App::$strings["Sync Now"] = "Sincronizar ahora";
+App::$strings["Please wait several minutes between consecutive operations."] = "Por favor, espere algunos minutos entre operaciones consecutivas.";
+App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Cuando sea posible, elimine una ubicación iniciando sesión en el sitio web o \"hub\" y borrando su canal.";
+App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Utilice este formulario para eliminar la dirección si el \"hub\" no está funcionando desde hace tiempo.";
+App::$strings["Hub not found."] = "Servidor no encontrado";
+App::$strings["Unable to lookup recipient."] = "Imposible asociar a un destinatario.";
+App::$strings["Unable to communicate with requested channel."] = "Imposible comunicar con el canal solicitado.";
+App::$strings["Cannot verify requested channel."] = "No se puede verificar el canal solicitado.";
+App::$strings["Selected channel has private message restrictions. Send failed."] = "El canal seleccionado tiene restricciones sobre los mensajes privados. El envío falló.";
+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";
+App::$strings["Message has been recalled."] = "El mensaje ha sido revocado.";
+App::$strings["Delete Conversation"] = "Eliminar conversación";
+App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Comunicación segura no disponible. Pero <strong>puede</strong> responder desde la página del perfil del remitente.";
+App::$strings["Send Reply"] = "Responder";
+App::$strings["Your message for %s (%s):"] = "Su mensaje para %s (%s):";
+App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Ha creado %1$.0f de %2$.0f canales permitidos.";
+App::$strings["Create a new channel"] = "Crear un nuevo canal";
+App::$strings["Channel Manager"] = "Administración de canales";
+App::$strings["Current Channel"] = "Canal actual";
+App::$strings["Switch to one of your channels by selecting it."] = "Cambiar a uno de sus canales seleccionándolo.";
+App::$strings["Default Channel"] = "Canal principal";
+App::$strings["Make Default"] = "Convertir en predeterminado";
+App::$strings["%d new messages"] = "%d mensajes nuevos";
+App::$strings["%d new introductions"] = "%d nuevas isolicitudes de conexión";
+App::$strings["Delegated Channel"] = "Canal delegado";
+App::$strings["Unable to update menu."] = "No se puede actualizar el menú.";
+App::$strings["Unable to create menu."] = "No se puede crear el menú.";
+App::$strings["Menu Name"] = "Nombre del menú";
+App::$strings["Unique name (not visible on webpage) - required"] = "Nombre único (no será visible en la página web) - requerido";
+App::$strings["Menu Title"] = "Título del menú";
+App::$strings["Visible on webpage - leave empty for no title"] = "Visible en la página web - no ponga nada si no desea un título";
+App::$strings["Allow Bookmarks"] = "Permitir marcadores";
+App::$strings["Menu may be used to store saved bookmarks"] = "El menú se puede usar para guardar marcadores";
+App::$strings["Submit and proceed"] = "Enviar y proceder";
+App::$strings["Menus"] = "Menús";
+App::$strings["Bookmarks allowed"] = "Marcadores permitidos";
+App::$strings["Delete this menu"] = "Borrar este menú";
+App::$strings["Edit menu contents"] = "Editar los contenidos del menú";
+App::$strings["Edit this menu"] = "Modificar este menú";
+App::$strings["Menu could not be deleted."] = "El menú no puede ser eliminado.";
+App::$strings["Menu not found."] = "Menú no encontrado";
+App::$strings["Edit Menu"] = "Modificar el menú";
+App::$strings["Add or remove entries to this menu"] = "Añadir o quitar entradas en este menú";
+App::$strings["Menu name"] = "Nombre del menú";
+App::$strings["Must be unique, only seen by you"] = "Debe ser único, solo será visible para usted";
+App::$strings["Menu title"] = "Título del menú";
+App::$strings["Menu title as seen by others"] = "El título del menú tal como será visto por los demás";
+App::$strings["Allow bookmarks"] = "Permitir marcadores";
+App::$strings["Not found."] = "No encontrado.";
+App::$strings["No valid account found."] = "No se ha encontrado una cuenta válida.";
+App::$strings["Password reset request issued. Check your email."] = "Se ha recibido una solicitud de restablecimiento de contraseña. Consulte su correo electrónico.";
+App::$strings["Site Member (%s)"] = "Usuario del sitio (%s)";
+App::$strings["Password reset requested at %s"] = "Se ha solicitado restablecer la contraseña en %s";
+App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La solicitud no ha podido ser verificada. (Puede que la haya enviado con anterioridad) El restablecimiento de la contraseña ha fallado.";
+App::$strings["Password Reset"] = "Restablecer la contraseña";
+App::$strings["Your password has been reset as requested."] = "Su contraseña ha sido restablecida según lo solicitó.";
+App::$strings["Your new password is"] = "Su nueva contraseña es";
+App::$strings["Save or copy your new password - and then"] = "Guarde o copie su nueva contraseña - y después";
+App::$strings["click here to login"] = "pulse aquí para conectarse";
+App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puede cambiar la contraseña en la página <em>Ajustes</em> una vez iniciada la sesión.";
+App::$strings["Your password has changed at %s"] = "Su contraseña en %s ha sido cambiada";
+App::$strings["Forgot your Password?"] = "¿Ha olvidado su contraseña?";
+App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Introduzca y envíe su dirección de correo electrónico para el restablecimiento de su contraseña. Luego revise su correo para obtener más instrucciones.";
+App::$strings["Email Address"] = "Dirección de correo electrónico";
+App::$strings["Reset"] = "Reiniciar";
+App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s está %2\$s";
+App::$strings["Mood"] = "Estado de ánimo";
+App::$strings["Set your current mood and tell your friends"] = "Describir su estado de ánimo para comunicárselo a sus amigos";
+App::$strings["No such group"] = "No se encuentra el grupo";
+App::$strings["No such channel"] = "No se encuentra el  canal";
+App::$strings["forum"] = "foro";
+App::$strings["Search Results For:"] = "Buscar resultados para:";
+App::$strings["Privacy group is empty"] = "El grupo de canales está vacío";
+App::$strings["Privacy group: "] = "Grupo de canales: ";
+App::$strings["Invalid connection."] = "Conexión no válida.";
+App::$strings["No more system notifications."] = "No hay más notificaciones del sistema";
+App::$strings["System Notifications"] = "Notificaciones del sistema";
+App::$strings["Profile Match"] = "Perfil compatible";
+App::$strings["No keywords to match. Please add keywords to your default profile."] = "No hay palabras clave en el perfil principal para poder encontrar perfiles compatibles. Por favor, añada palabras clave a su perfil principal.";
+App::$strings["is interested in:"] = "está interesado en:";
+App::$strings["No matches"] = "No se han encontrado perfiles compatibles";
+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["Unable to create element."] = "Imposible crear el elemento.";
+App::$strings["Unable to update menu element."] = "No es posible actualizar el elemento del menú.";
+App::$strings["Unable to add menu element."] = "No es posible añadir el elemento al menú";
+App::$strings["Menu Item Permissions"] = "Permisos del elemento del menú";
+App::$strings["(click to open/close)"] = "(pulsar para abrir o cerrar)";
+App::$strings["Link Name"] = "Nombre del enlace";
+App::$strings["Link or Submenu Target"] = "Destino del enlace o submenú";
+App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Introducir la dirección del enlace o seleccionar el nombre de un submenú";
+App::$strings["Use magic-auth if available"] = "Usar la autenticación mágica si está disponible";
+App::$strings["Open link in new window"] = "Abrir el enlace en una nueva ventana";
+App::$strings["Order in list"] = "Orden en la lista";
+App::$strings["Higher numbers will sink to bottom of listing"] = "Los números más altos irán al final de la lista";
+App::$strings["Submit and finish"] = "Enviar y terminar";
+App::$strings["Submit and continue"] = "Enviar y continuar";
+App::$strings["Menu:"] = "Menú:";
+App::$strings["Link Target"] = "Destino del enlace";
+App::$strings["Edit menu"] = "Editar menú";
+App::$strings["Edit element"] = "Editar el elemento";
+App::$strings["Drop element"] = "Eliminar el elemento";
+App::$strings["New element"] = "Nuevo elemento";
+App::$strings["Edit this menu container"] = "Modificar el contenedor del menú";
+App::$strings["Add menu element"] = "Añadir un elemento al menú";
+App::$strings["Delete this menu item"] = "Eliminar este elemento del menú";
+App::$strings["Edit this menu item"] = "Modificar este elemento del menú";
+App::$strings["Menu item not found."] = "Este elemento del menú no se ha encontrado";
+App::$strings["Menu item deleted."] = "Este elemento del menú ha sido borrado";
+App::$strings["Menu item could not be deleted."] = "Este elemento del menú no puede ser borrado.";
+App::$strings["Edit Menu Element"] = "Editar elemento del menú";
+App::$strings["Link text"] = "Texto del enlace";
 App::$strings["Theme settings updated."] = "Ajustes del tema actualizados.";
 App::$strings["# Accounts"] = "# Cuentas";
 App::$strings["# blocked accounts"] = "# cuentas bloqueadas";
@@ -1031,19 +1011,91 @@ App::$strings["(In addition to basic fields)"] = "(Además de los campos básico
 App::$strings["All available fields"] = "Todos los campos disponibles";
 App::$strings["Custom Fields"] = "Campos personalizados";
 App::$strings["Create Custom Field"] = "Crear un campo personalizado";
-App::$strings["App installed."] = "Aplicación instalada.";
-App::$strings["Malformed app."] = "Aplicación con errores";
-App::$strings["Embed code"] = "Código incorporado";
-App::$strings["Edit App"] = "Modificar la aplicación";
-App::$strings["Create App"] = "Crear una aplicación";
-App::$strings["Name of app"] = "Nombre de la aplicación";
-App::$strings["Location (URL) of app"] = "Dirección (URL) de la aplicació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["Name or caption"] = "Nombre o descripción";
+App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Ejemplos: \"Juan García\", \"Luisa y sus caballos\", \"Fútbol\", \"Grupo de aviación\"";
+App::$strings["Choose a short nickname"] = "Elija un alias corto";
+App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Su alias se usará para crear una dirección de canal fácil de recordar, p. ej.: alias%s";
+App::$strings["Channel role and privacy"] = "Clase de canal y privacidad";
+App::$strings["Select a channel role with your privacy requirements."] = "Seleccione un tipo de canal con sus requisitos de privacidad";
+App::$strings["Read more about roles"] = "Leer más sobre los roles";
+App::$strings["Create Channel"] = "Crear un canal";
+App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canal es su identidad en esta red. Puede representar a una persona, un blog o un foro, por nombrar unos pocos ejemplos. Los canales se pueden conectar con otros canales para compartir información con una gama de permisos extremadamente detallada.";
+App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "O <a href=\"import\">importar un canal existente</a> desde otro lugar.";
+App::$strings["sent you a private message"] = "le ha enviado un mensaje privado";
+App::$strings["added your channel"] = "añadió este canal a sus conexiones";
+App::$strings["g A l F d"] = "g A l d F";
+App::$strings["[today]"] = "[hoy]";
+App::$strings["posted an event"] = "publicó un evento";
+App::$strings["Invalid request identifier."] = "Petición inválida del identificador.";
+App::$strings["Discard"] = "Descartar";
+App::$strings["Mark all system notifications seen"] = "Marcar todas las notificaciones de sistema como leídas";
+App::$strings["Poke"] = "Toques y otras cosas";
+App::$strings["Poke somebody"] = "Dar un toque a alguien";
+App::$strings["Poke/Prod"] = "Toque/Incitación";
+App::$strings["Poke, prod or do other things to somebody"] = "Dar un toque, incitar o hacer otras cosas a alguien";
+App::$strings["Recipient"] = "Destinatario";
+App::$strings["Choose what you wish to do to recipient"] = "Elegir qué desea enviar al destinatario";
+App::$strings["Make this post private"] = "Convertir en privado este envío";
+App::$strings["Unable to find your hub."] = "No se puede encontrar su servidor.";
+App::$strings["Post successful."] = "Enviado con éxito.";
+App::$strings["OpenID protocol error. No ID returned."] = "Error del protocolo OpenID. Ningún ID recibido como respuesta.";
+App::$strings["Login failed."] = "El acceso ha fallado.";
+App::$strings["Invalid profile identifier."] = "Identificador del perfil no válido";
+App::$strings["Profile Visibility Editor"] = "Editor de visibilidad del perfil";
+App::$strings["Profile"] = "Perfil";
+App::$strings["Click on a contact to add or remove."] = "Pulsar en un contacto para añadirlo o eliminarlo.";
+App::$strings["Visible To"] = "Visible para";
+App::$strings["This setting requires special processing and editing has been blocked."] = "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada.";
+App::$strings["Configuration Editor"] = "Editor de configuración";
+App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Atención: El cambio de algunos ajustes puede volver inutilizable su canal. Por favor, abandone la página excepto que esté seguro y sepa cómo usar correctamente esta característica.";
+App::$strings["Fetching URL returns error: %1\$s"] = "Al intentar obtener la dirección, retorna el error: %1\$s";
+App::$strings["Version %s"] = "Versión %s";
+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:";
+App::$strings["Current load average: "] = "Carga media actual:";
+App::$strings["Running at web location"] = "Corriendo en el sitio web";
+App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para más información sobre \$Projectname.";
+App::$strings["Bug reports and issues: please visit"] = "Informes de errores e incidencias: por favor visite";
+App::$strings["\$projectname issues"] = "Problemas en \$projectname";
+App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com";
+App::$strings["Site Administrators"] = "Administradores del sitio";
+App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Encontramos un problema durante el inicio de sesión con la OpenID que proporcionó. Por favor, compruebe que la ID está correctamente escrita.";
+App::$strings["The error message was:"] = "El mensaje de error fue:";
+App::$strings["Authentication failed."] = "Falló la autenticación.";
+App::$strings["Remote Authentication"] = "Acceso desde su servidor";
+App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)";
+App::$strings["Authenticate"] = "Acceder";
+App::$strings["Public Hubs"] = "Servidores públicos";
+App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Los sitios listados permiten el registro público en la red \$Projectname. Todos los sitios de la red están vinculados entre sí, por lo que sus miembros, en ninguno de ellos, indican la pertenencia a la red en su conjunto. Algunos sitios pueden requerir suscripción o proporcionar planes de servicio por niveles. Los mismos hubs <strong>pueden</strong> proporcionar detalles adicionales.";
+App::$strings["Hub URL"] = "Dirección del hub";
+App::$strings["Access Type"] = "Tipo de acceso";
+App::$strings["Registration Policy"] = "Normas de registro";
+App::$strings["Stats"] = "Estadísticas";
+App::$strings["Software"] = "Software";
+App::$strings["Ratings"] = "Valoraciones";
+App::$strings["Rate"] = "Valorar";
+App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Recargue la página o limpie el caché del navegador si la nueva foto no se muestra inmediatamente.";
+App::$strings["Upload Profile Photo"] = "Subir foto de perfil";
+App::$strings["Block Name"] = "Nombre del bloque";
+App::$strings["Blocks"] = "Bloques";
+App::$strings["Block Title"] = "Título del bloque";
+App::$strings["Website:"] = "Sitio web:";
+App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Canal remoto [%s] (aún no es conocido en este sitio)";
+App::$strings["Rating (this information is public)"] = "Valoración (esta información es pública)";
+App::$strings["Optionally explain your rating (this information is public)"] = "Opcionalmente puede explicar su valoración (esta información es pública)";
+App::$strings["No ratings"] = "Ninguna valoración";
+App::$strings["Rating: "] = "Valoración:";
+App::$strings["Website: "] = "Sitio web:";
+App::$strings["Description: "] = "Descripción:";
+App::$strings["Apps"] = "Aplicaciones (apps)";
+App::$strings["Title (optional)"] = "Título (opcional)";
+App::$strings["Edit Block"] = "Modificar este bloque";
+App::$strings["No channel."] = "Ningún canal.";
+App::$strings["Common connections"] = "Conexiones comunes";
+App::$strings["No connections in common."] = "Ninguna  conexión en común.";
 App::$strings["Select a bookmark folder"] = "Seleccionar una carpeta de marcadores";
 App::$strings["Save Bookmark"] = "Guardar marcador";
 App::$strings["URL of bookmark"] = "Dirección del marcador";
@@ -1069,7 +1121,7 @@ App::$strings["no"] = "no";
 App::$strings["yes"] = "sí";
 App::$strings["Membership on this site is by invitation only."] = "Para registrarse en este sitio es necesaria una invitación.";
 App::$strings["Register"] = "Registrarse";
-App::$strings["Proceed to create your first channel"] = "Crear su primer canal";
+App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "";
 App::$strings["Please login."] = "Por favor, inicie sesión.";
 App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "La eliminación de cuentas no está permitida hasta después de que hayan transcurrido 48 horas desde el último cambio de contraseña.";
 App::$strings["Remove This Account"] = "Eliminar esta cuenta";
@@ -1086,17 +1138,23 @@ App::$strings["This channel will be completely removed from the network. "] = "E
 App::$strings["Remove this channel and all its clones from the network"] = "Eliminar este canal y todos sus clones de la red";
 App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red";
 App::$strings["Remove Channel"] = "Eliminar el canal";
-App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Encontramos un problema durante el inicio de sesión con la OpenID que proporcionó. Por favor, compruebe que la ID está correctamente escrita.";
-App::$strings["The error message was:"] = "El mensaje de error fue:";
-App::$strings["Authentication failed."] = "Falló la autenticación.";
-App::$strings["Remote Authentication"] = "Acceso desde su servidor";
-App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Introduzca la dirección del canal (p.ej. canal@ejemplo.com)";
-App::$strings["Authenticate"] = "Acceder";
+App::$strings["Export Channel"] = "Exportar el canal";
+App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido.";
+App::$strings["Export Content"] = "Exportar contenidos";
+App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportar la información sobre su canal y el contenido reciente a un fichero de respaldo JSON, que puede ser restaurado o importado a otro servidor. Este fichero incluye todas sus conexiones, permisos, datos del perfil y publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea paciente, la descarga puede tardar varios minutos en comenzar.";
+App::$strings["Export your posts from a given year."] = "Exporta sus publicaciones de un año dado.";
+App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "También puede exportar sus mensajes y conversaciones durante un año o mes en particular. Ajuste la fecha en la barra de direcciones del navegador para seleccionar otras fechas. Si la exportación falla (posiblemente debido al agotamiento de la memoria del servidor hub), por favor, intente de nuevo la selección de un rango de fechas más pequeño.";
+App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un año determinado, como este año, visite <a href=\"%1\$s\">%2\$s</a>";
+App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite <a href=\"%1\$s\">%2\$s</a>";
+App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1\$s\">%2\$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero).";
 App::$strings["Items tagged with: %s"] = "elementos etiquetados con: %s";
 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["This channel is limited to %d tokens"] = "";
+App::$strings["Name and Password are required."] = "";
+App::$strings["Token saved."] = "";
 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.";
@@ -1129,6 +1187,12 @@ App::$strings["Confirm New Password"] = "Confirmar la nueva contraseña";
 App::$strings["Leave password fields blank unless changing"] = "Dejar en blanco la contraseña a menos que desee cambiarla.";
 App::$strings["Email Address:"] = "Dirección de correo electrónico:";
 App::$strings["Remove this account including all its channels"] = "Eliminar esta cuenta incluyendo todos sus canales";
+App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content."] = "";
+App::$strings["You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "";
+App::$strings["Guest Access Tokens"] = "";
+App::$strings["Login Name"] = "";
+App::$strings["Login Password"] = "";
+App::$strings["Expires (yyyy-mm-dd)"] = "";
 App::$strings["Additional Features"] = "Funcionalidades";
 App::$strings["Connector Settings"] = "Configuración del conector";
 App::$strings["No special theme for mobile devices"] = "Sin tema especial para dispositivos móviles";
@@ -1291,7 +1355,6 @@ App::$strings["GD graphics PHP module"] = "módulo PHP GD graphics";
 App::$strings["OpenSSL PHP module"] = "módulo PHP OpenSSL";
 App::$strings["mysqli or postgres PHP module"] = "módulo PHP mysqli o postgres";
 App::$strings["mb_string PHP module"] = "módulo PHP mb_string";
-App::$strings["mcrypt PHP module"] = "módulo PHP mcrypt ";
 App::$strings["xml PHP module"] = "módulo PHP xml";
 App::$strings["Apache mod_rewrite module"] = "módulo Apache mod_rewrite ";
 App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: se necesita el módulo del servidor web Apache mod-rewrite pero no está instalado.";
@@ -1302,7 +1365,6 @@ App::$strings["Error: GD graphics PHP module with JPEG support required but not
 App::$strings["Error: openssl PHP module required but not installed."] = "Error: el módulo PHP openssl es necesario, pero no está instalado.";
 App::$strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Error: el módulo PHP mysqli o postgres es necesario pero ninguno de los dos está instalado.";
 App::$strings["Error: mb_string PHP module required but not installed."] = "Error: el módulo PHP mb_string es necesario, pero no está instalado.";
-App::$strings["Error: mcrypt PHP module required but not installed."] = "Error: el módulo PHP mcrypt es necesario, pero no está instalado.";
 App::$strings["Error: xml PHP module required for DAV but not installed."] = "Error: el módulo PHP xml es necesario para DAV, pero no está instalado.";
 App::$strings["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."] = "El instalador web no ha podido crear un fichero llamado “.htconfig.php” en la carpeta base de su servidor.";
 App::$strings["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."] = "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.";
@@ -1314,7 +1376,7 @@ App::$strings["In order to store these compiled templates, the web server needs
 App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Por favor, asegúrese de que el servidor web está siendo ejecutado por un usuario que tenga permisos de escritura sobre esta carpeta (por ejemplo, www-data).";
 App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Nota: como medida de seguridad, debe dar al servidor web permisos de escritura solo sobre %s - no sobre el fichero de plantilla (.tpl) que contiene.";
 App::$strings["%s is writable"] = "%s tiene permisos de escritura";
-App::$strings["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"] = "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.";
+App::$strings["This software 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"] = "";
 App::$strings["store is writable"] = "\"store\" tiene permisos de escritura";
 App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "El certificado SSL no ha podido ser validado. Corrija este problema o desactive el acceso https a este sitio.";
 App::$strings["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!"] = "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.";
@@ -1322,6 +1384,7 @@ App::$strings["This restriction is incorporated because public posts from you ma
 App::$strings["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."] = "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.";
 App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Por razones de compatibilidad (sobre el conjunto de la red, no solo sobre su propio sitio), debemos insistir en estos requisitos.";
 App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Existen varias Autoridades de Certificación que le pueden proporcionar certificados válidos.";
+App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "";
 App::$strings["SSL certificate validation"] = "validación del certificado SSL";
 App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "No se pueden reescribir las direcciones web en .htaccess. Compruebe la configuración de su servidor:";
 App::$strings["Url rewrite is working"] = "La reescritura de las direcciones funciona correctamente";
@@ -1333,19 +1396,20 @@ App::$strings["Files: shared with me"] = "Ficheros: compartidos conmigo";
 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 (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:";
-App::$strings["Current load average: "] = "Carga media actual:";
-App::$strings["Running at web location"] = "Corriendo en el sitio web";
-App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Por favor, visite <a href=\"http://hubzilla.org\">hubzilla.org</a> para más información sobre \$Projectname.";
-App::$strings["Bug reports and issues: please visit"] = "Informes de errores e incidencias: por favor visite";
-App::$strings["\$projectname issues"] = "Problemas en \$projectname";
-App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com";
-App::$strings["Site Administrators"] = "Administradores del sitio";
+App::$strings["Thing updated"] = "Elemento actualizado.";
+App::$strings["Object store: failed"] = "Guardar objeto: ha fallado";
+App::$strings["Thing added"] = "Elemento añadido";
+App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+App::$strings["Show Thing"] = "Mostrar elemento";
+App::$strings["item not found."] = "elemento no encontrado.";
+App::$strings["Edit Thing"] = "Editar elemento";
+App::$strings["Select a profile"] = "Seleccionar un perfil";
+App::$strings["Post an activity"] = "Publicar una actividad";
+App::$strings["Only sends to viewers of the applicable profile"] = "Sólo enviar a espectadores del perfil pertinente.";
+App::$strings["Name of thing e.g. something"] = "Nombre del elemento, p. ej.:. \"algo\"";
+App::$strings["URL of thing (optional)"] = "Dirección del elemento (opcional)";
+App::$strings["URL for photo of thing (optional)"] = "Dirección para la foto o elemento (opcional)";
+App::$strings["Add Thing to your Profile"] = "Añadir alguna cosa a su perfil";
 App::$strings["Failed to create source. No channel selected."] = "Imposible crear el origen de los contenidos. Ningún canal ha sido seleccionado.";
 App::$strings["Source created."] = "Fuente creada.";
 App::$strings["Source updated."] = "Fuente actualizada.";
@@ -1373,60 +1437,38 @@ App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado %3
 App::$strings["Tag removed"] = "Etiqueta eliminada.";
 App::$strings["Remove Item Tag"] = "Eliminar etiqueta del elemento.";
 App::$strings["Select a tag to remove: "] = "Seleccionar una etiqueta para eliminar:";
-App::$strings["Thing updated"] = "Elemento actualizado.";
-App::$strings["Object store: failed"] = "Guardar objeto: ha fallado";
-App::$strings["Thing added"] = "Elemento añadido";
-App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-App::$strings["Show Thing"] = "Mostrar elemento";
-App::$strings["item not found."] = "elemento no encontrado.";
-App::$strings["Edit Thing"] = "Editar elemento";
-App::$strings["Select a profile"] = "Seleccionar un perfil";
-App::$strings["Post an activity"] = "Publicar una actividad";
-App::$strings["Only sends to viewers of the applicable profile"] = "Sólo enviar a espectadores del perfil pertinente.";
-App::$strings["Name of thing e.g. something"] = "Nombre del elemento, p. ej.:. \"algo\"";
-App::$strings["URL of thing (optional)"] = "Dirección del elemento (opcional)";
-App::$strings["URL for photo of thing (optional)"] = "Dirección para la foto o elemento (opcional)";
-App::$strings["Add Thing to your Profile"] = "Añadir alguna cosa a su perfil";
-App::$strings["Export Channel"] = "Exportar el canal";
-App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportar la información básica del canal a un fichero. Este equivale a una copia de seguridad de sus conexiones, el perfil y datos fundamentales, que puede usarse para importar sus datos a un nuevo servidor, pero no incluye su contenido.";
-App::$strings["Export Content"] = "Exportar contenidos";
-App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportar la información sobre su canal y el contenido reciente a un fichero de respaldo JSON, que puede ser restaurado o importado a otro servidor. Este fichero incluye todas sus conexiones, permisos, datos del perfil y publicaciones de varios meses. Puede llegar a ser MUY grande. Por favor, sea paciente, la descarga puede tardar varios minutos en comenzar.";
-App::$strings["Export your posts from a given year."] = "Exporta sus publicaciones de un año dado.";
-App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "También puede exportar sus mensajes y conversaciones durante un año o mes en particular. Ajuste la fecha en la barra de direcciones del navegador para seleccionar otras fechas. Si la exportación falla (posiblemente debido al agotamiento de la memoria del servidor hub), por favor, intente de nuevo la selección de un rango de fechas más pequeño.";
-App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un año determinado, como este año, visite <a href=\"%1\$s\">%2\$s</a>";
-App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Para seleccionar todos los mensajes de un mes determinado, como el de enero de este año, visite <a href=\"%1\$s\">%2\$s</a>";
-App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Estos ficheros pueden ser importados o restaurados visitando <a href=\"%1\$s\">%2\$s</a> o cualquier sitio que contenga su canal. Para obtener los mejores resultados, por favor, importar o restaurar estos ficheros en orden de fecha (la más antigua primero).";
-App::$strings["No connections."] = "Sin conexiones.";
-App::$strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]";
-App::$strings["View Connections"] = "Ver conexiones";
-App::$strings["Source of Item"] = "Origen del elemento";
 App::$strings["Webpages"] = "Páginas web";
 App::$strings["Actions"] = "Acciones";
 App::$strings["Page Link"] = "Vínculo de la página";
 App::$strings["Page Title"] = "Título de página";
+App::$strings["Not found"] = "";
+App::$strings["Wiki"] = "Wiki";
+App::$strings["Sandbox"] = "Entorno de edición";
+App::$strings["\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be saved*.\""] = "";
+App::$strings["Revision Comparison"] = "Comparación de revisiones";
+App::$strings["Revert"] = "Revertir";
+App::$strings["Enter the name of your new wiki:"] = "Nombre de su nuevo wiki:";
+App::$strings["Enter the name of the new page:"] = "Nombre de la nueva página:";
+App::$strings["Enter the new name:"] = "Nuevo nombre:";
+App::$strings["Embed image from photo albums"] = "Incluir una imagen de los álbumes de fotos";
+App::$strings["Embed an image from your albums"] = "Incluir una imagen de sus álbumes";
+App::$strings["OK"] = "OK";
+App::$strings["Choose images to embed"] = "Elegir imágenes para incluir";
+App::$strings["Choose an album"] = "Elegir un álbum";
+App::$strings["Choose a different album..."] = "Elegir un álbum diferente...";
+App::$strings["Error getting album list"] = "Error al obtener la lista de álbumes";
+App::$strings["Error getting photo link"] = "Error al obtener el enlace de la foto";
+App::$strings["Error getting album"] = "Error al obtener el álbum";
+App::$strings["No connections."] = "Sin conexiones.";
+App::$strings["Visit %s's profile [%s]"] = "Visitar el perfil de %s [%s]";
+App::$strings["View Connections"] = "Ver conexiones";
+App::$strings["Source of Item"] = "Origen del elemento";
+App::$strings["Authorize application connection"] = "Autorizar una conexión de aplicación";
+App::$strings["Return to your app and insert this Securty Code:"] = "Volver a su aplicación e introducir este código de seguridad:";
+App::$strings["Please login to continue."] = "Por favor inicie sesión para continuar.";
+App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "¿Desea autorizar a esta aplicación a acceder a sus publicaciones y contactos, y/o crear nuevas publicaciones por usted?";
 App::$strings["Xchan Lookup"] = "Búsqueda de canales";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Buscar un canal (o un \"webbie\") que comience por:";
-App::$strings["Site Admin"] = "Administrador del sitio";
-App::$strings["Bug Report"] = "Informe de errores";
-App::$strings["View Bookmarks"] = "Ver los marcadores";
-App::$strings["My Chatrooms"] = "Mis salas de chat";
-App::$strings["Firefox Share"] = "Servicio de compartición de Firefox";
-App::$strings["Remote Diagnostics"] = "Diagnóstico remoto";
-App::$strings["Suggest Channels"] = "Sugerir canales";
-App::$strings["Login"] = "Iniciar sesión";
-App::$strings["Grid"] = "Red";
-App::$strings["Channel Home"] = "Mi canal";
-App::$strings["Events"] = "Eventos";
-App::$strings["Directory"] = "Directorio";
-App::$strings["Mail"] = "Correo";
-App::$strings["Chat"] = "Chat";
-App::$strings["Probe"] = "Probar";
-App::$strings["Suggest"] = "Sugerir";
-App::$strings["Random Channel"] = "Canal aleatorio";
-App::$strings["Invite"] = "Invitar";
-App::$strings["Features"] = "Funcionalidades";
-App::$strings["Post"] = "Publicación";
-App::$strings["Purchase"] = "Comprar";
 App::$strings["Missing room name"] = "Sala de chat sin nombre";
 App::$strings["Duplicate room name"] = "Nombre de sala duplicado.";
 App::$strings["Invalid room specifier."] = "Especificador de sala no válido.";
@@ -1474,6 +1516,27 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Por fav
 App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Aviso]";
 App::$strings["created a new post"] = "ha creado una nueva entrada";
 App::$strings["commented on %s's post"] = "ha comentado la entrada de %s";
+App::$strings["Site Admin"] = "Administrador del sitio";
+App::$strings["Bug Report"] = "Informe de errores";
+App::$strings["View Bookmarks"] = "Ver los marcadores";
+App::$strings["My Chatrooms"] = "Mis salas de chat";
+App::$strings["Firefox Share"] = "Servicio de compartición de Firefox";
+App::$strings["Remote Diagnostics"] = "Diagnóstico remoto";
+App::$strings["Suggest Channels"] = "Sugerir canales";
+App::$strings["Login"] = "Iniciar sesión";
+App::$strings["Grid"] = "Red";
+App::$strings["Channel Home"] = "Mi canal";
+App::$strings["Events"] = "Eventos";
+App::$strings["Directory"] = "Directorio";
+App::$strings["Mail"] = "Correo";
+App::$strings["Chat"] = "Chat";
+App::$strings["Probe"] = "Probar";
+App::$strings["Suggest"] = "Sugerir";
+App::$strings["Random Channel"] = "Canal aleatorio";
+App::$strings["Invite"] = "Invitar";
+App::$strings["Features"] = "Funcionalidades";
+App::$strings["Post"] = "Publicación";
+App::$strings["Purchase"] = "Comprar";
 App::$strings["Private Message"] = "Mensaje Privado";
 App::$strings["Select"] = "Seleccionar";
 App::$strings["Save to Folder"] = "Guardar en carpeta";
@@ -1510,7 +1573,7 @@ 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["%s show all"] = "";
 App::$strings["Bold"] = "Negrita";
 App::$strings["Italic"] = "Itálico ";
 App::$strings["Underline"] = "Subrayar";
@@ -1519,9 +1582,93 @@ App::$strings["Code"] = "Código";
 App::$strings["Image"] = "Imagen";
 App::$strings["Insert Link"] = "Insertar enlace";
 App::$strings["Video"] = "Vídeo";
+App::$strings["Visible to your default audience"] = "Visible para su público predeterminado.";
+App::$strings["Only me"] = "Sólo yo";
+App::$strings["Public"] = "Público";
+App::$strings["Anybody in the \$Projectname network"] = "Cualquiera en la red \$Projectname";
+App::$strings["Any account on %s"] = "Cualquier cuenta en %s";
+App::$strings["Any of my connections"] = "Cualquiera de mis conexiones";
+App::$strings["Only connections I specifically allow"] = "Sólo las conexiones que yo permita de forma explícita";
+App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Cualquiera que esté autenticado (podría incluir a los visitantes de otras redes)";
+App::$strings["Any connections including those who haven't yet been approved"] = "Cualquier conexión incluyendo aquellas que aún no han sido aprobadas";
+App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Esta es la configuración predeterminada para su flujo (stream) habitual de publicaciones.";
+App::$strings["This is your default setting for who can view your default channel profile"] = "Esta es su configuración por defecto para establecer quién puede ver su perfil del canal predeterminado";
+App::$strings["This is your default setting for who can view your connections"] = "Este es su ajuste predeterminado para establecer quién puede ver sus conexiones";
+App::$strings["This is your default setting for who can view your file storage and photos"] = "Este es su ajuste predeterminado para establecer quién puede ver su repositorio de ficheros y sus fotos";
+App::$strings["This is your default setting for the audience of your webpages"] = "Este es el ajuste predeterminado para establecer la audiencia de sus páginas web";
 App::$strings["No username found in import file."] = "No se ha encontrado el nombre de usuario en el fichero importado.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "No se ha podido crear una dirección de canal única. Ha fallado la importación.";
 App::$strings["Cannot locate DNS info for database server '%s'"] = "No se ha podido localizar información de DNS para el servidor de base de datos “%s”";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio";
+App::$strings["Image file is empty."] = "El fichero de imagen está vacío. ";
+App::$strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
+App::$strings["a new photo"] = "una nueva foto";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha publicado %2\$s en %3\$s";
+App::$strings["Photo Albums"] = "Álbumes de fotos";
+App::$strings["Upload New Photos"] = "Subir nuevas fotos";
+App::$strings["Logout"] = "Finalizar sesión";
+App::$strings["End this session"] = "Finalizar esta sesión";
+App::$strings["Home"] = "Inicio";
+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 Profile"] = "Editar el perfil";
+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["Bookmarks"] = "Marcadores";
+App::$strings["Your bookmarks"] = "Sus marcadores";
+App::$strings["Your webpages"] = "Sus páginas web";
+App::$strings["Your wiki"] = "";
+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["Inbox"] = "Bandeja de entrada";
+App::$strings["Outbox"] = "Bandeja de salida";
+App::$strings["New Message"] = "Nuevo mensaje";
+App::$strings["Event Calendar"] = "Calendario de eventos";
+App::$strings["See all events"] = "Ver todos los eventos";
+App::$strings["Mark all events seen"] = "Marcar todos los eventos como leidos";
+App::$strings["Manage Your Channels"] = "Gestionar sus canales";
+App::$strings["Account/Channel Settings"] = "Ajustes de cuenta/canales";
+App::$strings["Admin"] = "Administrador";
+App::$strings["Site Setup and Configuration"] = "Ajustes y configuración del sitio";
+App::$strings["Loading..."] = "Cargando...";
+App::$strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido";
+App::$strings["Please wait..."] = "Espere por favor…";
+App::$strings["view full size"] = "Ver en el tamaño original";
+App::$strings["Administrator"] = "Administrador";
+App::$strings["No Subject"] = "Sin asunto";
+App::$strings["Friendica"] = "Friendica";
+App::$strings["OStatus"] = "OStatus";
+App::$strings["GNU-Social"] = "GNU Social";
+App::$strings["RSS/Atom"] = "RSS/Atom";
+App::$strings["Diaspora"] = "Diaspora";
+App::$strings["Facebook"] = "Facebook";
+App::$strings["Zot"] = "Zot";
+App::$strings["LinkedIn"] = "LinkedIn";
+App::$strings["XMPP/IM"] = "XMPP/IM";
+App::$strings["MySpace"] = "MySpace";
+App::$strings["New Page"] = "Nueva página";
+App::$strings["Title"] = "Título";
 App::$strings["Categories"] = "Categorías";
 App::$strings["Tags"] = "Etiquetas";
 App::$strings["Keywords"] = "Palabras clave";
@@ -1531,34 +1678,196 @@ App::$strings["want"] = "quiero";
 App::$strings["wants"] = "quiere";
 App::$strings["likes"] = "gusta de";
 App::$strings["dislikes"] = "no gusta de";
-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["Unable to obtain identity information from database"] = "No ha sido posible obtener información sobre la identidad desde la base de datos";
+App::$strings["Empty name"] = "Nombre vacío";
+App::$strings["Name too long"] = "Nombre demasiado largo";
+App::$strings["No account identifier"] = "Ningún identificador de la cuenta";
+App::$strings["Nickname is required."] = "Se requiere un sobrenombre (alias).";
+App::$strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso. Por favor, elija otro.";
+App::$strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio.";
+App::$strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada";
+App::$strings["Default Profile"] = "Perfil principal";
+App::$strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
+App::$strings["Create New Profile"] = "Crear un nuevo perfil";
+App::$strings["Visible to everybody"] = "Visible para todos";
+App::$strings["Gender:"] = "Género:";
+App::$strings["Status:"] = "Estado:";
+App::$strings["Homepage:"] = "Página personal:";
+App::$strings["Online Now"] = "Ahora en línea";
+App::$strings["Like this channel"] = "Me gusta este canal";
+App::$strings["j F, Y"] = "j F Y";
+App::$strings["j F"] = "j F";
+App::$strings["Birthday:"] = "Cumpleaños:";
+App::$strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
+App::$strings["Sexual Preference:"] = "Orientación sexual:";
+App::$strings["Tags:"] = "Etiquetas:";
+App::$strings["Political Views:"] = "Posición política:";
+App::$strings["Religion:"] = "Religión:";
+App::$strings["Hobbies/Interests:"] = "Aficciones o intereses:";
+App::$strings["Likes:"] = "Me gusta:";
+App::$strings["Dislikes:"] = "No me gusta:";
+App::$strings["Contact information and Social Networks:"] = "Información de contacto y redes sociales:";
+App::$strings["My other channels:"] = "Mis otros canales:";
+App::$strings["Musical interests:"] = "Preferencias musicales:";
+App::$strings["Books, literature:"] = "Libros, literatura:";
+App::$strings["Television:"] = "Televisión:";
+App::$strings["Film/dance/culture/entertainment:"] = "Cine, danza, cultura, entretenimiento:";
+App::$strings["Love/Romance:"] = "Vida sentimental o amorosa:";
+App::$strings["Work/employment:"] = "Trabajo:";
+App::$strings["School/education:"] = "Estudios:";
+App::$strings["Like this thing"] = "Me gusta esto";
+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["%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 el código fuente de la entrada";
+App::$strings["Follow Thread"] = "Seguir este hilo";
+App::$strings["Unfollow Thread"] = "Dejar de seguir este hilo";
+App::$strings["Activity/Posts"] = "Actividad y publicaciones";
+App::$strings["Edit Connection"] = "Editar conexión";
+App::$strings["Message"] = "Mensaje";
+App::$strings["%s likes this."] = "A %s le gusta esto.";
+App::$strings["%s doesn't like this."] = "A %s no le gusta esto.";
+App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
+	0 => "a <span %1\$s>%2\$d personas</span> le gusta esto.",
+	1 => "A <span  %1\$s>%2\$d personas</span> les gusta esto.",
+);
+App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "a <span %1\$s>%2\$d personas</span> no les gusta esto.",
+	1 => "A <span  %1\$s>%2\$d personas</span> no les gusta esto.",
+);
+App::$strings["and"] = "y";
+App::$strings[", and %d other people"] = array(
+	0 => ", y %d persona más",
+	1 => ", y %d personas más",
+);
+App::$strings["%s like this."] = "A %s le gusta esto.";
+App::$strings["%s don't like this."] = "A %s no le gusta esto.";
+App::$strings["Set your location"] = "Establecer su ubicación";
+App::$strings["Clear browser location"] = "Eliminar los datos de localización geográfica del navegador";
+App::$strings["Tag term:"] = "Término de la etiqueta:";
+App::$strings["Where are you right now?"] = "¿Donde está ahora?";
+App::$strings["Page link name"] = "Nombre del enlace de la página";
+App::$strings["Post as"] = "Publicar como";
+App::$strings["Toggle voting"] = "Cambiar votación";
+App::$strings["Categories (optional, comma-separated list)"] = "Categorías (opcional, lista separada por comas)";
+App::$strings["Set publish date"] = "Establecer la fecha de publicación";
+App::$strings["Discover"] = "Descubrir";
+App::$strings["Imported public streams"] = "Contenidos públicos importados";
+App::$strings["Commented Order"] = "Comentarios recientes";
+App::$strings["Sort by Comment Date"] = "Ordenar por fecha de comentario";
+App::$strings["Posted Order"] = "Publicaciones recientes";
+App::$strings["Sort by Post Date"] = "Ordenar por fecha de publicación";
+App::$strings["Posts that mention or involve you"] = "Publicaciones que le mencionan o involucran";
+App::$strings["Activity Stream - by date"] = "Contenido - por fecha";
+App::$strings["Starred"] = "Preferidas";
+App::$strings["Favourite Posts"] = "Publicaciones favoritas";
+App::$strings["Spam"] = "Correo basura";
+App::$strings["Posts flagged as SPAM"] = "Publicaciones marcadas como basura";
+App::$strings["Status Messages and Posts"] = "Mensajes de estado y publicaciones";
+App::$strings["About"] = "Mi perfil";
+App::$strings["Profile Details"] = "Detalles del perfil";
+App::$strings["Files and Storage"] = "Ficheros y repositorio";
+App::$strings["Chatrooms"] = "Salas de chat";
+App::$strings["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["Cannot create a duplicate channel identifier on this system. Import failed."] = "No se ha podido crear un canal con un identificador que ya existe en este sistema. La importación ha fallado.";
 App::$strings["Channel clone failed. Import failed."] = "La clonación del canal no ha salido bien. La importación ha fallado.";
-App::$strings["(Unknown)"] = "(Desconocido)";
-App::$strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet.";
-App::$strings["Visible to you only."] = "Visible sólo para usted.";
-App::$strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red.";
-App::$strings["Visible to anybody authenticated."] = "Visible para cualquiera que esté autenticado.";
-App::$strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
-App::$strings["Visible to all connections."] = "Visible para todas las conexiones.";
-App::$strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
-App::$strings["Visible to specific connections."] = "Visible para conexiones específicas.";
-App::$strings["Privacy group is empty."] = "El grupo de canales está vacío.";
-App::$strings["Privacy group: %s"] = "Grupo de canales: %s";
-App::$strings["Connection not found."] = "Conexión no encontrada";
-App::$strings["profile photo"] = "foto del perfil";
-App::$strings["No recipient provided."] = "No se ha especificado ningún destinatario.";
-App::$strings["[no subject]"] = "[sin asunto]";
-App::$strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
-App::$strings["Stored post could not be verified."] = "No se han podido verificar las publicaciones guardadas.";
+App::$strings["Frequently"] = "Frecuentemente";
+App::$strings["Hourly"] = "Cada hora";
+App::$strings["Twice daily"] = "Dos veces al día";
+App::$strings["Daily"] = "Diariamente";
+App::$strings["Weekly"] = "Semanalmente";
+App::$strings["Monthly"] = "Mensualmente";
+App::$strings["Currently Male"] = "Actualmente hombre";
+App::$strings["Currently Female"] = "Actualmente mujer";
+App::$strings["Mostly Male"] = "Generalmente hombre";
+App::$strings["Mostly Female"] = "Generalmente mujer";
+App::$strings["Transgender"] = "Transgénero";
+App::$strings["Intersex"] = "Intersexual";
+App::$strings["Transsexual"] = "Transexual";
+App::$strings["Hermaphrodite"] = "Hermafrodita";
+App::$strings["Neuter"] = "Neutral";
+App::$strings["Non-specific"] = "No especificado";
+App::$strings["Undecided"] = "Indeciso/a";
+App::$strings["Males"] = "Hombres";
+App::$strings["Females"] = "Mujeres";
+App::$strings["Gay"] = "Homosexual";
+App::$strings["Lesbian"] = "Lesbiana";
+App::$strings["No Preference"] = "Sin preferencias";
+App::$strings["Bisexual"] = "Bisexual";
+App::$strings["Autosexual"] = "Autosexual";
+App::$strings["Abstinent"] = "Casto/a";
+App::$strings["Virgin"] = "Virgen";
+App::$strings["Deviant"] = "Fuera de lo común";
+App::$strings["Fetish"] = "Fetichista";
+App::$strings["Oodles"] = "Orgías";
+App::$strings["Nonsexual"] = "Asexual";
+App::$strings["Single"] = "Soltero/a";
+App::$strings["Lonely"] = "Solo/a";
+App::$strings["Available"] = "Disponible";
+App::$strings["Unavailable"] = "No disponible";
+App::$strings["Has crush"] = "Enamorado/a";
+App::$strings["Infatuated"] = "Apasionado/a";
+App::$strings["Dating"] = "Saliendo con alguien";
+App::$strings["Unfaithful"] = "Infiel";
+App::$strings["Sex Addict"] = "Con adicción al sexo";
+App::$strings["Friends/Benefits"] = "Amigos con algo extra";
+App::$strings["Casual"] = "Casual";
+App::$strings["Engaged"] = "Prometido/a";
+App::$strings["Married"] = "Casado/a";
+App::$strings["Imaginarily married"] = "Casado/a en sueños";
+App::$strings["Partners"] = "Pareja";
+App::$strings["Cohabiting"] = "Cohabitando";
+App::$strings["Common law"] = "Matrimonio tradicional";
+App::$strings["Happy"] = "Felíz";
+App::$strings["Not looking"] = "No estoy buscando";
+App::$strings["Swinger"] = "Libertino";
+App::$strings["Betrayed"] = "Engañado/a";
+App::$strings["Separated"] = "Separado/a";
+App::$strings["Unstable"] = "Inestable";
+App::$strings["Divorced"] = "Divorciado/a";
+App::$strings["Imaginarily divorced"] = "Divorciado/a en sueños";
+App::$strings["Widowed"] = "Viudo/a";
+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["%1\$s's bookmarks"] = "Marcadores de %1\$s";
+App::$strings["guest:"] = "";
+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["prev"] = "anterior";
 App::$strings["first"] = "primera";
 App::$strings["last"] = "última";
@@ -1568,7 +1877,6 @@ 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 ";
@@ -1631,385 +1939,21 @@ App::$strings["Select an alternate language"] = "Seleccionar un idioma alternati
 App::$strings["activity"] = "la actividad";
 App::$strings["Design Tools"] = "Herramientas de diseño web";
 App::$strings["Pages"] = "Páginas";
-App::$strings["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["Saved Folders"] = "Carpetas guardadas";
-App::$strings["Everything"] = "Todo";
-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["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["Channel is blocked on this site."] = "El canal está bloqueado en este sitio.";
-App::$strings["Channel location missing."] = "Falta la dirección del canal.";
-App::$strings["Response from remote channel was incomplete."] = "Respuesta incompleta del canal.";
-App::$strings["Channel was deleted and no longer exists."] = "El canal ha sido eliminado y ya no existe.";
-App::$strings["Protocol disabled."] = "Protocolo deshabilitado.";
-App::$strings["Channel discovery failed."] = "El intento de acceder al canal ha fallado.";
-App::$strings["Cannot connect to yourself."] = "No puede conectarse consigo mismo.";
-App::$strings["%1\$s's bookmarks"] = "Marcadores de %1\$s";
-App::$strings["Public Timeline"] = "Cronología pública";
-App::$strings["Image/photo"] = "Imagen/foto";
-App::$strings["Encrypted content"] = "Contenido cifrado";
-App::$strings["Install %s element: "] = "Instalar el elemento %s:";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s";
-App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar";
-App::$strings["spoiler"] = "spoiler";
-App::$strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta";
-App::$strings["$1 wrote:"] = "$1 escribió:";
-App::$strings["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["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["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 Profile"] = "Editar el perfil";
-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["Bookmarks"] = "Marcadores";
-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["Loading..."] = "Cargando...";
-App::$strings["@name, #tag, ?doc, content"] = "@nombre, #etiqueta, ?ayuda, contenido";
-App::$strings["Please wait..."] = "Espere por favor…";
-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["%d invitation available"] = array(
-	0 => "%d invitación pendiente",
-	1 => "%d invitaciones disponibles",
-);
-App::$strings["Find Channels"] = "Encontrar canales";
-App::$strings["Enter name or interest"] = "Introducir nombre o interés";
-App::$strings["Connect/Follow"] = "Conectar/Seguir";
-App::$strings["Examples: Robert Morgenstein, Fishing"] = "Ejemplos: José Fernández, Pesca";
-App::$strings["Random Profile"] = "Perfil aleatorio";
-App::$strings["Invite Friends"] = "Invitar a amigos";
-App::$strings["Advanced example: name=fred and country=iceland"] = "Ejemplo avanzado: nombre=juan y país=españa";
-App::$strings["%d connection in common"] = array(
-	0 => "%d conexión en común",
-	1 => "%d conexiones en común",
-);
-App::$strings["show more"] = "mostrar más";
-App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ahora está conectado/a con %2\$s";
-App::$strings["%1\$s poked %2\$s"] = "%1\$s ha dado un toque a %2\$s";
-App::$strings["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 el código fuente de la entrada";
-App::$strings["Follow Thread"] = "Seguir este hilo";
-App::$strings["Unfollow Thread"] = "Dejar de seguir este hilo";
-App::$strings["Activity/Posts"] = "Actividad y publicaciones";
-App::$strings["Edit Connection"] = "Editar conexión";
-App::$strings["Message"] = "Mensaje";
-App::$strings["%s likes this."] = "A %s le gusta esto.";
-App::$strings["%s doesn't like this."] = "A %s no le gusta esto.";
-App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
-	0 => "a <span %1\$s>%2\$d personas</span> le gusta esto.",
-	1 => "A <span  %1\$s>%2\$d personas</span> les gusta esto.",
-);
-App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
-	0 => "a <span %1\$s>%2\$d personas</span> no les gusta esto.",
-	1 => "A <span  %1\$s>%2\$d personas</span> no les gusta esto.",
-);
-App::$strings["and"] = "y";
-App::$strings[", and %d other people"] = array(
-	0 => ", y %d persona más",
-	1 => ", y %d personas más",
-);
-App::$strings["%s like this."] = "A %s le gusta esto.";
-App::$strings["%s don't like this."] = "A %s no le gusta esto.";
-App::$strings["Set your location"] = "Establecer su ubicación";
-App::$strings["Clear browser location"] = "Eliminar los datos de localización geográfica del navegador";
-App::$strings["Tag term:"] = "Término de la etiqueta:";
-App::$strings["Where are you right now?"] = "¿Donde está ahora?";
-App::$strings["Page link name"] = "Nombre del enlace de la página";
-App::$strings["Post as"] = "Publicar como";
-App::$strings["Toggle voting"] = "Cambiar votación";
-App::$strings["Categories (optional, comma-separated list)"] = "Categorías (opcional, lista separada por comas)";
-App::$strings["Set publish date"] = "Establecer la fecha de publicación";
-App::$strings["OK"] = "OK";
-App::$strings["Discover"] = "Descubrir";
-App::$strings["Imported public streams"] = "Contenidos públicos importados";
-App::$strings["Commented Order"] = "Comentarios recientes";
-App::$strings["Sort by Comment Date"] = "Ordenar por fecha de comentario";
-App::$strings["Posted Order"] = "Publicaciones recientes";
-App::$strings["Sort by Post Date"] = "Ordenar por fecha de publicación";
-App::$strings["Posts that mention or involve you"] = "Publicaciones que le mencionan o involucran";
-App::$strings["Activity Stream - by date"] = "Contenido - por fecha";
-App::$strings["Starred"] = "Preferidas";
-App::$strings["Favourite Posts"] = "Publicaciones favoritas";
-App::$strings["Spam"] = "Correo basura";
-App::$strings["Posts flagged as SPAM"] = "Publicaciones marcadas como basura";
-App::$strings["Status Messages and Posts"] = "Mensajes de estado y publicaciones";
-App::$strings["About"] = "Mi perfil";
-App::$strings["Profile Details"] = "Detalles del perfil";
-App::$strings["Photo Albums"] = "Álbumes de fotos";
-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["Frequently"] = "Frecuentemente";
-App::$strings["Hourly"] = "Cada hora";
-App::$strings["Twice daily"] = "Dos veces al día";
-App::$strings["Daily"] = "Diariamente";
-App::$strings["Weekly"] = "Semanalmente";
-App::$strings["Monthly"] = "Mensualmente";
-App::$strings["Currently Male"] = "Actualmente hombre";
-App::$strings["Currently Female"] = "Actualmente mujer";
-App::$strings["Mostly Male"] = "Generalmente hombre";
-App::$strings["Mostly Female"] = "Generalmente mujer";
-App::$strings["Transgender"] = "Transgénero";
-App::$strings["Intersex"] = "Intersexual";
-App::$strings["Transsexual"] = "Transexual";
-App::$strings["Hermaphrodite"] = "Hermafrodita";
-App::$strings["Neuter"] = "Neutral";
-App::$strings["Non-specific"] = "No especificado";
-App::$strings["Other"] = "Otro";
-App::$strings["Undecided"] = "Indeciso/a";
-App::$strings["Males"] = "Hombres";
-App::$strings["Females"] = "Mujeres";
-App::$strings["Gay"] = "Homosexual";
-App::$strings["Lesbian"] = "Lesbiana";
-App::$strings["No Preference"] = "Sin preferencias";
-App::$strings["Bisexual"] = "Bisexual";
-App::$strings["Autosexual"] = "Autosexual";
-App::$strings["Abstinent"] = "Casto/a";
-App::$strings["Virgin"] = "Virgen";
-App::$strings["Deviant"] = "Fuera de lo común";
-App::$strings["Fetish"] = "Fetichista";
-App::$strings["Oodles"] = "Orgías";
-App::$strings["Nonsexual"] = "Asexual";
-App::$strings["Single"] = "Soltero/a";
-App::$strings["Lonely"] = "Solo/a";
-App::$strings["Available"] = "Disponible";
-App::$strings["Unavailable"] = "No disponible";
-App::$strings["Has crush"] = "Enamorado/a";
-App::$strings["Infatuated"] = "Apasionado/a";
-App::$strings["Dating"] = "Saliendo con alguien";
-App::$strings["Unfaithful"] = "Infiel";
-App::$strings["Sex Addict"] = "Con adicción al sexo";
-App::$strings["Friends/Benefits"] = "Amigos con algo extra";
-App::$strings["Casual"] = "Casual";
-App::$strings["Engaged"] = "Prometido/a";
-App::$strings["Married"] = "Casado/a";
-App::$strings["Imaginarily married"] = "Casado/a en sueños";
-App::$strings["Partners"] = "Pareja";
-App::$strings["Cohabiting"] = "Cohabitando";
-App::$strings["Common law"] = "Matrimonio tradicional";
-App::$strings["Happy"] = "Felíz";
-App::$strings["Not looking"] = "No estoy buscando";
-App::$strings["Swinger"] = "Libertino";
-App::$strings["Betrayed"] = "Engañado/a";
-App::$strings["Separated"] = "Separado/a";
-App::$strings["Unstable"] = "Inestable";
-App::$strings["Divorced"] = "Divorciado/a";
-App::$strings["Imaginarily divorced"] = "Divorciado/a en sueños";
-App::$strings["Widowed"] = "Viudo/a";
-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["Only me"] = "Sólo yo";
-App::$strings["Public"] = "Público";
-App::$strings["Anybody in the \$Projectname network"] = "Cualquiera en la red \$Projectname";
-App::$strings["Any account on %s"] = "Cualquier cuenta en %s";
-App::$strings["Any of my connections"] = "Cualquiera de mis conexiones";
-App::$strings["Only connections I specifically allow"] = "Sólo las conexiones que yo permita de forma explícita";
-App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Cualquiera que esté autenticado (podría incluir a los visitantes de otras redes)";
-App::$strings["Any connections including those who haven't yet been approved"] = "Cualquier conexión incluyendo aquellas que aún no han sido aprobadas";
-App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Esta es la configuración predeterminada para su flujo (stream) habitual de publicaciones.";
-App::$strings["This is your default setting for who can view your default channel profile"] = "Esta es su configuración por defecto para establecer quién puede ver su perfil del canal predeterminado";
-App::$strings["This is your default setting for who can view your connections"] = "Este es su ajuste predeterminado para establecer quién puede ver sus conexiones";
-App::$strings["This is your default setting for who can view your file storage and photos"] = "Este es su ajuste predeterminado para establecer quién puede ver su repositorio de ficheros y sus fotos";
-App::$strings["This is your default setting for the audience of your webpages"] = "Este es el ajuste predeterminado para establecer la audiencia de sus páginas web";
-App::$strings["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["Item was not found."] = "Elemento no encontrado.";
-App::$strings["No source file."] = "Ningún fichero de origen";
-App::$strings["Cannot locate file to replace"] = "No se puede localizar el fichero que va a ser sustituido.";
-App::$strings["Cannot locate file to revise/update"] = "No se puede localizar el fichero para revisar/actualizar";
-App::$strings["File exceeds size limit of %d"] = "El fichero supera el limite de tamaño de %d";
-App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos.";
-App::$strings["File upload failed. Possible system limit or action terminated."] = "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado.";
-App::$strings["Stored file could not be verified. Upload failed."] = "El fichero almacenado no ha podido ser verificado. El envío ha fallado.";
-App::$strings["Path not available."] = "Ruta no disponible.";
-App::$strings["Empty pathname"] = "Ruta vacía";
-App::$strings["duplicate filename or path"] = "Nombre duplicado de ruta o fichero";
-App::$strings["Path not found."] = "Ruta no encontrada";
-App::$strings["mkdir failed."] = "mkdir ha fallado.";
-App::$strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado.";
-App::$strings["Empty path"] = "Ruta vacía";
-App::$strings["Unable to obtain identity information from database"] = "No ha sido posible obtener información sobre la identidad desde la base de datos";
-App::$strings["Empty name"] = "Nombre vacío";
-App::$strings["Name too long"] = "Nombre demasiado largo";
-App::$strings["No account identifier"] = "Ningún identificador de la cuenta";
-App::$strings["Nickname is required."] = "Se requiere un sobrenombre (alias).";
-App::$strings["Reserved nickname. Please choose another."] = "Sobrenombre en uso. Por favor, elija otro.";
-App::$strings["Nickname has unsupported characters or is already being used on this site."] = "El alias contiene caracteres no admitidos o está ya en uso por otros miembros de este sitio.";
-App::$strings["Unable to retrieve created identity"] = "No ha sido posible recuperar la identidad creada";
-App::$strings["Default Profile"] = "Perfil principal";
-App::$strings["Requested channel is not available."] = "El canal solicitado no está disponible.";
-App::$strings["Create New Profile"] = "Crear un nuevo perfil";
-App::$strings["Visible to everybody"] = "Visible para todos";
-App::$strings["Gender:"] = "Género:";
-App::$strings["Status:"] = "Estado:";
-App::$strings["Homepage:"] = "Página personal:";
-App::$strings["Online Now"] = "Ahora en línea";
-App::$strings["Like this channel"] = "Me gusta este canal";
-App::$strings["j F, Y"] = "j F Y";
-App::$strings["j F"] = "j F";
-App::$strings["Birthday:"] = "Cumpleaños:";
-App::$strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
-App::$strings["Sexual Preference:"] = "Orientación sexual:";
-App::$strings["Tags:"] = "Etiquetas:";
-App::$strings["Political Views:"] = "Posición política:";
-App::$strings["Religion:"] = "Religión:";
-App::$strings["Hobbies/Interests:"] = "Aficciones o intereses:";
-App::$strings["Likes:"] = "Me gusta:";
-App::$strings["Dislikes:"] = "No me gusta:";
-App::$strings["Contact information and Social Networks:"] = "Información de contacto y redes sociales:";
-App::$strings["My other channels:"] = "Mis otros canales:";
-App::$strings["Musical interests:"] = "Preferencias musicales:";
-App::$strings["Books, literature:"] = "Libros, literatura:";
-App::$strings["Television:"] = "Televisión:";
-App::$strings["Film/dance/culture/entertainment:"] = "Cine, danza, cultura, entretenimiento:";
-App::$strings["Love/Romance:"] = "Vida sentimental o amorosa:";
-App::$strings["Work/employment:"] = "Trabajo:";
-App::$strings["School/education:"] = "Estudios:";
-App::$strings["Like this thing"] = "Me gusta esto";
+App::$strings["Logged out."] = "Desconectado/a.";
+App::$strings["Failed authentication"] = "Autenticación fallida.";
+App::$strings["Can view my normal stream and posts"] = "Pueden verse mi actividad y publicaciones normales";
+App::$strings["Can view my webpages"] = "Pueden verse mis páginas web";
+App::$strings["Can post on my channel page (\"wall\")"] = "Pueden crearse entradas en mi página de inicio del canal (“muro”)";
+App::$strings["Can like/dislike stuff"] = "Puede marcarse contenido como me gusta/no me gusta";
+App::$strings["Profiles and things other than posts/comments"] = "Perfiles y otras cosas aparte de publicaciones/comentarios";
+App::$strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención";
+App::$strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foros de discusión o grupos";
+App::$strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)";
+App::$strings["Can write to my file storage and photos"] = "Puede escribirse en mi repositorio de ficheros y fotos";
+App::$strings["Can edit my webpages"] = "Pueden editarse mis páginas web";
+App::$strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas";
+App::$strings["Can administer my channel resources"] = "Pueden administrarse mis recursos del canal";
+App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo.";
 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";
@@ -2021,6 +1965,7 @@ App::$strings["Profile Import/Export"] = "Importar/Exportar perfil";
 App::$strings["Save and load profile details across sites/channels"] = "Guardar y cargar detalles del perfil a través de sitios/canales";
 App::$strings["Web Pages"] = "Páginas web";
 App::$strings["Provide managed web pages on your channel"] = "Proveer páginas web gestionadas en su canal";
+App::$strings["Provide a wiki for your channel"] = "";
 App::$strings["Hide Rating"] = "Ocultar las valoraciones";
 App::$strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Ocultar los botones de valoración en su canal y página de perfil. Tenga en cuenta, sin embargo, que la gente podrá expresar su valoración en otros lugares.";
 App::$strings["Private Notes"] = "Notas privadas";
@@ -2054,6 +1999,7 @@ 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.";
@@ -2071,6 +2017,7 @@ App::$strings["Post Categories"] = "Categorías de entradas";
 App::$strings["Add categories to your posts"] = "Añadir categorías a sus publicaciones";
 App::$strings["Emoji Reactions"] = "Emoticonos \"emoji\"";
 App::$strings["Add emoji reaction ability to posts"] = "Activar la capacidad de añadir un emoticono \"emoji\" a las entradas";
+App::$strings["Saved Folders"] = "Carpetas guardadas";
 App::$strings["Ability to file posts under folders"] = "Capacidad de archivar entradas en carpetas";
 App::$strings["Dislike Posts"] = "Desagrado de publicaciones";
 App::$strings["Ability to dislike posts/comments"] = "Capacidad de mostrar desacuerdo con el contenido de  entradas y comentarios";
@@ -2078,63 +2025,149 @@ App::$strings["Star Posts"] = "Entradas destacadas";
 App::$strings["Ability to mark special posts with a star indicator"] = "Capacidad de marcar entradas destacadas con un indicador de estrella";
 App::$strings["Tag Cloud"] = "Nube de etiquetas";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Proveer nube de etiquetas personal en su página de canal";
-App::$strings["Embedded content"] = "Contenido incorporado";
-App::$strings["Embedding disabled"] = "Incrustación deshabilitada";
-App::$strings["Who can see this?"] = "¿Quién puede ver esto?";
-App::$strings["Custom selection"] = "Selección personalizada";
-App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Seleccione \"Mostrar\" para permitir la visualización. La opción \"No mostrar\" le permite anular y limitar el alcance de \"Mostrar\".";
-App::$strings["Show"] = "Mostrar";
-App::$strings["Don't show"] = "No mostrar";
-App::$strings["Other networks and post services"] = "Otras redes y servicios de publicación";
-App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje.";
-App::$strings["Logged out."] = "Desconectado/a.";
-App::$strings["Failed authentication"] = "Autenticación fallida.";
-App::$strings["Birthday"] = "Cumpleaños";
-App::$strings["Age: "] = "Edad:";
-App::$strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-DD o MM-DD";
-App::$strings["never"] = "nunca";
-App::$strings["less than a second ago"] = "hace un instante";
-App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "hace %1\$d %2\$s";
-App::$strings["__ctx:relative_date__ year"] = array(
-	0 => "año",
-	1 => "años",
-);
-App::$strings["__ctx:relative_date__ month"] = array(
-	0 => "mes",
-	1 => "meses",
-);
-App::$strings["__ctx:relative_date__ week"] = array(
-	0 => "semana",
-	1 => "semanas",
-);
-App::$strings["__ctx:relative_date__ day"] = array(
-	0 => "día",
-	1 => "días",
-);
-App::$strings["__ctx:relative_date__ hour"] = array(
-	0 => "hora",
-	1 => "horas",
-);
-App::$strings["__ctx:relative_date__ minute"] = array(
-	0 => "minuto",
-	1 => "minutos",
-);
-App::$strings["__ctx:relative_date__ second"] = array(
-	0 => "segundo",
-	1 => "segundos",
-);
-App::$strings["%1\$s's birthday"] = "Cumpleaños de %1\$s";
-App::$strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un grupo suprimido con este nombre ha sido restablecido. <strong>Es posible</strong> que los permisos existentes  sean aplicados a este grupo y sus futuros miembros. Si no quiere esto, por favor cree otro grupo con un nombre diferente.";
 App::$strings["Add new connections to this privacy group"] = "Añadir conexiones nuevas a este grupo de canales";
 App::$strings["edit"] = "editar";
 App::$strings["Edit group"] = "Editar grupo";
 App::$strings["Add privacy group"] = "Añadir un grupo de canales";
 App::$strings["Channels not in any privacy group"] = "Sin canales en ningún grupo";
+App::$strings["add"] = "añadir";
+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["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["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["Channel is blocked on this site."] = "El canal está bloqueado en este sitio.";
+App::$strings["Channel location missing."] = "Falta la dirección del canal.";
+App::$strings["Response from remote channel was incomplete."] = "Respuesta incompleta del canal.";
+App::$strings["Channel was deleted and no longer exists."] = "El canal ha sido eliminado y ya no existe.";
+App::$strings["Protocol disabled."] = "Protocolo deshabilitado.";
+App::$strings["Channel discovery failed."] = "El intento de acceder al canal ha fallado.";
+App::$strings["Cannot connect to yourself."] = "No puede conectarse consigo mismo.";
+App::$strings["Item was not found."] = "Elemento no encontrado.";
+App::$strings["No source file."] = "Ningún fichero de origen";
+App::$strings["Cannot locate file to replace"] = "No se puede localizar el fichero que va a ser sustituido.";
+App::$strings["Cannot locate file to revise/update"] = "No se puede localizar el fichero para revisar/actualizar";
+App::$strings["File exceeds size limit of %d"] = "El fichero supera el limite de tamaño de %d";
+App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Ha alcanzado su límite de %1$.0f Mbytes de almacenamiento de adjuntos.";
+App::$strings["File upload failed. Possible system limit or action terminated."] = "Error de carga, posiblemente por limite del sistema o porque la acción ha finalizado.";
+App::$strings["Stored file could not be verified. Upload failed."] = "El fichero almacenado no ha podido ser verificado. El envío ha fallado.";
+App::$strings["Path not available."] = "Ruta no disponible.";
+App::$strings["Empty pathname"] = "Ruta vacía";
+App::$strings["duplicate filename or path"] = "Nombre duplicado de ruta o fichero";
+App::$strings["Path not found."] = "Ruta no encontrada";
+App::$strings["mkdir failed."] = "mkdir ha fallado.";
+App::$strings["database storage failed."] = "el almacenamiento en la base de datos ha fallado.";
+App::$strings["Empty path"] = "Ruta vacía";
+App::$strings["Image/photo"] = "Imagen/foto";
+App::$strings["Encrypted content"] = "Contenido cifrado";
+App::$strings["Install %s element: "] = "Instalar el elemento %s:";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Esta entrada contiene el elemento instalable %s, sin embargo le faltan permisos para instalarlo en este sitio.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s escribió %2\$s siguiente %3\$s";
+App::$strings["Click to open/close"] = "Pulsar para abrir/cerrar";
+App::$strings["spoiler"] = "spoiler";
+App::$strings["Different viewers will see this text differently"] = "Visitantes diferentes verán este texto de forma distinta";
+App::$strings["$1 wrote:"] = "$1 escribió:";
+App::$strings["(Unknown)"] = "(Desconocido)";
+App::$strings["Visible to anybody on the internet."] = "Visible para cualquiera en internet.";
+App::$strings["Visible to you only."] = "Visible sólo para usted.";
+App::$strings["Visible to anybody in this network."] = "Visible para cualquiera en esta red.";
+App::$strings["Visible to anybody authenticated."] = "Visible para cualquiera que esté autenticado.";
+App::$strings["Visible to anybody on %s."] = "Visible para cualquiera en %s.";
+App::$strings["Visible to all connections."] = "Visible para todas las conexiones.";
+App::$strings["Visible to approved connections."] = "Visible para las conexiones permitidas.";
+App::$strings["Visible to specific connections."] = "Visible para conexiones específicas.";
+App::$strings["Privacy group is empty."] = "El grupo de canales está vacío.";
+App::$strings["Privacy group: %s"] = "Grupo de canales: %s";
+App::$strings["Connection not found."] = "Conexión no encontrada";
+App::$strings["profile photo"] = "foto del perfil";
+App::$strings["Embedded content"] = "Contenido incorporado";
+App::$strings["Embedding disabled"] = "Incrustación deshabilitada";
+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["Everything"] = "Todo";
+App::$strings["Archives"] = "Hemeroteca";
+App::$strings["Refresh"] = "Recargar";
+App::$strings["Account settings"] = "Configuración de la cuenta";
+App::$strings["Channel settings"] = "Configuración del canal";
+App::$strings["Additional features"] = "Funcionalidades";
+App::$strings["Feature/Addon settings"] = "Complementos";
+App::$strings["Display settings"] = "Ajustes de visualización";
+App::$strings["Manage locations"] = "Gestión de ubicaciones (clones) del canal";
+App::$strings["Export channel"] = "Exportar canal";
+App::$strings["Connected apps"] = "Aplicaciones (apps) conectadas";
+App::$strings["Premium Channel Settings"] = "Configuración del canal premium";
+App::$strings["Private Mail Menu"] = "Menú de correo privado";
+App::$strings["Combined View"] = "Vista combinada";
+App::$strings["Conversations"] = "Conversaciones";
+App::$strings["Received Messages"] = "Mensajes recibidos";
+App::$strings["Sent Messages"] = "Enviar mensajes";
+App::$strings["No messages."] = "Sin mensajes.";
+App::$strings["Delete conversation"] = "Eliminar conversación";
+App::$strings["Events 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["Wiki List"] = "Lista de wikis";
+App::$strings["Wiki Pages"] = "Páginas del wiki";
+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["Member registrations waiting for confirmation"] = "Inscripciones de nuevos miembros pendientes de aprobación";
+App::$strings["Inspect queue"] = "Examinar la cola";
+App::$strings["DB updates"] = "Actualizaciones de la base de datos";
+App::$strings["Plugin Features"] = "Extensiones";
+App::$strings[" 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["Attachments:"] = "Ficheros adjuntos:";
+App::$strings["\$Projectname event notification:"] = "Notificación de eventos de \$Projectname:";
 App::$strings["Delete this item?"] = "¿Borrar este elemento?";
-App::$strings["[-] show less"] = "[-] mostrar menos";
-App::$strings["[+] expand"] = "[+] expandir";
-App::$strings["[-] collapse"] = "[-] contraer";
+App::$strings["%s show less"] = "";
+App::$strings["%s expand"] = "";
+App::$strings["%s collapse"] = "";
 App::$strings["Password too short"] = "Contraseña demasiado corta";
 App::$strings["Passwords do not match"] = "Las contraseñas no coinciden";
 App::$strings["everybody"] = "cualquiera";
@@ -2189,72 +2222,78 @@ App::$strings["__ctx:calendar__ month"] = "mes";
 App::$strings["__ctx:calendar__ week"] = "semana";
 App::$strings["__ctx:calendar__ day"] = "día";
 App::$strings["__ctx:calendar__ All day"] = "Todos los días";
-App::$strings["view full size"] = "Ver en el tamaño original";
-App::$strings["No Subject"] = "Sin asunto";
-App::$strings["Friendica"] = "Friendica";
-App::$strings["OStatus"] = "OStatus";
-App::$strings["GNU-Social"] = "GNU Social";
-App::$strings["RSS/Atom"] = "RSS/Atom";
-App::$strings["Diaspora"] = "Diaspora";
-App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot";
-App::$strings["LinkedIn"] = "LinkedIn";
-App::$strings["XMPP/IM"] = "XMPP/IM";
-App::$strings["MySpace"] = "MySpace";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "La imagen excede el límite de %lu bytes del sitio";
-App::$strings["Image file is empty."] = "El fichero de imagen está vacío. ";
-App::$strings["Photo storage failed."] = "La foto no ha podido ser guardada.";
-App::$strings["a new photo"] = "una nueva foto";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha publicado %2\$s en %3\$s";
-App::$strings["Upload New Photos"] = "Subir nuevas fotos";
+App::$strings["%d invitation available"] = array(
+	0 => "%d invitación pendiente",
+	1 => "%d invitaciones disponibles",
+);
+App::$strings["Find Channels"] = "Encontrar canales";
+App::$strings["Enter name or interest"] = "Introducir nombre o interés";
+App::$strings["Connect/Follow"] = "Conectar/Seguir";
+App::$strings["Examples: Robert Morgenstein, Fishing"] = "Ejemplos: José Fernández, Pesca";
+App::$strings["Random Profile"] = "Perfil aleatorio";
+App::$strings["Invite Friends"] = "Invitar a amigos";
+App::$strings["Advanced example: name=fred and country=iceland"] = "Ejemplo avanzado: nombre=juan y país=españa";
+App::$strings["%d connection in common"] = array(
+	0 => "%d conexión en común",
+	1 => "%d conexiones en común",
+);
+App::$strings["show more"] = "mostrar más";
+App::$strings["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["No recipient provided."] = "No se ha especificado ningún destinatario.";
+App::$strings["[no subject]"] = "[sin asunto]";
+App::$strings["Unable to determine sender."] = "No ha sido posible determinar el remitente. ";
+App::$strings["Stored post could not be verified."] = "No se han podido verificar las publicaciones guardadas.";
+App::$strings["Who can see this?"] = "¿Quién puede ver esto?";
+App::$strings["Custom selection"] = "Selección personalizada";
+App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Seleccione \"Mostrar\" para permitir la visualización. La opción \"No mostrar\" le permite anular y limitar el alcance de \"Mostrar\".";
+App::$strings["Show"] = "Mostrar";
+App::$strings["Don't show"] = "No mostrar";
+App::$strings["Other networks and post services"] = "Otras redes y servicios de publicación";
+App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Los permisos de la entrada %s no se pueden cambiar %s una vez que se ha compartido.</br /> Estos permisos establecen quién está autorizado para ver el mensaje.";
+App::$strings["Birthday"] = "Cumpleaños";
+App::$strings["Age: "] = "Edad:";
+App::$strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-DD o MM-DD";
+App::$strings["never"] = "nunca";
+App::$strings["less than a second ago"] = "hace un instante";
+App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "hace %1\$d %2\$s";
+App::$strings["__ctx:relative_date__ year"] = array(
+	0 => "año",
+	1 => "años",
+);
+App::$strings["__ctx:relative_date__ month"] = array(
+	0 => "mes",
+	1 => "meses",
+);
+App::$strings["__ctx:relative_date__ week"] = array(
+	0 => "semana",
+	1 => "semanas",
+);
+App::$strings["__ctx:relative_date__ day"] = array(
+	0 => "día",
+	1 => "días",
+);
+App::$strings["__ctx:relative_date__ hour"] = array(
+	0 => "hora",
+	1 => "horas",
+);
+App::$strings["__ctx:relative_date__ minute"] = array(
+	0 => "minuto",
+	1 => "minutos",
+);
+App::$strings["__ctx:relative_date__ second"] = array(
+	0 => "segundo",
+	1 => "segundos",
+);
+App::$strings["%1\$s's birthday"] = "Cumpleaños de %1\$s";
+App::$strings["Happy Birthday %1\$s"] = "Feliz cumpleaños %1\$s";
+App::$strings["Public Timeline"] = "Cronología pública";
 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["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";
-App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado.";
-App::$strings["Can view my connections"] = "Pueden verse mis conexiones";
-App::$strings["Can view my file storage and photos"] = "Pueden verse mi repositorio de ficheros y mis fotos";
-App::$strings["Can view my webpages"] = "Pueden verse mis páginas web";
-App::$strings["Can send me their channel stream and posts"] = "Me pueden enviar sus entradas y contenidos del canal";
-App::$strings["Can post on my channel page (\"wall\")"] = "Pueden crearse entradas en mi página de inicio del canal (“muro”)";
-App::$strings["Can comment on or like my posts"] = "Pueden publicarse comentarios en mis publicaciones o marcar mis entradas con 'me gusta'.";
-App::$strings["Can send me private mail messages"] = "Se me pueden enviar mensajes privados";
-App::$strings["Can like/dislike stuff"] = "Puede marcarse contenido como me gusta/no me gusta";
-App::$strings["Profiles and things other than posts/comments"] = "Perfiles y otras cosas aparte de publicaciones/comentarios";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Puede enviarse una entrada a todos mis contactos del canal mediante una @mención";
-App::$strings["Advanced - useful for creating group forum channels"] = "Avanzado - útil para crear canales de foros de discusión o grupos";
-App::$strings["Can chat with me (when available)"] = "Se puede charlar conmigo (cuando esté disponible)";
-App::$strings["Can write to my file storage and photos"] = "Puede escribirse en mi repositorio de ficheros y fotos";
-App::$strings["Can edit my webpages"] = "Pueden editarse mis páginas web";
-App::$strings["Can source my public posts in derived channels"] = "Pueden utilizarse mis publicaciones públicas como origen de contenidos  en canales derivados";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Algo avanzado - muy útil en comunidades abiertas";
-App::$strings["Can administer my channel resources"] = "Pueden administrarse mis recursos del canal";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Muy avanzado. Déjelo a no ser que sepa bien lo que está haciendo.";
-App::$strings["Social Networking"] = "Redes sociales";
-App::$strings["Social - Mostly Public"] = "Social - Público en su mayor parte";
-App::$strings["Social - Restricted"] = "Social - Restringido";
-App::$strings["Social - Private"] = "Social - Privado";
-App::$strings["Community Forum"] = "Foro de discusión";
-App::$strings["Forum - Mostly Public"] = "Foro - Público en su mayor parte";
-App::$strings["Forum - Restricted"] = "Foro - Restringido";
-App::$strings["Forum - Private"] = "Foro - Privado";
-App::$strings["Feed Republish"] = "Republicar un \"feed\"";
-App::$strings["Feed - Mostly Public"] = "Feed - Público en su mayor parte";
-App::$strings["Feed - Restricted"] = "Feed - Restringido";
-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[" 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["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";
@@ -2294,6 +2333,7 @@ App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["Update %s failed. See error logs."] = "La actualización %s ha fallado. Mire el informe de errores.";
 App::$strings["Update Error at %s"] = "Error de actualización en %s";
 App::$strings["Create an account to access services and applications within the Hubzilla"] = "Crear una cuenta para acceder a los servicios y aplicaciones dentro de Hubzilla";
+App::$strings["Login/Email"] = "";
 App::$strings["Password"] = "Contraseña";
 App::$strings["Remember me"] = "Recordarme";
 App::$strings["Forgot your password?"] = "¿Olvidó su contraseña?";
diff --git a/view/fr/hmessages.po b/view/fr/hmessages.po
index 73d711700..0fb50f0ca 100644
--- a/view/fr/hmessages.po
+++ b/view/fr/hmessages.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-10 00:02-0700\n"
-"PO-Revision-Date: 2016-06-10 09:14+0000\n"
+"POT-Creation-Date: 2016-07-22 00:02-0700\n"
+"PO-Revision-Date: 2016-07-25 08:54+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/red-matrix/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,11 +19,156 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ../../Zotlabs/Access/PermissionRoles.php:182
+#: ../../include/permissions.php:904
+msgid "Social Networking"
+msgstr "Réseau social"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:183
+#: ../../include/permissions.php:904
+msgid "Social - Mostly Public"
+msgstr "Social - surtout public"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:184
+#: ../../include/permissions.php:904
+msgid "Social - Restricted"
+msgstr "Social - restreint"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:185
+#: ../../include/permissions.php:904
+msgid "Social - Private"
+msgstr "Social - privé"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:188
+#: ../../include/permissions.php:905
+msgid "Community Forum"
+msgstr "Forum communautaire"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:189
+#: ../../include/permissions.php:905
+msgid "Forum - Mostly Public"
+msgstr "Forum - surtout public"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:190
+#: ../../include/permissions.php:905
+msgid "Forum - Restricted"
+msgstr "Forum - restreint"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:191
+#: ../../include/permissions.php:905
+msgid "Forum - Private"
+msgstr "Forum - privé"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:194
+#: ../../include/permissions.php:906
+msgid "Feed Republish"
+msgstr "Republication de flux"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:195
+#: ../../include/permissions.php:906
+msgid "Feed - Mostly Public"
+msgstr "Flux - surtout public"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:196
+#: ../../include/permissions.php:906
+msgid "Feed - Restricted"
+msgstr "Flux - restreint"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:199
+#: ../../include/permissions.php:907
+msgid "Special Purpose"
+msgstr "Utilisation spécifique"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:200
+#: ../../include/permissions.php:907
+msgid "Special - Celebrity/Soapbox"
+msgstr "Spécial - célébrité/promotion"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:201
+#: ../../include/permissions.php:907
+msgid "Special - Group Repository"
+msgstr "Spécial - dépôt partagé"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:204 ../../include/selectors.php:49
+#: ../../include/selectors.php:66 ../../include/selectors.php:104
+#: ../../include/selectors.php:140 ../../include/permissions.php:908
+msgid "Other"
+msgstr "Autre"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:205
+#: ../../include/permissions.php:908
+msgid "Custom/Expert Mode"
+msgstr "Mode expert/spécifique"
+
+#: ../../Zotlabs/Access/Permissions.php:30
+msgid "Can view my channel stream and posts"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:31 ../../include/permissions.php:33
+msgid "Can send me their channel stream and posts"
+msgstr "Peuvent m'envoyer leur flux et les publications de leur canal"
+
+#: ../../Zotlabs/Access/Permissions.php:32 ../../include/permissions.php:27
+msgid "Can view my default channel profile"
+msgstr "Peut voir le profil du canal par défaut."
+
+#: ../../Zotlabs/Access/Permissions.php:33 ../../include/permissions.php:28
+msgid "Can view my connections"
+msgstr "Peut voir mes contacts"
+
+#: ../../Zotlabs/Access/Permissions.php:34 ../../include/permissions.php:29
+msgid "Can view my file storage and photos"
+msgstr "Peut voir mes fichiers et photos"
+
+#: ../../Zotlabs/Access/Permissions.php:35
+msgid "Can upload/modify my file storage and photos"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:36
+msgid "Can view my channel webpages"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:37
+msgid "Can create/edit my channel webpages"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:38
+msgid "Can post on my channel (wall) page"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:39 ../../include/permissions.php:35
+msgid "Can comment on or like my posts"
+msgstr "Peuvent commenter et/ou aimer mes publications"
+
+#: ../../Zotlabs/Access/Permissions.php:40 ../../include/permissions.php:36
+msgid "Can send me private mail messages"
+msgstr "Peuvent m'envoyer des messages privés"
+
+#: ../../Zotlabs/Access/Permissions.php:41
+msgid "Can like/dislike profiles and profile things"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:42
+msgid "Can forward to all my channel connections via @+ mentions in posts"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:43
+msgid "Can chat with me"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:44 ../../include/permissions.php:44
+msgid "Can source my public posts in derived channels"
+msgstr "Peut rediriger mes publications publiques vers des canaux dérivés"
+
+#: ../../Zotlabs/Access/Permissions.php:45
+msgid "Can administer my channel"
+msgstr ""
+
 #: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
 msgid "parent"
 msgstr "retour"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2620
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2605
 msgid "Collection"
 msgstr "Groupe de contacts"
 
@@ -47,16 +192,17 @@ msgstr "Calendrier - Messages entrants"
 msgid "Schedule Outbox"
 msgstr "Calendrier - Messages sortants"
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
-#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486
-#: ../../Zotlabs/Lib/Apps.php:561 ../../include/widgets.php:1505
-#: ../../include/conversation.php:1032
+#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:796
+#: ../../Zotlabs/Module/Photos.php:1241
+#: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:490
+#: ../../Zotlabs/Lib/Apps.php:565 ../../include/conversation.php:1035
+#: ../../include/widgets.php:1599
 msgid "Unknown"
 msgstr "Inconnu"
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93
-#: ../../include/conversation.php:1639
+#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:93
+#: ../../include/conversation.php:1654
 msgid "Files"
 msgstr "Fichiers"
 
@@ -69,22 +215,23 @@ msgid "Shared"
 msgstr "Partagé"
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
-#: ../../Zotlabs/Module/Webpages.php:186
+#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/New_channel.php:142
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Webpages.php:193
 msgid "Create"
 msgstr "Créer"
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1518
+#: ../../Zotlabs/Module/Photos.php:823 ../../Zotlabs/Module/Photos.php:1362
+#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1612
 msgid "Upload"
 msgstr "Envoyer"
 
 #: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:247
-#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:592
-#: ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:646
+#: ../../Zotlabs/Module/Settings.php:672
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr "Nom"
@@ -94,7 +241,7 @@ msgid "Type"
 msgstr "Type"
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1344
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1324
 msgid "Size"
 msgstr "Taille"
 
@@ -103,34 +250,32 @@ msgstr "Taille"
 msgid "Last Modified"
 msgstr "Modifié le"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Editpost.php:84
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Editlayout.php:113
-#: ../../Zotlabs/Module/Editwebpage.php:146
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:187
-#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Lib/ThreadItem.php:106
-#: ../../include/channel.php:937 ../../include/channel.php:941
-#: ../../include/menu.php:108 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36
+#: ../../Zotlabs/Module/Editlayout.php:114
+#: ../../Zotlabs/Module/Editwebpage.php:145
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Settings.php:706 ../../Zotlabs/Module/Thing.php:260
+#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/page_widgets.php:9
+#: ../../include/page_widgets.php:39 ../../include/channel.php:976
+#: ../../include/channel.php:980 ../../include/menu.php:108
 msgid "Edit"
 msgstr "Modifier"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Connedit.php:572
-#: ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Connedit.php:602
 #: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Editlayout.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039
+#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Photos.php:1171 ../../Zotlabs/Module/Admin.php:1039
 #: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114
-#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261
-#: ../../Zotlabs/Module/Webpages.php:189 ../../Zotlabs/Lib/Apps.php:338
-#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:657
+#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Module/Settings.php:707 ../../Zotlabs/Module/Thing.php:261
+#: ../../Zotlabs/Module/Webpages.php:196 ../../Zotlabs/Lib/Apps.php:342
+#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -156,74 +301,73 @@ msgstr "Nouveau dossier"
 msgid "Upload file"
 msgstr "Téléverser un fichier"
 
-#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:112
+#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Module/Import_items.php:114
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../include/items.php:385
+#: ../../include/items.php:384
 msgid "Permission denied"
 msgstr "Accès refusé"
 
-#: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Channel.php:105
-#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:65
+#: ../../Zotlabs/Module/Achievements.php:34
+#: ../../Zotlabs/Module/Connedit.php:390 ../../Zotlabs/Module/Id.php:76
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Events.php:264
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Events.php:265
-#: ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Chat.php:100
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:69
-#: ../../Zotlabs/Module/Editwebpage.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Filestorage.php:24
-#: ../../Zotlabs/Module/Filestorage.php:79
-#: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:210
-#: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070
+#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:104
+#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Pdledit.php:26
+#: ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:93
+#: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
+#: ../../Zotlabs/Module/Item.php:213 ../../Zotlabs/Module/Item.php:221
+#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Photos.php:73
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:121
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Channel.php:104
+#: ../../Zotlabs/Module/Channel.php:225 ../../Zotlabs/Module/Channel.php:266
 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Notifications.php:70
-#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68
-#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203
-#: ../../Zotlabs/Module/Profiles.php:601
-#: ../../Zotlabs/Module/Profile_photo.php:256
-#: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Appman.php:75
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
+#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Profile_photo.php:265
+#: ../../Zotlabs/Module/Profile_photo.php:278
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Editblock.php:67
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
-#: ../../Zotlabs/Module/Sharedwithme.php:11
+#: ../../Zotlabs/Module/Settings.php:626 ../../Zotlabs/Module/Setup.php:215
+#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Thing.php:274
+#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:331
 #: ../../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:25
-#: ../../Zotlabs/Module/Viewconnections.php:30
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
-#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/items.php:3438
-#: ../../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/photos.php:27
+#: ../../Zotlabs/Module/Webpages.php:73
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Api.php:13
+#: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../include/photos.php:27 ../../include/attach.php:141
+#: ../../include/attach.php:189 ../../include/attach.php:252
+#: ../../include/attach.php:266 ../../include/attach.php:273
+#: ../../include/attach.php:338 ../../include/attach.php:352
+#: ../../include/attach.php:359 ../../include/attach.php:439
+#: ../../include/attach.php:901 ../../include/attach.php:972
+#: ../../include/attach.php:1124 ../../include/items.php:3448
 msgid "Permission denied."
 msgstr "Permission refusée."
 
@@ -231,9 +375,9 @@ msgstr "Permission refusée."
 msgid "Not Found"
 msgstr "Introuvable"
 
-#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97
-#: ../../Zotlabs/Module/Page.php:93
+#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Display.php:118
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Help.php:97
+#: ../../Zotlabs/Module/Block.php:79
 msgid "Page not found."
 msgstr "Page introuvable."
 
@@ -249,13 +393,13 @@ msgstr "Authentification distante bloquée. Vous êtes connecté(e) sur ce site
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Bienvenue %s. L'authentification distante a fonctionné."
 
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../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/channel.php:837
+#: ../../Zotlabs/Module/Achievements.php:15
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Layouts.php:31
+#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:33
+#: ../../include/channel.php:876
 msgid "Requested profile is not available."
 msgstr "Profil demandé non disponible."
 
@@ -263,229 +407,6 @@ msgstr "Profil demandé non disponible."
 msgid "Some blurb about what to do when you're new here"
 msgstr "Quelques mots sur quoi faire quand on est nouveau ici"
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152
-#: ../../Zotlabs/Module/Editblock.php:108
-msgid "Block Name"
-msgstr "Nom du Bloc"
-
-#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2265
-msgid "Blocks"
-msgstr "Blocs"
-
-#: ../../Zotlabs/Module/Blocks.php:153
-msgid "Block Title"
-msgstr "Titre du bloc"
-
-#: ../../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 "Créé(e)"
-
-#: ../../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 "Modifié(e)"
-
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
-#: ../../include/conversation.php:1208
-msgid "Share"
-msgstr "Partager"
-
-#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193
-#: ../../include/page_widgets.php:39
-msgid "View"
-msgstr "Voir"
-
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Block.php:43
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
-msgid "Channel not found."
-msgstr "Canal introuvable."
-
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr "Permissions refusées."
-
-#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
-msgid "l, F j"
-msgstr "l, F j"
-
-#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
-#: ../../include/text.php:1732
-msgid "Link to Source"
-msgstr "Lien vers la Source"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Edit Event"
-msgstr "Modifier l'événement"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Create Event"
-msgstr "Créer un événement"
-
-#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
-#: ../../Zotlabs/Module/Photos.php:949
-msgid "Previous"
-msgstr "Précédent"
-
-#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
-#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
-msgid "Next"
-msgstr "Suivant"
-
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
-#: ../../include/widgets.php:755
-msgid "Export"
-msgstr "Export"
-
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
-#: ../../include/widgets.php:756
-msgid "Import"
-msgstr "Import"
-
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Import.php:550
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Photos.php:677
-#: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
-#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032
-#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421
-#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733
-#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Appman.php:126
-#: ../../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:312
-#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
-#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:757
-#: ../../include/widgets.php:769 ../../include/js_strings.php:22
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Submit"
-msgstr "Envoyer"
-
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
-msgid "Today"
-msgstr "Aujourd'hui"
-
-#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
-msgid "You must be logged in to see this page."
-msgstr "Vous devez vous connecter pour voir cette page."
-
-#: ../../Zotlabs/Module/Channel.php:41
-msgid "Posts and comments"
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:42
-msgid "Only posts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:102
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Permissions insuffisantes. Demande redirigée vers la page du profil."
-
-#: ../../Zotlabs/Module/Chat.php:181
-msgid "Room not found"
-msgstr "Salon introuvable"
-
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "Leave Room"
-msgstr "Quitter le salon"
-
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "Delete Room"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:199
-msgid "I am away right now"
-msgstr "Je suis absent en ce moment"
-
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "I am online"
-msgstr "Je suis en ligne"
-
-#: ../../Zotlabs/Module/Chat.php:202
-msgid "Bookmark this room"
-msgstr "Marquer ce salon comme favori"
-
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
-#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176
-msgid "Please enter a link URL:"
-msgstr "Merci d'entrer l'URL d'un lien&nbsp;:"
-
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
-#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
-#: ../../include/conversation.php:1256
-msgid "Encrypt text"
-msgstr "Chiffrer le texte"
-
-#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143
-msgid "Insert web link"
-msgstr "Insérer lien web"
-
-#: ../../Zotlabs/Module/Chat.php:218
-msgid "Feature disabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "New Chatroom"
-msgstr "Nouveau salon de discussion"
-
-#: ../../Zotlabs/Module/Chat.php:233
-msgid "Chatroom name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:234
-msgid "Expiration of chats (minutes)"
-msgstr "Expiration des discussions (en minutes)"
-
-#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
-#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
-#: ../../include/acl_selectors.php:283
-msgid "Permissions"
-msgstr "Autorisations"
-
-#: ../../Zotlabs/Module/Chat.php:246
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "Salons de %1$s"
-
-#: ../../Zotlabs/Module/Chat.php:251
-msgid "No chatrooms available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Create New"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:255
-msgid "Expiration"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:256
-msgid "min"
-msgstr ""
-
 #: ../../Zotlabs/Module/Chatsvc.php:117
 msgid "Away"
 msgstr "Absent"
@@ -494,65 +415,6 @@ msgstr "Absent"
 msgid "Online"
 msgstr "En ligne"
 
-#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40
-msgid "Invalid item."
-msgstr "Élément invalide."
-
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
-msgstr "Favori ajouté"
-
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
-msgstr "Mes Favoris"
-
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
-msgstr "Favoris de mes contacts"
-
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
-msgstr "Continuer"
-
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
-msgstr "Configuration du canal VIP"
-
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
-msgstr "Activer les restrictions liées au canal VIP"
-
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Merci de saisir les restrictions et/ou conditions - reçu Paypal, transaction Bitcoin, ligne de conduite, ..."
-
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Avant d'autoriser la mise en relation, ce canal attire votre attention sur les conditions suivantes&nbsp;:"
-
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Les contacts potentiels verront ce qui suit avant de pouvoir continuer&nbsp;:"
-
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "En continuant, je certifie que je me suis conformé à toutes les instructions indiquées sur cette page."
-
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Aucune instruction spécifique n'a été fournie par le propriétaire du canal.)"
-
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
-msgstr "Canal VIP ou restreint"
-
 #: ../../Zotlabs/Module/Connedit.php:80
 msgid "Could not access contact record."
 msgstr "Impossible d'accéder aux détails du contact."
@@ -561,317 +423,350 @@ msgstr "Impossible d'accéder aux détails du contact."
 msgid "Could not locate selected profile."
 msgstr "Impossible de localiser le profil sélectionné."
 
-#: ../../Zotlabs/Module/Connedit.php:227
+#: ../../Zotlabs/Module/Connedit.php:248
 msgid "Connection updated."
 msgstr "Contact mis à jour."
 
-#: ../../Zotlabs/Module/Connedit.php:229
+#: ../../Zotlabs/Module/Connedit.php:250
 msgid "Failed to update connection record."
 msgstr "Impossible de mettre à jour les détails du contact."
 
-#: ../../Zotlabs/Module/Connedit.php:276
+#: ../../Zotlabs/Module/Connedit.php:300
 msgid "is now connected to"
 msgstr "est maintenant connecté avec"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89
-#: ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:459
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Connedit.php:685
+#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:459 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:89
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "No"
 msgstr "Non"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
-#: ../../Zotlabs/Module/Api.php:88 ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:461
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:461 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:88
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "Yes"
 msgstr "Oui"
 
-#: ../../Zotlabs/Module/Connedit.php:411
+#: ../../Zotlabs/Module/Connedit.php:435
 msgid "Could not access address book record."
 msgstr "Impossible d'accéder aux détails du carnet d'adresses."
 
-#: ../../Zotlabs/Module/Connedit.php:425
+#: ../../Zotlabs/Module/Connedit.php:455
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Actualisation impossible - le canal est indisponible."
 
-#: ../../Zotlabs/Module/Connedit.php:440 ../../Zotlabs/Module/Connedit.php:449
-#: ../../Zotlabs/Module/Connedit.php:458 ../../Zotlabs/Module/Connedit.php:467
-#: ../../Zotlabs/Module/Connedit.php:480
+#: ../../Zotlabs/Module/Connedit.php:470 ../../Zotlabs/Module/Connedit.php:479
+#: ../../Zotlabs/Module/Connedit.php:488 ../../Zotlabs/Module/Connedit.php:497
+#: ../../Zotlabs/Module/Connedit.php:510
 msgid "Unable to set address book parameters."
 msgstr "Impossible de régler les paramètres du carnet d'adresses."
 
-#: ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:533
 msgid "Connection has been removed."
 msgstr "Le contact a été supprimé."
 
-#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219
-#: ../../include/nav.php:86 ../../include/conversation.php:954
+#: ../../Zotlabs/Module/Connedit.php:549 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:86 ../../include/conversation.php:957
 msgid "View Profile"
 msgstr "Voir le profil"
 
-#: ../../Zotlabs/Module/Connedit.php:522
+#: ../../Zotlabs/Module/Connedit.php:552
 #, php-format
 msgid "View %s's profile"
 msgstr "Voir le profil de %s"
 
-#: ../../Zotlabs/Module/Connedit.php:526
+#: ../../Zotlabs/Module/Connedit.php:556
 msgid "Refresh Permissions"
 msgstr "Actualiser les autorisations"
 
-#: ../../Zotlabs/Module/Connedit.php:529
+#: ../../Zotlabs/Module/Connedit.php:559
 msgid "Fetch updated permissions"
 msgstr "Récupérer les autorisations les plus récentes"
 
-#: ../../Zotlabs/Module/Connedit.php:533
+#: ../../Zotlabs/Module/Connedit.php:563
 msgid "Recent Activity"
 msgstr "Activité récente"
 
-#: ../../Zotlabs/Module/Connedit.php:536
+#: ../../Zotlabs/Module/Connedit.php:566
 msgid "View recent posts and comments"
 msgstr "Voir les publications et commentaires récents"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1041
 msgid "Unblock"
 msgstr "Débloquer"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1040
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1040
 msgid "Block"
 msgstr "Bloquer"
 
-#: ../../Zotlabs/Module/Connedit.php:543
+#: ../../Zotlabs/Module/Connedit.php:573
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Bloquer ou débloquer toute communication avec ce contact"
 
-#: ../../Zotlabs/Module/Connedit.php:544
+#: ../../Zotlabs/Module/Connedit.php:574
 msgid "This connection is blocked!"
 msgstr "Ce contact est bloqué&nbsp;!"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 #: ../../Zotlabs/Module/Connections.php:277
 #: ../../Zotlabs/Module/Notifications.php:55
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../../Zotlabs/Module/Connedit.php:551
+#: ../../Zotlabs/Module/Connedit.php:581
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignorer ou ne plus ignorer toute communication venant de ce contact"
 
-#: ../../Zotlabs/Module/Connedit.php:552
+#: ../../Zotlabs/Module/Connedit.php:582
 msgid "This connection is ignored!"
 msgstr "Ce contact est ignoré&nbsp;!"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Unarchive"
 msgstr "Désarchiver"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Archive"
 msgstr "Archiver"
 
-#: ../../Zotlabs/Module/Connedit.php:559
+#: ../../Zotlabs/Module/Connedit.php:589
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Archiver ou désarchiver ce contact - le marquer comme inactif mais conserver le contenu"
 
-#: ../../Zotlabs/Module/Connedit.php:560
+#: ../../Zotlabs/Module/Connedit.php:590
 msgid "This connection is archived!"
 msgstr "Ce contact est archivé&nbsp;!"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Unhide"
 msgstr "Ne plus cacher"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Hide"
 msgstr "Cacher"
 
-#: ../../Zotlabs/Module/Connedit.php:567
+#: ../../Zotlabs/Module/Connedit.php:597
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Cacher ou ne plus cacher ce contact vis-à-vis de vos autres contacts"
 
-#: ../../Zotlabs/Module/Connedit.php:568
+#: ../../Zotlabs/Module/Connedit.php:598
 msgid "This connection is hidden!"
 msgstr "Ce contact est caché&nbsp;!"
 
-#: ../../Zotlabs/Module/Connedit.php:575
+#: ../../Zotlabs/Module/Connedit.php:605
 msgid "Delete this connection"
 msgstr "Supprimer ce contact"
 
-#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493
+#: ../../Zotlabs/Module/Connedit.php:620 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Moi"
 
-#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494
+#: ../../Zotlabs/Module/Connedit.php:621 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Famille"
 
-#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342
-#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
-#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
-#: ../../include/widgets.php:495 ../../include/selectors.php:123
-#: ../../include/channel.php:389 ../../include/channel.php:390
-#: ../../include/channel.php:397
+#: ../../Zotlabs/Module/Connedit.php:622 ../../Zotlabs/Module/Settings.php:391
+#: ../../Zotlabs/Module/Settings.php:395 ../../Zotlabs/Module/Settings.php:396
+#: ../../Zotlabs/Module/Settings.php:399 ../../Zotlabs/Module/Settings.php:410
+#: ../../include/channel.php:402 ../../include/channel.php:403
+#: ../../include/channel.php:410 ../../include/selectors.php:123
+#: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "Amis"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496
+#: ../../Zotlabs/Module/Connedit.php:623 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Connaissances"
 
-#: ../../Zotlabs/Module/Connedit.php:594
+#: ../../Zotlabs/Module/Connedit.php:624
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
 msgid "All"
 msgstr "Tous"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Approve this connection"
 msgstr "Autoriser ce contact"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Accept connection to allow communication"
 msgstr "Accepter le contact pour permettre la communication"
 
-#: ../../Zotlabs/Module/Connedit.php:659
+#: ../../Zotlabs/Module/Connedit.php:690
 msgid "Set Affinity"
 msgstr "Définir le degré d'affinité"
 
-#: ../../Zotlabs/Module/Connedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:693
 msgid "Set Profile"
 msgstr "Définir le profil"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Zotlabs/Module/Connedit.php:696
 msgid "Set Affinity & Profile"
 msgstr "Définir le degré d'affinité et le profil"
 
-#: ../../Zotlabs/Module/Connedit.php:698
+#: ../../Zotlabs/Module/Connedit.php:745
 msgid "none"
 msgstr "Aucun"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/widgets.php:623
 msgid "Connection Default Permissions"
 msgstr "Autorisations par défaut des contacts"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3926
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/items.php:3935
 #, php-format
 msgid "Connection: %s"
 msgstr "Contact&nbsp;: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Apply these permissions automatically"
 msgstr "Appliquer ces permissions automatiquement"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Connection requests will be approved without your interaction"
 msgstr "Les demandes de contact seront approuvées automatiquement"
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Zotlabs/Module/Connedit.php:752
 msgid "This connection's primary address is"
 msgstr "L'adresse principale de ce contact est"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:753
 msgid "Available locations:"
 msgstr "Emplacements disponibles&nbsp;:"
 
-#: ../../Zotlabs/Module/Connedit.php:710
+#: ../../Zotlabs/Module/Connedit.php:757
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Les permissions indiquées sur cette page seront appliquées à tous vos nouveaux contacts."
 
-#: ../../Zotlabs/Module/Connedit.php:711
+#: ../../Zotlabs/Module/Connedit.php:758
 msgid "Connection Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:713
+#: ../../Zotlabs/Module/Connedit.php:760
 msgid "Slide to adjust your degree of friendship"
 msgstr "Faites glisser pour ajuster votre proximité avec le contact"
 
-#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159
+#: ../../Zotlabs/Module/Connedit.php:761 ../../Zotlabs/Module/Rate.php:159
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Evaluation"
 
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Zotlabs/Module/Connedit.php:762
 msgid "Slide to adjust your rating"
 msgstr "Faîtes glisser pour ajuster votre note"
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:763 ../../Zotlabs/Module/Connedit.php:768
 msgid "Optionally explain your rating"
 msgstr "Explication facultative de votre évaluation"
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Zotlabs/Module/Connedit.php:765
 msgid "Custom Filter"
 msgstr "Filtre personnalisé"
 
-#: ../../Zotlabs/Module/Connedit.php:719
+#: ../../Zotlabs/Module/Connedit.php:766
 msgid "Only import posts with this text"
 msgstr "N'importer que les publications comprenant ce texte"
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:766 ../../Zotlabs/Module/Connedit.php:767
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "un mot par ligne ou #étiquettes ou /motif/ ou lang=xx, laisser vide pour importer toutes les publications"
 
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:767
 msgid "Do not import posts with this text"
 msgstr "Ne pas importer les publications comprenant ce texte"
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:769
 msgid "This information is public!"
 msgstr "Cette information est publique&nbsp;!"
 
-#: ../../Zotlabs/Module/Connedit.php:727
+#: ../../Zotlabs/Module/Connedit.php:774
 msgid "Connection Pending Approval"
 msgstr "Contact en attente d'approbation"
 
-#: ../../Zotlabs/Module/Connedit.php:730
+#: ../../Zotlabs/Module/Connedit.php:777
 msgid "inherited"
 msgstr "héritée"
 
-#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Module/Connedit.php:778 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:238
+#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Pdledit.php:66
+#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Import.php:560
+#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Mail.php:370 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771
+#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1211
+#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Admin.php:1648
+#: ../../Zotlabs/Module/Admin.php:1733 ../../Zotlabs/Module/Admin.php:2116
+#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Settings.php:644
+#: ../../Zotlabs/Module/Settings.php:757 ../../Zotlabs/Module/Settings.php:806
+#: ../../Zotlabs/Module/Settings.php:832 ../../Zotlabs/Module/Settings.php:855
+#: ../../Zotlabs/Module/Settings.php:943
+#: ../../Zotlabs/Module/Settings.php:1129 ../../Zotlabs/Module/Setup.php:312
+#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Thing.php:316
+#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:763
+#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:99
+msgid "Submit"
+msgstr "Envoyer"
+
+#: ../../Zotlabs/Module/Connedit.php:779
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Merci de choisir le profil que vous souhaitez montrer quand %s visite votre profil de manière authentifiée."
 
-#: ../../Zotlabs/Module/Connedit.php:734
+#: ../../Zotlabs/Module/Connedit.php:781
 msgid "Their Settings"
 msgstr "Leurs paramètres"
 
-#: ../../Zotlabs/Module/Connedit.php:735
+#: ../../Zotlabs/Module/Connedit.php:782
 msgid "My Settings"
 msgstr "Mes paramètres"
 
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:784
 msgid "Individual Permissions"
 msgstr "Permissions individuelles"
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Zotlabs/Module/Connedit.php:785
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -879,7 +774,7 @@ msgid ""
 " settings here."
 msgstr "Certaines permissions peuvent être héritées de vos <a href=\"settings\">paramètres de confidentialité</a> de canal, lesquels sont prioritaires sur les réglages individuels. Vous pouvez modifier ces permissions ici mais cela n'aura aucun effet à moins de changer les paramètres hérités."
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Zotlabs/Module/Connedit.php:786
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -887,17 +782,121 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Certaines permissions peuvent être héritées de vos <a href=\"settings\">paramètres de confidentialité</a> de canal, lesquels sont prioritaires sur les réglages individuels. Vous pouvez modifier ces permissions ici mais cela n'aura aucun effet à moins de changer les paramètres hérités."
 
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Connedit.php:787
 msgid "Last update:"
 msgstr "Dernière mise à jour&nbsp;:"
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Directory.php:63
+#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:20
+#: ../../Zotlabs/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr "Accès public refusé."
 
+#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:32
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
+#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3369
+msgid "Item not found."
+msgstr "Élément introuvable"
+
+#: ../../Zotlabs/Module/Id.php:13
+msgid "First Name"
+msgstr "Prénom"
+
+#: ../../Zotlabs/Module/Id.php:14
+msgid "Last Name"
+msgstr "Nom de famille"
+
+#: ../../Zotlabs/Module/Id.php:15
+msgid "Nickname"
+msgstr "Surnom"
+
+#: ../../Zotlabs/Module/Id.php:16
+msgid "Full Name"
+msgstr "Nom complet"
+
+#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../include/network.php:2203
+msgid "Email"
+msgstr "Courriel"
+
+#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
+#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:238
+msgid "Profile Photo"
+msgstr "Photo du Profil"
+
+#: ../../Zotlabs/Module/Id.php:22
+msgid "Profile Photo 16px"
+msgstr "Photo de profil 16px"
+
+#: ../../Zotlabs/Module/Id.php:23
+msgid "Profile Photo 32px"
+msgstr "Photo de profil 32px"
+
+#: ../../Zotlabs/Module/Id.php:24
+msgid "Profile Photo 48px"
+msgstr "Photo de profil 48px"
+
+#: ../../Zotlabs/Module/Id.php:25
+msgid "Profile Photo 64px"
+msgstr "Photo de profil 64px"
+
+#: ../../Zotlabs/Module/Id.php:26
+msgid "Profile Photo 80px"
+msgstr "Photo de profil 80px"
+
+#: ../../Zotlabs/Module/Id.php:27
+msgid "Profile Photo 128px"
+msgstr "Photo de profil 128px"
+
+#: ../../Zotlabs/Module/Id.php:28
+msgid "Timezone"
+msgstr "Fuseau horaire"
+
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
+msgid "Homepage URL"
+msgstr "URL de mon site Internet&nbsp;:"
+
+#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:236
+msgid "Language"
+msgstr "Langue"
+
+#: ../../Zotlabs/Module/Id.php:31
+msgid "Birth Year"
+msgstr "Année de naissance"
+
+#: ../../Zotlabs/Module/Id.php:32
+msgid "Birth Month"
+msgstr "Mois de naissance"
+
+#: ../../Zotlabs/Module/Id.php:33
+msgid "Birth Day"
+msgstr "Jour de naissance"
+
+#: ../../Zotlabs/Module/Id.php:34
+msgid "Birthdate"
+msgstr "Date de naissance"
+
+#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
+msgid "Gender"
+msgstr "Sexe"
+
+#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Male"
+msgstr "Homme"
+
+#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Female"
+msgstr "Femme"
+
+#: ../../Zotlabs/Module/Follow.php:34
+msgid "Channel added."
+msgstr "Canal ajouté."
+
 #: ../../Zotlabs/Module/Directory.php:243
 #, php-format
 msgid "%d rating"
@@ -917,12 +916,12 @@ msgstr "État&nbsp;:"
 msgid "Homepage: "
 msgstr "Site web&nbsp;:"
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1223
 msgid "Age:"
 msgstr "Age&nbsp;:"
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
-#: ../../include/event.php:84 ../../include/channel.php:1027
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/channel.php:1066
+#: ../../include/event.php:52 ../../include/event.php:84
 #: ../../include/bb2diaspora.php:507
 msgid "Location:"
 msgstr "Emplacement&nbsp;:"
@@ -931,18 +930,18 @@ msgstr "Emplacement&nbsp;:"
 msgid "Description:"
 msgstr "Description&nbsp;:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1239
 msgid "Hometown:"
 msgstr "Ville natale&nbsp;:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1247
 msgid "About:"
 msgstr "À propos&nbsp;:"
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147
-#: ../../include/widgets.php:184 ../../include/connections.php:78
-#: ../../include/conversation.php:956 ../../include/channel.php:1012
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1051
+#: ../../include/connections.php:78 ../../include/conversation.php:959
+#: ../../include/widgets.php:147 ../../include/widgets.php:184
 msgid "Connect"
 msgstr "Ajouter/Suivre"
 
@@ -1018,38 +1017,322 @@ msgstr "Du moins récent du plus récent"
 msgid "No entries (some entries may be hidden)."
 msgstr "Pas d'entrées (certaines peuvent être cachées)."
 
-#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
-#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3359
-msgid "Item not found."
-msgstr "Élément introuvable"
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
+msgstr "Continuer"
+
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
+msgstr "Configuration du canal VIP"
+
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
+msgstr "Activer les restrictions liées au canal VIP"
+
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Merci de saisir les restrictions et/ou conditions - reçu Paypal, transaction Bitcoin, ligne de conduite, ..."
+
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Avant d'autoriser la mise en relation, ce canal attire votre attention sur les conditions suivantes&nbsp;:"
+
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Les contacts potentiels verront ce qui suit avant de pouvoir continuer&nbsp;:"
+
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "En continuant, je certifie que je me suis conformé à toutes les instructions indiquées sur cette page."
+
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Aucune instruction spécifique n'a été fournie par le propriétaire du canal.)"
+
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
+msgstr "Canal VIP ou restreint"
+
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
+msgstr "Entrées du calendrier importées."
+
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+msgstr "Aucune entrée du calendrier trouvée."
+
+#: ../../Zotlabs/Module/Events.php:104
+msgid "Event can not end before it has started."
+msgstr "La fin de l'événement ne peut être antérieure à son début."
+
+#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
+#: ../../Zotlabs/Module/Events.php:135
+msgid "Unable to generate preview."
+msgstr "Impossible de générer l'aperçu."
+
+#: ../../Zotlabs/Module/Events.php:113
+msgid "Event title and start time are required."
+msgstr "Un titre et une date de début sont requises pour l'événement."
+
+#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
+msgid "Event not found."
+msgstr "Événement introuvable."
+
+#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:372
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
+#: ../../include/text.php:1924 ../../include/event.php:951
+msgid "event"
+msgstr "événement"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Edit event title"
+msgstr "Modifier le titre de l'événement"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Event title"
+msgstr "Titre de l'événement"
+
+#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
+#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
+#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
+#: ../../include/datetime.php:245
+msgid "Required"
+msgstr "Requis"
+
+#: ../../Zotlabs/Module/Events.php:450
+msgid "Categories (comma-separated list)"
+msgstr "Catégories (séparées par des virgules)"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Edit Category"
+msgstr "Modifier la catégorie"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Category"
+msgstr "Catégorie"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Edit start date and time"
+msgstr "Modifier la date et l'heure de début"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Start date and time"
+msgstr "Date et heure de début"
+
+#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
+msgid "Finish date and time are not known or not relevant"
+msgstr "Date et heure de fin inconnues ou sans objet"
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Edit finish date and time"
+msgstr "Modifier la date et l'heure de fin"
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Finish date and time"
+msgstr "Date et heure de fin"
+
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+msgid "Adjust for viewer timezone"
+msgstr "Ajuster au fuseau horaire du visiteur"
+
+#: ../../Zotlabs/Module/Events.php:459
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
+msgstr "Important pour les événements se tenant en un lieu particulier. Pas pratique pour les vacances communes à de nombreux pays dans le monde."
+
+#: ../../Zotlabs/Module/Events.php:461
+msgid "Edit Description"
+msgstr "Modifier la description"
+
+#: ../../Zotlabs/Module/Events.php:461 ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Rbmark.php:101
+msgid "Description"
+msgstr "Description"
+
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Location"
+msgstr "Modifier l'emplacement"
+
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Profiles.php:477
+#: ../../Zotlabs/Module/Profiles.php:698 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
+msgid "Location"
+msgstr "Emplacement"
+
+#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
+msgid "Share this event"
+msgstr "Partager cet événement"
+
+#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1091
+#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Lib/ThreadItem.php:719
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1198
+msgid "Preview"
+msgstr "Aperçu"
+
+#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1247
+msgid "Permission settings"
+msgstr "Gérer les autorisations"
+
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Advanced Options"
+msgstr "Options avancées"
+
+#: ../../Zotlabs/Module/Events.php:587 ../../Zotlabs/Module/Cal.php:259
+msgid "l, F j"
+msgstr "l, F j"
+
+#: ../../Zotlabs/Module/Events.php:609
+msgid "Edit event"
+msgstr "Modifier l'événement"
+
+#: ../../Zotlabs/Module/Events.php:611
+msgid "Delete event"
+msgstr "Supprimer l'événement"
+
+#: ../../Zotlabs/Module/Events.php:636 ../../Zotlabs/Module/Cal.php:308
+#: ../../include/text.php:1712
+msgid "Link to Source"
+msgstr "Lien vers la Source"
+
+#: ../../Zotlabs/Module/Events.php:645
+msgid "calendar"
+msgstr "calendrier"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Edit Event"
+msgstr "Modifier l'événement"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Create Event"
+msgstr "Créer un événement"
+
+#: ../../Zotlabs/Module/Events.php:665 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
+#: ../../Zotlabs/Module/Photos.php:947
+msgid "Previous"
+msgstr "Précédent"
+
+#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:675
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
+#: ../../Zotlabs/Module/Photos.php:956 ../../Zotlabs/Module/Setup.php:267
+msgid "Next"
+msgstr "Suivant"
+
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Cal.php:334
+msgid "Export"
+msgstr "Export"
+
+#: ../../Zotlabs/Module/Events.php:670 ../../Zotlabs/Module/Layouts.php:197
+#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Webpages.php:200 ../../include/page_widgets.php:42
+msgid "View"
+msgstr "Voir"
+
+#: ../../Zotlabs/Module/Events.php:671
+msgid "Month"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:672
+msgid "Week"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:673
+msgid "Day"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:341
+msgid "Today"
+msgstr "Aujourd'hui"
+
+#: ../../Zotlabs/Module/Events.php:707
+msgid "Event removed"
+msgstr "Événement supprimé"
+
+#: ../../Zotlabs/Module/Events.php:710
+msgid "Failed to remove event"
+msgstr "Impossible de supprimer l'événement"
+
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
+msgstr "Favori ajouté"
+
+#: ../../Zotlabs/Module/Bookmarks.php:75
+msgid "My Bookmarks"
+msgstr "Mes Favoris"
+
+#: ../../Zotlabs/Module/Bookmarks.php:86
+msgid "My Connections Bookmarks"
+msgstr "Favoris de mes contacts"
 
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 #: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:81
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 msgid "Item not found"
 msgstr "Élément introuvable"
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228
-msgid "Title (optional)"
-msgstr "Titre (facultatif)"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
+msgstr "Elément non modifiable"
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
-msgstr "Modifier le bloc"
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:134
+msgid "Edit post"
+msgstr "Modifier la publication"
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
-msgstr "Pas de canal."
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222
+#: ../../include/nav.php:92 ../../include/conversation.php:1647
+msgid "Photos"
+msgstr "Photos"
 
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
-msgstr "Contacts en commun"
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:645
+#: ../../Zotlabs/Module/Settings.php:671 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Wiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:202 ../../include/conversation.php:1235
+#: ../../include/conversation.php:1274
+msgid "Cancel"
+msgstr "Annuler"
 
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
-msgstr "Pas de contacts en commun."
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
+msgstr "Élément invalide."
+
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Wall_upload.php:33
+msgid "Channel not found."
+msgstr "Canal introuvable."
+
+#: ../../Zotlabs/Module/Page.php:131
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
+" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Save to Folder:"
+msgstr "Classer dans le dossier&nbsp;:"
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "- select -"
+msgstr "- choisir -"
+
+#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
+#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:926
+#: ../../include/text.php:938 ../../include/widgets.php:201
+msgid "Save"
+msgstr "Enregistrer"
 
 #: ../../Zotlabs/Module/Connections.php:56
 #: ../../Zotlabs/Module/Connections.php:161
@@ -1077,7 +1360,7 @@ msgstr "Archivé"
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1535
+#: ../../include/conversation.php:1550
 msgid "New"
 msgstr "Nouveautés"
 
@@ -1164,15 +1447,15 @@ msgstr "Ignorer le contact"
 msgid "Recent activity"
 msgstr "Activité récente"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
-#: ../../include/text.php:875 ../../include/nav.php:186
+#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209
+#: ../../include/nav.php:188 ../../include/text.php:855
 msgid "Connections"
 msgstr "Contacts"
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:228 ../../include/text.php:945
-#: ../../include/text.php:957 ../../include/nav.php:165
-#: ../../include/acl_selectors.php:276
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:167
+#: ../../include/text.php:925 ../../include/text.php:937
+#: ../../include/acl_selectors.php:274
 msgid "Search"
 msgstr "Recherche"
 
@@ -1185,7 +1468,7 @@ msgid "Connections search"
 msgstr "Chercher des contacts"
 
 #: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:79
+#: ../../Zotlabs/Module/Profile_photo.php:61
 msgid "Image uploaded but image cropping failed."
 msgstr "L'image a été téléversée, mais le recadrage a échoué."
 
@@ -1195,66 +1478,66 @@ msgid "Cover Photos"
 msgstr "Photos de couverture"
 
 #: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:133
+#: ../../Zotlabs/Module/Profile_photo.php:135
 msgid "Image resize failed."
 msgstr "Le redimensionnement de l'image a échoué."
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144
+#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:148
 msgid "Unable to process image"
 msgstr "Impossible de traiter l'image"
 
 #: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:217
+#: ../../Zotlabs/Module/Profile_photo.php:223
 msgid "Image upload failed."
 msgstr "Le téléversement de l'image a échoué."
 
 #: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:236
+#: ../../Zotlabs/Module/Profile_photo.php:242
 msgid "Unable to process image."
 msgstr "Impossible de traîter l'image."
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4270
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4283
 msgid "female"
 msgstr "femme"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4271
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4284
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s a mis à jour son %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4272
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4285
 msgid "male"
 msgstr "homme"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4273
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4286
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s a mis à jour son %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4275
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4288
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s a mis a jour sa %2$s"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1661
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1726
 msgid "cover photo"
 msgstr "Photo principale"
 
 #: ../../Zotlabs/Module/Cover_photo.php:303
 #: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:283
-#: ../../Zotlabs/Module/Profile_photo.php:324
+#: ../../Zotlabs/Module/Profile_photo.php:300
+#: ../../Zotlabs/Module/Profile_photo.php:341
 msgid "Photo not available."
 msgstr "Photo inaccessible."
 
 #: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:387
 msgid "Upload File:"
 msgstr "Téléverser fichier&nbsp;:"
 
 #: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:366
+#: ../../Zotlabs/Module/Profile_photo.php:388
 msgid "Select a profile:"
 msgstr "Choisir un profil&nbsp;:"
 
@@ -1263,200 +1546,69 @@ msgid "Upload Cover Photo"
 msgstr "Téléverser une photo de couverture"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:985
+#: ../../Zotlabs/Module/Profile_photo.php:396
+#: ../../Zotlabs/Module/Settings.php:1080
 msgid "or"
 msgstr "ou"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "skip this step"
 msgstr "passer cette étape"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "select a photo from your photo albums"
 msgstr "choisir une photo dans vos albums"
 
 #: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Profile_photo.php:415
 msgid "Crop Image"
 msgstr "Recadrer l'image"
 
 #: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:391
+#: ../../Zotlabs/Module/Profile_photo.php:416
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Merci d'ajuster le cadre pour une visualisation optimale."
 
 #: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:393
+#: ../../Zotlabs/Module/Profile_photo.php:418
 msgid "Done Editing"
 msgstr "J'ai terminé"
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
-msgstr "Elément non modifiable"
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
+msgid "webpage"
+msgstr "pages web"
 
-#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
-msgid "Edit post"
-msgstr "Modifier la publication"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
+msgid "block"
+msgstr "bloquer"
 
-#: ../../Zotlabs/Module/Events.php:26
-msgid "Calendar entries imported."
-msgstr "Entrées du calendrier importées."
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
+msgid "layout"
+msgstr "mise en page"
 
-#: ../../Zotlabs/Module/Events.php:28
-msgid "No calendar entries found."
-msgstr "Aucune entrée du calendrier trouvée."
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
+msgid "menu"
+msgstr "menu"
 
-#: ../../Zotlabs/Module/Events.php:105
-msgid "Event can not end before it has started."
-msgstr "La fin de l'événement ne peut être antérieure à son début."
+#: ../../Zotlabs/Module/Impel.php:187
+#, php-format
+msgid "%s element installed"
+msgstr "Elément %s installé"
 
-#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116
-#: ../../Zotlabs/Module/Events.php:136
-msgid "Unable to generate preview."
-msgstr "Impossible de générer l'aperçu."
+#: ../../Zotlabs/Module/Impel.php:190
+#, php-format
+msgid "%s element installation failed"
+msgstr "L'installation de l'élément %s a échoué"
 
-#: ../../Zotlabs/Module/Events.php:114
-msgid "Event title and start time are required."
-msgstr "Un titre et une date de début sont requises pour l'événement."
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
+msgstr "Permissions refusées."
 
-#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
-msgid "Event not found."
-msgstr "Événement introuvable."
-
-#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949
-#: ../../include/text.php:1943 ../../include/conversation.php:123
-msgid "event"
-msgstr "événement"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Edit event title"
-msgstr "Modifier le titre de l'événement"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Event title"
-msgstr "Titre de l'événement"
-
-#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
-#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
-#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
-#: ../../include/datetime.php:245
-msgid "Required"
-msgstr "Requis"
-
-#: ../../Zotlabs/Module/Events.php:451
-msgid "Categories (comma-separated list)"
-msgstr "Catégories (séparées par des virgules)"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Edit Category"
-msgstr "Modifier la catégorie"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Category"
-msgstr "Catégorie"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Edit start date and time"
-msgstr "Modifier la date et l'heure de début"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Start date and time"
-msgstr "Date et heure de début"
-
-#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459
-msgid "Finish date and time are not known or not relevant"
-msgstr "Date et heure de fin inconnues ou sans objet"
-
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Edit finish date and time"
-msgstr "Modifier la date et l'heure de fin"
-
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Finish date and time"
-msgstr "Date et heure de fin"
-
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
-msgid "Adjust for viewer timezone"
-msgstr "Ajuster au fuseau horaire du visiteur"
-
-#: ../../Zotlabs/Module/Events.php:460
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr "Important pour les événements se tenant en un lieu particulier. Pas pratique pour les vacances communes à de nombreux pays dans le monde."
-
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Edit Description"
-msgstr "Modifier la description"
-
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117
-#: ../../Zotlabs/Module/Rbmark.php:101
-msgid "Description"
-msgstr "Description"
-
-#: ../../Zotlabs/Module/Events.php:464
-msgid "Edit Location"
-msgstr "Modifier l'emplacement"
-
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
-#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
-msgid "Location"
-msgstr "Emplacement"
-
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
-msgid "Share this event"
-msgstr "Partager cet événement"
-
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:719
-#: ../../include/conversation.php:1187 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr "Aperçu"
-
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232
-msgid "Permission settings"
-msgstr "Gérer les autorisations"
-
-#: ../../Zotlabs/Module/Events.php:476
-msgid "Advanced Options"
-msgstr "Options avancées"
-
-#: ../../Zotlabs/Module/Events.php:610
-msgid "Edit event"
-msgstr "Modifier l'événement"
-
-#: ../../Zotlabs/Module/Events.php:612
-msgid "Delete event"
-msgstr "Supprimer l'événement"
-
-#: ../../Zotlabs/Module/Events.php:646
-msgid "calendar"
-msgstr "calendrier"
-
-#: ../../Zotlabs/Module/Events.php:706
-msgid "Event removed"
-msgstr "Événement supprimé"
-
-#: ../../Zotlabs/Module/Events.php:709
-msgid "Failed to remove event"
-msgstr "Impossible de supprimer l'événement"
-
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220
-#: ../../include/nav.php:92 ../../include/conversation.php:1632
-msgid "Photos"
-msgstr "Photos"
-
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591
-#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259
-msgid "Cancel"
-msgstr "Annuler"
+#: ../../Zotlabs/Module/Cal.php:337
+msgid "Import"
+msgstr "Import"
 
 #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
 msgid "This site is not a directory server"
@@ -1466,112 +1618,184 @@ msgstr "Ce site n'est pas un serveur d'annuaire"
 msgid "This directory server requires an access token"
 msgstr "Ce serveur d'annuaire requiert un jeton d'accès"
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
-msgstr "Classer dans le dossier&nbsp;:"
+#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:28
+#: ../../Zotlabs/Module/Wiki.php:20
+msgid "You must be logged in to see this page."
+msgstr "Vous devez vous connecter pour voir cette page."
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
-msgstr "- choisir -"
+#: ../../Zotlabs/Module/Chat.php:181
+msgid "Room not found"
+msgstr "Salon introuvable"
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
-#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:946
-#: ../../include/text.php:958 ../../include/widgets.php:201
-msgid "Save"
-msgstr "Enregistrer"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "Leave Room"
+msgstr "Quitter le salon"
 
-#: ../../Zotlabs/Module/Dreport.php:27
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "Delete Room"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:199
+msgid "I am away right now"
+msgstr "Je suis absent en ce moment"
+
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "I am online"
+msgstr "Je suis en ligne"
+
+#: ../../Zotlabs/Module/Chat.php:202
+msgid "Bookmark this room"
+msgstr "Marquer ce salon comme favori"
+
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:197
+#: ../../Zotlabs/Module/Mail.php:306 ../../include/conversation.php:1181
+msgid "Please enter a link URL:"
+msgstr "Merci d'entrer l'URL d'un lien&nbsp;:"
+
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:250
+#: ../../Zotlabs/Module/Mail.php:375 ../../Zotlabs/Lib/ThreadItem.php:722
+#: ../../include/conversation.php:1271
+msgid "Encrypt text"
+msgstr "Chiffrer le texte"
+
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editwebpage.php:146
+#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:369
+#: ../../Zotlabs/Module/Editblock.php:111 ../../include/conversation.php:1146
+msgid "Insert web link"
+msgstr "Insérer lien web"
+
+#: ../../Zotlabs/Module/Chat.php:218
+msgid "Feature disabled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "New Chatroom"
+msgstr "Nouveau salon de discussion"
+
+#: ../../Zotlabs/Module/Chat.php:233
+msgid "Chatroom name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:234
+msgid "Expiration of chats (minutes)"
+msgstr "Expiration des discussions (en minutes)"
+
+#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
+#: ../../include/acl_selectors.php:281
+msgid "Permissions"
+msgstr "Autorisations"
+
+#: ../../Zotlabs/Module/Chat.php:246
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "Salons de %1$s"
+
+#: ../../Zotlabs/Module/Chat.php:251
+msgid "No chatrooms available"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create New"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:255
+msgid "Expiration"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chat.php:256
+msgid "min"
+msgstr ""
+
+#: ../../Zotlabs/Module/Dreport.php:44
 msgid "Invalid message"
 msgstr "Message non valide"
 
-#: ../../Zotlabs/Module/Dreport.php:59
+#: ../../Zotlabs/Module/Dreport.php:76
 msgid "no results"
 msgstr "aucun résultat"
 
-#: ../../Zotlabs/Module/Dreport.php:64
+#: ../../Zotlabs/Module/Dreport.php:91
+msgid "channel sync processed"
+msgstr "Synchro de canal effectuée"
+
+#: ../../Zotlabs/Module/Dreport.php:95
+msgid "queued"
+msgstr "mis dans la file d'attente"
+
+#: ../../Zotlabs/Module/Dreport.php:99
+msgid "posted"
+msgstr "publié"
+
+#: ../../Zotlabs/Module/Dreport.php:103
+msgid "accepted for delivery"
+msgstr "accepté pour la distribution"
+
+#: ../../Zotlabs/Module/Dreport.php:107
+msgid "updated"
+msgstr "mis à jour"
+
+#: ../../Zotlabs/Module/Dreport.php:110
+msgid "update ignored"
+msgstr "mise à jour ignorée"
+
+#: ../../Zotlabs/Module/Dreport.php:113
+msgid "permission denied"
+msgstr "permission refusée"
+
+#: ../../Zotlabs/Module/Dreport.php:117
+msgid "recipient not found"
+msgstr "destinataire introuvable"
+
+#: ../../Zotlabs/Module/Dreport.php:120
+msgid "mail recalled"
+msgstr "courriel rappelé"
+
+#: ../../Zotlabs/Module/Dreport.php:123
+msgid "duplicate mail received"
+msgstr "courriel reçu en double"
+
+#: ../../Zotlabs/Module/Dreport.php:126
+msgid "mail delivered"
+msgstr "courriel distribué"
+
+#: ../../Zotlabs/Module/Dreport.php:146
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Rapport de distribution pour %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "channel sync processed"
-msgstr "Synchro de canal effectuée"
+#: ../../Zotlabs/Module/Dreport.php:149
+msgid "Options"
+msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:82
-msgid "queued"
-msgstr "mis dans la file d'attente"
+#: ../../Zotlabs/Module/Dreport.php:150
+msgid "Redeliver"
+msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:86
-msgid "posted"
-msgstr "publié"
-
-#: ../../Zotlabs/Module/Dreport.php:90
-msgid "accepted for delivery"
-msgstr "accepté pour la distribution"
-
-#: ../../Zotlabs/Module/Dreport.php:94
-msgid "updated"
-msgstr "mis à jour"
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "update ignored"
-msgstr "mise à jour ignorée"
-
-#: ../../Zotlabs/Module/Dreport.php:100
-msgid "permission denied"
-msgstr "permission refusée"
-
-#: ../../Zotlabs/Module/Dreport.php:104
-msgid "recipient not found"
-msgstr "destinataire introuvable"
-
-#: ../../Zotlabs/Module/Dreport.php:107
-msgid "mail recalled"
-msgstr "courriel rappelé"
-
-#: ../../Zotlabs/Module/Dreport.php:110
-msgid "duplicate mail received"
-msgstr "courriel reçu en double"
-
-#: ../../Zotlabs/Module/Dreport.php:113
-msgid "mail delivered"
-msgstr "courriel distribué"
-
-#: ../../Zotlabs/Module/Editlayout.php:126
-#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
+#: ../../Zotlabs/Module/Editlayout.php:127
+#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
 msgid "Layout Name"
 msgstr "Nom de la mise en page"
 
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:130
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:131
 msgid "Layout Description (Optional)"
 msgstr "Description de la mise en page (facultatif)"
 
-#: ../../Zotlabs/Module/Editlayout.php:135
+#: ../../Zotlabs/Module/Editlayout.php:136
 msgid "Edit Layout"
 msgstr "Modifier la mise en page"
 
-#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Zotlabs/Module/Editwebpage.php:142
 msgid "Page link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Editwebpage.php:168
 msgid "Edit Webpage"
 msgstr "Modifier la page web"
 
-#: ../../Zotlabs/Module/Follow.php:34
-msgid "Channel added."
-msgstr "Canal ajouté."
-
-#: ../../Zotlabs/Module/Acl.php:227
-msgid "network"
-msgstr "réseau"
-
-#: ../../Zotlabs/Module/Acl.php:237
-msgid "RSS"
-msgstr "RSS"
-
 #: ../../Zotlabs/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "Groupe d'accès créé."
@@ -1581,7 +1805,7 @@ msgid "Could not create privacy group."
 msgstr "Impossible de créer le groupe d'accès."
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3893
+#: ../../include/items.php:3902
 msgid "Privacy group not found."
 msgstr "Groupe d'accès introuvable."
 
@@ -1625,31 +1849,57 @@ msgstr "Tous les canaux connectés"
 msgid "Click on a channel to add or remove."
 msgstr "Cliquer sur un canal pour l'ajouter ou le supprimer"
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
-msgid "Share content from Firefox to $Projectname"
-msgstr "Partager du contenu depuis Firefox avec $Projectname"
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+msgid "App installed."
+msgstr "Application installée."
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
-msgid "Activate the Firefox $Projectname provider"
-msgstr "Activer le connecteur $Projectname pour Firefox"
+#: ../../Zotlabs/Module/Appman.php:46
+msgid "Malformed app."
+msgstr "Erreur de l'application - Malformée."
 
-#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
-msgid "Authorize application connection"
-msgstr "Autoriser l'application à se connecter"
+#: ../../Zotlabs/Module/Appman.php:104
+msgid "Embed code"
+msgstr "Imbriquer le code"
 
-#: ../../Zotlabs/Module/Api.php:62
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Merci de retourner vers votre application, et d'y insérer ce Code de Sécurité&nbsp;:"
+#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
+msgid "Edit App"
+msgstr "Modifier l'application"
 
-#: ../../Zotlabs/Module/Api.php:72
-msgid "Please login to continue."
-msgstr "Merci de vous identifier pour continuer."
+#: ../../Zotlabs/Module/Appman.php:110
+msgid "Create App"
+msgstr "Créer une application"
 
-#: ../../Zotlabs/Module/Api.php:87
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Voulez-vous autoriser cette application à accéder à vos publications et contacts, et/ou à publier en votre nom?"
+#: ../../Zotlabs/Module/Appman.php:115
+msgid "Name of app"
+msgstr "Nom de l'application"
+
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Location (URL) of app"
+msgstr "Emplacement (URL) de l'application"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Photo icon URL"
+msgstr "URL de l'icône à utiliser pour cette photo"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "80 x 80 pixels - optional"
+msgstr "80 x 80 pixels - facultatif"
+
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "Categories (optional, comma separated list)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Appman.php:120
+msgid "Version ID"
+msgstr "Identifiant de version"
+
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Price of app"
+msgstr "Prix de l'application"
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Location (URL) to purchase app"
+msgstr "Emplacement (URL) pour l'achat de l'application"
 
 #: ../../Zotlabs/Module/Help.php:26
 msgid "Documentation Search"
@@ -1661,8 +1911,8 @@ msgid "Help:"
 msgstr "Aide&nbsp;:"
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223
-#: ../../include/nav.php:159
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/nav.php:161
 msgid "Help"
 msgstr "Aide"
 
@@ -1670,335 +1920,124 @@ msgstr "Aide"
 msgid "$Projectname Documentation"
 msgstr "Documentation $Projectname"
 
-#: ../../Zotlabs/Module/Filestorage.php:88
-msgid "Permission Denied."
-msgstr "Permission refusée."
-
-#: ../../Zotlabs/Module/Filestorage.php:104
-msgid "File not found."
-msgstr "Fichier introuvable."
-
-#: ../../Zotlabs/Module/Filestorage.php:147
-msgid "Edit file permissions"
-msgstr "Modifier les autorisations d'accès au fichier"
-
-#: ../../Zotlabs/Module/Filestorage.php:156
-msgid "Set/edit permissions"
-msgstr "Définir/modifier les autorisations"
-
-#: ../../Zotlabs/Module/Filestorage.php:157
-msgid "Include all files and sub folders"
-msgstr "Inclure tous fichiers et sous-répertoires"
-
-#: ../../Zotlabs/Module/Filestorage.php:158
-msgid "Return to file list"
-msgstr "Retourner à la liste des fichiers"
-
-#: ../../Zotlabs/Module/Filestorage.php:160
-msgid "Copy/paste this code to attach file to a post"
-msgstr "Copiez/collez ce code pour joindre le fichier à une publication"
-
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Copy/paste this URL to link file from a web page"
-msgstr "Copiez/collez cette URL pour pointer vers ce fichier depuis une page web"
-
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Share this file"
-msgstr "Partager ce fichier"
-
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Show URL to this file"
-msgstr "Montrer l'URL de ce fichier"
-
-#: ../../Zotlabs/Module/Filestorage.php:165
-msgid "Notify your contacts about this file"
-msgstr "Notifier vos contacts à propos de ce fichier"
-
-#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
-#: ../../include/nav.php:163
-msgid "Apps"
-msgstr "Applications"
-
 #: ../../Zotlabs/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Élément indisponible."
 
-#: ../../Zotlabs/Module/Import.php:32
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "Votre forfait n'autorise que %d canaux."
+#: ../../Zotlabs/Module/Pdledit.php:18
+msgid "Layout updated."
+msgstr "Mise en page mise à jour."
 
-#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
-msgstr "Rien à importer."
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
+msgid "Edit System Page Description"
+msgstr "Modifier la description de la page du système"
 
-#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
-msgstr "Impossible de récupérer les données de l'ancien serveur"
+#: ../../Zotlabs/Module/Pdledit.php:56
+msgid "Layout not found."
+msgstr "Mise en page introuvable."
 
-#: ../../Zotlabs/Module/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
-msgstr "Le fichier importé est vide."
+#: ../../Zotlabs/Module/Pdledit.php:62
+msgid "Module Name:"
+msgstr "Nom du module&nbsp;:"
 
-#: ../../Zotlabs/Module/Import.php:122
-#: ../../Zotlabs/Module/Import_items.php:86
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Attention&nbsp;: les versions de bases de données diffèrent de %1$d mises à jour."
+#: ../../Zotlabs/Module/Pdledit.php:63
+msgid "Layout Help"
+msgstr "Aide à la mise en page"
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
-msgid "Cloned channel not found. Import failed."
-msgstr "Canal cloné non trouvé. Echec de l'import."
+#: ../../Zotlabs/Module/Ffsapi.php:12
+msgid "Share content from Firefox to $Projectname"
+msgstr "Partager du contenu depuis Firefox avec $Projectname"
 
-#: ../../Zotlabs/Module/Import.php:160
-msgid "No channel. Import failed."
-msgstr "Pas de canal. Echec de l'import."
+#: ../../Zotlabs/Module/Ffsapi.php:15
+msgid "Activate the Firefox $Projectname provider"
+msgstr "Activer le connecteur $Projectname pour Firefox"
 
-#: ../../Zotlabs/Module/Import.php:510
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
-msgstr "L'import est terminé."
+#: ../../Zotlabs/Module/Acl.php:312
+msgid "network"
+msgstr "réseau"
 
-#: ../../Zotlabs/Module/Import.php:532
-msgid "You must be logged in to use this feature."
-msgstr "Vous devez vous connecter pour utiliser cette fonctionnalité."
+#: ../../Zotlabs/Module/Acl.php:322
+msgid "RSS"
+msgstr "RSS"
 
-#: ../../Zotlabs/Module/Import.php:537
-msgid "Import Channel"
-msgstr "Importation de canal"
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
+msgstr "Permission refusée."
 
-#: ../../Zotlabs/Module/Import.php:538
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You"
-" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file."
-msgstr "Utilisez ce formulaire pour importer un canal existant sur un autre serveur. Vous pouvez récupérer l'identité du canal sur l'ancien serveur directement par le réseau, ou bien fournir un fichier d'export/import."
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
+msgstr "Fichier introuvable."
 
-#: ../../Zotlabs/Module/Import.php:539
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "File to Upload"
-msgstr "Fichier à envoyer"
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
+msgstr "Modifier les autorisations d'accès au fichier"
 
-#: ../../Zotlabs/Module/Import.php:540
-msgid "Or provide the old server/hub details"
-msgstr "Ou fournissez les détails de l'ancien serveur/hub"
+#: ../../Zotlabs/Module/Filestorage.php:155
+msgid "Set/edit permissions"
+msgstr "Définir/modifier les autorisations"
 
-#: ../../Zotlabs/Module/Import.php:541
-msgid "Your old identity address (xyz@example.com)"
-msgstr "Votre ancienne identité (zyx@exemple.com)"
+#: ../../Zotlabs/Module/Filestorage.php:156
+msgid "Include all files and sub folders"
+msgstr "Inclure tous fichiers et sous-répertoires"
 
-#: ../../Zotlabs/Module/Import.php:542
-msgid "Your old login email address"
-msgstr "Votre ancienne adresse de courriel"
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Return to file list"
+msgstr "Retourner à la liste des fichiers"
 
-#: ../../Zotlabs/Module/Import.php:543
-msgid "Your old login password"
-msgstr "Votre ancien mot de passe"
+#: ../../Zotlabs/Module/Filestorage.php:159
+msgid "Copy/paste this code to attach file to a post"
+msgstr "Copiez/collez ce code pour joindre le fichier à une publication"
 
-#: ../../Zotlabs/Module/Import.php:544
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be"
-" able to post from either location, but only one can be marked as the "
-"primary location for files, photos, and media."
-msgstr "Quelle que soit l'option choisie, merci de décider si ce hub sera votre nouvelle adresse primaire, ou si votre ancien hub continuera à jouer ce rôle. Vous pourrez publier depuis l'emplacement de votre choix, mais une seule peut être déclarée comme stockage primaire de vos fichiers/photos/media."
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Copy/paste this URL to link file from a web page"
+msgstr "Copiez/collez cette URL pour pointer vers ce fichier depuis une page web"
 
-#: ../../Zotlabs/Module/Import.php:545
-msgid "Make this hub my primary location"
-msgstr "Faire de ce hub mon emplacement primaire"
+#: ../../Zotlabs/Module/Filestorage.php:162
+msgid "Share this file"
+msgstr "Partager ce fichier"
 
-#: ../../Zotlabs/Module/Import.php:546
-msgid ""
-"Import existing posts if possible (experimental - limited by available "
-"memory"
-msgstr "Importer les publications existantes si possible (expérimental - limité par la mémoire disponible)"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Show URL to this file"
+msgstr "Montrer l'URL de ce fichier"
 
-#: ../../Zotlabs/Module/Import.php:547
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
-msgstr "Ce processus peut prendre plusieurs minutes. Merci de ne valider le formulaire qu'une seule fois et de laisser cette page ouverte jusqu'à la fin."
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Notify your contacts about this file"
+msgstr "Notifier vos contacts à propos de ce fichier"
 
-#: ../../Zotlabs/Module/Item.php:178
-msgid "Unable to locate original post."
-msgstr "Impossible de localiser la publication initiale."
-
-#: ../../Zotlabs/Module/Item.php:427
-msgid "Empty post discarded."
-msgstr "Publication vide annulée."
-
-#: ../../Zotlabs/Module/Item.php:467
-msgid "Executable content type not permitted to this channel."
-msgstr "Les contenus de type 'exécutable' ne sont pas autorisés sur ce canal."
-
-#: ../../Zotlabs/Module/Item.php:847
-msgid "Duplicate post suppressed."
-msgstr "Publication en doublon supprimée."
-
-#: ../../Zotlabs/Module/Item.php:977
-msgid "System error. Post not saved."
-msgstr "Erreur système. Publication non sauvegardée."
-
-#: ../../Zotlabs/Module/Item.php:1241
-msgid "Unable to obtain post information from database."
-msgstr "Impossible d'obtenir les informations de publication depuis la base de données."
-
-#: ../../Zotlabs/Module/Item.php:1248
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Vous avez atteint votre limite de %1$.0f contributions \"racines\"."
-
-#: ../../Zotlabs/Module/Item.php:1255
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Vous avez atteint votre limite de %1$.0f pages web."
-
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2267
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2240
 msgid "Layouts"
 msgstr "Mises-en-page"
 
-#: ../../Zotlabs/Module/Layouts.php:183
+#: ../../Zotlabs/Module/Layouts.php:185
 msgid "Comanche page description language help"
 msgstr "Aide sur le langage de description de page Comanche"
 
-#: ../../Zotlabs/Module/Layouts.php:187
+#: ../../Zotlabs/Module/Layouts.php:189
 msgid "Layout Description"
 msgstr "Description de la mise en page"
 
-#: ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:114
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Webpages.php:205
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr "Créé(e)"
+
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:115
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Webpages.php:206
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+msgstr "Modifié(e)"
+
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1070
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:195
+#: ../../include/conversation.php:1219
+msgid "Share"
+msgstr "Partager"
+
+#: ../../Zotlabs/Module/Layouts.php:194
 msgid "Download PDL file"
 msgstr "Télécharger le fichier PDL"
 
-#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
-#: ../../Zotlabs/Module/Siteinfo.php:65
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../Zotlabs/Module/Home.php:79
-#, php-format
-msgid "Welcome to %s"
-msgstr "Bienvenue sur %s"
-
-#: ../../Zotlabs/Module/Id.php:13
-msgid "First Name"
-msgstr "Prénom"
-
-#: ../../Zotlabs/Module/Id.php:14
-msgid "Last Name"
-msgstr "Nom de famille"
-
-#: ../../Zotlabs/Module/Id.php:15
-msgid "Nickname"
-msgstr "Surnom"
-
-#: ../../Zotlabs/Module/Id.php:16
-msgid "Full Name"
-msgstr "Nom complet"
-
-#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
-#: ../../include/network.php:2151 ../../boot.php:1705
-msgid "Email"
-msgstr "Courriel"
-
-#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236
-msgid "Profile Photo"
-msgstr "Photo du Profil"
-
-#: ../../Zotlabs/Module/Id.php:22
-msgid "Profile Photo 16px"
-msgstr "Photo de profil 16px"
-
-#: ../../Zotlabs/Module/Id.php:23
-msgid "Profile Photo 32px"
-msgstr "Photo de profil 32px"
-
-#: ../../Zotlabs/Module/Id.php:24
-msgid "Profile Photo 48px"
-msgstr "Photo de profil 48px"
-
-#: ../../Zotlabs/Module/Id.php:25
-msgid "Profile Photo 64px"
-msgstr "Photo de profil 64px"
-
-#: ../../Zotlabs/Module/Id.php:26
-msgid "Profile Photo 80px"
-msgstr "Photo de profil 80px"
-
-#: ../../Zotlabs/Module/Id.php:27
-msgid "Profile Photo 128px"
-msgstr "Photo de profil 128px"
-
-#: ../../Zotlabs/Module/Id.php:28
-msgid "Timezone"
-msgstr "Fuseau horaire"
-
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
-msgid "Homepage URL"
-msgstr "URL de mon site Internet&nbsp;:"
-
-#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234
-msgid "Language"
-msgstr "Langue"
-
-#: ../../Zotlabs/Module/Id.php:31
-msgid "Birth Year"
-msgstr "Année de naissance"
-
-#: ../../Zotlabs/Module/Id.php:32
-msgid "Birth Month"
-msgstr "Mois de naissance"
-
-#: ../../Zotlabs/Module/Id.php:33
-msgid "Birth Day"
-msgstr "Jour de naissance"
-
-#: ../../Zotlabs/Module/Id.php:34
-msgid "Birthdate"
-msgstr "Date de naissance"
-
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
-msgid "Gender"
-msgstr "Sexe"
-
-#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Male"
-msgstr "Homme"
-
-#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Female"
-msgstr "Femme"
-
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
-msgid "webpage"
-msgstr "pages web"
-
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
-msgid "block"
-msgstr "bloquer"
-
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
-msgid "layout"
-msgstr "mise en page"
-
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
-msgid "menu"
-msgstr "menu"
-
-#: ../../Zotlabs/Module/Impel.php:196
-#, php-format
-msgid "%s element installed"
-msgstr "Elément %s installé"
-
-#: ../../Zotlabs/Module/Impel.php:199
-#, php-format
-msgid "%s element installation failed"
-msgstr "L'installation de l'élément %s a échoué"
-
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr "Aime/n'aime pas"
@@ -2034,1180 +2073,65 @@ msgstr "Canal indisponible."
 msgid "Previous action reversed."
 msgstr "Action précédente annulée."
 
-#: ../../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/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
+#: ../../include/text.php:1921
 msgid "photo"
 msgstr "photo"
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/text.php:1946 ../../include/conversation.php:148
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../include/conversation.php:148 ../../include/text.php:1927
 msgid "status"
 msgstr "état"
 
-#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
+#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s aime %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s n'aime pas %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:424
+#: ../../Zotlabs/Module/Like.php:423
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s approuve %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:426
+#: ../../Zotlabs/Module/Like.php:425
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s n'est pas d'accord avec %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:428
+#: ../../Zotlabs/Module/Like.php:427
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s s'abstient de toute décision sur le %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:430
+#: ../../Zotlabs/Module/Like.php:429
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s participe à %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:432
+#: ../../Zotlabs/Module/Like.php:431
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s ne participe pas à %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:434
+#: ../../Zotlabs/Module/Like.php:433
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s participe peut-être à %3$s de %2$s"
 
-#: ../../Zotlabs/Module/Like.php:537
+#: ../../Zotlabs/Module/Like.php:536
 msgid "Action completed."
 msgstr "Action terminée."
 
-#: ../../Zotlabs/Module/Like.php:538
+#: ../../Zotlabs/Module/Like.php:537
 msgid "Thank you."
 msgstr "Merci."
 
-#: ../../Zotlabs/Module/Import_items.php:102
-msgid "Import completed"
-msgstr "L'import est terminé."
-
-#: ../../Zotlabs/Module/Import_items.php:117
-msgid "Import Items"
-msgstr "Importer"
-
-#: ../../Zotlabs/Module/Import_items.php:118
-msgid ""
-"Use this form to import existing posts and content from an export file."
-msgstr "Utiliser ce formulaire pour importer des publications et du contenu existant d'un fichier d'export."
-
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
-msgstr "Limite du nombre total d'invitation dépassée."
-
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s&nbsp;: adresse courriel invalide."
-
-#: ../../Zotlabs/Module/Invite.php:63
-msgid "Please join us on $Projectname"
-msgstr "Rejoignez-nous sur $Projectname"
-
-#: ../../Zotlabs/Module/Invite.php:74
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Limite d'invitations dépassée. Merci de contacter l'administration de votre site."
-
-#: ../../Zotlabs/Module/Invite.php:79
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s&nbsp;: Échec de distribution du message."
-
-#: ../../Zotlabs/Module/Invite.php:83
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d message envoyé."
-msgstr[1] "%d messages envoyés."
-
-#: ../../Zotlabs/Module/Invite.php:102
-msgid "You have no more invitations available"
-msgstr "Vous ne disposez plus d'aucune invitation"
-
-#: ../../Zotlabs/Module/Invite.php:133
-msgid "Send invitations"
-msgstr "Envoyer des invitations"
-
-#: ../../Zotlabs/Module/Invite.php:134
-msgid "Enter email addresses, one per line:"
-msgstr "Entrez les adresses de courriel, une par ligne&nbsp;:"
-
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
-msgid "Your message:"
-msgstr "Votre message&nbsp;:"
-
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Please join my community on $Projectname."
-msgstr "Rejoignez ma communauté sur $Projectname."
-
-#: ../../Zotlabs/Module/Invite.php:138
-msgid "You will need to supply this invitation code:"
-msgstr "Vous devrez fournir le code suivant&nbsp;:"
-
-#: ../../Zotlabs/Module/Invite.php:139
-msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Enregistrez-vous sur n'importe quel serveur $Projectname (ils sont tous inter-connectés)"
-
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Saisissez l'adresse de mon canal $Projectname dans la barre de recherche du site."
-
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "or visit"
-msgstr "ou rendez-vous sur"
-
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "3. Click [Connect]"
-msgstr "3. Cliquez sur [Ajouter]"
-
-#: ../../Zotlabs/Module/Lockview.php:61
-msgid "Remote privacy information not available."
-msgstr "Les informations distantes de confidentialité ne sont pas disponibles."
-
-#: ../../Zotlabs/Module/Lockview.php:82
-msgid "Visible to:"
-msgstr "Visible par&nbsp;:"
-
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
-msgstr "Emplacement introuvable."
-
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
-msgstr "Echec de la recherche de l'emplacement."
-
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary"
-" location."
-msgstr "Merci de sélectionner un autre emplacement comme nouvel emplacement primaire avant de supprimer l'emplacement primaire actuel."
-
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
-msgstr "Synchronisation des emplacements"
-
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
-msgstr "Emplacement(s) introuvable."
-
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
-msgstr "Gérer les emplacements des canaux"
-
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470
-#: ../../Zotlabs/Module/Admin.php:1224
-msgid "Address"
-msgstr "Adresse"
-
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
-msgid "Drop"
-msgstr "Supprimer"
-
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
-msgstr ""
-
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
-msgstr "Merci d'attendre plusieurs minutes entre opérations successives."
-
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing"
-" your channel."
-msgstr "Quand c'est possible, abandonnez un emplacement en vous connectant sur le site/hub et en supprimant votre canal."
-
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
-msgstr "Utilisez ce formulaire pour abandonner l'emplacement si le hub n'est plus actif."
-
-#: ../../Zotlabs/Module/Magic.php:71
-msgid "Hub not found."
-msgstr "Hub introuvable."
-
-#: ../../Zotlabs/Module/Mail.php:38
-msgid "Unable to lookup recipient."
-msgstr "Impossible de localiser le destinataire."
-
-#: ../../Zotlabs/Module/Mail.php:45
-msgid "Unable to communicate with requested channel."
-msgstr "Impossible de communiquer avec le canal demandé."
-
-#: ../../Zotlabs/Module/Mail.php:52
-msgid "Cannot verify requested channel."
-msgstr "Impossible de vérifier le canal demandé."
-
-#: ../../Zotlabs/Module/Mail.php:78
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Le canal choisi a des restrictions quant aux messages privés. L'envoi a échoué."
-
-#: ../../Zotlabs/Module/Mail.php:143
-msgid "Messages"
-msgstr "Messages"
-
-#: ../../Zotlabs/Module/Mail.php:178
-msgid "Message recalled."
-msgstr "Message rappelé."
-
-#: ../../Zotlabs/Module/Mail.php:191
-msgid "Conversation removed."
-msgstr "Conversation supprimée."
-
-#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Expire le YYYY-MM-DD à HH:MM"
-
-#: ../../Zotlabs/Module/Mail.php:234
-msgid "Requested channel is not in this network"
-msgstr "Le canal demandé n'est pas sur ce réseau"
-
-#: ../../Zotlabs/Module/Mail.php:242
-msgid "Send Private Message"
-msgstr "Envoyer un message privé"
-
-#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
-msgid "To:"
-msgstr "À&nbsp;:"
-
-#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
-msgid "Subject:"
-msgstr "Objet&nbsp;:"
-
-#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
-#: ../../include/conversation.php:1220
-msgid "Attach file"
-msgstr "Joindre un fichier"
-
-#: ../../Zotlabs/Module/Mail.php:253
-msgid "Send"
-msgstr "Envoyer"
-
-#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
-#: ../../include/conversation.php:1251
-msgid "Set expiration date"
-msgstr "Définir la date d'expiration"
-
-#: ../../Zotlabs/Module/Mail.php:340
-msgid "Delete message"
-msgstr "Supprimer le message"
-
-#: ../../Zotlabs/Module/Mail.php:341
-msgid "Delivery report"
-msgstr "Rapport de distribution"
-
-#: ../../Zotlabs/Module/Mail.php:342
-msgid "Recall message"
-msgstr "Rappeler le message"
-
-#: ../../Zotlabs/Module/Mail.php:344
-msgid "Message has been recalled."
-msgstr "Le message a été rappelé."
-
-#: ../../Zotlabs/Module/Mail.php:361
-msgid "Delete Conversation"
-msgstr "Supprimer la conversation"
-
-#: ../../Zotlabs/Module/Mail.php:363
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Aucune communication sécurisée n'est possible. Vous pourrez <strong>peut-être</strong> répondre depuis la page de profil de l'émetteur."
-
-#: ../../Zotlabs/Module/Mail.php:367
-msgid "Send Reply"
-msgstr "Envoyer la réponse"
-
-#: ../../Zotlabs/Module/Mail.php:372
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr "Votre message pour %s (%s)&nbsp;:"
-
-#: ../../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 "Vous avez créé %1$.0f des %2$.0f canaux autorisés."
-
-#: ../../Zotlabs/Module/Manage.php:143
-msgid "Create a new channel"
-msgstr "Créer un nouveau canal"
-
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
-#: ../../include/nav.php:206
-msgid "Channel Manager"
-msgstr "Gérer les canaux"
-
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
-msgstr "Canal actif"
-
-#: ../../Zotlabs/Module/Manage.php:167
-msgid "Switch to one of your channels by selecting it."
-msgstr "Pour changer de canal, sélectionnez-en un"
-
-#: ../../Zotlabs/Module/Manage.php:168
-msgid "Default Channel"
-msgstr "Canal par défaut"
-
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
-msgstr "Définir comme défaut"
-
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
-msgstr "%d nouveaux messages"
-
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
-msgstr "%d nouvelles présentations"
-
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr "Aucun compte valide trouvé."
-
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr "Demande de réinitialisation du mot de passe envoyée. Vérifiez vos courriels."
-
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Membre du site (%s)"
-
-#: ../../Zotlabs/Module/Lostpass.php:44
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Demande de réinitialisation du mot de passe sur %s"
-
-#: ../../Zotlabs/Module/Lostpass.php:67
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "La demande n'a pas pu être vérifiée. (Peut-être l'avez vous déjà utilisée.) La réinitialisation a échoué."
-
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1711
-msgid "Password Reset"
-msgstr "Réinitialiser le mot de passe"
-
-#: ../../Zotlabs/Module/Lostpass.php:91
-msgid "Your password has been reset as requested."
-msgstr "Votre mot de passe a bien été réinitialisé."
-
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your new password is"
-msgstr "Votre nouveau mot de passe est"
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Save or copy your new password - and then"
-msgstr "Enregistrez ou copiez votre nouveau mot de passe, puis"
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "click here to login"
-msgstr "cliquez ici pour vous connecter"
-
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Votre mot de passe peut être changé depuis la page des <em>Paramètres</em> une fois connecté."
-
-#: ../../Zotlabs/Module/Lostpass.php:112
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Votre mot de passe de %s a été changé"
-
-#: ../../Zotlabs/Module/Lostpass.php:127
-msgid "Forgot your Password?"
-msgstr "Mot de passe oublié&nbsp;?"
-
-#: ../../Zotlabs/Module/Lostpass.php:128
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Saisissez votre adresse de courriel, et validez, pour réinitialiser votre mot de passe. Vérifiez ensuite votre boîte aux lettres pour la suite des instructions."
-
-#: ../../Zotlabs/Module/Lostpass.php:129
-msgid "Email Address"
-msgstr "Adresse de courriel"
-
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Reset"
-msgstr "Réinitialiser"
-
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
-msgstr "Impossible de mettre le menu à jour."
-
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
-msgstr "Impossible de créer le menu."
-
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
-msgstr "Nom du menu"
-
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Nom unique (non visible sur la page web) - requis"
-
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
-msgstr "Titre du menu"
-
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Visible pour la page web - laisser vide pour qu'il n'y ait pas de titre"
-
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
-msgstr "Autoriser l'usage de favoris"
-
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
-msgstr "Le menu pourra être utilisé pour stocker des favoris"
-
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
-msgstr "Valider et continuer"
-
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2266
-msgid "Menus"
-msgstr "Menus"
-
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
-msgstr "Favoris autorisés"
-
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
-msgstr "Supprimer ce menu"
-
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
-msgstr "Modifier le contenu du menu"
-
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
-msgstr "Modifier ce menu"
-
-#: ../../Zotlabs/Module/Menu.php:136
-msgid "Menu could not be deleted."
-msgstr "Impossible de supprimer le menu."
-
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
-msgid "Menu not found."
-msgstr "Menu introuvable."
-
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
-msgstr "Modifier le menu"
-
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
-msgstr "Ajouter/supprimer des entrées à ce menu"
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
-msgstr "Nom du menu"
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
-msgstr "Doit être unique, ne sera vu que par vous"
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
-msgstr "Titre du menu"
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title as seen by others"
-msgstr "Titre du menu tel que vu par les visiteurs"
-
-#: ../../Zotlabs/Module/Menu.php:157
-msgid "Allow bookmarks"
-msgstr "Autoriser l'usage de favoris"
-
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
-msgstr "Introuvable."
-
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr "%1$s est %2$s"
-
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225
-msgid "Mood"
-msgstr "Humeur"
-
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
-msgstr "Indiquez votre humeur du moment à vos amis"
-
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
-msgstr "Profils similaires"
-
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Aucun mot-clef à comparer. Merci d'ajouter des mots-clefs à votre profil par défaut."
-
-#: ../../Zotlabs/Module/Match.php:67
-msgid "is interested in:"
-msgstr "s'intéresse à&nbsp;:"
-
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
-msgstr "Pas de correspondance"
-
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
-msgstr "Groupe introuvable"
-
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
-msgstr "Canal introuvable"
-
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
-msgstr "forum"
-
-#: ../../Zotlabs/Module/Network.php:153
-msgid "Search Results For:"
-msgstr "Résultats de recherche pour&nbsp;:"
-
-#: ../../Zotlabs/Module/Network.php:217
-msgid "Privacy group is empty"
-msgstr "Groupe d'accès vide"
-
-#: ../../Zotlabs/Module/Network.php:226
-msgid "Privacy group: "
-msgstr "Groupe d'accès&nbsp;:"
-
-#: ../../Zotlabs/Module/Network.php:252
-msgid "Invalid connection."
-msgstr "Contact non valide."
-
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:98
-msgid "No more system notifications."
-msgstr "Pas d'autre notification du système."
-
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:102
-msgid "System Notifications"
-msgstr "Notifications du système"
-
-#: ../../Zotlabs/Module/Mitem.php:52
-msgid "Unable to create element."
-msgstr "Impossible de créer l'entrée."
-
-#: ../../Zotlabs/Module/Mitem.php:76
-msgid "Unable to update menu element."
-msgstr "Impossible de mettre à jour l'entrée de menu."
-
-#: ../../Zotlabs/Module/Mitem.php:92
-msgid "Unable to add menu element."
-msgstr "Impossible d'ajouter l'entrée de menu."
-
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
-msgid "Menu Item Permissions"
-msgstr "Permissions de l'entrée de menu"
-
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1068
-msgid "(click to open/close)"
-msgstr "(cliquer pour ouvrir/fermer)"
-
-#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
-msgid "Link Name"
-msgstr "Nom du lien"
-
-#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
-msgid "Link or Submenu Target"
-msgstr "Lien ou sous-menu cible"
-
-#: ../../Zotlabs/Module/Mitem.php:157
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "Entrez l'URL du lien ou sélectionnez un nom de menu pour créer un sous-menu"
-
-#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
-msgid "Use magic-auth if available"
-msgstr "Utiliser l'authentification distante, quand disponible"
-
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
-msgid "Open link in new window"
-msgstr "Ouvrir le lien dans une nouvelle fenêtre"
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Order in list"
-msgstr "Ordre dans la liste"
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Les nombres les plus élevés seront au bas de la liste"
-
-#: ../../Zotlabs/Module/Mitem.php:161
-msgid "Submit and finish"
-msgstr "Vadiler et terminer"
-
-#: ../../Zotlabs/Module/Mitem.php:162
-msgid "Submit and continue"
-msgstr "Valider et continuer"
-
-#: ../../Zotlabs/Module/Mitem.php:170
-msgid "Menu:"
-msgstr "Menu&nbsp;:"
-
-#: ../../Zotlabs/Module/Mitem.php:173
-msgid "Link Target"
-msgstr "Cible du lien"
-
-#: ../../Zotlabs/Module/Mitem.php:176
-msgid "Edit menu"
-msgstr "Modifier le menu"
-
-#: ../../Zotlabs/Module/Mitem.php:179
-msgid "Edit element"
-msgstr "Modifier l'entrée"
-
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Drop element"
-msgstr "Supprimer l'entrée"
-
-#: ../../Zotlabs/Module/Mitem.php:181
-msgid "New element"
-msgstr "Nouvelle entrée"
-
-#: ../../Zotlabs/Module/Mitem.php:182
-msgid "Edit this menu container"
-msgstr "Éditer ce bloc de menu"
-
-#: ../../Zotlabs/Module/Mitem.php:183
-msgid "Add menu element"
-msgstr "Ajouter une entrée au menu"
-
-#: ../../Zotlabs/Module/Mitem.php:184
-msgid "Delete this menu item"
-msgstr "Supprimer cette entrée du menu"
-
-#: ../../Zotlabs/Module/Mitem.php:185
-msgid "Edit this menu item"
-msgstr "Modifier cette entrée du menu"
-
-#: ../../Zotlabs/Module/Mitem.php:202
-msgid "Menu item not found."
-msgstr "Entrée de menu introuvable."
-
-#: ../../Zotlabs/Module/Mitem.php:215
-msgid "Menu item deleted."
-msgstr "Entrée de menu supprimée."
-
-#: ../../Zotlabs/Module/Mitem.php:217
-msgid "Menu item could not be deleted."
-msgstr "Impossible de supprimer l'entrée de menu."
-
-#: ../../Zotlabs/Module/Mitem.php:224
-msgid "Edit Menu Element"
-msgstr "Modifier l'entrée de menu"
-
-#: ../../Zotlabs/Module/Mitem.php:230
-msgid "Link text"
-msgstr "Texte du lien"
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Name or caption"
-msgstr "Nom ou libellé"
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
-msgstr "Exemples&nbsp;: \"Jérôme Dutilleul\", \"Louise et ses chevaux\", \"Football\", \"Club d'aéromodélisme\""
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-msgid "Choose a short nickname"
-msgstr "Choisissez un alias"
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-#, php-format
-msgid ""
-"Your nickname will be used to create an easy to remember channel address "
-"e.g. nickname%s"
-msgstr "Votre pseudo sera utilisé pour créer une adresse de canal facile à mémoriser, par ex. pseudo%s"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Channel role and privacy"
-msgstr "Rôle et confidentialité du canal"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Select a channel role with your privacy requirements."
-msgstr "Sélectionner un rôle de canal adapté à vos besoins de confidentialité."
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Read more about roles"
-msgstr "En savoir plus sur les rôles"
-
-#: ../../Zotlabs/Module/New_channel.php:135
-msgid "Create Channel"
-msgstr "Créer le canal"
-
-#: ../../Zotlabs/Module/New_channel.php:136
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
-msgstr "Un canal est votre identité sur ce réseau. Il peut représenter une personne, un blog, ou un forum par exemple. Les canaux peuvent entrer en contact les uns avec les autres pour partager des informations avec des permissions d'accès très fines."
-
-#: ../../Zotlabs/Module/New_channel.php:137
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr "ou <a href=\"import\">importer un canal existant</a> d'un autre serveur."
-
-#: ../../Zotlabs/Module/Notifications.php:30
-msgid "Invalid request identifier."
-msgstr "Identifiant de requête invalide."
-
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "Discard"
-msgstr "Annuler"
-
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
-msgid "Mark all system notifications seen"
-msgstr "Marquer toutes les notifications système comme vues"
-
-#: ../../Zotlabs/Module/Photos.php:84
-msgid "Page owner information could not be retrieved."
-msgstr "Impossible d'obtenir des informations sur le propriétaire de la page."
-
-#: ../../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
-#: ../../include/photo/photo_driver.php:718
-msgid "Profile Photos"
-msgstr "Photos du profil"
-
-#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
-msgid "Album not found."
-msgstr "Album introuvable."
-
-#: ../../Zotlabs/Module/Photos.php:132
-msgid "Delete Album"
-msgstr "Supprimer l'album"
-
-#: ../../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:210 ../../Zotlabs/Module/Photos.php:1053
-msgid "Delete Photo"
-msgstr "Supprimer la photo"
-
-#: ../../Zotlabs/Module/Photos.php:533
-msgid "No photos selected"
-msgstr "Aucune photo selectionnée"
-
-#: ../../Zotlabs/Module/Photos.php:582
-msgid "Access to this item is restricted."
-msgstr "L'accès à l'élément est restreint."
-
-#: ../../Zotlabs/Module/Photos.php:621
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "Vous avez utilisé %1$.2f mégaoctets sur les %2$.2f autorisés pour le stockage des photos."
-
-#: ../../Zotlabs/Module/Photos.php:624
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f méga-octets utilisés pour le stockage des photos."
-
-#: ../../Zotlabs/Module/Photos.php:660
-msgid "Upload Photos"
-msgstr "Téléverser des photos"
-
-#: ../../Zotlabs/Module/Photos.php:664
-msgid "Enter an album name"
-msgstr "Entrer un nom d'album"
-
-#: ../../Zotlabs/Module/Photos.php:665
-msgid "or select an existing album (doubleclick)"
-msgstr "ou sélectionner un album existant (double-clic)"
-
-#: ../../Zotlabs/Module/Photos.php:666
-msgid "Create a status post for this upload"
-msgstr "Créer une publication de statut pour cet envoi"
-
-#: ../../Zotlabs/Module/Photos.php:667
-msgid "Caption (optional):"
-msgstr "Légende (facultative)"
-
-#: ../../Zotlabs/Module/Photos.php:668
-msgid "Description (optional):"
-msgstr "Description (facultative)"
-
-#: ../../Zotlabs/Module/Photos.php:695
-msgid "Album name could not be decoded"
-msgstr "Le nom de l'Album n'a pu être décodé"
-
-#: ../../Zotlabs/Module/Photos.php:743
-msgid "Contact Photos"
-msgstr "Photos de contact"
-
-#: ../../Zotlabs/Module/Photos.php:766
-msgid "Show Newest First"
-msgstr "Les plus récent(e)s en premier"
-
-#: ../../Zotlabs/Module/Photos.php:768
-msgid "Show Oldest First"
-msgstr "Les moins récent(e)s en premier"
-
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
-#: ../../include/widgets.php:1499
-msgid "View Photo"
-msgstr "Voir la photo"
-
-#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1516
-msgid "Edit Album"
-msgstr "Modifier l'album"
-
-#: ../../Zotlabs/Module/Photos.php:870
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Permission refusée. L'accès à cet élément peut avoir été restreint."
-
-#: ../../Zotlabs/Module/Photos.php:872
-msgid "Photo not available"
-msgstr "Photo non disponible"
-
-#: ../../Zotlabs/Module/Photos.php:930
-msgid "Use as profile photo"
-msgstr "Utiliser comme photo du profil"
-
-#: ../../Zotlabs/Module/Photos.php:931
-msgid "Use as cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:938
-msgid "Private Photo"
-msgstr "Photo privée"
-
-#: ../../Zotlabs/Module/Photos.php:953
-msgid "View Full Size"
-msgstr "Voir en taille réelle"
-
-#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437
-#: ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr "Retirer"
-
-#: ../../Zotlabs/Module/Photos.php:1032
-msgid "Edit photo"
-msgstr "Modifier la photo"
-
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Rotate CW (right)"
-msgstr "Rotation horaire (droite)"
-
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CCW (left)"
-msgstr "Rotation anti-horaire (gauche)"
-
-#: ../../Zotlabs/Module/Photos.php:1038
-msgid "Enter a new album name"
-msgstr "Entrer un nouveau nom d'album"
-
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "or select an existing one (doubleclick)"
-msgstr "ou en sélectionner un existant (double-clic)"
-
-#: ../../Zotlabs/Module/Photos.php:1042
-msgid "Caption"
-msgstr "Titre/légende"
-
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Add a Tag"
-msgstr "Ajouter une étiquette"
-
-#: ../../Zotlabs/Module/Photos.php:1048
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Exemple&nbsp;: @marc, @Barbara_Jensen, @charles@exemple.com, #Ile_de_France, #marathon"
-
-#: ../../Zotlabs/Module/Photos.php:1051
-msgid "Flag as adult in album view"
-msgstr "Marquer comme \"adulte\" dans l'affichage de l'album"
-
-#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
-msgid "I like this (toggle)"
-msgstr "J'aime (oui/non)"
-
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
-msgid "I don't like this (toggle)"
-msgstr "Je n'aime pas (oui/non)"
-
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
-#: ../../include/conversation.php:740
-msgid "Please wait"
-msgstr "Merci de patienter"
-
-#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../Zotlabs/Lib/ThreadItem.php:707
-msgid "This is you"
-msgstr "C'est vous"
-
-#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
-msgid "Comment"
-msgstr "Commenter"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Likes"
-msgstr "Aime"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Dislikes"
-msgstr "N'aime pas"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Agree"
-msgstr "D'accord"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Disagree"
-msgstr "Pas d'accord"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Abstain"
-msgstr "Abstention"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Attending"
-msgstr "Participations"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Not attending"
-msgstr "Non-participations"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Might attend"
-msgstr "Participation possible"
-
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
-#: ../../include/conversation.php:1717
-msgid "View all"
-msgstr "Voir tout"
-
-#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1741
-#: ../../include/channel.php:1158
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Aime"
-msgstr[1] "Aime"
-
-#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/conversation.php:1744
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "N'aime pas"
-msgstr[1] "N'aime pas"
-
-#: ../../Zotlabs/Module/Photos.php:1235
-msgid "Photo Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1244
-msgid "In This Photo:"
-msgstr "Dans cette photo&nbsp;:"
-
-#: ../../Zotlabs/Module/Photos.php:1249
-msgid "Map"
-msgstr "Carte"
-
-#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
-msgctxt "noun"
-msgid "Likes"
-msgstr "Aime"
-
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
-msgctxt "noun"
-msgid "Dislikes"
-msgstr "N'aime pas"
-
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
-#: ../../include/acl_selectors.php:285
-msgid "Close"
-msgstr "Fermer"
-
-#: ../../Zotlabs/Module/Photos.php:1337
-msgid "View Album"
-msgstr "Voir l'album"
-
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362
-msgid "Recent Photos"
-msgstr "Photos récentes"
-
-#: ../../Zotlabs/Module/Ping.php:265
-msgid "sent you a private message"
-msgstr "vous a envoyé un message privé"
-
-#: ../../Zotlabs/Module/Ping.php:313
-msgid "added your channel"
-msgstr "a ajouté votre canal"
-
-#: ../../Zotlabs/Module/Ping.php:323
-msgid "g A l F d"
-msgstr "g A l F d"
-
-#: ../../Zotlabs/Module/Ping.php:346
-msgid "[today]"
-msgstr "[aujourd'hui]"
-
-#: ../../Zotlabs/Module/Ping.php:355
-msgid "posted an event"
-msgstr "a publié un événement"
-
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr "Impossible de trouver votre hub."
-
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr "Publication réussie."
-
-#: ../../Zotlabs/Module/Openid.php:30
-msgid "OpenID protocol error. No ID returned."
-msgstr "Erreur du protocole OpenID. Pas d'ID retourné."
-
-#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
-msgid "Login failed."
-msgstr "Échec de la connexion."
-
-#: ../../Zotlabs/Module/Page.php:133
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
-" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Ce paramètre nécessité un traitement spécial, les modifications ont été bloquées."
-
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
-msgstr "Editeur de configuration"
-
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please"
-" leave this page unless you are comfortable with and knowledgeable about how"
-" to correctly use this feature."
-msgstr "Attention&nbsp;:modifier certains paramètres peut rendre votre canal inutilisable. Merci d'ignorer cette page à moins d'être suffisamment à l'aise de savoir comment utiliser correctement cette fonctionnalité."
-
-#: ../../Zotlabs/Module/Pdledit.php:18
-msgid "Layout updated."
-msgstr "Mise en page mise à jour."
-
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
-msgid "Edit System Page Description"
-msgstr "Modifier la description de la page du système"
-
-#: ../../Zotlabs/Module/Pdledit.php:56
-msgid "Layout not found."
-msgstr "Mise en page introuvable."
-
-#: ../../Zotlabs/Module/Pdledit.php:62
-msgid "Module Name:"
-msgstr "Nom du module&nbsp;:"
-
-#: ../../Zotlabs/Module/Pdledit.php:63
-msgid "Layout Help"
-msgstr "Aide à la mise en page"
-
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226
-#: ../../include/conversation.php:960
-msgid "Poke"
-msgstr "Tapoter"
-
-#: ../../Zotlabs/Module/Poke.php:169
-msgid "Poke somebody"
-msgstr "Taquiner quelqu'un"
-
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
-msgstr "Tapoter/Encourager"
-
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
-msgstr "Taquiner, pousser ou faire autre chose à quelqu'un"
-
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
-msgstr "Destinataire"
-
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
-msgstr "Choisir ce que vous voulez faire au destinataire"
-
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
-msgstr "Rendre cette publication privée"
-
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
-#, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr "Récupération d'URL échouée&nbsp;: %1$s"
-
 #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
 #: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
 msgid "Profile not found."
@@ -3277,6 +2201,11 @@ msgstr "Site Internet"
 msgid "Interests"
 msgstr "Centres d'intérêt"
 
+#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1224
+msgid "Address"
+msgstr "Adresse"
+
 #: ../../Zotlabs/Module/Profiles.php:560
 msgid "Profile updated."
 msgstr "Profil mis à jour."
@@ -3294,7 +2223,7 @@ msgid "View this profile"
 msgstr "Voir ce profil"
 
 #: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
-#: ../../include/channel.php:959
+#: ../../include/channel.php:998
 msgid "Edit visibility"
 msgstr "Changer la visibilité"
 
@@ -3306,7 +2235,7 @@ msgstr ""
 msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:969
 msgid "Change profile photo"
 msgstr "Changer la photo du profil"
 
@@ -3326,8 +2255,8 @@ msgstr "Supprimer ce profil"
 msgid "Add profile things"
 msgstr "Ajouter des éléments de profil"
 
-#: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105
-#: ../../include/conversation.php:1526
+#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541
+#: ../../include/widgets.php:105
 msgid "Personal"
 msgstr "Me concernant"
 
@@ -3467,119 +2396,1097 @@ msgstr ""
 msgid "My other channels"
 msgstr "Mes autres canaux"
 
-#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:994
 msgid "Profile Image"
 msgstr "Image du profil"
 
 #: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
-#: ../../include/channel.php:937
+#: ../../include/channel.php:976
 msgid "Edit Profiles"
 msgstr "Modifier les profils"
 
-#: ../../Zotlabs/Module/Profile_photo.php:179
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Shift-rechargez votre page, ou videz le cache du navigateur si la photo ne s'affiche pas immédiatement."
-
-#: ../../Zotlabs/Module/Profile_photo.php:367
-msgid "Upload Profile Photo"
-msgstr "Téléverser une photo de profil"
-
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr "Identifiant de profil invalide."
-
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
-msgstr "Éditeur de visibilité de profil"
-
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249
-msgid "Profile"
-msgstr "Profil"
-
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
-msgstr "Cliquer sur un contact pour l'ajouter ou le retirer."
-
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
-msgstr "Visible par"
-
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1270
-msgid "Public Hubs"
-msgstr "Instances publiques"
-
-#: ../../Zotlabs/Module/Pubsites.php:25
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
-msgstr "Les sites listés permettent l'enregistrement public de comptes pour le réseau $Projectname. Tous les sites du réseau sont reliés entre eux, être membre d'un site revient à être membre de tous. Certains sites peuvent demander une souscription ou proposer différents niveaux de service. Chaque site <strong>peut</strong> fournir des détails supplémentaires."
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Hub URL"
-msgstr "URL du site"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Access Type"
-msgstr "Type d'accès"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Registration Policy"
-msgstr "Politique d'inscription"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Stats"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Software"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:959
-msgid "Ratings"
-msgstr "Evaluations"
-
-#: ../../Zotlabs/Module/Pubsites.php:38
-msgid "Rate"
-msgstr "Evaluer"
-
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Website:"
-msgstr "Site web&nbsp;:"
-
-#: ../../Zotlabs/Module/Rate.php:163
+#: ../../Zotlabs/Module/Import.php:33
 #, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Canal distant [%s] (encore inconnu sur ce site)"
+msgid "Your service plan only allows %d channels."
+msgstr "Votre forfait n'autorise que %d canaux."
 
-#: ../../Zotlabs/Module/Rate.php:164
-msgid "Rating (this information is public)"
-msgstr "Evaluation (cette information est publique)"
+#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42
+msgid "Nothing to import."
+msgstr "Rien à importer."
 
-#: ../../Zotlabs/Module/Rate.php:165
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Explication facultative de votre évaluation (cette information est publique)"
+#: ../../Zotlabs/Module/Import.php:95 ../../Zotlabs/Module/Import_items.php:66
+msgid "Unable to download data from old server"
+msgstr "Impossible de récupérer les données de l'ancien serveur"
 
-#: ../../Zotlabs/Module/Ratings.php:73
-msgid "No ratings"
-msgstr "Pas de note"
+#: ../../Zotlabs/Module/Import.php:101
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Imported file is empty."
+msgstr "Le fichier importé est vide."
 
-#: ../../Zotlabs/Module/Ratings.php:104
-msgid "Rating: "
-msgstr "Evaluation&nbsp:"
+#: ../../Zotlabs/Module/Import.php:123
+#: ../../Zotlabs/Module/Import_items.php:88
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Attention&nbsp;: les versions de bases de données diffèrent de %1$d mises à jour."
 
-#: ../../Zotlabs/Module/Ratings.php:105
-msgid "Website: "
-msgstr "Site web&nbsp;:"
+#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107
+msgid "Cloned channel not found. Import failed."
+msgstr "Canal cloné non trouvé. Echec de l'import."
 
-#: ../../Zotlabs/Module/Ratings.php:107
-msgid "Description: "
-msgstr "Description&nbsp;:"
+#: ../../Zotlabs/Module/Import.php:163
+msgid "No channel. Import failed."
+msgstr "Pas de canal. Echec de l'import."
+
+#: ../../Zotlabs/Module/Import.php:520
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
+msgstr "L'import est terminé."
+
+#: ../../Zotlabs/Module/Import.php:542
+msgid "You must be logged in to use this feature."
+msgstr "Vous devez vous connecter pour utiliser cette fonctionnalité."
+
+#: ../../Zotlabs/Module/Import.php:547
+msgid "Import Channel"
+msgstr "Importation de canal"
+
+#: ../../Zotlabs/Module/Import.php:548
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file."
+msgstr "Utilisez ce formulaire pour importer un canal existant sur un autre serveur. Vous pouvez récupérer l'identité du canal sur l'ancien serveur directement par le réseau, ou bien fournir un fichier d'export/import."
+
+#: ../../Zotlabs/Module/Import.php:549
+#: ../../Zotlabs/Module/Import_items.php:121
+msgid "File to Upload"
+msgstr "Fichier à envoyer"
+
+#: ../../Zotlabs/Module/Import.php:550
+msgid "Or provide the old server/hub details"
+msgstr "Ou fournissez les détails de l'ancien serveur/hub"
+
+#: ../../Zotlabs/Module/Import.php:551
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Votre ancienne identité (zyx@exemple.com)"
+
+#: ../../Zotlabs/Module/Import.php:552
+msgid "Your old login email address"
+msgstr "Votre ancienne adresse de courriel"
+
+#: ../../Zotlabs/Module/Import.php:553
+msgid "Your old login password"
+msgstr "Votre ancien mot de passe"
+
+#: ../../Zotlabs/Module/Import.php:554
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Quelle que soit l'option choisie, merci de décider si ce hub sera votre nouvelle adresse primaire, ou si votre ancien hub continuera à jouer ce rôle. Vous pourrez publier depuis l'emplacement de votre choix, mais une seule peut être déclarée comme stockage primaire de vos fichiers/photos/media."
+
+#: ../../Zotlabs/Module/Import.php:555
+msgid "Make this hub my primary location"
+msgstr "Faire de ce hub mon emplacement primaire"
+
+#: ../../Zotlabs/Module/Import.php:556
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importer les publications existantes si possible (expérimental - limité par la mémoire disponible)"
+
+#: ../../Zotlabs/Module/Import.php:557
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Ce processus peut prendre plusieurs minutes. Merci de ne valider le formulaire qu'une seule fois et de laisser cette page ouverte jusqu'à la fin."
+
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../Zotlabs/Module/Siteinfo.php:48
+msgid "$Projectname"
+msgstr "$Projectname"
+
+#: ../../Zotlabs/Module/Home.php:92
+#, php-format
+msgid "Welcome to %s"
+msgstr "Bienvenue sur %s"
+
+#: ../../Zotlabs/Module/Item.php:179
+msgid "Unable to locate original post."
+msgstr "Impossible de localiser la publication initiale."
+
+#: ../../Zotlabs/Module/Item.php:432
+msgid "Empty post discarded."
+msgstr "Publication vide annulée."
+
+#: ../../Zotlabs/Module/Item.php:472
+msgid "Executable content type not permitted to this channel."
+msgstr "Les contenus de type 'exécutable' ne sont pas autorisés sur ce canal."
+
+#: ../../Zotlabs/Module/Item.php:856
+msgid "Duplicate post suppressed."
+msgstr "Publication en doublon supprimée."
+
+#: ../../Zotlabs/Module/Item.php:989
+msgid "System error. Post not saved."
+msgstr "Erreur système. Publication non sauvegardée."
+
+#: ../../Zotlabs/Module/Item.php:1242
+msgid "Unable to obtain post information from database."
+msgstr "Impossible d'obtenir les informations de publication depuis la base de données."
+
+#: ../../Zotlabs/Module/Item.php:1249
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Vous avez atteint votre limite de %1$.0f contributions \"racines\"."
+
+#: ../../Zotlabs/Module/Item.php:1256
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Vous avez atteint votre limite de %1$.0f pages web."
+
+#: ../../Zotlabs/Module/Photos.php:82
+msgid "Page owner information could not be retrieved."
+msgstr "Impossible d'obtenir des informations sur le propriétaire de la page."
+
+#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:741
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:212
+#: ../../Zotlabs/Module/Profile_photo.php:311
+#: ../../include/photo/photo_driver.php:718
+msgid "Profile Photos"
+msgstr "Photos du profil"
+
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147
+msgid "Album not found."
+msgstr "Album introuvable."
+
+#: ../../Zotlabs/Module/Photos.php:130
+msgid "Delete Album"
+msgstr "Supprimer l'album"
+
+#: ../../Zotlabs/Module/Photos.php:151
+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:208 ../../Zotlabs/Module/Photos.php:1051
+msgid "Delete Photo"
+msgstr "Supprimer la photo"
+
+#: ../../Zotlabs/Module/Photos.php:531
+msgid "No photos selected"
+msgstr "Aucune photo selectionnée"
+
+#: ../../Zotlabs/Module/Photos.php:580
+msgid "Access to this item is restricted."
+msgstr "L'accès à l'élément est restreint."
+
+#: ../../Zotlabs/Module/Photos.php:619
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "Vous avez utilisé %1$.2f mégaoctets sur les %2$.2f autorisés pour le stockage des photos."
+
+#: ../../Zotlabs/Module/Photos.php:622
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f méga-octets utilisés pour le stockage des photos."
+
+#: ../../Zotlabs/Module/Photos.php:658
+msgid "Upload Photos"
+msgstr "Téléverser des photos"
+
+#: ../../Zotlabs/Module/Photos.php:662
+msgid "Enter an album name"
+msgstr "Entrer un nom d'album"
+
+#: ../../Zotlabs/Module/Photos.php:663
+msgid "or select an existing album (doubleclick)"
+msgstr "ou sélectionner un album existant (double-clic)"
+
+#: ../../Zotlabs/Module/Photos.php:664
+msgid "Create a status post for this upload"
+msgstr "Créer une publication de statut pour cet envoi"
+
+#: ../../Zotlabs/Module/Photos.php:665
+msgid "Caption (optional):"
+msgstr "Légende (facultative)"
+
+#: ../../Zotlabs/Module/Photos.php:666
+msgid "Description (optional):"
+msgstr "Description (facultative)"
+
+#: ../../Zotlabs/Module/Photos.php:693
+msgid "Album name could not be decoded"
+msgstr "Le nom de l'Album n'a pu être décodé"
+
+#: ../../Zotlabs/Module/Photos.php:741
+msgid "Contact Photos"
+msgstr "Photos de contact"
+
+#: ../../Zotlabs/Module/Photos.php:764
+msgid "Show Newest First"
+msgstr "Les plus récent(e)s en premier"
+
+#: ../../Zotlabs/Module/Photos.php:766
+msgid "Show Oldest First"
+msgstr "Les moins récent(e)s en premier"
+
+#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1329
+#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1593
+msgid "View Photo"
+msgstr "Voir la photo"
+
+#: ../../Zotlabs/Module/Photos.php:821
+#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1610
+msgid "Edit Album"
+msgstr "Modifier l'album"
+
+#: ../../Zotlabs/Module/Photos.php:868
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Permission refusée. L'accès à cet élément peut avoir été restreint."
+
+#: ../../Zotlabs/Module/Photos.php:870
+msgid "Photo not available"
+msgstr "Photo non disponible"
+
+#: ../../Zotlabs/Module/Photos.php:928
+msgid "Use as profile photo"
+msgstr "Utiliser comme photo du profil"
+
+#: ../../Zotlabs/Module/Photos.php:929
+msgid "Use as cover photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:936
+msgid "Private Photo"
+msgstr "Photo privée"
+
+#: ../../Zotlabs/Module/Photos.php:951
+msgid "View Full Size"
+msgstr "Voir en taille réelle"
+
+#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Admin.php:1437
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
+msgstr "Retirer"
+
+#: ../../Zotlabs/Module/Photos.php:1030
+msgid "Edit photo"
+msgstr "Modifier la photo"
+
+#: ../../Zotlabs/Module/Photos.php:1032
+msgid "Rotate CW (right)"
+msgstr "Rotation horaire (droite)"
+
+#: ../../Zotlabs/Module/Photos.php:1033
+msgid "Rotate CCW (left)"
+msgstr "Rotation anti-horaire (gauche)"
+
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "Enter a new album name"
+msgstr "Entrer un nouveau nom d'album"
+
+#: ../../Zotlabs/Module/Photos.php:1037
+msgid "or select an existing one (doubleclick)"
+msgstr "ou en sélectionner un existant (double-clic)"
+
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Caption"
+msgstr "Titre/légende"
+
+#: ../../Zotlabs/Module/Photos.php:1042
+msgid "Add a Tag"
+msgstr "Ajouter une étiquette"
+
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Exemple&nbsp;: @marc, @Barbara_Jensen, @charles@exemple.com, #Ile_de_France, #marathon"
+
+#: ../../Zotlabs/Module/Photos.php:1049
+msgid "Flag as adult in album view"
+msgstr "Marquer comme \"adulte\" dans l'affichage de l'album"
+
+#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Lib/ThreadItem.php:261
+msgid "I like this (toggle)"
+msgstr "J'aime (oui/non)"
+
+#: ../../Zotlabs/Module/Photos.php:1069 ../../Zotlabs/Lib/ThreadItem.php:262
+msgid "I don't like this (toggle)"
+msgstr "Je n'aime pas (oui/non)"
+
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:397
+#: ../../include/conversation.php:743
+msgid "Please wait"
+msgstr "Merci de patienter"
+
+#: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1205
+#: ../../Zotlabs/Lib/ThreadItem.php:707
+msgid "This is you"
+msgstr "C'est vous"
+
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
+#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr "Commenter"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
+msgstr "Aime"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
+msgstr "N'aime pas"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
+msgstr "D'accord"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
+msgstr "Pas d'accord"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
+msgstr "Abstention"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
+msgstr "Participations"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
+msgstr "Non-participations"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
+msgstr "Participation possible"
+
+#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1136
+#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../include/conversation.php:1738
+msgid "View all"
+msgstr "Voir tout"
+
+#: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../include/taxonomy.php:403 ../../include/channel.php:1198
+#: ../../include/conversation.php:1762
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Aime"
+msgstr[1] "Aime"
+
+#: ../../Zotlabs/Module/Photos.php:1133 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/conversation.php:1765
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "N'aime pas"
+msgstr[1] "N'aime pas"
+
+#: ../../Zotlabs/Module/Photos.php:1233
+msgid "Photo Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Photos.php:1242
+msgid "In This Photo:"
+msgstr "Dans cette photo&nbsp;:"
+
+#: ../../Zotlabs/Module/Photos.php:1247
+msgid "Map"
+msgstr "Carte"
+
+#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/ThreadItem.php:386
+msgctxt "noun"
+msgid "Likes"
+msgstr "Aime"
+
+#: ../../Zotlabs/Module/Photos.php:1256 ../../Zotlabs/Lib/ThreadItem.php:387
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "N'aime pas"
+
+#: ../../Zotlabs/Module/Photos.php:1261 ../../Zotlabs/Lib/ThreadItem.php:392
+#: ../../include/acl_selectors.php:283
+msgid "Close"
+msgstr "Fermer"
+
+#: ../../Zotlabs/Module/Photos.php:1335
+msgid "View Album"
+msgstr "Voir l'album"
+
+#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359
+#: ../../Zotlabs/Module/Photos.php:1360
+msgid "Recent Photos"
+msgstr "Photos récentes"
+
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
+msgstr "Les informations distantes de confidentialité ne sont pas disponibles."
+
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
+msgstr "Visible par&nbsp;:"
+
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
+msgstr "L'import est terminé."
+
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
+msgstr "Importer"
+
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid ""
+"Use this form to import existing posts and content from an export file."
+msgstr "Utiliser ce formulaire pour importer des publications et du contenu existant d'un fichier d'export."
+
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
+msgstr "Limite du nombre total d'invitation dépassée."
+
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s&nbsp;: adresse courriel invalide."
+
+#: ../../Zotlabs/Module/Invite.php:63
+msgid "Please join us on $Projectname"
+msgstr "Rejoignez-nous sur $Projectname"
+
+#: ../../Zotlabs/Module/Invite.php:74
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Limite d'invitations dépassée. Merci de contacter l'administration de votre site."
+
+#: ../../Zotlabs/Module/Invite.php:79
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s&nbsp;: Échec de distribution du message."
+
+#: ../../Zotlabs/Module/Invite.php:83
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d message envoyé."
+msgstr[1] "%d messages envoyés."
+
+#: ../../Zotlabs/Module/Invite.php:102
+msgid "You have no more invitations available"
+msgstr "Vous ne disposez plus d'aucune invitation"
+
+#: ../../Zotlabs/Module/Invite.php:133
+msgid "Send invitations"
+msgstr "Envoyer des invitations"
+
+#: ../../Zotlabs/Module/Invite.php:134
+msgid "Enter email addresses, one per line:"
+msgstr "Entrez les adresses de courriel, une par ligne&nbsp;:"
+
+#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:241
+msgid "Your message:"
+msgstr "Votre message&nbsp;:"
+
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Please join my community on $Projectname."
+msgstr "Rejoignez ma communauté sur $Projectname."
+
+#: ../../Zotlabs/Module/Invite.php:138
+msgid "You will need to supply this invitation code:"
+msgstr "Vous devrez fournir le code suivant&nbsp;:"
+
+#: ../../Zotlabs/Module/Invite.php:139
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Enregistrez-vous sur n'importe quel serveur $Projectname (ils sont tous inter-connectés)"
+
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Saisissez l'adresse de mon canal $Projectname dans la barre de recherche du site."
+
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "or visit"
+msgstr "ou rendez-vous sur"
+
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "3. Click [Connect]"
+msgstr "3. Cliquez sur [Ajouter]"
+
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
+msgstr "Emplacement introuvable."
+
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
+msgstr "Echec de la recherche de l'emplacement."
+
+#: ../../Zotlabs/Module/Locs.php:66
+msgid ""
+"Please select another location to become primary before removing the primary"
+" location."
+msgstr "Merci de sélectionner un autre emplacement comme nouvel emplacement primaire avant de supprimer l'emplacement primaire actuel."
+
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
+msgstr "Synchronisation des emplacements"
+
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
+msgstr "Emplacement(s) introuvable."
+
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
+msgstr "Gérer les emplacements des canaux"
+
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+msgid "Drop"
+msgstr "Supprimer"
+
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
+msgstr "Merci d'attendre plusieurs minutes entre opérations successives."
+
+#: ../../Zotlabs/Module/Locs.php:124
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing"
+" your channel."
+msgstr "Quand c'est possible, abandonnez un emplacement en vous connectant sur le site/hub et en supprimant votre canal."
+
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr "Utilisez ce formulaire pour abandonner l'emplacement si le hub n'est plus actif."
+
+#: ../../Zotlabs/Module/Magic.php:71
+msgid "Hub not found."
+msgstr "Hub introuvable."
+
+#: ../../Zotlabs/Module/Mail.php:38
+msgid "Unable to lookup recipient."
+msgstr "Impossible de localiser le destinataire."
+
+#: ../../Zotlabs/Module/Mail.php:45
+msgid "Unable to communicate with requested channel."
+msgstr "Impossible de communiquer avec le canal demandé."
+
+#: ../../Zotlabs/Module/Mail.php:52
+msgid "Cannot verify requested channel."
+msgstr "Impossible de vérifier le canal demandé."
+
+#: ../../Zotlabs/Module/Mail.php:70
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Le canal choisi a des restrictions quant aux messages privés. L'envoi a échoué."
+
+#: ../../Zotlabs/Module/Mail.php:135
+msgid "Messages"
+msgstr "Messages"
+
+#: ../../Zotlabs/Module/Mail.php:170
+msgid "Message recalled."
+msgstr "Message rappelé."
+
+#: ../../Zotlabs/Module/Mail.php:183
+msgid "Conversation removed."
+msgstr "Conversation supprimée."
+
+#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Expire le YYYY-MM-DD à HH:MM"
+
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Requested channel is not in this network"
+msgstr "Le canal demandé n'est pas sur ce réseau"
+
+#: ../../Zotlabs/Module/Mail.php:234
+msgid "Send Private Message"
+msgstr "Envoyer un message privé"
+
+#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360
+msgid "To:"
+msgstr "À&nbsp;:"
+
+#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362
+msgid "Subject:"
+msgstr "Objet&nbsp;:"
+
+#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
+#: ../../include/conversation.php:1231
+msgid "Attach file"
+msgstr "Joindre un fichier"
+
+#: ../../Zotlabs/Module/Mail.php:245
+msgid "Send"
+msgstr "Envoyer"
+
+#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373
+#: ../../include/conversation.php:1266
+msgid "Set expiration date"
+msgstr "Définir la date d'expiration"
+
+#: ../../Zotlabs/Module/Mail.php:332
+msgid "Delete message"
+msgstr "Supprimer le message"
+
+#: ../../Zotlabs/Module/Mail.php:333
+msgid "Delivery report"
+msgstr "Rapport de distribution"
+
+#: ../../Zotlabs/Module/Mail.php:334
+msgid "Recall message"
+msgstr "Rappeler le message"
+
+#: ../../Zotlabs/Module/Mail.php:336
+msgid "Message has been recalled."
+msgstr "Le message a été rappelé."
+
+#: ../../Zotlabs/Module/Mail.php:353
+msgid "Delete Conversation"
+msgstr "Supprimer la conversation"
+
+#: ../../Zotlabs/Module/Mail.php:355
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Aucune communication sécurisée n'est possible. Vous pourrez <strong>peut-être</strong> répondre depuis la page de profil de l'émetteur."
+
+#: ../../Zotlabs/Module/Mail.php:359
+msgid "Send Reply"
+msgstr "Envoyer la réponse"
+
+#: ../../Zotlabs/Module/Mail.php:364
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Votre message pour %s (%s)&nbsp;:"
+
+#: ../../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 "Vous avez créé %1$.0f des %2$.0f canaux autorisés."
+
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create a new channel"
+msgstr "Créer un nouveau canal"
+
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214
+#: ../../include/nav.php:208
+msgid "Channel Manager"
+msgstr "Gérer les canaux"
+
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
+msgstr "Canal actif"
+
+#: ../../Zotlabs/Module/Manage.php:167
+msgid "Switch to one of your channels by selecting it."
+msgstr "Pour changer de canal, sélectionnez-en un"
+
+#: ../../Zotlabs/Module/Manage.php:168
+msgid "Default Channel"
+msgstr "Canal par défaut"
+
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
+msgstr "Définir comme défaut"
+
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
+msgstr "%d nouveaux messages"
+
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
+msgstr "%d nouvelles présentations"
+
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:49
+msgid "Unable to update menu."
+msgstr "Impossible de mettre le menu à jour."
+
+#: ../../Zotlabs/Module/Menu.php:60
+msgid "Unable to create menu."
+msgstr "Impossible de créer le menu."
+
+#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+msgid "Menu Name"
+msgstr "Nom du menu"
+
+#: ../../Zotlabs/Module/Menu.php:98
+msgid "Unique name (not visible on webpage) - required"
+msgstr "Nom unique (non visible sur la page web) - requis"
+
+#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+msgid "Menu Title"
+msgstr "Titre du menu"
+
+#: ../../Zotlabs/Module/Menu.php:99
+msgid "Visible on webpage - leave empty for no title"
+msgstr "Visible pour la page web - laisser vide pour qu'il n'y ait pas de titre"
+
+#: ../../Zotlabs/Module/Menu.php:100
+msgid "Allow Bookmarks"
+msgstr "Autoriser l'usage de favoris"
+
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Le menu pourra être utilisé pour stocker des favoris"
+
+#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+msgid "Submit and proceed"
+msgstr "Valider et continuer"
+
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2239
+msgid "Menus"
+msgstr "Menus"
+
+#: ../../Zotlabs/Module/Menu.php:117
+msgid "Bookmarks allowed"
+msgstr "Favoris autorisés"
+
+#: ../../Zotlabs/Module/Menu.php:119
+msgid "Delete this menu"
+msgstr "Supprimer ce menu"
+
+#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+msgid "Edit menu contents"
+msgstr "Modifier le contenu du menu"
+
+#: ../../Zotlabs/Module/Menu.php:121
+msgid "Edit this menu"
+msgstr "Modifier ce menu"
+
+#: ../../Zotlabs/Module/Menu.php:136
+msgid "Menu could not be deleted."
+msgstr "Impossible de supprimer le menu."
+
+#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+msgid "Menu not found."
+msgstr "Menu introuvable."
+
+#: ../../Zotlabs/Module/Menu.php:149
+msgid "Edit Menu"
+msgstr "Modifier le menu"
+
+#: ../../Zotlabs/Module/Menu.php:153
+msgid "Add or remove entries to this menu"
+msgstr "Ajouter/supprimer des entrées à ce menu"
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Menu name"
+msgstr "Nom du menu"
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Must be unique, only seen by you"
+msgstr "Doit être unique, ne sera vu que par vous"
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title"
+msgstr "Titre du menu"
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title as seen by others"
+msgstr "Titre du menu tel que vu par les visiteurs"
+
+#: ../../Zotlabs/Module/Menu.php:157
+msgid "Allow bookmarks"
+msgstr "Autoriser l'usage de favoris"
+
+#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
+#: ../../Zotlabs/Module/Xchan.php:41
+msgid "Not found."
+msgstr "Introuvable."
+
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
+msgstr "Aucun compte valide trouvé."
+
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr "Demande de réinitialisation du mot de passe envoyée. Vérifiez vos courriels."
+
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Membre du site (%s)"
+
+#: ../../Zotlabs/Module/Lostpass.php:44
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Demande de réinitialisation du mot de passe sur %s"
+
+#: ../../Zotlabs/Module/Lostpass.php:67
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "La demande n'a pas pu être vérifiée. (Peut-être l'avez vous déjà utilisée.) La réinitialisation a échoué."
+
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1712
+msgid "Password Reset"
+msgstr "Réinitialiser le mot de passe"
+
+#: ../../Zotlabs/Module/Lostpass.php:91
+msgid "Your password has been reset as requested."
+msgstr "Votre mot de passe a bien été réinitialisé."
+
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your new password is"
+msgstr "Votre nouveau mot de passe est"
+
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Save or copy your new password - and then"
+msgstr "Enregistrez ou copiez votre nouveau mot de passe, puis"
+
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "click here to login"
+msgstr "cliquez ici pour vous connecter"
+
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Votre mot de passe peut être changé depuis la page des <em>Paramètres</em> une fois connecté."
+
+#: ../../Zotlabs/Module/Lostpass.php:112
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Votre mot de passe de %s a été changé"
+
+#: ../../Zotlabs/Module/Lostpass.php:127
+msgid "Forgot your Password?"
+msgstr "Mot de passe oublié&nbsp;?"
+
+#: ../../Zotlabs/Module/Lostpass.php:128
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Saisissez votre adresse de courriel, et validez, pour réinitialiser votre mot de passe. Vérifiez ensuite votre boîte aux lettres pour la suite des instructions."
+
+#: ../../Zotlabs/Module/Lostpass.php:129
+msgid "Email Address"
+msgstr "Adresse de courriel"
+
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr "%1$s est %2$s"
+
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227
+msgid "Mood"
+msgstr "Humeur"
+
+#: ../../Zotlabs/Module/Mood.php:136
+msgid "Set your current mood and tell your friends"
+msgstr "Indiquez votre humeur du moment à vos amis"
+
+#: ../../Zotlabs/Module/Network.php:94
+msgid "No such group"
+msgstr "Groupe introuvable"
+
+#: ../../Zotlabs/Module/Network.php:134
+msgid "No such channel"
+msgstr "Canal introuvable"
+
+#: ../../Zotlabs/Module/Network.php:139
+msgid "forum"
+msgstr "forum"
+
+#: ../../Zotlabs/Module/Network.php:151
+msgid "Search Results For:"
+msgstr "Résultats de recherche pour&nbsp;:"
+
+#: ../../Zotlabs/Module/Network.php:215
+msgid "Privacy group is empty"
+msgstr "Groupe d'accès vide"
+
+#: ../../Zotlabs/Module/Network.php:224
+msgid "Privacy group: "
+msgstr "Groupe d'accès&nbsp;:"
+
+#: ../../Zotlabs/Module/Network.php:250
+msgid "Invalid connection."
+msgstr "Contact non valide."
+
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:98
+msgid "No more system notifications."
+msgstr "Pas d'autre notification du système."
+
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:102
+msgid "System Notifications"
+msgstr "Notifications du système"
+
+#: ../../Zotlabs/Module/Match.php:26
+msgid "Profile Match"
+msgstr "Profils similaires"
+
+#: ../../Zotlabs/Module/Match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Aucun mot-clef à comparer. Merci d'ajouter des mots-clefs à votre profil par défaut."
+
+#: ../../Zotlabs/Module/Match.php:67
+msgid "is interested in:"
+msgstr "s'intéresse à&nbsp;:"
+
+#: ../../Zotlabs/Module/Match.php:74
+msgid "No matches"
+msgstr "Pas de correspondance"
+
+#: ../../Zotlabs/Module/Channel.php:40
+msgid "Posts and comments"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel.php:41
+msgid "Only posts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel.php:101
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Permissions insuffisantes. Demande redirigée vers la page du profil."
+
+#: ../../Zotlabs/Module/Mitem.php:52
+msgid "Unable to create element."
+msgstr "Impossible de créer l'entrée."
+
+#: ../../Zotlabs/Module/Mitem.php:76
+msgid "Unable to update menu element."
+msgstr "Impossible de mettre à jour l'entrée de menu."
+
+#: ../../Zotlabs/Module/Mitem.php:92
+msgid "Unable to add menu element."
+msgstr "Impossible d'ajouter l'entrée de menu."
+
+#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
+msgid "Menu Item Permissions"
+msgstr "Permissions de l'entrée de menu"
+
+#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
+#: ../../Zotlabs/Module/Settings.php:1163
+msgid "(click to open/close)"
+msgstr "(cliquer pour ouvrir/fermer)"
+
+#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
+msgid "Link Name"
+msgstr "Nom du lien"
+
+#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
+msgid "Link or Submenu Target"
+msgstr "Lien ou sous-menu cible"
+
+#: ../../Zotlabs/Module/Mitem.php:157
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "Entrez l'URL du lien ou sélectionnez un nom de menu pour créer un sous-menu"
+
+#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
+msgid "Use magic-auth if available"
+msgstr "Utiliser l'authentification distante, quand disponible"
+
+#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
+msgid "Open link in new window"
+msgstr "Ouvrir le lien dans une nouvelle fenêtre"
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Order in list"
+msgstr "Ordre dans la liste"
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Les nombres les plus élevés seront au bas de la liste"
+
+#: ../../Zotlabs/Module/Mitem.php:161
+msgid "Submit and finish"
+msgstr "Vadiler et terminer"
+
+#: ../../Zotlabs/Module/Mitem.php:162
+msgid "Submit and continue"
+msgstr "Valider et continuer"
+
+#: ../../Zotlabs/Module/Mitem.php:170
+msgid "Menu:"
+msgstr "Menu&nbsp;:"
+
+#: ../../Zotlabs/Module/Mitem.php:173
+msgid "Link Target"
+msgstr "Cible du lien"
+
+#: ../../Zotlabs/Module/Mitem.php:176
+msgid "Edit menu"
+msgstr "Modifier le menu"
+
+#: ../../Zotlabs/Module/Mitem.php:179
+msgid "Edit element"
+msgstr "Modifier l'entrée"
+
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Drop element"
+msgstr "Supprimer l'entrée"
+
+#: ../../Zotlabs/Module/Mitem.php:181
+msgid "New element"
+msgstr "Nouvelle entrée"
+
+#: ../../Zotlabs/Module/Mitem.php:182
+msgid "Edit this menu container"
+msgstr "Éditer ce bloc de menu"
+
+#: ../../Zotlabs/Module/Mitem.php:183
+msgid "Add menu element"
+msgstr "Ajouter une entrée au menu"
+
+#: ../../Zotlabs/Module/Mitem.php:184
+msgid "Delete this menu item"
+msgstr "Supprimer cette entrée du menu"
+
+#: ../../Zotlabs/Module/Mitem.php:185
+msgid "Edit this menu item"
+msgstr "Modifier cette entrée du menu"
+
+#: ../../Zotlabs/Module/Mitem.php:202
+msgid "Menu item not found."
+msgstr "Entrée de menu introuvable."
+
+#: ../../Zotlabs/Module/Mitem.php:215
+msgid "Menu item deleted."
+msgstr "Entrée de menu supprimée."
+
+#: ../../Zotlabs/Module/Mitem.php:217
+msgid "Menu item could not be deleted."
+msgstr "Impossible de supprimer l'entrée de menu."
+
+#: ../../Zotlabs/Module/Mitem.php:224
+msgid "Edit Menu Element"
+msgstr "Modifier l'entrée de menu"
+
+#: ../../Zotlabs/Module/Mitem.php:230
+msgid "Link text"
+msgstr "Texte du lien"
 
 #: ../../Zotlabs/Module/Admin.php:77
 msgid "Theme settings updated."
@@ -3666,11 +3573,11 @@ msgstr ""
 msgid "Site settings updated."
 msgstr "Paramètres du site sauvegardés."
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2841
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2829
 msgid "Default"
 msgstr "Défaut"
 
-#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:899
 msgid "mobile"
 msgstr "mobile"
 
@@ -3702,7 +3609,7 @@ msgstr "Mon site est gratuit uniquement"
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mon site offre des comptes gratuits avec des améliorations payantes facultatives"
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1382
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1476
 msgid "Site"
 msgstr "Site"
 
@@ -3990,12 +3897,12 @@ msgid "0 for no expiration of imported content"
 msgstr "0 pour ne pas expirer le contenu importé"
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "Off"
 msgstr "Inactif"
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "On"
 msgstr "Actif"
 
@@ -4052,7 +3959,7 @@ msgid ""
 "embedded content from that site is explicitly blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1385
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1479
 msgid "Security"
 msgstr "Sécurité"
 
@@ -4220,7 +4127,7 @@ msgid "Account '%s' unblocked"
 msgstr "Compte '%s' débloqué"
 
 #: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
-#: ../../include/widgets.php:1383
+#: ../../include/widgets.php:1477
 msgid "Accounts"
 msgstr "Comptes"
 
@@ -4326,7 +4233,7 @@ msgstr "Code autorisé pour le canal '%s'"
 msgid "Channel '%s' code disallowed"
 msgstr "Code interdit pour le canal '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1384
+#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1478
 msgid "Channels"
 msgstr "Canaux"
 
@@ -4346,7 +4253,7 @@ msgstr "Autoriser le code"
 msgid "Disallow Code"
 msgstr "Interdire le code"
 
-#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1611
+#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626
 msgid "Channel"
 msgstr "Canal"
 
@@ -4385,7 +4292,7 @@ msgid "Enable"
 msgstr "Activer"
 
 #: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
-#: ../../include/widgets.php:1387
+#: ../../include/widgets.php:1481
 msgid "Plugins"
 msgstr "Greffons"
 
@@ -4394,8 +4301,8 @@ msgid "Toggle"
 msgstr "(Dés)activer"
 
 #: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
-#: ../../Zotlabs/Lib/Apps.php:215 ../../include/widgets.php:638
-#: ../../include/nav.php:208
+#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:210
+#: ../../include/widgets.php:647
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -4451,7 +4358,7 @@ msgstr ""
 msgid "Install new repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:334
 msgid "Install"
 msgstr "Installer"
 
@@ -4467,8 +4374,8 @@ msgstr ""
 msgid "Install a New Plugin Repository"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:72
+#: ../../Zotlabs/Module/Settings.php:670 ../../Zotlabs/Lib/Apps.php:334
 msgid "Update"
 msgstr "Mise à jour"
 
@@ -4485,7 +4392,7 @@ msgid "Screenshot"
 msgstr "Capture d'écran"
 
 #: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
-#: ../../include/widgets.php:1388
+#: ../../include/widgets.php:1482
 msgid "Themes"
 msgstr "Thèmes"
 
@@ -4501,8 +4408,8 @@ msgstr "[Non maintenu]"
 msgid "Log settings updated."
 msgstr "Paramètres du journal mis à jour."
 
-#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1409
-#: ../../include/widgets.php:1419
+#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1503
+#: ../../include/widgets.php:1513
 msgid "Logs"
 msgstr "Journaux"
 
@@ -4568,7 +4475,7 @@ msgstr "Définition du champ introuvable"
 msgid "Edit Profile Field"
 msgstr "Modifier le champ de profil"
 
-#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1390
+#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1484
 msgid "Profile Fields"
 msgstr "Champs de profil"
 
@@ -4596,57 +4503,384 @@ msgstr "Champs personnalisés"
 msgid "Create Custom Field"
 msgstr "Créer un champ personnalisé"
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
-msgid "App installed."
-msgstr "Application installée."
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Name or caption"
+msgstr "Nom ou libellé"
 
-#: ../../Zotlabs/Module/Appman.php:46
-msgid "Malformed app."
-msgstr "Erreur de l'application - Malformée."
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
+msgstr "Exemples&nbsp;: \"Jérôme Dutilleul\", \"Louise et ses chevaux\", \"Football\", \"Club d'aéromodélisme\""
 
-#: ../../Zotlabs/Module/Appman.php:104
-msgid "Embed code"
-msgstr "Imbriquer le code"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+msgid "Choose a short nickname"
+msgstr "Choisissez un alias"
 
-#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
-msgid "Edit App"
-msgstr "Modifier l'application"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+#, php-format
+msgid ""
+"Your nickname will be used to create an easy to remember channel address "
+"e.g. nickname%s"
+msgstr "Votre pseudo sera utilisé pour créer une adresse de canal facile à mémoriser, par ex. pseudo%s"
 
-#: ../../Zotlabs/Module/Appman.php:110
-msgid "Create App"
-msgstr "Créer une application"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Channel role and privacy"
+msgstr "Rôle et confidentialité du canal"
 
-#: ../../Zotlabs/Module/Appman.php:115
-msgid "Name of app"
-msgstr "Nom de l'application"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Select a channel role with your privacy requirements."
+msgstr "Sélectionner un rôle de canal adapté à vos besoins de confidentialité."
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Location (URL) of app"
-msgstr "Emplacement (URL) de l'application"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Read more about roles"
+msgstr "En savoir plus sur les rôles"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "Photo icon URL"
-msgstr "URL de l'icône à utiliser pour cette photo"
+#: ../../Zotlabs/Module/New_channel.php:135
+msgid "Create Channel"
+msgstr "Créer le canal"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "80 x 80 pixels - optional"
-msgstr "80 x 80 pixels - facultatif"
+#: ../../Zotlabs/Module/New_channel.php:136
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
+msgstr "Un canal est votre identité sur ce réseau. Il peut représenter une personne, un blog, ou un forum par exemple. Les canaux peuvent entrer en contact les uns avec les autres pour partager des informations avec des permissions d'accès très fines."
 
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Categories (optional, comma separated list)"
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr "ou <a href=\"import\">importer un canal existant</a> d'un autre serveur."
+
+#: ../../Zotlabs/Module/Ping.php:265
+msgid "sent you a private message"
+msgstr "vous a envoyé un message privé"
+
+#: ../../Zotlabs/Module/Ping.php:313
+msgid "added your channel"
+msgstr "a ajouté votre canal"
+
+#: ../../Zotlabs/Module/Ping.php:323
+msgid "g A l F d"
+msgstr "g A l F d"
+
+#: ../../Zotlabs/Module/Ping.php:346
+msgid "[today]"
+msgstr "[aujourd'hui]"
+
+#: ../../Zotlabs/Module/Ping.php:355
+msgid "posted an event"
+msgstr "a publié un événement"
+
+#: ../../Zotlabs/Module/Notifications.php:30
+msgid "Invalid request identifier."
+msgstr "Identifiant de requête invalide."
+
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "Discard"
+msgstr "Annuler"
+
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:193
+msgid "Mark all system notifications seen"
+msgstr "Marquer toutes les notifications système comme vues"
+
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228
+#: ../../include/conversation.php:963
+msgid "Poke"
+msgstr "Tapoter"
+
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
+msgstr "Taquiner quelqu'un"
+
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
+msgstr "Tapoter/Encourager"
+
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
+msgstr "Taquiner, pousser ou faire autre chose à quelqu'un"
+
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
+msgstr "Destinataire"
+
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
+msgstr "Choisir ce que vous voulez faire au destinataire"
+
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
+msgstr "Rendre cette publication privée"
+
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr "Impossible de trouver votre hub."
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr "Publication réussie."
+
+#: ../../Zotlabs/Module/Openid.php:30
+msgid "OpenID protocol error. No ID returned."
+msgstr "Erreur du protocole OpenID. Pas d'ID retourné."
+
+#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:285
+msgid "Login failed."
+msgstr "Échec de la connexion."
+
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr "Identifiant de profil invalide."
+
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
+msgstr "Éditeur de visibilité de profil"
+
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1290
+msgid "Profile"
+msgstr "Profil"
+
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
+msgstr "Cliquer sur un contact pour l'ajouter ou le retirer."
+
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
+msgstr "Visible par"
+
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Ce paramètre nécessité un traitement spécial, les modifications ont été bloquées."
+
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
+msgstr "Editeur de configuration"
+
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Attention&nbsp;:modifier certains paramètres peut rendre votre canal inutilisable. Merci d'ignorer cette page à moins d'être suffisamment à l'aise de savoir comment utiliser correctement cette fonctionnalité."
+
+#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "Récupération d'URL échouée&nbsp;: %1$s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:19
+#, php-format
+msgid "Version %s"
+msgstr "Version %s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Installed plugins/addons/apps:"
+msgstr "Greffons/extensions/applications installés&nbsp;:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:36
+msgid "No installed plugins/addons/apps"
+msgstr "Aucun greffon/extension/application installé"
+
+#: ../../Zotlabs/Module/Siteinfo.php:49
+msgid ""
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Ceci est un serveur $Projectname - un réseau collaboratif mondial de serveurs décentralisés à la confidentialité améliorée."
+
+#: ../../Zotlabs/Module/Siteinfo.php:51
+msgid "Tag: "
+msgstr "Étiquette&nbsp;:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:53
+msgid "Last background fetch: "
+msgstr "Dernière récupération en tâche de fond&nbsp;:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:55
+msgid "Current load average: "
+msgstr "Charge moyenne actuelle&nbsp;:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:58
+msgid "Running at web location"
+msgstr "Tourne à l'adresse internet"
+
+#: ../../Zotlabs/Module/Siteinfo.php:59
+msgid ""
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr "Merci de visiter <a href=\"http://hubzilla.org\">hubzilla.org</a> pour en apprendre davantage sur $Projectname."
+
+#: ../../Zotlabs/Module/Siteinfo.php:60
+msgid "Bug reports and issues: please visit"
+msgstr "Pour remonter bogues et problèmes, merci de visiter"
+
+#: ../../Zotlabs/Module/Siteinfo.php:62
+msgid "$projectname issues"
+msgstr "Problèmes $projectname"
+
+#: ../../Zotlabs/Module/Siteinfo.php:63
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Suggestions, demandes, etc. - merci de vous adresser à \"redmatrix\" à librelist - point com"
+
+#: ../../Zotlabs/Module/Siteinfo.php:65
+msgid "Site Administrators"
+msgstr "Administrateurs du site"
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Nous avons rencontré un problème avec l'OpenID que vous nous avez fourni. Merci de vérifier que l'ID est correctement saisi."
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid "The error message was:"
+msgstr "Le message d'erreur était&nbsp;:"
+
+#: ../../Zotlabs/Module/Rmagic.php:48
+msgid "Authentication failed."
+msgstr "Échec de l'authentification."
+
+#: ../../Zotlabs/Module/Rmagic.php:88
+msgid "Remote Authentication"
+msgstr "Authentification distante"
+
+#: ../../Zotlabs/Module/Rmagic.php:89
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Entrez l'adresse de votre canal (par ex. moncanal@monsite.com)"
+
+#: ../../Zotlabs/Module/Rmagic.php:90
+msgid "Authenticate"
+msgstr "Authentifier"
+
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1337
+msgid "Public Hubs"
+msgstr "Instances publiques"
+
+#: ../../Zotlabs/Module/Pubsites.php:25
+msgid ""
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
+msgstr "Les sites listés permettent l'enregistrement public de comptes pour le réseau $Projectname. Tous les sites du réseau sont reliés entre eux, être membre d'un site revient à être membre de tous. Certains sites peuvent demander une souscription ou proposer différents niveaux de service. Chaque site <strong>peut</strong> fournir des détails supplémentaires."
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Hub URL"
+msgstr "URL du site"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Access Type"
+msgstr "Type d'accès"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Registration Policy"
+msgstr "Politique d'inscription"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Stats"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Version ID"
-msgstr "Identifiant de version"
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Software"
+msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Price of app"
-msgstr "Prix de l'application"
+#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
+#: ../../include/conversation.php:962
+msgid "Ratings"
+msgstr "Evaluations"
 
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Location (URL) to purchase app"
-msgstr "Emplacement (URL) pour l'achat de l'application"
+#: ../../Zotlabs/Module/Pubsites.php:38
+msgid "Rate"
+msgstr "Evaluer"
+
+#: ../../Zotlabs/Module/Profile_photo.php:186
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Shift-rechargez votre page, ou videz le cache du navigateur si la photo ne s'affiche pas immédiatement."
+
+#: ../../Zotlabs/Module/Profile_photo.php:389
+msgid "Upload Profile Photo"
+msgstr "Téléverser une photo de profil"
+
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Editblock.php:108
+msgid "Block Name"
+msgstr "Nom du Bloc"
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2238
+msgid "Blocks"
+msgstr "Blocs"
+
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr "Titre du bloc"
+
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Website:"
+msgstr "Site web&nbsp;:"
+
+#: ../../Zotlabs/Module/Rate.php:163
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Canal distant [%s] (encore inconnu sur ce site)"
+
+#: ../../Zotlabs/Module/Rate.php:164
+msgid "Rating (this information is public)"
+msgstr "Evaluation (cette information est publique)"
+
+#: ../../Zotlabs/Module/Rate.php:165
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Explication facultative de votre évaluation (cette information est publique)"
+
+#: ../../Zotlabs/Module/Ratings.php:73
+msgid "No ratings"
+msgstr "Pas de note"
+
+#: ../../Zotlabs/Module/Ratings.php:104
+msgid "Rating: "
+msgstr "Evaluation&nbsp:"
+
+#: ../../Zotlabs/Module/Ratings.php:105
+msgid "Website: "
+msgstr "Site web&nbsp;:"
+
+#: ../../Zotlabs/Module/Ratings.php:107
+msgid "Description: "
+msgstr "Description&nbsp;:"
+
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:165
+#: ../../include/widgets.php:102
+msgid "Apps"
+msgstr "Applications"
+
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243
+msgid "Title (optional)"
+msgstr "Titre (facultatif)"
+
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
+msgstr "Modifier le bloc"
+
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr "Pas de canal."
+
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr "Contacts en commun"
+
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
+msgstr "Pas de contacts en commun."
 
 #: ../../Zotlabs/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
@@ -4751,120 +4985,154 @@ msgstr "oui"
 msgid "Membership on this site is by invitation only."
 msgstr "L'inscription à ce site se fait uniquement sur invitation."
 
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
-#: ../../boot.php:1685
+#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:149
+#: ../../boot.php:1686
 msgid "Register"
 msgstr "S'inscrire"
 
-#: ../../Zotlabs/Module/Register.php:262
-msgid "Proceed to create your first channel"
-msgstr "Continuer pour créer votre premier canal"
+#: ../../Zotlabs/Module/Register.php:263
+msgid ""
+"This site may require email verification after submitting this form. If you "
+"are returned to a login page, please check your email for instructions."
+msgstr ""
 
 #: ../../Zotlabs/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Merci de vous connecter."
 
-#: ../../Zotlabs/Module/Removeaccount.php:34
+#: ../../Zotlabs/Module/Removeaccount.php:35
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Il est impossible de supprimer un compte dans les 48 heures après avoir changé le mot de passe du compte."
 
-#: ../../Zotlabs/Module/Removeaccount.php:56
+#: ../../Zotlabs/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Supprimer ce compte"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "WARNING: "
 msgstr "AVERTISSEMENT&nbsp;:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Ce compte et tous ses canaux seront entièrement supprimés du réseau."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This action is permanent and can not be undone!"
 msgstr "Cette action est permanente et irréversible&nbsp;!"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeme.php:62
 msgid "Please enter your password for verification:"
 msgstr "Merci de saisir votre mot de passe pour vérification&nbsp;:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Supprimer du réseau ce compte, tous ses canaux et tous les clones de ses canaux."
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Par défaut, seules les instances des canaux situés sur ce hub seront supprimées du réseau"
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
-#: ../../Zotlabs/Module/Settings.php:705
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings.php:759
 msgid "Remove Account"
 msgstr "Supprimer le compte"
 
-#: ../../Zotlabs/Module/Removeme.php:33
+#: ../../Zotlabs/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Il est impossible de supprimer un canal moins de 48 heures après avoir changé le mot de passe d'un compte."
 
-#: ../../Zotlabs/Module/Removeme.php:58
+#: ../../Zotlabs/Module/Removeme.php:60
 msgid "Remove This Channel"
 msgstr "Supprimer ce canal"
 
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This channel will be completely removed from the network. "
 msgstr "Ce canal sera complètement supprimé du réseau."
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid "Remove this channel and all its clones from the network"
 msgstr "Supprimer ce canal ainsi que tous ses clones sur le réseau"
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "Par défaut, seule l'instance du canal présente sur ce hub sera supprimée du réseau"
 
-#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Removeme.php:64 ../../Zotlabs/Module/Settings.php:1219
 msgid "Remove Channel"
 msgstr "Supprimer le canal"
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+msgid "Export Channel"
+msgstr "Exporter le canal"
+
+#: ../../Zotlabs/Module/Uexport.php:57
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Nous avons rencontré un problème avec l'OpenID que vous nous avez fourni. Merci de vérifier que l'ID est correctement saisi."
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Exportez les principales informations de votre canal dans un fichier. Celui-ci pourra servir de sauvegarde de vos contacts, permissions, profils et données de base. Il pourra être importé sur un nouveau hub/serveur, mais n'embarquera pas vos contenus."
 
-#: ../../Zotlabs/Module/Rmagic.php:44
-msgid "The error message was:"
-msgstr "Le message d'erreur était&nbsp;:"
+#: ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Content"
+msgstr "Exporter le contenu"
 
-#: ../../Zotlabs/Module/Rmagic.php:48
-msgid "Authentication failed."
-msgstr "Échec de l'authentification."
+#: ../../Zotlabs/Module/Uexport.php:59
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Exportez les informations du canal et les contenus récents dans un fichier JSON. Celui-ci contiendra toutes vos relations, permissions, profils, et plusieurs mois de publications. Ce fichier peut être TRÈS gros. Armez-vous de patience - plusieurs minutes peuvent s'écouler avant que le téléchargement ne commence."
 
-#: ../../Zotlabs/Module/Rmagic.php:88
-msgid "Remote Authentication"
-msgstr "Authentification distante"
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export your posts from a given year."
+msgstr "Exporter vos publications d'une année en particulier"
 
-#: ../../Zotlabs/Module/Rmagic.php:89
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Entrez l'adresse de votre canal (par ex. moncanal@monsite.com)"
+#: ../../Zotlabs/Module/Uexport.php:62
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "Vous pouvez également exporter vos publications et conversations pour une année ou un mois particulier. Ajustez la date dans la barre de votre navigateur pour sélectionner d'autres dates. Si l'export échoue (possible en cas de pénurie de mémoire sur le serveur de votre hub), essayez à nouveau en sélectionnant un intervalle de dates plus petit."
 
-#: ../../Zotlabs/Module/Rmagic.php:90
-msgid "Authenticate"
-msgstr "Authentifier"
+#: ../../Zotlabs/Module/Uexport.php:63
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a "
+"href=\"%1$s\">%2$s</a>"
+msgstr "Pour sélectionner toutes les publications pour une année donnée, telle que cette année, visitez <a href=\"%1$s\">%2$s</a>"
+
+#: ../../Zotlabs/Module/Uexport.php:64
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr "Pour sélectionner toutes les publications pour un mois donné, par exemple janvier, visitez <a href=\"%1$s\">%2$s</a>"
+
+#: ../../Zotlabs/Module/Uexport.php:65
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a "
+"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
+" please import or restore these in date order (oldest first)."
+msgstr "Ces fichiers de contenu peuvent être importés ou restaurés en visitant <a href=\"%1$s\">%2$s</a> sur n'importe quel site hébergeant votre canal. Pour de meilleurs résultats merci de les importer par ordre chronologique (les plus anciens d'abord)."
 
 #: ../../Zotlabs/Module/Search.php:216
 #, php-format
@@ -4880,609 +5148,652 @@ msgstr "Résultats de recherche pour&nbsp;: %s"
 msgid "No service class restrictions found."
 msgstr "Aucune restriction de classe de service trouvée."
 
-#: ../../Zotlabs/Module/Settings.php:69
+#: ../../Zotlabs/Module/Settings.php:64
 msgid "Name is required"
 msgstr "Le nom est requis"
 
-#: ../../Zotlabs/Module/Settings.php:73
+#: ../../Zotlabs/Module/Settings.php:68
 msgid "Key and Secret are required"
 msgstr "Clef et secret sont requis"
 
-#: ../../Zotlabs/Module/Settings.php:225
+#: ../../Zotlabs/Module/Settings.php:138
+#, php-format
+msgid "This channel is limited to %d tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:144
+msgid "Name and Password are required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:168
+msgid "Token saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:274
 msgid "Not valid email."
 msgstr "Adresse de courriel non valide."
 
-#: ../../Zotlabs/Module/Settings.php:228
+#: ../../Zotlabs/Module/Settings.php:277
 msgid "Protected email address. Cannot change to that email."
 msgstr "Adresse de courriel protégée. Impossible de l'utiliser."
 
-#: ../../Zotlabs/Module/Settings.php:237
+#: ../../Zotlabs/Module/Settings.php:286
 msgid "System failure storing new email. Please try again."
 msgstr "Défaillance système lors du stockage de la nouvelle adresse de courriel. Merci d'essayer à nouveau."
 
-#: ../../Zotlabs/Module/Settings.php:254
+#: ../../Zotlabs/Module/Settings.php:303
 msgid "Password verification failed."
 msgstr "La vérification du mot de passe a échoué."
 
-#: ../../Zotlabs/Module/Settings.php:261
+#: ../../Zotlabs/Module/Settings.php:310
 msgid "Passwords do not match. Password unchanged."
 msgstr "Les deux saisies du mot de passe ne correspondent pas. Il n'a donc pas été changé."
 
-#: ../../Zotlabs/Module/Settings.php:265
+#: ../../Zotlabs/Module/Settings.php:314
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Le mot de passe ne peut pas être vide. Il n'a donc pas été changé."
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Zotlabs/Module/Settings.php:328
 msgid "Password changed."
 msgstr "Le mot de passe a été changé."
 
-#: ../../Zotlabs/Module/Settings.php:281
+#: ../../Zotlabs/Module/Settings.php:330
 msgid "Password update failed. Please try again."
 msgstr "La mise à jour du mot de passe a échoué. Merci d'essayer à nouveau."
 
-#: ../../Zotlabs/Module/Settings.php:525
+#: ../../Zotlabs/Module/Settings.php:579
 msgid "Settings updated."
 msgstr "Paramètres mis à jour."
 
-#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
-#: ../../Zotlabs/Module/Settings.php:651
+#: ../../Zotlabs/Module/Settings.php:643 ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:705
 msgid "Add application"
 msgstr "Ajouter une application"
 
-#: ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:646
 msgid "Name of application"
 msgstr "Nom de l'application"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:673
 msgid "Consumer Key"
 msgstr "Clef client"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:648
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Généré automatiquement - à changer si besoin. Longueur maximale 20 caractères."
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:648 ../../Zotlabs/Module/Settings.php:674
 msgid "Consumer Secret"
 msgstr "Secret client"
 
-#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
+#: ../../Zotlabs/Module/Settings.php:649 ../../Zotlabs/Module/Settings.php:675
 msgid "Redirect"
 msgstr "Redirection"
 
-#: ../../Zotlabs/Module/Settings.php:595
+#: ../../Zotlabs/Module/Settings.php:649
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "URI de redirection - laissez vide, sauf si votre application le requiert spécifiquement"
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Settings.php:622
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Settings.php:676
 msgid "Icon url"
 msgstr "URL de l'icône"
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Sources.php:112
 #: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr "Facultatif"
 
-#: ../../Zotlabs/Module/Settings.php:607
+#: ../../Zotlabs/Module/Settings.php:661
 msgid "Application not found."
 msgstr "Application introuvable."
 
-#: ../../Zotlabs/Module/Settings.php:650
+#: ../../Zotlabs/Module/Settings.php:704
 msgid "Connected Apps"
 msgstr "Applications connectées"
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:708
 msgid "Client key starts with"
 msgstr "La clef partagée commence par"
 
-#: ../../Zotlabs/Module/Settings.php:655
+#: ../../Zotlabs/Module/Settings.php:709
 msgid "No name"
 msgstr "Sans nom"
 
-#: ../../Zotlabs/Module/Settings.php:656
+#: ../../Zotlabs/Module/Settings.php:710
 msgid "Remove authorization"
 msgstr "Révoquer l'autorisation"
 
-#: ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:723
 msgid "No feature settings configured"
 msgstr "Aucun paramètre de fonctionnalité configuré"
 
-#: ../../Zotlabs/Module/Settings.php:676
+#: ../../Zotlabs/Module/Settings.php:730
 msgid "Feature/Addon Settings"
 msgstr "Paramètres des extensions/greffons"
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:753
 msgid "Account Settings"
 msgstr "Paramètres du compte"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:754
 msgid "Current Password"
 msgstr "Mot de passe actuel"
 
-#: ../../Zotlabs/Module/Settings.php:701
+#: ../../Zotlabs/Module/Settings.php:755
 msgid "Enter New Password"
 msgstr "Entrez votre nouveau mot de passe"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 msgid "Confirm New Password"
 msgstr "Confirmez le nouveau mot de passe"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 msgid "Leave password fields blank unless changing"
 msgstr "Laissez les mots de passe vides si vous ne voulez pas les modifier"
 
-#: ../../Zotlabs/Module/Settings.php:704
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:758
+#: ../../Zotlabs/Module/Settings.php:1136
 msgid "Email Address:"
 msgstr "Adresse de courriel&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:706
+#: ../../Zotlabs/Module/Settings.php:760
 msgid "Remove this account including all its channels"
 msgstr "Supprimer ce compte et tous ses canaux"
 
-#: ../../Zotlabs/Module/Settings.php:729
+#: ../../Zotlabs/Module/Settings.php:789
+msgid ""
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in Access Control Lists and "
+"visitors may login using these credentials to access the private content."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:791
+msgid ""
+"You may also provide <em>dropbox</em> style access links to friends and "
+"associates by adding the Login Password to any specific site URL as shown. "
+"Examples:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:796 ../../include/widgets.php:614
+msgid "Guest Access Tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:803
+msgid "Login Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:804
+msgid "Login Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:805
+msgid "Expires (yyyy-mm-dd)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:830
 msgid "Additional Features"
 msgstr "Fonctionnalités additionnelles"
 
-#: ../../Zotlabs/Module/Settings.php:753
+#: ../../Zotlabs/Module/Settings.php:854
 msgid "Connector Settings"
 msgstr "Paramètres du connecteur"
 
-#: ../../Zotlabs/Module/Settings.php:792
+#: ../../Zotlabs/Module/Settings.php:893
 msgid "No special theme for mobile devices"
 msgstr "Pas de thème spécifique aux mobiles"
 
-#: ../../Zotlabs/Module/Settings.php:795
+#: ../../Zotlabs/Module/Settings.php:896
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Expérimental)"
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:938
 msgid "Display Settings"
 msgstr "Afficher les paramètres"
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:939
 msgid "Theme Settings"
 msgstr "Paramètres du thème"
 
-#: ../../Zotlabs/Module/Settings.php:839
+#: ../../Zotlabs/Module/Settings.php:940
 msgid "Custom Theme Settings"
 msgstr "Paramètres personnels du thème"
 
-#: ../../Zotlabs/Module/Settings.php:840
+#: ../../Zotlabs/Module/Settings.php:941
 msgid "Content Settings"
 msgstr "Paramètres liés au contenu"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:947
 msgid "Display Theme:"
 msgstr "Afficher le thème&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:948
 msgid "Mobile Theme:"
 msgstr "Thème mobile&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 msgid "Preload images before rendering the page"
 msgstr "Pré-charger les images avant d'afficher la page"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "Le temps de charge perçu de la page sera plus long mais la page sera complète quand elle s'affichera"
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:950
 msgid "Enable user zoom on mobile devices"
 msgstr "Permettre à l'utilisateur d'un mobile d'agrandir le contenu"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Update browser every xx seconds"
 msgstr "Mettre à jour le navigateur toutes les xx secondes"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 secondes, pas de maximum"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:952
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Nombre maximal de conversations pouvant être chargées en même temps&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:952
 msgid "Maximum of 100 items"
 msgstr "100 éléments au maximum"
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:953
 msgid "Show emoticons (smilies) as images"
 msgstr "Remplacer les émoticônes (smileys) par des images"
 
-#: ../../Zotlabs/Module/Settings.php:853
+#: ../../Zotlabs/Module/Settings.php:954
 msgid "Link post titles to source"
 msgstr "Lier les titres des publications à leur source"
 
-#: ../../Zotlabs/Module/Settings.php:854
+#: ../../Zotlabs/Module/Settings.php:955
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Editeur de mise en page des pages systèmes - (avancé)"
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:958
 msgid "Use blog/list mode on channel page"
 msgstr "Utiliser le mode blog/liste sur la page du canal"
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:958 ../../Zotlabs/Module/Settings.php:959
 msgid "(comments displayed separately)"
 msgstr "(commentaires affichés séparément)"
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:959
 msgid "Use blog/list mode on grid page"
 msgstr "Utiliser le mode blog/liste sur la page du réseau"
 
-#: ../../Zotlabs/Module/Settings.php:859
+#: ../../Zotlabs/Module/Settings.php:960
 msgid "Channel page max height of content (in pixels)"
 msgstr "Hauteur maximale du contenu pour la page du canal (en pixels)"
 
-#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:960 ../../Zotlabs/Module/Settings.php:961
 msgid "click to expand content exceeding this height"
 msgstr "cliquer pour dérouler le contenu dépassant cette limite"
 
-#: ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:961
 msgid "Grid page max height of content (in pixels)"
 msgstr "Hauteur maximale du contenu sur la page du réseau (en pixels)"
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Zotlabs/Module/Settings.php:990
 msgid "Nobody except yourself"
 msgstr "Personne sauf vous"
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:991
 msgid "Only those you specifically allow"
 msgstr "Seulement ceux que vous autorisez spécifiquement"
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:992
 msgid "Approved connections"
 msgstr "Contacts approuvés"
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:993
 msgid "Any connections"
 msgstr "Tous les contacts"
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:994
 msgid "Anybody on this website"
 msgstr "Tous les utilisateurs du hub"
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:995
 msgid "Anybody in this network"
 msgstr "Tous les utilisateurs sur ce réseau"
 
-#: ../../Zotlabs/Module/Settings.php:900
+#: ../../Zotlabs/Module/Settings.php:996
 msgid "Anybody authenticated"
 msgstr "Tous les utilisateurs authentifiés"
 
-#: ../../Zotlabs/Module/Settings.php:901
+#: ../../Zotlabs/Module/Settings.php:997
 msgid "Anybody on the internet"
 msgstr "Tous les utilisateurs d'Internet"
 
-#: ../../Zotlabs/Module/Settings.php:976
+#: ../../Zotlabs/Module/Settings.php:1071
 msgid "Publish your default profile in the network directory"
 msgstr "Publier votre profil par défaut dans l'annuaire du réseau"
 
-#: ../../Zotlabs/Module/Settings.php:981
+#: ../../Zotlabs/Module/Settings.php:1076
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Nous autoriser à vous suggérer comme ami(e) potentiel(le) aux nouveaux membres?"
 
-#: ../../Zotlabs/Module/Settings.php:990
+#: ../../Zotlabs/Module/Settings.php:1085
 msgid "Your channel address is"
 msgstr "L'adresse de votre canal est"
 
-#: ../../Zotlabs/Module/Settings.php:1032
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Channel Settings"
 msgstr "Paramètres du canal"
 
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:1134
 msgid "Basic Settings"
 msgstr "Paramètres standard"
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140
+#: ../../Zotlabs/Module/Settings.php:1135 ../../include/channel.php:1180
 msgid "Full Name:"
 msgstr "Nom complet&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1137
 msgid "Your Timezone:"
 msgstr "Votre fureau horaire&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Default Post Location:"
 msgstr "Emplacement de publication par défaut&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Geographical location to display on your posts"
 msgstr "Emplacement géographique à afficher sur vos publications"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1139
 msgid "Use Browser Location:"
 msgstr "Utiliser la géolocalisation du navigateur&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 msgid "Adult Content"
 msgstr "Contenu \"adulte\""
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Ce canal publie plus ou moins fréquemment du contenu pour adultes. (Merci d'indiquer tout contenu pour adulte ou potentiellement choquant avec l'étiquette <em>#NSFW</em> - Not Safe For Work)"
 
-#: ../../Zotlabs/Module/Settings.php:1048
+#: ../../Zotlabs/Module/Settings.php:1143
 msgid "Security and Privacy Settings"
 msgstr "Paramètres de sécurité et de confidentialité"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1146
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Vous permissions sont déjà paramétrées. Cliquer pour voir/ajuster"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 msgid "Hide my online presence"
 msgstr "Cacher ma présence en ligne"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Cacher votre statut (en ligne/hors ligne) sur votre profil"
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Zotlabs/Module/Settings.php:1150
 msgid "Simple Privacy Settings:"
 msgstr "Paramètres de confidentialité simplifiés&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1151
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Très public - <em>extrèmement permissif (à n'utiliser qu'en connaissance de cause)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Zotlabs/Module/Settings.php:1152
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Classique - <em>public par défaut, privé en cas de besoin (comparable aux permissions type réseau social, avec une confidentialité améliorée)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1058
+#: ../../Zotlabs/Module/Settings.php:1153
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privé - <em>privé par défaut, jamais ouvert ni public</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1154
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Bloqué - <em>par défaut, bloqué de/vers tout le monde</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 msgid "Allow others to tag your posts"
 msgstr "Autoriser les autres à \"étiqueter\" vos publications"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Souvent utilisé par la communauté pour identifier un contenu inapproprié a posteriori "
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1158
 msgid "Advanced Privacy Settings"
 msgstr "Paramètres de confidentialité avancés"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "Expire other channel content after this many days"
 msgstr "Faire expirer le contenu des autres canaux après n jours"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "0 or blank to use the website limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 #, php-format
 msgid "This website expires after %d days."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "This website does not expire imported content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "The website limit takes precedence if lower than your limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "Maximum Friend Requests/Day:"
 msgstr "Nombre maximum de demandes de contact par jour&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "May reduce spam activity"
 msgstr "Contribue à réduire l'impact des indésirables"
 
-#: ../../Zotlabs/Module/Settings.php:1067
+#: ../../Zotlabs/Module/Settings.php:1162
 msgid "Default Post and Publish Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1069
+#: ../../Zotlabs/Module/Settings.php:1164
 msgid "Use my default audience setting for the type of object published"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1072
+#: ../../Zotlabs/Module/Settings.php:1167
 msgid "Channel permissions category:"
 msgstr "Catégorie de permissions du canal&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Nombre maximum de messages privés émanant d'inconnus, par jour&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Useful to reduce spamming"
 msgstr "Utile pour réduire les indésirables"
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1176
 msgid "Notification Settings"
 msgstr "Paramètres de notification"
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1177
 msgid "By default post a status message when:"
 msgstr "Par défaut, publier un statut quand&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1178
 msgid "accepting a friend request"
 msgstr "vous acceptez une demande de contact"
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1179
 msgid "joining a forum/community"
 msgstr "vous rejoignez un forum ou une communauté"
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1180
 msgid "making an <em>interesting</em> profile change"
 msgstr "vous faîtes une modification <em>intéressante</em> de votre profil"
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1181
 msgid "Send a notification email when:"
 msgstr "Envoyer un courriel de notification quand&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1182
 msgid "You receive a connection request"
 msgstr "Vous recevez une demande de contact"
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1183
 msgid "Your connections are confirmed"
 msgstr "Vos contacts sont confirmés"
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1184
 msgid "Someone writes on your profile wall"
 msgstr "Quelqu'un a écrit sur votre mur"
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1185
 msgid "Someone writes a followup comment"
 msgstr "Quelqu'un a commenté vos publications"
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1186
 msgid "You receive a private message"
 msgstr "Vous recevez un message privé"
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1187
 msgid "You receive a friend suggestion"
 msgstr "Vous recevez une suggestion d'amitié/contact"
 
-#: ../../Zotlabs/Module/Settings.php:1093
+#: ../../Zotlabs/Module/Settings.php:1188
 msgid "You are tagged in a post"
 msgstr "Vous êtes étiqueté dans une publication"
 
-#: ../../Zotlabs/Module/Settings.php:1094
+#: ../../Zotlabs/Module/Settings.php:1189
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Vous êtes tapoté/encouragé/etc. dans une publication"
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1192
 msgid "Show visual notifications including:"
 msgstr "Afficher des notifications visuelles y compris&nbsp;:"
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1194
 msgid "Unseen grid activity"
 msgstr "Activité du réseau pas encore consultée"
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1195
 msgid "Unseen channel activity"
 msgstr "Activité non vue sur le canal"
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1196
 msgid "Unseen private messages"
 msgstr "Messages privés non lus"
 
-#: ../../Zotlabs/Module/Settings.php:1101
-#: ../../Zotlabs/Module/Settings.php:1106
-#: ../../Zotlabs/Module/Settings.php:1107
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1196
+#: ../../Zotlabs/Module/Settings.php:1201
+#: ../../Zotlabs/Module/Settings.php:1202
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "Recommended"
 msgstr "Recommandé"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1197
 msgid "Upcoming events"
 msgstr "Événements à venir"
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1198
 msgid "Events today"
 msgstr "Événements aujourd'hui"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Upcoming birthdays"
 msgstr "Anniversaires à venir"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Not available in all themes"
 msgstr "Pas disponible dans tous les thèmes"
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1200
 msgid "System (personal) notifications"
 msgstr "Notifications système (personnelles)"
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1201
 msgid "System info messages"
 msgstr "Messages d'info système"
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1202
 msgid "System critical alerts"
 msgstr "Alertes critiques système"
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "New connections"
 msgstr "Nouveaux contacts"
 
-#: ../../Zotlabs/Module/Settings.php:1109
+#: ../../Zotlabs/Module/Settings.php:1204
 msgid "System Registrations"
 msgstr "Inscriptions système"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1205
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Afficher également les nouvelles publications sur le mur, les messages privés et les contacts dans Notifications"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 msgid "Notify me of events this many days in advance"
 msgstr "Me prévenir d’événements à venir tant de jours en avance"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 msgid "Must be greater than 0"
 msgstr "Doit être supérieur à 0"
 
-#: ../../Zotlabs/Module/Settings.php:1114
+#: ../../Zotlabs/Module/Settings.php:1209
 msgid "Advanced Account/Page Type Settings"
 msgstr "Paramètres avancés de compte/type de page"
 
-#: ../../Zotlabs/Module/Settings.php:1115
+#: ../../Zotlabs/Module/Settings.php:1210
 msgid "Change the behaviour of this account for special situations"
 msgstr "Modifie le comportement de ce compte pour des situations particulières"
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1213
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr "Mode expert requis (<a href=\"settings/features\">Paramètres > Fonctions supplémentaires</a>) pour ajuster&nbsp;!"
 
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1214
 msgid "Miscellaneous Settings"
 msgstr "Paramètres divers"
 
-#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1215
 msgid "Default photo upload folder"
 msgstr "Répertoire par défaut pour les photos téléversées"
 
-#: ../../Zotlabs/Module/Settings.php:1120
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1215
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - année en cours, %m - mois en cours"
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "Default file upload folder"
 msgstr "Répertoire par défaut pour les fichiers téléversés"
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1218
 msgid "Personal menu to display in your channel pages"
 msgstr "Menu personnel à afficher sur les pages de votre canal"
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Zotlabs/Module/Settings.php:1220
 msgid "Remove this channel."
 msgstr "Supprimer ce canal"
 
-#: ../../Zotlabs/Module/Settings.php:1126
+#: ../../Zotlabs/Module/Settings.php:1221
 msgid "Firefox Share $Projectname provider"
 msgstr "Connecteur $Projectname pour Firefox Share"
 
-#: ../../Zotlabs/Module/Settings.php:1127
+#: ../../Zotlabs/Module/Settings.php:1222
 msgid "Start calendar week on monday"
 msgstr "Commencer la semaine du calendrier le lundi"
 
@@ -5515,7 +5826,7 @@ msgid ""
 msgstr "Vous pourriez avoir besoin d'importer le fichier \"install/schema_xxx.sql\" manuellement via un client de base de données (ex: phpmyadmin)."
 
 #: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
-#: ../../Zotlabs/Module/Setup.php:721
+#: ../../Zotlabs/Module/Setup.php:722
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Merci de consulter le fichier \"install/INSTALL.txt\"."
 
@@ -5715,199 +6026,200 @@ msgid "mb_string PHP module"
 msgstr "module PHP mb_string"
 
 #: ../../Zotlabs/Module/Setup.php:496
-msgid "mcrypt PHP module"
-msgstr "module PHP mcrypt"
-
-#: ../../Zotlabs/Module/Setup.php:497
 msgid "xml PHP module"
 msgstr "module PHP xml"
 
-#: ../../Zotlabs/Module/Setup.php:501 ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:500 ../../Zotlabs/Module/Setup.php:502
 msgid "Apache mod_rewrite module"
 msgstr "module Apache mod_rewrite"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Zotlabs/Module/Setup.php:500
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Erreur&nbsp;: le module mod-rewrite du serveur web Apache est requis, mais pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:506 ../../Zotlabs/Module/Setup.php:509
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Zotlabs/Module/Setup.php:506
 msgid ""
 "Error: proc_open is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Erreur&nbsp;: proc_open est requis, mais soit n'est pas installé, soit est désactivé dans le php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:514
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Erreur&nbsp;: le module libCURL de PHP est requis, mais pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:518
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Erreur&nbsp;: le module GD de PHP avec support JPEG est requis, mais pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:523
+#: ../../Zotlabs/Module/Setup.php:522
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Erreur&nbsp;: le module openssl de PHP est requis, mais pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Zotlabs/Module/Setup.php:526
 msgid ""
 "Error: mysqli or postgres PHP module required but neither are installed."
 msgstr "Erreur&nbsp;: un module PHP mysqli ou postgres est requis, mais aucun des deux n'est installé."
 
-#: ../../Zotlabs/Module/Setup.php:531
+#: ../../Zotlabs/Module/Setup.php:530
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Erreur&nbsp;: le module mb_string de PHP est requis, mais pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:535
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Erreur&nbsp;: le module mcrypt de PHP est requis, mais pas installé."
-
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Zotlabs/Module/Setup.php:534
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Erreur&nbsp;: le module xml de PHP est requis pour le DAV, mais pas installé."
 
-#: ../../Zotlabs/Module/Setup.php:557
+#: ../../Zotlabs/Module/Setup.php:552
 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 "L'installeur web a besoin de créer un fichier \".htconfig.php\" à la racine de votre serveur web, mais en est incapable."
 
-#: ../../Zotlabs/Module/Setup.php:558
+#: ../../Zotlabs/Module/Setup.php:553
 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 "C'est généralement lié à un problème de droits, à cause duquel le serveur web est interdit d'écriture dans le répertoire concerné - alors que votre propre utilisateur a le droit."
 
-#: ../../Zotlabs/Module/Setup.php:559
+#: ../../Zotlabs/Module/Setup.php:554
 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 "Au terme de cette procédure, nous vous transmettrons un texte à sauvegarder dans un fichier nommé .htconfig.php, à la racine de votre installation de $Projectname."
 
-#: ../../Zotlabs/Module/Setup.php:560
+#: ../../Zotlabs/Module/Setup.php:555
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr "Autrement, vous pouvez contourner toute cette procédure et réaliser l'installation manuellement. Merci de consulter le fichier \"install/INSTALL.txt\" pour les instructions détaillées."
 
-#: ../../Zotlabs/Module/Setup.php:563
+#: ../../Zotlabs/Module/Setup.php:558
 msgid ".htconfig.php is writable"
 msgstr "Le fichier .htconfig.php est accessible en écriture"
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Zotlabs/Module/Setup.php:572
 msgid ""
 "Red uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr "$Projectname utilise le moteur de gabarits Smarty3 pour mettre son contenu en forme. Smarty3 compile ses modèles vers du PHP natif pour accélérer le rendu."
 
-#: ../../Zotlabs/Module/Setup.php:578
+#: ../../Zotlabs/Module/Setup.php:573
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:579 ../../Zotlabs/Module/Setup.php:600
+#: ../../Zotlabs/Module/Setup.php:574 ../../Zotlabs/Module/Setup.php:595
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Merci de vous assurer que l'utilisateur sous lequel le serveur web tourne (le plus souvent, www-data) a bien l'autorisation d'écrire dans ce répertoire."
 
-#: ../../Zotlabs/Module/Setup.php:580
+#: ../../Zotlabs/Module/Setup.php:575
 #, 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: Comme mesure de sécurité, assurez vous de donner les droits d'écriture au serveur web sur %s uniquement, pas sur les fichiers individuels (.tpl) qu'il contient."
 
-#: ../../Zotlabs/Module/Setup.php:583
+#: ../../Zotlabs/Module/Setup.php:578
 #, php-format
 msgid "%s is writable"
 msgstr "Permission d'écriture sur %s activée"
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Zotlabs/Module/Setup.php:594
 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 utilise le répertoire 'store' - situé à la racine de votre installation de $Projectname - pour sauvegarder les fichiers envoyés. Le serveur web aura donc besoin de pouvoir y écrire."
+"This software 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Zotlabs/Module/Setup.php:598
 msgid "store is writable"
 msgstr "'store' est accessible en écriture"
 
-#: ../../Zotlabs/Module/Setup.php:636
+#: ../../Zotlabs/Module/Setup.php:631
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "Le certificat SSL/TLS n'a pas pu être validé. Merci de le corriger, ou de désactiver l'accès https à ce site (non recommandé)."
 
-#: ../../Zotlabs/Module/Setup.php:637
+#: ../../Zotlabs/Module/Setup.php:632
 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 votre serveur accepte les connexions https ou s'il permet les connexions sur le port TCP 443 (le port utilisé par le protocole https), vous DEVEZ utiliser un certificat valide. Vous ne DEVEZ PAS utiliser un certificat que vous avez vous-mêmes signé&nbsp;!"
 
-#: ../../Zotlabs/Module/Setup.php:638
+#: ../../Zotlabs/Module/Setup.php:633
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Nous avons ajouté cette contrainte pour éviter que vos publications publiques ne fassent référence par exemple à des images sur votre propre hub."
 
-#: ../../Zotlabs/Module/Setup.php:639
+#: ../../Zotlabs/Module/Setup.php:634
 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 votre certificat n'est pas reconnu, les membres des autres sites (qui eux peuvent avoir des certificats valides) recevront des messages d'avertissement sur leur propre site se plaignant de problèmes de sécurité."
 
-#: ../../Zotlabs/Module/Setup.php:640
+#: ../../Zotlabs/Module/Setup.php:635
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Ceci peut causer des problèmes d'ergonomie ailleurs (pas seulement sur votre site), nous devons donc insister sur ce prérequis."
 
-#: ../../Zotlabs/Module/Setup.php:641
+#: ../../Zotlabs/Module/Setup.php:636
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Il existe des autorités de certification qui vous fourniront gratuitement un certificat valide."
 
-#: ../../Zotlabs/Module/Setup.php:643
+#: ../../Zotlabs/Module/Setup.php:638
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:641
 msgid "SSL certificate validation"
 msgstr "Validation du certificat SSL/TLS"
 
-#: ../../Zotlabs/Module/Setup.php:649
+#: ../../Zotlabs/Module/Setup.php:647
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "La réécriture d'URL définie dans le .htaccess ne fonctionne pas. Vérifiez votre configuration serveur. Test&nbsp;:"
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Zotlabs/Module/Setup.php:650
 msgid "Url rewrite is working"
 msgstr "La réécriture d'URL fonctionne"
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:659
 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 "Le fichier de configuration de la base de données - \".htconfig.php\" - ne peut être écrit. Merci de copier le texte généré dans un fichier à ce nom, à la racine de votre serveur web."
 
-#: ../../Zotlabs/Module/Setup.php:685
+#: ../../Zotlabs/Module/Setup.php:683
 msgid "Errors encountered creating database tables."
 msgstr "Erreurs rencontrées pendant la création de tables de BDD."
 
-#: ../../Zotlabs/Module/Setup.php:719
+#: ../../Zotlabs/Module/Setup.php:720
 msgid "<h1>What next</h1>"
 msgstr "<h1>Et maintenant</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:720
+#: ../../Zotlabs/Module/Setup.php:721
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -5929,64 +6241,62 @@ msgstr "Supprimer tous les fichiers"
 msgid "Remove this file"
 msgstr "Supprimer ce fichier"
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Zotlabs/Module/Thing.php:114
+msgid "Thing updated"
+msgstr "Elément mis à jour"
+
+#: ../../Zotlabs/Module/Thing.php:166
+msgid "Object store: failed"
+msgstr "Stockage de l'objet&nbsp;: échec"
+
+#: ../../Zotlabs/Module/Thing.php:170
+msgid "Thing added"
+msgstr "Elément ajouté"
+
+#: ../../Zotlabs/Module/Thing.php:196
 #, php-format
-msgid "Version %s"
-msgstr "Version %s"
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:40
-msgid "Installed plugins/addons/apps:"
-msgstr "Greffons/extensions/applications installés&nbsp;:"
+#: ../../Zotlabs/Module/Thing.php:259
+msgid "Show Thing"
+msgstr "Montrer élément"
 
-#: ../../Zotlabs/Module/Siteinfo.php:53
-msgid "No installed plugins/addons/apps"
-msgstr "Aucun greffon/extension/application installé"
+#: ../../Zotlabs/Module/Thing.php:266
+msgid "item not found."
+msgstr "élément introuvable."
 
-#: ../../Zotlabs/Module/Siteinfo.php:66
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
-msgstr "Ceci est un serveur $Projectname - un réseau collaboratif mondial de serveurs décentralisés à la confidentialité améliorée."
+#: ../../Zotlabs/Module/Thing.php:299
+msgid "Edit Thing"
+msgstr "Modifier élément"
 
-#: ../../Zotlabs/Module/Siteinfo.php:68
-msgid "Tag: "
-msgstr "Étiquette&nbsp;:"
+#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
+msgid "Select a profile"
+msgstr "Choisissez un profil"
 
-#: ../../Zotlabs/Module/Siteinfo.php:70
-msgid "Last background fetch: "
-msgstr "Dernière récupération en tâche de fond&nbsp;:"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Post an activity"
+msgstr "Publier une activité"
 
-#: ../../Zotlabs/Module/Siteinfo.php:72
-msgid "Current load average: "
-msgstr "Charge moyenne actuelle&nbsp;:"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Envoie exclusivement aux visiteurs du profil concerné"
 
-#: ../../Zotlabs/Module/Siteinfo.php:75
-msgid "Running at web location"
-msgstr "Tourne à l'adresse internet"
+#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
+msgid "Name of thing e.g. something"
+msgstr "Nom de l'élément, p.ex. quelque-chose"
 
-#: ../../Zotlabs/Module/Siteinfo.php:76
-msgid ""
-"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
-"about $Projectname."
-msgstr "Merci de visiter <a href=\"http://hubzilla.org\">hubzilla.org</a> pour en apprendre davantage sur $Projectname."
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
+msgid "URL of thing (optional)"
+msgstr "URL de l'élément (facultatif)"
 
-#: ../../Zotlabs/Module/Siteinfo.php:77
-msgid "Bug reports and issues: please visit"
-msgstr "Pour remonter bogues et problèmes, merci de visiter"
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
+msgid "URL for photo of thing (optional)"
+msgstr "URL d'une photo de l'élément (facultatif)"
 
-#: ../../Zotlabs/Module/Siteinfo.php:79
-msgid "$projectname issues"
-msgstr "Problèmes $projectname"
-
-#: ../../Zotlabs/Module/Siteinfo.php:80
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Suggestions, demandes, etc. - merci de vous adresser à \"redmatrix\" à librelist - point com"
-
-#: ../../Zotlabs/Module/Siteinfo.php:82
-msgid "Site Administrators"
-msgstr "Administrateurs du site"
+#: ../../Zotlabs/Module/Thing.php:349
+msgid "Add Thing to your Profile"
+msgstr "Ajouter l'élément à  votre profil"
 
 #: ../../Zotlabs/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
@@ -6004,8 +6314,8 @@ msgstr "Source mise à jour."
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630
-#: ../../include/features.php:71
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:72
+#: ../../include/widgets.php:639
 msgid "Channel Sources"
 msgstr "Sources du canal"
 
@@ -6081,12 +6391,12 @@ msgstr "Aucune suggestion disponible. Si le site est récent, merci de re-tenter
 msgid "Ignore/Hide"
 msgstr "Ignorer/Cacher"
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:263
 msgid "post"
 msgstr "publication"
 
-#: ../../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:1929
 msgid "comment"
 msgstr "commentaire"
 
@@ -6107,131 +6417,110 @@ msgstr "Retirer une étiquette à l'élément"
 msgid "Select a tag to remove: "
 msgstr "Étiquette à retirer&nbsp;:"
 
-#: ../../Zotlabs/Module/Thing.php:114
-msgid "Thing updated"
-msgstr "Elément mis à jour"
+#: ../../Zotlabs/Module/Webpages.php:191 ../../Zotlabs/Lib/Apps.php:218
+#: ../../include/nav.php:106 ../../include/conversation.php:1700
+msgid "Webpages"
+msgstr "Pages web"
 
-#: ../../Zotlabs/Module/Thing.php:166
-msgid "Object store: failed"
-msgstr "Stockage de l'objet&nbsp;: échec"
+#: ../../Zotlabs/Module/Webpages.php:202 ../../include/page_widgets.php:44
+msgid "Actions"
+msgstr "Actions"
 
-#: ../../Zotlabs/Module/Thing.php:170
-msgid "Thing added"
-msgstr "Elément ajouté"
+#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:45
+msgid "Page Link"
+msgstr "Lien vers la page"
 
-#: ../../Zotlabs/Module/Thing.php:196
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr "OBJ: %1$s %2$s %3$s"
+#: ../../Zotlabs/Module/Webpages.php:204
+msgid "Page Title"
+msgstr "Titre de la page"
 
-#: ../../Zotlabs/Module/Thing.php:259
-msgid "Show Thing"
-msgstr "Montrer élément"
+#: ../../Zotlabs/Module/Wiki.php:34
+msgid "Not found"
+msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:266
-msgid "item not found."
-msgstr "élément introuvable."
+#: ../../Zotlabs/Module/Wiki.php:92 ../../Zotlabs/Lib/Apps.php:219
+#: ../../include/nav.php:108 ../../include/conversation.php:1710
+#: ../../include/conversation.php:1713 ../../include/features.php:55
+msgid "Wiki"
+msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:299
-msgid "Edit Thing"
-msgstr "Modifier élément"
+#: ../../Zotlabs/Module/Wiki.php:93
+msgid "Sandbox"
+msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
-msgid "Select a profile"
-msgstr "Choisissez un profil"
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Post an activity"
-msgstr "Publier une activité"
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Only sends to viewers of the applicable profile"
-msgstr "Envoie exclusivement aux visiteurs du profil concerné"
-
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
-msgid "Name of thing e.g. something"
-msgstr "Nom de l'élément, p.ex. quelque-chose"
-
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
-msgid "URL of thing (optional)"
-msgstr "URL de l'élément (facultatif)"
-
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
-msgid "URL for photo of thing (optional)"
-msgstr "URL d'une photo de l'élément (facultatif)"
-
-#: ../../Zotlabs/Module/Thing.php:349
-msgid "Add Thing to your Profile"
-msgstr "Ajouter l'élément à  votre profil"
-
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
-msgid "Export Channel"
-msgstr "Exporter le canal"
-
-#: ../../Zotlabs/Module/Uexport.php:57
+#: ../../Zotlabs/Module/Wiki.php:95
 msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
-msgstr "Exportez les principales informations de votre canal dans un fichier. Celui-ci pourra servir de sauvegarde de vos contacts, permissions, profils et données de base. Il pourra être importé sur un nouveau hub/serveur, mais n'embarquera pas vos contenus."
+"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be"
+" saved*.\""
+msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Content"
-msgstr "Exporter le contenu"
+#: ../../Zotlabs/Module/Wiki.php:164
+msgid "Revision Comparison"
+msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:59
-msgid ""
-"Export your channel information and recent content to a JSON backup that can"
-" be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for"
-" this download to begin."
-msgstr "Exportez les informations du canal et les contenus récents dans un fichier JSON. Celui-ci contiendra toutes vos relations, permissions, profils, et plusieurs mois de publications. Ce fichier peut être TRÈS gros. Armez-vous de patience - plusieurs minutes peuvent s'écouler avant que le téléchargement ne commence."
+#: ../../Zotlabs/Module/Wiki.php:165
+msgid "Revert"
+msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export your posts from a given year."
-msgstr "Exporter vos publications d'une année en particulier"
+#: ../../Zotlabs/Module/Wiki.php:192
+msgid "Enter the name of your new wiki:"
+msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:62
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
-msgstr "Vous pouvez également exporter vos publications et conversations pour une année ou un mois particulier. Ajustez la date dans la barre de votre navigateur pour sélectionner d'autres dates. Si l'export échoue (possible en cas de pénurie de mémoire sur le serveur de votre hub), essayez à nouveau en sélectionnant un intervalle de dates plus petit."
+#: ../../Zotlabs/Module/Wiki.php:193
+msgid "Enter the name of the new page:"
+msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:63
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a "
-"href=\"%1$s\">%2$s</a>"
-msgstr "Pour sélectionner toutes les publications pour une année donnée, telle que cette année, visitez <a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Wiki.php:194
+msgid "Enter the new name:"
+msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:64
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr "Pour sélectionner toutes les publications pour un mois donné, par exemple janvier, visitez <a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Wiki.php:200 ../../include/conversation.php:1150
+msgid "Embed image from photo albums"
+msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:65
-#, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a "
-"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
-" please import or restore these in date order (oldest first)."
-msgstr "Ces fichiers de contenu peuvent être importés ou restaurés en visitant <a href=\"%1$s\">%2$s</a> sur n'importe quel site hébergeant votre canal. Pour de meilleurs résultats merci de les importer par ordre chronologique (les plus anciens d'abord)."
+#: ../../Zotlabs/Module/Wiki.php:201 ../../include/conversation.php:1234
+msgid "Embed an image from your albums"
+msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:62
+#: ../../Zotlabs/Module/Wiki.php:203 ../../include/conversation.php:1236
+#: ../../include/conversation.php:1273
+msgid "OK"
+msgstr "OK"
+
+#: ../../Zotlabs/Module/Wiki.php:204 ../../include/conversation.php:1186
+msgid "Choose images to embed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:205 ../../include/conversation.php:1187
+msgid "Choose an album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:206 ../../include/conversation.php:1188
+msgid "Choose a different album..."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:207 ../../include/conversation.php:1189
+msgid "Error getting album list"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:208 ../../include/conversation.php:1190
+msgid "Error getting photo link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1191
+msgid "Error getting album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr "Aucun contact."
 
-#: ../../Zotlabs/Module/Viewconnections.php:75
+#: ../../Zotlabs/Module/Viewconnections.php:78
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Visiter le profil de %s [%s]"
 
-#: ../../Zotlabs/Module/Viewconnections.php:104
+#: ../../Zotlabs/Module/Viewconnections.php:107
 msgid "View Connections"
 msgstr "Voir les contacts"
 
@@ -6239,22 +6528,23 @@ msgstr "Voir les contacts"
 msgid "Source of Item"
 msgstr "Source de l'élément"
 
-#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217
-#: ../../include/nav.php:106 ../../include/conversation.php:1685
-msgid "Webpages"
-msgstr "Pages web"
+#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
+msgid "Authorize application connection"
+msgstr "Autoriser l'application à se connecter"
 
-#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
-msgid "Actions"
-msgstr "Actions"
+#: ../../Zotlabs/Module/Api.php:62
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Merci de retourner vers votre application, et d'y insérer ce Code de Sécurité&nbsp;:"
 
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
-msgid "Page Link"
-msgstr "Lien vers la page"
+#: ../../Zotlabs/Module/Api.php:72
+msgid "Please login to continue."
+msgstr "Merci de vous identifier pour continuer."
 
-#: ../../Zotlabs/Module/Webpages.php:197
-msgid "Page Title"
-msgstr "Titre de la page"
+#: ../../Zotlabs/Module/Api.php:87
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Voulez-vous autoriser cette application à accéder à vos publications et contacts, et/ou à publier en votre nom?"
 
 #: ../../Zotlabs/Module/Xchan.php:10
 msgid "Xchan Lookup"
@@ -6264,92 +6554,6 @@ msgstr "Recherche xchan"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Recherche xchan commençant par (ou adresse \"webbie\")&nbsp;:"
 
-#: ../../Zotlabs/Lib/Apps.php:204
-msgid "Site Admin"
-msgstr "Administrateur"
-
-#: ../../Zotlabs/Lib/Apps.php:205
-msgid "Bug Report"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:206
-msgid "View Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:207
-msgid "My Chatrooms"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:209
-msgid "Firefox Share"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:210
-msgid "Remote Diagnostics"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
-msgid "Suggest Channels"
-msgstr "Suggérer des canaux"
-
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
-#: ../../boot.php:1703
-msgid "Login"
-msgstr "Connexion"
-
-#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
-msgid "Grid"
-msgstr "Réseau"
-
-#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182
-msgid "Channel Home"
-msgstr "Mon canal"
-
-#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:201
-#: ../../include/conversation.php:1649 ../../include/conversation.php:1652
-msgid "Events"
-msgstr "Événements"
-
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167
-msgid "Directory"
-msgstr "Annuaire"
-
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193
-msgid "Mail"
-msgstr "Messages"
-
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96
-msgid "Chat"
-msgstr "Clavardage"
-
-#: ../../Zotlabs/Lib/Apps.php:229
-msgid "Probe"
-msgstr "Sonder"
-
-#: ../../Zotlabs/Lib/Apps.php:230
-msgid "Suggest"
-msgstr "Suggérer"
-
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Random Channel"
-msgstr "Un canal au hasard"
-
-#: ../../Zotlabs/Lib/Apps.php:232
-msgid "Invite"
-msgstr "Invitation"
-
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1386
-msgid "Features"
-msgstr "Fonctionalités"
-
-#: ../../Zotlabs/Lib/Apps.php:235
-msgid "Post"
-msgstr "Envoyer"
-
-#: ../../Zotlabs/Lib/Apps.php:335
-msgid "Purchase"
-msgstr "Acheter"
-
 #: ../../Zotlabs/Lib/Chatroom.php:27
 msgid "Missing room name"
 msgstr "Il manque le nom du salon"
@@ -6370,19 +6574,19 @@ msgstr "Salon introuvable."
 msgid "Room is full"
 msgstr "Le salon est plein"
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1882
 msgid "$Projectname Notification"
 msgstr "Notification $Projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1883
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1885
 msgid "Thank You,"
 msgstr "Merci,"
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1887
 #, php-format
 msgid "%s Administrator"
 msgstr "l'administrateur de %s"
@@ -6575,11 +6779,97 @@ msgstr "a publié un nouveau message"
 msgid "commented on %s's post"
 msgstr "a commenté la publication de %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:664
+#: ../../Zotlabs/Lib/Apps.php:205
+msgid "Site Admin"
+msgstr "Administrateur"
+
+#: ../../Zotlabs/Lib/Apps.php:206
+msgid "Bug Report"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:207
+msgid "View Bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:208
+msgid "My Chatrooms"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:210
+msgid "Firefox Share"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:211
+msgid "Remote Diagnostics"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:90
+msgid "Suggest Channels"
+msgstr "Suggérer des canaux"
+
+#: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:112
+#: ../../boot.php:1704
+msgid "Login"
+msgstr "Connexion"
+
+#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:181
+msgid "Grid"
+msgstr "Réseau"
+
+#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:184
+msgid "Channel Home"
+msgstr "Mon canal"
+
+#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:203
+#: ../../include/conversation.php:1664 ../../include/conversation.php:1667
+msgid "Events"
+msgstr "Événements"
+
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:169
+msgid "Directory"
+msgstr "Annuaire"
+
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:195
+msgid "Mail"
+msgstr "Messages"
+
+#: ../../Zotlabs/Lib/Apps.php:229 ../../include/nav.php:96
+msgid "Chat"
+msgstr "Clavardage"
+
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Probe"
+msgstr "Sonder"
+
+#: ../../Zotlabs/Lib/Apps.php:232
+msgid "Suggest"
+msgstr "Suggérer"
+
+#: ../../Zotlabs/Lib/Apps.php:233
+msgid "Random Channel"
+msgstr "Un canal au hasard"
+
+#: ../../Zotlabs/Lib/Apps.php:234
+msgid "Invite"
+msgstr "Invitation"
+
+#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1480
+msgid "Features"
+msgstr "Fonctionalités"
+
+#: ../../Zotlabs/Lib/Apps.php:237
+msgid "Post"
+msgstr "Envoyer"
+
+#: ../../Zotlabs/Lib/Apps.php:339
+msgid "Purchase"
+msgstr "Acheter"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:667
 msgid "Private Message"
 msgstr "Message Privé"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:656
+#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:659
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -6627,11 +6917,11 @@ msgstr "(Dés)activer l'étoile"
 msgid "starred"
 msgstr "mis en avant"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:671
+#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:674
 msgid "Message signature validated"
 msgstr "Signature du message validée"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:672
+#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:675
 msgid "Message signature incorrect"
 msgstr "Signature du message incorrecte"
 
@@ -6687,17 +6977,17 @@ msgstr "Mur-à-mur"
 msgid "via Wall-To-Wall:"
 msgstr "par Mur-à-mur&nbsp;:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:719
+#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:722
 #, php-format
 msgid "from %s"
 msgstr "de %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:722
+#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:725
 #, php-format
 msgid "last edited: %s"
 msgstr "dernière modification&nbsp;: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:723
+#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:726
 #, php-format
 msgid "Expires: %s"
 msgstr "Expire&nbsp;: %s"
@@ -6715,26 +7005,27 @@ msgid "Mark all seen"
 msgstr "Tout marquer comme vu"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
-msgid "[+] show all"
-msgstr "[+] voir tous"
+#, php-format
+msgid "%s show all"
+msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1215
+#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1226
 msgid "Bold"
 msgstr "Gras"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1216
+#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1227
 msgid "Italic"
 msgstr "Italique"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1217
+#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1228
 msgid "Underline"
 msgstr "Souligné"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1218
+#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1229
 msgid "Quote"
 msgstr "Citation"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1219
+#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1230
 msgid "Code"
 msgstr "Code"
 
@@ -6750,11 +7041,74 @@ msgstr "Insérer un lien"
 msgid "Video"
 msgstr "Vidéo"
 
+#: ../../Zotlabs/Lib/PermissionDescription.php:31
+#: ../../include/acl_selectors.php:230
+msgid "Visible to your default audience"
+msgstr "Visible pour vos contacts seulement"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:106
+#: ../../include/acl_selectors.php:266
+msgid "Only me"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+msgid "Public"
+msgstr "Public"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Anybody in the $Projectname network"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+#, php-format
+msgid "Any account on %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+msgid "Any of my connections"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Only connections I specifically allow"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Any connections including those who haven't yet been approved"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
+msgid ""
+"This is your default setting for who can view your default channel profile"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+msgid "This is your default setting for who can view your connections"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:155
+msgid ""
+"This is your default setting for who can view your file storage and photos"
+msgstr ""
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:156
+msgid "This is your default setting for the audience of your webpages"
+msgstr ""
+
 #: ../../include/Import/import_diaspora.php:16
 msgid "No username found in import file."
 msgstr "Aucun nom d'utilisateur dans le fichier d'import."
 
-#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50
+#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:51
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "Impossible de créer une adresse de canal unique. Echec de l'import."
 
@@ -6763,6 +7117,291 @@ msgstr "Impossible de créer une adresse de canal unique. Echec de l'import."
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Impossible de trouver les infos DNS du serveur de BDD '%s'"
 
+#: ../../include/photos.php:114
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "L'image dépasse la taille limite de %lu octets"
+
+#: ../../include/photos.php:121
+msgid "Image file is empty."
+msgstr "L'image est vide."
+
+#: ../../include/photos.php:259
+msgid "Photo storage failed."
+msgstr "Le stockage de l'image a échoué."
+
+#: ../../include/photos.php:299
+msgid "a new photo"
+msgstr "une nouvelle photo"
+
+#: ../../include/photos.php:303
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s a publié %2$s pour %3$s"
+
+#: ../../include/photos.php:506 ../../include/conversation.php:1650
+msgid "Photo Albums"
+msgstr "Albums photo"
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Ajouter des photos"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1703
+msgid "Logout"
+msgstr "Déconnexion"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115
+msgid "End this session"
+msgstr "Mettre fin à la session"
+
+#: ../../include/nav.php:85 ../../include/nav.php:146
+msgid "Home"
+msgstr "Mon canal"
+
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr "Vos publications et conversations"
+
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr "Votre profil"
+
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr "Gérer/modifier les profils"
+
+#: ../../include/nav.php:90 ../../include/channel.php:980
+msgid "Edit Profile"
+msgstr "Éditeur de profil"
+
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr "Modifier votre profil"
+
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr "Vos photos"
+
+#: ../../include/nav.php:93
+msgid "Your files"
+msgstr "Vos fichiers"
+
+#: ../../include/nav.php:96
+msgid "Your chatrooms"
+msgstr "Vos salons"
+
+#: ../../include/nav.php:102 ../../include/conversation.php:1690
+msgid "Bookmarks"
+msgstr "Favoris"
+
+#: ../../include/nav.php:102
+msgid "Your bookmarks"
+msgstr "Vos favoris"
+
+#: ../../include/nav.php:106
+msgid "Your webpages"
+msgstr "Vos pages web"
+
+#: ../../include/nav.php:108
+msgid "Your wiki"
+msgstr ""
+
+#: ../../include/nav.php:112
+msgid "Sign in"
+msgstr "Connexion"
+
+#: ../../include/nav.php:129
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - cliquer ici pour déconnecter"
+
+#: ../../include/nav.php:132
+msgid "Remote authentication"
+msgstr "Authentification distante"
+
+#: ../../include/nav.php:132
+msgid "Click to authenticate to your home hub"
+msgstr "S'authentifier auprès de votre hub principal"
+
+#: ../../include/nav.php:146
+msgid "Home Page"
+msgstr "Page d'accueil"
+
+#: ../../include/nav.php:149
+msgid "Create an account"
+msgstr "Créer un compte"
+
+#: ../../include/nav.php:161
+msgid "Help and documentation"
+msgstr "Aide et documentation"
+
+#: ../../include/nav.php:165
+msgid "Applications, utilities, links, games"
+msgstr "Applications, utilitaires, liens, jeux"
+
+#: ../../include/nav.php:167
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Recherche @nom, #tag, contenu"
+
+#: ../../include/nav.php:169
+msgid "Channel Directory"
+msgstr "Annuaire des canaux"
+
+#: ../../include/nav.php:181
+msgid "Your grid"
+msgstr "Votre réseau"
+
+#: ../../include/nav.php:182
+msgid "Mark all grid notifications seen"
+msgstr "Marquer toutes les notifications du réseau comme vues"
+
+#: ../../include/nav.php:184
+msgid "Channel home"
+msgstr "Mon canal"
+
+#: ../../include/nav.php:185
+msgid "Mark all channel notifications seen"
+msgstr "Marquer toutes les notifications du canal comme vues"
+
+#: ../../include/nav.php:191
+msgid "Notices"
+msgstr "Notifications"
+
+#: ../../include/nav.php:191
+msgid "Notifications"
+msgstr "Notifications"
+
+#: ../../include/nav.php:192
+msgid "See all notifications"
+msgstr "Voir toutes les notifications"
+
+#: ../../include/nav.php:195
+msgid "Private mail"
+msgstr "Messages privés"
+
+#: ../../include/nav.php:196
+msgid "See all private messages"
+msgstr "Voir tous les messages privés"
+
+#: ../../include/nav.php:197
+msgid "Mark all private messages seen"
+msgstr "Marquer tous les messages privés comme vus"
+
+#: ../../include/nav.php:198 ../../include/widgets.php:667
+msgid "Inbox"
+msgstr "Boîte de réception"
+
+#: ../../include/nav.php:199 ../../include/widgets.php:672
+msgid "Outbox"
+msgstr "Boîte d'envoi"
+
+#: ../../include/nav.php:200 ../../include/widgets.php:677
+msgid "New Message"
+msgstr "Nouveau message"
+
+#: ../../include/nav.php:203
+msgid "Event Calendar"
+msgstr "Calendrier des événements"
+
+#: ../../include/nav.php:204
+msgid "See all events"
+msgstr "Voir tous les événements"
+
+#: ../../include/nav.php:205
+msgid "Mark all events seen"
+msgstr "Marquer tous les événements comme vus"
+
+#: ../../include/nav.php:208
+msgid "Manage Your Channels"
+msgstr "Gérer vos canaux"
+
+#: ../../include/nav.php:210
+msgid "Account/Channel Settings"
+msgstr "Paramètres du Compte/Canal"
+
+#: ../../include/nav.php:218 ../../include/widgets.php:1510
+msgid "Admin"
+msgstr "Administrateur"
+
+#: ../../include/nav.php:218
+msgid "Site Setup and Configuration"
+msgstr "Configuration du site"
+
+#: ../../include/nav.php:249 ../../include/conversation.php:854
+msgid "Loading..."
+msgstr "Chargement..."
+
+#: ../../include/nav.php:254
+msgid "@name, #tag, ?doc, content"
+msgstr "@nom, #étiquette, ?doc, contenu"
+
+#: ../../include/nav.php:255
+msgid "Please wait..."
+msgstr "Merci de patienter..."
+
+#: ../../include/network.php:704
+msgid "view full size"
+msgstr "voir en taille réelle"
+
+#: ../../include/network.php:1930 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr "Administrateur"
+
+#: ../../include/network.php:1944
+msgid "No Subject"
+msgstr "Pas d'objet"
+
+#: ../../include/network.php:2198 ../../include/network.php:2199
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/network.php:2200
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/network.php:2201
+msgid "GNU-Social"
+msgstr ""
+
+#: ../../include/network.php:2202
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/network.php:2204
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/network.php:2205
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/network.php:2206
+msgid "Zot"
+msgstr "Zot"
+
+#: ../../include/network.php:2207
+msgid "LinkedIn"
+msgstr "Linkedin"
+
+#: ../../include/network.php:2208
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/network.php:2209
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/page_widgets.php:7
+msgid "New Page"
+msgstr "Nouvelle page"
+
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr "Titre"
+
 #: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
 #: ../../include/widgets.php:46 ../../include/widgets.php:429
 #: ../../include/contact_widgets.php:91
@@ -6801,952 +7440,159 @@ msgstr "aime"
 msgid "dislikes"
 msgstr "n'aime pas"
 
-#: ../../include/event.php:22 ../../include/event.php:69
-#: ../../include/bb2diaspora.php:485
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d F Y \\à G\\hi"
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
+msgstr "Impossible d'obtenir les données d'identité depuis la base de données"
 
-#: ../../include/event.php:30 ../../include/event.php:73
-#: ../../include/bb2diaspora.php:491
-msgid "Starts:"
-msgstr "Début&nbsp;:"
+#: ../../include/channel.php:67
+msgid "Empty name"
+msgstr "Nom vide"
 
-#: ../../include/event.php:40 ../../include/event.php:77
-#: ../../include/bb2diaspora.php:499
-msgid "Finishes:"
-msgstr "Fin&nbsp;:"
+#: ../../include/channel.php:70
+msgid "Name too long"
+msgstr "Nom trop long"
 
-#: ../../include/event.php:812
-msgid "This event has been added to your calendar."
-msgstr "Cet évènement a été ajouté dans votre calendrier."
+#: ../../include/channel.php:181
+msgid "No account identifier"
+msgstr "Pas d'identifiant de compte"
 
-#: ../../include/event.php:1012
-msgid "Not specified"
-msgstr "Non spécifié"
+#: ../../include/channel.php:193
+msgid "Nickname is required."
+msgstr "Un surnom est requis."
 
-#: ../../include/event.php:1013
-msgid "Needs Action"
-msgstr "Besoin d'une action"
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Surnom réservé. Merci d'en choisir un autre."
 
-#: ../../include/event.php:1014
-msgid "Completed"
-msgstr "Terminé"
-
-#: ../../include/event.php:1015
-msgid "In Process"
-msgstr "En cours"
-
-#: ../../include/event.php:1016
-msgid "Cancelled"
-msgstr "Annulé"
-
-#: ../../include/import.php:29
+#: ../../include/channel.php:212
 msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "L'import a échoué. Un canal existe déjà avec ce nom"
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Le surnom contient des caractères interdits ou est déjà pris sur ce site."
 
-#: ../../include/import.php:76
-msgid "Channel clone failed. Import failed."
-msgstr "Echec du clonage du canal. Echec de l'impot."
+#: ../../include/channel.php:272
+msgid "Unable to retrieve created identity"
+msgstr "Impossible de récupérer l'identité créée"
 
-#: ../../include/items.php:892 ../../include/items.php:937
-msgid "(Unknown)"
-msgstr "(Inconnu)"
+#: ../../include/channel.php:341
+msgid "Default Profile"
+msgstr "Profil par défaut"
 
-#: ../../include/items.php:1136
-msgid "Visible to anybody on the internet."
-msgstr "Visible pour tout le monde sur internet."
+#: ../../include/channel.php:830
+msgid "Requested channel is not available."
+msgstr "Canal demandé non disponible."
 
-#: ../../include/items.php:1138
-msgid "Visible to you only."
-msgstr "Visible pour vous seulement."
+#: ../../include/channel.php:977
+msgid "Create New Profile"
+msgstr "Créer un nouveau profil"
 
-#: ../../include/items.php:1140
-msgid "Visible to anybody in this network."
-msgstr "Visible pour tout le monde sur ce réseau."
+#: ../../include/channel.php:997
+msgid "Visible to everybody"
+msgstr "Visible de tous"
 
-#: ../../include/items.php:1142
-msgid "Visible to anybody authenticated."
-msgstr "Visible aux utilisateurs authentifiés."
+#: ../../include/channel.php:1070 ../../include/channel.php:1182
+msgid "Gender:"
+msgstr "Sexe&nbsp;:"
 
-#: ../../include/items.php:1144
+#: ../../include/channel.php:1071 ../../include/channel.php:1226
+msgid "Status:"
+msgstr "État&nbsp;:"
+
+#: ../../include/channel.php:1072 ../../include/channel.php:1237
+msgid "Homepage:"
+msgstr "Site Internet&nbsp;:"
+
+#: ../../include/channel.php:1073
+msgid "Online Now"
+msgstr "Connecté"
+
+#: ../../include/channel.php:1187
+msgid "Like this channel"
+msgstr "J'aime ce canal"
+
+#: ../../include/channel.php:1211
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: ../../include/channel.php:1212
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/channel.php:1219
+msgid "Birthday:"
+msgstr "Date de naissance&nbsp;:"
+
+#: ../../include/channel.php:1232
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr "Visible pour tous sur %s."
+msgid "for %1$d %2$s"
+msgstr "depuis %1$d %2$s"
 
-#: ../../include/items.php:1146
-msgid "Visible to all connections."
-msgstr "Visible pour tous les contacts."
+#: ../../include/channel.php:1235
+msgid "Sexual Preference:"
+msgstr "Orientation sexuelle&nbsp;:"
 
-#: ../../include/items.php:1148
-msgid "Visible to approved connections."
-msgstr "Visible aux contacts approuvés."
+#: ../../include/channel.php:1241
+msgid "Tags:"
+msgstr "Étiquettes&nbsp;:"
 
-#: ../../include/items.php:1150
-msgid "Visible to specific connections."
-msgstr "Visible pour certains contacts."
+#: ../../include/channel.php:1243
+msgid "Political Views:"
+msgstr "Opinions politiques&nbsp;:"
 
-#: ../../include/items.php:3909
-msgid "Privacy group is empty."
-msgstr "Groupe d'accès vide."
+#: ../../include/channel.php:1245
+msgid "Religion:"
+msgstr "Religion&nbsp;:"
 
-#: ../../include/items.php:3916
-#, php-format
-msgid "Privacy group: %s"
-msgstr "Groupe d'accès&nbsp;: %s"
+#: ../../include/channel.php:1249
+msgid "Hobbies/Interests:"
+msgstr "Occupations/Centres d'intérêt&nbsp;:"
 
-#: ../../include/items.php:3928
-msgid "Connection not found."
-msgstr "Contact non trouvé."
+#: ../../include/channel.php:1251
+msgid "Likes:"
+msgstr "Aime&nbsp;:"
 
-#: ../../include/items.php:4277
-msgid "profile photo"
-msgstr "photo de profil"
+#: ../../include/channel.php:1253
+msgid "Dislikes:"
+msgstr "N'aime pas&nbsp;:"
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
-msgstr "Pas de destinataire."
+#: ../../include/channel.php:1255
+msgid "Contact information and Social Networks:"
+msgstr "Coordonnées et réseaux sociaux&nbsp;:"
 
-#: ../../include/message.php:25
-msgid "[no subject]"
-msgstr "[sans objet]"
+#: ../../include/channel.php:1257
+msgid "My other channels:"
+msgstr "Mes autres canaux&nbsp;:"
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "Impossible de déterminer l'émetteur."
+#: ../../include/channel.php:1259
+msgid "Musical interests:"
+msgstr "Goûts musicaux&nbsp;:"
 
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
-msgstr "Le message stocké n'a pas pu être vérifié."
+#: ../../include/channel.php:1261
+msgid "Books, literature:"
+msgstr "Lectures, goûts littéraires&nbsp;:"
 
-#: ../../include/text.php:428
-msgid "prev"
-msgstr "préc."
+#: ../../include/channel.php:1263
+msgid "Television:"
+msgstr "Télévision&nbsp;:"
 
-#: ../../include/text.php:430
-msgid "first"
-msgstr "premier"
+#: ../../include/channel.php:1265
+msgid "Film/dance/culture/entertainment:"
+msgstr "Cinéma/danse/culture/divertissement&nsbp;:"
 
-#: ../../include/text.php:459
-msgid "last"
-msgstr "dernier"
+#: ../../include/channel.php:1267
+msgid "Love/Romance:"
+msgstr "Vie sentimentale/amoureuse&nbsp;:"
 
-#: ../../include/text.php:462
-msgid "next"
-msgstr "Suivant"
+#: ../../include/channel.php:1269
+msgid "Work/employment:"
+msgstr "Travail/Occupation&nbsp;"
 
-#: ../../include/text.php:472
-msgid "older"
-msgstr "plus ancien"
+#: ../../include/channel.php:1271
+msgid "School/education:"
+msgstr "Études&nbsp;"
 
-#: ../../include/text.php:474
-msgid "newer"
-msgstr "plus récent"
-
-#: ../../include/text.php:863
-msgid "No connections"
-msgstr "Pas de relations."
-
-#: ../../include/text.php:888
-#, php-format
-msgid "View all %s connections"
-msgstr "Voir les %s contacts"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-msgid "poke"
-msgstr "tapoter"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-#: ../../include/conversation.php:243
-msgid "poked"
-msgstr "a tapoté"
-
-#: ../../include/text.php:1039
-msgid "ping"
-msgstr "ping"
-
-#: ../../include/text.php:1039
-msgid "pinged"
-msgstr "pingé"
-
-#: ../../include/text.php:1040
-msgid "prod"
-msgstr "encourager"
-
-#: ../../include/text.php:1040
-msgid "prodded"
-msgstr "encouragé"
-
-#: ../../include/text.php:1041
-msgid "slap"
-msgstr "giffler"
-
-#: ../../include/text.php:1041
-msgid "slapped"
-msgstr "gifflé(e)"
-
-#: ../../include/text.php:1042
-msgid "finger"
-msgstr "pointer"
-
-#: ../../include/text.php:1042
-msgid "fingered"
-msgstr "pointé"
-
-#: ../../include/text.php:1043
-msgid "rebuff"
-msgstr "rejetter"
-
-#: ../../include/text.php:1043
-msgid "rebuffed"
-msgstr "rejeté"
-
-#: ../../include/text.php:1055
-msgid "happy"
-msgstr "heureux"
-
-#: ../../include/text.php:1056
-msgid "sad"
-msgstr "triste"
-
-#: ../../include/text.php:1057
-msgid "mellow"
-msgstr "mélancolique"
-
-#: ../../include/text.php:1058
-msgid "tired"
-msgstr "fatigué"
-
-#: ../../include/text.php:1059
-msgid "perky"
-msgstr "impertinent"
-
-#: ../../include/text.php:1060
-msgid "angry"
-msgstr "en colère"
-
-#: ../../include/text.php:1061
-msgid "stupefied"
-msgstr "stupéfait"
-
-#: ../../include/text.php:1062
-msgid "puzzled"
-msgstr "perplexe"
-
-#: ../../include/text.php:1063
-msgid "interested"
-msgstr "intéressé"
-
-#: ../../include/text.php:1064
-msgid "bitter"
-msgstr "amer"
-
-#: ../../include/text.php:1065
-msgid "cheerful"
-msgstr "plein d'entrain"
-
-#: ../../include/text.php:1066
-msgid "alive"
-msgstr "vivant"
-
-#: ../../include/text.php:1067
-msgid "annoyed"
-msgstr "agaçé"
-
-#: ../../include/text.php:1068
-msgid "anxious"
-msgstr "anxieux"
-
-#: ../../include/text.php:1069
-msgid "cranky"
-msgstr "énervé"
-
-#: ../../include/text.php:1070
-msgid "disturbed"
-msgstr "perturbé"
-
-#: ../../include/text.php:1071
-msgid "frustrated"
-msgstr "frustré"
-
-#: ../../include/text.php:1072
-msgid "depressed"
-msgstr "déprimé"
-
-#: ../../include/text.php:1073
-msgid "motivated"
-msgstr "motivé"
-
-#: ../../include/text.php:1074
-msgid "relaxed"
-msgstr "détendu"
-
-#: ../../include/text.php:1075
-msgid "surprised"
-msgstr "surpris"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:70
-msgid "Monday"
-msgstr "Lundi"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:71
-msgid "Tuesday"
-msgstr "Mardi"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:72
-msgid "Wednesday"
-msgstr "Mercredi"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:73
-msgid "Thursday"
-msgstr "Jeudi"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:74
-msgid "Friday"
-msgstr "Vendredi"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:75
-msgid "Saturday"
-msgstr "Samedi"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:69
-msgid "Sunday"
-msgstr "Dimanche"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:45
-msgid "January"
-msgstr "Janvier"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:46
-msgid "February"
-msgstr "Février"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:47
-msgid "March"
-msgstr "Mars"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:48
-msgid "April"
-msgstr "Avril"
-
-#: ../../include/text.php:1261
-msgid "May"
-msgstr "Mai"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:50
-msgid "June"
-msgstr "Juin"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:51
-msgid "July"
-msgstr "Juillet"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:52
-msgid "August"
-msgstr "Août"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:53
-msgid "September"
-msgstr "Septembre"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:54
-msgid "October"
-msgstr "Octobre"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:55
-msgid "November"
-msgstr "Novembre"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:56
-msgid "December"
-msgstr "Décembre"
-
-#: ../../include/text.php:1338 ../../include/text.php:1342
-msgid "Unknown Attachment"
-msgstr "Pièce jointe inconnue"
-
-#: ../../include/text.php:1344
-msgid "unknown"
-msgstr "Inconnu"
-
-#: ../../include/text.php:1380
-msgid "remove category"
-msgstr "supprimer la catégorie"
-
-#: ../../include/text.php:1457
-msgid "remove from file"
-msgstr "retirer du fichier"
-
-#: ../../include/text.php:1753 ../../include/text.php:1824
-msgid "default"
-msgstr "défaut"
-
-#: ../../include/text.php:1761
-msgid "Page layout"
-msgstr "Mise en page"
-
-#: ../../include/text.php:1761
-msgid "You can create your own with the layouts tool"
-msgstr "Créez les vôtres avec les outils de mise en page"
-
-#: ../../include/text.php:1803
-msgid "Page content type"
-msgstr "Type de contenu de la page"
-
-#: ../../include/text.php:1836
-msgid "Select an alternate language"
-msgstr "Choisir une langue alternative"
-
-#: ../../include/text.php:1953
-msgid "activity"
-msgstr "activité"
-
-#: ../../include/text.php:2262
-msgid "Design Tools"
-msgstr "Outils de conception"
-
-#: ../../include/text.php:2268
-msgid "Pages"
-msgstr "Pages"
-
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr "Système"
-
-#: ../../include/widgets.php:106
-msgid "New App"
-msgstr ""
-
-#: ../../include/widgets.php:154
-msgid "Suggestions"
-msgstr "Suggestions"
-
-#: ../../include/widgets.php:155
-msgid "See more..."
-msgstr "Voir plus..."
-
-#: ../../include/widgets.php:175
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Vous avez %1$.0f sur %2$.0f contacts autorisés."
-
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
-msgstr "Ajouter un nouveau contact"
-
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr "Saisissez l'adresse du canal"
-
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Exemples&nbsp;: pierre@exemple.com, https://exemple.com/sophie"
-
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr "Notes"
-
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr "Retirer le terme"
-
-#: ../../include/widgets.php:281 ../../include/features.php:84
-msgid "Saved Searches"
-msgstr "Recherches sauvegardées"
-
-#: ../../include/widgets.php:282 ../../include/group.php:316
-msgid "add"
-msgstr "ajouter"
-
-#: ../../include/widgets.php:310 ../../include/contact_widgets.php:53
-#: ../../include/features.php:98
-msgid "Saved Folders"
-msgstr "Dossiers sauvegardés"
-
-#: ../../include/widgets.php:313 ../../include/widgets.php:432
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-msgid "Everything"
-msgstr "Tout"
-
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr "Archives"
-
-#: ../../include/widgets.php:516
-msgid "Refresh"
-msgstr "Actualiser"
-
-#: ../../include/widgets.php:556
-msgid "Account settings"
-msgstr "Paramètres du compte"
-
-#: ../../include/widgets.php:562
-msgid "Channel settings"
-msgstr "Paramètres du canal"
-
-#: ../../include/widgets.php:571
-msgid "Additional features"
-msgstr "Fonctionnalités supplémentaires"
-
-#: ../../include/widgets.php:578
-msgid "Feature/Addon settings"
-msgstr "Paramètres des extensions/greffons"
-
-#: ../../include/widgets.php:584
-msgid "Display settings"
-msgstr "Paramètres d'affichage"
-
-#: ../../include/widgets.php:591
-msgid "Manage locations"
-msgstr ""
-
-#: ../../include/widgets.php:600
-msgid "Export channel"
-msgstr "Exporter le canal"
-
-#: ../../include/widgets.php:607
-msgid "Connected apps"
-msgstr "Applications connectées"
-
-#: ../../include/widgets.php:622
-msgid "Premium Channel Settings"
-msgstr "Paramètres de canal VIP"
-
-#: ../../include/widgets.php:651
-msgid "Private Mail Menu"
-msgstr "Menu des messages privés"
-
-#: ../../include/widgets.php:653
-msgid "Combined View"
-msgstr "Vue combinée"
-
-#: ../../include/widgets.php:658 ../../include/nav.php:196
-msgid "Inbox"
-msgstr "Boîte de réception"
-
-#: ../../include/widgets.php:663 ../../include/nav.php:197
-msgid "Outbox"
-msgstr "Boîte d'envoi"
-
-#: ../../include/widgets.php:668 ../../include/nav.php:198
-msgid "New Message"
-msgstr "Nouveau message"
-
-#: ../../include/widgets.php:685 ../../include/widgets.php:697
-msgid "Conversations"
-msgstr "Conversations"
-
-#: ../../include/widgets.php:689
-msgid "Received Messages"
-msgstr "Messages reçus"
-
-#: ../../include/widgets.php:693
-msgid "Sent Messages"
-msgstr "Messages envoyés"
-
-#: ../../include/widgets.php:707
-msgid "No messages."
-msgstr "Pas de message."
-
-#: ../../include/widgets.php:725
-msgid "Delete conversation"
-msgstr "Supprimer la conversation"
-
-#: ../../include/widgets.php:751
-msgid "Events Menu"
-msgstr "Menu Evènements"
-
-#: ../../include/widgets.php:752
-msgid "Day View"
-msgstr "Vue Jour"
-
-#: ../../include/widgets.php:753
-msgid "Week View"
-msgstr "Vue Semaine"
-
-#: ../../include/widgets.php:754
-msgid "Month View"
-msgstr "Vue Mois"
-
-#: ../../include/widgets.php:766
-msgid "Events Tools"
-msgstr "Outils Evènements"
-
-#: ../../include/widgets.php:767
-msgid "Export Calendar"
-msgstr "Exporter le calendrier"
-
-#: ../../include/widgets.php:768
-msgid "Import Calendar"
-msgstr "Importer un calendrier"
-
-#: ../../include/widgets.php:842 ../../include/conversation.php:1662
-#: ../../include/conversation.php:1665
-msgid "Chatrooms"
-msgstr "Salons de clavardage"
-
-#: ../../include/widgets.php:846
-msgid "Overview"
-msgstr ""
-
-#: ../../include/widgets.php:853
-msgid "Chat Members"
-msgstr ""
-
-#: ../../include/widgets.php:876
-msgid "Bookmarked Chatrooms"
-msgstr "Salons favoris"
-
-#: ../../include/widgets.php:899
-msgid "Suggested Chatrooms"
-msgstr "Salons suggérés"
-
-#: ../../include/widgets.php:1044 ../../include/widgets.php:1156
-msgid "photo/image"
-msgstr "photo/image"
-
-#: ../../include/widgets.php:1099
-msgid "Click to show more"
-msgstr "Cliquer pour voir plus"
-
-#: ../../include/widgets.php:1250
-msgid "Rating Tools"
-msgstr "Outils d'évaluation"
-
-#: ../../include/widgets.php:1254 ../../include/widgets.php:1256
-msgid "Rate Me"
-msgstr "M'évaluer"
-
-#: ../../include/widgets.php:1259
-msgid "View Ratings"
-msgstr "Voir mes évaluations"
-
-#: ../../include/widgets.php:1316
-msgid "Forums"
-msgstr "Membres du forum"
-
-#: ../../include/widgets.php:1345
-msgid "Tasks"
-msgstr "Tâches"
-
-#: ../../include/widgets.php:1354
-msgid "Documentation"
-msgstr "Documentation"
-
-#: ../../include/widgets.php:1356
-msgid "Project/Site Information"
-msgstr "Information sur le site/projet"
-
-#: ../../include/widgets.php:1357
-msgid "For Members"
-msgstr "Pour les membres"
-
-#: ../../include/widgets.php:1358
-msgid "For Administrators"
-msgstr "Pour les administrateurs"
-
-#: ../../include/widgets.php:1359
-msgid "For Developers"
-msgstr "Pour les développeurs"
-
-#: ../../include/widgets.php:1383 ../../include/widgets.php:1421
-msgid "Member registrations waiting for confirmation"
-msgstr ""
-
-#: ../../include/widgets.php:1389
-msgid "Inspect queue"
-msgstr "Analyser la file d'attente"
-
-#: ../../include/widgets.php:1391
-msgid "DB updates"
-msgstr "Mises à jour BDD"
-
-#: ../../include/widgets.php:1416 ../../include/nav.php:216
-msgid "Admin"
-msgstr "Administrateur"
-
-#: ../../include/widgets.php:1417
-msgid "Plugin Features"
-msgstr "Fonctionnalités des greffons"
-
-#: ../../include/follow.php:27
-msgid "Channel is blocked on this site."
-msgstr "Ce canal est bloqué sur ce site."
-
-#: ../../include/follow.php:32
-msgid "Channel location missing."
-msgstr "Emplacement du canal introuvable."
-
-#: ../../include/follow.php:81
-msgid "Response from remote channel was incomplete."
-msgstr "La réponse du canal distant était incomplète."
-
-#: ../../include/follow.php:98
-msgid "Channel was deleted and no longer exists."
-msgstr "Le canal a été supprimé et n'existe plus."
-
-#: ../../include/follow.php:154 ../../include/follow.php:190
-msgid "Protocol disabled."
-msgstr "Protocole désactivé."
-
-#: ../../include/follow.php:178
-msgid "Channel discovery failed."
-msgstr "La tentative d'accéder au canal a échoué."
-
-#: ../../include/follow.php:216
-msgid "Cannot connect to yourself."
-msgstr "Ne peut pas se connecter à vous."
-
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "Favoris de %1$s"
-
-#: ../../include/api.php:1336
-msgid "Public Timeline"
-msgstr "Fil public"
-
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:844
-#: ../../include/bbcode.php:847 ../../include/bbcode.php:852
-#: ../../include/bbcode.php:855 ../../include/bbcode.php:858
-#: ../../include/bbcode.php:861 ../../include/bbcode.php:866
-#: ../../include/bbcode.php:869 ../../include/bbcode.php:874
-#: ../../include/bbcode.php:877 ../../include/bbcode.php:880
-#: ../../include/bbcode.php:883
-msgid "Image/photo"
-msgstr "Image/photo"
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:894
-msgid "Encrypted content"
-msgstr "Contenu chiffré"
-
-#: ../../include/bbcode.php:178
-#, php-format
-msgid "Install %s element: "
-msgstr "Installer %s élément"
-
-#: ../../include/bbcode.php:182
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Ce message contient un élément installable %s, mais vous n'avez pas l'autorisation de l'installer sur ce site."
-
-#: ../../include/bbcode.php:254
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s a écrit %2$s qui suit %3$s"
-
-#: ../../include/bbcode.php:331 ../../include/bbcode.php:339
-msgid "Click to open/close"
-msgstr "Cliquer pour ouvrir/fermer"
-
-#: ../../include/bbcode.php:339
-msgid "spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:585
-msgid "Different viewers will see this text differently"
-msgstr "Ce texte aura un rendu différent en fonction des utilisateurs"
-
-#: ../../include/bbcode.php:832
-msgid "$1 wrote:"
-msgstr "$1 a écrit&nbsp;:"
-
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr "Options d'annuaire"
-
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr "Mode sûr"
-
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr "Les forums publics uniquement"
-
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr "Ce site uniquement"
-
-#: ../../include/security.php:383
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "Le formulaire n'est plus sécurisé, probablement parce qu'il est ouvert depuis trop longtemps (plus de 3 heures)."
-
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1702
-msgid "Logout"
-msgstr "Déconnexion"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
-msgstr "Mettre fin à la session"
-
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
-msgstr "Mon canal"
-
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr "Vos publications et conversations"
-
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr "Votre profil"
-
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr "Gérer/modifier les profils"
-
-#: ../../include/nav.php:90 ../../include/channel.php:941
-msgid "Edit Profile"
-msgstr "Éditeur de profil"
-
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr "Modifier votre profil"
-
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr "Vos photos"
-
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr "Vos fichiers"
-
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
-msgstr "Vos salons"
-
-#: ../../include/nav.php:102 ../../include/conversation.php:1675
-msgid "Bookmarks"
-msgstr "Favoris"
-
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
-msgstr "Vos favoris"
-
-#: ../../include/nav.php:106
-msgid "Your webpages"
-msgstr "Vos pages web"
-
-#: ../../include/nav.php:110
-msgid "Sign in"
-msgstr "Connexion"
-
-#: ../../include/nav.php:127
-#, php-format
-msgid "%s - click to logout"
-msgstr "%s - cliquer ici pour déconnecter"
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr "Authentification distante"
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr "S'authentifier auprès de votre hub principal"
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr "Page d'accueil"
-
-#: ../../include/nav.php:147
-msgid "Create an account"
-msgstr "Créer un compte"
-
-#: ../../include/nav.php:159
-msgid "Help and documentation"
-msgstr "Aide et documentation"
-
-#: ../../include/nav.php:163
-msgid "Applications, utilities, links, games"
-msgstr "Applications, utilitaires, liens, jeux"
-
-#: ../../include/nav.php:165
-msgid "Search site @name, #tag, ?docs, content"
-msgstr "Recherche @nom, #tag, contenu"
-
-#: ../../include/nav.php:167
-msgid "Channel Directory"
-msgstr "Annuaire des canaux"
-
-#: ../../include/nav.php:179
-msgid "Your grid"
-msgstr "Votre réseau"
-
-#: ../../include/nav.php:180
-msgid "Mark all grid notifications seen"
-msgstr "Marquer toutes les notifications du réseau comme vues"
-
-#: ../../include/nav.php:182
-msgid "Channel home"
-msgstr "Mon canal"
-
-#: ../../include/nav.php:183
-msgid "Mark all channel notifications seen"
-msgstr "Marquer toutes les notifications du canal comme vues"
-
-#: ../../include/nav.php:189
-msgid "Notices"
-msgstr "Notifications"
-
-#: ../../include/nav.php:189
-msgid "Notifications"
-msgstr "Notifications"
-
-#: ../../include/nav.php:190
-msgid "See all notifications"
-msgstr "Voir toutes les notifications"
-
-#: ../../include/nav.php:193
-msgid "Private mail"
-msgstr "Messages privés"
-
-#: ../../include/nav.php:194
-msgid "See all private messages"
-msgstr "Voir tous les messages privés"
-
-#: ../../include/nav.php:195
-msgid "Mark all private messages seen"
-msgstr "Marquer tous les messages privés comme vus"
-
-#: ../../include/nav.php:201
-msgid "Event Calendar"
-msgstr "Calendrier des événements"
-
-#: ../../include/nav.php:202
-msgid "See all events"
-msgstr "Voir tous les événements"
-
-#: ../../include/nav.php:203
-msgid "Mark all events seen"
-msgstr "Marquer tous les événements comme vus"
-
-#: ../../include/nav.php:206
-msgid "Manage Your Channels"
-msgstr "Gérer vos canaux"
-
-#: ../../include/nav.php:208
-msgid "Account/Channel Settings"
-msgstr "Paramètres du Compte/Canal"
-
-#: ../../include/nav.php:216
-msgid "Site Setup and Configuration"
-msgstr "Configuration du site"
-
-#: ../../include/nav.php:247 ../../include/conversation.php:851
-msgid "Loading..."
-msgstr "Chargement..."
-
-#: ../../include/nav.php:252
-msgid "@name, #tag, ?doc, content"
-msgstr "@nom, #étiquette, ?doc, contenu"
-
-#: ../../include/nav.php:253
-msgid "Please wait..."
-msgstr "Merci de patienter..."
+#: ../../include/channel.php:1292
+msgid "Like this thing"
+msgstr "J'aime ceci"
 
 #: ../../include/connections.php:95
 msgid "New window"
@@ -7761,52 +7607,6 @@ msgstr "Ouvrir l'emplacement dans une fenêtre ou un onglet différent"
 msgid "User '%s' deleted"
 msgstr "Utilisateur '%s' supprimé"
 
-#: ../../include/contact_widgets.php:11
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invitation disponible"
-msgstr[1] "%d invitations disponibles"
-
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
-msgstr "Trouver des canaux"
-
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
-msgstr "Saisir nom ou centre d'intérêt"
-
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
-msgstr "Ajouter/Suivre"
-
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Exemples: Guillaume Martin, Course à pieds"
-
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
-msgstr "Un profil au hasard"
-
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
-msgstr "Inviter des amis"
-
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Exemple avancé&nbsp;: name=fred and country=iceland"
-
-#: ../../include/contact_widgets.php:122
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d contact en commun"
-msgstr[1] "%d contacts en commun"
-
-#: ../../include/contact_widgets.php:127
-msgid "show more"
-msgstr "montrer plus"
-
 #: ../../include/conversation.php:204
 #, php-format
 msgid "%1$s is now connected with %2$s"
@@ -7817,258 +7617,269 @@ msgstr "%1$s ajoute %2$s à ses contacts"
 msgid "%1$s poked %2$s"
 msgstr "%1$s a tapoté %2$s"
 
-#: ../../include/conversation.php:691
+#: ../../include/conversation.php:243 ../../include/text.php:1013
+#: ../../include/text.php:1018
+msgid "poked"
+msgstr "a tapoté"
+
+#: ../../include/conversation.php:694
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Voir le profil de %s @ %s"
 
-#: ../../include/conversation.php:710
+#: ../../include/conversation.php:713
 msgid "Categories:"
 msgstr "Catégories&nbsp;:"
 
-#: ../../include/conversation.php:711
+#: ../../include/conversation.php:714
 msgid "Filed under:"
 msgstr "Classé sous&nbsp;:"
 
-#: ../../include/conversation.php:738
+#: ../../include/conversation.php:741
 msgid "View in context"
 msgstr "Voir en contexte"
 
-#: ../../include/conversation.php:847
+#: ../../include/conversation.php:850
 msgid "remove"
 msgstr "supprimer"
 
-#: ../../include/conversation.php:852
+#: ../../include/conversation.php:855
 msgid "Delete Selected Items"
 msgstr "Supprimer les éléments selectionnés"
 
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:951
 msgid "View Source"
 msgstr "Voir source"
 
-#: ../../include/conversation.php:949
+#: ../../include/conversation.php:952
 msgid "Follow Thread"
 msgstr "Suivre la discussion"
 
-#: ../../include/conversation.php:950
+#: ../../include/conversation.php:953
 msgid "Unfollow Thread"
 msgstr "Ne plus suivre la discussion"
 
-#: ../../include/conversation.php:955
+#: ../../include/conversation.php:958
 msgid "Activity/Posts"
 msgstr "Activité/Publications"
 
-#: ../../include/conversation.php:957
+#: ../../include/conversation.php:960
 msgid "Edit Connection"
 msgstr "Modifier le contact"
 
-#: ../../include/conversation.php:958
+#: ../../include/conversation.php:961
 msgid "Message"
 msgstr "Message"
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s likes this."
 msgstr "%s aime ça."
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s n'aime pas ça."
 
-#: ../../include/conversation.php:1079
+#: ../../include/conversation.php:1082
 #, 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 personne</span> aime ceci."
 msgstr[1] "<span  %1$s>%2$d personnes</span> aiment ceci."
 
-#: ../../include/conversation.php:1081
+#: ../../include/conversation.php:1084
 #, 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 personne</span> n'aime pas ça."
 msgstr[1] "<span  %1$s>%2$d personnes</span> n'aiment pas ça."
 
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1090
 msgid "and"
 msgstr "et"
 
-#: ../../include/conversation.php:1090
+#: ../../include/conversation.php:1093
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ", et %d autre personne"
 msgstr[1] ", et %d autres personnes"
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s like this."
 msgstr "%s aime ça."
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s don't like this."
 msgstr "%s n'aime pas ça."
 
-#: ../../include/conversation.php:1130
+#: ../../include/conversation.php:1133
 msgid "Set your location"
 msgstr "Spécifier votre emplacement géographique"
 
-#: ../../include/conversation.php:1131
+#: ../../include/conversation.php:1134
 msgid "Clear browser location"
 msgstr "Supprimer l'emplacement géographique du navigateur"
 
-#: ../../include/conversation.php:1177
+#: ../../include/conversation.php:1182
 msgid "Tag term:"
 msgstr "Étiquette&nbsp;:"
 
-#: ../../include/conversation.php:1178
+#: ../../include/conversation.php:1183
 msgid "Where are you right now?"
 msgstr "Où êtes-vous en ce moment&nbsp;?"
 
-#: ../../include/conversation.php:1210
+#: ../../include/conversation.php:1221
 msgid "Page link name"
 msgstr "Nom du lien vers la page"
 
-#: ../../include/conversation.php:1213
+#: ../../include/conversation.php:1224
 msgid "Post as"
 msgstr "Publier en tant que"
 
-#: ../../include/conversation.php:1223
+#: ../../include/conversation.php:1238
 msgid "Toggle voting"
 msgstr "(Dés)activer le vote"
 
-#: ../../include/conversation.php:1231
+#: ../../include/conversation.php:1246
 msgid "Categories (optional, comma-separated list)"
 msgstr "Catégories (facultatives, séparées par des virgules)"
 
-#: ../../include/conversation.php:1254
+#: ../../include/conversation.php:1269
 msgid "Set publish date"
 msgstr "Définir la date de publication"
 
-#: ../../include/conversation.php:1258
-msgid "OK"
-msgstr "OK"
-
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1518
 msgid "Discover"
 msgstr "À découvrir"
 
-#: ../../include/conversation.php:1506
+#: ../../include/conversation.php:1521
 msgid "Imported public streams"
 msgstr "Flux publics importés"
 
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1526
 msgid "Commented Order"
 msgstr "Par date de commentaire"
 
-#: ../../include/conversation.php:1514
+#: ../../include/conversation.php:1529
 msgid "Sort by Comment Date"
 msgstr "Trier par date de dernier commentaire"
 
-#: ../../include/conversation.php:1518
+#: ../../include/conversation.php:1533
 msgid "Posted Order"
 msgstr "Par date de publication"
 
-#: ../../include/conversation.php:1521
+#: ../../include/conversation.php:1536
 msgid "Sort by Post Date"
 msgstr "Trier par date de publication"
 
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1544
 msgid "Posts that mention or involve you"
 msgstr "Publications qui vous mentionnent ou vous concernent d'une manière ou d'une autre"
 
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1553
 msgid "Activity Stream - by date"
 msgstr "Flux d'activité - par date"
 
-#: ../../include/conversation.php:1544
+#: ../../include/conversation.php:1559
 msgid "Starred"
 msgstr "Mis en avant (étoiles)"
 
-#: ../../include/conversation.php:1547
+#: ../../include/conversation.php:1562
 msgid "Favourite Posts"
 msgstr "Publications préférées"
 
-#: ../../include/conversation.php:1554
+#: ../../include/conversation.php:1569
 msgid "Spam"
 msgstr "Indésirable"
 
-#: ../../include/conversation.php:1557
+#: ../../include/conversation.php:1572
 msgid "Posts flagged as SPAM"
 msgstr "Publications marquées comme indésirables"
 
-#: ../../include/conversation.php:1614
+#: ../../include/conversation.php:1629
 msgid "Status Messages and Posts"
 msgstr "Messages d'état et contributions"
 
-#: ../../include/conversation.php:1623
+#: ../../include/conversation.php:1638
 msgid "About"
 msgstr "À propos"
 
-#: ../../include/conversation.php:1626
+#: ../../include/conversation.php:1641
 msgid "Profile Details"
 msgstr "Détails du profil"
 
-#: ../../include/conversation.php:1635 ../../include/photos.php:502
-msgid "Photo Albums"
-msgstr "Albums photo"
-
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1657
 msgid "Files and Storage"
 msgstr "Fichiers et Stockage"
 
-#: ../../include/conversation.php:1678
+#: ../../include/conversation.php:1677 ../../include/conversation.php:1680
+#: ../../include/widgets.php:836
+msgid "Chatrooms"
+msgstr "Salons de clavardage"
+
+#: ../../include/conversation.php:1693
 msgid "Saved Bookmarks"
 msgstr "Favoris sauvegardés"
 
-#: ../../include/conversation.php:1688
+#: ../../include/conversation.php:1703
 msgid "Manage Webpages"
 msgstr "Gérer les pages web"
 
-#: ../../include/conversation.php:1747
+#: ../../include/conversation.php:1768
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Participe"
 msgstr[1] "Participent"
 
-#: ../../include/conversation.php:1750
+#: ../../include/conversation.php:1771
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Ne participe pas"
 msgstr[1] "Ne participent pas"
 
-#: ../../include/conversation.php:1753
+#: ../../include/conversation.php:1774
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Indécis(e)"
 msgstr[1] "Indécis(es)"
 
-#: ../../include/conversation.php:1756
+#: ../../include/conversation.php:1777
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "D'accord"
 msgstr[1] "D'accord"
 
-#: ../../include/conversation.php:1759
+#: ../../include/conversation.php:1780
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "Pas d'accord"
 msgstr[1] "Pas d'accord"
 
-#: ../../include/conversation.php:1762
+#: ../../include/conversation.php:1783
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "S'abstient"
 msgstr[1] "S'abstiennent"
 
+#: ../../include/import.php:30
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "L'import a échoué. Un canal existe déjà avec ce nom"
+
+#: ../../include/import.php:97
+msgid "Channel clone failed. Import failed."
+msgstr "Echec du clonage du canal. Echec de l'impot."
+
 #: ../../include/selectors.php:30
 msgid "Frequently"
 msgstr "Fréquemment"
@@ -8133,12 +7944,6 @@ msgstr "Neutre"
 msgid "Non-specific"
 msgstr "Non spécifique"
 
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-#: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:881
-msgid "Other"
-msgstr "Autre"
-
 #: ../../include/selectors.php:49
 msgid "Undecided"
 msgstr "Indécis"
@@ -8315,361 +8120,366 @@ msgstr "S'en fiche"
 msgid "Ask me"
 msgstr "Me demander"
 
-#: ../../include/PermissionDescription.php:31
-#: ../../include/acl_selectors.php:232
-msgid "Visible to your default audience"
-msgstr "Visible pour vos contacts seulement"
-
-#: ../../include/PermissionDescription.php:115
-#: ../../include/acl_selectors.php:268
-msgid "Only me"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:116
-msgid "Public"
-msgstr "Public"
-
-#: ../../include/PermissionDescription.php:117
-msgid "Anybody in the $Projectname network"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:118
+#: ../../include/bookmarks.php:35
 #, php-format
-msgid "Any account on %s"
+msgid "%1$s's bookmarks"
+msgstr "Favoris de %1$s"
+
+#: ../../include/security.php:109
+msgid "guest:"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:119
-msgid "Any of my connections"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:120
-msgid "Only connections I specifically allow"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:121
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:122
-msgid "Any connections including those who haven't yet been approved"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:161
+#: ../../include/security.php:427
 msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
-msgstr ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "Le formulaire n'est plus sécurisé, probablement parce qu'il est ouvert depuis trop longtemps (plus de 3 heures)."
 
-#: ../../include/PermissionDescription.php:162
+#: ../../include/text.php:404
+msgid "prev"
+msgstr "préc."
+
+#: ../../include/text.php:406
+msgid "first"
+msgstr "premier"
+
+#: ../../include/text.php:435
+msgid "last"
+msgstr "dernier"
+
+#: ../../include/text.php:438
+msgid "next"
+msgstr "Suivant"
+
+#: ../../include/text.php:448
+msgid "older"
+msgstr "plus ancien"
+
+#: ../../include/text.php:450
+msgid "newer"
+msgstr "plus récent"
+
+#: ../../include/text.php:843
+msgid "No connections"
+msgstr "Pas de relations."
+
+#: ../../include/text.php:868
+#, php-format
+msgid "View all %s connections"
+msgstr "Voir les %s contacts"
+
+#: ../../include/text.php:1013 ../../include/text.php:1018
+msgid "poke"
+msgstr "tapoter"
+
+#: ../../include/text.php:1019
+msgid "ping"
+msgstr "ping"
+
+#: ../../include/text.php:1019
+msgid "pinged"
+msgstr "pingé"
+
+#: ../../include/text.php:1020
+msgid "prod"
+msgstr "encourager"
+
+#: ../../include/text.php:1020
+msgid "prodded"
+msgstr "encouragé"
+
+#: ../../include/text.php:1021
+msgid "slap"
+msgstr "giffler"
+
+#: ../../include/text.php:1021
+msgid "slapped"
+msgstr "gifflé(e)"
+
+#: ../../include/text.php:1022
+msgid "finger"
+msgstr "pointer"
+
+#: ../../include/text.php:1022
+msgid "fingered"
+msgstr "pointé"
+
+#: ../../include/text.php:1023
+msgid "rebuff"
+msgstr "rejetter"
+
+#: ../../include/text.php:1023
+msgid "rebuffed"
+msgstr "rejeté"
+
+#: ../../include/text.php:1035
+msgid "happy"
+msgstr "heureux"
+
+#: ../../include/text.php:1036
+msgid "sad"
+msgstr "triste"
+
+#: ../../include/text.php:1037
+msgid "mellow"
+msgstr "mélancolique"
+
+#: ../../include/text.php:1038
+msgid "tired"
+msgstr "fatigué"
+
+#: ../../include/text.php:1039
+msgid "perky"
+msgstr "impertinent"
+
+#: ../../include/text.php:1040
+msgid "angry"
+msgstr "en colère"
+
+#: ../../include/text.php:1041
+msgid "stupefied"
+msgstr "stupéfait"
+
+#: ../../include/text.php:1042
+msgid "puzzled"
+msgstr "perplexe"
+
+#: ../../include/text.php:1043
+msgid "interested"
+msgstr "intéressé"
+
+#: ../../include/text.php:1044
+msgid "bitter"
+msgstr "amer"
+
+#: ../../include/text.php:1045
+msgid "cheerful"
+msgstr "plein d'entrain"
+
+#: ../../include/text.php:1046
+msgid "alive"
+msgstr "vivant"
+
+#: ../../include/text.php:1047
+msgid "annoyed"
+msgstr "agaçé"
+
+#: ../../include/text.php:1048
+msgid "anxious"
+msgstr "anxieux"
+
+#: ../../include/text.php:1049
+msgid "cranky"
+msgstr "énervé"
+
+#: ../../include/text.php:1050
+msgid "disturbed"
+msgstr "perturbé"
+
+#: ../../include/text.php:1051
+msgid "frustrated"
+msgstr "frustré"
+
+#: ../../include/text.php:1052
+msgid "depressed"
+msgstr "déprimé"
+
+#: ../../include/text.php:1053
+msgid "motivated"
+msgstr "motivé"
+
+#: ../../include/text.php:1054
+msgid "relaxed"
+msgstr "détendu"
+
+#: ../../include/text.php:1055
+msgid "surprised"
+msgstr "surpris"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "Lundi"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "Mardi"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "Mercredi"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "Jeudi"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "Vendredi"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "Samedi"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "Dimanche"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:45
+msgid "January"
+msgstr "Janvier"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:46
+msgid "February"
+msgstr "Février"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:47
+msgid "March"
+msgstr "Mars"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:48
+msgid "April"
+msgstr "Avril"
+
+#: ../../include/text.php:1241
+msgid "May"
+msgstr "Mai"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:50
+msgid "June"
+msgstr "Juin"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:51
+msgid "July"
+msgstr "Juillet"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:52
+msgid "August"
+msgstr "Août"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:53
+msgid "September"
+msgstr "Septembre"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:54
+msgid "October"
+msgstr "Octobre"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:55
+msgid "November"
+msgstr "Novembre"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:56
+msgid "December"
+msgstr "Décembre"
+
+#: ../../include/text.php:1318 ../../include/text.php:1322
+msgid "Unknown Attachment"
+msgstr "Pièce jointe inconnue"
+
+#: ../../include/text.php:1324
+msgid "unknown"
+msgstr "Inconnu"
+
+#: ../../include/text.php:1360
+msgid "remove category"
+msgstr "supprimer la catégorie"
+
+#: ../../include/text.php:1437
+msgid "remove from file"
+msgstr "retirer du fichier"
+
+#: ../../include/text.php:1734 ../../include/text.php:1805
+msgid "default"
+msgstr "défaut"
+
+#: ../../include/text.php:1742
+msgid "Page layout"
+msgstr "Mise en page"
+
+#: ../../include/text.php:1742
+msgid "You can create your own with the layouts tool"
+msgstr "Créez les vôtres avec les outils de mise en page"
+
+#: ../../include/text.php:1784
+msgid "Page content type"
+msgstr "Type de contenu de la page"
+
+#: ../../include/text.php:1817
+msgid "Select an alternate language"
+msgstr "Choisir une langue alternative"
+
+#: ../../include/text.php:1934
+msgid "activity"
+msgstr "activité"
+
+#: ../../include/text.php:2235
+msgid "Design Tools"
+msgstr "Outils de conception"
+
+#: ../../include/text.php:2241
+msgid "Pages"
+msgstr "Pages"
+
+#: ../../include/auth.php:147
+msgid "Logged out."
+msgstr "Deconnecté."
+
+#: ../../include/auth.php:274
+msgid "Failed authentication"
+msgstr "Échec de l'authentification"
+
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
+msgstr "Peut voir les publications ordinaires sur mon canal."
+
+#: ../../include/permissions.php:30
+msgid "Can view my webpages"
+msgstr "Peut voir mes pages web"
+
+#: ../../include/permissions.php:34
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Peuvent poster sur la page de mon canal (\"mur\")"
+
+#: ../../include/permissions.php:37
+msgid "Can like/dislike stuff"
+msgstr "Peuvent aimer/ne pas aimer"
+
+#: ../../include/permissions.php:37
+msgid "Profiles and things other than posts/comments"
+msgstr "Profils et autres excluant les publications/commentaires."
+
+#: ../../include/permissions.php:39
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Peut faire suivre à tous les contacts de mon canal via \"@mention\""
+
+#: ../../include/permissions.php:39
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Avancé - utile pour les canaux de type \"forum/groupe\""
+
+#: ../../include/permissions.php:40
+msgid "Can chat with me (when available)"
+msgstr "Peut discuter avec moi (quand disponibie)"
+
+#: ../../include/permissions.php:41
+msgid "Can write to my file storage and photos"
+msgstr "Peut charger des fichiers et des photos dans mon canal"
+
+#: ../../include/permissions.php:42
+msgid "Can edit my webpages"
+msgstr "Peut modifier mes pages web"
+
+#: ../../include/permissions.php:44
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Plutôt avancé - très utile dans les communautés ouvertes"
+
+#: ../../include/permissions.php:46
+msgid "Can administer my channel resources"
+msgstr "Peut administrer les ressources de mon canal"
+
+#: ../../include/permissions.php:46
 msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:163
-msgid "This is your default setting for who can view your connections"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:164
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:165
-msgid "This is your default setting for the audience of your webpages"
-msgstr ""
-
-#: ../../include/account.php:28
-msgid "Not a valid email address"
-msgstr "Ce n'est pas une adresse de courriel valide"
-
-#: ../../include/account.php:30
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Votre domaine de courriel ne fait pas partie de ceux autorisés par ce site"
-
-#: ../../include/account.php:36
-msgid "Your email address is already registered at this site."
-msgstr "Votre adresse de courriel est déjà inscrite sur ce site."
-
-#: ../../include/account.php:68
-msgid "An invitation is required."
-msgstr "Une invitation est requise."
-
-#: ../../include/account.php:72
-msgid "Invitation could not be verified."
-msgstr "Votre invitation n'a pas pu être vérifiée."
-
-#: ../../include/account.php:122
-msgid "Please enter the required information."
-msgstr "Merci d'entrer les informations requises."
-
-#: ../../include/account.php:189
-msgid "Failed to store account information."
-msgstr "Impossible de stocker les informations liées au compte."
-
-#: ../../include/account.php:249
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Confirmation de l'inscription pour %s"
-
-#: ../../include/account.php:315
-#, php-format
-msgid "Registration request at %s"
-msgstr "Demande d'inscription sur %s"
-
-#: ../../include/account.php:317 ../../include/account.php:344
-#: ../../include/account.php:404 ../../include/network.php:1871
-msgid "Administrator"
-msgstr "Administrateur"
-
-#: ../../include/account.php:339
-msgid "your registration password"
-msgstr "votre mot de passe d'inscription"
-
-#: ../../include/account.php:342 ../../include/account.php:402
-#, php-format
-msgid "Registration details for %s"
-msgstr "Détails de l'inscription pour %s"
-
-#: ../../include/account.php:414
-msgid "Account approved."
-msgstr "Compte approuvé."
-
-#: ../../include/account.php:454
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Inscription révoquée pour %s"
-
-#: ../../include/account.php:506
-msgid "Account verified. Please login."
-msgstr "Compte vérifié. Veuillez vous connecter."
-
-#: ../../include/account.php:723 ../../include/account.php:725
-msgid "Click here to upgrade."
-msgstr "Cliquez ici pour mettre à jour."
-
-#: ../../include/account.php:731
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Cette action outrepasserait les limites prévues par votre forfait."
-
-#: ../../include/account.php:736
-msgid "This action is not available under your subscription plan."
-msgstr "Cette action n'est pas disponible avec votre forfait."
-
-#: ../../include/attach.php:247 ../../include/attach.php:333
-msgid "Item was not found."
-msgstr "Élément introuvable."
-
-#: ../../include/attach.php:497
-msgid "No source file."
-msgstr "Pas de fichier source."
-
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
-msgstr "Impossible de trouver le fichier à remplacer."
-
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
-msgstr "Impossible de trouver le fichier à corriger/mettre à jour"
-
-#: ../../include/attach.php:672
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Le fichier dépasse la taille limite de %d"
-
-#: ../../include/attach.php:686
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Vous avez atteint votre limite de %1$.0f méga-octets autorisés pour le stockage des pièces-jointes."
-
-#: ../../include/attach.php:842
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Envoi du fichier impossible. Limite système ou action avortée."
-
-#: ../../include/attach.php:855
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Le fichier stocké n'a pu être vérifié. Echec de l'envoi."
-
-#: ../../include/attach.php:909 ../../include/attach.php:925
-msgid "Path not available."
-msgstr "Chemin non disponible."
-
-#: ../../include/attach.php:971 ../../include/attach.php:1123
-msgid "Empty pathname"
-msgstr "Chemin vide"
-
-#: ../../include/attach.php:997
-msgid "duplicate filename or path"
-msgstr "doublon de chemin ou de fichier"
-
-#: ../../include/attach.php:1019
-msgid "Path not found."
-msgstr "Chemin introuvable."
-
-#: ../../include/attach.php:1077
-msgid "mkdir failed."
-msgstr "mkdir a échoué."
-
-#: ../../include/attach.php:1081
-msgid "database storage failed."
-msgstr "l'écriture dans la base de données a échoué."
-
-#: ../../include/attach.php:1129
-msgid "Empty path"
-msgstr "Chemin vide"
-
-#: ../../include/channel.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "Impossible d'obtenir les données d'identité depuis la base de données"
-
-#: ../../include/channel.php:66
-msgid "Empty name"
-msgstr "Nom vide"
-
-#: ../../include/channel.php:69
-msgid "Name too long"
-msgstr "Nom trop long"
-
-#: ../../include/channel.php:180
-msgid "No account identifier"
-msgstr "Pas d'identifiant de compte"
-
-#: ../../include/channel.php:192
-msgid "Nickname is required."
-msgstr "Un surnom est requis."
-
-#: ../../include/channel.php:206
-msgid "Reserved nickname. Please choose another."
-msgstr "Surnom réservé. Merci d'en choisir un autre."
-
-#: ../../include/channel.php:211
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Le surnom contient des caractères interdits ou est déjà pris sur ce site."
-
-#: ../../include/channel.php:287
-msgid "Unable to retrieve created identity"
-msgstr "Impossible de récupérer l'identité créée"
-
-#: ../../include/channel.php:345
-msgid "Default Profile"
-msgstr "Profil par défaut"
-
-#: ../../include/channel.php:791
-msgid "Requested channel is not available."
-msgstr "Canal demandé non disponible."
-
-#: ../../include/channel.php:938
-msgid "Create New Profile"
-msgstr "Créer un nouveau profil"
-
-#: ../../include/channel.php:958
-msgid "Visible to everybody"
-msgstr "Visible de tous"
-
-#: ../../include/channel.php:1031 ../../include/channel.php:1142
-msgid "Gender:"
-msgstr "Sexe&nbsp;:"
-
-#: ../../include/channel.php:1032 ../../include/channel.php:1186
-msgid "Status:"
-msgstr "État&nbsp;:"
-
-#: ../../include/channel.php:1033 ../../include/channel.php:1197
-msgid "Homepage:"
-msgstr "Site Internet&nbsp;:"
-
-#: ../../include/channel.php:1034
-msgid "Online Now"
-msgstr "Connecté"
-
-#: ../../include/channel.php:1147
-msgid "Like this channel"
-msgstr "J'aime ce canal"
-
-#: ../../include/channel.php:1171
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: ../../include/channel.php:1172
-msgid "j F"
-msgstr "j F"
-
-#: ../../include/channel.php:1179
-msgid "Birthday:"
-msgstr "Date de naissance&nbsp;:"
-
-#: ../../include/channel.php:1192
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "depuis %1$d %2$s"
-
-#: ../../include/channel.php:1195
-msgid "Sexual Preference:"
-msgstr "Orientation sexuelle&nbsp;:"
-
-#: ../../include/channel.php:1201
-msgid "Tags:"
-msgstr "Étiquettes&nbsp;:"
-
-#: ../../include/channel.php:1203
-msgid "Political Views:"
-msgstr "Opinions politiques&nbsp;:"
-
-#: ../../include/channel.php:1205
-msgid "Religion:"
-msgstr "Religion&nbsp;:"
-
-#: ../../include/channel.php:1209
-msgid "Hobbies/Interests:"
-msgstr "Occupations/Centres d'intérêt&nbsp;:"
-
-#: ../../include/channel.php:1211
-msgid "Likes:"
-msgstr "Aime&nbsp;:"
-
-#: ../../include/channel.php:1213
-msgid "Dislikes:"
-msgstr "N'aime pas&nbsp;:"
-
-#: ../../include/channel.php:1215
-msgid "Contact information and Social Networks:"
-msgstr "Coordonnées et réseaux sociaux&nbsp;:"
-
-#: ../../include/channel.php:1217
-msgid "My other channels:"
-msgstr "Mes autres canaux&nbsp;:"
-
-#: ../../include/channel.php:1219
-msgid "Musical interests:"
-msgstr "Goûts musicaux&nbsp;:"
-
-#: ../../include/channel.php:1221
-msgid "Books, literature:"
-msgstr "Lectures, goûts littéraires&nbsp;:"
-
-#: ../../include/channel.php:1223
-msgid "Television:"
-msgstr "Télévision&nbsp;:"
-
-#: ../../include/channel.php:1225
-msgid "Film/dance/culture/entertainment:"
-msgstr "Cinéma/danse/culture/divertissement&nsbp;:"
-
-#: ../../include/channel.php:1227
-msgid "Love/Romance:"
-msgstr "Vie sentimentale/amoureuse&nbsp;:"
-
-#: ../../include/channel.php:1229
-msgid "Work/employment:"
-msgstr "Travail/Occupation&nbsp;"
-
-#: ../../include/channel.php:1231
-msgid "School/education:"
-msgstr "Études&nbsp;"
-
-#: ../../include/channel.php:1251
-msgid "Like this thing"
-msgstr "J'aime ceci"
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Très avancé. Ne pas toucher, sauf si vous savez ce que vous faîtes"
 
 #: ../../include/features.php:48
 msgid "General Features"
@@ -8716,378 +8526,257 @@ msgid "Provide managed web pages on your channel"
 msgstr "Fournir des pages web, sous votre contrôle, sur votre canal"
 
 #: ../../include/features.php:55
+msgid "Provide a wiki for your channel"
+msgstr ""
+
+#: ../../include/features.php:56
 msgid "Hide Rating"
 msgstr "Masquer l'évaluation"
 
-#: ../../include/features.php:55
+#: ../../include/features.php:56
 msgid ""
 "Hide the rating buttons on your channel and profile pages. Note: People can "
 "still rate you somewhere else."
 msgstr "Masquer les boutons d'évaluation sur les pages de votre canal et de votre profil. NB : vous pourrez toujours être évalué(e) ailleurs."
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Private Notes"
 msgstr "Notes privées"
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr "Active un outil pour stocker des notes et des rappels (note&nbsp;:non chiffré)"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Navigation Channel Select"
 msgstr "Sélection du canal par la navigation"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Changez de canal directement depuis le menu de navigation déroulant"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "Photo Location"
 msgstr "Site de prise de vue"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr "Si des informations géographiques sont présentes dans les images téléversées, les lier à une carte."
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Access Controlled Chatrooms"
 msgstr ""
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Provide chatrooms and chat services with access control."
 msgstr ""
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid "Smart Birthdays"
 msgstr "Anniversaires intelligents"
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid ""
 "Make birthday events timezone aware in case your friends are scattered "
 "across the planet."
 msgstr "Adapter les anniversaires aux fuseaux horaires, utile pour vos amis sur d'autres continents."
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Expert Mode"
 msgstr "Mode expert"
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr "Activer le mode expert pour accéder aux options avancées"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid "Premium Channel"
 msgstr "Canal VIP"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr "Vous permet d'appliquer des règles et restrictions aux contacts de votre canal"
 
-#: ../../include/features.php:67
+#: ../../include/features.php:68
 msgid "Post Composition Features"
 msgstr "Fonctionnalités de composition"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Large Photos"
 msgstr "Grandes photos"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr "Inclure de grands aperçus (1024px) dans les messages. Si désactivé, inclure de petits aperçus (640px)."
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Automatically import channel content from other channels or feeds"
 msgstr "Importe automatiquement le contenus d'autres canaux ou flux dans le canal actif"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Even More Encryption"
 msgstr "Encore plus de chiffrement"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr "Permettre le chiffrement optionnel du contenu de bout en bout au moyen d'un secret partagé"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Enable Voting Tools"
 msgstr "Activer les outils de vote"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Provide a class of post which others can vote on"
 msgstr "Fournit un type de publication sur lequel les utilisateurs peuvent voter"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Delayed Posting"
 msgstr "Publication plus tard"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Allow posts to be published at a later date"
 msgstr "Permettre de publier des messages à une date programmée"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Suppress Duplicate Posts/Comments"
 msgstr "Supprimer les publications/commentaires en doublon"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr "Empêcher des messages aux contenus identiques d'être publiés à moins de deux minutes d'intervalle"
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Network and Stream Filtering"
 msgstr "Filtrage du réseau et des flux"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Search by Date"
 msgstr "Chercher par date"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to select posts by date ranges"
 msgstr "Pouvoir choisir des publications par date"
 
-#: ../../include/features.php:83 ../../include/group.php:311
+#: ../../include/features.php:84 ../../include/group.php:311
 msgid "Privacy Groups"
 msgstr "Groupes d'accès"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Enable management and selection of privacy groups"
 msgstr "Active la gestion et la sélection des groupes d'accès"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85 ../../include/widgets.php:281
+msgid "Saved Searches"
+msgstr "Recherches sauvegardées"
+
+#: ../../include/features.php:85
 msgid "Save search terms for re-use"
 msgstr "Sauvegarder des termes de recherche pour utilisation ultérieure"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Network Personal Tab"
 msgstr "Onglet \"Me concernant\""
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Activer un onglet affichant seulement les publications du réseau sur lesquelles vous êtes intervenu"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Network New Tab"
 msgstr "Onglet \"nouveautés réseau\""
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Enable tab to display all new Network activity"
 msgstr "Activer un onglet présentant toute l'activité récente sur le réseau"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Affinity Tool"
 msgstr "Gérer l'affinité"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filtrer le flux d'activité en fonction de la profondeur des relations"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Connection Filtering"
 msgstr "Filtrage des contacts"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Filtrer les publications entrantes de mes contacts sur la base de mots-clefs"
 
-#: ../../include/features.php:89
+#: ../../include/features.php:90
 msgid "Show channel suggestions"
 msgstr "Montrer les suggestions de canaux"
 
-#: ../../include/features.php:94
+#: ../../include/features.php:95
 msgid "Post/Comment Tools"
 msgstr "Gérer les publications/commentaires"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Community Tagging"
 msgstr "Etiquetage communautaire"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Ability to tag existing posts"
 msgstr "Permettre de marquer les publications existantes"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Post Categories"
 msgstr "Catégoriser les publications"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Add categories to your posts"
 msgstr "Ajouter des catégories à vos publications"
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Emoji Reactions"
 msgstr ""
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Add emoji reaction ability to posts"
 msgstr ""
 
-#: ../../include/features.php:98
+#: ../../include/features.php:99 ../../include/widgets.php:310
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Dossiers sauvegardés"
+
+#: ../../include/features.php:99
 msgid "Ability to file posts under folders"
 msgstr "Permettre de classer les publications dans des dossiers"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Dislike Posts"
 msgstr "\"Ne pas aimer\" les publications"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Ability to dislike posts/comments"
 msgstr "Possibilité de \"ne pas aimer\" les publications/commentaires"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Star Posts"
 msgstr "Pouvoir mettre en avant les publications"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Pouvoir marquer certaines publications d'une étoile"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Tag Cloud"
 msgstr "Nuage de tags"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Afficher un nuage de vos tags sur votre canal"
 
-#: ../../include/oembed.php:324
-msgid "Embedded content"
-msgstr "Contenu imbriqué"
-
-#: ../../include/oembed.php:333
-msgid "Embedding disabled"
-msgstr "Imbrication désactivée"
-
-#: ../../include/acl_selectors.php:271
-msgid "Who can see this?"
-msgstr ""
-
-#: ../../include/acl_selectors.php:272
-msgid "Custom selection"
-msgstr ""
-
-#: ../../include/acl_selectors.php:273
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
-" the scope of \"Show\"."
-msgstr ""
-
-#: ../../include/acl_selectors.php:274
-msgid "Show"
-msgstr "Montrer"
-
-#: ../../include/acl_selectors.php:275
-msgid "Don't show"
-msgstr "Cacher"
-
-#: ../../include/acl_selectors.php:281
-msgid "Other networks and post services"
-msgstr "Autres réseaux et services de messagerie"
-
-#: ../../include/acl_selectors.php:311
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These"
-" permissions set who is allowed to view the post."
-msgstr ""
-
-#: ../../include/auth.php:105
-msgid "Logged out."
-msgstr "Deconnecté."
-
-#: ../../include/auth.php:212
-msgid "Failed authentication"
-msgstr "Échec de l'authentification"
-
-#: ../../include/datetime.php:135
-msgid "Birthday"
-msgstr "Anniversaire"
-
-#: ../../include/datetime.php:137
-msgid "Age: "
-msgstr "Age&nbsp;:"
-
-#: ../../include/datetime.php:139
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "AAAA-MM-JJ ou MM-JJ"
-
-#: ../../include/datetime.php:272 ../../boot.php:2470
-msgid "never"
-msgstr "jamais"
-
-#: ../../include/datetime.php:278
-msgid "less than a second ago"
-msgstr "à l'instant"
-
-#: ../../include/datetime.php:296
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "il y a %1$d %2$s"
-
-#: ../../include/datetime.php:307
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] "an"
-msgstr[1] "ans"
-
-#: ../../include/datetime.php:310
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] "mois"
-msgstr[1] "mois"
-
-#: ../../include/datetime.php:313
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "semaine"
-msgstr[1] "semaines"
-
-#: ../../include/datetime.php:316
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] "jour"
-msgstr[1] "jours"
-
-#: ../../include/datetime.php:319
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "heure"
-msgstr[1] "heures"
-
-#: ../../include/datetime.php:322
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minute"
-msgstr[1] "minutes"
-
-#: ../../include/datetime.php:325
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "seconde"
-msgstr[1] "secondes"
-
-#: ../../include/datetime.php:562
-#, php-format
-msgid "%1$s's birthday"
-msgstr "Anniversaire de %1$s"
-
-#: ../../include/datetime.php:563
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr "Joyeux Anniversaire %1$s"
-
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -9115,21 +8804,583 @@ msgstr "Ajouter un groupe d'accès"
 msgid "Channels not in any privacy group"
 msgstr "Canaux n'étant dans aucun groupe d'accès"
 
+#: ../../include/group.php:316 ../../include/widgets.php:282
+msgid "add"
+msgstr "ajouter"
+
+#: ../../include/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:485
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\à G\\hi"
+
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:491
+msgid "Starts:"
+msgstr "Début&nbsp;:"
+
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:499
+msgid "Finishes:"
+msgstr "Fin&nbsp;:"
+
+#: ../../include/event.php:814
+msgid "This event has been added to your calendar."
+msgstr "Cet évènement a été ajouté dans votre calendrier."
+
+#: ../../include/event.php:1014
+msgid "Not specified"
+msgstr "Non spécifié"
+
+#: ../../include/event.php:1015
+msgid "Needs Action"
+msgstr "Besoin d'une action"
+
+#: ../../include/event.php:1016
+msgid "Completed"
+msgstr "Terminé"
+
+#: ../../include/event.php:1017
+msgid "In Process"
+msgstr "En cours"
+
+#: ../../include/event.php:1018
+msgid "Cancelled"
+msgstr "Annulé"
+
+#: ../../include/account.php:28
+msgid "Not a valid email address"
+msgstr "Ce n'est pas une adresse de courriel valide"
+
+#: ../../include/account.php:30
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Votre domaine de courriel ne fait pas partie de ceux autorisés par ce site"
+
+#: ../../include/account.php:36
+msgid "Your email address is already registered at this site."
+msgstr "Votre adresse de courriel est déjà inscrite sur ce site."
+
+#: ../../include/account.php:68
+msgid "An invitation is required."
+msgstr "Une invitation est requise."
+
+#: ../../include/account.php:72
+msgid "Invitation could not be verified."
+msgstr "Votre invitation n'a pas pu être vérifiée."
+
+#: ../../include/account.php:122
+msgid "Please enter the required information."
+msgstr "Merci d'entrer les informations requises."
+
+#: ../../include/account.php:189
+msgid "Failed to store account information."
+msgstr "Impossible de stocker les informations liées au compte."
+
+#: ../../include/account.php:249
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Confirmation de l'inscription pour %s"
+
+#: ../../include/account.php:315
+#, php-format
+msgid "Registration request at %s"
+msgstr "Demande d'inscription sur %s"
+
+#: ../../include/account.php:339
+msgid "your registration password"
+msgstr "votre mot de passe d'inscription"
+
+#: ../../include/account.php:342 ../../include/account.php:402
+#, php-format
+msgid "Registration details for %s"
+msgstr "Détails de l'inscription pour %s"
+
+#: ../../include/account.php:414
+msgid "Account approved."
+msgstr "Compte approuvé."
+
+#: ../../include/account.php:454
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Inscription révoquée pour %s"
+
+#: ../../include/account.php:739 ../../include/account.php:741
+msgid "Click here to upgrade."
+msgstr "Cliquez ici pour mettre à jour."
+
+#: ../../include/account.php:747
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Cette action outrepasserait les limites prévues par votre forfait."
+
+#: ../../include/account.php:752
+msgid "This action is not available under your subscription plan."
+msgstr "Cette action n'est pas disponible avec votre forfait."
+
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
+msgstr "Ce canal est bloqué sur ce site."
+
+#: ../../include/follow.php:32
+msgid "Channel location missing."
+msgstr "Emplacement du canal introuvable."
+
+#: ../../include/follow.php:80
+msgid "Response from remote channel was incomplete."
+msgstr "La réponse du canal distant était incomplète."
+
+#: ../../include/follow.php:97
+msgid "Channel was deleted and no longer exists."
+msgstr "Le canal a été supprimé et n'existe plus."
+
+#: ../../include/follow.php:147 ../../include/follow.php:183
+msgid "Protocol disabled."
+msgstr "Protocole désactivé."
+
+#: ../../include/follow.php:171
+msgid "Channel discovery failed."
+msgstr "La tentative d'accéder au canal a échoué."
+
+#: ../../include/follow.php:210
+msgid "Cannot connect to yourself."
+msgstr "Ne peut pas se connecter à vous."
+
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
+msgstr "Élément introuvable."
+
+#: ../../include/attach.php:499
+msgid "No source file."
+msgstr "Pas de fichier source."
+
+#: ../../include/attach.php:521
+msgid "Cannot locate file to replace"
+msgstr "Impossible de trouver le fichier à remplacer."
+
+#: ../../include/attach.php:539
+msgid "Cannot locate file to revise/update"
+msgstr "Impossible de trouver le fichier à corriger/mettre à jour"
+
+#: ../../include/attach.php:674
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Le fichier dépasse la taille limite de %d"
+
+#: ../../include/attach.php:688
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Vous avez atteint votre limite de %1$.0f méga-octets autorisés pour le stockage des pièces-jointes."
+
+#: ../../include/attach.php:846
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Envoi du fichier impossible. Limite système ou action avortée."
+
+#: ../../include/attach.php:859
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Le fichier stocké n'a pu être vérifié. Echec de l'envoi."
+
+#: ../../include/attach.php:915 ../../include/attach.php:931
+msgid "Path not available."
+msgstr "Chemin non disponible."
+
+#: ../../include/attach.php:977 ../../include/attach.php:1129
+msgid "Empty pathname"
+msgstr "Chemin vide"
+
+#: ../../include/attach.php:1003
+msgid "duplicate filename or path"
+msgstr "doublon de chemin ou de fichier"
+
+#: ../../include/attach.php:1025
+msgid "Path not found."
+msgstr "Chemin introuvable."
+
+#: ../../include/attach.php:1083
+msgid "mkdir failed."
+msgstr "mkdir a échoué."
+
+#: ../../include/attach.php:1087
+msgid "database storage failed."
+msgstr "l'écriture dans la base de données a échoué."
+
+#: ../../include/attach.php:1135
+msgid "Empty path"
+msgstr "Chemin vide"
+
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:878
+#: ../../include/bbcode.php:881 ../../include/bbcode.php:886
+#: ../../include/bbcode.php:889 ../../include/bbcode.php:892
+#: ../../include/bbcode.php:895 ../../include/bbcode.php:900
+#: ../../include/bbcode.php:903 ../../include/bbcode.php:908
+#: ../../include/bbcode.php:911 ../../include/bbcode.php:914
+#: ../../include/bbcode.php:917
+msgid "Image/photo"
+msgstr "Image/photo"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:928
+msgid "Encrypted content"
+msgstr "Contenu chiffré"
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr "Installer %s élément"
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Ce message contient un élément installable %s, mais vous n'avez pas l'autorisation de l'installer sur ce site."
+
+#: ../../include/bbcode.php:261
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s a écrit %2$s qui suit %3$s"
+
+#: ../../include/bbcode.php:338 ../../include/bbcode.php:346
+msgid "Click to open/close"
+msgstr "Cliquer pour ouvrir/fermer"
+
+#: ../../include/bbcode.php:346
+msgid "spoiler"
+msgstr ""
+
+#: ../../include/bbcode.php:619
+msgid "Different viewers will see this text differently"
+msgstr "Ce texte aura un rendu différent en fonction des utilisateurs"
+
+#: ../../include/bbcode.php:866
+msgid "$1 wrote:"
+msgstr "$1 a écrit&nbsp;:"
+
+#: ../../include/items.php:897 ../../include/items.php:942
+msgid "(Unknown)"
+msgstr "(Inconnu)"
+
+#: ../../include/items.php:1141
+msgid "Visible to anybody on the internet."
+msgstr "Visible pour tout le monde sur internet."
+
+#: ../../include/items.php:1143
+msgid "Visible to you only."
+msgstr "Visible pour vous seulement."
+
+#: ../../include/items.php:1145
+msgid "Visible to anybody in this network."
+msgstr "Visible pour tout le monde sur ce réseau."
+
+#: ../../include/items.php:1147
+msgid "Visible to anybody authenticated."
+msgstr "Visible aux utilisateurs authentifiés."
+
+#: ../../include/items.php:1149
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Visible pour tous sur %s."
+
+#: ../../include/items.php:1151
+msgid "Visible to all connections."
+msgstr "Visible pour tous les contacts."
+
+#: ../../include/items.php:1153
+msgid "Visible to approved connections."
+msgstr "Visible aux contacts approuvés."
+
+#: ../../include/items.php:1155
+msgid "Visible to specific connections."
+msgstr "Visible pour certains contacts."
+
+#: ../../include/items.php:3918
+msgid "Privacy group is empty."
+msgstr "Groupe d'accès vide."
+
+#: ../../include/items.php:3925
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Groupe d'accès&nbsp;: %s"
+
+#: ../../include/items.php:3937
+msgid "Connection not found."
+msgstr "Contact non trouvé."
+
+#: ../../include/items.php:4290
+msgid "profile photo"
+msgstr "photo de profil"
+
+#: ../../include/oembed.php:336
+msgid "Embedded content"
+msgstr "Contenu imbriqué"
+
+#: ../../include/oembed.php:345
+msgid "Embedding disabled"
+msgstr "Imbrication désactivée"
+
+#: ../../include/widgets.php:103
+msgid "System"
+msgstr "Système"
+
+#: ../../include/widgets.php:106
+msgid "New App"
+msgstr ""
+
+#: ../../include/widgets.php:154
+msgid "Suggestions"
+msgstr "Suggestions"
+
+#: ../../include/widgets.php:155
+msgid "See more..."
+msgstr "Voir plus..."
+
+#: ../../include/widgets.php:175
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Vous avez %1$.0f sur %2$.0f contacts autorisés."
+
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
+msgstr "Ajouter un nouveau contact"
+
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
+msgstr "Saisissez l'adresse du canal"
+
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Exemples&nbsp;: pierre@exemple.com, https://exemple.com/sophie"
+
+#: ../../include/widgets.php:199
+msgid "Notes"
+msgstr "Notes"
+
+#: ../../include/widgets.php:273
+msgid "Remove term"
+msgstr "Retirer le terme"
+
+#: ../../include/widgets.php:313 ../../include/widgets.php:432
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
+msgstr "Tout"
+
+#: ../../include/widgets.php:354
+msgid "Archives"
+msgstr "Archives"
+
+#: ../../include/widgets.php:516
+msgid "Refresh"
+msgstr "Actualiser"
+
+#: ../../include/widgets.php:556
+msgid "Account settings"
+msgstr "Paramètres du compte"
+
+#: ../../include/widgets.php:562
+msgid "Channel settings"
+msgstr "Paramètres du canal"
+
+#: ../../include/widgets.php:571
+msgid "Additional features"
+msgstr "Fonctionnalités supplémentaires"
+
+#: ../../include/widgets.php:578
+msgid "Feature/Addon settings"
+msgstr "Paramètres des extensions/greffons"
+
+#: ../../include/widgets.php:584
+msgid "Display settings"
+msgstr "Paramètres d'affichage"
+
+#: ../../include/widgets.php:591
+msgid "Manage locations"
+msgstr ""
+
+#: ../../include/widgets.php:600
+msgid "Export channel"
+msgstr "Exporter le canal"
+
+#: ../../include/widgets.php:607
+msgid "Connected apps"
+msgstr "Applications connectées"
+
+#: ../../include/widgets.php:631
+msgid "Premium Channel Settings"
+msgstr "Paramètres de canal VIP"
+
+#: ../../include/widgets.php:660
+msgid "Private Mail Menu"
+msgstr "Menu des messages privés"
+
+#: ../../include/widgets.php:662
+msgid "Combined View"
+msgstr "Vue combinée"
+
+#: ../../include/widgets.php:694 ../../include/widgets.php:706
+msgid "Conversations"
+msgstr "Conversations"
+
+#: ../../include/widgets.php:698
+msgid "Received Messages"
+msgstr "Messages reçus"
+
+#: ../../include/widgets.php:702
+msgid "Sent Messages"
+msgstr "Messages envoyés"
+
+#: ../../include/widgets.php:716
+msgid "No messages."
+msgstr "Pas de message."
+
+#: ../../include/widgets.php:734
+msgid "Delete conversation"
+msgstr "Supprimer la conversation"
+
+#: ../../include/widgets.php:760
+msgid "Events Tools"
+msgstr "Outils Evènements"
+
+#: ../../include/widgets.php:761
+msgid "Export Calendar"
+msgstr "Exporter le calendrier"
+
+#: ../../include/widgets.php:762
+msgid "Import Calendar"
+msgstr "Importer un calendrier"
+
+#: ../../include/widgets.php:840
+msgid "Overview"
+msgstr ""
+
+#: ../../include/widgets.php:847
+msgid "Chat Members"
+msgstr ""
+
+#: ../../include/widgets.php:869
+msgid "Wiki List"
+msgstr ""
+
+#: ../../include/widgets.php:907
+msgid "Wiki Pages"
+msgstr ""
+
+#: ../../include/widgets.php:942
+msgid "Bookmarked Chatrooms"
+msgstr "Salons favoris"
+
+#: ../../include/widgets.php:965
+msgid "Suggested Chatrooms"
+msgstr "Salons suggérés"
+
+#: ../../include/widgets.php:1111 ../../include/widgets.php:1223
+msgid "photo/image"
+msgstr "photo/image"
+
+#: ../../include/widgets.php:1166
+msgid "Click to show more"
+msgstr "Cliquer pour voir plus"
+
+#: ../../include/widgets.php:1317
+msgid "Rating Tools"
+msgstr "Outils d'évaluation"
+
+#: ../../include/widgets.php:1321 ../../include/widgets.php:1323
+msgid "Rate Me"
+msgstr "M'évaluer"
+
+#: ../../include/widgets.php:1326
+msgid "View Ratings"
+msgstr "Voir mes évaluations"
+
+#: ../../include/widgets.php:1410
+msgid "Forums"
+msgstr "Membres du forum"
+
+#: ../../include/widgets.php:1439
+msgid "Tasks"
+msgstr "Tâches"
+
+#: ../../include/widgets.php:1448
+msgid "Documentation"
+msgstr "Documentation"
+
+#: ../../include/widgets.php:1450
+msgid "Project/Site Information"
+msgstr "Information sur le site/projet"
+
+#: ../../include/widgets.php:1451
+msgid "For Members"
+msgstr "Pour les membres"
+
+#: ../../include/widgets.php:1452
+msgid "For Administrators"
+msgstr "Pour les administrateurs"
+
+#: ../../include/widgets.php:1453
+msgid "For Developers"
+msgstr "Pour les développeurs"
+
+#: ../../include/widgets.php:1477 ../../include/widgets.php:1515
+msgid "Member registrations waiting for confirmation"
+msgstr ""
+
+#: ../../include/widgets.php:1483
+msgid "Inspect queue"
+msgstr "Analyser la file d'attente"
+
+#: ../../include/widgets.php:1485
+msgid "DB updates"
+msgstr "Mises à jour BDD"
+
+#: ../../include/widgets.php:1511
+msgid "Plugin Features"
+msgstr "Fonctionnalités des greffons"
+
+#: ../../include/activities.php:41
+msgid " and "
+msgstr "et"
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr "profil public"
+
+#: ../../include/activities.php:58
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s a changé %2$s en &ldquo;%3$s&rdquo;"
+
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Visiter %2$s de %1$s"
+
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s a mis à jour %2$s, modifiant %3$s."
+
+#: ../../include/bb2diaspora.php:398
+msgid "Attachments:"
+msgstr "Pièces jointes&nbsp;:"
+
+#: ../../include/bb2diaspora.php:487
+msgid "$Projectname event notification:"
+msgstr "Notification d'événement de $Projectname&nbsp;:"
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "Supprimer cet élément?"
 
 #: ../../include/js_strings.php:8
-msgid "[-] show less"
-msgstr "[-] montrer moins"
+#, php-format
+msgid "%s show less"
+msgstr ""
 
 #: ../../include/js_strings.php:9
-msgid "[+] expand"
-msgstr "[+] déplier"
+#, php-format
+msgid "%s expand"
+msgstr ""
 
 #: ../../include/js_strings.php:10
-msgid "[-] collapse"
-msgstr "[-] replier"
+#, php-format
+msgid "%s collapse"
+msgstr ""
 
 #: ../../include/js_strings.php:11
 msgid "Password too short"
@@ -9359,278 +9610,223 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "Toute la journée"
 
-#: ../../include/network.php:657
-msgid "view full size"
-msgstr "voir en taille réelle"
+#: ../../include/contact_widgets.php:11
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitation disponible"
+msgstr[1] "%d invitations disponibles"
 
-#: ../../include/network.php:1885
-msgid "No Subject"
-msgstr "Pas d'objet"
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
+msgstr "Trouver des canaux"
 
-#: ../../include/network.php:2146 ../../include/network.php:2147
-msgid "Friendica"
-msgstr "Friendica"
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
+msgstr "Saisir nom ou centre d'intérêt"
 
-#: ../../include/network.php:2148
-msgid "OStatus"
-msgstr "OStatus"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
+msgstr "Ajouter/Suivre"
 
-#: ../../include/network.php:2149
-msgid "GNU-Social"
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Exemples: Guillaume Martin, Course à pieds"
+
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
+msgstr "Un profil au hasard"
+
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
+msgstr "Inviter des amis"
+
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Exemple avancé&nbsp;: name=fred and country=iceland"
+
+#: ../../include/contact_widgets.php:122
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d contact en commun"
+msgstr[1] "%d contacts en commun"
+
+#: ../../include/contact_widgets.php:127
+msgid "show more"
+msgstr "montrer plus"
+
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr "Options d'annuaire"
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr "Mode sûr"
+
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr "Les forums publics uniquement"
+
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr "Ce site uniquement"
+
+#: ../../include/message.php:20
+msgid "No recipient provided."
+msgstr "Pas de destinataire."
+
+#: ../../include/message.php:25
+msgid "[no subject]"
+msgstr "[sans objet]"
+
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
+msgstr "Impossible de déterminer l'émetteur."
+
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
+msgstr "Le message stocké n'a pas pu être vérifié."
+
+#: ../../include/acl_selectors.php:269
+msgid "Who can see this?"
 msgstr ""
 
-#: ../../include/network.php:2150
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
+#: ../../include/acl_selectors.php:270
+msgid "Custom selection"
+msgstr ""
 
-#: ../../include/network.php:2152
-msgid "Diaspora"
-msgstr "Diaspora"
+#: ../../include/acl_selectors.php:271
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
+" the scope of \"Show\"."
+msgstr ""
 
-#: ../../include/network.php:2153
-msgid "Facebook"
-msgstr "Facebook"
+#: ../../include/acl_selectors.php:272
+msgid "Show"
+msgstr "Montrer"
 
-#: ../../include/network.php:2154
-msgid "Zot"
-msgstr "Zot"
+#: ../../include/acl_selectors.php:273
+msgid "Don't show"
+msgstr "Cacher"
 
-#: ../../include/network.php:2155
-msgid "LinkedIn"
-msgstr "Linkedin"
+#: ../../include/acl_selectors.php:279
+msgid "Other networks and post services"
+msgstr "Autres réseaux et services de messagerie"
 
-#: ../../include/network.php:2156
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: ../../include/network.php:2157
-msgid "MySpace"
-msgstr "MySpace"
-
-#: ../../include/photos.php:110
+#: ../../include/acl_selectors.php:309
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "L'image dépasse la taille limite de %lu octets"
+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 ""
 
-#: ../../include/photos.php:117
-msgid "Image file is empty."
-msgstr "L'image est vide."
+#: ../../include/datetime.php:135
+msgid "Birthday"
+msgstr "Anniversaire"
 
-#: ../../include/photos.php:255
-msgid "Photo storage failed."
-msgstr "Le stockage de l'image a échoué."
+#: ../../include/datetime.php:137
+msgid "Age: "
+msgstr "Age&nbsp;:"
 
-#: ../../include/photos.php:295
-msgid "a new photo"
-msgstr "une nouvelle photo"
+#: ../../include/datetime.php:139
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "AAAA-MM-JJ ou MM-JJ"
 
-#: ../../include/photos.php:299
+#: ../../include/datetime.php:272 ../../boot.php:2479
+msgid "never"
+msgstr "jamais"
+
+#: ../../include/datetime.php:278
+msgid "less than a second ago"
+msgstr "à l'instant"
+
+#: ../../include/datetime.php:296
 #, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s a publié %2$s pour %3$s"
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr "il y a %1$d %2$s"
 
-#: ../../include/photos.php:506
-msgid "Upload New Photos"
-msgstr "Ajouter des photos"
+#: ../../include/datetime.php:307
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] "an"
+msgstr[1] "ans"
 
-#: ../../include/zot.php:699
+#: ../../include/datetime.php:310
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] "mois"
+msgstr[1] "mois"
+
+#: ../../include/datetime.php:313
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "semaine"
+msgstr[1] "semaines"
+
+#: ../../include/datetime.php:316
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "jour"
+msgstr[1] "jours"
+
+#: ../../include/datetime.php:319
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "heure"
+msgstr[1] "heures"
+
+#: ../../include/datetime.php:322
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minute"
+msgstr[1] "minutes"
+
+#: ../../include/datetime.php:325
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "seconde"
+msgstr[1] "secondes"
+
+#: ../../include/datetime.php:562
+#, php-format
+msgid "%1$s's birthday"
+msgstr "Anniversaire de %1$s"
+
+#: ../../include/datetime.php:563
+#, php-format
+msgid "Happy Birthday %1$s"
+msgstr "Joyeux Anniversaire %1$s"
+
+#: ../../include/api.php:1327
+msgid "Public Timeline"
+msgstr "Fil public"
+
+#: ../../include/zot.php:697
 msgid "Invalid data packet"
 msgstr "Paquet de données invalide"
 
-#: ../../include/zot.php:715
+#: ../../include/zot.php:713
 msgid "Unable to verify channel signature"
 msgstr "Impossible de vérifier la signature du canal"
 
-#: ../../include/zot.php:2363
+#: ../../include/zot.php:2326
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Impossible de vérifier la signature de site pour %s"
 
-#: ../../include/zot.php:3712
+#: ../../include/zot.php:3703
 msgid "invalid target signature"
 msgstr "signature de la cible invalide"
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Nouvelle page"
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr "Titre"
-
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
-msgstr "Peut voir les publications ordinaires sur mon canal."
-
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
-msgstr "Peut voir le profil du canal par défaut."
-
-#: ../../include/permissions.php:28
-msgid "Can view my connections"
-msgstr "Peut voir mes contacts"
-
-#: ../../include/permissions.php:29
-msgid "Can view my file storage and photos"
-msgstr "Peut voir mes fichiers et photos"
-
-#: ../../include/permissions.php:30
-msgid "Can view my webpages"
-msgstr "Peut voir mes pages web"
-
-#: ../../include/permissions.php:33
-msgid "Can send me their channel stream and posts"
-msgstr "Peuvent m'envoyer leur flux et les publications de leur canal"
-
-#: ../../include/permissions.php:34
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Peuvent poster sur la page de mon canal (\"mur\")"
-
-#: ../../include/permissions.php:35
-msgid "Can comment on or like my posts"
-msgstr "Peuvent commenter et/ou aimer mes publications"
-
-#: ../../include/permissions.php:36
-msgid "Can send me private mail messages"
-msgstr "Peuvent m'envoyer des messages privés"
-
-#: ../../include/permissions.php:37
-msgid "Can like/dislike stuff"
-msgstr "Peuvent aimer/ne pas aimer"
-
-#: ../../include/permissions.php:37
-msgid "Profiles and things other than posts/comments"
-msgstr "Profils et autres excluant les publications/commentaires."
-
-#: ../../include/permissions.php:39
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Peut faire suivre à tous les contacts de mon canal via \"@mention\""
-
-#: ../../include/permissions.php:39
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Avancé - utile pour les canaux de type \"forum/groupe\""
-
-#: ../../include/permissions.php:40
-msgid "Can chat with me (when available)"
-msgstr "Peut discuter avec moi (quand disponibie)"
-
-#: ../../include/permissions.php:41
-msgid "Can write to my file storage and photos"
-msgstr "Peut charger des fichiers et des photos dans mon canal"
-
-#: ../../include/permissions.php:42
-msgid "Can edit my webpages"
-msgstr "Peut modifier mes pages web"
-
-#: ../../include/permissions.php:44
-msgid "Can source my public posts in derived channels"
-msgstr "Peut rediriger mes publications publiques vers des canaux dérivés"
-
-#: ../../include/permissions.php:44
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Plutôt avancé - très utile dans les communautés ouvertes"
-
-#: ../../include/permissions.php:46
-msgid "Can administer my channel resources"
-msgstr "Peut administrer les ressources de mon canal"
-
-#: ../../include/permissions.php:46
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Très avancé. Ne pas toucher, sauf si vous savez ce que vous faîtes"
-
-#: ../../include/permissions.php:877
-msgid "Social Networking"
-msgstr "Réseau social"
-
-#: ../../include/permissions.php:877
-msgid "Social - Mostly Public"
-msgstr "Social - surtout public"
-
-#: ../../include/permissions.php:877
-msgid "Social - Restricted"
-msgstr "Social - restreint"
-
-#: ../../include/permissions.php:877
-msgid "Social - Private"
-msgstr "Social - privé"
-
-#: ../../include/permissions.php:878
-msgid "Community Forum"
-msgstr "Forum communautaire"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Mostly Public"
-msgstr "Forum - surtout public"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Restricted"
-msgstr "Forum - restreint"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Private"
-msgstr "Forum - privé"
-
-#: ../../include/permissions.php:879
-msgid "Feed Republish"
-msgstr "Republication de flux"
-
-#: ../../include/permissions.php:879
-msgid "Feed - Mostly Public"
-msgstr "Flux - surtout public"
-
-#: ../../include/permissions.php:879
-msgid "Feed - Restricted"
-msgstr "Flux - restreint"
-
-#: ../../include/permissions.php:880
-msgid "Special Purpose"
-msgstr "Utilisation spécifique"
-
-#: ../../include/permissions.php:880
-msgid "Special - Celebrity/Soapbox"
-msgstr "Spécial - célébrité/promotion"
-
-#: ../../include/permissions.php:880
-msgid "Special - Group Repository"
-msgstr "Spécial - dépôt partagé"
-
-#: ../../include/permissions.php:881
-msgid "Custom/Expert Mode"
-msgstr "Mode expert/spécifique"
-
-#: ../../include/activities.php:41
-msgid " and "
-msgstr "et"
-
-#: ../../include/activities.php:49
-msgid "public profile"
-msgstr "profil public"
-
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s a changé %2$s en &ldquo;%3$s&rdquo;"
-
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Visiter %2$s de %1$s"
-
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s a mis à jour %2$s, modifiant %3$s."
-
-#: ../../include/bb2diaspora.php:398
-msgid "Attachments:"
-msgstr "Pièces jointes&nbsp;:"
-
-#: ../../include/bb2diaspora.php:487
-msgid "$Projectname event notification:"
-msgstr "Notification d'événement de $Projectname&nbsp;:"
-
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (par défaut pour Hubzilla)"
@@ -9767,62 +9963,66 @@ msgstr "Définir la taille de la photo de l'auteur d'une conversation"
 msgid "Set size of followup author photos"
 msgstr "Définir la taille de la photo de l'auteur d'une réponse"
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr ""
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr ""
 
-#: ../../boot.php:1480
+#: ../../boot.php:1481
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "La mise-à-jour %s a échoué. Merci de consulter les journaux d'erreur."
 
-#: ../../boot.php:1483
+#: ../../boot.php:1484
 #, php-format
 msgid "Update Error at %s"
 msgstr "Erreur de mise à jour sur %s"
 
-#: ../../boot.php:1684
+#: ../../boot.php:1685
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Créez un compte pour pouvoir accéder aux services et applications de Hubzilla"
 
 #: ../../boot.php:1706
+msgid "Login/Email"
+msgstr ""
+
+#: ../../boot.php:1707
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../../boot.php:1707
+#: ../../boot.php:1708
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: ../../boot.php:1710
+#: ../../boot.php:1711
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié&nbsp;?"
 
-#: ../../boot.php:2276
+#: ../../boot.php:2277
 msgid "toggle mobile"
 msgstr "(dés)activer mobile"
 
-#: ../../boot.php:2425
+#: ../../boot.php:2432
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Le certificat SSL n'est pas valide. Corrigez le."
 
-#: ../../boot.php:2428
+#: ../../boot.php:2435
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Erreur SSL pour %s"
 
-#: ../../boot.php:2469
+#: ../../boot.php:2478
 msgid "Cron/Scheduled tasks not running."
 msgstr "Les taches planifiées ne tournent pas."
 
-#: ../../boot.php:2473
+#: ../../boot.php:2482
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Les tâches planifiées ne tournent pas sur %s"
diff --git a/view/fr/hstrings.php b/view/fr/hstrings.php
index a1ff9f868..3da3329cd 100644
--- a/view/fr/hstrings.php
+++ b/view/fr/hstrings.php
@@ -4,7 +4,39 @@ if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	return ($n > 1);;
 }}
-;
+App::$rtl = 0;
+App::$strings["Social Networking"] = "Réseau social";
+App::$strings["Social - Mostly Public"] = "Social - surtout public";
+App::$strings["Social - Restricted"] = "Social - restreint";
+App::$strings["Social - Private"] = "Social - privé";
+App::$strings["Community Forum"] = "Forum communautaire";
+App::$strings["Forum - Mostly Public"] = "Forum - surtout public";
+App::$strings["Forum - Restricted"] = "Forum - restreint";
+App::$strings["Forum - Private"] = "Forum - privé";
+App::$strings["Feed Republish"] = "Republication de flux";
+App::$strings["Feed - Mostly Public"] = "Flux - surtout public";
+App::$strings["Feed - Restricted"] = "Flux - restreint";
+App::$strings["Special Purpose"] = "Utilisation spécifique";
+App::$strings["Special - Celebrity/Soapbox"] = "Spécial - célébrité/promotion";
+App::$strings["Special - Group Repository"] = "Spécial - dépôt partagé";
+App::$strings["Other"] = "Autre";
+App::$strings["Custom/Expert Mode"] = "Mode expert/spécifique";
+App::$strings["Can view my channel stream and posts"] = "";
+App::$strings["Can send me their channel stream and posts"] = "Peuvent m'envoyer leur flux et les publications de leur canal";
+App::$strings["Can view my default channel profile"] = "Peut voir le profil du canal par défaut.";
+App::$strings["Can view my connections"] = "Peut voir mes contacts";
+App::$strings["Can view my file storage and photos"] = "Peut voir mes fichiers et photos";
+App::$strings["Can upload/modify my file storage and photos"] = "";
+App::$strings["Can view my channel webpages"] = "";
+App::$strings["Can create/edit my channel webpages"] = "";
+App::$strings["Can post on my channel (wall) page"] = "";
+App::$strings["Can comment on or like my posts"] = "Peuvent commenter et/ou aimer mes publications";
+App::$strings["Can send me private mail messages"] = "Peuvent m'envoyer des messages privés";
+App::$strings["Can like/dislike profiles and profile things"] = "";
+App::$strings["Can forward to all my channel connections via @+ mentions in posts"] = "";
+App::$strings["Can chat with me"] = "";
+App::$strings["Can source my public posts in derived channels"] = "Peut rediriger mes publications publiques vers des canaux dérivés";
+App::$strings["Can administer my channel"] = "";
 App::$strings["parent"] = "retour";
 App::$strings["Collection"] = "Groupe de contacts";
 App::$strings["Principal"] = "Principal";
@@ -37,63 +69,8 @@ App::$strings["Remote authentication blocked. You are logged into this site loca
 App::$strings["Welcome %s. Remote authentication successful."] = "Bienvenue %s. L'authentification distante a fonctionné.";
 App::$strings["Requested profile is not available."] = "Profil demandé non disponible.";
 App::$strings["Some blurb about what to do when you're new here"] = "Quelques mots sur quoi faire quand on est nouveau ici";
-App::$strings["Block Name"] = "Nom du Bloc";
-App::$strings["Blocks"] = "Blocs";
-App::$strings["Block Title"] = "Titre du bloc";
-App::$strings["Created"] = "Créé(e)";
-App::$strings["Edited"] = "Modifié(e)";
-App::$strings["Share"] = "Partager";
-App::$strings["View"] = "Voir";
-App::$strings["Channel not found."] = "Canal introuvable.";
-App::$strings["Permissions denied."] = "Permissions refusées.";
-App::$strings["l, F j"] = "l, F j";
-App::$strings["Link to Source"] = "Lien vers la Source";
-App::$strings["Edit Event"] = "Modifier l'événement";
-App::$strings["Create Event"] = "Créer un événement";
-App::$strings["Previous"] = "Précédent";
-App::$strings["Next"] = "Suivant";
-App::$strings["Export"] = "Export";
-App::$strings["Import"] = "Import";
-App::$strings["Submit"] = "Envoyer";
-App::$strings["Today"] = "Aujourd'hui";
-App::$strings["You must be logged in to see this page."] = "Vous devez vous connecter pour voir cette page.";
-App::$strings["Posts and comments"] = "";
-App::$strings["Only posts"] = "";
-App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Permissions insuffisantes. Demande redirigée vers la page du profil.";
-App::$strings["Room not found"] = "Salon introuvable";
-App::$strings["Leave Room"] = "Quitter le salon";
-App::$strings["Delete Room"] = "";
-App::$strings["I am away right now"] = "Je suis absent en ce moment";
-App::$strings["I am online"] = "Je suis en ligne";
-App::$strings["Bookmark this room"] = "Marquer ce salon comme favori";
-App::$strings["Please enter a link URL:"] = "Merci d'entrer l'URL d'un lien&nbsp;:";
-App::$strings["Encrypt text"] = "Chiffrer le texte";
-App::$strings["Insert web link"] = "Insérer lien web";
-App::$strings["Feature disabled."] = "";
-App::$strings["New Chatroom"] = "Nouveau salon de discussion";
-App::$strings["Chatroom name"] = "";
-App::$strings["Expiration of chats (minutes)"] = "Expiration des discussions (en minutes)";
-App::$strings["Permissions"] = "Autorisations";
-App::$strings["%1\$s's Chatrooms"] = "Salons de %1\$s";
-App::$strings["No chatrooms available"] = "";
-App::$strings["Create New"] = "";
-App::$strings["Expiration"] = "";
-App::$strings["min"] = "";
 App::$strings["Away"] = "Absent";
 App::$strings["Online"] = "En ligne";
-App::$strings["Invalid item."] = "Élément invalide.";
-App::$strings["Bookmark added"] = "Favori ajouté";
-App::$strings["My Bookmarks"] = "Mes Favoris";
-App::$strings["My Connections Bookmarks"] = "Favoris de mes contacts";
-App::$strings["Continue"] = "Continuer";
-App::$strings["Premium Channel Setup"] = "Configuration du canal VIP";
-App::$strings["Enable premium channel connection restrictions"] = "Activer les restrictions liées au canal VIP";
-App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Merci de saisir les restrictions et/ou conditions - reçu Paypal, transaction Bitcoin, ligne de conduite, ...";
-App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Avant d'autoriser la mise en relation, ce canal attire votre attention sur les conditions suivantes&nbsp;:";
-App::$strings["Potential connections will then see the following text before proceeding:"] = "Les contacts potentiels verront ce qui suit avant de pouvoir continuer&nbsp;:";
-App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "En continuant, je certifie que je me suis conformé à toutes les instructions indiquées sur cette page.";
-App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Aucune instruction spécifique n'a été fournie par le propriétaire du canal.)";
-App::$strings["Restricted or Premium Channel"] = "Canal VIP ou restreint";
 App::$strings["Could not access contact record."] = "Impossible d'accéder aux détails du contact.";
 App::$strings["Could not locate selected profile."] = "Impossible de localiser le profil sélectionné.";
 App::$strings["Connection updated."] = "Contact mis à jour.";
@@ -158,6 +135,7 @@ App::$strings["Do not import posts with this text"] = "Ne pas importer les publi
 App::$strings["This information is public!"] = "Cette information est publique&nbsp;!";
 App::$strings["Connection Pending Approval"] = "Contact en attente d'approbation";
 App::$strings["inherited"] = "héritée";
+App::$strings["Submit"] = "Envoyer";
 App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Merci de choisir le profil que vous souhaitez montrer quand %s visite votre profil de manière authentifiée.";
 App::$strings["Their Settings"] = "Leurs paramètres";
 App::$strings["My Settings"] = "Mes paramètres";
@@ -166,6 +144,30 @@ App::$strings["Some permissions may be inherited from your channel's <a href=\"s
 App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Certaines permissions peuvent être héritées de vos <a href=\"settings\">paramètres de confidentialité</a> de canal, lesquels sont prioritaires sur les réglages individuels. Vous pouvez modifier ces permissions ici mais cela n'aura aucun effet à moins de changer les paramètres hérités.";
 App::$strings["Last update:"] = "Dernière mise à jour&nbsp;:";
 App::$strings["Public access denied."] = "Accès public refusé.";
+App::$strings["Item not found."] = "Élément introuvable";
+App::$strings["First Name"] = "Prénom";
+App::$strings["Last Name"] = "Nom de famille";
+App::$strings["Nickname"] = "Surnom";
+App::$strings["Full Name"] = "Nom complet";
+App::$strings["Email"] = "Courriel";
+App::$strings["Profile Photo"] = "Photo du Profil";
+App::$strings["Profile Photo 16px"] = "Photo de profil 16px";
+App::$strings["Profile Photo 32px"] = "Photo de profil 32px";
+App::$strings["Profile Photo 48px"] = "Photo de profil 48px";
+App::$strings["Profile Photo 64px"] = "Photo de profil 64px";
+App::$strings["Profile Photo 80px"] = "Photo de profil 80px";
+App::$strings["Profile Photo 128px"] = "Photo de profil 128px";
+App::$strings["Timezone"] = "Fuseau horaire";
+App::$strings["Homepage URL"] = "URL de mon site Internet&nbsp;:";
+App::$strings["Language"] = "Langue";
+App::$strings["Birth Year"] = "Année de naissance";
+App::$strings["Birth Month"] = "Mois de naissance";
+App::$strings["Birth Day"] = "Jour de naissance";
+App::$strings["Birthdate"] = "Date de naissance";
+App::$strings["Gender"] = "Sexe";
+App::$strings["Male"] = "Homme";
+App::$strings["Female"] = "Femme";
+App::$strings["Channel added."] = "Canal ajouté.";
 App::$strings["%d rating"] = array(
 	0 => "%d évaluation",
 	1 => "%d évaluations",
@@ -196,13 +198,74 @@ App::$strings["Reverse Alphabetic"] = "Alphabétique inversé";
 App::$strings["Newest to Oldest"] = "Du plus récent au moins récent";
 App::$strings["Oldest to Newest"] = "Du moins récent du plus récent";
 App::$strings["No entries (some entries may be hidden)."] = "Pas d'entrées (certaines peuvent être cachées).";
-App::$strings["Item not found."] = "Élément introuvable";
+App::$strings["Continue"] = "Continuer";
+App::$strings["Premium Channel Setup"] = "Configuration du canal VIP";
+App::$strings["Enable premium channel connection restrictions"] = "Activer les restrictions liées au canal VIP";
+App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Merci de saisir les restrictions et/ou conditions - reçu Paypal, transaction Bitcoin, ligne de conduite, ...";
+App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Avant d'autoriser la mise en relation, ce canal attire votre attention sur les conditions suivantes&nbsp;:";
+App::$strings["Potential connections will then see the following text before proceeding:"] = "Les contacts potentiels verront ce qui suit avant de pouvoir continuer&nbsp;:";
+App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "En continuant, je certifie que je me suis conformé à toutes les instructions indiquées sur cette page.";
+App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Aucune instruction spécifique n'a été fournie par le propriétaire du canal.)";
+App::$strings["Restricted or Premium Channel"] = "Canal VIP ou restreint";
+App::$strings["Calendar entries imported."] = "Entrées du calendrier importées.";
+App::$strings["No calendar entries found."] = "Aucune entrée du calendrier trouvée.";
+App::$strings["Event can not end before it has started."] = "La fin de l'événement ne peut être antérieure à son début.";
+App::$strings["Unable to generate preview."] = "Impossible de générer l'aperçu.";
+App::$strings["Event title and start time are required."] = "Un titre et une date de début sont requises pour l'événement.";
+App::$strings["Event not found."] = "Événement introuvable.";
+App::$strings["event"] = "événement";
+App::$strings["Edit event title"] = "Modifier le titre de l'événement";
+App::$strings["Event title"] = "Titre de l'événement";
+App::$strings["Required"] = "Requis";
+App::$strings["Categories (comma-separated list)"] = "Catégories (séparées par des virgules)";
+App::$strings["Edit Category"] = "Modifier la catégorie";
+App::$strings["Category"] = "Catégorie";
+App::$strings["Edit start date and time"] = "Modifier la date et l'heure de début";
+App::$strings["Start date and time"] = "Date et heure de début";
+App::$strings["Finish date and time are not known or not relevant"] = "Date et heure de fin inconnues ou sans objet";
+App::$strings["Edit finish date and time"] = "Modifier la date et l'heure de fin";
+App::$strings["Finish date and time"] = "Date et heure de fin";
+App::$strings["Adjust for viewer timezone"] = "Ajuster au fuseau horaire du visiteur";
+App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Important pour les événements se tenant en un lieu particulier. Pas pratique pour les vacances communes à de nombreux pays dans le monde.";
+App::$strings["Edit Description"] = "Modifier la description";
+App::$strings["Description"] = "Description";
+App::$strings["Edit Location"] = "Modifier l'emplacement";
+App::$strings["Location"] = "Emplacement";
+App::$strings["Share this event"] = "Partager cet événement";
+App::$strings["Preview"] = "Aperçu";
+App::$strings["Permission settings"] = "Gérer les autorisations";
+App::$strings["Advanced Options"] = "Options avancées";
+App::$strings["l, F j"] = "l, F j";
+App::$strings["Edit event"] = "Modifier l'événement";
+App::$strings["Delete event"] = "Supprimer l'événement";
+App::$strings["Link to Source"] = "Lien vers la Source";
+App::$strings["calendar"] = "calendrier";
+App::$strings["Edit Event"] = "Modifier l'événement";
+App::$strings["Create Event"] = "Créer un événement";
+App::$strings["Previous"] = "Précédent";
+App::$strings["Next"] = "Suivant";
+App::$strings["Export"] = "Export";
+App::$strings["View"] = "Voir";
+App::$strings["Month"] = "";
+App::$strings["Week"] = "";
+App::$strings["Day"] = "";
+App::$strings["Today"] = "Aujourd'hui";
+App::$strings["Event removed"] = "Événement supprimé";
+App::$strings["Failed to remove event"] = "Impossible de supprimer l'événement";
+App::$strings["Bookmark added"] = "Favori ajouté";
+App::$strings["My Bookmarks"] = "Mes Favoris";
+App::$strings["My Connections Bookmarks"] = "Favoris de mes contacts";
 App::$strings["Item not found"] = "Élément introuvable";
-App::$strings["Title (optional)"] = "Titre (facultatif)";
-App::$strings["Edit Block"] = "Modifier le bloc";
-App::$strings["No channel."] = "Pas de canal.";
-App::$strings["Common connections"] = "Contacts en commun";
-App::$strings["No connections in common."] = "Pas de contacts en commun.";
+App::$strings["Item is not editable"] = "Elément non modifiable";
+App::$strings["Edit post"] = "Modifier la publication";
+App::$strings["Photos"] = "Photos";
+App::$strings["Cancel"] = "Annuler";
+App::$strings["Invalid item."] = "Élément invalide.";
+App::$strings["Channel not found."] = "Canal introuvable.";
+App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+App::$strings["Save to Folder:"] = "Classer dans le dossier&nbsp;:";
+App::$strings["- select -"] = "- choisir -";
+App::$strings["Save"] = "Enregistrer";
 App::$strings["Blocked"] = "Bloqué(e)";
 App::$strings["Ignored"] = "Ignoré(e)";
 App::$strings["Hidden"] = "Caché";
@@ -254,51 +317,38 @@ App::$strings["select a photo from your photo albums"] = "choisir une photo dans
 App::$strings["Crop Image"] = "Recadrer l'image";
 App::$strings["Please adjust the image cropping for optimum viewing."] = "Merci d'ajuster le cadre pour une visualisation optimale.";
 App::$strings["Done Editing"] = "J'ai terminé";
-App::$strings["Item is not editable"] = "Elément non modifiable";
-App::$strings["Edit post"] = "Modifier la publication";
-App::$strings["Calendar entries imported."] = "Entrées du calendrier importées.";
-App::$strings["No calendar entries found."] = "Aucune entrée du calendrier trouvée.";
-App::$strings["Event can not end before it has started."] = "La fin de l'événement ne peut être antérieure à son début.";
-App::$strings["Unable to generate preview."] = "Impossible de générer l'aperçu.";
-App::$strings["Event title and start time are required."] = "Un titre et une date de début sont requises pour l'événement.";
-App::$strings["Event not found."] = "Événement introuvable.";
-App::$strings["event"] = "événement";
-App::$strings["Edit event title"] = "Modifier le titre de l'événement";
-App::$strings["Event title"] = "Titre de l'événement";
-App::$strings["Required"] = "Requis";
-App::$strings["Categories (comma-separated list)"] = "Catégories (séparées par des virgules)";
-App::$strings["Edit Category"] = "Modifier la catégorie";
-App::$strings["Category"] = "Catégorie";
-App::$strings["Edit start date and time"] = "Modifier la date et l'heure de début";
-App::$strings["Start date and time"] = "Date et heure de début";
-App::$strings["Finish date and time are not known or not relevant"] = "Date et heure de fin inconnues ou sans objet";
-App::$strings["Edit finish date and time"] = "Modifier la date et l'heure de fin";
-App::$strings["Finish date and time"] = "Date et heure de fin";
-App::$strings["Adjust for viewer timezone"] = "Ajuster au fuseau horaire du visiteur";
-App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Important pour les événements se tenant en un lieu particulier. Pas pratique pour les vacances communes à de nombreux pays dans le monde.";
-App::$strings["Edit Description"] = "Modifier la description";
-App::$strings["Description"] = "Description";
-App::$strings["Edit Location"] = "Modifier l'emplacement";
-App::$strings["Location"] = "Emplacement";
-App::$strings["Share this event"] = "Partager cet événement";
-App::$strings["Preview"] = "Aperçu";
-App::$strings["Permission settings"] = "Gérer les autorisations";
-App::$strings["Advanced Options"] = "Options avancées";
-App::$strings["Edit event"] = "Modifier l'événement";
-App::$strings["Delete event"] = "Supprimer l'événement";
-App::$strings["calendar"] = "calendrier";
-App::$strings["Event removed"] = "Événement supprimé";
-App::$strings["Failed to remove event"] = "Impossible de supprimer l'événement";
-App::$strings["Photos"] = "Photos";
-App::$strings["Cancel"] = "Annuler";
+App::$strings["webpage"] = "pages web";
+App::$strings["block"] = "bloquer";
+App::$strings["layout"] = "mise en page";
+App::$strings["menu"] = "menu";
+App::$strings["%s element installed"] = "Elément %s installé";
+App::$strings["%s element installation failed"] = "L'installation de l'élément %s a échoué";
+App::$strings["Permissions denied."] = "Permissions refusées.";
+App::$strings["Import"] = "Import";
 App::$strings["This site is not a directory server"] = "Ce site n'est pas un serveur d'annuaire";
 App::$strings["This directory server requires an access token"] = "Ce serveur d'annuaire requiert un jeton d'accès";
-App::$strings["Save to Folder:"] = "Classer dans le dossier&nbsp;:";
-App::$strings["- select -"] = "- choisir -";
-App::$strings["Save"] = "Enregistrer";
+App::$strings["You must be logged in to see this page."] = "Vous devez vous connecter pour voir cette page.";
+App::$strings["Room not found"] = "Salon introuvable";
+App::$strings["Leave Room"] = "Quitter le salon";
+App::$strings["Delete Room"] = "";
+App::$strings["I am away right now"] = "Je suis absent en ce moment";
+App::$strings["I am online"] = "Je suis en ligne";
+App::$strings["Bookmark this room"] = "Marquer ce salon comme favori";
+App::$strings["Please enter a link URL:"] = "Merci d'entrer l'URL d'un lien&nbsp;:";
+App::$strings["Encrypt text"] = "Chiffrer le texte";
+App::$strings["Insert web link"] = "Insérer lien web";
+App::$strings["Feature disabled."] = "";
+App::$strings["New Chatroom"] = "Nouveau salon de discussion";
+App::$strings["Chatroom name"] = "";
+App::$strings["Expiration of chats (minutes)"] = "Expiration des discussions (en minutes)";
+App::$strings["Permissions"] = "Autorisations";
+App::$strings["%1\$s's Chatrooms"] = "Salons de %1\$s";
+App::$strings["No chatrooms available"] = "";
+App::$strings["Create New"] = "";
+App::$strings["Expiration"] = "";
+App::$strings["min"] = "";
 App::$strings["Invalid message"] = "Message non valide";
 App::$strings["no results"] = "aucun résultat";
-App::$strings["Delivery report for %1\$s"] = "Rapport de distribution pour %1\$s";
 App::$strings["channel sync processed"] = "Synchro de canal effectuée";
 App::$strings["queued"] = "mis dans la file d'attente";
 App::$strings["posted"] = "publié";
@@ -310,14 +360,14 @@ App::$strings["recipient not found"] = "destinataire introuvable";
 App::$strings["mail recalled"] = "courriel rappelé";
 App::$strings["duplicate mail received"] = "courriel reçu en double";
 App::$strings["mail delivered"] = "courriel distribué";
+App::$strings["Delivery report for %1\$s"] = "Rapport de distribution pour %1\$s";
+App::$strings["Options"] = "";
+App::$strings["Redeliver"] = "";
 App::$strings["Layout Name"] = "Nom de la mise en page";
 App::$strings["Layout Description (Optional)"] = "Description de la mise en page (facultatif)";
 App::$strings["Edit Layout"] = "Modifier la mise en page";
 App::$strings["Page link"] = "";
 App::$strings["Edit Webpage"] = "Modifier la page web";
-App::$strings["Channel added."] = "Canal ajouté.";
-App::$strings["network"] = "réseau";
-App::$strings["RSS"] = "RSS";
 App::$strings["Privacy group created."] = "Groupe d'accès créé.";
 App::$strings["Could not create privacy group."] = "Impossible de créer le groupe d'accès.";
 App::$strings["Privacy group not found."] = "Groupe d'accès introuvable.";
@@ -331,16 +381,33 @@ App::$strings["Privacy group editor"] = "Editeur de groupe d'accès.";
 App::$strings["Members"] = "Membres";
 App::$strings["All Connected Channels"] = "Tous les canaux connectés";
 App::$strings["Click on a channel to add or remove."] = "Cliquer sur un canal pour l'ajouter ou le supprimer";
-App::$strings["Share content from Firefox to \$Projectname"] = "Partager du contenu depuis Firefox avec \$Projectname";
-App::$strings["Activate the Firefox \$Projectname provider"] = "Activer le connecteur \$Projectname pour Firefox";
-App::$strings["Authorize application connection"] = "Autoriser l'application à se connecter";
-App::$strings["Return to your app and insert this Securty Code:"] = "Merci de retourner vers votre application, et d'y insérer ce Code de Sécurité&nbsp;:";
-App::$strings["Please login to continue."] = "Merci de vous identifier pour continuer.";
-App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Voulez-vous autoriser cette application à accéder à vos publications et contacts, et/ou à publier en votre nom?";
+App::$strings["App installed."] = "Application installée.";
+App::$strings["Malformed app."] = "Erreur de l'application - Malformée.";
+App::$strings["Embed code"] = "Imbriquer le code";
+App::$strings["Edit App"] = "Modifier l'application";
+App::$strings["Create App"] = "Créer une application";
+App::$strings["Name of app"] = "Nom de l'application";
+App::$strings["Location (URL) of app"] = "Emplacement (URL) de l'application";
+App::$strings["Photo icon URL"] = "URL de l'icône à utiliser pour cette photo";
+App::$strings["80 x 80 pixels - optional"] = "80 x 80 pixels - facultatif";
+App::$strings["Categories (optional, comma separated list)"] = "";
+App::$strings["Version ID"] = "Identifiant de version";
+App::$strings["Price of app"] = "Prix de l'application";
+App::$strings["Location (URL) to purchase app"] = "Emplacement (URL) pour l'achat de l'application";
 App::$strings["Documentation Search"] = "Chercher dans la documentation";
 App::$strings["Help:"] = "Aide&nbsp;:";
 App::$strings["Help"] = "Aide";
 App::$strings["\$Projectname Documentation"] = "Documentation \$Projectname";
+App::$strings["Item not available."] = "Élément indisponible.";
+App::$strings["Layout updated."] = "Mise en page mise à jour.";
+App::$strings["Edit System Page Description"] = "Modifier la description de la page du système";
+App::$strings["Layout not found."] = "Mise en page introuvable.";
+App::$strings["Module Name:"] = "Nom du module&nbsp;:";
+App::$strings["Layout Help"] = "Aide à la mise en page";
+App::$strings["Share content from Firefox to \$Projectname"] = "Partager du contenu depuis Firefox avec \$Projectname";
+App::$strings["Activate the Firefox \$Projectname provider"] = "Activer le connecteur \$Projectname pour Firefox";
+App::$strings["network"] = "réseau";
+App::$strings["RSS"] = "RSS";
 App::$strings["Permission Denied."] = "Permission refusée.";
 App::$strings["File not found."] = "Fichier introuvable.";
 App::$strings["Edit file permissions"] = "Modifier les autorisations d'accès au fichier";
@@ -352,70 +419,13 @@ App::$strings["Copy/paste this URL to link file from a web page"] = "Copiez/coll
 App::$strings["Share this file"] = "Partager ce fichier";
 App::$strings["Show URL to this file"] = "Montrer l'URL de ce fichier";
 App::$strings["Notify your contacts about this file"] = "Notifier vos contacts à propos de ce fichier";
-App::$strings["Apps"] = "Applications";
-App::$strings["Item not available."] = "Élément indisponible.";
-App::$strings["Your service plan only allows %d channels."] = "Votre forfait n'autorise que %d canaux.";
-App::$strings["Nothing to import."] = "Rien à importer.";
-App::$strings["Unable to download data from old server"] = "Impossible de récupérer les données de l'ancien serveur";
-App::$strings["Imported file is empty."] = "Le fichier importé est vide.";
-App::$strings["Warning: Database versions differ by %1\$d updates."] = "Attention&nbsp;: les versions de bases de données diffèrent de %1\$d mises à jour.";
-App::$strings["Cloned channel not found. Import failed."] = "Canal cloné non trouvé. Echec de l'import.";
-App::$strings["No channel. Import failed."] = "Pas de canal. Echec de l'import.";
-App::$strings["Import completed."] = "L'import est terminé.";
-App::$strings["You must be logged in to use this feature."] = "Vous devez vous connecter pour utiliser cette fonctionnalité.";
-App::$strings["Import Channel"] = "Importation de canal";
-App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Utilisez ce formulaire pour importer un canal existant sur un autre serveur. Vous pouvez récupérer l'identité du canal sur l'ancien serveur directement par le réseau, ou bien fournir un fichier d'export/import.";
-App::$strings["File to Upload"] = "Fichier à envoyer";
-App::$strings["Or provide the old server/hub details"] = "Ou fournissez les détails de l'ancien serveur/hub";
-App::$strings["Your old identity address (xyz@example.com)"] = "Votre ancienne identité (zyx@exemple.com)";
-App::$strings["Your old login email address"] = "Votre ancienne adresse de courriel";
-App::$strings["Your old login password"] = "Votre ancien mot de passe";
-App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Quelle que soit l'option choisie, merci de décider si ce hub sera votre nouvelle adresse primaire, ou si votre ancien hub continuera à jouer ce rôle. Vous pourrez publier depuis l'emplacement de votre choix, mais une seule peut être déclarée comme stockage primaire de vos fichiers/photos/media.";
-App::$strings["Make this hub my primary location"] = "Faire de ce hub mon emplacement primaire";
-App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importer les publications existantes si possible (expérimental - limité par la mémoire disponible)";
-App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Ce processus peut prendre plusieurs minutes. Merci de ne valider le formulaire qu'une seule fois et de laisser cette page ouverte jusqu'à la fin.";
-App::$strings["Unable to locate original post."] = "Impossible de localiser la publication initiale.";
-App::$strings["Empty post discarded."] = "Publication vide annulée.";
-App::$strings["Executable content type not permitted to this channel."] = "Les contenus de type 'exécutable' ne sont pas autorisés sur ce canal.";
-App::$strings["Duplicate post suppressed."] = "Publication en doublon supprimée.";
-App::$strings["System error. Post not saved."] = "Erreur système. Publication non sauvegardée.";
-App::$strings["Unable to obtain post information from database."] = "Impossible d'obtenir les informations de publication depuis la base de données.";
-App::$strings["You have reached your limit of %1$.0f top level posts."] = "Vous avez atteint votre limite de %1$.0f contributions \"racines\".";
-App::$strings["You have reached your limit of %1$.0f webpages."] = "Vous avez atteint votre limite de %1$.0f pages web.";
 App::$strings["Layouts"] = "Mises-en-page";
 App::$strings["Comanche page description language help"] = "Aide sur le langage de description de page Comanche";
 App::$strings["Layout Description"] = "Description de la mise en page";
+App::$strings["Created"] = "Créé(e)";
+App::$strings["Edited"] = "Modifié(e)";
+App::$strings["Share"] = "Partager";
 App::$strings["Download PDL file"] = "Télécharger le fichier PDL";
-App::$strings["\$Projectname"] = "\$Projectname";
-App::$strings["Welcome to %s"] = "Bienvenue sur %s";
-App::$strings["First Name"] = "Prénom";
-App::$strings["Last Name"] = "Nom de famille";
-App::$strings["Nickname"] = "Surnom";
-App::$strings["Full Name"] = "Nom complet";
-App::$strings["Email"] = "Courriel";
-App::$strings["Profile Photo"] = "Photo du Profil";
-App::$strings["Profile Photo 16px"] = "Photo de profil 16px";
-App::$strings["Profile Photo 32px"] = "Photo de profil 32px";
-App::$strings["Profile Photo 48px"] = "Photo de profil 48px";
-App::$strings["Profile Photo 64px"] = "Photo de profil 64px";
-App::$strings["Profile Photo 80px"] = "Photo de profil 80px";
-App::$strings["Profile Photo 128px"] = "Photo de profil 128px";
-App::$strings["Timezone"] = "Fuseau horaire";
-App::$strings["Homepage URL"] = "URL de mon site Internet&nbsp;:";
-App::$strings["Language"] = "Langue";
-App::$strings["Birth Year"] = "Année de naissance";
-App::$strings["Birth Month"] = "Mois de naissance";
-App::$strings["Birth Day"] = "Jour de naissance";
-App::$strings["Birthdate"] = "Date de naissance";
-App::$strings["Gender"] = "Sexe";
-App::$strings["Male"] = "Homme";
-App::$strings["Female"] = "Femme";
-App::$strings["webpage"] = "pages web";
-App::$strings["block"] = "bloquer";
-App::$strings["layout"] = "mise en page";
-App::$strings["menu"] = "menu";
-App::$strings["%s element installed"] = "Elément %s installé";
-App::$strings["%s element installation failed"] = "L'installation de l'élément %s a échoué";
 App::$strings["Like/Dislike"] = "Aime/n'aime pas";
 App::$strings["This action is restricted to members."] = "Cette action est réservée aux membres.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "S'il vous plait, <a href=\"rmagic\">identifiez vous avec votre identifant de \$Projectname </a> ou <a href=\"register\">inscrivez vous comme nouveau membre de \$Projectname </a> pour continuer.";
@@ -436,175 +446,103 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s ne participe pas
 App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s participe peut-être à %3\$s de %2\$s";
 App::$strings["Action completed."] = "Action terminée.";
 App::$strings["Thank you."] = "Merci.";
-App::$strings["Import completed"] = "L'import est terminé.";
-App::$strings["Import Items"] = "Importer";
-App::$strings["Use this form to import existing posts and content from an export file."] = "Utiliser ce formulaire pour importer des publications et du contenu existant d'un fichier d'export.";
-App::$strings["Total invitation limit exceeded."] = "Limite du nombre total d'invitation dépassée.";
-App::$strings["%s : Not a valid email address."] = "%s&nbsp;: adresse courriel invalide.";
-App::$strings["Please join us on \$Projectname"] = "Rejoignez-nous sur \$Projectname";
-App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Limite d'invitations dépassée. Merci de contacter l'administration de votre site.";
-App::$strings["%s : Message delivery failed."] = "%s&nbsp;: Échec de distribution du message.";
-App::$strings["%d message sent."] = array(
-	0 => "%d message envoyé.",
-	1 => "%d messages envoyés.",
-);
-App::$strings["You have no more invitations available"] = "Vous ne disposez plus d'aucune invitation";
-App::$strings["Send invitations"] = "Envoyer des invitations";
-App::$strings["Enter email addresses, one per line:"] = "Entrez les adresses de courriel, une par ligne&nbsp;:";
-App::$strings["Your message:"] = "Votre message&nbsp;:";
-App::$strings["Please join my community on \$Projectname."] = "Rejoignez ma communauté sur \$Projectname.";
-App::$strings["You will need to supply this invitation code:"] = "Vous devrez fournir le code suivant&nbsp;:";
-App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Enregistrez-vous sur n'importe quel serveur \$Projectname (ils sont tous inter-connectés)";
-App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Saisissez l'adresse de mon canal \$Projectname dans la barre de recherche du site.";
-App::$strings["or visit"] = "ou rendez-vous sur";
-App::$strings["3. Click [Connect]"] = "3. Cliquez sur [Ajouter]";
-App::$strings["Remote privacy information not available."] = "Les informations distantes de confidentialité ne sont pas disponibles.";
-App::$strings["Visible to:"] = "Visible par&nbsp;:";
-App::$strings["Location not found."] = "Emplacement introuvable.";
-App::$strings["Location lookup failed."] = "Echec de la recherche de l'emplacement.";
-App::$strings["Please select another location to become primary before removing the primary location."] = "Merci de sélectionner un autre emplacement comme nouvel emplacement primaire avant de supprimer l'emplacement primaire actuel.";
-App::$strings["Syncing locations"] = "Synchronisation des emplacements";
-App::$strings["No locations found."] = "Emplacement(s) introuvable.";
-App::$strings["Manage Channel Locations"] = "Gérer les emplacements des canaux";
+App::$strings["Profile not found."] = "Profil introuvable.";
+App::$strings["Profile deleted."] = "Profil supprimé.";
+App::$strings["Profile-"] = "Profil-";
+App::$strings["New profile created."] = "Nouveau profil créé.";
+App::$strings["Profile unavailable to clone."] = "Profil impossible à cloner.";
+App::$strings["Profile unavailable to export."] = "Impossible d'exporter le profil.";
+App::$strings["Profile Name is required."] = "Le nom du profil est obligatoire.";
+App::$strings["Marital Status"] = "Statut marital";
+App::$strings["Romantic Partner"] = "Partenaire amoureux";
+App::$strings["Likes"] = "Aime";
+App::$strings["Dislikes"] = "N'aime pas";
+App::$strings["Work/Employment"] = "Travail/Occupation";
+App::$strings["Religion"] = "Religion/Croyance";
+App::$strings["Political Views"] = "Opinions politiques";
+App::$strings["Sexual Preference"] = "Préférences sexuelle";
+App::$strings["Homepage"] = "Site Internet";
+App::$strings["Interests"] = "Centres d'intérêt";
 App::$strings["Address"] = "Adresse";
-App::$strings["Primary"] = "";
-App::$strings["Drop"] = "Supprimer";
-App::$strings["Sync Now"] = "";
-App::$strings["Please wait several minutes between consecutive operations."] = "Merci d'attendre plusieurs minutes entre opérations successives.";
-App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Quand c'est possible, abandonnez un emplacement en vous connectant sur le site/hub et en supprimant votre canal.";
-App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Utilisez ce formulaire pour abandonner l'emplacement si le hub n'est plus actif.";
-App::$strings["Hub not found."] = "Hub introuvable.";
-App::$strings["Unable to lookup recipient."] = "Impossible de localiser le destinataire.";
-App::$strings["Unable to communicate with requested channel."] = "Impossible de communiquer avec le canal demandé.";
-App::$strings["Cannot verify requested channel."] = "Impossible de vérifier le canal demandé.";
-App::$strings["Selected channel has private message restrictions. Send failed."] = "Le canal choisi a des restrictions quant aux messages privés. L'envoi a échoué.";
-App::$strings["Messages"] = "Messages";
-App::$strings["Message recalled."] = "Message rappelé.";
-App::$strings["Conversation removed."] = "Conversation supprimée.";
-App::$strings["Expires YYYY-MM-DD HH:MM"] = "Expire le YYYY-MM-DD à HH:MM";
-App::$strings["Requested channel is not in this network"] = "Le canal demandé n'est pas sur ce réseau";
-App::$strings["Send Private Message"] = "Envoyer un message privé";
-App::$strings["To:"] = "À&nbsp;:";
-App::$strings["Subject:"] = "Objet&nbsp;:";
-App::$strings["Attach file"] = "Joindre un fichier";
-App::$strings["Send"] = "Envoyer";
-App::$strings["Set expiration date"] = "Définir la date d'expiration";
-App::$strings["Delete message"] = "Supprimer le message";
-App::$strings["Delivery report"] = "Rapport de distribution";
-App::$strings["Recall message"] = "Rappeler le message";
-App::$strings["Message has been recalled."] = "Le message a été rappelé.";
-App::$strings["Delete Conversation"] = "Supprimer la conversation";
-App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Aucune communication sécurisée n'est possible. Vous pourrez <strong>peut-être</strong> répondre depuis la page de profil de l'émetteur.";
-App::$strings["Send Reply"] = "Envoyer la réponse";
-App::$strings["Your message for %s (%s):"] = "Votre message pour %s (%s)&nbsp;:";
-App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Vous avez créé %1$.0f des %2$.0f canaux autorisés.";
-App::$strings["Create a new channel"] = "Créer un nouveau canal";
-App::$strings["Channel Manager"] = "Gérer les canaux";
-App::$strings["Current Channel"] = "Canal actif";
-App::$strings["Switch to one of your channels by selecting it."] = "Pour changer de canal, sélectionnez-en un";
-App::$strings["Default Channel"] = "Canal par défaut";
-App::$strings["Make Default"] = "Définir comme défaut";
-App::$strings["%d new messages"] = "%d nouveaux messages";
-App::$strings["%d new introductions"] = "%d nouvelles présentations";
-App::$strings["Delegated Channel"] = "";
-App::$strings["No valid account found."] = "Aucun compte valide trouvé.";
-App::$strings["Password reset request issued. Check your email."] = "Demande de réinitialisation du mot de passe envoyée. Vérifiez vos courriels.";
-App::$strings["Site Member (%s)"] = "Membre du site (%s)";
-App::$strings["Password reset requested at %s"] = "Demande de réinitialisation du mot de passe sur %s";
-App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La demande n'a pas pu être vérifiée. (Peut-être l'avez vous déjà utilisée.) La réinitialisation a échoué.";
-App::$strings["Password Reset"] = "Réinitialiser le mot de passe";
-App::$strings["Your password has been reset as requested."] = "Votre mot de passe a bien été réinitialisé.";
-App::$strings["Your new password is"] = "Votre nouveau mot de passe est";
-App::$strings["Save or copy your new password - and then"] = "Enregistrez ou copiez votre nouveau mot de passe, puis";
-App::$strings["click here to login"] = "cliquez ici pour vous connecter";
-App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Votre mot de passe peut être changé depuis la page des <em>Paramètres</em> une fois connecté.";
-App::$strings["Your password has changed at %s"] = "Votre mot de passe de %s a été changé";
-App::$strings["Forgot your Password?"] = "Mot de passe oublié&nbsp;?";
-App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Saisissez votre adresse de courriel, et validez, pour réinitialiser votre mot de passe. Vérifiez ensuite votre boîte aux lettres pour la suite des instructions.";
-App::$strings["Email Address"] = "Adresse de courriel";
-App::$strings["Reset"] = "Réinitialiser";
-App::$strings["Unable to update menu."] = "Impossible de mettre le menu à jour.";
-App::$strings["Unable to create menu."] = "Impossible de créer le menu.";
-App::$strings["Menu Name"] = "Nom du menu";
-App::$strings["Unique name (not visible on webpage) - required"] = "Nom unique (non visible sur la page web) - requis";
-App::$strings["Menu Title"] = "Titre du menu";
-App::$strings["Visible on webpage - leave empty for no title"] = "Visible pour la page web - laisser vide pour qu'il n'y ait pas de titre";
-App::$strings["Allow Bookmarks"] = "Autoriser l'usage de favoris";
-App::$strings["Menu may be used to store saved bookmarks"] = "Le menu pourra être utilisé pour stocker des favoris";
-App::$strings["Submit and proceed"] = "Valider et continuer";
-App::$strings["Menus"] = "Menus";
-App::$strings["Bookmarks allowed"] = "Favoris autorisés";
-App::$strings["Delete this menu"] = "Supprimer ce menu";
-App::$strings["Edit menu contents"] = "Modifier le contenu du menu";
-App::$strings["Edit this menu"] = "Modifier ce menu";
-App::$strings["Menu could not be deleted."] = "Impossible de supprimer le menu.";
-App::$strings["Menu not found."] = "Menu introuvable.";
-App::$strings["Edit Menu"] = "Modifier le menu";
-App::$strings["Add or remove entries to this menu"] = "Ajouter/supprimer des entrées à ce menu";
-App::$strings["Menu name"] = "Nom du menu";
-App::$strings["Must be unique, only seen by you"] = "Doit être unique, ne sera vu que par vous";
-App::$strings["Menu title"] = "Titre du menu";
-App::$strings["Menu title as seen by others"] = "Titre du menu tel que vu par les visiteurs";
-App::$strings["Allow bookmarks"] = "Autoriser l'usage de favoris";
-App::$strings["Not found."] = "Introuvable.";
-App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s est %2\$s";
-App::$strings["Mood"] = "Humeur";
-App::$strings["Set your current mood and tell your friends"] = "Indiquez votre humeur du moment à vos amis";
-App::$strings["Profile Match"] = "Profils similaires";
-App::$strings["No keywords to match. Please add keywords to your default profile."] = "Aucun mot-clef à comparer. Merci d'ajouter des mots-clefs à votre profil par défaut.";
-App::$strings["is interested in:"] = "s'intéresse à&nbsp;:";
-App::$strings["No matches"] = "Pas de correspondance";
-App::$strings["No such group"] = "Groupe introuvable";
-App::$strings["No such channel"] = "Canal introuvable";
-App::$strings["forum"] = "forum";
-App::$strings["Search Results For:"] = "Résultats de recherche pour&nbsp;:";
-App::$strings["Privacy group is empty"] = "Groupe d'accès vide";
-App::$strings["Privacy group: "] = "Groupe d'accès&nbsp;:";
-App::$strings["Invalid connection."] = "Contact non valide.";
-App::$strings["No more system notifications."] = "Pas d'autre notification du système.";
-App::$strings["System Notifications"] = "Notifications du système";
-App::$strings["Unable to create element."] = "Impossible de créer l'entrée.";
-App::$strings["Unable to update menu element."] = "Impossible de mettre à jour l'entrée de menu.";
-App::$strings["Unable to add menu element."] = "Impossible d'ajouter l'entrée de menu.";
-App::$strings["Menu Item Permissions"] = "Permissions de l'entrée de menu";
-App::$strings["(click to open/close)"] = "(cliquer pour ouvrir/fermer)";
-App::$strings["Link Name"] = "Nom du lien";
-App::$strings["Link or Submenu Target"] = "Lien ou sous-menu cible";
-App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Entrez l'URL du lien ou sélectionnez un nom de menu pour créer un sous-menu";
-App::$strings["Use magic-auth if available"] = "Utiliser l'authentification distante, quand disponible";
-App::$strings["Open link in new window"] = "Ouvrir le lien dans une nouvelle fenêtre";
-App::$strings["Order in list"] = "Ordre dans la liste";
-App::$strings["Higher numbers will sink to bottom of listing"] = "Les nombres les plus élevés seront au bas de la liste";
-App::$strings["Submit and finish"] = "Vadiler et terminer";
-App::$strings["Submit and continue"] = "Valider et continuer";
-App::$strings["Menu:"] = "Menu&nbsp;:";
-App::$strings["Link Target"] = "Cible du lien";
-App::$strings["Edit menu"] = "Modifier le menu";
-App::$strings["Edit element"] = "Modifier l'entrée";
-App::$strings["Drop element"] = "Supprimer l'entrée";
-App::$strings["New element"] = "Nouvelle entrée";
-App::$strings["Edit this menu container"] = "Éditer ce bloc de menu";
-App::$strings["Add menu element"] = "Ajouter une entrée au menu";
-App::$strings["Delete this menu item"] = "Supprimer cette entrée du menu";
-App::$strings["Edit this menu item"] = "Modifier cette entrée du menu";
-App::$strings["Menu item not found."] = "Entrée de menu introuvable.";
-App::$strings["Menu item deleted."] = "Entrée de menu supprimée.";
-App::$strings["Menu item could not be deleted."] = "Impossible de supprimer l'entrée de menu.";
-App::$strings["Edit Menu Element"] = "Modifier l'entrée de menu";
-App::$strings["Link text"] = "Texte du lien";
-App::$strings["Name or caption"] = "Nom ou libellé";
-App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Exemples&nbsp;: \"Jérôme Dutilleul\", \"Louise et ses chevaux\", \"Football\", \"Club d'aéromodélisme\"";
-App::$strings["Choose a short nickname"] = "Choisissez un alias";
-App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Votre pseudo sera utilisé pour créer une adresse de canal facile à mémoriser, par ex. pseudo%s";
-App::$strings["Channel role and privacy"] = "Rôle et confidentialité du canal";
-App::$strings["Select a channel role with your privacy requirements."] = "Sélectionner un rôle de canal adapté à vos besoins de confidentialité.";
-App::$strings["Read more about roles"] = "En savoir plus sur les rôles";
-App::$strings["Create Channel"] = "Créer le canal";
-App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canal est votre identité sur ce réseau. Il peut représenter une personne, un blog, ou un forum par exemple. Les canaux peuvent entrer en contact les uns avec les autres pour partager des informations avec des permissions d'accès très fines.";
-App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "ou <a href=\"import\">importer un canal existant</a> d'un autre serveur.";
-App::$strings["Invalid request identifier."] = "Identifiant de requête invalide.";
-App::$strings["Discard"] = "Annuler";
-App::$strings["Mark all system notifications seen"] = "Marquer toutes les notifications système comme vues";
+App::$strings["Profile updated."] = "Profil mis à jour.";
+App::$strings["Hide your connections list from viewers of this profile"] = "";
+App::$strings["Edit Profile Details"] = "Modifier les détails du profil";
+App::$strings["View this profile"] = "Voir ce profil";
+App::$strings["Edit visibility"] = "Changer la visibilité";
+App::$strings["Profile Tools"] = "";
+App::$strings["Change cover photo"] = "";
+App::$strings["Change profile photo"] = "Changer la photo du profil";
+App::$strings["Create a new profile using these settings"] = "Créer un nouveau profil avec ces paramètres";
+App::$strings["Clone this profile"] = "Cloner ce profil";
+App::$strings["Delete this profile"] = "Supprimer ce profil";
+App::$strings["Add profile things"] = "Ajouter des éléments de profil";
+App::$strings["Personal"] = "Me concernant";
+App::$strings["Relation"] = "";
+App::$strings["Miscellaneous"] = "Divers";
+App::$strings["Import profile from file"] = "Importer le profil à partir d'un fichier";
+App::$strings["Export profile to file"] = "Exporter le profil vers un fichier.";
+App::$strings["Your gender"] = "";
+App::$strings["Marital status"] = "";
+App::$strings["Sexual preference"] = "";
+App::$strings["Profile name"] = "";
+App::$strings["This is your default profile."] = "Ceci est votre profil par défaut.";
+App::$strings["Your full name"] = "";
+App::$strings["Title/Description"] = "Titre/description";
+App::$strings["Street address"] = "";
+App::$strings["Locality/City"] = "Ville";
+App::$strings["Region/State"] = "Région";
+App::$strings["Postal/Zip code"] = "";
+App::$strings["Country"] = "Pays";
+App::$strings["Who (if applicable)"] = "Qui (si applicable)";
+App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exemples&nbsp;: marie123, Marie Deschamps, marie@exemple.com";
+App::$strings["Since (date)"] = "";
+App::$strings["Tell us about yourself"] = "";
+App::$strings["Hometown"] = "Ville de naissance";
+App::$strings["Political views"] = "";
+App::$strings["Religious views"] = "";
+App::$strings["Keywords used in directory listings"] = "";
+App::$strings["Example: fishing photography software"] = "Exemple&nbsp;: escrime photographie modélisme";
+App::$strings["Musical interests"] = "Goûts musicaux";
+App::$strings["Books, literature"] = "Livres, littérature";
+App::$strings["Television"] = "Télévision";
+App::$strings["Film/Dance/Culture/Entertainment"] = "";
+App::$strings["Hobbies/Interests"] = "Loisirs/Centres d'intêret";
+App::$strings["Love/Romance"] = "";
+App::$strings["School/Education"] = "";
+App::$strings["Contact information and social networks"] = "";
+App::$strings["My other channels"] = "Mes autres canaux";
+App::$strings["Profile Image"] = "Image du profil";
+App::$strings["Edit Profiles"] = "Modifier les profils";
+App::$strings["Your service plan only allows %d channels."] = "Votre forfait n'autorise que %d canaux.";
+App::$strings["Nothing to import."] = "Rien à importer.";
+App::$strings["Unable to download data from old server"] = "Impossible de récupérer les données de l'ancien serveur";
+App::$strings["Imported file is empty."] = "Le fichier importé est vide.";
+App::$strings["Warning: Database versions differ by %1\$d updates."] = "Attention&nbsp;: les versions de bases de données diffèrent de %1\$d mises à jour.";
+App::$strings["Cloned channel not found. Import failed."] = "Canal cloné non trouvé. Echec de l'import.";
+App::$strings["No channel. Import failed."] = "Pas de canal. Echec de l'import.";
+App::$strings["Import completed."] = "L'import est terminé.";
+App::$strings["You must be logged in to use this feature."] = "Vous devez vous connecter pour utiliser cette fonctionnalité.";
+App::$strings["Import Channel"] = "Importation de canal";
+App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Utilisez ce formulaire pour importer un canal existant sur un autre serveur. Vous pouvez récupérer l'identité du canal sur l'ancien serveur directement par le réseau, ou bien fournir un fichier d'export/import.";
+App::$strings["File to Upload"] = "Fichier à envoyer";
+App::$strings["Or provide the old server/hub details"] = "Ou fournissez les détails de l'ancien serveur/hub";
+App::$strings["Your old identity address (xyz@example.com)"] = "Votre ancienne identité (zyx@exemple.com)";
+App::$strings["Your old login email address"] = "Votre ancienne adresse de courriel";
+App::$strings["Your old login password"] = "Votre ancien mot de passe";
+App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Quelle que soit l'option choisie, merci de décider si ce hub sera votre nouvelle adresse primaire, ou si votre ancien hub continuera à jouer ce rôle. Vous pourrez publier depuis l'emplacement de votre choix, mais une seule peut être déclarée comme stockage primaire de vos fichiers/photos/media.";
+App::$strings["Make this hub my primary location"] = "Faire de ce hub mon emplacement primaire";
+App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importer les publications existantes si possible (expérimental - limité par la mémoire disponible)";
+App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Ce processus peut prendre plusieurs minutes. Merci de ne valider le formulaire qu'une seule fois et de laisser cette page ouverte jusqu'à la fin.";
+App::$strings["\$Projectname"] = "\$Projectname";
+App::$strings["Welcome to %s"] = "Bienvenue sur %s";
+App::$strings["Unable to locate original post."] = "Impossible de localiser la publication initiale.";
+App::$strings["Empty post discarded."] = "Publication vide annulée.";
+App::$strings["Executable content type not permitted to this channel."] = "Les contenus de type 'exécutable' ne sont pas autorisés sur ce canal.";
+App::$strings["Duplicate post suppressed."] = "Publication en doublon supprimée.";
+App::$strings["System error. Post not saved."] = "Erreur système. Publication non sauvegardée.";
+App::$strings["Unable to obtain post information from database."] = "Impossible d'obtenir les informations de publication depuis la base de données.";
+App::$strings["You have reached your limit of %1$.0f top level posts."] = "Vous avez atteint votre limite de %1$.0f contributions \"racines\".";
+App::$strings["You have reached your limit of %1$.0f webpages."] = "Vous avez atteint votre limite de %1$.0f pages web.";
 App::$strings["Page owner information could not be retrieved."] = "Impossible d'obtenir des informations sur le propriétaire de la page.";
 App::$strings["Profile Photos"] = "Photos du profil";
 App::$strings["Album not found."] = "Album introuvable.";
@@ -673,122 +611,164 @@ App::$strings["__ctx:noun__ Dislikes"] = "N'aime pas";
 App::$strings["Close"] = "Fermer";
 App::$strings["View Album"] = "Voir l'album";
 App::$strings["Recent Photos"] = "Photos récentes";
-App::$strings["sent you a private message"] = "vous a envoyé un message privé";
-App::$strings["added your channel"] = "a ajouté votre canal";
-App::$strings["g A l F d"] = "g A l F d";
-App::$strings["[today]"] = "[aujourd'hui]";
-App::$strings["posted an event"] = "a publié un événement";
-App::$strings["Unable to find your hub."] = "Impossible de trouver votre hub.";
-App::$strings["Post successful."] = "Publication réussie.";
-App::$strings["OpenID protocol error. No ID returned."] = "Erreur du protocole OpenID. Pas d'ID retourné.";
-App::$strings["Login failed."] = "Échec de la connexion.";
-App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-App::$strings["This setting requires special processing and editing has been blocked."] = "Ce paramètre nécessité un traitement spécial, les modifications ont été bloquées.";
-App::$strings["Configuration Editor"] = "Editeur de configuration";
-App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Attention&nbsp;:modifier certains paramètres peut rendre votre canal inutilisable. Merci d'ignorer cette page à moins d'être suffisamment à l'aise de savoir comment utiliser correctement cette fonctionnalité.";
-App::$strings["Layout updated."] = "Mise en page mise à jour.";
-App::$strings["Edit System Page Description"] = "Modifier la description de la page du système";
-App::$strings["Layout not found."] = "Mise en page introuvable.";
-App::$strings["Module Name:"] = "Nom du module&nbsp;:";
-App::$strings["Layout Help"] = "Aide à la mise en page";
-App::$strings["Poke"] = "Tapoter";
-App::$strings["Poke somebody"] = "Taquiner quelqu'un";
-App::$strings["Poke/Prod"] = "Tapoter/Encourager";
-App::$strings["Poke, prod or do other things to somebody"] = "Taquiner, pousser ou faire autre chose à quelqu'un";
-App::$strings["Recipient"] = "Destinataire";
-App::$strings["Choose what you wish to do to recipient"] = "Choisir ce que vous voulez faire au destinataire";
-App::$strings["Make this post private"] = "Rendre cette publication privée";
-App::$strings["Fetching URL returns error: %1\$s"] = "Récupération d'URL échouée&nbsp;: %1\$s";
-App::$strings["Profile not found."] = "Profil introuvable.";
-App::$strings["Profile deleted."] = "Profil supprimé.";
-App::$strings["Profile-"] = "Profil-";
-App::$strings["New profile created."] = "Nouveau profil créé.";
-App::$strings["Profile unavailable to clone."] = "Profil impossible à cloner.";
-App::$strings["Profile unavailable to export."] = "Impossible d'exporter le profil.";
-App::$strings["Profile Name is required."] = "Le nom du profil est obligatoire.";
-App::$strings["Marital Status"] = "Statut marital";
-App::$strings["Romantic Partner"] = "Partenaire amoureux";
-App::$strings["Likes"] = "Aime";
-App::$strings["Dislikes"] = "N'aime pas";
-App::$strings["Work/Employment"] = "Travail/Occupation";
-App::$strings["Religion"] = "Religion/Croyance";
-App::$strings["Political Views"] = "Opinions politiques";
-App::$strings["Sexual Preference"] = "Préférences sexuelle";
-App::$strings["Homepage"] = "Site Internet";
-App::$strings["Interests"] = "Centres d'intérêt";
-App::$strings["Profile updated."] = "Profil mis à jour.";
-App::$strings["Hide your connections list from viewers of this profile"] = "";
-App::$strings["Edit Profile Details"] = "Modifier les détails du profil";
-App::$strings["View this profile"] = "Voir ce profil";
-App::$strings["Edit visibility"] = "Changer la visibilité";
-App::$strings["Profile Tools"] = "";
-App::$strings["Change cover photo"] = "";
-App::$strings["Change profile photo"] = "Changer la photo du profil";
-App::$strings["Create a new profile using these settings"] = "Créer un nouveau profil avec ces paramètres";
-App::$strings["Clone this profile"] = "Cloner ce profil";
-App::$strings["Delete this profile"] = "Supprimer ce profil";
-App::$strings["Add profile things"] = "Ajouter des éléments de profil";
-App::$strings["Personal"] = "Me concernant";
-App::$strings["Relation"] = "";
-App::$strings["Miscellaneous"] = "Divers";
-App::$strings["Import profile from file"] = "Importer le profil à partir d'un fichier";
-App::$strings["Export profile to file"] = "Exporter le profil vers un fichier.";
-App::$strings["Your gender"] = "";
-App::$strings["Marital status"] = "";
-App::$strings["Sexual preference"] = "";
-App::$strings["Profile name"] = "";
-App::$strings["This is your default profile."] = "Ceci est votre profil par défaut.";
-App::$strings["Your full name"] = "";
-App::$strings["Title/Description"] = "Titre/description";
-App::$strings["Street address"] = "";
-App::$strings["Locality/City"] = "Ville";
-App::$strings["Region/State"] = "Région";
-App::$strings["Postal/Zip code"] = "";
-App::$strings["Country"] = "Pays";
-App::$strings["Who (if applicable)"] = "Qui (si applicable)";
-App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Exemples&nbsp;: marie123, Marie Deschamps, marie@exemple.com";
-App::$strings["Since (date)"] = "";
-App::$strings["Tell us about yourself"] = "";
-App::$strings["Hometown"] = "Ville de naissance";
-App::$strings["Political views"] = "";
-App::$strings["Religious views"] = "";
-App::$strings["Keywords used in directory listings"] = "";
-App::$strings["Example: fishing photography software"] = "Exemple&nbsp;: escrime photographie modélisme";
-App::$strings["Musical interests"] = "Goûts musicaux";
-App::$strings["Books, literature"] = "Livres, littérature";
-App::$strings["Television"] = "Télévision";
-App::$strings["Film/Dance/Culture/Entertainment"] = "";
-App::$strings["Hobbies/Interests"] = "Loisirs/Centres d'intêret";
-App::$strings["Love/Romance"] = "";
-App::$strings["School/Education"] = "";
-App::$strings["Contact information and social networks"] = "";
-App::$strings["My other channels"] = "Mes autres canaux";
-App::$strings["Profile Image"] = "Image du profil";
-App::$strings["Edit Profiles"] = "Modifier les profils";
-App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Shift-rechargez votre page, ou videz le cache du navigateur si la photo ne s'affiche pas immédiatement.";
-App::$strings["Upload Profile Photo"] = "Téléverser une photo de profil";
-App::$strings["Invalid profile identifier."] = "Identifiant de profil invalide.";
-App::$strings["Profile Visibility Editor"] = "Éditeur de visibilité de profil";
-App::$strings["Profile"] = "Profil";
-App::$strings["Click on a contact to add or remove."] = "Cliquer sur un contact pour l'ajouter ou le retirer.";
-App::$strings["Visible To"] = "Visible par";
-App::$strings["Public Hubs"] = "Instances publiques";
-App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Les sites listés permettent l'enregistrement public de comptes pour le réseau \$Projectname. Tous les sites du réseau sont reliés entre eux, être membre d'un site revient à être membre de tous. Certains sites peuvent demander une souscription ou proposer différents niveaux de service. Chaque site <strong>peut</strong> fournir des détails supplémentaires.";
-App::$strings["Hub URL"] = "URL du site";
-App::$strings["Access Type"] = "Type d'accès";
-App::$strings["Registration Policy"] = "Politique d'inscription";
-App::$strings["Stats"] = "";
-App::$strings["Software"] = "";
-App::$strings["Ratings"] = "Evaluations";
-App::$strings["Rate"] = "Evaluer";
-App::$strings["Website:"] = "Site web&nbsp;:";
-App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Canal distant [%s] (encore inconnu sur ce site)";
-App::$strings["Rating (this information is public)"] = "Evaluation (cette information est publique)";
-App::$strings["Optionally explain your rating (this information is public)"] = "Explication facultative de votre évaluation (cette information est publique)";
-App::$strings["No ratings"] = "Pas de note";
-App::$strings["Rating: "] = "Evaluation&nbsp:";
-App::$strings["Website: "] = "Site web&nbsp;:";
-App::$strings["Description: "] = "Description&nbsp;:";
+App::$strings["Remote privacy information not available."] = "Les informations distantes de confidentialité ne sont pas disponibles.";
+App::$strings["Visible to:"] = "Visible par&nbsp;:";
+App::$strings["Import completed"] = "L'import est terminé.";
+App::$strings["Import Items"] = "Importer";
+App::$strings["Use this form to import existing posts and content from an export file."] = "Utiliser ce formulaire pour importer des publications et du contenu existant d'un fichier d'export.";
+App::$strings["Total invitation limit exceeded."] = "Limite du nombre total d'invitation dépassée.";
+App::$strings["%s : Not a valid email address."] = "%s&nbsp;: adresse courriel invalide.";
+App::$strings["Please join us on \$Projectname"] = "Rejoignez-nous sur \$Projectname";
+App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Limite d'invitations dépassée. Merci de contacter l'administration de votre site.";
+App::$strings["%s : Message delivery failed."] = "%s&nbsp;: Échec de distribution du message.";
+App::$strings["%d message sent."] = array(
+	0 => "%d message envoyé.",
+	1 => "%d messages envoyés.",
+);
+App::$strings["You have no more invitations available"] = "Vous ne disposez plus d'aucune invitation";
+App::$strings["Send invitations"] = "Envoyer des invitations";
+App::$strings["Enter email addresses, one per line:"] = "Entrez les adresses de courriel, une par ligne&nbsp;:";
+App::$strings["Your message:"] = "Votre message&nbsp;:";
+App::$strings["Please join my community on \$Projectname."] = "Rejoignez ma communauté sur \$Projectname.";
+App::$strings["You will need to supply this invitation code:"] = "Vous devrez fournir le code suivant&nbsp;:";
+App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Enregistrez-vous sur n'importe quel serveur \$Projectname (ils sont tous inter-connectés)";
+App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Saisissez l'adresse de mon canal \$Projectname dans la barre de recherche du site.";
+App::$strings["or visit"] = "ou rendez-vous sur";
+App::$strings["3. Click [Connect]"] = "3. Cliquez sur [Ajouter]";
+App::$strings["Location not found."] = "Emplacement introuvable.";
+App::$strings["Location lookup failed."] = "Echec de la recherche de l'emplacement.";
+App::$strings["Please select another location to become primary before removing the primary location."] = "Merci de sélectionner un autre emplacement comme nouvel emplacement primaire avant de supprimer l'emplacement primaire actuel.";
+App::$strings["Syncing locations"] = "Synchronisation des emplacements";
+App::$strings["No locations found."] = "Emplacement(s) introuvable.";
+App::$strings["Manage Channel Locations"] = "Gérer les emplacements des canaux";
+App::$strings["Primary"] = "";
+App::$strings["Drop"] = "Supprimer";
+App::$strings["Sync Now"] = "";
+App::$strings["Please wait several minutes between consecutive operations."] = "Merci d'attendre plusieurs minutes entre opérations successives.";
+App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Quand c'est possible, abandonnez un emplacement en vous connectant sur le site/hub et en supprimant votre canal.";
+App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Utilisez ce formulaire pour abandonner l'emplacement si le hub n'est plus actif.";
+App::$strings["Hub not found."] = "Hub introuvable.";
+App::$strings["Unable to lookup recipient."] = "Impossible de localiser le destinataire.";
+App::$strings["Unable to communicate with requested channel."] = "Impossible de communiquer avec le canal demandé.";
+App::$strings["Cannot verify requested channel."] = "Impossible de vérifier le canal demandé.";
+App::$strings["Selected channel has private message restrictions. Send failed."] = "Le canal choisi a des restrictions quant aux messages privés. L'envoi a échoué.";
+App::$strings["Messages"] = "Messages";
+App::$strings["Message recalled."] = "Message rappelé.";
+App::$strings["Conversation removed."] = "Conversation supprimée.";
+App::$strings["Expires YYYY-MM-DD HH:MM"] = "Expire le YYYY-MM-DD à HH:MM";
+App::$strings["Requested channel is not in this network"] = "Le canal demandé n'est pas sur ce réseau";
+App::$strings["Send Private Message"] = "Envoyer un message privé";
+App::$strings["To:"] = "À&nbsp;:";
+App::$strings["Subject:"] = "Objet&nbsp;:";
+App::$strings["Attach file"] = "Joindre un fichier";
+App::$strings["Send"] = "Envoyer";
+App::$strings["Set expiration date"] = "Définir la date d'expiration";
+App::$strings["Delete message"] = "Supprimer le message";
+App::$strings["Delivery report"] = "Rapport de distribution";
+App::$strings["Recall message"] = "Rappeler le message";
+App::$strings["Message has been recalled."] = "Le message a été rappelé.";
+App::$strings["Delete Conversation"] = "Supprimer la conversation";
+App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Aucune communication sécurisée n'est possible. Vous pourrez <strong>peut-être</strong> répondre depuis la page de profil de l'émetteur.";
+App::$strings["Send Reply"] = "Envoyer la réponse";
+App::$strings["Your message for %s (%s):"] = "Votre message pour %s (%s)&nbsp;:";
+App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Vous avez créé %1$.0f des %2$.0f canaux autorisés.";
+App::$strings["Create a new channel"] = "Créer un nouveau canal";
+App::$strings["Channel Manager"] = "Gérer les canaux";
+App::$strings["Current Channel"] = "Canal actif";
+App::$strings["Switch to one of your channels by selecting it."] = "Pour changer de canal, sélectionnez-en un";
+App::$strings["Default Channel"] = "Canal par défaut";
+App::$strings["Make Default"] = "Définir comme défaut";
+App::$strings["%d new messages"] = "%d nouveaux messages";
+App::$strings["%d new introductions"] = "%d nouvelles présentations";
+App::$strings["Delegated Channel"] = "";
+App::$strings["Unable to update menu."] = "Impossible de mettre le menu à jour.";
+App::$strings["Unable to create menu."] = "Impossible de créer le menu.";
+App::$strings["Menu Name"] = "Nom du menu";
+App::$strings["Unique name (not visible on webpage) - required"] = "Nom unique (non visible sur la page web) - requis";
+App::$strings["Menu Title"] = "Titre du menu";
+App::$strings["Visible on webpage - leave empty for no title"] = "Visible pour la page web - laisser vide pour qu'il n'y ait pas de titre";
+App::$strings["Allow Bookmarks"] = "Autoriser l'usage de favoris";
+App::$strings["Menu may be used to store saved bookmarks"] = "Le menu pourra être utilisé pour stocker des favoris";
+App::$strings["Submit and proceed"] = "Valider et continuer";
+App::$strings["Menus"] = "Menus";
+App::$strings["Bookmarks allowed"] = "Favoris autorisés";
+App::$strings["Delete this menu"] = "Supprimer ce menu";
+App::$strings["Edit menu contents"] = "Modifier le contenu du menu";
+App::$strings["Edit this menu"] = "Modifier ce menu";
+App::$strings["Menu could not be deleted."] = "Impossible de supprimer le menu.";
+App::$strings["Menu not found."] = "Menu introuvable.";
+App::$strings["Edit Menu"] = "Modifier le menu";
+App::$strings["Add or remove entries to this menu"] = "Ajouter/supprimer des entrées à ce menu";
+App::$strings["Menu name"] = "Nom du menu";
+App::$strings["Must be unique, only seen by you"] = "Doit être unique, ne sera vu que par vous";
+App::$strings["Menu title"] = "Titre du menu";
+App::$strings["Menu title as seen by others"] = "Titre du menu tel que vu par les visiteurs";
+App::$strings["Allow bookmarks"] = "Autoriser l'usage de favoris";
+App::$strings["Not found."] = "Introuvable.";
+App::$strings["No valid account found."] = "Aucun compte valide trouvé.";
+App::$strings["Password reset request issued. Check your email."] = "Demande de réinitialisation du mot de passe envoyée. Vérifiez vos courriels.";
+App::$strings["Site Member (%s)"] = "Membre du site (%s)";
+App::$strings["Password reset requested at %s"] = "Demande de réinitialisation du mot de passe sur %s";
+App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La demande n'a pas pu être vérifiée. (Peut-être l'avez vous déjà utilisée.) La réinitialisation a échoué.";
+App::$strings["Password Reset"] = "Réinitialiser le mot de passe";
+App::$strings["Your password has been reset as requested."] = "Votre mot de passe a bien été réinitialisé.";
+App::$strings["Your new password is"] = "Votre nouveau mot de passe est";
+App::$strings["Save or copy your new password - and then"] = "Enregistrez ou copiez votre nouveau mot de passe, puis";
+App::$strings["click here to login"] = "cliquez ici pour vous connecter";
+App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Votre mot de passe peut être changé depuis la page des <em>Paramètres</em> une fois connecté.";
+App::$strings["Your password has changed at %s"] = "Votre mot de passe de %s a été changé";
+App::$strings["Forgot your Password?"] = "Mot de passe oublié&nbsp;?";
+App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Saisissez votre adresse de courriel, et validez, pour réinitialiser votre mot de passe. Vérifiez ensuite votre boîte aux lettres pour la suite des instructions.";
+App::$strings["Email Address"] = "Adresse de courriel";
+App::$strings["Reset"] = "Réinitialiser";
+App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s est %2\$s";
+App::$strings["Mood"] = "Humeur";
+App::$strings["Set your current mood and tell your friends"] = "Indiquez votre humeur du moment à vos amis";
+App::$strings["No such group"] = "Groupe introuvable";
+App::$strings["No such channel"] = "Canal introuvable";
+App::$strings["forum"] = "forum";
+App::$strings["Search Results For:"] = "Résultats de recherche pour&nbsp;:";
+App::$strings["Privacy group is empty"] = "Groupe d'accès vide";
+App::$strings["Privacy group: "] = "Groupe d'accès&nbsp;:";
+App::$strings["Invalid connection."] = "Contact non valide.";
+App::$strings["No more system notifications."] = "Pas d'autre notification du système.";
+App::$strings["System Notifications"] = "Notifications du système";
+App::$strings["Profile Match"] = "Profils similaires";
+App::$strings["No keywords to match. Please add keywords to your default profile."] = "Aucun mot-clef à comparer. Merci d'ajouter des mots-clefs à votre profil par défaut.";
+App::$strings["is interested in:"] = "s'intéresse à&nbsp;:";
+App::$strings["No matches"] = "Pas de correspondance";
+App::$strings["Posts and comments"] = "";
+App::$strings["Only posts"] = "";
+App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Permissions insuffisantes. Demande redirigée vers la page du profil.";
+App::$strings["Unable to create element."] = "Impossible de créer l'entrée.";
+App::$strings["Unable to update menu element."] = "Impossible de mettre à jour l'entrée de menu.";
+App::$strings["Unable to add menu element."] = "Impossible d'ajouter l'entrée de menu.";
+App::$strings["Menu Item Permissions"] = "Permissions de l'entrée de menu";
+App::$strings["(click to open/close)"] = "(cliquer pour ouvrir/fermer)";
+App::$strings["Link Name"] = "Nom du lien";
+App::$strings["Link or Submenu Target"] = "Lien ou sous-menu cible";
+App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Entrez l'URL du lien ou sélectionnez un nom de menu pour créer un sous-menu";
+App::$strings["Use magic-auth if available"] = "Utiliser l'authentification distante, quand disponible";
+App::$strings["Open link in new window"] = "Ouvrir le lien dans une nouvelle fenêtre";
+App::$strings["Order in list"] = "Ordre dans la liste";
+App::$strings["Higher numbers will sink to bottom of listing"] = "Les nombres les plus élevés seront au bas de la liste";
+App::$strings["Submit and finish"] = "Vadiler et terminer";
+App::$strings["Submit and continue"] = "Valider et continuer";
+App::$strings["Menu:"] = "Menu&nbsp;:";
+App::$strings["Link Target"] = "Cible du lien";
+App::$strings["Edit menu"] = "Modifier le menu";
+App::$strings["Edit element"] = "Modifier l'entrée";
+App::$strings["Drop element"] = "Supprimer l'entrée";
+App::$strings["New element"] = "Nouvelle entrée";
+App::$strings["Edit this menu container"] = "Éditer ce bloc de menu";
+App::$strings["Add menu element"] = "Ajouter une entrée au menu";
+App::$strings["Delete this menu item"] = "Supprimer cette entrée du menu";
+App::$strings["Edit this menu item"] = "Modifier cette entrée du menu";
+App::$strings["Menu item not found."] = "Entrée de menu introuvable.";
+App::$strings["Menu item deleted."] = "Entrée de menu supprimée.";
+App::$strings["Menu item could not be deleted."] = "Impossible de supprimer l'entrée de menu.";
+App::$strings["Edit Menu Element"] = "Modifier l'entrée de menu";
+App::$strings["Link text"] = "Texte du lien";
 App::$strings["Theme settings updated."] = "Paramètres du thème mis à jour.";
 App::$strings["# Accounts"] = "# Comptes";
 App::$strings["# blocked accounts"] = "# comptes bloqués";
@@ -1031,19 +1011,91 @@ App::$strings["(In addition to basic fields)"] = "(en plus des champs de base)";
 App::$strings["All available fields"] = "Tous les champs disponibles";
 App::$strings["Custom Fields"] = "Champs personnalisés";
 App::$strings["Create Custom Field"] = "Créer un champ personnalisé";
-App::$strings["App installed."] = "Application installée.";
-App::$strings["Malformed app."] = "Erreur de l'application - Malformée.";
-App::$strings["Embed code"] = "Imbriquer le code";
-App::$strings["Edit App"] = "Modifier l'application";
-App::$strings["Create App"] = "Créer une application";
-App::$strings["Name of app"] = "Nom de l'application";
-App::$strings["Location (URL) of app"] = "Emplacement (URL) de l'application";
-App::$strings["Photo icon URL"] = "URL de l'icône à utiliser pour cette photo";
-App::$strings["80 x 80 pixels - optional"] = "80 x 80 pixels - facultatif";
-App::$strings["Categories (optional, comma separated list)"] = "";
-App::$strings["Version ID"] = "Identifiant de version";
-App::$strings["Price of app"] = "Prix de l'application";
-App::$strings["Location (URL) to purchase app"] = "Emplacement (URL) pour l'achat de l'application";
+App::$strings["Name or caption"] = "Nom ou libellé";
+App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Exemples&nbsp;: \"Jérôme Dutilleul\", \"Louise et ses chevaux\", \"Football\", \"Club d'aéromodélisme\"";
+App::$strings["Choose a short nickname"] = "Choisissez un alias";
+App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Votre pseudo sera utilisé pour créer une adresse de canal facile à mémoriser, par ex. pseudo%s";
+App::$strings["Channel role and privacy"] = "Rôle et confidentialité du canal";
+App::$strings["Select a channel role with your privacy requirements."] = "Sélectionner un rôle de canal adapté à vos besoins de confidentialité.";
+App::$strings["Read more about roles"] = "En savoir plus sur les rôles";
+App::$strings["Create Channel"] = "Créer le canal";
+App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canal est votre identité sur ce réseau. Il peut représenter une personne, un blog, ou un forum par exemple. Les canaux peuvent entrer en contact les uns avec les autres pour partager des informations avec des permissions d'accès très fines.";
+App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "ou <a href=\"import\">importer un canal existant</a> d'un autre serveur.";
+App::$strings["sent you a private message"] = "vous a envoyé un message privé";
+App::$strings["added your channel"] = "a ajouté votre canal";
+App::$strings["g A l F d"] = "g A l F d";
+App::$strings["[today]"] = "[aujourd'hui]";
+App::$strings["posted an event"] = "a publié un événement";
+App::$strings["Invalid request identifier."] = "Identifiant de requête invalide.";
+App::$strings["Discard"] = "Annuler";
+App::$strings["Mark all system notifications seen"] = "Marquer toutes les notifications système comme vues";
+App::$strings["Poke"] = "Tapoter";
+App::$strings["Poke somebody"] = "Taquiner quelqu'un";
+App::$strings["Poke/Prod"] = "Tapoter/Encourager";
+App::$strings["Poke, prod or do other things to somebody"] = "Taquiner, pousser ou faire autre chose à quelqu'un";
+App::$strings["Recipient"] = "Destinataire";
+App::$strings["Choose what you wish to do to recipient"] = "Choisir ce que vous voulez faire au destinataire";
+App::$strings["Make this post private"] = "Rendre cette publication privée";
+App::$strings["Unable to find your hub."] = "Impossible de trouver votre hub.";
+App::$strings["Post successful."] = "Publication réussie.";
+App::$strings["OpenID protocol error. No ID returned."] = "Erreur du protocole OpenID. Pas d'ID retourné.";
+App::$strings["Login failed."] = "Échec de la connexion.";
+App::$strings["Invalid profile identifier."] = "Identifiant de profil invalide.";
+App::$strings["Profile Visibility Editor"] = "Éditeur de visibilité de profil";
+App::$strings["Profile"] = "Profil";
+App::$strings["Click on a contact to add or remove."] = "Cliquer sur un contact pour l'ajouter ou le retirer.";
+App::$strings["Visible To"] = "Visible par";
+App::$strings["This setting requires special processing and editing has been blocked."] = "Ce paramètre nécessité un traitement spécial, les modifications ont été bloquées.";
+App::$strings["Configuration Editor"] = "Editeur de configuration";
+App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Attention&nbsp;:modifier certains paramètres peut rendre votre canal inutilisable. Merci d'ignorer cette page à moins d'être suffisamment à l'aise de savoir comment utiliser correctement cette fonctionnalité.";
+App::$strings["Fetching URL returns error: %1\$s"] = "Récupération d'URL échouée&nbsp;: %1\$s";
+App::$strings["Version %s"] = "Version %s";
+App::$strings["Installed plugins/addons/apps:"] = "Greffons/extensions/applications installés&nbsp;:";
+App::$strings["No installed plugins/addons/apps"] = "Aucun greffon/extension/application installé";
+App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Ceci est un serveur \$Projectname - un réseau collaboratif mondial de serveurs décentralisés à la confidentialité améliorée.";
+App::$strings["Tag: "] = "Étiquette&nbsp;:";
+App::$strings["Last background fetch: "] = "Dernière récupération en tâche de fond&nbsp;:";
+App::$strings["Current load average: "] = "Charge moyenne actuelle&nbsp;:";
+App::$strings["Running at web location"] = "Tourne à l'adresse internet";
+App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Merci de visiter <a href=\"http://hubzilla.org\">hubzilla.org</a> pour en apprendre davantage sur \$Projectname.";
+App::$strings["Bug reports and issues: please visit"] = "Pour remonter bogues et problèmes, merci de visiter";
+App::$strings["\$projectname issues"] = "Problèmes \$projectname";
+App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Suggestions, demandes, etc. - merci de vous adresser à \"redmatrix\" à librelist - point com";
+App::$strings["Site Administrators"] = "Administrateurs du site";
+App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Nous avons rencontré un problème avec l'OpenID que vous nous avez fourni. Merci de vérifier que l'ID est correctement saisi.";
+App::$strings["The error message was:"] = "Le message d'erreur était&nbsp;:";
+App::$strings["Authentication failed."] = "Échec de l'authentification.";
+App::$strings["Remote Authentication"] = "Authentification distante";
+App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Entrez l'adresse de votre canal (par ex. moncanal@monsite.com)";
+App::$strings["Authenticate"] = "Authentifier";
+App::$strings["Public Hubs"] = "Instances publiques";
+App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Les sites listés permettent l'enregistrement public de comptes pour le réseau \$Projectname. Tous les sites du réseau sont reliés entre eux, être membre d'un site revient à être membre de tous. Certains sites peuvent demander une souscription ou proposer différents niveaux de service. Chaque site <strong>peut</strong> fournir des détails supplémentaires.";
+App::$strings["Hub URL"] = "URL du site";
+App::$strings["Access Type"] = "Type d'accès";
+App::$strings["Registration Policy"] = "Politique d'inscription";
+App::$strings["Stats"] = "";
+App::$strings["Software"] = "";
+App::$strings["Ratings"] = "Evaluations";
+App::$strings["Rate"] = "Evaluer";
+App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Shift-rechargez votre page, ou videz le cache du navigateur si la photo ne s'affiche pas immédiatement.";
+App::$strings["Upload Profile Photo"] = "Téléverser une photo de profil";
+App::$strings["Block Name"] = "Nom du Bloc";
+App::$strings["Blocks"] = "Blocs";
+App::$strings["Block Title"] = "Titre du bloc";
+App::$strings["Website:"] = "Site web&nbsp;:";
+App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Canal distant [%s] (encore inconnu sur ce site)";
+App::$strings["Rating (this information is public)"] = "Evaluation (cette information est publique)";
+App::$strings["Optionally explain your rating (this information is public)"] = "Explication facultative de votre évaluation (cette information est publique)";
+App::$strings["No ratings"] = "Pas de note";
+App::$strings["Rating: "] = "Evaluation&nbsp:";
+App::$strings["Website: "] = "Site web&nbsp;:";
+App::$strings["Description: "] = "Description&nbsp;:";
+App::$strings["Apps"] = "Applications";
+App::$strings["Title (optional)"] = "Titre (facultatif)";
+App::$strings["Edit Block"] = "Modifier le bloc";
+App::$strings["No channel."] = "Pas de canal.";
+App::$strings["Common connections"] = "Contacts en commun";
+App::$strings["No connections in common."] = "Pas de contacts en commun.";
 App::$strings["Select a bookmark folder"] = "Choisir un dossier de favoris";
 App::$strings["Save Bookmark"] = "Enregistrer le favori";
 App::$strings["URL of bookmark"] = "URL du favori";
@@ -1069,7 +1121,7 @@ App::$strings["no"] = "non";
 App::$strings["yes"] = "oui";
 App::$strings["Membership on this site is by invitation only."] = "L'inscription à ce site se fait uniquement sur invitation.";
 App::$strings["Register"] = "S'inscrire";
-App::$strings["Proceed to create your first channel"] = "Continuer pour créer votre premier canal";
+App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "";
 App::$strings["Please login."] = "Merci de vous connecter.";
 App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Il est impossible de supprimer un compte dans les 48 heures après avoir changé le mot de passe du compte.";
 App::$strings["Remove This Account"] = "Supprimer ce compte";
@@ -1086,17 +1138,23 @@ App::$strings["This channel will be completely removed from the network. "] = "C
 App::$strings["Remove this channel and all its clones from the network"] = "Supprimer ce canal ainsi que tous ses clones sur le réseau";
 App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Par défaut, seule l'instance du canal présente sur ce hub sera supprimée du réseau";
 App::$strings["Remove Channel"] = "Supprimer le canal";
-App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Nous avons rencontré un problème avec l'OpenID que vous nous avez fourni. Merci de vérifier que l'ID est correctement saisi.";
-App::$strings["The error message was:"] = "Le message d'erreur était&nbsp;:";
-App::$strings["Authentication failed."] = "Échec de l'authentification.";
-App::$strings["Remote Authentication"] = "Authentification distante";
-App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Entrez l'adresse de votre canal (par ex. moncanal@monsite.com)";
-App::$strings["Authenticate"] = "Authentifier";
+App::$strings["Export Channel"] = "Exporter le canal";
+App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportez les principales informations de votre canal dans un fichier. Celui-ci pourra servir de sauvegarde de vos contacts, permissions, profils et données de base. Il pourra être importé sur un nouveau hub/serveur, mais n'embarquera pas vos contenus.";
+App::$strings["Export Content"] = "Exporter le contenu";
+App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportez les informations du canal et les contenus récents dans un fichier JSON. Celui-ci contiendra toutes vos relations, permissions, profils, et plusieurs mois de publications. Ce fichier peut être TRÈS gros. Armez-vous de patience - plusieurs minutes peuvent s'écouler avant que le téléchargement ne commence.";
+App::$strings["Export your posts from a given year."] = "Exporter vos publications d'une année en particulier";
+App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Vous pouvez également exporter vos publications et conversations pour une année ou un mois particulier. Ajustez la date dans la barre de votre navigateur pour sélectionner d'autres dates. Si l'export échoue (possible en cas de pénurie de mémoire sur le serveur de votre hub), essayez à nouveau en sélectionnant un intervalle de dates plus petit.";
+App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Pour sélectionner toutes les publications pour une année donnée, telle que cette année, visitez <a href=\"%1\$s\">%2\$s</a>";
+App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Pour sélectionner toutes les publications pour un mois donné, par exemple janvier, visitez <a href=\"%1\$s\">%2\$s</a>";
+App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Ces fichiers de contenu peuvent être importés ou restaurés en visitant <a href=\"%1\$s\">%2\$s</a> sur n'importe quel site hébergeant votre canal. Pour de meilleurs résultats merci de les importer par ordre chronologique (les plus anciens d'abord).";
 App::$strings["Items tagged with: %s"] = "Eléments étiquetés avec&nbsp;: %s";
 App::$strings["Search results for: %s"] = "Résultats de recherche pour&nbsp;: %s";
 App::$strings["No service class restrictions found."] = "Aucune restriction de classe de service trouvée.";
 App::$strings["Name is required"] = "Le nom est requis";
 App::$strings["Key and Secret are required"] = "Clef et secret sont requis";
+App::$strings["This channel is limited to %d tokens"] = "";
+App::$strings["Name and Password are required."] = "";
+App::$strings["Token saved."] = "";
 App::$strings["Not valid email."] = "Adresse de courriel non valide.";
 App::$strings["Protected email address. Cannot change to that email."] = "Adresse de courriel protégée. Impossible de l'utiliser.";
 App::$strings["System failure storing new email. Please try again."] = "Défaillance système lors du stockage de la nouvelle adresse de courriel. Merci d'essayer à nouveau.";
@@ -1129,6 +1187,12 @@ App::$strings["Confirm New Password"] = "Confirmez le nouveau mot de passe";
 App::$strings["Leave password fields blank unless changing"] = "Laissez les mots de passe vides si vous ne voulez pas les modifier";
 App::$strings["Email Address:"] = "Adresse de courriel&nbsp;:";
 App::$strings["Remove this account including all its channels"] = "Supprimer ce compte et tous ses canaux";
+App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content."] = "";
+App::$strings["You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "";
+App::$strings["Guest Access Tokens"] = "";
+App::$strings["Login Name"] = "";
+App::$strings["Login Password"] = "";
+App::$strings["Expires (yyyy-mm-dd)"] = "";
 App::$strings["Additional Features"] = "Fonctionnalités additionnelles";
 App::$strings["Connector Settings"] = "Paramètres du connecteur";
 App::$strings["No special theme for mobile devices"] = "Pas de thème spécifique aux mobiles";
@@ -1291,7 +1355,6 @@ App::$strings["GD graphics PHP module"] = "module PHP GD graphics";
 App::$strings["OpenSSL PHP module"] = "module PHP OpenSSL";
 App::$strings["mysqli or postgres PHP module"] = "module PHP postgres ou mysqli";
 App::$strings["mb_string PHP module"] = "module PHP mb_string";
-App::$strings["mcrypt PHP module"] = "module PHP mcrypt";
 App::$strings["xml PHP module"] = "module PHP xml";
 App::$strings["Apache mod_rewrite module"] = "module Apache mod_rewrite";
 App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Erreur&nbsp;: le module mod-rewrite du serveur web Apache est requis, mais pas installé.";
@@ -1302,7 +1365,6 @@ App::$strings["Error: GD graphics PHP module with JPEG support required but not
 App::$strings["Error: openssl PHP module required but not installed."] = "Erreur&nbsp;: le module openssl de PHP est requis, mais pas installé.";
 App::$strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Erreur&nbsp;: un module PHP mysqli ou postgres est requis, mais aucun des deux n'est installé.";
 App::$strings["Error: mb_string PHP module required but not installed."] = "Erreur&nbsp;: le module mb_string de PHP est requis, mais pas installé.";
-App::$strings["Error: mcrypt PHP module required but not installed."] = "Erreur&nbsp;: le module mcrypt de PHP est requis, mais pas installé.";
 App::$strings["Error: xml PHP module required for DAV but not installed."] = "Erreur&nbsp;: le module xml de PHP est requis pour le DAV, mais pas installé.";
 App::$strings["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."] = "L'installeur web a besoin de créer un fichier \".htconfig.php\" à la racine de votre serveur web, mais en est incapable.";
 App::$strings["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."] = "C'est généralement lié à un problème de droits, à cause duquel le serveur web est interdit d'écriture dans le répertoire concerné - alors que votre propre utilisateur a le droit.";
@@ -1314,7 +1376,7 @@ App::$strings["In order to store these compiled templates, the web server needs
 App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Merci de vous assurer que l'utilisateur sous lequel le serveur web tourne (le plus souvent, www-data) a bien l'autorisation d'écrire dans ce répertoire.";
 App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Note: Comme mesure de sécurité, assurez vous de donner les droits d'écriture au serveur web sur %s uniquement, pas sur les fichiers individuels (.tpl) qu'il contient.";
 App::$strings["%s is writable"] = "Permission d'écriture sur %s activée";
-App::$strings["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"] = "\$Projectname utilise le répertoire 'store' - situé à la racine de votre installation de \$Projectname - pour sauvegarder les fichiers envoyés. Le serveur web aura donc besoin de pouvoir y écrire.";
+App::$strings["This software 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"] = "";
 App::$strings["store is writable"] = "'store' est accessible en écriture";
 App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Le certificat SSL/TLS n'a pas pu être validé. Merci de le corriger, ou de désactiver l'accès https à ce site (non recommandé).";
 App::$strings["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!"] = "Si votre serveur accepte les connexions https ou s'il permet les connexions sur le port TCP 443 (le port utilisé par le protocole https), vous DEVEZ utiliser un certificat valide. Vous ne DEVEZ PAS utiliser un certificat que vous avez vous-mêmes signé&nbsp;!";
@@ -1322,6 +1384,7 @@ App::$strings["This restriction is incorporated because public posts from you ma
 App::$strings["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."] = "Si votre certificat n'est pas reconnu, les membres des autres sites (qui eux peuvent avoir des certificats valides) recevront des messages d'avertissement sur leur propre site se plaignant de problèmes de sécurité.";
 App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Ceci peut causer des problèmes d'ergonomie ailleurs (pas seulement sur votre site), nous devons donc insister sur ce prérequis.";
 App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Il existe des autorités de certification qui vous fourniront gratuitement un certificat valide.";
+App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "";
 App::$strings["SSL certificate validation"] = "Validation du certificat SSL/TLS";
 App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "La réécriture d'URL définie dans le .htaccess ne fonctionne pas. Vérifiez votre configuration serveur. Test&nbsp;:";
 App::$strings["Url rewrite is working"] = "La réécriture d'URL fonctionne";
@@ -1333,19 +1396,20 @@ App::$strings["Files: shared with me"] = "Fichiers&nbsp;: partagés avec moi";
 App::$strings["NEW"] = "NOUVEAU";
 App::$strings["Remove all files"] = "Supprimer tous les fichiers";
 App::$strings["Remove this file"] = "Supprimer ce fichier";
-App::$strings["Version %s"] = "Version %s";
-App::$strings["Installed plugins/addons/apps:"] = "Greffons/extensions/applications installés&nbsp;:";
-App::$strings["No installed plugins/addons/apps"] = "Aucun greffon/extension/application installé";
-App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Ceci est un serveur \$Projectname - un réseau collaboratif mondial de serveurs décentralisés à la confidentialité améliorée.";
-App::$strings["Tag: "] = "Étiquette&nbsp;:";
-App::$strings["Last background fetch: "] = "Dernière récupération en tâche de fond&nbsp;:";
-App::$strings["Current load average: "] = "Charge moyenne actuelle&nbsp;:";
-App::$strings["Running at web location"] = "Tourne à l'adresse internet";
-App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Merci de visiter <a href=\"http://hubzilla.org\">hubzilla.org</a> pour en apprendre davantage sur \$Projectname.";
-App::$strings["Bug reports and issues: please visit"] = "Pour remonter bogues et problèmes, merci de visiter";
-App::$strings["\$projectname issues"] = "Problèmes \$projectname";
-App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Suggestions, demandes, etc. - merci de vous adresser à \"redmatrix\" à librelist - point com";
-App::$strings["Site Administrators"] = "Administrateurs du site";
+App::$strings["Thing updated"] = "Elément mis à jour";
+App::$strings["Object store: failed"] = "Stockage de l'objet&nbsp;: échec";
+App::$strings["Thing added"] = "Elément ajouté";
+App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+App::$strings["Show Thing"] = "Montrer élément";
+App::$strings["item not found."] = "élément introuvable.";
+App::$strings["Edit Thing"] = "Modifier élément";
+App::$strings["Select a profile"] = "Choisissez un profil";
+App::$strings["Post an activity"] = "Publier une activité";
+App::$strings["Only sends to viewers of the applicable profile"] = "Envoie exclusivement aux visiteurs du profil concerné";
+App::$strings["Name of thing e.g. something"] = "Nom de l'élément, p.ex. quelque-chose";
+App::$strings["URL of thing (optional)"] = "URL de l'élément (facultatif)";
+App::$strings["URL for photo of thing (optional)"] = "URL d'une photo de l'élément (facultatif)";
+App::$strings["Add Thing to your Profile"] = "Ajouter l'élément à  votre profil";
 App::$strings["Failed to create source. No channel selected."] = "Impossible de créer la source. Aucun canal selectionné.";
 App::$strings["Source created."] = "Source créée.";
 App::$strings["Source updated."] = "Source mise à jour.";
@@ -1373,60 +1437,38 @@ App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s a étiqueté le
 App::$strings["Tag removed"] = "Étiquette retirée";
 App::$strings["Remove Item Tag"] = "Retirer une étiquette à l'élément";
 App::$strings["Select a tag to remove: "] = "Étiquette à retirer&nbsp;:";
-App::$strings["Thing updated"] = "Elément mis à jour";
-App::$strings["Object store: failed"] = "Stockage de l'objet&nbsp;: échec";
-App::$strings["Thing added"] = "Elément ajouté";
-App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-App::$strings["Show Thing"] = "Montrer élément";
-App::$strings["item not found."] = "élément introuvable.";
-App::$strings["Edit Thing"] = "Modifier élément";
-App::$strings["Select a profile"] = "Choisissez un profil";
-App::$strings["Post an activity"] = "Publier une activité";
-App::$strings["Only sends to viewers of the applicable profile"] = "Envoie exclusivement aux visiteurs du profil concerné";
-App::$strings["Name of thing e.g. something"] = "Nom de l'élément, p.ex. quelque-chose";
-App::$strings["URL of thing (optional)"] = "URL de l'élément (facultatif)";
-App::$strings["URL for photo of thing (optional)"] = "URL d'une photo de l'élément (facultatif)";
-App::$strings["Add Thing to your Profile"] = "Ajouter l'élément à  votre profil";
-App::$strings["Export Channel"] = "Exporter le canal";
-App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exportez les principales informations de votre canal dans un fichier. Celui-ci pourra servir de sauvegarde de vos contacts, permissions, profils et données de base. Il pourra être importé sur un nouveau hub/serveur, mais n'embarquera pas vos contenus.";
-App::$strings["Export Content"] = "Exporter le contenu";
-App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exportez les informations du canal et les contenus récents dans un fichier JSON. Celui-ci contiendra toutes vos relations, permissions, profils, et plusieurs mois de publications. Ce fichier peut être TRÈS gros. Armez-vous de patience - plusieurs minutes peuvent s'écouler avant que le téléchargement ne commence.";
-App::$strings["Export your posts from a given year."] = "Exporter vos publications d'une année en particulier";
-App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Vous pouvez également exporter vos publications et conversations pour une année ou un mois particulier. Ajustez la date dans la barre de votre navigateur pour sélectionner d'autres dates. Si l'export échoue (possible en cas de pénurie de mémoire sur le serveur de votre hub), essayez à nouveau en sélectionnant un intervalle de dates plus petit.";
-App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Pour sélectionner toutes les publications pour une année donnée, telle que cette année, visitez <a href=\"%1\$s\">%2\$s</a>";
-App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Pour sélectionner toutes les publications pour un mois donné, par exemple janvier, visitez <a href=\"%1\$s\">%2\$s</a>";
-App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Ces fichiers de contenu peuvent être importés ou restaurés en visitant <a href=\"%1\$s\">%2\$s</a> sur n'importe quel site hébergeant votre canal. Pour de meilleurs résultats merci de les importer par ordre chronologique (les plus anciens d'abord).";
-App::$strings["No connections."] = "Aucun contact.";
-App::$strings["Visit %s's profile [%s]"] = "Visiter le profil de %s [%s]";
-App::$strings["View Connections"] = "Voir les contacts";
-App::$strings["Source of Item"] = "Source de l'élément";
 App::$strings["Webpages"] = "Pages web";
 App::$strings["Actions"] = "Actions";
 App::$strings["Page Link"] = "Lien vers la page";
 App::$strings["Page Title"] = "Titre de la page";
+App::$strings["Not found"] = "";
+App::$strings["Wiki"] = "";
+App::$strings["Sandbox"] = "";
+App::$strings["\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be saved*.\""] = "";
+App::$strings["Revision Comparison"] = "";
+App::$strings["Revert"] = "";
+App::$strings["Enter the name of your new wiki:"] = "";
+App::$strings["Enter the name of the new page:"] = "";
+App::$strings["Enter the new name:"] = "";
+App::$strings["Embed image from photo albums"] = "";
+App::$strings["Embed an image from your albums"] = "";
+App::$strings["OK"] = "OK";
+App::$strings["Choose images to embed"] = "";
+App::$strings["Choose an album"] = "";
+App::$strings["Choose a different album..."] = "";
+App::$strings["Error getting album list"] = "";
+App::$strings["Error getting photo link"] = "";
+App::$strings["Error getting album"] = "";
+App::$strings["No connections."] = "Aucun contact.";
+App::$strings["Visit %s's profile [%s]"] = "Visiter le profil de %s [%s]";
+App::$strings["View Connections"] = "Voir les contacts";
+App::$strings["Source of Item"] = "Source de l'élément";
+App::$strings["Authorize application connection"] = "Autoriser l'application à se connecter";
+App::$strings["Return to your app and insert this Securty Code:"] = "Merci de retourner vers votre application, et d'y insérer ce Code de Sécurité&nbsp;:";
+App::$strings["Please login to continue."] = "Merci de vous identifier pour continuer.";
+App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Voulez-vous autoriser cette application à accéder à vos publications et contacts, et/ou à publier en votre nom?";
 App::$strings["Xchan Lookup"] = "Recherche xchan";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Recherche xchan commençant par (ou adresse \"webbie\")&nbsp;:";
-App::$strings["Site Admin"] = "Administrateur";
-App::$strings["Bug Report"] = "";
-App::$strings["View Bookmarks"] = "";
-App::$strings["My Chatrooms"] = "";
-App::$strings["Firefox Share"] = "";
-App::$strings["Remote Diagnostics"] = "";
-App::$strings["Suggest Channels"] = "Suggérer des canaux";
-App::$strings["Login"] = "Connexion";
-App::$strings["Grid"] = "Réseau";
-App::$strings["Channel Home"] = "Mon canal";
-App::$strings["Events"] = "Événements";
-App::$strings["Directory"] = "Annuaire";
-App::$strings["Mail"] = "Messages";
-App::$strings["Chat"] = "Clavardage";
-App::$strings["Probe"] = "Sonder";
-App::$strings["Suggest"] = "Suggérer";
-App::$strings["Random Channel"] = "Un canal au hasard";
-App::$strings["Invite"] = "Invitation";
-App::$strings["Features"] = "Fonctionalités";
-App::$strings["Post"] = "Envoyer";
-App::$strings["Purchase"] = "Acheter";
 App::$strings["Missing room name"] = "Il manque le nom du salon";
 App::$strings["Duplicate room name"] = "Un salon avec ce nom existe déjà";
 App::$strings["Invalid room specifier."] = "Identifiant de salon invalide.";
@@ -1474,6 +1516,27 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Merci d
 App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Notify]";
 App::$strings["created a new post"] = "a publié un nouveau message";
 App::$strings["commented on %s's post"] = "a commenté la publication de %s";
+App::$strings["Site Admin"] = "Administrateur";
+App::$strings["Bug Report"] = "";
+App::$strings["View Bookmarks"] = "";
+App::$strings["My Chatrooms"] = "";
+App::$strings["Firefox Share"] = "";
+App::$strings["Remote Diagnostics"] = "";
+App::$strings["Suggest Channels"] = "Suggérer des canaux";
+App::$strings["Login"] = "Connexion";
+App::$strings["Grid"] = "Réseau";
+App::$strings["Channel Home"] = "Mon canal";
+App::$strings["Events"] = "Événements";
+App::$strings["Directory"] = "Annuaire";
+App::$strings["Mail"] = "Messages";
+App::$strings["Chat"] = "Clavardage";
+App::$strings["Probe"] = "Sonder";
+App::$strings["Suggest"] = "Suggérer";
+App::$strings["Random Channel"] = "Un canal au hasard";
+App::$strings["Invite"] = "Invitation";
+App::$strings["Features"] = "Fonctionalités";
+App::$strings["Post"] = "Envoyer";
+App::$strings["Purchase"] = "Acheter";
 App::$strings["Private Message"] = "Message Privé";
 App::$strings["Select"] = "Sélectionner";
 App::$strings["Save to Folder"] = "Enregistrer dans le dossier";
@@ -1510,7 +1573,7 @@ App::$strings["Expires: %s"] = "Expire&nbsp;: %s";
 App::$strings["Save Bookmarks"] = "Enregistrer les favoris";
 App::$strings["Add to Calendar"] = "Ajouter au Calendrier";
 App::$strings["Mark all seen"] = "Tout marquer comme vu";
-App::$strings["[+] show all"] = "[+] voir tous";
+App::$strings["%s show all"] = "";
 App::$strings["Bold"] = "Gras";
 App::$strings["Italic"] = "Italique";
 App::$strings["Underline"] = "Souligné";
@@ -1519,9 +1582,93 @@ App::$strings["Code"] = "Code";
 App::$strings["Image"] = "Image";
 App::$strings["Insert Link"] = "Insérer un lien";
 App::$strings["Video"] = "Vidéo";
+App::$strings["Visible to your default audience"] = "Visible pour vos contacts seulement";
+App::$strings["Only me"] = "";
+App::$strings["Public"] = "Public";
+App::$strings["Anybody in the \$Projectname network"] = "";
+App::$strings["Any account on %s"] = "";
+App::$strings["Any of my connections"] = "";
+App::$strings["Only connections I specifically allow"] = "";
+App::$strings["Anybody authenticated (could include visitors from other networks)"] = "";
+App::$strings["Any connections including those who haven't yet been approved"] = "";
+App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "";
+App::$strings["This is your default setting for who can view your default channel profile"] = "";
+App::$strings["This is your default setting for who can view your connections"] = "";
+App::$strings["This is your default setting for who can view your file storage and photos"] = "";
+App::$strings["This is your default setting for the audience of your webpages"] = "";
 App::$strings["No username found in import file."] = "Aucun nom d'utilisateur dans le fichier d'import.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "Impossible de créer une adresse de canal unique. Echec de l'import.";
 App::$strings["Cannot locate DNS info for database server '%s'"] = "Impossible de trouver les infos DNS du serveur de BDD '%s'";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "L'image dépasse la taille limite de %lu octets";
+App::$strings["Image file is empty."] = "L'image est vide.";
+App::$strings["Photo storage failed."] = "Le stockage de l'image a échoué.";
+App::$strings["a new photo"] = "une nouvelle photo";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s a publié %2\$s pour %3\$s";
+App::$strings["Photo Albums"] = "Albums photo";
+App::$strings["Upload New Photos"] = "Ajouter des photos";
+App::$strings["Logout"] = "Déconnexion";
+App::$strings["End this session"] = "Mettre fin à la session";
+App::$strings["Home"] = "Mon canal";
+App::$strings["Your posts and conversations"] = "Vos publications et conversations";
+App::$strings["Your profile page"] = "Votre profil";
+App::$strings["Manage/Edit profiles"] = "Gérer/modifier les profils";
+App::$strings["Edit Profile"] = "Éditeur de profil";
+App::$strings["Edit your profile"] = "Modifier votre profil";
+App::$strings["Your photos"] = "Vos photos";
+App::$strings["Your files"] = "Vos fichiers";
+App::$strings["Your chatrooms"] = "Vos salons";
+App::$strings["Bookmarks"] = "Favoris";
+App::$strings["Your bookmarks"] = "Vos favoris";
+App::$strings["Your webpages"] = "Vos pages web";
+App::$strings["Your wiki"] = "";
+App::$strings["Sign in"] = "Connexion";
+App::$strings["%s - click to logout"] = "%s - cliquer ici pour déconnecter";
+App::$strings["Remote authentication"] = "Authentification distante";
+App::$strings["Click to authenticate to your home hub"] = "S'authentifier auprès de votre hub principal";
+App::$strings["Home Page"] = "Page d'accueil";
+App::$strings["Create an account"] = "Créer un compte";
+App::$strings["Help and documentation"] = "Aide et documentation";
+App::$strings["Applications, utilities, links, games"] = "Applications, utilitaires, liens, jeux";
+App::$strings["Search site @name, #tag, ?docs, content"] = "Recherche @nom, #tag, contenu";
+App::$strings["Channel Directory"] = "Annuaire des canaux";
+App::$strings["Your grid"] = "Votre réseau";
+App::$strings["Mark all grid notifications seen"] = "Marquer toutes les notifications du réseau comme vues";
+App::$strings["Channel home"] = "Mon canal";
+App::$strings["Mark all channel notifications seen"] = "Marquer toutes les notifications du canal comme vues";
+App::$strings["Notices"] = "Notifications";
+App::$strings["Notifications"] = "Notifications";
+App::$strings["See all notifications"] = "Voir toutes les notifications";
+App::$strings["Private mail"] = "Messages privés";
+App::$strings["See all private messages"] = "Voir tous les messages privés";
+App::$strings["Mark all private messages seen"] = "Marquer tous les messages privés comme vus";
+App::$strings["Inbox"] = "Boîte de réception";
+App::$strings["Outbox"] = "Boîte d'envoi";
+App::$strings["New Message"] = "Nouveau message";
+App::$strings["Event Calendar"] = "Calendrier des événements";
+App::$strings["See all events"] = "Voir tous les événements";
+App::$strings["Mark all events seen"] = "Marquer tous les événements comme vus";
+App::$strings["Manage Your Channels"] = "Gérer vos canaux";
+App::$strings["Account/Channel Settings"] = "Paramètres du Compte/Canal";
+App::$strings["Admin"] = "Administrateur";
+App::$strings["Site Setup and Configuration"] = "Configuration du site";
+App::$strings["Loading..."] = "Chargement...";
+App::$strings["@name, #tag, ?doc, content"] = "@nom, #étiquette, ?doc, contenu";
+App::$strings["Please wait..."] = "Merci de patienter...";
+App::$strings["view full size"] = "voir en taille réelle";
+App::$strings["Administrator"] = "Administrateur";
+App::$strings["No Subject"] = "Pas d'objet";
+App::$strings["Friendica"] = "Friendica";
+App::$strings["OStatus"] = "OStatus";
+App::$strings["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["New Page"] = "Nouvelle page";
+App::$strings["Title"] = "Titre";
 App::$strings["Categories"] = "Catégories";
 App::$strings["Tags"] = "Étiquettes";
 App::$strings["Keywords"] = "Mots-clefs";
@@ -1531,34 +1678,196 @@ App::$strings["want"] = "veulent";
 App::$strings["wants"] = "veut";
 App::$strings["likes"] = "aime";
 App::$strings["dislikes"] = "n'aime pas";
-App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\à G\\hi";
-App::$strings["Starts:"] = "Début&nbsp;:";
-App::$strings["Finishes:"] = "Fin&nbsp;:";
-App::$strings["This event has been added to your calendar."] = "Cet évènement a été ajouté dans votre calendrier.";
-App::$strings["Not specified"] = "Non spécifié";
-App::$strings["Needs Action"] = "Besoin d'une action";
-App::$strings["Completed"] = "Terminé";
-App::$strings["In Process"] = "En cours";
-App::$strings["Cancelled"] = "Annulé";
+App::$strings["Unable to obtain identity information from database"] = "Impossible d'obtenir les données d'identité depuis la base de données";
+App::$strings["Empty name"] = "Nom vide";
+App::$strings["Name too long"] = "Nom trop long";
+App::$strings["No account identifier"] = "Pas d'identifiant de compte";
+App::$strings["Nickname is required."] = "Un surnom est requis.";
+App::$strings["Reserved nickname. Please choose another."] = "Surnom réservé. Merci d'en choisir un autre.";
+App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Le surnom contient des caractères interdits ou est déjà pris sur ce site.";
+App::$strings["Unable to retrieve created identity"] = "Impossible de récupérer l'identité créée";
+App::$strings["Default Profile"] = "Profil par défaut";
+App::$strings["Requested channel is not available."] = "Canal demandé non disponible.";
+App::$strings["Create New Profile"] = "Créer un nouveau profil";
+App::$strings["Visible to everybody"] = "Visible de tous";
+App::$strings["Gender:"] = "Sexe&nbsp;:";
+App::$strings["Status:"] = "État&nbsp;:";
+App::$strings["Homepage:"] = "Site Internet&nbsp;:";
+App::$strings["Online Now"] = "Connecté";
+App::$strings["Like this channel"] = "J'aime ce canal";
+App::$strings["j F, Y"] = "j F, Y";
+App::$strings["j F"] = "j F";
+App::$strings["Birthday:"] = "Date de naissance&nbsp;:";
+App::$strings["for %1\$d %2\$s"] = "depuis %1\$d %2\$s";
+App::$strings["Sexual Preference:"] = "Orientation sexuelle&nbsp;:";
+App::$strings["Tags:"] = "Étiquettes&nbsp;:";
+App::$strings["Political Views:"] = "Opinions politiques&nbsp;:";
+App::$strings["Religion:"] = "Religion&nbsp;:";
+App::$strings["Hobbies/Interests:"] = "Occupations/Centres d'intérêt&nbsp;:";
+App::$strings["Likes:"] = "Aime&nbsp;:";
+App::$strings["Dislikes:"] = "N'aime pas&nbsp;:";
+App::$strings["Contact information and Social Networks:"] = "Coordonnées et réseaux sociaux&nbsp;:";
+App::$strings["My other channels:"] = "Mes autres canaux&nbsp;:";
+App::$strings["Musical interests:"] = "Goûts musicaux&nbsp;:";
+App::$strings["Books, literature:"] = "Lectures, goûts littéraires&nbsp;:";
+App::$strings["Television:"] = "Télévision&nbsp;:";
+App::$strings["Film/dance/culture/entertainment:"] = "Cinéma/danse/culture/divertissement&nsbp;:";
+App::$strings["Love/Romance:"] = "Vie sentimentale/amoureuse&nbsp;:";
+App::$strings["Work/employment:"] = "Travail/Occupation&nbsp;";
+App::$strings["School/education:"] = "Études&nbsp;";
+App::$strings["Like this thing"] = "J'aime ceci";
+App::$strings["New window"] = "Nouvelle fenêtre";
+App::$strings["Open the selected location in a different window or browser tab"] = "Ouvrir l'emplacement dans une fenêtre ou un onglet différent";
+App::$strings["User '%s' deleted"] = "Utilisateur '%s' supprimé";
+App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ajoute %2\$s à ses contacts";
+App::$strings["%1\$s poked %2\$s"] = "%1\$s a tapoté %2\$s";
+App::$strings["poked"] = "a tapoté";
+App::$strings["View %s's profile @ %s"] = "Voir le profil de %s @ %s";
+App::$strings["Categories:"] = "Catégories&nbsp;:";
+App::$strings["Filed under:"] = "Classé sous&nbsp;:";
+App::$strings["View in context"] = "Voir en contexte";
+App::$strings["remove"] = "supprimer";
+App::$strings["Delete Selected Items"] = "Supprimer les éléments selectionnés";
+App::$strings["View Source"] = "Voir source";
+App::$strings["Follow Thread"] = "Suivre la discussion";
+App::$strings["Unfollow Thread"] = "Ne plus suivre la discussion";
+App::$strings["Activity/Posts"] = "Activité/Publications";
+App::$strings["Edit Connection"] = "Modifier le contact";
+App::$strings["Message"] = "Message";
+App::$strings["%s likes this."] = "%s aime ça.";
+App::$strings["%s doesn't like this."] = "%s n'aime pas ça.";
+App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
+	0 => "<span  %1\$s>%2\$d personne</span> aime ceci.",
+	1 => "<span  %1\$s>%2\$d personnes</span> aiment ceci.",
+);
+App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "<span  %1\$s>%2\$d personne</span> n'aime pas ça.",
+	1 => "<span  %1\$s>%2\$d personnes</span> n'aiment pas ça.",
+);
+App::$strings["and"] = "et";
+App::$strings[", and %d other people"] = array(
+	0 => ", et %d autre personne",
+	1 => ", et %d autres personnes",
+);
+App::$strings["%s like this."] = "%s aime ça.";
+App::$strings["%s don't like this."] = "%s n'aime pas ça.";
+App::$strings["Set your location"] = "Spécifier votre emplacement géographique";
+App::$strings["Clear browser location"] = "Supprimer l'emplacement géographique du navigateur";
+App::$strings["Tag term:"] = "Étiquette&nbsp;:";
+App::$strings["Where are you right now?"] = "Où êtes-vous en ce moment&nbsp;?";
+App::$strings["Page link name"] = "Nom du lien vers la page";
+App::$strings["Post as"] = "Publier en tant que";
+App::$strings["Toggle voting"] = "(Dés)activer le vote";
+App::$strings["Categories (optional, comma-separated list)"] = "Catégories (facultatives, séparées par des virgules)";
+App::$strings["Set publish date"] = "Définir la date de publication";
+App::$strings["Discover"] = "À découvrir";
+App::$strings["Imported public streams"] = "Flux publics importés";
+App::$strings["Commented Order"] = "Par date de commentaire";
+App::$strings["Sort by Comment Date"] = "Trier par date de dernier commentaire";
+App::$strings["Posted Order"] = "Par date de publication";
+App::$strings["Sort by Post Date"] = "Trier par date de publication";
+App::$strings["Posts that mention or involve you"] = "Publications qui vous mentionnent ou vous concernent d'une manière ou d'une autre";
+App::$strings["Activity Stream - by date"] = "Flux d'activité - par date";
+App::$strings["Starred"] = "Mis en avant (étoiles)";
+App::$strings["Favourite Posts"] = "Publications préférées";
+App::$strings["Spam"] = "Indésirable";
+App::$strings["Posts flagged as SPAM"] = "Publications marquées comme indésirables";
+App::$strings["Status Messages and Posts"] = "Messages d'état et contributions";
+App::$strings["About"] = "À propos";
+App::$strings["Profile Details"] = "Détails du profil";
+App::$strings["Files and Storage"] = "Fichiers et Stockage";
+App::$strings["Chatrooms"] = "Salons de clavardage";
+App::$strings["Saved Bookmarks"] = "Favoris sauvegardés";
+App::$strings["Manage Webpages"] = "Gérer les pages web";
+App::$strings["__ctx:noun__ Attending"] = array(
+	0 => "Participe",
+	1 => "Participent",
+);
+App::$strings["__ctx:noun__ Not Attending"] = array(
+	0 => "Ne participe pas",
+	1 => "Ne participent pas",
+);
+App::$strings["__ctx:noun__ Undecided"] = array(
+	0 => "Indécis(e)",
+	1 => "Indécis(es)",
+);
+App::$strings["__ctx:noun__ Agree"] = array(
+	0 => "D'accord",
+	1 => "D'accord",
+);
+App::$strings["__ctx:noun__ Disagree"] = array(
+	0 => "Pas d'accord",
+	1 => "Pas d'accord",
+);
+App::$strings["__ctx:noun__ Abstain"] = array(
+	0 => "S'abstient",
+	1 => "S'abstiennent",
+);
 App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "L'import a échoué. Un canal existe déjà avec ce nom";
 App::$strings["Channel clone failed. Import failed."] = "Echec du clonage du canal. Echec de l'impot.";
-App::$strings["(Unknown)"] = "(Inconnu)";
-App::$strings["Visible to anybody on the internet."] = "Visible pour tout le monde sur internet.";
-App::$strings["Visible to you only."] = "Visible pour vous seulement.";
-App::$strings["Visible to anybody in this network."] = "Visible pour tout le monde sur ce réseau.";
-App::$strings["Visible to anybody authenticated."] = "Visible aux utilisateurs authentifiés.";
-App::$strings["Visible to anybody on %s."] = "Visible pour tous sur %s.";
-App::$strings["Visible to all connections."] = "Visible pour tous les contacts.";
-App::$strings["Visible to approved connections."] = "Visible aux contacts approuvés.";
-App::$strings["Visible to specific connections."] = "Visible pour certains contacts.";
-App::$strings["Privacy group is empty."] = "Groupe d'accès vide.";
-App::$strings["Privacy group: %s"] = "Groupe d'accès&nbsp;: %s";
-App::$strings["Connection not found."] = "Contact non trouvé.";
-App::$strings["profile photo"] = "photo de profil";
-App::$strings["No recipient provided."] = "Pas de destinataire.";
-App::$strings["[no subject]"] = "[sans objet]";
-App::$strings["Unable to determine sender."] = "Impossible de déterminer l'émetteur.";
-App::$strings["Stored post could not be verified."] = "Le message stocké n'a pas pu être vérifié.";
+App::$strings["Frequently"] = "Fréquemment";
+App::$strings["Hourly"] = "Toutes les heures";
+App::$strings["Twice daily"] = "Deux fois par jour";
+App::$strings["Daily"] = "Chaque jour";
+App::$strings["Weekly"] = "Chaque semaine";
+App::$strings["Monthly"] = "Chaque mois";
+App::$strings["Currently Male"] = "Actuellement homme";
+App::$strings["Currently Female"] = "Actuellement femme";
+App::$strings["Mostly Male"] = "Surtout homme";
+App::$strings["Mostly Female"] = "Surtout femme";
+App::$strings["Transgender"] = "Transgenre";
+App::$strings["Intersex"] = "Intersexuel";
+App::$strings["Transsexual"] = "Transsexuel";
+App::$strings["Hermaphrodite"] = "Hermaphrodite";
+App::$strings["Neuter"] = "Neutre";
+App::$strings["Non-specific"] = "Non spécifique";
+App::$strings["Undecided"] = "Indécis";
+App::$strings["Males"] = "Hommes";
+App::$strings["Females"] = "Femmes";
+App::$strings["Gay"] = "Gay";
+App::$strings["Lesbian"] = "Lesbienne";
+App::$strings["No Preference"] = "Sans préférence";
+App::$strings["Bisexual"] = "Bisexuel";
+App::$strings["Autosexual"] = "Autosexuel";
+App::$strings["Abstinent"] = "Abstinent";
+App::$strings["Virgin"] = "Vierge";
+App::$strings["Deviant"] = "Déviant";
+App::$strings["Fetish"] = "Fétichiste";
+App::$strings["Oodles"] = "Une floppée";
+App::$strings["Nonsexual"] = "Non-sexuel";
+App::$strings["Single"] = "Célibataire";
+App::$strings["Lonely"] = "Solitaire";
+App::$strings["Available"] = "Disponible";
+App::$strings["Unavailable"] = "Indisponible";
+App::$strings["Has crush"] = "A un béguin";
+App::$strings["Infatuated"] = "Amoureux transi";
+App::$strings["Dating"] = "Sort avec quelqu'un";
+App::$strings["Unfaithful"] = "Infidèle";
+App::$strings["Sex Addict"] = "Accro au sexe";
+App::$strings["Friends/Benefits"] = "Amis avec bénéfices";
+App::$strings["Casual"] = "Sans engagement";
+App::$strings["Engaged"] = "Fiancé(e)";
+App::$strings["Married"] = "Marié(e)";
+App::$strings["Imaginarily married"] = "Marié(e) dans ses rêves";
+App::$strings["Partners"] = "Partenaires";
+App::$strings["Cohabiting"] = "En cohabitation";
+App::$strings["Common law"] = "Conjoints de fait";
+App::$strings["Happy"] = "Heureux";
+App::$strings["Not looking"] = "Pas en recherche";
+App::$strings["Swinger"] = "Echangiste";
+App::$strings["Betrayed"] = "Trahi(e)";
+App::$strings["Separated"] = "Séparé(e)";
+App::$strings["Unstable"] = "Instable";
+App::$strings["Divorced"] = "Divorcé(e)";
+App::$strings["Imaginarily divorced"] = "Divorcé(e) dans ses rêves";
+App::$strings["Widowed"] = "Veuf/veuve";
+App::$strings["Uncertain"] = "Incertain";
+App::$strings["It's complicated"] = "C'est compliqué";
+App::$strings["Don't care"] = "S'en fiche";
+App::$strings["Ask me"] = "Me demander";
+App::$strings["%1\$s's bookmarks"] = "Favoris de %1\$s";
+App::$strings["guest:"] = "";
+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."] = "Le formulaire n'est plus sécurisé, probablement parce qu'il est ouvert depuis trop longtemps (plus de 3 heures).";
 App::$strings["prev"] = "préc.";
 App::$strings["first"] = "premier";
 App::$strings["last"] = "dernier";
@@ -1568,7 +1877,6 @@ App::$strings["newer"] = "plus récent";
 App::$strings["No connections"] = "Pas de relations.";
 App::$strings["View all %s connections"] = "Voir les %s contacts";
 App::$strings["poke"] = "tapoter";
-App::$strings["poked"] = "a tapoté";
 App::$strings["ping"] = "ping";
 App::$strings["pinged"] = "pingé";
 App::$strings["prod"] = "encourager";
@@ -1631,385 +1939,21 @@ App::$strings["Select an alternate language"] = "Choisir une langue alternative"
 App::$strings["activity"] = "activité";
 App::$strings["Design Tools"] = "Outils de conception";
 App::$strings["Pages"] = "Pages";
-App::$strings["System"] = "Système";
-App::$strings["New App"] = "";
-App::$strings["Suggestions"] = "Suggestions";
-App::$strings["See more..."] = "Voir plus...";
-App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Vous avez %1$.0f sur %2$.0f contacts autorisés.";
-App::$strings["Add New Connection"] = "Ajouter un nouveau contact";
-App::$strings["Enter channel address"] = "Saisissez l'adresse du canal";
-App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Exemples&nbsp;: pierre@exemple.com, https://exemple.com/sophie";
-App::$strings["Notes"] = "Notes";
-App::$strings["Remove term"] = "Retirer le terme";
-App::$strings["Saved Searches"] = "Recherches sauvegardées";
-App::$strings["add"] = "ajouter";
-App::$strings["Saved Folders"] = "Dossiers sauvegardés";
-App::$strings["Everything"] = "Tout";
-App::$strings["Archives"] = "Archives";
-App::$strings["Refresh"] = "Actualiser";
-App::$strings["Account settings"] = "Paramètres du compte";
-App::$strings["Channel settings"] = "Paramètres du canal";
-App::$strings["Additional features"] = "Fonctionnalités supplémentaires";
-App::$strings["Feature/Addon settings"] = "Paramètres des extensions/greffons";
-App::$strings["Display settings"] = "Paramètres d'affichage";
-App::$strings["Manage locations"] = "";
-App::$strings["Export channel"] = "Exporter le canal";
-App::$strings["Connected apps"] = "Applications connectées";
-App::$strings["Premium Channel Settings"] = "Paramètres de canal VIP";
-App::$strings["Private Mail Menu"] = "Menu des messages privés";
-App::$strings["Combined View"] = "Vue combinée";
-App::$strings["Inbox"] = "Boîte de réception";
-App::$strings["Outbox"] = "Boîte d'envoi";
-App::$strings["New Message"] = "Nouveau message";
-App::$strings["Conversations"] = "Conversations";
-App::$strings["Received Messages"] = "Messages reçus";
-App::$strings["Sent Messages"] = "Messages envoyés";
-App::$strings["No messages."] = "Pas de message.";
-App::$strings["Delete conversation"] = "Supprimer la conversation";
-App::$strings["Events Menu"] = "Menu Evènements";
-App::$strings["Day View"] = "Vue Jour";
-App::$strings["Week View"] = "Vue Semaine";
-App::$strings["Month View"] = "Vue Mois";
-App::$strings["Events Tools"] = "Outils Evènements";
-App::$strings["Export Calendar"] = "Exporter le calendrier";
-App::$strings["Import Calendar"] = "Importer un calendrier";
-App::$strings["Chatrooms"] = "Salons de clavardage";
-App::$strings["Overview"] = "";
-App::$strings["Chat Members"] = "";
-App::$strings["Bookmarked Chatrooms"] = "Salons favoris";
-App::$strings["Suggested Chatrooms"] = "Salons suggérés";
-App::$strings["photo/image"] = "photo/image";
-App::$strings["Click to show more"] = "Cliquer pour voir plus";
-App::$strings["Rating Tools"] = "Outils d'évaluation";
-App::$strings["Rate Me"] = "M'évaluer";
-App::$strings["View Ratings"] = "Voir mes évaluations";
-App::$strings["Forums"] = "Membres du forum";
-App::$strings["Tasks"] = "Tâches";
-App::$strings["Documentation"] = "Documentation";
-App::$strings["Project/Site Information"] = "Information sur le site/projet";
-App::$strings["For Members"] = "Pour les membres";
-App::$strings["For Administrators"] = "Pour les administrateurs";
-App::$strings["For Developers"] = "Pour les développeurs";
-App::$strings["Member registrations waiting for confirmation"] = "";
-App::$strings["Inspect queue"] = "Analyser la file d'attente";
-App::$strings["DB updates"] = "Mises à jour BDD";
-App::$strings["Admin"] = "Administrateur";
-App::$strings["Plugin Features"] = "Fonctionnalités des greffons";
-App::$strings["Channel is blocked on this site."] = "Ce canal est bloqué sur ce site.";
-App::$strings["Channel location missing."] = "Emplacement du canal introuvable.";
-App::$strings["Response from remote channel was incomplete."] = "La réponse du canal distant était incomplète.";
-App::$strings["Channel was deleted and no longer exists."] = "Le canal a été supprimé et n'existe plus.";
-App::$strings["Protocol disabled."] = "Protocole désactivé.";
-App::$strings["Channel discovery failed."] = "La tentative d'accéder au canal a échoué.";
-App::$strings["Cannot connect to yourself."] = "Ne peut pas se connecter à vous.";
-App::$strings["%1\$s's bookmarks"] = "Favoris de %1\$s";
-App::$strings["Public Timeline"] = "Fil public";
-App::$strings["Image/photo"] = "Image/photo";
-App::$strings["Encrypted content"] = "Contenu chiffré";
-App::$strings["Install %s element: "] = "Installer %s élément";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Ce message contient un élément installable %s, mais vous n'avez pas l'autorisation de l'installer sur ce site.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s a écrit %2\$s qui suit %3\$s";
-App::$strings["Click to open/close"] = "Cliquer pour ouvrir/fermer";
-App::$strings["spoiler"] = "";
-App::$strings["Different viewers will see this text differently"] = "Ce texte aura un rendu différent en fonction des utilisateurs";
-App::$strings["$1 wrote:"] = "$1 a écrit&nbsp;:";
-App::$strings["Directory Options"] = "Options d'annuaire";
-App::$strings["Safe Mode"] = "Mode sûr";
-App::$strings["Public Forums Only"] = "Les forums publics uniquement";
-App::$strings["This Website Only"] = "Ce site uniquement";
-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."] = "Le formulaire n'est plus sécurisé, probablement parce qu'il est ouvert depuis trop longtemps (plus de 3 heures).";
-App::$strings["Logout"] = "Déconnexion";
-App::$strings["End this session"] = "Mettre fin à la session";
-App::$strings["Home"] = "Mon canal";
-App::$strings["Your posts and conversations"] = "Vos publications et conversations";
-App::$strings["Your profile page"] = "Votre profil";
-App::$strings["Manage/Edit profiles"] = "Gérer/modifier les profils";
-App::$strings["Edit Profile"] = "Éditeur de profil";
-App::$strings["Edit your profile"] = "Modifier votre profil";
-App::$strings["Your photos"] = "Vos photos";
-App::$strings["Your files"] = "Vos fichiers";
-App::$strings["Your chatrooms"] = "Vos salons";
-App::$strings["Bookmarks"] = "Favoris";
-App::$strings["Your bookmarks"] = "Vos favoris";
-App::$strings["Your webpages"] = "Vos pages web";
-App::$strings["Sign in"] = "Connexion";
-App::$strings["%s - click to logout"] = "%s - cliquer ici pour déconnecter";
-App::$strings["Remote authentication"] = "Authentification distante";
-App::$strings["Click to authenticate to your home hub"] = "S'authentifier auprès de votre hub principal";
-App::$strings["Home Page"] = "Page d'accueil";
-App::$strings["Create an account"] = "Créer un compte";
-App::$strings["Help and documentation"] = "Aide et documentation";
-App::$strings["Applications, utilities, links, games"] = "Applications, utilitaires, liens, jeux";
-App::$strings["Search site @name, #tag, ?docs, content"] = "Recherche @nom, #tag, contenu";
-App::$strings["Channel Directory"] = "Annuaire des canaux";
-App::$strings["Your grid"] = "Votre réseau";
-App::$strings["Mark all grid notifications seen"] = "Marquer toutes les notifications du réseau comme vues";
-App::$strings["Channel home"] = "Mon canal";
-App::$strings["Mark all channel notifications seen"] = "Marquer toutes les notifications du canal comme vues";
-App::$strings["Notices"] = "Notifications";
-App::$strings["Notifications"] = "Notifications";
-App::$strings["See all notifications"] = "Voir toutes les notifications";
-App::$strings["Private mail"] = "Messages privés";
-App::$strings["See all private messages"] = "Voir tous les messages privés";
-App::$strings["Mark all private messages seen"] = "Marquer tous les messages privés comme vus";
-App::$strings["Event Calendar"] = "Calendrier des événements";
-App::$strings["See all events"] = "Voir tous les événements";
-App::$strings["Mark all events seen"] = "Marquer tous les événements comme vus";
-App::$strings["Manage Your Channels"] = "Gérer vos canaux";
-App::$strings["Account/Channel Settings"] = "Paramètres du Compte/Canal";
-App::$strings["Site Setup and Configuration"] = "Configuration du site";
-App::$strings["Loading..."] = "Chargement...";
-App::$strings["@name, #tag, ?doc, content"] = "@nom, #étiquette, ?doc, contenu";
-App::$strings["Please wait..."] = "Merci de patienter...";
-App::$strings["New window"] = "Nouvelle fenêtre";
-App::$strings["Open the selected location in a different window or browser tab"] = "Ouvrir l'emplacement dans une fenêtre ou un onglet différent";
-App::$strings["User '%s' deleted"] = "Utilisateur '%s' supprimé";
-App::$strings["%d invitation available"] = array(
-	0 => "%d invitation disponible",
-	1 => "%d invitations disponibles",
-);
-App::$strings["Find Channels"] = "Trouver des canaux";
-App::$strings["Enter name or interest"] = "Saisir nom ou centre d'intérêt";
-App::$strings["Connect/Follow"] = "Ajouter/Suivre";
-App::$strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Guillaume Martin, Course à pieds";
-App::$strings["Random Profile"] = "Un profil au hasard";
-App::$strings["Invite Friends"] = "Inviter des amis";
-App::$strings["Advanced example: name=fred and country=iceland"] = "Exemple avancé&nbsp;: name=fred and country=iceland";
-App::$strings["%d connection in common"] = array(
-	0 => "%d contact en commun",
-	1 => "%d contacts en commun",
-);
-App::$strings["show more"] = "montrer plus";
-App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s ajoute %2\$s à ses contacts";
-App::$strings["%1\$s poked %2\$s"] = "%1\$s a tapoté %2\$s";
-App::$strings["View %s's profile @ %s"] = "Voir le profil de %s @ %s";
-App::$strings["Categories:"] = "Catégories&nbsp;:";
-App::$strings["Filed under:"] = "Classé sous&nbsp;:";
-App::$strings["View in context"] = "Voir en contexte";
-App::$strings["remove"] = "supprimer";
-App::$strings["Delete Selected Items"] = "Supprimer les éléments selectionnés";
-App::$strings["View Source"] = "Voir source";
-App::$strings["Follow Thread"] = "Suivre la discussion";
-App::$strings["Unfollow Thread"] = "Ne plus suivre la discussion";
-App::$strings["Activity/Posts"] = "Activité/Publications";
-App::$strings["Edit Connection"] = "Modifier le contact";
-App::$strings["Message"] = "Message";
-App::$strings["%s likes this."] = "%s aime ça.";
-App::$strings["%s doesn't like this."] = "%s n'aime pas ça.";
-App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
-	0 => "<span  %1\$s>%2\$d personne</span> aime ceci.",
-	1 => "<span  %1\$s>%2\$d personnes</span> aiment ceci.",
-);
-App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
-	0 => "<span  %1\$s>%2\$d personne</span> n'aime pas ça.",
-	1 => "<span  %1\$s>%2\$d personnes</span> n'aiment pas ça.",
-);
-App::$strings["and"] = "et";
-App::$strings[", and %d other people"] = array(
-	0 => ", et %d autre personne",
-	1 => ", et %d autres personnes",
-);
-App::$strings["%s like this."] = "%s aime ça.";
-App::$strings["%s don't like this."] = "%s n'aime pas ça.";
-App::$strings["Set your location"] = "Spécifier votre emplacement géographique";
-App::$strings["Clear browser location"] = "Supprimer l'emplacement géographique du navigateur";
-App::$strings["Tag term:"] = "Étiquette&nbsp;:";
-App::$strings["Where are you right now?"] = "Où êtes-vous en ce moment&nbsp;?";
-App::$strings["Page link name"] = "Nom du lien vers la page";
-App::$strings["Post as"] = "Publier en tant que";
-App::$strings["Toggle voting"] = "(Dés)activer le vote";
-App::$strings["Categories (optional, comma-separated list)"] = "Catégories (facultatives, séparées par des virgules)";
-App::$strings["Set publish date"] = "Définir la date de publication";
-App::$strings["OK"] = "OK";
-App::$strings["Discover"] = "À découvrir";
-App::$strings["Imported public streams"] = "Flux publics importés";
-App::$strings["Commented Order"] = "Par date de commentaire";
-App::$strings["Sort by Comment Date"] = "Trier par date de dernier commentaire";
-App::$strings["Posted Order"] = "Par date de publication";
-App::$strings["Sort by Post Date"] = "Trier par date de publication";
-App::$strings["Posts that mention or involve you"] = "Publications qui vous mentionnent ou vous concernent d'une manière ou d'une autre";
-App::$strings["Activity Stream - by date"] = "Flux d'activité - par date";
-App::$strings["Starred"] = "Mis en avant (étoiles)";
-App::$strings["Favourite Posts"] = "Publications préférées";
-App::$strings["Spam"] = "Indésirable";
-App::$strings["Posts flagged as SPAM"] = "Publications marquées comme indésirables";
-App::$strings["Status Messages and Posts"] = "Messages d'état et contributions";
-App::$strings["About"] = "À propos";
-App::$strings["Profile Details"] = "Détails du profil";
-App::$strings["Photo Albums"] = "Albums photo";
-App::$strings["Files and Storage"] = "Fichiers et Stockage";
-App::$strings["Saved Bookmarks"] = "Favoris sauvegardés";
-App::$strings["Manage Webpages"] = "Gérer les pages web";
-App::$strings["__ctx:noun__ Attending"] = array(
-	0 => "Participe",
-	1 => "Participent",
-);
-App::$strings["__ctx:noun__ Not Attending"] = array(
-	0 => "Ne participe pas",
-	1 => "Ne participent pas",
-);
-App::$strings["__ctx:noun__ Undecided"] = array(
-	0 => "Indécis(e)",
-	1 => "Indécis(es)",
-);
-App::$strings["__ctx:noun__ Agree"] = array(
-	0 => "D'accord",
-	1 => "D'accord",
-);
-App::$strings["__ctx:noun__ Disagree"] = array(
-	0 => "Pas d'accord",
-	1 => "Pas d'accord",
-);
-App::$strings["__ctx:noun__ Abstain"] = array(
-	0 => "S'abstient",
-	1 => "S'abstiennent",
-);
-App::$strings["Frequently"] = "Fréquemment";
-App::$strings["Hourly"] = "Toutes les heures";
-App::$strings["Twice daily"] = "Deux fois par jour";
-App::$strings["Daily"] = "Chaque jour";
-App::$strings["Weekly"] = "Chaque semaine";
-App::$strings["Monthly"] = "Chaque mois";
-App::$strings["Currently Male"] = "Actuellement homme";
-App::$strings["Currently Female"] = "Actuellement femme";
-App::$strings["Mostly Male"] = "Surtout homme";
-App::$strings["Mostly Female"] = "Surtout femme";
-App::$strings["Transgender"] = "Transgenre";
-App::$strings["Intersex"] = "Intersexuel";
-App::$strings["Transsexual"] = "Transsexuel";
-App::$strings["Hermaphrodite"] = "Hermaphrodite";
-App::$strings["Neuter"] = "Neutre";
-App::$strings["Non-specific"] = "Non spécifique";
-App::$strings["Other"] = "Autre";
-App::$strings["Undecided"] = "Indécis";
-App::$strings["Males"] = "Hommes";
-App::$strings["Females"] = "Femmes";
-App::$strings["Gay"] = "Gay";
-App::$strings["Lesbian"] = "Lesbienne";
-App::$strings["No Preference"] = "Sans préférence";
-App::$strings["Bisexual"] = "Bisexuel";
-App::$strings["Autosexual"] = "Autosexuel";
-App::$strings["Abstinent"] = "Abstinent";
-App::$strings["Virgin"] = "Vierge";
-App::$strings["Deviant"] = "Déviant";
-App::$strings["Fetish"] = "Fétichiste";
-App::$strings["Oodles"] = "Une floppée";
-App::$strings["Nonsexual"] = "Non-sexuel";
-App::$strings["Single"] = "Célibataire";
-App::$strings["Lonely"] = "Solitaire";
-App::$strings["Available"] = "Disponible";
-App::$strings["Unavailable"] = "Indisponible";
-App::$strings["Has crush"] = "A un béguin";
-App::$strings["Infatuated"] = "Amoureux transi";
-App::$strings["Dating"] = "Sort avec quelqu'un";
-App::$strings["Unfaithful"] = "Infidèle";
-App::$strings["Sex Addict"] = "Accro au sexe";
-App::$strings["Friends/Benefits"] = "Amis avec bénéfices";
-App::$strings["Casual"] = "Sans engagement";
-App::$strings["Engaged"] = "Fiancé(e)";
-App::$strings["Married"] = "Marié(e)";
-App::$strings["Imaginarily married"] = "Marié(e) dans ses rêves";
-App::$strings["Partners"] = "Partenaires";
-App::$strings["Cohabiting"] = "En cohabitation";
-App::$strings["Common law"] = "Conjoints de fait";
-App::$strings["Happy"] = "Heureux";
-App::$strings["Not looking"] = "Pas en recherche";
-App::$strings["Swinger"] = "Echangiste";
-App::$strings["Betrayed"] = "Trahi(e)";
-App::$strings["Separated"] = "Séparé(e)";
-App::$strings["Unstable"] = "Instable";
-App::$strings["Divorced"] = "Divorcé(e)";
-App::$strings["Imaginarily divorced"] = "Divorcé(e) dans ses rêves";
-App::$strings["Widowed"] = "Veuf/veuve";
-App::$strings["Uncertain"] = "Incertain";
-App::$strings["It's complicated"] = "C'est compliqué";
-App::$strings["Don't care"] = "S'en fiche";
-App::$strings["Ask me"] = "Me demander";
-App::$strings["Visible to your default audience"] = "Visible pour vos contacts seulement";
-App::$strings["Only me"] = "";
-App::$strings["Public"] = "Public";
-App::$strings["Anybody in the \$Projectname network"] = "";
-App::$strings["Any account on %s"] = "";
-App::$strings["Any of my connections"] = "";
-App::$strings["Only connections I specifically allow"] = "";
-App::$strings["Anybody authenticated (could include visitors from other networks)"] = "";
-App::$strings["Any connections including those who haven't yet been approved"] = "";
-App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "";
-App::$strings["This is your default setting for who can view your default channel profile"] = "";
-App::$strings["This is your default setting for who can view your connections"] = "";
-App::$strings["This is your default setting for who can view your file storage and photos"] = "";
-App::$strings["This is your default setting for the audience of your webpages"] = "";
-App::$strings["Not a valid email address"] = "Ce n'est pas une adresse de courriel valide";
-App::$strings["Your email domain is not among those allowed on this site"] = "Votre domaine de courriel ne fait pas partie de ceux autorisés par ce site";
-App::$strings["Your email address is already registered at this site."] = "Votre adresse de courriel est déjà inscrite sur ce site.";
-App::$strings["An invitation is required."] = "Une invitation est requise.";
-App::$strings["Invitation could not be verified."] = "Votre invitation n'a pas pu être vérifiée.";
-App::$strings["Please enter the required information."] = "Merci d'entrer les informations requises.";
-App::$strings["Failed to store account information."] = "Impossible de stocker les informations liées au compte.";
-App::$strings["Registration confirmation for %s"] = "Confirmation de l'inscription pour %s";
-App::$strings["Registration request at %s"] = "Demande d'inscription sur %s";
-App::$strings["Administrator"] = "Administrateur";
-App::$strings["your registration password"] = "votre mot de passe d'inscription";
-App::$strings["Registration details for %s"] = "Détails de l'inscription pour %s";
-App::$strings["Account approved."] = "Compte approuvé.";
-App::$strings["Registration revoked for %s"] = "Inscription révoquée pour %s";
-App::$strings["Account verified. Please login."] = "Compte vérifié. Veuillez vous connecter.";
-App::$strings["Click here to upgrade."] = "Cliquez ici pour mettre à jour.";
-App::$strings["This action exceeds the limits set by your subscription plan."] = "Cette action outrepasserait les limites prévues par votre forfait.";
-App::$strings["This action is not available under your subscription plan."] = "Cette action n'est pas disponible avec votre forfait.";
-App::$strings["Item was not found."] = "Élément introuvable.";
-App::$strings["No source file."] = "Pas de fichier source.";
-App::$strings["Cannot locate file to replace"] = "Impossible de trouver le fichier à remplacer.";
-App::$strings["Cannot locate file to revise/update"] = "Impossible de trouver le fichier à corriger/mettre à jour";
-App::$strings["File exceeds size limit of %d"] = "Le fichier dépasse la taille limite de %d";
-App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Vous avez atteint votre limite de %1$.0f méga-octets autorisés pour le stockage des pièces-jointes.";
-App::$strings["File upload failed. Possible system limit or action terminated."] = "Envoi du fichier impossible. Limite système ou action avortée.";
-App::$strings["Stored file could not be verified. Upload failed."] = "Le fichier stocké n'a pu être vérifié. Echec de l'envoi.";
-App::$strings["Path not available."] = "Chemin non disponible.";
-App::$strings["Empty pathname"] = "Chemin vide";
-App::$strings["duplicate filename or path"] = "doublon de chemin ou de fichier";
-App::$strings["Path not found."] = "Chemin introuvable.";
-App::$strings["mkdir failed."] = "mkdir a échoué.";
-App::$strings["database storage failed."] = "l'écriture dans la base de données a échoué.";
-App::$strings["Empty path"] = "Chemin vide";
-App::$strings["Unable to obtain identity information from database"] = "Impossible d'obtenir les données d'identité depuis la base de données";
-App::$strings["Empty name"] = "Nom vide";
-App::$strings["Name too long"] = "Nom trop long";
-App::$strings["No account identifier"] = "Pas d'identifiant de compte";
-App::$strings["Nickname is required."] = "Un surnom est requis.";
-App::$strings["Reserved nickname. Please choose another."] = "Surnom réservé. Merci d'en choisir un autre.";
-App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Le surnom contient des caractères interdits ou est déjà pris sur ce site.";
-App::$strings["Unable to retrieve created identity"] = "Impossible de récupérer l'identité créée";
-App::$strings["Default Profile"] = "Profil par défaut";
-App::$strings["Requested channel is not available."] = "Canal demandé non disponible.";
-App::$strings["Create New Profile"] = "Créer un nouveau profil";
-App::$strings["Visible to everybody"] = "Visible de tous";
-App::$strings["Gender:"] = "Sexe&nbsp;:";
-App::$strings["Status:"] = "État&nbsp;:";
-App::$strings["Homepage:"] = "Site Internet&nbsp;:";
-App::$strings["Online Now"] = "Connecté";
-App::$strings["Like this channel"] = "J'aime ce canal";
-App::$strings["j F, Y"] = "j F, Y";
-App::$strings["j F"] = "j F";
-App::$strings["Birthday:"] = "Date de naissance&nbsp;:";
-App::$strings["for %1\$d %2\$s"] = "depuis %1\$d %2\$s";
-App::$strings["Sexual Preference:"] = "Orientation sexuelle&nbsp;:";
-App::$strings["Tags:"] = "Étiquettes&nbsp;:";
-App::$strings["Political Views:"] = "Opinions politiques&nbsp;:";
-App::$strings["Religion:"] = "Religion&nbsp;:";
-App::$strings["Hobbies/Interests:"] = "Occupations/Centres d'intérêt&nbsp;:";
-App::$strings["Likes:"] = "Aime&nbsp;:";
-App::$strings["Dislikes:"] = "N'aime pas&nbsp;:";
-App::$strings["Contact information and Social Networks:"] = "Coordonnées et réseaux sociaux&nbsp;:";
-App::$strings["My other channels:"] = "Mes autres canaux&nbsp;:";
-App::$strings["Musical interests:"] = "Goûts musicaux&nbsp;:";
-App::$strings["Books, literature:"] = "Lectures, goûts littéraires&nbsp;:";
-App::$strings["Television:"] = "Télévision&nbsp;:";
-App::$strings["Film/dance/culture/entertainment:"] = "Cinéma/danse/culture/divertissement&nsbp;:";
-App::$strings["Love/Romance:"] = "Vie sentimentale/amoureuse&nbsp;:";
-App::$strings["Work/employment:"] = "Travail/Occupation&nbsp;";
-App::$strings["School/education:"] = "Études&nbsp;";
-App::$strings["Like this thing"] = "J'aime ceci";
+App::$strings["Logged out."] = "Deconnecté.";
+App::$strings["Failed authentication"] = "Échec de l'authentification";
+App::$strings["Can view my normal stream and posts"] = "Peut voir les publications ordinaires sur mon canal.";
+App::$strings["Can view my webpages"] = "Peut voir mes pages web";
+App::$strings["Can post on my channel page (\"wall\")"] = "Peuvent poster sur la page de mon canal (\"mur\")";
+App::$strings["Can like/dislike stuff"] = "Peuvent aimer/ne pas aimer";
+App::$strings["Profiles and things other than posts/comments"] = "Profils et autres excluant les publications/commentaires.";
+App::$strings["Can forward to all my channel contacts via post @mentions"] = "Peut faire suivre à tous les contacts de mon canal via \"@mention\"";
+App::$strings["Advanced - useful for creating group forum channels"] = "Avancé - utile pour les canaux de type \"forum/groupe\"";
+App::$strings["Can chat with me (when available)"] = "Peut discuter avec moi (quand disponibie)";
+App::$strings["Can write to my file storage and photos"] = "Peut charger des fichiers et des photos dans mon canal";
+App::$strings["Can edit my webpages"] = "Peut modifier mes pages web";
+App::$strings["Somewhat advanced - very useful in open communities"] = "Plutôt avancé - très utile dans les communautés ouvertes";
+App::$strings["Can administer my channel resources"] = "Peut administrer les ressources de mon canal";
+App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Très avancé. Ne pas toucher, sauf si vous savez ce que vous faîtes";
 App::$strings["General Features"] = "Fonctionnalités générales";
 App::$strings["Content Expiration"] = "Expiration du contenu";
 App::$strings["Remove posts/comments and/or private messages at a future time"] = "Supprimer les contributions/commentaires et/ou messages privés plus tard";
@@ -2021,6 +1965,7 @@ App::$strings["Profile Import/Export"] = "Importer/Exporter le profil";
 App::$strings["Save and load profile details across sites/channels"] = "Sauvegarder et charger les détails d'un profil entre sites/canaux";
 App::$strings["Web Pages"] = "Pages web";
 App::$strings["Provide managed web pages on your channel"] = "Fournir des pages web, sous votre contrôle, sur votre canal";
+App::$strings["Provide a wiki for your channel"] = "";
 App::$strings["Hide Rating"] = "Masquer l'évaluation";
 App::$strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Masquer les boutons d'évaluation sur les pages de votre canal et de votre profil. NB : vous pourrez toujours être évalué(e) ailleurs.";
 App::$strings["Private Notes"] = "Notes privées";
@@ -2054,6 +1999,7 @@ App::$strings["Search by Date"] = "Chercher par date";
 App::$strings["Ability to select posts by date ranges"] = "Pouvoir choisir des publications par date";
 App::$strings["Privacy Groups"] = "Groupes d'accès";
 App::$strings["Enable management and selection of privacy groups"] = "Active la gestion et la sélection des groupes d'accès";
+App::$strings["Saved Searches"] = "Recherches sauvegardées";
 App::$strings["Save search terms for re-use"] = "Sauvegarder des termes de recherche pour utilisation ultérieure";
 App::$strings["Network Personal Tab"] = "Onglet \"Me concernant\"";
 App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Activer un onglet affichant seulement les publications du réseau sur lesquelles vous êtes intervenu";
@@ -2071,6 +2017,7 @@ App::$strings["Post Categories"] = "Catégoriser les publications";
 App::$strings["Add categories to your posts"] = "Ajouter des catégories à vos publications";
 App::$strings["Emoji Reactions"] = "";
 App::$strings["Add emoji reaction ability to posts"] = "";
+App::$strings["Saved Folders"] = "Dossiers sauvegardés";
 App::$strings["Ability to file posts under folders"] = "Permettre de classer les publications dans des dossiers";
 App::$strings["Dislike Posts"] = "\"Ne pas aimer\" les publications";
 App::$strings["Ability to dislike posts/comments"] = "Possibilité de \"ne pas aimer\" les publications/commentaires";
@@ -2078,63 +2025,149 @@ App::$strings["Star Posts"] = "Pouvoir mettre en avant les publications";
 App::$strings["Ability to mark special posts with a star indicator"] = "Pouvoir marquer certaines publications d'une étoile";
 App::$strings["Tag Cloud"] = "Nuage de tags";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Afficher un nuage de vos tags sur votre canal";
-App::$strings["Embedded content"] = "Contenu imbriqué";
-App::$strings["Embedding disabled"] = "Imbrication désactivée";
-App::$strings["Who can see this?"] = "";
-App::$strings["Custom selection"] = "";
-App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "";
-App::$strings["Show"] = "Montrer";
-App::$strings["Don't show"] = "Cacher";
-App::$strings["Other networks and post services"] = "Autres réseaux et services de messagerie";
-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."] = "";
-App::$strings["Logged out."] = "Deconnecté.";
-App::$strings["Failed authentication"] = "Échec de l'authentification";
-App::$strings["Birthday"] = "Anniversaire";
-App::$strings["Age: "] = "Age&nbsp;:";
-App::$strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-JJ ou MM-JJ";
-App::$strings["never"] = "jamais";
-App::$strings["less than a second ago"] = "à l'instant";
-App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "il y a %1\$d %2\$s";
-App::$strings["__ctx:relative_date__ year"] = array(
-	0 => "an",
-	1 => "ans",
-);
-App::$strings["__ctx:relative_date__ month"] = array(
-	0 => "mois",
-	1 => "mois",
-);
-App::$strings["__ctx:relative_date__ week"] = array(
-	0 => "semaine",
-	1 => "semaines",
-);
-App::$strings["__ctx:relative_date__ day"] = array(
-	0 => "jour",
-	1 => "jours",
-);
-App::$strings["__ctx:relative_date__ hour"] = array(
-	0 => "heure",
-	1 => "heures",
-);
-App::$strings["__ctx:relative_date__ minute"] = array(
-	0 => "minute",
-	1 => "minutes",
-);
-App::$strings["__ctx:relative_date__ second"] = array(
-	0 => "seconde",
-	1 => "secondes",
-);
-App::$strings["%1\$s's birthday"] = "Anniversaire de %1\$s";
-App::$strings["Happy Birthday %1\$s"] = "Joyeux Anniversaire %1\$s";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un groupe supprimé portant ce nom a été ressuscité. Les permissions liées aux éléments existants <strong>peuvent</strong> s'appliquer au groupe et aux membres futurs. Si ce n'est pas ce que vous attendiez, merci de créer un autre groupe avec un nom différent.";
 App::$strings["Add new connections to this privacy group"] = "Ajouter de nouveaux contacts à ce groupe d'accès";
 App::$strings["edit"] = "modifier";
 App::$strings["Edit group"] = "Modifier le groupe";
 App::$strings["Add privacy group"] = "Ajouter un groupe d'accès";
 App::$strings["Channels not in any privacy group"] = "Canaux n'étant dans aucun groupe d'accès";
+App::$strings["add"] = "ajouter";
+App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\à G\\hi";
+App::$strings["Starts:"] = "Début&nbsp;:";
+App::$strings["Finishes:"] = "Fin&nbsp;:";
+App::$strings["This event has been added to your calendar."] = "Cet évènement a été ajouté dans votre calendrier.";
+App::$strings["Not specified"] = "Non spécifié";
+App::$strings["Needs Action"] = "Besoin d'une action";
+App::$strings["Completed"] = "Terminé";
+App::$strings["In Process"] = "En cours";
+App::$strings["Cancelled"] = "Annulé";
+App::$strings["Not a valid email address"] = "Ce n'est pas une adresse de courriel valide";
+App::$strings["Your email domain is not among those allowed on this site"] = "Votre domaine de courriel ne fait pas partie de ceux autorisés par ce site";
+App::$strings["Your email address is already registered at this site."] = "Votre adresse de courriel est déjà inscrite sur ce site.";
+App::$strings["An invitation is required."] = "Une invitation est requise.";
+App::$strings["Invitation could not be verified."] = "Votre invitation n'a pas pu être vérifiée.";
+App::$strings["Please enter the required information."] = "Merci d'entrer les informations requises.";
+App::$strings["Failed to store account information."] = "Impossible de stocker les informations liées au compte.";
+App::$strings["Registration confirmation for %s"] = "Confirmation de l'inscription pour %s";
+App::$strings["Registration request at %s"] = "Demande d'inscription sur %s";
+App::$strings["your registration password"] = "votre mot de passe d'inscription";
+App::$strings["Registration details for %s"] = "Détails de l'inscription pour %s";
+App::$strings["Account approved."] = "Compte approuvé.";
+App::$strings["Registration revoked for %s"] = "Inscription révoquée pour %s";
+App::$strings["Click here to upgrade."] = "Cliquez ici pour mettre à jour.";
+App::$strings["This action exceeds the limits set by your subscription plan."] = "Cette action outrepasserait les limites prévues par votre forfait.";
+App::$strings["This action is not available under your subscription plan."] = "Cette action n'est pas disponible avec votre forfait.";
+App::$strings["Channel is blocked on this site."] = "Ce canal est bloqué sur ce site.";
+App::$strings["Channel location missing."] = "Emplacement du canal introuvable.";
+App::$strings["Response from remote channel was incomplete."] = "La réponse du canal distant était incomplète.";
+App::$strings["Channel was deleted and no longer exists."] = "Le canal a été supprimé et n'existe plus.";
+App::$strings["Protocol disabled."] = "Protocole désactivé.";
+App::$strings["Channel discovery failed."] = "La tentative d'accéder au canal a échoué.";
+App::$strings["Cannot connect to yourself."] = "Ne peut pas se connecter à vous.";
+App::$strings["Item was not found."] = "Élément introuvable.";
+App::$strings["No source file."] = "Pas de fichier source.";
+App::$strings["Cannot locate file to replace"] = "Impossible de trouver le fichier à remplacer.";
+App::$strings["Cannot locate file to revise/update"] = "Impossible de trouver le fichier à corriger/mettre à jour";
+App::$strings["File exceeds size limit of %d"] = "Le fichier dépasse la taille limite de %d";
+App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Vous avez atteint votre limite de %1$.0f méga-octets autorisés pour le stockage des pièces-jointes.";
+App::$strings["File upload failed. Possible system limit or action terminated."] = "Envoi du fichier impossible. Limite système ou action avortée.";
+App::$strings["Stored file could not be verified. Upload failed."] = "Le fichier stocké n'a pu être vérifié. Echec de l'envoi.";
+App::$strings["Path not available."] = "Chemin non disponible.";
+App::$strings["Empty pathname"] = "Chemin vide";
+App::$strings["duplicate filename or path"] = "doublon de chemin ou de fichier";
+App::$strings["Path not found."] = "Chemin introuvable.";
+App::$strings["mkdir failed."] = "mkdir a échoué.";
+App::$strings["database storage failed."] = "l'écriture dans la base de données a échoué.";
+App::$strings["Empty path"] = "Chemin vide";
+App::$strings["Image/photo"] = "Image/photo";
+App::$strings["Encrypted content"] = "Contenu chiffré";
+App::$strings["Install %s element: "] = "Installer %s élément";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Ce message contient un élément installable %s, mais vous n'avez pas l'autorisation de l'installer sur ce site.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s a écrit %2\$s qui suit %3\$s";
+App::$strings["Click to open/close"] = "Cliquer pour ouvrir/fermer";
+App::$strings["spoiler"] = "";
+App::$strings["Different viewers will see this text differently"] = "Ce texte aura un rendu différent en fonction des utilisateurs";
+App::$strings["$1 wrote:"] = "$1 a écrit&nbsp;:";
+App::$strings["(Unknown)"] = "(Inconnu)";
+App::$strings["Visible to anybody on the internet."] = "Visible pour tout le monde sur internet.";
+App::$strings["Visible to you only."] = "Visible pour vous seulement.";
+App::$strings["Visible to anybody in this network."] = "Visible pour tout le monde sur ce réseau.";
+App::$strings["Visible to anybody authenticated."] = "Visible aux utilisateurs authentifiés.";
+App::$strings["Visible to anybody on %s."] = "Visible pour tous sur %s.";
+App::$strings["Visible to all connections."] = "Visible pour tous les contacts.";
+App::$strings["Visible to approved connections."] = "Visible aux contacts approuvés.";
+App::$strings["Visible to specific connections."] = "Visible pour certains contacts.";
+App::$strings["Privacy group is empty."] = "Groupe d'accès vide.";
+App::$strings["Privacy group: %s"] = "Groupe d'accès&nbsp;: %s";
+App::$strings["Connection not found."] = "Contact non trouvé.";
+App::$strings["profile photo"] = "photo de profil";
+App::$strings["Embedded content"] = "Contenu imbriqué";
+App::$strings["Embedding disabled"] = "Imbrication désactivée";
+App::$strings["System"] = "Système";
+App::$strings["New App"] = "";
+App::$strings["Suggestions"] = "Suggestions";
+App::$strings["See more..."] = "Voir plus...";
+App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Vous avez %1$.0f sur %2$.0f contacts autorisés.";
+App::$strings["Add New Connection"] = "Ajouter un nouveau contact";
+App::$strings["Enter channel address"] = "Saisissez l'adresse du canal";
+App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Exemples&nbsp;: pierre@exemple.com, https://exemple.com/sophie";
+App::$strings["Notes"] = "Notes";
+App::$strings["Remove term"] = "Retirer le terme";
+App::$strings["Everything"] = "Tout";
+App::$strings["Archives"] = "Archives";
+App::$strings["Refresh"] = "Actualiser";
+App::$strings["Account settings"] = "Paramètres du compte";
+App::$strings["Channel settings"] = "Paramètres du canal";
+App::$strings["Additional features"] = "Fonctionnalités supplémentaires";
+App::$strings["Feature/Addon settings"] = "Paramètres des extensions/greffons";
+App::$strings["Display settings"] = "Paramètres d'affichage";
+App::$strings["Manage locations"] = "";
+App::$strings["Export channel"] = "Exporter le canal";
+App::$strings["Connected apps"] = "Applications connectées";
+App::$strings["Premium Channel Settings"] = "Paramètres de canal VIP";
+App::$strings["Private Mail Menu"] = "Menu des messages privés";
+App::$strings["Combined View"] = "Vue combinée";
+App::$strings["Conversations"] = "Conversations";
+App::$strings["Received Messages"] = "Messages reçus";
+App::$strings["Sent Messages"] = "Messages envoyés";
+App::$strings["No messages."] = "Pas de message.";
+App::$strings["Delete conversation"] = "Supprimer la conversation";
+App::$strings["Events Tools"] = "Outils Evènements";
+App::$strings["Export Calendar"] = "Exporter le calendrier";
+App::$strings["Import Calendar"] = "Importer un calendrier";
+App::$strings["Overview"] = "";
+App::$strings["Chat Members"] = "";
+App::$strings["Wiki List"] = "";
+App::$strings["Wiki Pages"] = "";
+App::$strings["Bookmarked Chatrooms"] = "Salons favoris";
+App::$strings["Suggested Chatrooms"] = "Salons suggérés";
+App::$strings["photo/image"] = "photo/image";
+App::$strings["Click to show more"] = "Cliquer pour voir plus";
+App::$strings["Rating Tools"] = "Outils d'évaluation";
+App::$strings["Rate Me"] = "M'évaluer";
+App::$strings["View Ratings"] = "Voir mes évaluations";
+App::$strings["Forums"] = "Membres du forum";
+App::$strings["Tasks"] = "Tâches";
+App::$strings["Documentation"] = "Documentation";
+App::$strings["Project/Site Information"] = "Information sur le site/projet";
+App::$strings["For Members"] = "Pour les membres";
+App::$strings["For Administrators"] = "Pour les administrateurs";
+App::$strings["For Developers"] = "Pour les développeurs";
+App::$strings["Member registrations waiting for confirmation"] = "";
+App::$strings["Inspect queue"] = "Analyser la file d'attente";
+App::$strings["DB updates"] = "Mises à jour BDD";
+App::$strings["Plugin Features"] = "Fonctionnalités des greffons";
+App::$strings[" and "] = "et";
+App::$strings["public profile"] = "profil public";
+App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s a changé %2\$s en &ldquo;%3\$s&rdquo;";
+App::$strings["Visit %1\$s's %2\$s"] = "Visiter %2\$s de %1\$s";
+App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s a mis à jour %2\$s, modifiant %3\$s.";
+App::$strings["Attachments:"] = "Pièces jointes&nbsp;:";
+App::$strings["\$Projectname event notification:"] = "Notification d'événement de \$Projectname&nbsp;:";
 App::$strings["Delete this item?"] = "Supprimer cet élément?";
-App::$strings["[-] show less"] = "[-] montrer moins";
-App::$strings["[+] expand"] = "[+] déplier";
-App::$strings["[-] collapse"] = "[-] replier";
+App::$strings["%s show less"] = "";
+App::$strings["%s expand"] = "";
+App::$strings["%s collapse"] = "";
 App::$strings["Password too short"] = "Mot de passe trop court";
 App::$strings["Passwords do not match"] = "Les mots de passe ne correspondent pas";
 App::$strings["everybody"] = "tout le monde";
@@ -2189,72 +2222,78 @@ App::$strings["__ctx:calendar__ month"] = "mois";
 App::$strings["__ctx:calendar__ week"] = "semaine";
 App::$strings["__ctx:calendar__ day"] = "jour";
 App::$strings["__ctx:calendar__ All day"] = "Toute la journée";
-App::$strings["view full size"] = "voir en taille réelle";
-App::$strings["No Subject"] = "Pas d'objet";
-App::$strings["Friendica"] = "Friendica";
-App::$strings["OStatus"] = "OStatus";
-App::$strings["GNU-Social"] = "";
-App::$strings["RSS/Atom"] = "RSS/Atom";
-App::$strings["Diaspora"] = "Diaspora";
-App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot";
-App::$strings["LinkedIn"] = "Linkedin";
-App::$strings["XMPP/IM"] = "XMPP/IM";
-App::$strings["MySpace"] = "MySpace";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "L'image dépasse la taille limite de %lu octets";
-App::$strings["Image file is empty."] = "L'image est vide.";
-App::$strings["Photo storage failed."] = "Le stockage de l'image a échoué.";
-App::$strings["a new photo"] = "une nouvelle photo";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s a publié %2\$s pour %3\$s";
-App::$strings["Upload New Photos"] = "Ajouter des photos";
+App::$strings["%d invitation available"] = array(
+	0 => "%d invitation disponible",
+	1 => "%d invitations disponibles",
+);
+App::$strings["Find Channels"] = "Trouver des canaux";
+App::$strings["Enter name or interest"] = "Saisir nom ou centre d'intérêt";
+App::$strings["Connect/Follow"] = "Ajouter/Suivre";
+App::$strings["Examples: Robert Morgenstein, Fishing"] = "Exemples: Guillaume Martin, Course à pieds";
+App::$strings["Random Profile"] = "Un profil au hasard";
+App::$strings["Invite Friends"] = "Inviter des amis";
+App::$strings["Advanced example: name=fred and country=iceland"] = "Exemple avancé&nbsp;: name=fred and country=iceland";
+App::$strings["%d connection in common"] = array(
+	0 => "%d contact en commun",
+	1 => "%d contacts en commun",
+);
+App::$strings["show more"] = "montrer plus";
+App::$strings["Directory Options"] = "Options d'annuaire";
+App::$strings["Safe Mode"] = "Mode sûr";
+App::$strings["Public Forums Only"] = "Les forums publics uniquement";
+App::$strings["This Website Only"] = "Ce site uniquement";
+App::$strings["No recipient provided."] = "Pas de destinataire.";
+App::$strings["[no subject]"] = "[sans objet]";
+App::$strings["Unable to determine sender."] = "Impossible de déterminer l'émetteur.";
+App::$strings["Stored post could not be verified."] = "Le message stocké n'a pas pu être vérifié.";
+App::$strings["Who can see this?"] = "";
+App::$strings["Custom selection"] = "";
+App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "";
+App::$strings["Show"] = "Montrer";
+App::$strings["Don't show"] = "Cacher";
+App::$strings["Other networks and post services"] = "Autres réseaux et services de messagerie";
+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."] = "";
+App::$strings["Birthday"] = "Anniversaire";
+App::$strings["Age: "] = "Age&nbsp;:";
+App::$strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-JJ ou MM-JJ";
+App::$strings["never"] = "jamais";
+App::$strings["less than a second ago"] = "à l'instant";
+App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "il y a %1\$d %2\$s";
+App::$strings["__ctx:relative_date__ year"] = array(
+	0 => "an",
+	1 => "ans",
+);
+App::$strings["__ctx:relative_date__ month"] = array(
+	0 => "mois",
+	1 => "mois",
+);
+App::$strings["__ctx:relative_date__ week"] = array(
+	0 => "semaine",
+	1 => "semaines",
+);
+App::$strings["__ctx:relative_date__ day"] = array(
+	0 => "jour",
+	1 => "jours",
+);
+App::$strings["__ctx:relative_date__ hour"] = array(
+	0 => "heure",
+	1 => "heures",
+);
+App::$strings["__ctx:relative_date__ minute"] = array(
+	0 => "minute",
+	1 => "minutes",
+);
+App::$strings["__ctx:relative_date__ second"] = array(
+	0 => "seconde",
+	1 => "secondes",
+);
+App::$strings["%1\$s's birthday"] = "Anniversaire de %1\$s";
+App::$strings["Happy Birthday %1\$s"] = "Joyeux Anniversaire %1\$s";
+App::$strings["Public Timeline"] = "Fil public";
 App::$strings["Invalid data packet"] = "Paquet de données invalide";
 App::$strings["Unable to verify channel signature"] = "Impossible de vérifier la signature du canal";
 App::$strings["Unable to verify site signature for %s"] = "Impossible de vérifier la signature de site pour %s";
 App::$strings["invalid target signature"] = "signature de la cible invalide";
-App::$strings["New Page"] = "Nouvelle page";
-App::$strings["Title"] = "Titre";
-App::$strings["Can view my normal stream and posts"] = "Peut voir les publications ordinaires sur mon canal.";
-App::$strings["Can view my default channel profile"] = "Peut voir le profil du canal par défaut.";
-App::$strings["Can view my connections"] = "Peut voir mes contacts";
-App::$strings["Can view my file storage and photos"] = "Peut voir mes fichiers et photos";
-App::$strings["Can view my webpages"] = "Peut voir mes pages web";
-App::$strings["Can send me their channel stream and posts"] = "Peuvent m'envoyer leur flux et les publications de leur canal";
-App::$strings["Can post on my channel page (\"wall\")"] = "Peuvent poster sur la page de mon canal (\"mur\")";
-App::$strings["Can comment on or like my posts"] = "Peuvent commenter et/ou aimer mes publications";
-App::$strings["Can send me private mail messages"] = "Peuvent m'envoyer des messages privés";
-App::$strings["Can like/dislike stuff"] = "Peuvent aimer/ne pas aimer";
-App::$strings["Profiles and things other than posts/comments"] = "Profils et autres excluant les publications/commentaires.";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Peut faire suivre à tous les contacts de mon canal via \"@mention\"";
-App::$strings["Advanced - useful for creating group forum channels"] = "Avancé - utile pour les canaux de type \"forum/groupe\"";
-App::$strings["Can chat with me (when available)"] = "Peut discuter avec moi (quand disponibie)";
-App::$strings["Can write to my file storage and photos"] = "Peut charger des fichiers et des photos dans mon canal";
-App::$strings["Can edit my webpages"] = "Peut modifier mes pages web";
-App::$strings["Can source my public posts in derived channels"] = "Peut rediriger mes publications publiques vers des canaux dérivés";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Plutôt avancé - très utile dans les communautés ouvertes";
-App::$strings["Can administer my channel resources"] = "Peut administrer les ressources de mon canal";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Très avancé. Ne pas toucher, sauf si vous savez ce que vous faîtes";
-App::$strings["Social Networking"] = "Réseau social";
-App::$strings["Social - Mostly Public"] = "Social - surtout public";
-App::$strings["Social - Restricted"] = "Social - restreint";
-App::$strings["Social - Private"] = "Social - privé";
-App::$strings["Community Forum"] = "Forum communautaire";
-App::$strings["Forum - Mostly Public"] = "Forum - surtout public";
-App::$strings["Forum - Restricted"] = "Forum - restreint";
-App::$strings["Forum - Private"] = "Forum - privé";
-App::$strings["Feed Republish"] = "Republication de flux";
-App::$strings["Feed - Mostly Public"] = "Flux - surtout public";
-App::$strings["Feed - Restricted"] = "Flux - restreint";
-App::$strings["Special Purpose"] = "Utilisation spécifique";
-App::$strings["Special - Celebrity/Soapbox"] = "Spécial - célébrité/promotion";
-App::$strings["Special - Group Repository"] = "Spécial - dépôt partagé";
-App::$strings["Custom/Expert Mode"] = "Mode expert/spécifique";
-App::$strings[" and "] = "et";
-App::$strings["public profile"] = "profil public";
-App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s a changé %2\$s en &ldquo;%3\$s&rdquo;";
-App::$strings["Visit %1\$s's %2\$s"] = "Visiter %2\$s de %1\$s";
-App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s a mis à jour %2\$s, modifiant %3\$s.";
-App::$strings["Attachments:"] = "Pièces jointes&nbsp;:";
-App::$strings["\$Projectname event notification:"] = "Notification d'événement de \$Projectname&nbsp;:";
 App::$strings["Focus (Hubzilla default)"] = "Focus (par défaut pour Hubzilla)";
 App::$strings["Theme settings"] = "Paramètres du thème";
 App::$strings["Select scheme"] = "Définir la palette de couleurs";
@@ -2294,6 +2333,7 @@ App::$strings["__ctx:opensearch__ \$Projectname"] = "";
 App::$strings["Update %s failed. See error logs."] = "La mise-à-jour %s a échoué. Merci de consulter les journaux d'erreur.";
 App::$strings["Update Error at %s"] = "Erreur de mise à jour sur %s";
 App::$strings["Create an account to access services and applications within the Hubzilla"] = "Créez un compte pour pouvoir accéder aux services et applications de Hubzilla";
+App::$strings["Login/Email"] = "";
 App::$strings["Password"] = "Mot de passe";
 App::$strings["Remember me"] = "Se souvenir de moi";
 App::$strings["Forgot your password?"] = "Mot de passe oublié&nbsp;?";
diff --git a/view/it/hstrings.php b/view/it/hstrings.php
index 1abdad30e..21e413144 100644
--- a/view/it/hstrings.php
+++ b/view/it/hstrings.php
@@ -1,10 +1,43 @@
 <?php
 
+
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	return ($n != 1);;
 }}
-;
+App::$rtl = 0;
+App::$strings["Social Networking"] = "Social network";
+App::$strings["Social - Mostly Public"] = "Social - Prevalentemente pubblico";
+App::$strings["Social - Restricted"] = "Social - Con restrizioni";
+App::$strings["Social - Private"] = "Social - Privato";
+App::$strings["Community Forum"] = "Forum di discussione";
+App::$strings["Forum - Mostly Public"] = "Social - Prevalentemente pubblico";
+App::$strings["Forum - Restricted"] = "Forum - Con restrizioni";
+App::$strings["Forum - Private"] = "Forum - Privato";
+App::$strings["Feed Republish"] = "Aggregatore di feed esterni";
+App::$strings["Feed - Mostly Public"] = "Feed - Prevalentemente pubblico";
+App::$strings["Feed - Restricted"] = "Feed - Con restrizioni";
+App::$strings["Special Purpose"] = "Per finalità speciali";
+App::$strings["Special - Celebrity/Soapbox"] = "Speciale - Pagina per fan";
+App::$strings["Special - Group Repository"] = "Speciale - Repository di gruppo";
+App::$strings["Other"] = "Altro";
+App::$strings["Custom/Expert Mode"] = "Personalizzazione per esperti";
+App::$strings["Can view my channel stream and posts"] = "Può vedere i post e i contenuti del mio canale";
+App::$strings["Can send me their channel stream and posts"] = "È tra i canali che seguo";
+App::$strings["Can view my default channel profile"] = "Può vedere il profilo predefinito del canale";
+App::$strings["Can view my connections"] = "Può vedere i miei contatti";
+App::$strings["Can view my file storage and photos"] = "Può vedere il mio archivio file e foto";
+App::$strings["Can upload/modify my file storage and photos"] = "Può caricare o modificare i file e le foto del mio archivio";
+App::$strings["Can view my channel webpages"] = "Può vedere le pagine web del mio canale";
+App::$strings["Can create/edit my channel webpages"] = "Può creare o modificare le pagine web del mio canale";
+App::$strings["Can post on my channel (wall) page"] = "Può postare sulla mia bacheca";
+App::$strings["Can comment on or like my posts"] = "Può commentare o aggiungere \"mi piace\" ai miei post";
+App::$strings["Can send me private mail messages"] = "Può inviarmi messaggi privati";
+App::$strings["Can like/dislike profiles and profile things"] = "Può aggiungere un \"mi piace\" sul profilo e sugli oggetti del profilo";
+App::$strings["Can forward to all my channel connections via @+ mentions in posts"] = "Può inoltrare post a tutti i miei contatti con una menzione @+";
+App::$strings["Can chat with me"] = "Può aprire una chat con me";
+App::$strings["Can source my public posts in derived channels"] = "Può usare i miei post pubblici per creare canali derivati";
+App::$strings["Can administer my channel"] = "Può amministrare il mio canale";
 App::$strings["parent"] = "cartella superiore";
 App::$strings["Collection"] = "Cartella";
 App::$strings["Principal"] = "Principale";
@@ -37,63 +70,8 @@ App::$strings["Remote authentication blocked. You are logged into this site loca
 App::$strings["Welcome %s. Remote authentication successful."] = "Ciao %s. L'accesso tramite il tuo hub è avvenuto con successo.";
 App::$strings["Requested profile is not available."] = "Il profilo richiesto non è disponibile.";
 App::$strings["Some blurb about what to do when you're new here"] = "Qualche suggerimento per i nuovi utenti su cosa fare";
-App::$strings["Block Name"] = "Nome del block";
-App::$strings["Blocks"] = "Block";
-App::$strings["Block Title"] = "Titolo del block";
-App::$strings["Created"] = "Creato";
-App::$strings["Edited"] = "Modificato";
-App::$strings["Share"] = "Condividi";
-App::$strings["View"] = "Guarda";
-App::$strings["Channel not found."] = "Canale non trovato.";
-App::$strings["Permissions denied."] = "Permesso negato.";
-App::$strings["l, F j"] = "l j F";
-App::$strings["Link to Source"] = "Link al sito d'origine";
-App::$strings["Edit Event"] = "Modifica l'evento";
-App::$strings["Create Event"] = "Crea un evento";
-App::$strings["Previous"] = "Precendente";
-App::$strings["Next"] = "Successivo";
-App::$strings["Export"] = "Esporta";
-App::$strings["Import"] = "Importa";
-App::$strings["Submit"] = "Salva";
-App::$strings["Today"] = "Oggi";
-App::$strings["You must be logged in to see this page."] = "Devi aver effettuato l'accesso per vedere questa pagina.";
-App::$strings["Posts and comments"] = "Post e commenti";
-App::$strings["Only posts"] = "Solo post";
-App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Permessi insufficienti. Sarà visualizzata la pagina del profilo.";
-App::$strings["Room not found"] = "Chat non trovata";
-App::$strings["Leave Room"] = "Lascia la chat";
-App::$strings["Delete Room"] = "Elimina questa chat";
-App::$strings["I am away right now"] = "Non sono presente";
-App::$strings["I am online"] = "Sono online";
-App::$strings["Bookmark this room"] = "Aggiungi questa chat ai segnalibri";
-App::$strings["Please enter a link URL:"] = "Inserisci l'indirizzo del link:";
-App::$strings["Encrypt text"] = "Cifratura del messaggio";
-App::$strings["Insert web link"] = "Inserisci un indirizzo web";
-App::$strings["Feature disabled."] = "Funzionalità disattivata.";
-App::$strings["New Chatroom"] = "Nuova chat";
-App::$strings["Chatroom name"] = "Nome chat";
-App::$strings["Expiration of chats (minutes)"] = "Scadenza dei messaggi della chat (minuti)";
-App::$strings["Permissions"] = "Permessi";
-App::$strings["%1\$s's Chatrooms"] = "Le chat di %1\$s";
-App::$strings["No chatrooms available"] = "Nessuna chat disponibile";
-App::$strings["Create New"] = "Crea nuova";
-App::$strings["Expiration"] = "Scadenza";
-App::$strings["min"] = "min";
 App::$strings["Away"] = "Assente";
 App::$strings["Online"] = "Online";
-App::$strings["Invalid item."] = "Elemento non valido.";
-App::$strings["Bookmark added"] = "Segnalibro aggiunto";
-App::$strings["My Bookmarks"] = "I miei segnalibri";
-App::$strings["My Connections Bookmarks"] = "I segnalibri dei miei contatti";
-App::$strings["Continue"] = "Continua";
-App::$strings["Premium Channel Setup"] = "Canale premium - configurazione";
-App::$strings["Enable premium channel connection restrictions"] = "Abilita le restrizioni del canale premium";
-App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Scrivi le condizioni d'uso e le restrizioni di questo canale, come per esempio le linee guida, il sistema di pagamento, ecc.";
-App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Prima di connetterti a questo canale è necessario che tu accetti le seguenti condizioni:";
-App::$strings["Potential connections will then see the following text before proceeding:"] = "Il testo seguente comparirà a chi vorrà seguire il canale:";
-App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Continuando dichiaro di aver seguito tutte le indicazioni e le istruzioni fornite in questa pagina.";
-App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Il gestore del canale non ha fornito istruzioni specifiche)";
-App::$strings["Restricted or Premium Channel"] = "Canale premium - con restrizioni";
 App::$strings["Could not access contact record."] = "Non è possibile accedere alle informazioni sul contatto.";
 App::$strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato.";
 App::$strings["Connection updated."] = "Contatto aggiornato.";
@@ -158,6 +136,7 @@ App::$strings["Do not import posts with this text"] = "Non importare i post con
 App::$strings["This information is public!"] = "Questa informazione è pubblica!";
 App::$strings["Connection Pending Approval"] = "Contatti in attesa di approvazione";
 App::$strings["inherited"] = "derivato";
+App::$strings["Submit"] = "Salva";
 App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Seleziona il profilo che vuoi mostrare a %s dopo che ha effettuato l'accesso.";
 App::$strings["Their Settings"] = "Permessi concessi a te";
 App::$strings["My Settings"] = "Permessi che concedo";
@@ -166,6 +145,30 @@ App::$strings["Some permissions may be inherited from your channel's <a href=\"s
 App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Alcuni permessi derivano dalle <a href=\"settings\"><strong>impostazioni di privacy</strong></a> del tuo canale, che hanno priorità assoluta su qualsiasi altra impostazione scelta per i singoli contatti. Le personalizzazioni che effettuerai qui potrebbero non essere effettive a meno che tu non cambi le impostazioni generali.";
 App::$strings["Last update:"] = "Ultimo aggiornamento:";
 App::$strings["Public access denied."] = "Accesso pubblico negato.";
+App::$strings["Item not found."] = "Elemento non trovato.";
+App::$strings["First Name"] = "Nome";
+App::$strings["Last Name"] = "Cognome";
+App::$strings["Nickname"] = "Nick";
+App::$strings["Full Name"] = "Nome e cognome";
+App::$strings["Email"] = "Email";
+App::$strings["Profile Photo"] = "Foto del profilo";
+App::$strings["Profile Photo 16px"] = "Foto del profilo 16px";
+App::$strings["Profile Photo 32px"] = "Foto del profilo 32px";
+App::$strings["Profile Photo 48px"] = "Foto del profilo 48px";
+App::$strings["Profile Photo 64px"] = "Foto del profilo 64px";
+App::$strings["Profile Photo 80px"] = "Foto del profilo 80px";
+App::$strings["Profile Photo 128px"] = "Foto del profilo 128px";
+App::$strings["Timezone"] = "Fuso orario";
+App::$strings["Homepage URL"] = "Indirizzo home page";
+App::$strings["Language"] = "Lingua";
+App::$strings["Birth Year"] = "Anno di nascita";
+App::$strings["Birth Month"] = "Mese di nascita";
+App::$strings["Birth Day"] = "Giorno di nascita";
+App::$strings["Birthdate"] = "Data di nascita";
+App::$strings["Gender"] = "Sesso";
+App::$strings["Male"] = "Maschio";
+App::$strings["Female"] = "Femmina";
+App::$strings["Channel added."] = "Canale aggiunto.";
 App::$strings["%d rating"] = array(
 	0 => "%d valutazione",
 	1 => "%d valutazioni",
@@ -196,13 +199,74 @@ App::$strings["Reverse Alphabetic"] = "Alfabetico inverso";
 App::$strings["Newest to Oldest"] = "Prima i più recenti";
 App::$strings["Oldest to Newest"] = "Prima i più vecchi";
 App::$strings["No entries (some entries may be hidden)."] = "Nessun risultato (qualche elemento potrebbe essere nascosto).";
-App::$strings["Item not found."] = "Elemento non trovato.";
+App::$strings["Continue"] = "Continua";
+App::$strings["Premium Channel Setup"] = "Canale premium - configurazione";
+App::$strings["Enable premium channel connection restrictions"] = "Abilita le restrizioni del canale premium";
+App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Scrivi le condizioni d'uso e le restrizioni di questo canale, come per esempio le linee guida, il sistema di pagamento, ecc.";
+App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Prima di connetterti a questo canale è necessario che tu accetti le seguenti condizioni:";
+App::$strings["Potential connections will then see the following text before proceeding:"] = "Il testo seguente comparirà a chi vorrà seguire il canale:";
+App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Continuando dichiaro di aver seguito tutte le indicazioni e le istruzioni fornite in questa pagina.";
+App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Il gestore del canale non ha fornito istruzioni specifiche)";
+App::$strings["Restricted or Premium Channel"] = "Canale premium - con restrizioni";
+App::$strings["Calendar entries imported."] = "Le voci del calendario sono state importate.";
+App::$strings["No calendar entries found."] = "Non sono state trovate voci del calendario.";
+App::$strings["Event can not end before it has started."] = "Un evento non può terminare prima del suo inizio.";
+App::$strings["Unable to generate preview."] = "Impossibile creare un'anteprima.";
+App::$strings["Event title and start time are required."] = "Sono necessari il titolo e l'ora d'inizio dell'evento.";
+App::$strings["Event not found."] = "Evento non trovato.";
+App::$strings["event"] = "l'evento";
+App::$strings["Edit event title"] = "Modifica il titolo dell'evento";
+App::$strings["Event title"] = "Titolo dell'evento";
+App::$strings["Required"] = "Obbligatorio";
+App::$strings["Categories (comma-separated list)"] = "Categorie (separate da virgola)";
+App::$strings["Edit Category"] = "Modifica la categoria";
+App::$strings["Category"] = "Categoria";
+App::$strings["Edit start date and time"] = "Modifica data/ora di inizio";
+App::$strings["Start date and time"] = "Data e ora di inizio";
+App::$strings["Finish date and time are not known or not relevant"] = "La data e l'ora di fine non sono necessarie";
+App::$strings["Edit finish date and time"] = "Modifica data/ora di fine";
+App::$strings["Finish date and time"] = "Data e ora di fine";
+App::$strings["Adjust for viewer timezone"] = "Adatta al fuso orario di chi legge";
+App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante per eventi che avvengono online ma con un certo fuso orario.";
+App::$strings["Edit Description"] = "Modifica la descrizione";
+App::$strings["Description"] = "Descrizione";
+App::$strings["Edit Location"] = "Modifica il luogo";
+App::$strings["Location"] = "Posizione geografica";
+App::$strings["Share this event"] = "Condividi questo evento";
+App::$strings["Preview"] = "Anteprima";
+App::$strings["Permission settings"] = "Permessi dei tuoi contatti";
+App::$strings["Advanced Options"] = "Opzioni avanzate";
+App::$strings["l, F j"] = "l j F";
+App::$strings["Edit event"] = "Modifica l'evento";
+App::$strings["Delete event"] = "Elimina l'evento";
+App::$strings["Link to Source"] = "Link al sito d'origine";
+App::$strings["calendar"] = "calendario";
+App::$strings["Edit Event"] = "Modifica l'evento";
+App::$strings["Create Event"] = "Crea un evento";
+App::$strings["Previous"] = "Precendente";
+App::$strings["Next"] = "Successivo";
+App::$strings["Export"] = "Esporta";
+App::$strings["View"] = "Guarda";
+App::$strings["Month"] = "Mese";
+App::$strings["Week"] = "Settimana";
+App::$strings["Day"] = "Giorno";
+App::$strings["Today"] = "Oggi";
+App::$strings["Event removed"] = "Evento eliminato";
+App::$strings["Failed to remove event"] = "Impossibile eliminare l'evento";
+App::$strings["Bookmark added"] = "Segnalibro aggiunto";
+App::$strings["My Bookmarks"] = "I miei segnalibri";
+App::$strings["My Connections Bookmarks"] = "I segnalibri dei miei contatti";
 App::$strings["Item not found"] = "Elemento non trovato";
-App::$strings["Title (optional)"] = "Titolo (facoltativo)";
-App::$strings["Edit Block"] = "Modifica il block";
-App::$strings["No channel."] = "Nessun canale.";
-App::$strings["Common connections"] = "Contatti in comune";
-App::$strings["No connections in common."] = "Nessun contatto in comune.";
+App::$strings["Item is not editable"] = "L'elemento non è modificabile";
+App::$strings["Edit post"] = "Modifica post";
+App::$strings["Photos"] = "Foto";
+App::$strings["Cancel"] = "Annulla";
+App::$strings["Invalid item."] = "Elemento non valido.";
+App::$strings["Channel not found."] = "Canale non trovato.";
+App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+App::$strings["Save to Folder:"] = "Salva nella cartella:";
+App::$strings["- select -"] = "- scegli -";
+App::$strings["Save"] = "Salva";
 App::$strings["Blocked"] = "Bloccati";
 App::$strings["Ignored"] = "Ignorati";
 App::$strings["Hidden"] = "Nascosti";
@@ -254,51 +318,38 @@ App::$strings["select a photo from your photo albums"] = "seleziona una foto dai
 App::$strings["Crop Image"] = "Ritaglia immagine";
 App::$strings["Please adjust the image cropping for optimum viewing."] = "Ritaglia l'immagine per migliorarne la visualizzazione.";
 App::$strings["Done Editing"] = "Modifica terminata";
-App::$strings["Item is not editable"] = "L'elemento non è modificabile";
-App::$strings["Edit post"] = "Modifica post";
-App::$strings["Calendar entries imported."] = "Le voci del calendario sono state importate.";
-App::$strings["No calendar entries found."] = "Non sono state trovate voci del calendario.";
-App::$strings["Event can not end before it has started."] = "Un evento non può terminare prima del suo inizio.";
-App::$strings["Unable to generate preview."] = "Impossibile creare un'anteprima.";
-App::$strings["Event title and start time are required."] = "Sono necessari il titolo e l'ora d'inizio dell'evento.";
-App::$strings["Event not found."] = "Evento non trovato.";
-App::$strings["event"] = "l'evento";
-App::$strings["Edit event title"] = "Modifica il titolo dell'evento";
-App::$strings["Event title"] = "Titolo dell'evento";
-App::$strings["Required"] = "Obbligatorio";
-App::$strings["Categories (comma-separated list)"] = "Categorie (separate da virgola)";
-App::$strings["Edit Category"] = "Modifica la categoria";
-App::$strings["Category"] = "Categoria";
-App::$strings["Edit start date and time"] = "Modifica data/ora di inizio";
-App::$strings["Start date and time"] = "Data e ora di inizio";
-App::$strings["Finish date and time are not known or not relevant"] = "La data e l'ora di fine non sono necessarie";
-App::$strings["Edit finish date and time"] = "Modifica data/ora di fine";
-App::$strings["Finish date and time"] = "Data e ora di fine";
-App::$strings["Adjust for viewer timezone"] = "Adatta al fuso orario di chi legge";
-App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Importante per eventi che avvengono online ma con un certo fuso orario.";
-App::$strings["Edit Description"] = "Modifica la descrizione";
-App::$strings["Description"] = "Descrizione";
-App::$strings["Edit Location"] = "Modifica il luogo";
-App::$strings["Location"] = "Posizione geografica";
-App::$strings["Share this event"] = "Condividi questo evento";
-App::$strings["Preview"] = "Anteprima";
-App::$strings["Permission settings"] = "Permessi dei tuoi contatti";
-App::$strings["Advanced Options"] = "Opzioni avanzate";
-App::$strings["Edit event"] = "Modifica l'evento";
-App::$strings["Delete event"] = "Elimina l'evento";
-App::$strings["calendar"] = "calendario";
-App::$strings["Event removed"] = "Evento eliminato";
-App::$strings["Failed to remove event"] = "Impossibile eliminare l'evento";
-App::$strings["Photos"] = "Foto";
-App::$strings["Cancel"] = "Annulla";
+App::$strings["webpage"] = "pagina web";
+App::$strings["block"] = "block";
+App::$strings["layout"] = "layout";
+App::$strings["menu"] = "menu";
+App::$strings["%s element installed"] = "%s elemento installato";
+App::$strings["%s element installation failed"] = "Elementi con installazione fallita: %s";
+App::$strings["Permissions denied."] = "Permesso negato.";
+App::$strings["Import"] = "Importa";
 App::$strings["This site is not a directory server"] = "Questo non è un directory server";
 App::$strings["This directory server requires an access token"] = "Questo directory server necessita di un token di autenticazione";
-App::$strings["Save to Folder:"] = "Salva nella cartella:";
-App::$strings["- select -"] = "- scegli -";
-App::$strings["Save"] = "Salva";
+App::$strings["You must be logged in to see this page."] = "Devi aver effettuato l'accesso per vedere questa pagina.";
+App::$strings["Room not found"] = "Chat non trovata";
+App::$strings["Leave Room"] = "Lascia la chat";
+App::$strings["Delete Room"] = "Elimina questa chat";
+App::$strings["I am away right now"] = "Non sono presente";
+App::$strings["I am online"] = "Sono online";
+App::$strings["Bookmark this room"] = "Aggiungi questa chat ai segnalibri";
+App::$strings["Please enter a link URL:"] = "Inserisci l'indirizzo del link:";
+App::$strings["Encrypt text"] = "Cifratura del messaggio";
+App::$strings["Insert web link"] = "Inserisci un indirizzo web";
+App::$strings["Feature disabled."] = "Funzionalità disattivata.";
+App::$strings["New Chatroom"] = "Nuova chat";
+App::$strings["Chatroom name"] = "Nome chat";
+App::$strings["Expiration of chats (minutes)"] = "Scadenza dei messaggi della chat (minuti)";
+App::$strings["Permissions"] = "Permessi";
+App::$strings["%1\$s's Chatrooms"] = "Le chat di %1\$s";
+App::$strings["No chatrooms available"] = "Nessuna chat disponibile";
+App::$strings["Create New"] = "Crea nuova";
+App::$strings["Expiration"] = "Scadenza";
+App::$strings["min"] = "min";
 App::$strings["Invalid message"] = "Messaggio non valido";
 App::$strings["no results"] = "nessun risultato";
-App::$strings["Delivery report for %1\$s"] = "Rapporto di consegna - %1\$s";
 App::$strings["channel sync processed"] = "sincronizzazione del canale effettuata";
 App::$strings["queued"] = "in coda";
 App::$strings["posted"] = "inviato";
@@ -310,14 +361,14 @@ App::$strings["recipient not found"] = "Destinatario non trovato";
 App::$strings["mail recalled"] = "messaggio richiamato dal mittente";
 App::$strings["duplicate mail received"] = "ricevuto messaggio duplicato";
 App::$strings["mail delivered"] = "messaggio recapitato";
+App::$strings["Delivery report for %1\$s"] = "Rapporto di consegna - %1\$s";
+App::$strings["Options"] = "Opzioni";
+App::$strings["Redeliver"] = "Reinvia";
 App::$strings["Layout Name"] = "Nome layout";
 App::$strings["Layout Description (Optional)"] = "Descrizione del layout (facoltativa)";
 App::$strings["Edit Layout"] = "Modifica il layout";
 App::$strings["Page link"] = "Link alla pagina";
 App::$strings["Edit Webpage"] = "Modifica la pagina web";
-App::$strings["Channel added."] = "Canale aggiunto.";
-App::$strings["network"] = "rete";
-App::$strings["RSS"] = "RSS";
 App::$strings["Privacy group created."] = "Gruppo di canali creato.";
 App::$strings["Could not create privacy group."] = "Impossibile creare il gruppo di canali.";
 App::$strings["Privacy group not found."] = "Gruppo di canali non trovato.";
@@ -331,16 +382,33 @@ App::$strings["Privacy group editor"] = "Editor dei gruppi di canali";
 App::$strings["Members"] = "Membri";
 App::$strings["All Connected Channels"] = "Tutti i canali connessi";
 App::$strings["Click on a channel to add or remove."] = "Clicca su un canale per aggiungerlo o rimuoverlo.";
-App::$strings["Share content from Firefox to \$Projectname"] = "Condividi i contenuti su \$Projectname da Firefox";
-App::$strings["Activate the Firefox \$Projectname provider"] = "Attiva Firefox Share per \$Projectname";
-App::$strings["Authorize application connection"] = "Autorizza la app";
-App::$strings["Return to your app and insert this Securty Code:"] = "Torna alla app e inserisci questo codice di sicurezza:";
-App::$strings["Please login to continue."] = "Accedi al sito per continuare.";
-App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?";
+App::$strings["App installed."] = "App installata";
+App::$strings["Malformed app."] = "L'app contiene errori";
+App::$strings["Embed code"] = "Inserisci il codice";
+App::$strings["Edit App"] = "Modifica app";
+App::$strings["Create App"] = "Crea una app";
+App::$strings["Name of app"] = "Nome app";
+App::$strings["Location (URL) of app"] = "Indirizzo (URL) della app";
+App::$strings["Photo icon URL"] = "URL icona";
+App::$strings["80 x 80 pixels - optional"] = "80 x 80 pixel - facoltativa";
+App::$strings["Categories (optional, comma separated list)"] = "Categorie (facoltative, lista separata da virgole)";
+App::$strings["Version ID"] = "ID versione";
+App::$strings["Price of app"] = "Prezzo app";
+App::$strings["Location (URL) to purchase app"] = "Indirizzo (URL) per acquistare la app";
 App::$strings["Documentation Search"] = "Ricerca nella guida";
 App::$strings["Help:"] = "Guida:";
 App::$strings["Help"] = "Guida";
 App::$strings["\$Projectname Documentation"] = "Guida di \$Projectname";
+App::$strings["Item not available."] = "Elemento non disponibile.";
+App::$strings["Layout updated."] = "Layout aggiornato.";
+App::$strings["Edit System Page Description"] = "Modifica i layout di sistema";
+App::$strings["Layout not found."] = "Layout non trovato.";
+App::$strings["Module Name:"] = "Nome del modulo:";
+App::$strings["Layout Help"] = "Guida al layout";
+App::$strings["Share content from Firefox to \$Projectname"] = "Condividi i contenuti su \$Projectname da Firefox";
+App::$strings["Activate the Firefox \$Projectname provider"] = "Attiva Firefox Share per \$Projectname";
+App::$strings["network"] = "rete";
+App::$strings["RSS"] = "RSS";
 App::$strings["Permission Denied."] = "Permesso negato.";
 App::$strings["File not found."] = "File non trovato.";
 App::$strings["Edit file permissions"] = "Modifica i permessi del file";
@@ -352,70 +420,13 @@ App::$strings["Copy/paste this URL to link file from a web page"] = "Copia/incol
 App::$strings["Share this file"] = "Condividi questo file";
 App::$strings["Show URL to this file"] = "Mostra l'URL del file";
 App::$strings["Notify your contacts about this file"] = "Notifica ai contatti che hai caricato questo file";
-App::$strings["Apps"] = "App";
-App::$strings["Item not available."] = "Elemento non disponibile.";
-App::$strings["Your service plan only allows %d channels."] = "Il tuo account permette di creare al massimo %d canali.";
-App::$strings["Nothing to import."] = "Non c'è niente da importare.";
-App::$strings["Unable to download data from old server"] = "Impossibile importare i dati dal vecchio hub";
-App::$strings["Imported file is empty."] = "Il file da importare è vuoto.";
-App::$strings["Warning: Database versions differ by %1\$d updates."] = "Attenzione: le versioni di database differiscono di %1\$d aggiornamenti.";
-App::$strings["Cloned channel not found. Import failed."] = "Impossibile trovare il canale clonato. L'importazione è fallita.";
-App::$strings["No channel. Import failed."] = "Nessun canale. Import fallito.";
-App::$strings["Import completed."] = "L'importazione è terminata con successo.";
-App::$strings["You must be logged in to use this feature."] = "Per questa funzionalità devi aver effettuato l'accesso.";
-App::$strings["Import Channel"] = "Importa un canale";
-App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Usa questo modulo per importare un tuo canale da un altro hub. Puoi ottenere i dati identificativi del canale direttamente dall'altro hub oppure tramite un file esportato in precedenza.";
-App::$strings["File to Upload"] = "File da caricare";
-App::$strings["Or provide the old server/hub details"] = "Oppure fornisci i dettagli del vecchio hub";
-App::$strings["Your old identity address (xyz@example.com)"] = "Il tuo vecchio identificativo (per esempio pippo@esempio.com)";
-App::$strings["Your old login email address"] = "L'email che usavi per accedere sul vecchio hub";
-App::$strings["Your old login password"] = "La password per il vecchio hub";
-App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Scegli se vuoi spostare il tuo indirizzo primario su questo hub, oppure se preferisci che quello vecchio resti tale. Potrai pubblicare da entrambi i hub, ma solamente uno sarà indicato come la posizione su cui risiedono i tuoi file, foto, ecc.";
-App::$strings["Make this hub my primary location"] = "Rendi questo hub il mio indirizzo primario";
-App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importa i contenuti pubblicati, se possibile (sperimentale)";
-App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Questa funzione potrebbe impiegare molto tempo a terminare. Per favore lanciala *una volta sola* e resta su questa pagina finché non avrà finito.";
-App::$strings["Unable to locate original post."] = "Impossibile trovare il messaggio originale.";
-App::$strings["Empty post discarded."] = "Il post vuoto è stato ignorato.";
-App::$strings["Executable content type not permitted to this channel."] = "I contenuti eseguibili non sono permessi su questo canale.";
-App::$strings["Duplicate post suppressed."] = "I post duplicati sono scartati.";
-App::$strings["System error. Post not saved."] = "Errore di sistema. Post non salvato.";
-App::$strings["Unable to obtain post information from database."] = "Impossibile caricare il post dal database.";
-App::$strings["You have reached your limit of %1$.0f top level posts."] = "Hai raggiunto il limite massimo di %1$.0f post sulla pagina principale.";
-App::$strings["You have reached your limit of %1$.0f webpages."] = "Hai raggiunto il limite massimo di %1$.0f pagine web.";
 App::$strings["Layouts"] = "Layout";
 App::$strings["Comanche page description language help"] = "Guida di Comanche Page Description Language";
 App::$strings["Layout Description"] = "Descrizione del layout";
+App::$strings["Created"] = "Creato";
+App::$strings["Edited"] = "Modificato";
+App::$strings["Share"] = "Condividi";
 App::$strings["Download PDL file"] = "Scarica il file PDL";
-App::$strings["\$Projectname"] = "\$Projectname";
-App::$strings["Welcome to %s"] = "%s ti dà il benvenuto";
-App::$strings["First Name"] = "Nome";
-App::$strings["Last Name"] = "Cognome";
-App::$strings["Nickname"] = "Nick";
-App::$strings["Full Name"] = "Nome e cognome";
-App::$strings["Email"] = "Email";
-App::$strings["Profile Photo"] = "Foto del profilo";
-App::$strings["Profile Photo 16px"] = "Foto del profilo 16px";
-App::$strings["Profile Photo 32px"] = "Foto del profilo 32px";
-App::$strings["Profile Photo 48px"] = "Foto del profilo 48px";
-App::$strings["Profile Photo 64px"] = "Foto del profilo 64px";
-App::$strings["Profile Photo 80px"] = "Foto del profilo 80px";
-App::$strings["Profile Photo 128px"] = "Foto del profilo 128px";
-App::$strings["Timezone"] = "Fuso orario";
-App::$strings["Homepage URL"] = "Indirizzo home page";
-App::$strings["Language"] = "Lingua";
-App::$strings["Birth Year"] = "Anno di nascita";
-App::$strings["Birth Month"] = "Mese di nascita";
-App::$strings["Birth Day"] = "Giorno di nascita";
-App::$strings["Birthdate"] = "Data di nascita";
-App::$strings["Gender"] = "Sesso";
-App::$strings["Male"] = "Maschio";
-App::$strings["Female"] = "Femmina";
-App::$strings["webpage"] = "pagina web";
-App::$strings["block"] = "block";
-App::$strings["layout"] = "layout";
-App::$strings["menu"] = "menu";
-App::$strings["%s element installed"] = "%s elemento installato";
-App::$strings["%s element installation failed"] = "Elementi con installazione fallita: %s";
 App::$strings["Like/Dislike"] = "Mi piace/Non mi piace";
 App::$strings["This action is restricted to members."] = "Questa funzionalità è riservata agli iscritti.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Per continuare devi <a href=\"rmagic\">accedere con il tuo identificativo \$Projectname</a> o <a href=\"register\">registrarti come nuovo utente \$Projectname</a>.";
@@ -436,180 +447,108 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%3\$s di %2\$s: %1\$s n
 App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%3\$s di %2\$s: %1\$s forse partecipa";
 App::$strings["Action completed."] = "Comando completato.";
 App::$strings["Thank you."] = "Grazie.";
-App::$strings["Import completed"] = "Importazione completata";
-App::$strings["Import Items"] = "Importa i contenuti";
-App::$strings["Use this form to import existing posts and content from an export file."] = "Usa questa funzionalità per importare i vecchi contenuti e i post da un file esportato in precedenza.";
-App::$strings["Total invitation limit exceeded."] = "Hai superato il numero massimo di inviti.";
-App::$strings["%s : Not a valid email address."] = "%s: non è un indirizzo email valido.";
-App::$strings["Please join us on \$Projectname"] = "Unisciti a noi su \$Projectname";
-App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Hai superato il numero massimo di inviti. Contatta l'amministratore se necessario.";
-App::$strings["%s : Message delivery failed."] = "%s: la consegna del messaggio è fallita.";
-App::$strings["%d message sent."] = array(
-	0 => "%d messaggio inviato.",
-	1 => "%d messaggi inviati.",
-);
-App::$strings["You have no more invitations available"] = "Non hai altri inviti disponibili";
-App::$strings["Send invitations"] = "Spedisci inviti";
-App::$strings["Enter email addresses, one per line:"] = "Inserisci gli indirizzi email, uno per riga:";
-App::$strings["Your message:"] = "Il tuo messaggio:";
-App::$strings["Please join my community on \$Projectname."] = "Entra nella mia comunità su \$Projectname.";
-App::$strings["You will need to supply this invitation code:"] = "Dovrai fornire questo codice invito:";
-App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registrati su qualsiasi server \$Projectname (sono tutti interconnessi)";
-App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Inserisci il mio indirizzo \$Projectname nel riquadro di ricerca del sito.";
-App::$strings["or visit"] = "oppure visita";
-App::$strings["3. Click [Connect]"] = "3. Clicca su [Aggiungi]";
-App::$strings["Remote privacy information not available."] = "Le informazioni remote sulla privacy non sono disponibili.";
-App::$strings["Visible to:"] = "Visibile a:";
-App::$strings["Location not found."] = "Indirizzo non trovato.";
-App::$strings["Location lookup failed."] = "La ricerca dell'indirizzo è fallita.";
-App::$strings["Please select another location to become primary before removing the primary location."] = "Prima di rimuovere il tuo canale primario assicurati di avere scelto una sua copia (clone) come primaria.";
-App::$strings["Syncing locations"] = "Sincronizzazione tra hub";
-App::$strings["No locations found."] = "Nessun indirizzo trovato.";
-App::$strings["Manage Channel Locations"] = "Modifica gli indirizzi del canale";
+App::$strings["Profile not found."] = "Profilo non trovato.";
+App::$strings["Profile deleted."] = "Profilo eliminato.";
+App::$strings["Profile-"] = "Profilo-";
+App::$strings["New profile created."] = "Il nuovo profilo è stato creato.";
+App::$strings["Profile unavailable to clone."] = "Impossibile duplicare il profilo.";
+App::$strings["Profile unavailable to export."] = "Il profilo non è disponibile per l'export.";
+App::$strings["Profile Name is required."] = "Il nome del profilo è obbligatorio.";
+App::$strings["Marital Status"] = "Stato sentimentale";
+App::$strings["Romantic Partner"] = "Partner affettivo";
+App::$strings["Likes"] = "Mi piace";
+App::$strings["Dislikes"] = "Non mi piace";
+App::$strings["Work/Employment"] = "Lavoro/impiego";
+App::$strings["Religion"] = "Religione";
+App::$strings["Political Views"] = "Orientamento politico";
+App::$strings["Sexual Preference"] = "Preferenze sessuali";
+App::$strings["Homepage"] = "Home page";
+App::$strings["Interests"] = "Interessi";
 App::$strings["Address"] = "Indirizzo";
-App::$strings["Primary"] = "Primario";
-App::$strings["Drop"] = "Elimina";
-App::$strings["Sync Now"] = "Sincronizza ora";
-App::$strings["Please wait several minutes between consecutive operations."] = "Si raccomanda di attendere alcuni minuti prima di effettuare una nuova sincronizzazione.";
-App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Quando possibile, riduci il numero di cloni del tuo canale effettuando il login sul relativo hub e rimuovendoli.";
-App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Usa questo modulo per abbandonare un canale su un hub che non è più funzionante.";
-App::$strings["Hub not found."] = "Hub non trovato.";
-App::$strings["Unable to lookup recipient."] = "Impossibile associare un destinatario.";
-App::$strings["Unable to communicate with requested channel."] = "Impossibile comunicare con il canale richiesto.";
-App::$strings["Cannot verify requested channel."] = "Impossibile verificare il canale richiesto.";
-App::$strings["Selected channel has private message restrictions. Send failed."] = "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito.";
-App::$strings["Messages"] = "Messaggi";
-App::$strings["Message recalled."] = "Messaggio revocato.";
-App::$strings["Conversation removed."] = "Conversazione rimossa.";
-App::$strings["Expires YYYY-MM-DD HH:MM"] = "Scade il YYYY-MM-DD HH:MM";
-App::$strings["Requested channel is not in this network"] = "Il canale cercato non è in questa rete";
-App::$strings["Send Private Message"] = "Invia un messaggio privato";
-App::$strings["To:"] = "A:";
-App::$strings["Subject:"] = "Oggetto:";
-App::$strings["Attach file"] = "Allega file";
-App::$strings["Send"] = "Invia";
-App::$strings["Set expiration date"] = "Data di scadenza";
-App::$strings["Delete message"] = "Elimina il messaggio";
-App::$strings["Delivery report"] = "Rapporto di trasmissione";
-App::$strings["Recall message"] = "Revoca il messaggio";
-App::$strings["Message has been recalled."] = "Il messaggio è stato revocato.";
-App::$strings["Delete Conversation"] = "Elimina la conversazione";
-App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente.";
-App::$strings["Send Reply"] = "Invia la risposta";
-App::$strings["Your message for %s (%s):"] = "Il tuo messaggio per %s (%s):";
-App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Hai creato %1$.0f dei %2$.0f canali permessi.";
-App::$strings["Create a new channel"] = "Crea un nuovo canale";
-App::$strings["Channel Manager"] = "Gestione canali";
-App::$strings["Current Channel"] = "Canale attuale";
-App::$strings["Switch to one of your channels by selecting it."] = "Seleziona l'altro canale a cui vuoi passare.";
-App::$strings["Default Channel"] = "Canale predefinito";
-App::$strings["Make Default"] = "Rendi predefinito";
-App::$strings["%d new messages"] = "%d nuovi messaggi";
-App::$strings["%d new introductions"] = "%d nuove richieste di entrare in contatto";
-App::$strings["Delegated Channel"] = "Canale delegato";
-App::$strings["No valid account found."] = "Nessun account valido trovato.";
-App::$strings["Password reset request issued. Check your email."] = "La richiesta per reimpostare la password è stata inviata. Controlla la tua email.";
-App::$strings["Site Member (%s)"] = "Utente del sito (%s)";
-App::$strings["Password reset requested at %s"] = "È stato richiesto di reimpostare password su %s";
-App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non sarà reimpostata.";
-App::$strings["Password Reset"] = "Reimposta la password";
-App::$strings["Your password has been reset as requested."] = "La password è stata reimpostata come richiesto.";
-App::$strings["Your new password is"] = "La tua nuova password è";
-App::$strings["Save or copy your new password - and then"] = "Salva o copia la tua nuova password, quindi";
-App::$strings["click here to login"] = "clicca qui per accedere";
-App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puoi cambiare la tua password dalla pagina delle <em>Impostazioni</em> dopo aver effettuato l'accesso.";
-App::$strings["Your password has changed at %s"] = "La tua password su %s è cambiata";
-App::$strings["Forgot your Password?"] = "Hai dimenticato la password?";
-App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Inserisci il tuo indirizzo email per reimpostare la password. Dopo aver inviato la richiesta, controlla l'email e troverai le istruzioni per continuare.";
-App::$strings["Email Address"] = "Indirizzo email";
-App::$strings["Reset"] = "Reimposta";
-App::$strings["Unable to update menu."] = "Impossibile aggiornare il menù.";
-App::$strings["Unable to create menu."] = "Impossibile creare il menù.";
-App::$strings["Menu Name"] = "Nome del menu";
-App::$strings["Unique name (not visible on webpage) - required"] = "Nome unico (non visibile sulla pagina) - obbligatorio";
-App::$strings["Menu Title"] = "Titolo del menu";
-App::$strings["Visible on webpage - leave empty for no title"] = "Visibile sulla pagina - lascia vuoto per non avere un titolo";
-App::$strings["Allow Bookmarks"] = "Permetti i segnalibri";
-App::$strings["Menu may be used to store saved bookmarks"] = "Puoi salvare i segnalibri nei menù";
-App::$strings["Submit and proceed"] = "Salva e procedi";
-App::$strings["Menus"] = "Menù";
-App::$strings["Bookmarks allowed"] = "Permetti segnalibri";
-App::$strings["Delete this menu"] = "Elimina questo menù";
-App::$strings["Edit menu contents"] = "Modifica i contenuti del menù";
-App::$strings["Edit this menu"] = "Modifica questo menù";
-App::$strings["Menu could not be deleted."] = "Il menù non può essere eliminato.";
-App::$strings["Menu not found."] = "Menù non trovato.";
-App::$strings["Edit Menu"] = "Modifica menù";
-App::$strings["Add or remove entries to this menu"] = "Aggiungi o rimuovi elementi di questo menù";
-App::$strings["Menu name"] = "Nome del menù";
-App::$strings["Must be unique, only seen by you"] = "Deve essere unico, lo vedrai solo tu";
-App::$strings["Menu title"] = "Titolo del menù";
-App::$strings["Menu title as seen by others"] = "Titolo del menù come comparirà a tutti";
-App::$strings["Allow bookmarks"] = "Permetti l'invio di segnalibri";
-App::$strings["Not found."] = "Non trovato.";
-App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s è %2\$s";
-App::$strings["Mood"] = "Umore";
-App::$strings["Set your current mood and tell your friends"] = "Scegli il tuo umore attuale per mostrarlo agli amici";
-App::$strings["Profile Match"] = "Profili corrispondenti";
-App::$strings["No keywords to match. Please add keywords to your default profile."] = "Non hai scritto parole chiave. Aggiungi parole chiave al tuo profilo predefinito per comparire nelle ricerche.";
-App::$strings["is interested in:"] = "interessi personali:";
-App::$strings["No matches"] = "Nessun risultato";
-App::$strings["No such group"] = "Impossibile trovare il gruppo di canali";
-App::$strings["No such channel"] = "Canale sconosciuto";
-App::$strings["forum"] = "forum";
-App::$strings["Search Results For:"] = "Cerca risultati con:";
-App::$strings["Privacy group is empty"] = "Il gruppo di canali è vuoto";
-App::$strings["Privacy group: "] = "Gruppo di canali:";
-App::$strings["Invalid connection."] = "Contatto non valido.";
-App::$strings["No more system notifications."] = "Non ci sono nuove notifiche di sistema.";
-App::$strings["System Notifications"] = "Notifiche di sistema";
-App::$strings["Unable to create element."] = "Impossibile creare l'elemento.";
-App::$strings["Unable to update menu element."] = "Non è possibile aggiornare l'elemento del menù.";
-App::$strings["Unable to add menu element."] = "Impossibile aggiungere l'elemento al menù.";
-App::$strings["Menu Item Permissions"] = "Permessi del menu";
-App::$strings["(click to open/close)"] = "(clicca per aprire/chiudere)";
-App::$strings["Link Name"] = "Nome link";
-App::$strings["Link or Submenu Target"] = "Azione del link o del sottomenu";
-App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Inserisci l'indirizzo del link o scegli il nome di un sottomenu";
-App::$strings["Use magic-auth if available"] = "Usa l'autenticazione tramite il tuo hub, se disponibile";
-App::$strings["Open link in new window"] = "Apri il link in una nuova finestra";
-App::$strings["Order in list"] = "Ordine dell'elenco";
-App::$strings["Higher numbers will sink to bottom of listing"] = "I numeri più alti andranno in fondo all'elenco";
-App::$strings["Submit and finish"] = "Salva e termina";
-App::$strings["Submit and continue"] = "Salva e continua";
-App::$strings["Menu:"] = "Menu:";
-App::$strings["Link Target"] = "Destinazione link";
-App::$strings["Edit menu"] = "Modifica il menù";
-App::$strings["Edit element"] = "Modifica l'elemento";
-App::$strings["Drop element"] = "Elimina l'elemento";
-App::$strings["New element"] = "Nuovo elemento";
-App::$strings["Edit this menu container"] = "Modifica il contenitore del menù";
-App::$strings["Add menu element"] = "Aggiungi un elemento al menù";
-App::$strings["Delete this menu item"] = "Elimina questo elemento del menù";
-App::$strings["Edit this menu item"] = "Modifica questo elemento del menù";
-App::$strings["Menu item not found."] = "L'elemento del menù non è stato trovato.";
-App::$strings["Menu item deleted."] = "L'elemento del menù è stato eliminato.";
-App::$strings["Menu item could not be deleted."] = "L'elemento del menù non può essere eliminato.";
-App::$strings["Edit Menu Element"] = "Modifica l'elemento del menù";
-App::$strings["Link text"] = "Testo del link";
-App::$strings["Name or caption"] = "Nome o titolo";
-App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\"";
-App::$strings["Choose a short nickname"] = "Scegli un nome breve";
-App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale, per esempio nickname%s";
-App::$strings["Channel role and privacy"] = "Tipo di canale e privacy";
-App::$strings["Select a channel role with your privacy requirements."] = "Scegli il tipo di canale che vuoi e la privacy da applicare.";
-App::$strings["Read more about roles"] = "Maggiori informazioni sui ruoli";
-App::$strings["Create Channel"] = "Crea un canale";
-App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canale è la tua identità su questa rete. Può rappresentare una persona, un blog o un forum, per esempio. Il tuo canale può essere in contatto con altri canali per condividere contenuti con permessi anche molto dettagliati.";
-App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "oppure <a href=\"import\">importa un canale esistente</a> da un altro server/hub.";
-App::$strings["Invalid request identifier."] = "L'identificativo della richiesta non è valido.";
-App::$strings["Discard"] = "Rifiuta";
-App::$strings["Mark all system notifications seen"] = "Segna come lette le notifiche di sistema";
+App::$strings["Profile updated."] = "Profilo aggiornato.";
+App::$strings["Hide your connections list from viewers of this profile"] = "Nascondi la tua lista di contatti ai visitatori di questo profilo";
+App::$strings["Edit Profile Details"] = "Modifica i dettagli del profilo";
+App::$strings["View this profile"] = "Guarda questo profilo";
+App::$strings["Edit visibility"] = "Cambia la visibilità";
+App::$strings["Profile Tools"] = "Gestione del profilo";
+App::$strings["Change cover photo"] = "Cambia la copertina del canale";
+App::$strings["Change profile photo"] = "Cambia la foto del profilo";
+App::$strings["Create a new profile using these settings"] = "Crea un nuovo profilo usando queste impostazioni";
+App::$strings["Clone this profile"] = "Clona questo profilo";
+App::$strings["Delete this profile"] = "Elimina questo profilo";
+App::$strings["Add profile things"] = "Aggiungi oggetti al profilo";
+App::$strings["Personal"] = "Personali";
+App::$strings["Relation"] = "Relazione";
+App::$strings["Miscellaneous"] = "Altro";
+App::$strings["Import profile from file"] = "Importa il profilo da un file";
+App::$strings["Export profile to file"] = "Esporta il profilo in un file";
+App::$strings["Your gender"] = "Sesso";
+App::$strings["Marital status"] = "Stato civile";
+App::$strings["Sexual preference"] = "Preferenze sessuali";
+App::$strings["Profile name"] = "Nome del profilo";
+App::$strings["This is your default profile."] = "Questo è il tuo profilo predefinito.";
+App::$strings["Your full name"] = "Il tuo nome completo";
+App::$strings["Title/Description"] = "Titolo/descrizione";
+App::$strings["Street address"] = "Indirizzo (via/piazza)";
+App::$strings["Locality/City"] = "Località";
+App::$strings["Region/State"] = "Regione/stato";
+App::$strings["Postal/Zip code"] = "CAP";
+App::$strings["Country"] = "Nazione";
+App::$strings["Who (if applicable)"] = "Con chi (se possibile)";
+App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Per esempio: cathy123, Cathy Williams, cathy@example.com";
+App::$strings["Since (date)"] = "dal (data)";
+App::$strings["Tell us about yourself"] = "Raccontaci di te...";
+App::$strings["Hometown"] = "Città dove vivo";
+App::$strings["Political views"] = "Orientamento politico";
+App::$strings["Religious views"] = "Orientamento religioso";
+App::$strings["Keywords used in directory listings"] = "Parole chiavi mostrate nell'elenco dei canali";
+App::$strings["Example: fishing photography software"] = "Per esempio: pesca fotografia programmazione";
+App::$strings["Musical interests"] = "Interessi musicali";
+App::$strings["Books, literature"] = "Libri, letteratura";
+App::$strings["Television"] = "Televisione";
+App::$strings["Film/Dance/Culture/Entertainment"] = "Film, danza, cultura, intrattenimento";
+App::$strings["Hobbies/Interests"] = "Hobby/interessi";
+App::$strings["Love/Romance"] = "Amore";
+App::$strings["School/Education"] = "Scuola/educazione";
+App::$strings["Contact information and social networks"] = "Contatti e social network";
+App::$strings["My other channels"] = "I miei altri canali";
+App::$strings["Profile Image"] = "Immagine del profilo";
+App::$strings["Edit Profiles"] = "Modifica i tuoi profili";
+App::$strings["Your service plan only allows %d channels."] = "Il tuo account permette di creare al massimo %d canali.";
+App::$strings["Nothing to import."] = "Non c'è niente da importare.";
+App::$strings["Unable to download data from old server"] = "Impossibile importare i dati dal vecchio hub";
+App::$strings["Imported file is empty."] = "Il file da importare è vuoto.";
+App::$strings["Warning: Database versions differ by %1\$d updates."] = "Attenzione: le versioni di database differiscono di %1\$d aggiornamenti.";
+App::$strings["Cloned channel not found. Import failed."] = "Impossibile trovare il canale clonato. L'importazione è fallita.";
+App::$strings["No channel. Import failed."] = "Nessun canale. Import fallito.";
+App::$strings["Import completed."] = "L'importazione è terminata con successo.";
+App::$strings["You must be logged in to use this feature."] = "Per questa funzionalità devi aver effettuato l'accesso.";
+App::$strings["Import Channel"] = "Importa un canale";
+App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Usa questo modulo per importare un tuo canale da un altro hub. Puoi ottenere i dati identificativi del canale direttamente dall'altro hub oppure tramite un file esportato in precedenza.";
+App::$strings["File to Upload"] = "File da caricare";
+App::$strings["Or provide the old server/hub details"] = "Oppure fornisci i dettagli del vecchio hub";
+App::$strings["Your old identity address (xyz@example.com)"] = "Il tuo vecchio identificativo (per esempio pippo@esempio.com)";
+App::$strings["Your old login email address"] = "L'email che usavi per accedere sul vecchio hub";
+App::$strings["Your old login password"] = "La password per il vecchio hub";
+App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Scegli se vuoi spostare il tuo indirizzo primario su questo hub, oppure se preferisci che quello vecchio resti tale. Potrai pubblicare da entrambi i hub, ma solamente uno sarà indicato come la posizione su cui risiedono i tuoi file, foto, ecc.";
+App::$strings["Make this hub my primary location"] = "Rendi questo hub il mio indirizzo primario";
+App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importa i contenuti pubblicati, se possibile (sperimentale)";
+App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Questa funzione potrebbe impiegare molto tempo a terminare. Per favore lanciala *una volta sola* e resta su questa pagina finché non avrà finito.";
+App::$strings["\$Projectname"] = "\$Projectname";
+App::$strings["Welcome to %s"] = "%s ti dà il benvenuto";
+App::$strings["Unable to locate original post."] = "Impossibile trovare il messaggio originale.";
+App::$strings["Empty post discarded."] = "Il post vuoto è stato ignorato.";
+App::$strings["Executable content type not permitted to this channel."] = "I contenuti eseguibili non sono permessi su questo canale.";
+App::$strings["Duplicate post suppressed."] = "I post duplicati sono scartati.";
+App::$strings["System error. Post not saved."] = "Errore di sistema. Post non salvato.";
+App::$strings["Unable to obtain post information from database."] = "Impossibile caricare il post dal database.";
+App::$strings["You have reached your limit of %1$.0f top level posts."] = "Hai raggiunto il limite massimo di %1$.0f post sulla pagina principale.";
+App::$strings["You have reached your limit of %1$.0f webpages."] = "Hai raggiunto il limite massimo di %1$.0f pagine web.";
 App::$strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina.";
 App::$strings["Profile Photos"] = "Foto del profilo";
 App::$strings["Album not found."] = "Album non trovato.";
 App::$strings["Delete Album"] = "Elimina album";
-App::$strings["Multiple storage folders exist with this album name, but within different directories. Please remove the desired folder or folders using the Files manager"] = "Esistono più archivi con il nome di quest'album, ma dentro cartelle diverse. Per favore rimuovili dall'Archivio file ";
+App::$strings["Multiple storage folders exist with this album name, but within different directories. Please remove the desired folder or folders using the Files manager"] = "Esistono più archivi con il nome di quest'album, ma dentro cartelle diverse. Per favore effettua la rimozione dall'Archivio file ";
 App::$strings["Delete Photo"] = "Elimina foto";
 App::$strings["No photos selected"] = "Nessuna foto selezionata";
 App::$strings["Access to this item is restricted."] = "Questo elemento non è visibile a tutti.";
@@ -665,7 +604,7 @@ App::$strings["__ctx:noun__ Dislike"] = array(
 	0 => "Non mi piace",
 	1 => "Non mi piace",
 );
-App::$strings["Photo Tools"] = "Gestione delle foto";
+App::$strings["Photo Tools"] = "Gestione foto";
 App::$strings["In This Photo:"] = "In questa foto:";
 App::$strings["Map"] = "Mappa";
 App::$strings["__ctx:noun__ Likes"] = "Mi piace";
@@ -673,122 +612,164 @@ App::$strings["__ctx:noun__ Dislikes"] = "Non mi piace";
 App::$strings["Close"] = "Chiudi";
 App::$strings["View Album"] = "Guarda l'album";
 App::$strings["Recent Photos"] = "Foto recenti";
-App::$strings["sent you a private message"] = "ti ha inviato un messaggio privato";
-App::$strings["added your channel"] = "ha aggiunto il tuo canale";
-App::$strings["g A l F d"] = "g A l d F";
-App::$strings["[today]"] = "[oggi]";
-App::$strings["posted an event"] = "ha creato un evento";
-App::$strings["Unable to find your hub."] = "Impossibile raggiungere il tuo hub.";
-App::$strings["Post successful."] = "Inviato!";
-App::$strings["OpenID protocol error. No ID returned."] = "Errore del protocollo OpenID. Nessun ID ricevuto in risposta.";
-App::$strings["Login failed."] = "Accesso fallito.";
-App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-App::$strings["This setting requires special processing and editing has been blocked."] = "Questa impostazione è bloccata, richiede criteri di modifica speciali";
-App::$strings["Configuration Editor"] = "Editor di configurazione";
-App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare.";
-App::$strings["Layout updated."] = "Layout aggiornato.";
-App::$strings["Edit System Page Description"] = "Modifica i layout di sistema";
-App::$strings["Layout not found."] = "Layout non trovato.";
-App::$strings["Module Name:"] = "Nome del modulo:";
-App::$strings["Layout Help"] = "Guida al layout";
-App::$strings["Poke"] = "Poke";
-App::$strings["Poke somebody"] = "Manda un poke";
-App::$strings["Poke/Prod"] = "Poke/Prod";
-App::$strings["Poke, prod or do other things to somebody"] = "Manda un poke o altro a qualcuno";
-App::$strings["Recipient"] = "Destinatario";
-App::$strings["Choose what you wish to do to recipient"] = "Scegli cosa vuoi inviare al destinatario";
-App::$strings["Make this post private"] = "Rendi privato questo post";
-App::$strings["Fetching URL returns error: %1\$s"] = "La chiamata all'URL restituisce questo errore: %1\$s";
-App::$strings["Profile not found."] = "Profilo non trovato.";
-App::$strings["Profile deleted."] = "Profilo eliminato.";
-App::$strings["Profile-"] = "Profilo-";
-App::$strings["New profile created."] = "Il nuovo profilo è stato creato.";
-App::$strings["Profile unavailable to clone."] = "Impossibile duplicare il profilo.";
-App::$strings["Profile unavailable to export."] = "Il profilo non è disponibile per l'export.";
-App::$strings["Profile Name is required."] = "Il nome del profilo è obbligatorio.";
-App::$strings["Marital Status"] = "Stato sentimentale";
-App::$strings["Romantic Partner"] = "Partner affettivo";
-App::$strings["Likes"] = "Mi piace";
-App::$strings["Dislikes"] = "Non mi piace";
-App::$strings["Work/Employment"] = "Lavoro/impiego";
-App::$strings["Religion"] = "Religione";
-App::$strings["Political Views"] = "Orientamento politico";
-App::$strings["Sexual Preference"] = "Preferenze sessuali";
-App::$strings["Homepage"] = "Home page";
-App::$strings["Interests"] = "Interessi";
-App::$strings["Profile updated."] = "Profilo aggiornato.";
-App::$strings["Hide your connections list from viewers of this profile"] = "Nascondi la tua lista di contatti ai visitatori di questo profilo";
-App::$strings["Edit Profile Details"] = "Modifica i dettagli del profilo";
-App::$strings["View this profile"] = "Guarda questo profilo";
-App::$strings["Edit visibility"] = "Cambia la visibilità";
-App::$strings["Profile Tools"] = "Gestione del profilo";
-App::$strings["Change cover photo"] = "Cambia la copertina del canale";
-App::$strings["Change profile photo"] = "Cambia la foto del profilo";
-App::$strings["Create a new profile using these settings"] = "Crea un nuovo profilo usando queste impostazioni";
-App::$strings["Clone this profile"] = "Clona questo profilo";
-App::$strings["Delete this profile"] = "Elimina questo profilo";
-App::$strings["Add profile things"] = "Aggiungi oggetti al profilo";
-App::$strings["Personal"] = "Personali";
-App::$strings["Relation"] = "Relazione";
-App::$strings["Miscellaneous"] = "Altro";
-App::$strings["Import profile from file"] = "Importa il profilo da un file";
-App::$strings["Export profile to file"] = "Esporta il profilo in un file";
-App::$strings["Your gender"] = "Sesso";
-App::$strings["Marital status"] = "Stato civile";
-App::$strings["Sexual preference"] = "Preferenze sessuali";
-App::$strings["Profile name"] = "Nome del profilo";
-App::$strings["This is your default profile."] = "Questo è il tuo profilo predefinito.";
-App::$strings["Your full name"] = "Il tuo nome completo";
-App::$strings["Title/Description"] = "Titolo/descrizione";
-App::$strings["Street address"] = "Indirizzo (via/piazza)";
-App::$strings["Locality/City"] = "Località";
-App::$strings["Region/State"] = "Regione/stato";
-App::$strings["Postal/Zip code"] = "CAP";
-App::$strings["Country"] = "Nazione";
-App::$strings["Who (if applicable)"] = "Con chi (se possibile)";
-App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Per esempio: cathy123, Cathy Williams, cathy@example.com";
-App::$strings["Since (date)"] = "dal (data)";
-App::$strings["Tell us about yourself"] = "Raccontaci di te...";
-App::$strings["Hometown"] = "Città dove vivo";
-App::$strings["Political views"] = "Orientamento politico";
-App::$strings["Religious views"] = "Orientamento religioso";
-App::$strings["Keywords used in directory listings"] = "Parole chiavi mostrate nell'elenco dei canali";
-App::$strings["Example: fishing photography software"] = "Per esempio: pesca fotografia programmazione";
-App::$strings["Musical interests"] = "Interessi musicali";
-App::$strings["Books, literature"] = "Libri, letteratura";
-App::$strings["Television"] = "Televisione";
-App::$strings["Film/Dance/Culture/Entertainment"] = "Film, danza, cultura, intrattenimento";
-App::$strings["Hobbies/Interests"] = "Hobby/interessi";
-App::$strings["Love/Romance"] = "Amore";
-App::$strings["School/Education"] = "Scuola/educazione";
-App::$strings["Contact information and social networks"] = "Contatti e social network";
-App::$strings["My other channels"] = "I miei altri canali";
-App::$strings["Profile Image"] = "Immagine del profilo";
-App::$strings["Edit Profiles"] = "Modifica i tuoi profili";
-App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Forza l'aggiornamento della pagina o cancella la cache del browser se la nuova foto non viene visualizzata immediatamente.";
-App::$strings["Upload Profile Photo"] = "Carica la foto del profilo";
-App::$strings["Invalid profile identifier."] = "Indentificativo del profilo non valido.";
-App::$strings["Profile Visibility Editor"] = "Modifica la visibilità del profilo";
-App::$strings["Profile"] = "Profilo";
-App::$strings["Click on a contact to add or remove."] = "Clicca su un contatto per aggiungerlo o rimuoverlo.";
-App::$strings["Visible To"] = "Visibile a";
-App::$strings["Public Hubs"] = "Hub pubblici";
-App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "I siti elencati permettono la registrazione libera sulla rete \$Projectname. Tutti questi hub sono interconnessi, quindi essere iscritti su uno equivale a una registrazione su tutta la rete. Alcuni siti potrebbero richiedere un abbonamento o dei servizi a pagamento. Per maggiori dettagli visita gli indirizzi nell'elenco.";
-App::$strings["Hub URL"] = "URL del hub";
-App::$strings["Access Type"] = "Tipo di accesso";
-App::$strings["Registration Policy"] = "Politica di registrazione";
-App::$strings["Stats"] = "";
-App::$strings["Software"] = "Software";
-App::$strings["Ratings"] = "Valutazioni";
-App::$strings["Rate"] = "Valuta";
-App::$strings["Website:"] = "Sito web:";
-App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Canale remoto [%s] (non ancora conosciuto da questo sito)";
-App::$strings["Rating (this information is public)"] = "Valutazione (visibile a tutti)";
-App::$strings["Optionally explain your rating (this information is public)"] = "Commento alla valutazione (facoltativo, visibile a tutti)";
-App::$strings["No ratings"] = "Nessuna valutazione";
-App::$strings["Rating: "] = "Valutazione:";
-App::$strings["Website: "] = "Sito web:";
-App::$strings["Description: "] = "Descrizione:";
+App::$strings["Remote privacy information not available."] = "Le informazioni remote sulla privacy non sono disponibili.";
+App::$strings["Visible to:"] = "Visibile a:";
+App::$strings["Import completed"] = "Importazione completata";
+App::$strings["Import Items"] = "Importa i contenuti";
+App::$strings["Use this form to import existing posts and content from an export file."] = "Usa questa funzionalità per importare i vecchi contenuti e i post da un file esportato in precedenza.";
+App::$strings["Total invitation limit exceeded."] = "Hai superato il numero massimo di inviti.";
+App::$strings["%s : Not a valid email address."] = "%s: non è un indirizzo email valido.";
+App::$strings["Please join us on \$Projectname"] = "Unisciti a noi su \$Projectname";
+App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Hai superato il numero massimo di inviti. Contatta l'amministratore se necessario.";
+App::$strings["%s : Message delivery failed."] = "%s: la consegna del messaggio è fallita.";
+App::$strings["%d message sent."] = array(
+	0 => "%d messaggio inviato.",
+	1 => "%d messaggi inviati.",
+);
+App::$strings["You have no more invitations available"] = "Non hai altri inviti disponibili";
+App::$strings["Send invitations"] = "Spedisci inviti";
+App::$strings["Enter email addresses, one per line:"] = "Inserisci gli indirizzi email, uno per riga:";
+App::$strings["Your message:"] = "Il tuo messaggio:";
+App::$strings["Please join my community on \$Projectname."] = "Entra nella mia comunità su \$Projectname.";
+App::$strings["You will need to supply this invitation code:"] = "Dovrai fornire questo codice invito:";
+App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registrati su qualsiasi server \$Projectname (sono tutti interconnessi)";
+App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Inserisci il mio indirizzo \$Projectname nel riquadro di ricerca del sito.";
+App::$strings["or visit"] = "oppure visita";
+App::$strings["3. Click [Connect]"] = "3. Clicca su [Aggiungi]";
+App::$strings["Location not found."] = "Indirizzo non trovato.";
+App::$strings["Location lookup failed."] = "La ricerca dell'indirizzo è fallita.";
+App::$strings["Please select another location to become primary before removing the primary location."] = "Prima di rimuovere il tuo canale primario assicurati di avere scelto una sua copia (clone) come primaria.";
+App::$strings["Syncing locations"] = "Sincronizzazione tra hub";
+App::$strings["No locations found."] = "Nessun indirizzo trovato.";
+App::$strings["Manage Channel Locations"] = "Modifica gli indirizzi del canale";
+App::$strings["Primary"] = "Primario";
+App::$strings["Drop"] = "Elimina";
+App::$strings["Sync Now"] = "Sincronizza ora";
+App::$strings["Please wait several minutes between consecutive operations."] = "Si raccomanda di attendere alcuni minuti prima di effettuare una nuova sincronizzazione.";
+App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Quando possibile, riduci il numero di cloni del tuo canale effettuando il login sul relativo hub e rimuovendoli.";
+App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Usa questo modulo per abbandonare un canale su un hub che non è più funzionante.";
+App::$strings["Hub not found."] = "Hub non trovato.";
+App::$strings["Unable to lookup recipient."] = "Impossibile associare un destinatario.";
+App::$strings["Unable to communicate with requested channel."] = "Impossibile comunicare con il canale richiesto.";
+App::$strings["Cannot verify requested channel."] = "Impossibile verificare il canale richiesto.";
+App::$strings["Selected channel has private message restrictions. Send failed."] = "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito.";
+App::$strings["Messages"] = "Messaggi";
+App::$strings["Message recalled."] = "Messaggio revocato.";
+App::$strings["Conversation removed."] = "Conversazione rimossa.";
+App::$strings["Expires YYYY-MM-DD HH:MM"] = "Scade il YYYY-MM-DD HH:MM";
+App::$strings["Requested channel is not in this network"] = "Il canale cercato non è in questa rete";
+App::$strings["Send Private Message"] = "Invia un messaggio privato";
+App::$strings["To:"] = "A:";
+App::$strings["Subject:"] = "Oggetto:";
+App::$strings["Attach file"] = "Allega file";
+App::$strings["Send"] = "Invia";
+App::$strings["Set expiration date"] = "Data di scadenza";
+App::$strings["Delete message"] = "Elimina il messaggio";
+App::$strings["Delivery report"] = "Rapporto di trasmissione";
+App::$strings["Recall message"] = "Revoca il messaggio";
+App::$strings["Message has been recalled."] = "Il messaggio è stato revocato.";
+App::$strings["Delete Conversation"] = "Elimina la conversazione";
+App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Non è disponibile alcun modo sicuro di comunicare con questo canale. <strong>Se possibile</strong>, prova a rispondere direttamente dalla pagina del profilo del mittente.";
+App::$strings["Send Reply"] = "Invia la risposta";
+App::$strings["Your message for %s (%s):"] = "Il tuo messaggio per %s (%s):";
+App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Hai creato %1$.0f dei %2$.0f canali permessi.";
+App::$strings["Create a new channel"] = "Crea un nuovo canale";
+App::$strings["Channel Manager"] = "Gestione canali";
+App::$strings["Current Channel"] = "Canale attuale";
+App::$strings["Switch to one of your channels by selecting it."] = "Seleziona l'altro canale a cui vuoi passare.";
+App::$strings["Default Channel"] = "Canale predefinito";
+App::$strings["Make Default"] = "Rendi predefinito";
+App::$strings["%d new messages"] = "%d nuovi messaggi";
+App::$strings["%d new introductions"] = "%d nuove richieste di entrare in contatto";
+App::$strings["Delegated Channel"] = "Canale delegato";
+App::$strings["Unable to update menu."] = "Impossibile aggiornare il menù.";
+App::$strings["Unable to create menu."] = "Impossibile creare il menù.";
+App::$strings["Menu Name"] = "Nome del menu";
+App::$strings["Unique name (not visible on webpage) - required"] = "Nome unico (non visibile sulla pagina) - obbligatorio";
+App::$strings["Menu Title"] = "Titolo del menu";
+App::$strings["Visible on webpage - leave empty for no title"] = "Visibile sulla pagina - lascia vuoto per non avere un titolo";
+App::$strings["Allow Bookmarks"] = "Permetti i segnalibri";
+App::$strings["Menu may be used to store saved bookmarks"] = "Puoi salvare i segnalibri nei menù";
+App::$strings["Submit and proceed"] = "Salva e procedi";
+App::$strings["Menus"] = "Menù";
+App::$strings["Bookmarks allowed"] = "Permetti segnalibri";
+App::$strings["Delete this menu"] = "Elimina questo menù";
+App::$strings["Edit menu contents"] = "Modifica i contenuti del menù";
+App::$strings["Edit this menu"] = "Modifica questo menù";
+App::$strings["Menu could not be deleted."] = "Il menù non può essere eliminato.";
+App::$strings["Menu not found."] = "Menù non trovato.";
+App::$strings["Edit Menu"] = "Modifica menù";
+App::$strings["Add or remove entries to this menu"] = "Aggiungi o rimuovi elementi di questo menù";
+App::$strings["Menu name"] = "Nome del menù";
+App::$strings["Must be unique, only seen by you"] = "Deve essere unico, lo vedrai solo tu";
+App::$strings["Menu title"] = "Titolo del menù";
+App::$strings["Menu title as seen by others"] = "Titolo del menù come comparirà a tutti";
+App::$strings["Allow bookmarks"] = "Permetti l'invio di segnalibri";
+App::$strings["Not found."] = "Non trovato.";
+App::$strings["No valid account found."] = "Nessun account valido trovato.";
+App::$strings["Password reset request issued. Check your email."] = "La richiesta per reimpostare la password è stata inviata. Controlla la tua email.";
+App::$strings["Site Member (%s)"] = "Utente del sito (%s)";
+App::$strings["Password reset requested at %s"] = "È stato richiesto di reimpostare password su %s";
+App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non sarà reimpostata.";
+App::$strings["Password Reset"] = "Reimposta la password";
+App::$strings["Your password has been reset as requested."] = "La password è stata reimpostata come richiesto.";
+App::$strings["Your new password is"] = "La tua nuova password è";
+App::$strings["Save or copy your new password - and then"] = "Salva o copia la tua nuova password, quindi";
+App::$strings["click here to login"] = "clicca qui per accedere";
+App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Puoi cambiare la tua password dalla pagina delle <em>Impostazioni</em> dopo aver effettuato l'accesso.";
+App::$strings["Your password has changed at %s"] = "La tua password su %s è cambiata";
+App::$strings["Forgot your Password?"] = "Hai dimenticato la password?";
+App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Inserisci il tuo indirizzo email per reimpostare la password. Dopo aver inviato la richiesta, controlla l'email e troverai le istruzioni per continuare.";
+App::$strings["Email Address"] = "Indirizzo email";
+App::$strings["Reset"] = "Reimposta";
+App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s è %2\$s";
+App::$strings["Mood"] = "Umore";
+App::$strings["Set your current mood and tell your friends"] = "Scegli il tuo umore attuale per mostrarlo agli amici";
+App::$strings["No such group"] = "Impossibile trovare il gruppo di canali";
+App::$strings["No such channel"] = "Canale sconosciuto";
+App::$strings["forum"] = "forum";
+App::$strings["Search Results For:"] = "Cerca risultati con:";
+App::$strings["Privacy group is empty"] = "Il gruppo di canali è vuoto";
+App::$strings["Privacy group: "] = "Gruppo di canali:";
+App::$strings["Invalid connection."] = "Contatto non valido.";
+App::$strings["No more system notifications."] = "Non ci sono nuove notifiche di sistema.";
+App::$strings["System Notifications"] = "Notifiche di sistema";
+App::$strings["Profile Match"] = "Profili corrispondenti";
+App::$strings["No keywords to match. Please add keywords to your default profile."] = "Non hai scritto parole chiave. Aggiungi parole chiave al tuo profilo predefinito per comparire nelle ricerche.";
+App::$strings["is interested in:"] = "interessi personali:";
+App::$strings["No matches"] = "Nessun risultato";
+App::$strings["Posts and comments"] = "Post e commenti";
+App::$strings["Only posts"] = "Solo post";
+App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Permessi insufficienti. Sarà visualizzata la pagina del profilo.";
+App::$strings["Unable to create element."] = "Impossibile creare l'elemento.";
+App::$strings["Unable to update menu element."] = "Non è possibile aggiornare l'elemento del menù.";
+App::$strings["Unable to add menu element."] = "Impossibile aggiungere l'elemento al menù.";
+App::$strings["Menu Item Permissions"] = "Permessi del menu";
+App::$strings["(click to open/close)"] = "(clicca per aprire/chiudere)";
+App::$strings["Link Name"] = "Nome link";
+App::$strings["Link or Submenu Target"] = "Azione del link o del sottomenu";
+App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Inserisci l'indirizzo del link o scegli il nome di un sottomenu";
+App::$strings["Use magic-auth if available"] = "Usa l'autenticazione tramite il tuo hub, se disponibile";
+App::$strings["Open link in new window"] = "Apri il link in una nuova finestra";
+App::$strings["Order in list"] = "Ordine dell'elenco";
+App::$strings["Higher numbers will sink to bottom of listing"] = "I numeri più alti andranno in fondo all'elenco";
+App::$strings["Submit and finish"] = "Salva e termina";
+App::$strings["Submit and continue"] = "Salva e continua";
+App::$strings["Menu:"] = "Menu:";
+App::$strings["Link Target"] = "Destinazione link";
+App::$strings["Edit menu"] = "Modifica il menù";
+App::$strings["Edit element"] = "Modifica l'elemento";
+App::$strings["Drop element"] = "Elimina l'elemento";
+App::$strings["New element"] = "Nuovo elemento";
+App::$strings["Edit this menu container"] = "Modifica il contenitore del menù";
+App::$strings["Add menu element"] = "Aggiungi un elemento al menù";
+App::$strings["Delete this menu item"] = "Elimina questo elemento del menù";
+App::$strings["Edit this menu item"] = "Modifica questo elemento del menù";
+App::$strings["Menu item not found."] = "L'elemento del menù non è stato trovato.";
+App::$strings["Menu item deleted."] = "L'elemento del menù è stato eliminato.";
+App::$strings["Menu item could not be deleted."] = "L'elemento del menù non può essere eliminato.";
+App::$strings["Edit Menu Element"] = "Modifica l'elemento del menù";
+App::$strings["Link text"] = "Testo del link";
 App::$strings["Theme settings updated."] = "Le impostazioni del tema sono state aggiornate.";
 App::$strings["# Accounts"] = "# account";
 App::$strings["# blocked accounts"] = "# account bloccati";
@@ -798,7 +779,7 @@ App::$strings["# Channels"] = "# canali";
 App::$strings["# primary"] = "# primari";
 App::$strings["# clones"] = "# cloni";
 App::$strings["Message queues"] = "Coda messaggi in uscita";
-App::$strings["Your software should be updated"] = "Il tuo software ha bisogno di essere aggiornato";
+App::$strings["Your software should be updated"] = "Il tuo software necessita di un aggiornamento";
 App::$strings["Administration"] = "Amministrazione";
 App::$strings["Summary"] = "Riepilogo";
 App::$strings["Registered accounts"] = "Account creati";
@@ -863,7 +844,7 @@ App::$strings["Import and allow access to public content pulled from other sites
 App::$strings["Login on Homepage"] = "Login sulla homepage";
 App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = "Presenta il modulo di login ai visitatori sulla homepage in mancanza di altri contenuti.";
 App::$strings["Enable context help"] = "Abilita la guida contestuale";
-App::$strings["Display contextual help for the current page when the help button is pressed."] = "Quando è premuto il bottone della guida mostra quella della pagina corrente";
+App::$strings["Display contextual help for the current page when the help button is pressed."] = "Quando è premuto, il bottone della guida mostra quella relativa alla pagina corrente";
 App::$strings["Directory Server URL"] = "URL del directory server";
 App::$strings["Default directory server"] = "Directory server predefinito";
 App::$strings["Proxy user"] = "Utente proxy";
@@ -889,24 +870,24 @@ App::$strings["ID"] = "ID";
 App::$strings["for channel"] = "per il canale";
 App::$strings["on server"] = "sul server";
 App::$strings["Server"] = "Server";
-App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "";
-App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "L'impostazione consigliata è di permettere HTML non filtrato solo dai siti seguenti:";
+App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Il codice HTML degli oggetti multimediali incorporati nei post è consentito. Questo tipo di impostazione è insicura.";
+App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "L'impostazione consigliata è di permettere HTML non filtrato solo dai seguenti siti:";
 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."] = "Tutti gli altri contenuti incorporati saranno filtrati <strong>a meno che</strong> il contenuto incorporato di quel sito non venga esplicitamente bloccato.";
+App::$strings["All other embedded content will be filtered, <strong>unless</strong> embedded content from that site is explicitly blocked."] = "Tutti gli altri contenuti incorporati saranno filtrati <strong>a meno che</strong> il contenuto incorporato di quel sito non sia esplicitamente bloccato.";
 App::$strings["Security"] = "Sicurezza";
 App::$strings["Block public"] = "Blocca pagine pubbliche";
 App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "Seleziona per impedire di vedere le pagine personali di questo sito a chi non ha effettuato l'accesso.";
-App::$strings["Set \"Transport Security\" HTTP header"] = "";
-App::$strings["Set \"Content Security Policy\" HTTP header"] = "";
+App::$strings["Set \"Transport Security\" HTTP header"] = "Imposta il \"Transport Security\" HTTP header";
+App::$strings["Set \"Content Security Policy\" HTTP header"] = "Imposta il \"Content Security Policy\" HTTP header";
 App::$strings["Allow communications only from these sites"] = "Permetti la comunicazione solo da questi siti";
 App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Un sito per riga. Lascia vuoto per permettere la comunicazione con tutti";
 App::$strings["Block communications from these sites"] = "Blocca la comunicazione da questi siti";
 App::$strings["Allow communications only from these channels"] = "Permetti la comunicazione solo da questi canali";
 App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "Un canale (hash) per riga. Lascia vuoto per comunicare con tutti i canali";
 App::$strings["Block communications from these channels"] = "Blocca la comunicazione da questi canali";
-App::$strings["Only allow embeds from secure (SSL) websites and links."] = "";
-App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "";
-App::$strings["One site per line. By default embedded content is filtered."] = "";
+App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Permetti di incorporare contenuti solamente da siti sicuri (SSL).";
+App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Incorpora i contenuti HTML non filtrati solo da questi domini";
+App::$strings["One site per line. By default embedded content is filtered."] = "Un sito per riga. Normalmente i contenuti incorporati sono filtrati.";
 App::$strings["Block embedded HTML from these domains"] = "Blocca i contenuti incorporati HTML da questi domini";
 App::$strings["Update has been marked successful"] = "L'aggiornamento è stato marcato come eseguito.";
 App::$strings["Executing %s failed. Check system logs."] = "Fallita l'esecuzione di %s. Maggiori informazioni sui log di sistema.";
@@ -938,7 +919,7 @@ App::$strings["Account '%s' blocked"] = "Aggiunto un blocco verso '%s'";
 App::$strings["Account '%s' unblocked"] = "Rimosso il blocco verso '%s'";
 App::$strings["Accounts"] = "Account";
 App::$strings["select all"] = "seleziona tutti";
-App::$strings["Registrations waiting for confirm"] = "";
+App::$strings["Registrations waiting for confirm"] = "Registrazioni in attesa di conferma";
 App::$strings["Request date"] = "Data richiesta";
 App::$strings["No registrations."] = "Nessuna registrazione.";
 App::$strings["Deny"] = "Nega";
@@ -990,14 +971,14 @@ App::$strings["Maximum project version: "] = "Massima versione hubzilla";
 App::$strings["Minimum PHP version: "] = "Minima versione PHP:";
 App::$strings["Requires: "] = "Necessita di:";
 App::$strings["Disabled - version incompatibility"] = "Disabilitato - incompatibilità di versione";
-App::$strings["Enter the public git repository URL of the plugin repo."] = "";
+App::$strings["Enter the public git repository URL of the plugin repo."] = "Inserisci lo URL del repository git dei plugin.";
 App::$strings["Plugin repo git URL"] = "URL git del repository del plugin";
 App::$strings["Custom repo name"] = "Nome repository personalizzato";
 App::$strings["(optional)"] = "(facoltativo)";
 App::$strings["Download Plugin Repo"] = "Scarica il repository del plugin";
 App::$strings["Install new repo"] = "Installa un nuovo repository";
 App::$strings["Install"] = "Installa";
-App::$strings["Manage Repos"] = "Gestisci i repsitory";
+App::$strings["Manage Repos"] = "Gestisci i repository";
 App::$strings["Installed Plugin Repositories"] = "Repository per i plugin installati";
 App::$strings["Install a New Plugin Repository"] = "Installa un nuovo repository per i plugin";
 App::$strings["Update"] = "Aggiorna";
@@ -1012,7 +993,7 @@ App::$strings["Logs"] = "Log";
 App::$strings["Clear"] = "Pulisci";
 App::$strings["Debugging"] = "Debugging";
 App::$strings["Log file"] = "File di log";
-App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "";
+App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "Relativo alla directory base del server web. Deve essere scrivibile.";
 App::$strings["Log level"] = "Livello di log";
 App::$strings["New Profile Field"] = "Nuovo campo del profilo";
 App::$strings["Field nickname"] = "Nome breve del campo";
@@ -1031,19 +1012,91 @@ App::$strings["(In addition to basic fields)"] = "(In aggiunta ai campi di base)
 App::$strings["All available fields"] = "Tutti i campi disponibili";
 App::$strings["Custom Fields"] = "Campi personalizzati";
 App::$strings["Create Custom Field"] = "Aggiungi campo personalizzato";
-App::$strings["App installed."] = "App installata";
-App::$strings["Malformed app."] = "L'app contiene errori";
-App::$strings["Embed code"] = "Inserisci il codice";
-App::$strings["Edit App"] = "Modifica app";
-App::$strings["Create App"] = "Crea una app";
-App::$strings["Name of app"] = "Nome app";
-App::$strings["Location (URL) of app"] = "Indirizzo (URL) della app";
-App::$strings["Photo icon URL"] = "URL icona";
-App::$strings["80 x 80 pixels - optional"] = "80 x 80 pixel - facoltativa";
-App::$strings["Categories (optional, comma separated list)"] = "Categorie (facoltative, lista separata da virgole)";
-App::$strings["Version ID"] = "ID versione";
-App::$strings["Price of app"] = "Prezzo app";
-App::$strings["Location (URL) to purchase app"] = "Indirizzo (URL) per acquistare la app";
+App::$strings["Name or caption"] = "Nome o titolo";
+App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\"";
+App::$strings["Choose a short nickname"] = "Scegli un nome breve";
+App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale, per esempio nickname%s";
+App::$strings["Channel role and privacy"] = "Tipo di canale e privacy";
+App::$strings["Select a channel role with your privacy requirements."] = "Scegli il tipo di canale che vuoi e la privacy da applicare.";
+App::$strings["Read more about roles"] = "Maggiori informazioni sui ruoli";
+App::$strings["Create Channel"] = "Crea un canale";
+App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Un canale è la tua identità su questa rete. Può rappresentare una persona, un blog o un forum, per esempio. Il tuo canale può essere in contatto con altri canali per condividere contenuti con permessi anche molto dettagliati.";
+App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "oppure <a href=\"import\">importa un canale esistente</a> da un altro server/hub.";
+App::$strings["sent you a private message"] = "ti ha inviato un messaggio privato";
+App::$strings["added your channel"] = "ha aggiunto il tuo canale";
+App::$strings["g A l F d"] = "g A l d F";
+App::$strings["[today]"] = "[oggi]";
+App::$strings["posted an event"] = "ha creato un evento";
+App::$strings["Invalid request identifier."] = "L'identificativo della richiesta non è valido.";
+App::$strings["Discard"] = "Rifiuta";
+App::$strings["Mark all system notifications seen"] = "Segna come lette le notifiche di sistema";
+App::$strings["Poke"] = "Poke";
+App::$strings["Poke somebody"] = "Manda un poke";
+App::$strings["Poke/Prod"] = "Poke/Prod";
+App::$strings["Poke, prod or do other things to somebody"] = "Manda un poke o altro a qualcuno";
+App::$strings["Recipient"] = "Destinatario";
+App::$strings["Choose what you wish to do to recipient"] = "Scegli cosa vuoi inviare al destinatario";
+App::$strings["Make this post private"] = "Rendi privato questo post";
+App::$strings["Unable to find your hub."] = "Impossibile raggiungere il tuo hub.";
+App::$strings["Post successful."] = "Inviato!";
+App::$strings["OpenID protocol error. No ID returned."] = "Errore del protocollo OpenID. Nessun ID ricevuto in risposta.";
+App::$strings["Login failed."] = "Accesso fallito.";
+App::$strings["Invalid profile identifier."] = "Indentificativo del profilo non valido.";
+App::$strings["Profile Visibility Editor"] = "Modifica la visibilità del profilo";
+App::$strings["Profile"] = "Profilo";
+App::$strings["Click on a contact to add or remove."] = "Clicca su un contatto per aggiungerlo o rimuoverlo.";
+App::$strings["Visible To"] = "Visibile a";
+App::$strings["This setting requires special processing and editing has been blocked."] = "Questa impostazione è bloccata, richiede criteri di modifica speciali";
+App::$strings["Configuration Editor"] = "Editor di configurazione";
+App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Attenzione: alcune delle impostazioni, se cambiate, potrebbero rendere questo canale non funzionante. Lascia questa pagina a meno che tu non sappia con assoluta certezza quali modifiche effettuare.";
+App::$strings["Fetching URL returns error: %1\$s"] = "La chiamata all'URL restituisce questo errore: %1\$s";
+App::$strings["Version %s"] = "Versione %s";
+App::$strings["Installed plugins/addons/apps:"] = "App e componenti installati:";
+App::$strings["No installed plugins/addons/apps"] = "Nessuna app o componente installato";
+App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Questo è un hub di \$Projectname - una rete cooperativa e decentralizzata di siti ad elevata privacy. ";
+App::$strings["Tag: "] = "Tag: ";
+App::$strings["Last background fetch: "] = "Ultima acquisizione:";
+App::$strings["Current load average: "] = "Carico medio attuale:";
+App::$strings["Running at web location"] = "In esecuzione sull'indirizzo web";
+App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Visita <a href=\"http://hubzilla.org\">hubzilla.org</a> per maggiori informazioni su \$Projectname.";
+App::$strings["Bug reports and issues: please visit"] = "Per segnalare bug e problemi: visita";
+App::$strings["\$projectname issues"] = "Problematiche note su \$projectname";
+App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Per consigli, ringraziamenti, ecc. - scrivi a \"redmatrix\" at librelist - dot com";
+App::$strings["Site Administrators"] = "Amministratori del sito";
+App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Non è possibile effettuare login con l'OpenID che hai fornito. Per favore controlla che sia scritto correttamente.";
+App::$strings["The error message was:"] = "Messaggio di errore ricevuto:";
+App::$strings["Authentication failed."] = "Autenticazione fallita.";
+App::$strings["Remote Authentication"] = "Accedi tramite il tuo hub";
+App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)";
+App::$strings["Authenticate"] = "Accedi";
+App::$strings["Public Hubs"] = "Hub pubblici";
+App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "I siti elencati permettono la registrazione libera sulla rete \$Projectname. Tutti questi hub sono interconnessi, quindi essere iscritti su uno equivale a una registrazione su tutta la rete. Alcuni siti potrebbero richiedere un abbonamento o dei servizi a pagamento. Per maggiori dettagli visita gli indirizzi nell'elenco.";
+App::$strings["Hub URL"] = "URL del hub";
+App::$strings["Access Type"] = "Tipo di accesso";
+App::$strings["Registration Policy"] = "Politica di registrazione";
+App::$strings["Stats"] = "Statistiche";
+App::$strings["Software"] = "Software";
+App::$strings["Ratings"] = "Valutazioni";
+App::$strings["Rate"] = "Valuta";
+App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Forza l'aggiornamento della pagina o cancella la cache del browser se la nuova foto non viene visualizzata immediatamente.";
+App::$strings["Upload Profile Photo"] = "Carica la foto del profilo";
+App::$strings["Block Name"] = "Nome del block";
+App::$strings["Blocks"] = "Block";
+App::$strings["Block Title"] = "Titolo del block";
+App::$strings["Website:"] = "Sito web:";
+App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Canale remoto [%s] (non ancora conosciuto da questo sito)";
+App::$strings["Rating (this information is public)"] = "Valutazione (visibile a tutti)";
+App::$strings["Optionally explain your rating (this information is public)"] = "Commento alla valutazione (facoltativo, visibile a tutti)";
+App::$strings["No ratings"] = "Nessuna valutazione";
+App::$strings["Rating: "] = "Valutazione:";
+App::$strings["Website: "] = "Sito web:";
+App::$strings["Description: "] = "Descrizione:";
+App::$strings["Apps"] = "App";
+App::$strings["Title (optional)"] = "Titolo (facoltativo)";
+App::$strings["Edit Block"] = "Modifica il block";
+App::$strings["No channel."] = "Nessun canale.";
+App::$strings["Common connections"] = "Contatti in comune";
+App::$strings["No connections in common."] = "Nessun contatto in comune.";
 App::$strings["Select a bookmark folder"] = "Scegli una cartella di segnalibri";
 App::$strings["Save Bookmark"] = "Salva segnalibro";
 App::$strings["URL of bookmark"] = "URL del segnalibro";
@@ -1069,7 +1122,7 @@ App::$strings["no"] = "no";
 App::$strings["yes"] = "sì";
 App::$strings["Membership on this site is by invitation only."] = "Per registrarsi su questo hub è necessario un invito.";
 App::$strings["Register"] = "Registrati";
-App::$strings["Proceed to create your first channel"] = "Continua e crea il tuo primo canale";
+App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "Dopo aver inviato questo modulo, potrebbe esserti richiesta una verifica via email. Se ti sarà mostrata la pagina di login, segui le istruzioni sull'email per continuare.";
 App::$strings["Please login."] = "Effettua l'accesso.";
 App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Non è possibile eliminare il tuo account prima di 48 ore dall'ultimo cambio password.";
 App::$strings["Remove This Account"] = "Elimina questo account";
@@ -1086,17 +1139,23 @@ App::$strings["This channel will be completely removed from the network. "] = "Q
 App::$strings["Remove this channel and all its clones from the network"] = "Elimina questo canale e tutti i suoi cloni dalla rete";
 App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "L'impostazione predefinita è che sia eliminata solo l'istanza del canale presente su questo hub, non gli eventuali cloni";
 App::$strings["Remove Channel"] = "Elimina questo canale";
-App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Non è possibile effettuare login con l'OpenID che hai fornito. Per favore controlla che sia scritto correttamente.";
-App::$strings["The error message was:"] = "Messaggio di errore ricevuto:";
-App::$strings["Authentication failed."] = "Autenticazione fallita.";
-App::$strings["Remote Authentication"] = "Accedi tramite il tuo hub";
-App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)";
-App::$strings["Authenticate"] = "Accedi";
+App::$strings["Export Channel"] = "Esporta il canale";
+App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Esporta le informazioni di base del canale in un file. In pratica è un salvataggio delle tue connessioni, dei permessi che hai assegnato e del tuo profilo che così potrà essere importato su un altro server/hub. Il file non includerà i tuoi post e altri contenuti che hai creato o caricato.";
+App::$strings["Export Content"] = "Esporta i contenuti";
+App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Esporta il tuo canale e i contenuti recenti in un file di salvataggio che potrà essere importato su un altro server/hub. Sarà un backup dei tuoi contatti, dei permessi che hai assegnato, dei dati del profilo e dei post degli ultimi mesi. Il file potrebbe essere MOLTO grande. Sarà necessario attendere con pazienza - saranno necessari molti minuti prima che inizi lo scaricamento.";
+App::$strings["Export your posts from a given year."] = "Esporta i tuoi post a partire dall'anno scelto.";
+App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Puoi anche esportare post e conversazioni di un particolare anno o mese. Modifica la data nella barra dell'indirizzo del browser per scegliere date differenti. Se l'esportazione dovesse fallire (la memoria sul server potrebbe non bastare), riprova scegliendo un intervallo più breve tra le date.";
+App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Per selezionare tutti i post di un anno, come per esempio quello in corso, visita <a href=\"%1\$s\">%2\$s</a> ";
+App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Per selezionare tutti post di un dato mese, come per esempio gennaio di quest'anno, visita <a href=\"%1\$s\">%2\$s</a>";
+App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Questi contenuti potranno essere importati o ripristinati visitando <a href=\"%1\$s\">%2\$s</a> su qualsiasi sito/hub dove è presente il tuo canale. Per mantenere l'ordinamento originale fai attenzione ad importare i file secondo la data (prima il più vecchio)";
 App::$strings["Items tagged with: %s"] = "Elementi taggati con: %s";
 App::$strings["Search results for: %s"] = "Risultati ricerca: %s";
 App::$strings["No service class restrictions found."] = "Non esistono restrizioni su questa classe di account.";
 App::$strings["Name is required"] = "Il nome è obbligatorio";
 App::$strings["Key and Secret are required"] = "Key e Secret sono richiesti";
+App::$strings["This channel is limited to %d tokens"] = "Questo canale è limitato a %d token";
+App::$strings["Name and Password are required."] = "Nome e password sono obbligatori.";
+App::$strings["Token saved."] = "Token salvato.";
 App::$strings["Not valid email."] = "Email non valida.";
 App::$strings["Protected email address. Cannot change to that email."] = "È un indirizzo email riservato. Non puoi sceglierlo.";
 App::$strings["System failure storing new email. Please try again."] = "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore.";
@@ -1129,6 +1188,12 @@ App::$strings["Confirm New Password"] = "Conferma la nuova password";
 App::$strings["Leave password fields blank unless changing"] = "Lascia vuoti questi campi per non cambiare la password";
 App::$strings["Email Address:"] = "Indirizzo email:";
 App::$strings["Remove this account including all its channels"] = "Elimina questo account e tutti i suoi canali";
+App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content."] = "Usa questo modulo per creare credenziali di accesso temporanee per condividere oggetti con chi non è utente. Queste identità possono essere gestite nelle Access Control List e i visitatori possono usare le credenziali per accedere ai contenuti privati.";
+App::$strings["You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "Puoi anche fornire un accesso simile a <em>dropbox</em> agli amici o ai colleghi aggiungendo la password all'url che vuoi comunicare, come mostrato sotto. Esempi:";
+App::$strings["Guest Access Tokens"] = "Token di accesso ospite";
+App::$strings["Login Name"] = "Nome utente";
+App::$strings["Login Password"] = "Password";
+App::$strings["Expires (yyyy-mm-dd)"] = "Con scadenza (aaaa-mm-gg)";
 App::$strings["Additional Features"] = "Funzionalità opzionali";
 App::$strings["Connector Settings"] = "Impostazioni del connettore";
 App::$strings["No special theme for mobile devices"] = "Nessun tema per dispositivi mobili";
@@ -1191,11 +1256,11 @@ App::$strings["Expire other channel content after this many days"] = "Giorni dop
 App::$strings["0 or blank to use the website limit."] = "0 o vuoto per usare i valori predefiniti.";
 App::$strings["This website expires after %d days."] = "Per questo sito la scadenza è %d giorni. ";
 App::$strings["This website does not expire imported content."] = "I contenuti di questo sito non hanno scadenza.";
-App::$strings["The website limit takes precedence if lower than your limit."] = "";
+App::$strings["The website limit takes precedence if lower than your limit."] = "Il limite del webserver ha la precedenza, se minore di quello impostato da te.";
 App::$strings["Maximum Friend Requests/Day:"] = "Numero massimo giornaliero di richieste di amicizia:";
 App::$strings["May reduce spam activity"] = "Serve a ridurre lo spam";
-App::$strings["Default Post and Publish Permissions"] = "";
-App::$strings["Use my default audience setting for the type of object published"] = "";
+App::$strings["Default Post and Publish Permissions"] = "Permessi predefiniti per postare e pubblicare";
+App::$strings["Use my default audience setting for the type of object published"] = "Mostra ai contatti secondo le impostazioni standard per questo tipo di contenuto";
 App::$strings["Channel permissions category:"] = "Categorie di permessi dei canali:";
 App::$strings["Maximum private messages per day from unknown people:"] = "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:";
 App::$strings["Useful to reduce spamming"] = "Serve e ridurre lo spam";
@@ -1270,7 +1335,7 @@ App::$strings["Please select a default timezone for your website"] = "Seleziona
 App::$strings["Site settings"] = "Impostazioni del hub";
 App::$strings["Enable \$Projectname <strong>advanced</strong> features?"] = "Vuoi attivare le funzionalità <strong>avanzate</strong> di \$Projectname?";
 App::$strings["Some advanced features, while useful - may be best suited for technically proficient audiences"] = "Alcune funzionalità avanzate, per quanto utili, potrebbero essere adatte solo a un pubblico tecnicamente preparato.";
-App::$strings["PHP version 5.5 or greater is required."] = "";
+App::$strings["PHP version 5.5 or greater is required."] = "E' necessario PHP in versione 5.5 o superiore.";
 App::$strings["PHP version"] = "Versione PHP";
 App::$strings["Could not find a command line version of PHP in the web server PATH."] = "Non è possibile trovare la versione di PHP da riga di comando nel PATH del server 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."] = "Se non hai installata la versione di PHP da riga di comando non potrai attivare il polling in background tramite cron.";
@@ -1291,7 +1356,6 @@ App::$strings["GD graphics PHP module"] = "modulo PHP GD graphics";
 App::$strings["OpenSSL PHP module"] = "modulo PHP OpenSSL";
 App::$strings["mysqli or postgres PHP module"] = "modulo PHP per mysqli oppure prostgres";
 App::$strings["mb_string PHP module"] = "modulo PHP mb_string";
-App::$strings["mcrypt PHP module"] = "modulo PHP mcrypt";
 App::$strings["xml PHP module"] = "modulo xml PHP";
 App::$strings["Apache mod_rewrite module"] = "modulo Apache mod_rewrite";
 App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Errore: il modulo mod-rewrite di Apache è richiesto ma non installato";
@@ -1302,7 +1366,6 @@ App::$strings["Error: GD graphics PHP module with JPEG support required but not
 App::$strings["Error: openssl PHP module required but not installed."] = "Errore: il modulo openssl di PHP è richiesto ma non installato.";
 App::$strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Errore: il modulo PHP per mysqli o postgres è richiesto ma non installato";
 App::$strings["Error: mb_string PHP module required but not installed."] = "Errore: il modulo PHP mb_string è richiesto ma non installato.";
-App::$strings["Error: mcrypt PHP module required but not installed."] = "Errore: il modulo PHP mcrypt è richiesto ma non installato.";
 App::$strings["Error: xml PHP module required for DAV but not installed."] = "Errore: il modulo xml PHP è richiesto per DAV ma non è installato.";
 App::$strings["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."] = "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella di Hubzilla ma non è in grado di farlo.";
 App::$strings["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."] = "Spesso ciò è dovuto ai permessi di accesso al disco: il web server potrebbe non aver diritto di scrivere il file nella cartella, anche se tu puoi.";
@@ -1310,11 +1373,11 @@ App::$strings["At the end of this procedure, we will give you a text to save in
 App::$strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Puoi anche saltare questa procedura ed effettuare un'installazione manuale. Guarda il file 'install/INSTALL.txt' per le istruzioni.";
 App::$strings[".htconfig.php is writable"] = ".htconfig.php è scrivibile";
 App::$strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Hubzilla usa il sistema Smarty3 per costruire i suoi template grafici. Smarty3 è molto veloce perché compila i template delle pagine direttamente in PHP.";
-App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "";
+App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "Per poter memorizzare questi template, il server web deve avere i diritti di scrittura sulla directory %s";
 App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Assicurati che il tuo web server sia in esecuzione con un utente che ha diritto di scrittura su quella cartella (ad esempio www-data).";
 App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Nota bene: come precauzione, dovresti dare i diritti di scrittura solamente su %s e non sui file template (.tpl) che contiene.";
 App::$strings["%s is writable"] = "%s è scrivibile";
-App::$strings["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"] = "Hubzilla salva i file caricati nella cartella \"store\" sul server. Il server deve avere i diritti di scrittura su quella cartella che si trova dentro l'installazione di RedMatrix";
+App::$strings["This software 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"] = "Questo software usa la cartella store per salvare i file caricati. Il server web deve avere i diritti di scrittura sulla cartella perché l'operazione avvenga con successo";
 App::$strings["store is writable"] = "l'archivio è scrivibile";
 App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "Il certificato SSL non può essere validato. Correggi l'errore o disabilita l'accesso https al sito.";
 App::$strings["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!"] = "Se abiliti https per il tuo sito o permetti connessioni TCP su port 443 (quella di https), DEVI usare un certificato riconosciuto dai browser internet. NON DEVI usare certificati self-signed generati da te!";
@@ -1322,6 +1385,7 @@ App::$strings["This restriction is incorporated because public posts from you ma
 App::$strings["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."] = "Se il tuo certificato non è riconosciuto, gli utenti che ti seguono da altri siti (che avranno certificati validi) riceveranno gravi avvisi di sicurezza dal browser.";
 App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Ciò può creare seri problemi di usabilità (non solo sul tuo sito), quindi dobbiamo insistere su questo punto.";
 App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Eventualmente, considera che esistono provider che rilasciano certificati gratuiti riconosciuti dai browser.";
+App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "Se credi che il certificato sia valido e firmato da una authority, verifica se hai sbagliato a installare i certificati intermedi. Normalmente non sono richiesti dai browser, ma sono necessari per la comunicazione server-to-server.";
 App::$strings["SSL certificate validation"] = "Validazione del certificato SSL";
 App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "In .htaccess la funzionalità url rewrite non funziona. Controlla la configurazione del server. Test:";
 App::$strings["Url rewrite is working"] = "Url rewrite funziona correttamente";
@@ -1333,19 +1397,20 @@ App::$strings["Files: shared with me"] = "File: condivisi con me";
 App::$strings["NEW"] = "NOVITÀ";
 App::$strings["Remove all files"] = "Elimina tutti i file";
 App::$strings["Remove this file"] = "Elimina questo file";
-App::$strings["Version %s"] = "Versione %s";
-App::$strings["Installed plugins/addons/apps:"] = "App e componenti installati:";
-App::$strings["No installed plugins/addons/apps"] = "Nessuna app o componente installato";
-App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Questo è un hub di \$Projectname - una rete cooperativa e decentralizzata di siti ad elevata privacy. ";
-App::$strings["Tag: "] = "Tag: ";
-App::$strings["Last background fetch: "] = "Ultima acquisizione:";
-App::$strings["Current load average: "] = "Carico medio attuale:";
-App::$strings["Running at web location"] = "In esecuzione sull'indirizzo web";
-App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Visita <a href=\"http://hubzilla.org\">hubzilla.org</a> per maggiori informazioni su \$Projectname.";
-App::$strings["Bug reports and issues: please visit"] = "Per segnalare bug e problemi: visita";
-App::$strings["\$projectname issues"] = "Problematiche note su \$projectname";
-App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Per consigli, ringraziamenti, ecc. - scrivi a \"redmatrix\" at librelist - dot com";
-App::$strings["Site Administrators"] = "Amministratori del sito";
+App::$strings["Thing updated"] = "L'oggetto è stato aggiornato";
+App::$strings["Object store: failed"] = "Impossibile memorizzare l'oggetto.";
+App::$strings["Thing added"] = "L'Oggetto è stato aggiunto";
+App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+App::$strings["Show Thing"] = "Mostra l'oggetto";
+App::$strings["item not found."] = "non trovato.";
+App::$strings["Edit Thing"] = "Modifica l'oggetto";
+App::$strings["Select a profile"] = "Scegli un profilo";
+App::$strings["Post an activity"] = "Pubblica un'attività";
+App::$strings["Only sends to viewers of the applicable profile"] = "Invia solo a chi può vedere il profilo scelto";
+App::$strings["Name of thing e.g. something"] = "Nome dell'oggetto";
+App::$strings["URL of thing (optional)"] = "Indirizzo web dell'oggetto (facoltativo)";
+App::$strings["URL for photo of thing (optional)"] = "Indirizzo di un'immagine dell'oggetto (facoltativo)";
+App::$strings["Add Thing to your Profile"] = "Aggiungi l'oggetto al tuo profilo";
 App::$strings["Failed to create source. No channel selected."] = "Impossibile creare la sorgente. Nessun canale selezionato.";
 App::$strings["Source created."] = "Sorgente creata.";
 App::$strings["Source updated."] = "Sorgente aggiornata.";
@@ -1357,7 +1422,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)"] = "Importa solo i contenuti che hanno queste parole (una per riga)";
 App::$strings["Leave blank to import all public content"] = "Lascia vuoto per importare tutti i contenuti pubblici";
 App::$strings["Channel Name"] = "Nome del canale";
-App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "";
+App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Aggiungi le seguenti categorie ai post importati da questa sorgente (separate da virgola)";
 App::$strings["Source not found."] = "Sorgente non trovata.";
 App::$strings["Edit Source"] = "Modifica la sorgente";
 App::$strings["Delete Source"] = "Elimina la sorgente";
@@ -1373,60 +1438,38 @@ App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha taggato %3\$s
 App::$strings["Tag removed"] = "Tag rimosso";
 App::$strings["Remove Item Tag"] = "Rimuovi il tag";
 App::$strings["Select a tag to remove: "] = "Seleziona un tag da rimuovere: ";
-App::$strings["Thing updated"] = "L'oggetto è stato aggiornato";
-App::$strings["Object store: failed"] = "Impossibile memorizzare l'oggetto.";
-App::$strings["Thing added"] = "L'Oggetto è stato aggiunto";
-App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-App::$strings["Show Thing"] = "Mostra l'oggetto";
-App::$strings["item not found."] = "non trovato.";
-App::$strings["Edit Thing"] = "Modifica l'oggetto";
-App::$strings["Select a profile"] = "Scegli un profilo";
-App::$strings["Post an activity"] = "Pubblica un'attività";
-App::$strings["Only sends to viewers of the applicable profile"] = "Invia solo a chi può vedere il profilo scelto";
-App::$strings["Name of thing e.g. something"] = "Nome dell'oggetto";
-App::$strings["URL of thing (optional)"] = "Indirizzo web dell'oggetto (facoltativo)";
-App::$strings["URL for photo of thing (optional)"] = "Indirizzo di un'immagine dell'oggetto (facoltativo)";
-App::$strings["Add Thing to your Profile"] = "Aggiungi l'oggetto al tuo profilo";
-App::$strings["Export Channel"] = "Esporta il canale";
-App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Esporta le informazioni di base del canale in un file. In pratica è un salvataggio delle tue connessioni, dei permessi che hai assegnato e del tuo profilo che così potrà essere importato su un altro server/hub. Il file non includerà i tuoi post e altri contenuti che hai creato o caricato.";
-App::$strings["Export Content"] = "Esporta i contenuti";
-App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Esporta il tuo canale e i contenuti recenti in un file di salvataggio che potrà essere importato su un altro server/hub. Sarà un backup dei tuoi contatti, dei permessi che hai assegnato, dei dati del profilo e dei post degli ultimi mesi. Il file potrebbe essere MOLTO grande. Sarà necessario attendere con pazienza - saranno necessari molti minuti prima che inizi lo scaricamento.";
-App::$strings["Export your posts from a given year."] = "Esporta i tuoi post a partire dall'anno scelto.";
-App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Puoi anche esportare post e conversazioni di un particolare anno o mese. Modifica la data nella barra dell'indirizzo del browser per scegliere date differenti. Se l'esportazione dovesse fallire (la memoria sul server potrebbe non bastare), riprova scegliendo un intervallo più breve tra le date.";
-App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Per selezionare tutti i post di un anno, come per esempio quello in corso, visita <a href=\"%1\$s\">%2\$s</a> ";
-App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Per selezionare tutti post di un dato mese, come per esempio gennaio di quest'anno, visita <a href=\"%1\$s\">%2\$s</a>";
-App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Questi contenuti potranno essere importati o ripristinati visitando <a href=\"%1\$s\">%2\$s</a> su qualsiasi sito/hub dove è presente il tuo canale. Per mantenere l'ordinamento originale fai attenzione ad importare i file secondo la data (prima il più vecchio)";
-App::$strings["No connections."] = "Nessun contatto.";
-App::$strings["Visit %s's profile [%s]"] = "Visita il profilo di %s [%s]";
-App::$strings["View Connections"] = "Elenco contatti";
-App::$strings["Source of Item"] = "Sorgente";
 App::$strings["Webpages"] = "Pagine web";
 App::$strings["Actions"] = "Azioni";
 App::$strings["Page Link"] = "Link alla pagina";
 App::$strings["Page Title"] = "Titolo della pagina";
+App::$strings["Not found"] = "Non trovato";
+App::$strings["Wiki"] = "Wiki";
+App::$strings["Sandbox"] = "Sandbox";
+App::$strings["\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be saved*.\""] = "\"# Wiki Sandbox\\n\\nI contenuti che **modifichi** e che vedi in **anteprima** qui *non saranno salvati*.\"";
+App::$strings["Revision Comparison"] = "Confronto tra revisioni";
+App::$strings["Revert"] = "Ripristina";
+App::$strings["Enter the name of your new wiki:"] = "Nome della tua nuova pagina wiki:";
+App::$strings["Enter the name of the new page:"] = "Nome della tua nuova pagina:";
+App::$strings["Enter the new name:"] = "Nuovo nome:";
+App::$strings["Embed image from photo albums"] = "Inserisci un'immagine dall'album foto";
+App::$strings["Embed an image from your albums"] = "Inserisci un'immagine dai tuoi album";
+App::$strings["OK"] = "OK";
+App::$strings["Choose images to embed"] = "Scegli le immagini da inserire";
+App::$strings["Choose an album"] = "Scegli un album";
+App::$strings["Choose a different album..."] = "Scegli un altro album...";
+App::$strings["Error getting album list"] = "Errore nell'ottenere l'elenco degli album";
+App::$strings["Error getting photo link"] = "Errore nell'ottenere il link alla foto";
+App::$strings["Error getting album"] = "Errore nell'ottenere l'album";
+App::$strings["No connections."] = "Nessun contatto.";
+App::$strings["Visit %s's profile [%s]"] = "Visita il profilo di %s [%s]";
+App::$strings["View Connections"] = "Elenco contatti";
+App::$strings["Source of Item"] = "Sorgente";
+App::$strings["Authorize application connection"] = "Autorizza la app";
+App::$strings["Return to your app and insert this Securty Code:"] = "Torna alla app e inserisci questo codice di sicurezza:";
+App::$strings["Please login to continue."] = "Accedi al sito per continuare.";
+App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?";
 App::$strings["Xchan Lookup"] = "Ricerca canale";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Cerca un canale (o un webbie) che inizia per:";
-App::$strings["Site Admin"] = "Amministrazione sito";
-App::$strings["Bug Report"] = "Bug Report";
-App::$strings["View Bookmarks"] = "Vedi i segnalibri";
-App::$strings["My Chatrooms"] = "Le mie aree chat";
-App::$strings["Firefox Share"] = "";
-App::$strings["Remote Diagnostics"] = "";
-App::$strings["Suggest Channels"] = "Suggerisci canali";
-App::$strings["Login"] = "Accedi";
-App::$strings["Grid"] = "Rete";
-App::$strings["Channel Home"] = "Bacheca del canale";
-App::$strings["Events"] = "Eventi";
-App::$strings["Directory"] = "Elenchi pubblici dei canali";
-App::$strings["Mail"] = "Messaggi";
-App::$strings["Chat"] = "Chat";
-App::$strings["Probe"] = "Diagnostica";
-App::$strings["Suggest"] = "Suggerisci";
-App::$strings["Random Channel"] = "Canale casuale";
-App::$strings["Invite"] = "Invita";
-App::$strings["Features"] = "Funzionalità";
-App::$strings["Post"] = "Post";
-App::$strings["Purchase"] = "Acquista";
 App::$strings["Missing room name"] = "Chat senza nome";
 App::$strings["Duplicate room name"] = "Il nome della chat è duplicato";
 App::$strings["Invalid room specifier."] = "Il nome della chat non è valido.";
@@ -1474,6 +1517,27 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Visita
 App::$strings["[Hubzilla:Notify]"] = "[Hubzilla]";
 App::$strings["created a new post"] = "Ha creato un nuovo post";
 App::$strings["commented on %s's post"] = "ha commentato il post di %s";
+App::$strings["Site Admin"] = "Amministrazione sito";
+App::$strings["Bug Report"] = "Bug Report";
+App::$strings["View Bookmarks"] = "Vedi i segnalibri";
+App::$strings["My Chatrooms"] = "Le mie aree chat";
+App::$strings["Firefox Share"] = "Firefox Share";
+App::$strings["Remote Diagnostics"] = "Diagnostica remota";
+App::$strings["Suggest Channels"] = "Suggerisci canali";
+App::$strings["Login"] = "Accedi";
+App::$strings["Grid"] = "Rete";
+App::$strings["Channel Home"] = "Bacheca del canale";
+App::$strings["Events"] = "Eventi";
+App::$strings["Directory"] = "Elenchi pubblici dei canali";
+App::$strings["Mail"] = "Messaggi";
+App::$strings["Chat"] = "Chat";
+App::$strings["Probe"] = "Diagnostica";
+App::$strings["Suggest"] = "Suggerisci";
+App::$strings["Random Channel"] = "Canale casuale";
+App::$strings["Invite"] = "Invita";
+App::$strings["Features"] = "Funzionalità";
+App::$strings["Post"] = "Post";
+App::$strings["Purchase"] = "Acquista";
 App::$strings["Private Message"] = "Messaggio privato";
 App::$strings["Select"] = "Scegli";
 App::$strings["Save to Folder"] = "Salva nella cartella";
@@ -1510,7 +1574,7 @@ App::$strings["Expires: %s"] = "Scadenza: %s";
 App::$strings["Save Bookmarks"] = "Salva segnalibro";
 App::$strings["Add to Calendar"] = "Aggiungi al calendario";
 App::$strings["Mark all seen"] = "Marca tutto come letto";
-App::$strings["[+] show all"] = "[+] mostra tutto";
+App::$strings["%s show all"] = "%s mostra tutto";
 App::$strings["Bold"] = "Grassetto";
 App::$strings["Italic"] = "Corsivo";
 App::$strings["Underline"] = "Sottolineato";
@@ -1519,9 +1583,93 @@ App::$strings["Code"] = "Codice";
 App::$strings["Image"] = "Immagine";
 App::$strings["Insert Link"] = "Collegamento";
 App::$strings["Video"] = "Video";
+App::$strings["Visible to your default audience"] = "Visibile secondo le impostazioni predefinite";
+App::$strings["Only me"] = "Solo io";
+App::$strings["Public"] = "Pubblico";
+App::$strings["Anybody in the \$Projectname network"] = "Tutti sulla rete \$Projectname";
+App::$strings["Any account on %s"] = "Tutti gli account su %s";
+App::$strings["Any of my connections"] = "Chiunque tra i miei contatti";
+App::$strings["Only connections I specifically allow"] = "Solo chi riceve il mio permesso";
+App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Chiunque sia autenticato (inclusi visitatori di altre reti)";
+App::$strings["Any connections including those who haven't yet been approved"] = "Tutti i contatti inclusi quelli non ancora approvati";
+App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Impostazione predefinita di chi può vedere ciò che pubblichi in bacheca";
+App::$strings["This is your default setting for who can view your default channel profile"] = "Impostazione predefinita di chi può vedere il profilo standard del tuo canale";
+App::$strings["This is your default setting for who can view your connections"] = "Impostazione predefinita di chi può vedere i tuoi contatti/amici";
+App::$strings["This is your default setting for who can view your file storage and photos"] = "Impostazione predefinita di chi può vedere le foto e il tuo archivio file";
+App::$strings["This is your default setting for the audience of your webpages"] = "Impostazione predefinita di chi può vedere le tue pagine web";
 App::$strings["No username found in import file."] = "Impossibile trovare il nome utente nel file da importare.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "Impossibile creare un indirizzo univoco per il canale. L'import è fallito.";
 App::$strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "L'immagine supera il limite massimo di %lu bytes";
+App::$strings["Image file is empty."] = "Il file dell'immagine è vuoto.";
+App::$strings["Photo storage failed."] = "Impossibile salvare la foto.";
+App::$strings["a new photo"] = "una nuova foto";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha pubblicato %2\$s su %3\$s";
+App::$strings["Photo Albums"] = "Album foto";
+App::$strings["Upload New Photos"] = "Carica nuove foto";
+App::$strings["Logout"] = "Esci";
+App::$strings["End this session"] = "Chiudi questa sessione";
+App::$strings["Home"] = "Bacheca";
+App::$strings["Your posts and conversations"] = "I tuoi post e conversazioni";
+App::$strings["Your profile page"] = "Il tuo profilo";
+App::$strings["Manage/Edit profiles"] = "Gestisci i tuoi profili";
+App::$strings["Edit Profile"] = "Modifica il profilo";
+App::$strings["Edit your profile"] = "Modifica il tuo profilo";
+App::$strings["Your photos"] = "Le tue foto";
+App::$strings["Your files"] = "I tuoi file";
+App::$strings["Your chatrooms"] = "Le tue chat";
+App::$strings["Bookmarks"] = "Segnalibri";
+App::$strings["Your bookmarks"] = "I tuoi segnalibri";
+App::$strings["Your webpages"] = "Le tue pagine web";
+App::$strings["Your wiki"] = "La tua wiki";
+App::$strings["Sign in"] = "Accedi";
+App::$strings["%s - click to logout"] = "%s - clicca per uscire";
+App::$strings["Remote authentication"] = "Accedi dal tuo hub";
+App::$strings["Click to authenticate to your home hub"] = "Clicca per farti riconoscere dal tuo hub principale";
+App::$strings["Home Page"] = "Bacheca";
+App::$strings["Create an account"] = "Crea un account";
+App::$strings["Help and documentation"] = "Guida e documentazione";
+App::$strings["Applications, utilities, links, games"] = "Applicazioni, utilità, link, giochi";
+App::$strings["Search site @name, #tag, ?docs, content"] = "Cerca nel sito per @nome, #tag, ?guida o per contenuto";
+App::$strings["Channel Directory"] = "Elenchi pubblici dei canali";
+App::$strings["Your grid"] = "La tua rete";
+App::$strings["Mark all grid notifications seen"] = "Segna come lette le notifiche della tua rete";
+App::$strings["Channel home"] = "Bacheca del canale";
+App::$strings["Mark all channel notifications seen"] = "Segna come lette le notifiche del canale";
+App::$strings["Notices"] = "Avvisi";
+App::$strings["Notifications"] = "Notifiche";
+App::$strings["See all notifications"] = "Vedi tutte le notifiche";
+App::$strings["Private mail"] = "Messaggi privati";
+App::$strings["See all private messages"] = "Guarda tutti i messaggi privati";
+App::$strings["Mark all private messages seen"] = "Segna come letti tutti i messaggi privati";
+App::$strings["Inbox"] = "In arrivo";
+App::$strings["Outbox"] = "Inviati";
+App::$strings["New Message"] = "Nuovo messaggio";
+App::$strings["Event Calendar"] = "Calendario";
+App::$strings["See all events"] = "Guarda tutti gli eventi";
+App::$strings["Mark all events seen"] = "Marca come letti tutti gli eventi";
+App::$strings["Manage Your Channels"] = "Gestisci i tuoi canali";
+App::$strings["Account/Channel Settings"] = "Impostazioni dell'account e del canale";
+App::$strings["Admin"] = "Amministrazione";
+App::$strings["Site Setup and Configuration"] = "Installazione e configurazione del sito";
+App::$strings["Loading..."] = "Caricamento in corso...";
+App::$strings["@name, #tag, ?doc, content"] = "@nome, #tag, ?guida, contenuto";
+App::$strings["Please wait..."] = "Attendere...";
+App::$strings["view full size"] = "guarda nelle dimensioni reali";
+App::$strings["Administrator"] = "Amministratore";
+App::$strings["No Subject"] = "Nessun titolo";
+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["New Page"] = "Nuova pagina web";
+App::$strings["Title"] = "Titolo";
 App::$strings["Categories"] = "Categorie";
 App::$strings["Tags"] = "Tag";
 App::$strings["Keywords"] = "Parole chiave";
@@ -1531,34 +1679,196 @@ App::$strings["want"] = "voglio";
 App::$strings["wants"] = "vuole";
 App::$strings["likes"] = "gli piace";
 App::$strings["dislikes"] = "non gli piace";
-App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
-App::$strings["Starts:"] = "Inizio:";
-App::$strings["Finishes:"] = "Fine:";
-App::$strings["This event has been added to your calendar."] = "Questo evento è stato aggiunto al tuo calendario";
-App::$strings["Not specified"] = "Non specificato";
-App::$strings["Needs Action"] = "Necessita di un intervento";
-App::$strings["Completed"] = "Completato";
-App::$strings["In Process"] = "In corso";
-App::$strings["Cancelled"] = "Annullato";
+App::$strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database";
+App::$strings["Empty name"] = "Nome vuoto";
+App::$strings["Name too long"] = "Nome troppo lungo";
+App::$strings["No account identifier"] = "Account senza identificativo";
+App::$strings["Nickname is required."] = "Il nome dell'account è obbligatorio.";
+App::$strings["Reserved nickname. Please choose another."] = "Nome utente riservato. Per favore scegline un altro.";
+App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Il nome dell'account è già in uso oppure ha dei caratteri non supportati.";
+App::$strings["Unable to retrieve created identity"] = "Impossibile caricare l'identità creata";
+App::$strings["Default Profile"] = "Profilo predefinito";
+App::$strings["Requested channel is not available."] = "Il canale che cerchi non è disponibile.";
+App::$strings["Create New Profile"] = "Crea un nuovo profilo";
+App::$strings["Visible to everybody"] = "Visibile a tutti";
+App::$strings["Gender:"] = "Sesso:";
+App::$strings["Status:"] = "Stato:";
+App::$strings["Homepage:"] = "Home page:";
+App::$strings["Online Now"] = "Online adesso";
+App::$strings["Like this channel"] = "Mi piace questo canale";
+App::$strings["j F, Y"] = "j F Y";
+App::$strings["j F"] = "j F";
+App::$strings["Birthday:"] = "Compleanno:";
+App::$strings["for %1\$d %2\$s"] = "per %1\$d %2\$s";
+App::$strings["Sexual Preference:"] = "Preferenze sessuali:";
+App::$strings["Tags:"] = "Tag:";
+App::$strings["Political Views:"] = "Orientamento politico:";
+App::$strings["Religion:"] = "Religione:";
+App::$strings["Hobbies/Interests:"] = "Interessi e hobby:";
+App::$strings["Likes:"] = "Mi piace:";
+App::$strings["Dislikes:"] = "Non mi piace:";
+App::$strings["Contact information and Social Networks:"] = "Contatti e social network:";
+App::$strings["My other channels:"] = "I miei altri canali:";
+App::$strings["Musical interests:"] = "Gusti musicali:";
+App::$strings["Books, literature:"] = "Libri, letteratura:";
+App::$strings["Television:"] = "Televisione:";
+App::$strings["Film/dance/culture/entertainment:"] = "Film, danza, cultura, intrattenimento:";
+App::$strings["Love/Romance:"] = "Amore:";
+App::$strings["Work/employment:"] = "Lavoro:";
+App::$strings["School/education:"] = "Scuola:";
+App::$strings["Like this thing"] = "Mi piace";
+App::$strings["New window"] = "Nuova finestra";
+App::$strings["Open the selected location in a different window or browser tab"] = "Apri l'indirizzo selezionato in una nuova scheda o finestra";
+App::$strings["User '%s' deleted"] = "Utente '%s' eliminato";
+App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s adesso è connesso con %2\$s";
+App::$strings["%1\$s poked %2\$s"] = "%1\$s ha mandato un poke a %2\$s";
+App::$strings["poked"] = "ha mandato un poke";
+App::$strings["View %s's profile @ %s"] = "Vedi il profilo di %s @ %s";
+App::$strings["Categories:"] = "Categorie:";
+App::$strings["Filed under:"] = "Classificato come:";
+App::$strings["View in context"] = "Vedi nel contesto";
+App::$strings["remove"] = "rimuovi";
+App::$strings["Delete Selected Items"] = "Elimina gli oggetti selezionati";
+App::$strings["View Source"] = "Vedi il sorgente";
+App::$strings["Follow Thread"] = "Segui la discussione";
+App::$strings["Unfollow Thread"] = "Non seguire la discussione";
+App::$strings["Activity/Posts"] = "Attività e Post";
+App::$strings["Edit Connection"] = "Modifica il contatto";
+App::$strings["Message"] = "Messaggio";
+App::$strings["%s likes this."] = "Piace a %s.";
+App::$strings["%s doesn't like this."] = "Non piace a %s.";
+App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
+	0 => "",
+	1 => "Piace a <span %1\$s>%2\$d persone</span>.",
+);
+App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "",
+	1 => "Non piace a <span %1\$s>%2\$d persone</span>.",
+);
+App::$strings["and"] = "e";
+App::$strings[", and %d other people"] = array(
+	0 => "",
+	1 => "e altre %d persone",
+);
+App::$strings["%s like this."] = "Piace a %s.";
+App::$strings["%s don't like this."] = "Non piace a %s.";
+App::$strings["Set your location"] = "La tua località";
+App::$strings["Clear browser location"] = "Rimuovi la località data dal browser";
+App::$strings["Tag term:"] = "Tag:";
+App::$strings["Where are you right now?"] = "Dove sei ora?";
+App::$strings["Page link name"] = "Nome del link alla pagina";
+App::$strings["Post as"] = "Pubblica come ";
+App::$strings["Toggle voting"] = "Abilita/disabilita il voto";
+App::$strings["Categories (optional, comma-separated list)"] = "Categorie (facoltative, lista separata da virgole)";
+App::$strings["Set publish date"] = "Data di uscita programmata";
+App::$strings["Discover"] = "Scopri";
+App::$strings["Imported public streams"] = "Contenuti pubblici importati";
+App::$strings["Commented Order"] = "Commenti recenti";
+App::$strings["Sort by Comment Date"] = "Per data del commento";
+App::$strings["Posted Order"] = "Post recenti";
+App::$strings["Sort by Post Date"] = "Per data di creazione";
+App::$strings["Posts that mention or involve you"] = "Post che ti riguardano";
+App::$strings["Activity Stream - by date"] = "Elenco attività - per data";
+App::$strings["Starred"] = "Preferiti";
+App::$strings["Favourite Posts"] = "Post preferiti";
+App::$strings["Spam"] = "Spam";
+App::$strings["Posts flagged as SPAM"] = "Post marcati come spam";
+App::$strings["Status Messages and Posts"] = "Post e messaggi di stato";
+App::$strings["About"] = "Informazioni";
+App::$strings["Profile Details"] = "Dettagli del profilo";
+App::$strings["Files and Storage"] = "Archivio file";
+App::$strings["Chatrooms"] = "Chat";
+App::$strings["Saved Bookmarks"] = "Segnalibri salvati";
+App::$strings["Manage Webpages"] = "Gestisci le pagine web";
+App::$strings["__ctx:noun__ Attending"] = array(
+	0 => "Partecipa",
+	1 => "Partecipano",
+);
+App::$strings["__ctx:noun__ Not Attending"] = array(
+	0 => "Non partecipa",
+	1 => "Non partecipano",
+);
+App::$strings["__ctx:noun__ Undecided"] = array(
+	0 => "Indeciso",
+	1 => "Indecisi",
+);
+App::$strings["__ctx:noun__ Agree"] = array(
+	0 => "D'accordo",
+	1 => "D'accordo",
+);
+App::$strings["__ctx:noun__ Disagree"] = array(
+	0 => "Non d'accordo",
+	1 => "Non d'accordo",
+);
+App::$strings["__ctx:noun__ Abstain"] = array(
+	0 => "Astenuto",
+	1 => "Astenuti",
+);
 App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Non posso creare un canale con un identificativo che già esiste su questo sistema. L'importazione è fallita.";
 App::$strings["Channel clone failed. Import failed."] = "Impossibile clonare il canale. L'importazione è fallita.";
-App::$strings["(Unknown)"] = "(Sconosciuto)";
-App::$strings["Visible to anybody on the internet."] = "Visibile a chiunque su internet.";
-App::$strings["Visible to you only."] = "Visibile solo a te.";
-App::$strings["Visible to anybody in this network."] = "Visibile a tutti su questa rete.";
-App::$strings["Visible to anybody authenticated."] = "Visibile a chiunque sia autenticato.";
-App::$strings["Visible to anybody on %s."] = "Visibile a tutti su %s.";
-App::$strings["Visible to all connections."] = "Visibile a tutti coloro che ti seguono.";
-App::$strings["Visible to approved connections."] = "Visibile ai contatti approvati.";
-App::$strings["Visible to specific connections."] = "Visibile ad alcuni contatti scelti.";
-App::$strings["Privacy group is empty."] = "Gruppo di canali vuoto.";
-App::$strings["Privacy group: %s"] = "Gruppo di canali: %s";
-App::$strings["Connection not found."] = "Contatto non trovato.";
-App::$strings["profile photo"] = "foto del profilo";
-App::$strings["No recipient provided."] = "Devi scegliere un destinatario.";
-App::$strings["[no subject]"] = "[nessun titolo]";
-App::$strings["Unable to determine sender."] = "Impossibile determinare il mittente.";
-App::$strings["Stored post could not be verified."] = "Non è stato possibile verificare il post.";
+App::$strings["Frequently"] = "Frequentemente";
+App::$strings["Hourly"] = "Ogni ora";
+App::$strings["Twice daily"] = "Due volte al giorno";
+App::$strings["Daily"] = "Ogni giorno";
+App::$strings["Weekly"] = "Ogni settimana";
+App::$strings["Monthly"] = "Ogni mese";
+App::$strings["Currently Male"] = "Al momento maschio";
+App::$strings["Currently Female"] = "Al momento femmina";
+App::$strings["Mostly Male"] = "Prevalentemente maschio";
+App::$strings["Mostly Female"] = "Prevalentemente femmina";
+App::$strings["Transgender"] = "Transgender";
+App::$strings["Intersex"] = "Intersex";
+App::$strings["Transsexual"] = "Transessuale";
+App::$strings["Hermaphrodite"] = "Ermafrodito";
+App::$strings["Neuter"] = "Neutro";
+App::$strings["Non-specific"] = "Non specificato";
+App::$strings["Undecided"] = "Indeciso";
+App::$strings["Males"] = "Maschi";
+App::$strings["Females"] = "Femmine";
+App::$strings["Gay"] = "Gay";
+App::$strings["Lesbian"] = "Lesbica";
+App::$strings["No Preference"] = "Senza preferenza";
+App::$strings["Bisexual"] = "Bisessuale";
+App::$strings["Autosexual"] = "Autosessuale";
+App::$strings["Abstinent"] = "Astinente";
+App::$strings["Virgin"] = "Vergine";
+App::$strings["Deviant"] = "Deviato";
+App::$strings["Fetish"] = "Feticista";
+App::$strings["Oodles"] = "Un sacco";
+App::$strings["Nonsexual"] = "Asessuato";
+App::$strings["Single"] = "Single";
+App::$strings["Lonely"] = "Da solo";
+App::$strings["Available"] = "Disponibile";
+App::$strings["Unavailable"] = "Non disponibile";
+App::$strings["Has crush"] = "Ha una cotta";
+App::$strings["Infatuated"] = "Infatuato/a";
+App::$strings["Dating"] = "Disponibile a un incontro";
+App::$strings["Unfaithful"] = "Infedele";
+App::$strings["Sex Addict"] = "Sesso-dipendente";
+App::$strings["Friends/Benefits"] = "Amici con qualcosa in più";
+App::$strings["Casual"] = "Casual";
+App::$strings["Engaged"] = "Impegnato";
+App::$strings["Married"] = "Sposato/a";
+App::$strings["Imaginarily married"] = "Con matrimonio immaginario";
+App::$strings["Partners"] = "Partner";
+App::$strings["Cohabiting"] = "Convivente";
+App::$strings["Common law"] = "Matrimonio regolare";
+App::$strings["Happy"] = "Felice";
+App::$strings["Not looking"] = "Non in cerca";
+App::$strings["Swinger"] = "Scambista";
+App::$strings["Betrayed"] = "Tradito/a";
+App::$strings["Separated"] = "Separato/a";
+App::$strings["Unstable"] = "Instabile";
+App::$strings["Divorced"] = "Divorziato/a";
+App::$strings["Imaginarily divorced"] = "Sogna il divorzio";
+App::$strings["Widowed"] = "Vedovo/a";
+App::$strings["Uncertain"] = "Incerto/a";
+App::$strings["It's complicated"] = "Relazione complicata";
+App::$strings["Don't care"] = "Chi se ne frega";
+App::$strings["Ask me"] = "Chiedimelo";
+App::$strings["%1\$s's bookmarks"] = "I segnalibri di %1\$s";
+App::$strings["guest:"] = "ospite:";
+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."] = "I controlli di sicurezza sono falliti. Probabilmente è accaduto perché la pagina è stata tenuta aperta troppo a lungo (ore?) prima di inviare il contenuto.";
 App::$strings["prev"] = "prec";
 App::$strings["first"] = "inizio";
 App::$strings["last"] = "fine";
@@ -1568,7 +1878,6 @@ App::$strings["newer"] = "più nuovi";
 App::$strings["No connections"] = "Nessun contatto";
 App::$strings["View all %s connections"] = "Mostra tutti i %s contatti";
 App::$strings["poke"] = "poke";
-App::$strings["poked"] = "ha mandato un poke";
 App::$strings["ping"] = "ping";
 App::$strings["pinged"] = "ha effettuato un ping";
 App::$strings["prod"] = "spintone";
@@ -1631,385 +1940,21 @@ App::$strings["Select an alternate language"] = "Seleziona una lingua diversa";
 App::$strings["activity"] = "l'attività";
 App::$strings["Design Tools"] = "Strumenti di design";
 App::$strings["Pages"] = "Pagine";
-App::$strings["System"] = "Sistema";
-App::$strings["New App"] = "Nuova app";
-App::$strings["Suggestions"] = "Suggerimenti";
-App::$strings["See more..."] = "Altro...";
-App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Hai attivato %1$.0f delle %2$.0f connessioni permesse.";
-App::$strings["Add New Connection"] = "Aggiungi un contatto";
-App::$strings["Enter channel address"] = "Indirizzo del canale";
-App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Per esempio: bob@example.com, https://example.com/barbara";
-App::$strings["Notes"] = "Note";
-App::$strings["Remove term"] = "Rimuovi termine";
-App::$strings["Saved Searches"] = "Ricerche salvate";
-App::$strings["add"] = "aggiungi";
-App::$strings["Saved Folders"] = "Cartelle salvate";
-App::$strings["Everything"] = "Tutto";
-App::$strings["Archives"] = "Archivi";
-App::$strings["Refresh"] = "Aggiorna";
-App::$strings["Account settings"] = "Il tuo account";
-App::$strings["Channel settings"] = "Impostazioni del canale";
-App::$strings["Additional features"] = "Funzionalità opzionali";
-App::$strings["Feature/Addon settings"] = "Componenti aggiuntivi";
-App::$strings["Display settings"] = "Aspetto";
-App::$strings["Manage locations"] = "Gestione repliche";
-App::$strings["Export channel"] = "Esporta il canale";
-App::$strings["Connected apps"] = "App connesse";
-App::$strings["Premium Channel Settings"] = "Canale premium - impostazioni";
-App::$strings["Private Mail Menu"] = "Menu messaggi privati";
-App::$strings["Combined View"] = "Vista combinata";
-App::$strings["Inbox"] = "In arrivo";
-App::$strings["Outbox"] = "Inviati";
-App::$strings["New Message"] = "Nuovo messaggio";
-App::$strings["Conversations"] = "Conversazioni";
-App::$strings["Received Messages"] = "Ricevuti";
-App::$strings["Sent Messages"] = "Inviati";
-App::$strings["No messages."] = "Nessun messaggio.";
-App::$strings["Delete conversation"] = "Elimina la conversazione";
-App::$strings["Events Menu"] = "Menu eventi";
-App::$strings["Day View"] = "Eventi del giorno";
-App::$strings["Week View"] = "Eventi della settimana";
-App::$strings["Month View"] = "Eventi del mese";
-App::$strings["Events Tools"] = "Gestione eventi";
-App::$strings["Export Calendar"] = "Esporta calendario";
-App::$strings["Import Calendar"] = "Importa calendario";
-App::$strings["Chatrooms"] = "Chat";
-App::$strings["Overview"] = "Riepilogo";
-App::$strings["Chat Members"] = "Partecipanti";
-App::$strings["Bookmarked Chatrooms"] = "Chat nei segnalibri";
-App::$strings["Suggested Chatrooms"] = "Chat suggerite";
-App::$strings["photo/image"] = "foto/immagine";
-App::$strings["Click to show more"] = "Clicca per mostrare tutto";
-App::$strings["Rating Tools"] = "Valutazione";
-App::$strings["Rate Me"] = "Valutami";
-App::$strings["View Ratings"] = "Vedi le valutazioni ricevute";
-App::$strings["Forums"] = "Forum";
-App::$strings["Tasks"] = "Attività";
-App::$strings["Documentation"] = "Guida";
-App::$strings["Project/Site Information"] = "Informazioni sul sito/progetto";
-App::$strings["For Members"] = "Per gli utenti";
-App::$strings["For Administrators"] = "Per gli amministratori";
-App::$strings["For Developers"] = "Per sviluppatori";
-App::$strings["Member registrations waiting for confirmation"] = "Richieste in attesa di conferma";
-App::$strings["Inspect queue"] = "Coda di attesa";
-App::$strings["DB updates"] = "Aggiornamenti al DB";
-App::$strings["Admin"] = "Amministrazione";
-App::$strings["Plugin Features"] = "Plugin";
-App::$strings["Channel is blocked on this site."] = "Il canale è bloccato per questo sito.";
-App::$strings["Channel location missing."] = "Manca l'indirizzo del canale.";
-App::$strings["Response from remote channel was incomplete."] = "La risposta dal canale non è completa.";
-App::$strings["Channel was deleted and no longer exists."] = "Il canale è stato rimosso e non esiste più.";
-App::$strings["Protocol disabled."] = "Protocollo disabilitato.";
-App::$strings["Channel discovery failed."] = "La ricerca del canale non ha avuto successo.";
-App::$strings["Cannot connect to yourself."] = "Non puoi connetterti a te stesso.";
-App::$strings["%1\$s's bookmarks"] = "I segnalibri di %1\$s";
-App::$strings["Public Timeline"] = "Diario pubblico";
-App::$strings["Image/photo"] = "Immagine";
-App::$strings["Encrypted content"] = "Contenuto cifrato";
-App::$strings["Install %s element: "] = "Installa l'elemento %s:";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Questo post contiene un elemento %s installabile, tuttavia non hai i permessi necessari per l'installazione.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s ha scritto %2\$s %3\$s";
-App::$strings["Click to open/close"] = "Clicca per aprire/chiudere";
-App::$strings["spoiler"] = "spoiler";
-App::$strings["Different viewers will see this text differently"] = "Ad altri questo testo potrebbe apparire in modo differente";
-App::$strings["$1 wrote:"] = "$1 ha scritto:";
-App::$strings["Directory Options"] = "Visibilità negli elenchi pubblici";
-App::$strings["Safe Mode"] = "Modalità SafeSearch";
-App::$strings["Public Forums Only"] = "Solo forum pubblici";
-App::$strings["This Website Only"] = "Solo in questo sito";
-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."] = "I controlli di sicurezza sono falliti. Probabilmente è accaduto perché la pagina è stata tenuta aperta troppo a lungo (ore?) prima di inviare il contenuto.";
-App::$strings["Logout"] = "Esci";
-App::$strings["End this session"] = "Chiudi questa sessione";
-App::$strings["Home"] = "Bacheca";
-App::$strings["Your posts and conversations"] = "I tuoi post e conversazioni";
-App::$strings["Your profile page"] = "Il tuo profilo";
-App::$strings["Manage/Edit profiles"] = "Gestisci i tuoi profili";
-App::$strings["Edit Profile"] = "Modifica il profilo";
-App::$strings["Edit your profile"] = "Modifica il tuo profilo";
-App::$strings["Your photos"] = "Le tue foto";
-App::$strings["Your files"] = "I tuoi file";
-App::$strings["Your chatrooms"] = "Le tue chat";
-App::$strings["Bookmarks"] = "Segnalibri";
-App::$strings["Your bookmarks"] = "I tuoi segnalibri";
-App::$strings["Your webpages"] = "Le tue pagine web";
-App::$strings["Sign in"] = "Accedi";
-App::$strings["%s - click to logout"] = "%s - clicca per uscire";
-App::$strings["Remote authentication"] = "Accedi dal tuo hub";
-App::$strings["Click to authenticate to your home hub"] = "Clicca per farti riconoscere dal tuo hub principale";
-App::$strings["Home Page"] = "Bacheca";
-App::$strings["Create an account"] = "Crea un account";
-App::$strings["Help and documentation"] = "Guida e documentazione";
-App::$strings["Applications, utilities, links, games"] = "Applicazioni, utilità, link, giochi";
-App::$strings["Search site @name, #tag, ?docs, content"] = "Cerca nel sito per @nome, #tag, ?guida o per contenuto";
-App::$strings["Channel Directory"] = "Elenchi pubblici dei canali";
-App::$strings["Your grid"] = "La tua rete";
-App::$strings["Mark all grid notifications seen"] = "Segna come lette le notifiche della tua rete";
-App::$strings["Channel home"] = "Bacheca del canale";
-App::$strings["Mark all channel notifications seen"] = "Segna come lette le notifiche del canale";
-App::$strings["Notices"] = "Avvisi";
-App::$strings["Notifications"] = "Notifiche";
-App::$strings["See all notifications"] = "Vedi tutte le notifiche";
-App::$strings["Private mail"] = "Messaggi privati";
-App::$strings["See all private messages"] = "Guarda tutti i messaggi privati";
-App::$strings["Mark all private messages seen"] = "Segna come letti tutti i messaggi privati";
-App::$strings["Event Calendar"] = "Calendario";
-App::$strings["See all events"] = "Guarda tutti gli eventi";
-App::$strings["Mark all events seen"] = "Marca come letti tutti gli eventi";
-App::$strings["Manage Your Channels"] = "Gestisci i tuoi canali";
-App::$strings["Account/Channel Settings"] = "Impostazioni dell'account e del canale";
-App::$strings["Site Setup and Configuration"] = "Installazione e configurazione del sito";
-App::$strings["Loading..."] = "Caricamento in corso...";
-App::$strings["@name, #tag, ?doc, content"] = "@nome, #tag, ?guida, contenuto";
-App::$strings["Please wait..."] = "Attendere...";
-App::$strings["New window"] = "Nuova finestra";
-App::$strings["Open the selected location in a different window or browser tab"] = "Apri l'indirizzo selezionato in una nuova scheda o finestra";
-App::$strings["User '%s' deleted"] = "Utente '%s' eliminato";
-App::$strings["%d invitation available"] = array(
-	0 => "%d invito disponibile",
-	1 => "%d inviti disponibili",
-);
-App::$strings["Find Channels"] = "Ricerca canali";
-App::$strings["Enter name or interest"] = "Scrivi un nome o un interesse";
-App::$strings["Connect/Follow"] = "Aggiungi";
-App::$strings["Examples: Robert Morgenstein, Fishing"] = "Per esempio: Mario Rossi, Pesca";
-App::$strings["Random Profile"] = "Profilo casuale";
-App::$strings["Invite Friends"] = "Invita amici";
-App::$strings["Advanced example: name=fred and country=iceland"] = "Per esempio: name=mario e country=italy";
-App::$strings["%d connection in common"] = array(
-	0 => "%d contatto in comune",
-	1 => "%d contatti in comune",
-);
-App::$strings["show more"] = "mostra tutto";
-App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s adesso è connesso con %2\$s";
-App::$strings["%1\$s poked %2\$s"] = "%1\$s ha mandato un poke a %2\$s";
-App::$strings["View %s's profile @ %s"] = "Vedi il profilo di %s @ %s";
-App::$strings["Categories:"] = "Categorie:";
-App::$strings["Filed under:"] = "Classificato come:";
-App::$strings["View in context"] = "Vedi nel contesto";
-App::$strings["remove"] = "rimuovi";
-App::$strings["Delete Selected Items"] = "Elimina gli oggetti selezionati";
-App::$strings["View Source"] = "Vedi il sorgente";
-App::$strings["Follow Thread"] = "Segui la discussione";
-App::$strings["Unfollow Thread"] = "Non seguire la discussione";
-App::$strings["Activity/Posts"] = "Attività e Post";
-App::$strings["Edit Connection"] = "Modifica il contatto";
-App::$strings["Message"] = "Messaggio";
-App::$strings["%s likes this."] = "Piace a %s.";
-App::$strings["%s doesn't like this."] = "Non piace a %s.";
-App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
-	0 => "",
-	1 => "Piace a <span %1\$s>%2\$d persone</span>.",
-);
-App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
-	0 => "",
-	1 => "Non piace a <span %1\$s>%2\$d persone</span>.",
-);
-App::$strings["and"] = "e";
-App::$strings[", and %d other people"] = array(
-	0 => "",
-	1 => "e altre %d persone",
-);
-App::$strings["%s like this."] = "Piace a %s.";
-App::$strings["%s don't like this."] = "Non piace a %s.";
-App::$strings["Set your location"] = "La tua località";
-App::$strings["Clear browser location"] = "Rimuovi la località data dal browser";
-App::$strings["Tag term:"] = "Tag:";
-App::$strings["Where are you right now?"] = "Dove sei ora?";
-App::$strings["Page link name"] = "Nome del link alla pagina";
-App::$strings["Post as"] = "Pubblica come ";
-App::$strings["Toggle voting"] = "Abilita/disabilita il voto";
-App::$strings["Categories (optional, comma-separated list)"] = "Categorie (facoltative, lista separata da virgole)";
-App::$strings["Set publish date"] = "Data di uscita programmata";
-App::$strings["OK"] = "OK";
-App::$strings["Discover"] = "Scopri";
-App::$strings["Imported public streams"] = "Contenuti pubblici importati";
-App::$strings["Commented Order"] = "Commenti recenti";
-App::$strings["Sort by Comment Date"] = "Per data del commento";
-App::$strings["Posted Order"] = "Post recenti";
-App::$strings["Sort by Post Date"] = "Per data di creazione";
-App::$strings["Posts that mention or involve you"] = "Post che ti riguardano";
-App::$strings["Activity Stream - by date"] = "Elenco attività - per data";
-App::$strings["Starred"] = "Preferiti";
-App::$strings["Favourite Posts"] = "Post preferiti";
-App::$strings["Spam"] = "Spam";
-App::$strings["Posts flagged as SPAM"] = "Post marcati come spam";
-App::$strings["Status Messages and Posts"] = "Post e messaggi di stato";
-App::$strings["About"] = "Informazioni";
-App::$strings["Profile Details"] = "Dettagli del profilo";
-App::$strings["Photo Albums"] = "Album foto";
-App::$strings["Files and Storage"] = "Archivio file";
-App::$strings["Saved Bookmarks"] = "Segnalibri salvati";
-App::$strings["Manage Webpages"] = "Gestisci le pagine web";
-App::$strings["__ctx:noun__ Attending"] = array(
-	0 => "Partecipa",
-	1 => "Partecipano",
-);
-App::$strings["__ctx:noun__ Not Attending"] = array(
-	0 => "Non partecipa",
-	1 => "Non partecipano",
-);
-App::$strings["__ctx:noun__ Undecided"] = array(
-	0 => "Indeciso",
-	1 => "Indecisi",
-);
-App::$strings["__ctx:noun__ Agree"] = array(
-	0 => "D'accordo",
-	1 => "D'accordo",
-);
-App::$strings["__ctx:noun__ Disagree"] = array(
-	0 => "Non d'accordo",
-	1 => "Non d'accordo",
-);
-App::$strings["__ctx:noun__ Abstain"] = array(
-	0 => "Astenuto",
-	1 => "Astenuti",
-);
-App::$strings["Frequently"] = "Frequentemente";
-App::$strings["Hourly"] = "Ogni ora";
-App::$strings["Twice daily"] = "Due volte al giorno";
-App::$strings["Daily"] = "Ogni giorno";
-App::$strings["Weekly"] = "Ogni settimana";
-App::$strings["Monthly"] = "Ogni mese";
-App::$strings["Currently Male"] = "Al momento maschio";
-App::$strings["Currently Female"] = "Al momento femmina";
-App::$strings["Mostly Male"] = "Prevalentemente maschio";
-App::$strings["Mostly Female"] = "Prevalentemente femmina";
-App::$strings["Transgender"] = "Transgender";
-App::$strings["Intersex"] = "Intersex";
-App::$strings["Transsexual"] = "Transessuale";
-App::$strings["Hermaphrodite"] = "Ermafrodito";
-App::$strings["Neuter"] = "Neutro";
-App::$strings["Non-specific"] = "Non specificato";
-App::$strings["Other"] = "Altro";
-App::$strings["Undecided"] = "Indeciso";
-App::$strings["Males"] = "Maschi";
-App::$strings["Females"] = "Femmine";
-App::$strings["Gay"] = "Gay";
-App::$strings["Lesbian"] = "Lesbica";
-App::$strings["No Preference"] = "Senza preferenza";
-App::$strings["Bisexual"] = "Bisessuale";
-App::$strings["Autosexual"] = "Autosessuale";
-App::$strings["Abstinent"] = "Astinente";
-App::$strings["Virgin"] = "Vergine";
-App::$strings["Deviant"] = "Deviato";
-App::$strings["Fetish"] = "Feticista";
-App::$strings["Oodles"] = "Un sacco";
-App::$strings["Nonsexual"] = "Asessuato";
-App::$strings["Single"] = "Single";
-App::$strings["Lonely"] = "Da solo";
-App::$strings["Available"] = "Disponibile";
-App::$strings["Unavailable"] = "Non disponibile";
-App::$strings["Has crush"] = "Ha una cotta";
-App::$strings["Infatuated"] = "Infatuato/a";
-App::$strings["Dating"] = "Disponibile a un incontro";
-App::$strings["Unfaithful"] = "Infedele";
-App::$strings["Sex Addict"] = "Sesso-dipendente";
-App::$strings["Friends/Benefits"] = "Amici con qualcosa in più";
-App::$strings["Casual"] = "Casual";
-App::$strings["Engaged"] = "Impegnato";
-App::$strings["Married"] = "Sposato/a";
-App::$strings["Imaginarily married"] = "Con matrimonio immaginario";
-App::$strings["Partners"] = "Partner";
-App::$strings["Cohabiting"] = "Convivente";
-App::$strings["Common law"] = "Matrimonio regolare";
-App::$strings["Happy"] = "Felice";
-App::$strings["Not looking"] = "Non in cerca";
-App::$strings["Swinger"] = "Scambista";
-App::$strings["Betrayed"] = "Tradito/a";
-App::$strings["Separated"] = "Separato/a";
-App::$strings["Unstable"] = "Instabile";
-App::$strings["Divorced"] = "Divorziato/a";
-App::$strings["Imaginarily divorced"] = "Sogna il divorzio";
-App::$strings["Widowed"] = "Vedovo/a";
-App::$strings["Uncertain"] = "Incerto/a";
-App::$strings["It's complicated"] = "Relazione complicata";
-App::$strings["Don't care"] = "Chi se ne frega";
-App::$strings["Ask me"] = "Chiedimelo";
-App::$strings["Visible to your default audience"] = "Visibile secondo le impostazioni predefinite";
-App::$strings["Only me"] = "Solo io";
-App::$strings["Public"] = "Pubblico";
-App::$strings["Anybody in the \$Projectname network"] = "Tutti sulla rete \$Projectname";
-App::$strings["Any account on %s"] = "Tutti gli account su %s";
-App::$strings["Any of my connections"] = "Chiunque tra i miei contatti";
-App::$strings["Only connections I specifically allow"] = "Solo chi riceve il mio permesso";
-App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Chiunque sia autenticato (inclusi visitatori di altre reti)";
-App::$strings["Any connections including those who haven't yet been approved"] = "Tutti i contatti inclusi quelli non ancora approvati";
-App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "";
-App::$strings["This is your default setting for who can view your default channel profile"] = "";
-App::$strings["This is your default setting for who can view your connections"] = "";
-App::$strings["This is your default setting for who can view your file storage and photos"] = "";
-App::$strings["This is your default setting for the audience of your webpages"] = "";
-App::$strings["Not a valid email address"] = "Email non valida";
-App::$strings["Your email domain is not among those allowed on this site"] = "Il dominio della tua email attualmente non è permesso su questo sito";
-App::$strings["Your email address is already registered at this site."] = "La tua email è già registrata su questo sito.";
-App::$strings["An invitation is required."] = "È necessario un invito.";
-App::$strings["Invitation could not be verified."] = "L'invito non può essere verificato.";
-App::$strings["Please enter the required information."] = "Inserisci le informazioni richieste.";
-App::$strings["Failed to store account information."] = "Non è stato possibile salvare le informazioni del tuo account.";
-App::$strings["Registration confirmation for %s"] = "Registrazione di %s confermata";
-App::$strings["Registration request at %s"] = "Richiesta di registrazione su %s";
-App::$strings["Administrator"] = "Amministratore";
-App::$strings["your registration password"] = "la password di registrazione";
-App::$strings["Registration details for %s"] = "Dettagli della registrazione di %s";
-App::$strings["Account approved."] = "Account approvato.";
-App::$strings["Registration revoked for %s"] = "Registrazione revocata per %s";
-App::$strings["Account verified. Please login."] = "Registrazione verificata. Adesso puoi effettuare login.";
-App::$strings["Click here to upgrade."] = "Clicca qui per aggiornare.";
-App::$strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione supera i limiti del tuo abbonamento.";
-App::$strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento.";
-App::$strings["Item was not found."] = "Elemento non trovato.";
-App::$strings["No source file."] = "Nessun file di origine.";
-App::$strings["Cannot locate file to replace"] = "Il file da sostituire non è stato trovato";
-App::$strings["Cannot locate file to revise/update"] = "Il file da aggiornare non è stato trovato";
-App::$strings["File exceeds size limit of %d"] = "Il file supera la dimensione massima di %d";
-App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati.";
-App::$strings["File upload failed. Possible system limit or action terminated."] = "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato.";
-App::$strings["Stored file could not be verified. Upload failed."] = "Il file non può essere verificato. Caricamento fallito.";
-App::$strings["Path not available."] = "Percorso non disponibile.";
-App::$strings["Empty pathname"] = "Il percorso del file è vuoto";
-App::$strings["duplicate filename or path"] = "il file o il percorso del file è duplicato";
-App::$strings["Path not found."] = "Percorso del file non trovato.";
-App::$strings["mkdir failed."] = "mkdir fallito.";
-App::$strings["database storage failed."] = "scrittura su database fallita.";
-App::$strings["Empty path"] = "La posizione è vuota";
-App::$strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database";
-App::$strings["Empty name"] = "Nome vuoto";
-App::$strings["Name too long"] = "Nome troppo lungo";
-App::$strings["No account identifier"] = "Account senza identificativo";
-App::$strings["Nickname is required."] = "Il nome dell'account è obbligatorio.";
-App::$strings["Reserved nickname. Please choose another."] = "Nome utente riservato. Per favore scegline un altro.";
-App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Il nome dell'account è già in uso oppure ha dei caratteri non supportati.";
-App::$strings["Unable to retrieve created identity"] = "Impossibile caricare l'identità creata";
-App::$strings["Default Profile"] = "Profilo predefinito";
-App::$strings["Requested channel is not available."] = "Il canale che cerchi non è disponibile.";
-App::$strings["Create New Profile"] = "Crea un nuovo profilo";
-App::$strings["Visible to everybody"] = "Visibile a tutti";
-App::$strings["Gender:"] = "Sesso:";
-App::$strings["Status:"] = "Stato:";
-App::$strings["Homepage:"] = "Home page:";
-App::$strings["Online Now"] = "Online adesso";
-App::$strings["Like this channel"] = "Mi piace questo canale";
-App::$strings["j F, Y"] = "j F Y";
-App::$strings["j F"] = "j F";
-App::$strings["Birthday:"] = "Compleanno:";
-App::$strings["for %1\$d %2\$s"] = "per %1\$d %2\$s";
-App::$strings["Sexual Preference:"] = "Preferenze sessuali:";
-App::$strings["Tags:"] = "Tag:";
-App::$strings["Political Views:"] = "Orientamento politico:";
-App::$strings["Religion:"] = "Religione:";
-App::$strings["Hobbies/Interests:"] = "Interessi e hobby:";
-App::$strings["Likes:"] = "Mi piace:";
-App::$strings["Dislikes:"] = "Non mi piace:";
-App::$strings["Contact information and Social Networks:"] = "Contatti e social network:";
-App::$strings["My other channels:"] = "I miei altri canali:";
-App::$strings["Musical interests:"] = "Gusti musicali:";
-App::$strings["Books, literature:"] = "Libri, letteratura:";
-App::$strings["Television:"] = "Televisione:";
-App::$strings["Film/dance/culture/entertainment:"] = "Film, danza, cultura, intrattenimento:";
-App::$strings["Love/Romance:"] = "Amore:";
-App::$strings["Work/employment:"] = "Lavoro:";
-App::$strings["School/education:"] = "Scuola:";
-App::$strings["Like this thing"] = "Mi piace";
+App::$strings["Logged out."] = "Uscita effettuata.";
+App::$strings["Failed authentication"] = "Autenticazione fallita";
+App::$strings["Can view my normal stream and posts"] = "Può vedere i miei contenuti e i post normali";
+App::$strings["Can view my webpages"] = "Può vedere le mie pagine web";
+App::$strings["Can post on my channel page (\"wall\")"] = "Può scrivere sulla bacheca del mio canale";
+App::$strings["Can like/dislike stuff"] = "Può aggiungere \"mi piace\" a tutto il resto";
+App::$strings["Profiles and things other than posts/comments"] = "Può aggiungere \"mi piace\" a tutto ciò che non riguarda i post, come per esempio il profilo";
+App::$strings["Can forward to all my channel contacts via post @mentions"] = "Può inoltrare post a tutti i contatti del canale tramite una @menzione";
+App::$strings["Advanced - useful for creating group forum channels"] = "Impostazione avanzata - utile per creare un canale-forum di discussione";
+App::$strings["Can chat with me (when available)"] = "Può aprire una chat con me (se disponibile)";
+App::$strings["Can write to my file storage and photos"] = "Può modificare il mio archivio file e foto";
+App::$strings["Can edit my webpages"] = "Può modificare le mie pagine web";
+App::$strings["Somewhat advanced - very useful in open communities"] = "Piuttosto avanzato - molto utile nelle comunità aperte";
+App::$strings["Can administer my channel resources"] = "Può amministrare i contenuti del mio canale";
+App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri";
 App::$strings["General Features"] = "Funzionalità di base";
 App::$strings["Content Expiration"] = "Scadenza";
 App::$strings["Remove posts/comments and/or private messages at a future time"] = "Elimina i post, i commenti o i messaggi privati dopo un lasso di tempo";
@@ -2021,6 +1966,7 @@ App::$strings["Profile Import/Export"] = "Importa/esporta il profilo";
 App::$strings["Save and load profile details across sites/channels"] = "Salva o ripristina le informazioni del profilo su siti diversi";
 App::$strings["Web Pages"] = "Pagine web";
 App::$strings["Provide managed web pages on your channel"] = "Attiva la creazione di pagine web sul tuo canale";
+App::$strings["Provide a wiki for your channel"] = "Fornisce una wiki per il tuo canale";
 App::$strings["Hide Rating"] = "Nascondi le valutazioni";
 App::$strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Nascondi i bottoni delle valutazioni sul tuo canale e sul profilo. Nota: le persone potranno comunque esprimere una valutazione altrove.";
 App::$strings["Private Notes"] = "Note private";
@@ -2054,6 +2000,7 @@ App::$strings["Search by Date"] = "Ricerca per data";
 App::$strings["Ability to select posts by date ranges"] = "Per selezionare i post in un intervallo tra date";
 App::$strings["Privacy Groups"] = "Gruppi di canali";
 App::$strings["Enable management and selection of privacy groups"] = "Abilita i gruppi di canali";
+App::$strings["Saved Searches"] = "Ricerche salvate";
 App::$strings["Save search terms for re-use"] = "Salva i termini delle ricerche per poterle ripetere";
 App::$strings["Network Personal Tab"] = "Attività personale";
 App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Abilita il link per mostrare solamente i contenuti con cui hai interagito";
@@ -2069,8 +2016,9 @@ App::$strings["Community Tagging"] = "Tag della comunità";
 App::$strings["Ability to tag existing posts"] = "Permetti l'aggiunta di tag su post già esistenti";
 App::$strings["Post Categories"] = "Categorie dei post";
 App::$strings["Add categories to your posts"] = "Abilita le categorie per i tuoi post";
-App::$strings["Emoji Reactions"] = "";
-App::$strings["Add emoji reaction ability to posts"] = "";
+App::$strings["Emoji Reactions"] = "Reazioni emoji";
+App::$strings["Add emoji reaction ability to posts"] = "Permetti le reazioni emoji ai post";
+App::$strings["Saved Folders"] = "Cartelle salvate";
 App::$strings["Ability to file posts under folders"] = "Abilita la raccolta dei tuoi articoli in cartelle";
 App::$strings["Dislike Posts"] = "Non mi piace";
 App::$strings["Ability to dislike posts/comments"] = "Abilità la funzionalità \"non mi piace\" per i tuoi post";
@@ -2078,63 +2026,149 @@ App::$strings["Star Posts"] = "Post con stella";
 App::$strings["Ability to mark special posts with a star indicator"] = "Mostra la stella per segnare i post preferiti";
 App::$strings["Tag Cloud"] = "Nuvola di tag";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale";
-App::$strings["Embedded content"] = "Contenuti incorporati";
-App::$strings["Embedding disabled"] = "Disabilita la creazione di contenuti incorporati";
-App::$strings["Who can see this?"] = "Chi può vederlo?";
-App::$strings["Custom selection"] = "Selezione personalizzata";
-App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "";
-App::$strings["Show"] = "Mostra";
-App::$strings["Don't show"] = "Non mostrare";
-App::$strings["Other networks and post services"] = "Invio ad altre reti o a siti esterni";
-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."] = "";
-App::$strings["Logged out."] = "Uscita effettuata.";
-App::$strings["Failed authentication"] = "Autenticazione fallita";
-App::$strings["Birthday"] = "Compleanno";
-App::$strings["Age: "] = "Età:";
-App::$strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-GG oppure MM-GG";
-App::$strings["never"] = "mai";
-App::$strings["less than a second ago"] = "meno di un secondo fa";
-App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s fa";
-App::$strings["__ctx:relative_date__ year"] = array(
-	0 => "anno",
-	1 => "anni",
-);
-App::$strings["__ctx:relative_date__ month"] = array(
-	0 => "mese",
-	1 => "mesi",
-);
-App::$strings["__ctx:relative_date__ week"] = array(
-	0 => "settimana",
-	1 => "settimane",
-);
-App::$strings["__ctx:relative_date__ day"] = array(
-	0 => "giorno",
-	1 => "giorni",
-);
-App::$strings["__ctx:relative_date__ hour"] = array(
-	0 => "ora",
-	1 => "ore",
-);
-App::$strings["__ctx:relative_date__ minute"] = array(
-	0 => "minuto",
-	1 => "minuti",
-);
-App::$strings["__ctx:relative_date__ second"] = array(
-	0 => "secondo",
-	1 => "secondi",
-);
-App::$strings["%1\$s's birthday"] = "Compleanno di %1\$s";
-App::$strings["Happy Birthday %1\$s"] = "Buon compleanno %1\$s";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Un gruppo di canali con lo stesso nome esisteva in precedenza ed è stato ripristinato. I vecchi permessi saranno applicati ai nuovi canali. Se non vuoi che ciò accada, devi creare un gruppo con un nome diverso.";
 App::$strings["Add new connections to this privacy group"] = "Aggiungi nuovi contatti a questo gruppo di canali";
 App::$strings["edit"] = "modifica";
 App::$strings["Edit group"] = "Modifica il gruppo";
 App::$strings["Add privacy group"] = "Crea un gruppo di canali";
 App::$strings["Channels not in any privacy group"] = "Canali che non sono in nessun gruppo";
+App::$strings["add"] = "aggiungi";
+App::$strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
+App::$strings["Starts:"] = "Inizio:";
+App::$strings["Finishes:"] = "Fine:";
+App::$strings["This event has been added to your calendar."] = "Questo evento è stato aggiunto al tuo calendario";
+App::$strings["Not specified"] = "Non specificato";
+App::$strings["Needs Action"] = "Necessita di un intervento";
+App::$strings["Completed"] = "Completato";
+App::$strings["In Process"] = "In corso";
+App::$strings["Cancelled"] = "Annullato";
+App::$strings["Not a valid email address"] = "Email non valida";
+App::$strings["Your email domain is not among those allowed on this site"] = "Il dominio della tua email attualmente non è permesso su questo sito";
+App::$strings["Your email address is already registered at this site."] = "La tua email è già registrata su questo sito.";
+App::$strings["An invitation is required."] = "È necessario un invito.";
+App::$strings["Invitation could not be verified."] = "L'invito non può essere verificato.";
+App::$strings["Please enter the required information."] = "Inserisci le informazioni richieste.";
+App::$strings["Failed to store account information."] = "Non è stato possibile salvare le informazioni del tuo account.";
+App::$strings["Registration confirmation for %s"] = "Registrazione di %s confermata";
+App::$strings["Registration request at %s"] = "Richiesta di registrazione su %s";
+App::$strings["your registration password"] = "la password di registrazione";
+App::$strings["Registration details for %s"] = "Dettagli della registrazione di %s";
+App::$strings["Account approved."] = "Account approvato.";
+App::$strings["Registration revoked for %s"] = "Registrazione revocata per %s";
+App::$strings["Click here to upgrade."] = "Clicca qui per aggiornare.";
+App::$strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione supera i limiti del tuo abbonamento.";
+App::$strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento.";
+App::$strings["Channel is blocked on this site."] = "Il canale è bloccato per questo sito.";
+App::$strings["Channel location missing."] = "Manca l'indirizzo del canale.";
+App::$strings["Response from remote channel was incomplete."] = "La risposta dal canale non è completa.";
+App::$strings["Channel was deleted and no longer exists."] = "Il canale è stato rimosso e non esiste più.";
+App::$strings["Protocol disabled."] = "Protocollo disabilitato.";
+App::$strings["Channel discovery failed."] = "La ricerca del canale non ha avuto successo.";
+App::$strings["Cannot connect to yourself."] = "Non puoi connetterti a te stesso.";
+App::$strings["Item was not found."] = "Elemento non trovato.";
+App::$strings["No source file."] = "Nessun file di origine.";
+App::$strings["Cannot locate file to replace"] = "Il file da sostituire non è stato trovato";
+App::$strings["Cannot locate file to revise/update"] = "Il file da aggiornare non è stato trovato";
+App::$strings["File exceeds size limit of %d"] = "Il file supera la dimensione massima di %d";
+App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati.";
+App::$strings["File upload failed. Possible system limit or action terminated."] = "Caricamento file fallito, potrebbe essere stato interrotto o potrebbe aver superato lo spazio assegnato.";
+App::$strings["Stored file could not be verified. Upload failed."] = "Il file non può essere verificato. Caricamento fallito.";
+App::$strings["Path not available."] = "Percorso non disponibile.";
+App::$strings["Empty pathname"] = "Il percorso del file è vuoto";
+App::$strings["duplicate filename or path"] = "il file o il percorso del file è duplicato";
+App::$strings["Path not found."] = "Percorso del file non trovato.";
+App::$strings["mkdir failed."] = "mkdir fallito.";
+App::$strings["database storage failed."] = "scrittura su database fallita.";
+App::$strings["Empty path"] = "La posizione è vuota";
+App::$strings["Image/photo"] = "Immagine";
+App::$strings["Encrypted content"] = "Contenuto cifrato";
+App::$strings["Install %s element: "] = "Installa l'elemento %s:";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Questo post contiene un elemento %s installabile, tuttavia non hai i permessi necessari per l'installazione.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s ha scritto %2\$s %3\$s";
+App::$strings["Click to open/close"] = "Clicca per aprire/chiudere";
+App::$strings["spoiler"] = "spoiler";
+App::$strings["Different viewers will see this text differently"] = "Ad altri questo testo potrebbe apparire in modo differente";
+App::$strings["$1 wrote:"] = "$1 ha scritto:";
+App::$strings["(Unknown)"] = "(Sconosciuto)";
+App::$strings["Visible to anybody on the internet."] = "Visibile a chiunque su internet.";
+App::$strings["Visible to you only."] = "Visibile solo a te.";
+App::$strings["Visible to anybody in this network."] = "Visibile a tutti su questa rete.";
+App::$strings["Visible to anybody authenticated."] = "Visibile a chiunque sia autenticato.";
+App::$strings["Visible to anybody on %s."] = "Visibile a tutti su %s.";
+App::$strings["Visible to all connections."] = "Visibile a tutti coloro che ti seguono.";
+App::$strings["Visible to approved connections."] = "Visibile ai contatti approvati.";
+App::$strings["Visible to specific connections."] = "Visibile ad alcuni contatti scelti.";
+App::$strings["Privacy group is empty."] = "Gruppo di canali vuoto.";
+App::$strings["Privacy group: %s"] = "Gruppo di canali: %s";
+App::$strings["Connection not found."] = "Contatto non trovato.";
+App::$strings["profile photo"] = "foto del profilo";
+App::$strings["Embedded content"] = "Contenuti incorporati";
+App::$strings["Embedding disabled"] = "Disabilita la creazione di contenuti incorporati";
+App::$strings["System"] = "Sistema";
+App::$strings["New App"] = "Nuova app";
+App::$strings["Suggestions"] = "Suggerimenti";
+App::$strings["See more..."] = "Altro...";
+App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Hai attivato %1$.0f delle %2$.0f connessioni permesse.";
+App::$strings["Add New Connection"] = "Aggiungi un contatto";
+App::$strings["Enter channel address"] = "Indirizzo del canale";
+App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Per esempio: bob@example.com, https://example.com/barbara";
+App::$strings["Notes"] = "Note";
+App::$strings["Remove term"] = "Rimuovi termine";
+App::$strings["Everything"] = "Tutto";
+App::$strings["Archives"] = "Archivi";
+App::$strings["Refresh"] = "Aggiorna";
+App::$strings["Account settings"] = "Il tuo account";
+App::$strings["Channel settings"] = "Impostazioni del canale";
+App::$strings["Additional features"] = "Funzionalità opzionali";
+App::$strings["Feature/Addon settings"] = "Componenti aggiuntivi";
+App::$strings["Display settings"] = "Aspetto";
+App::$strings["Manage locations"] = "Gestione repliche";
+App::$strings["Export channel"] = "Esporta il canale";
+App::$strings["Connected apps"] = "App connesse";
+App::$strings["Premium Channel Settings"] = "Canale premium - impostazioni";
+App::$strings["Private Mail Menu"] = "Menu messaggi privati";
+App::$strings["Combined View"] = "Vista combinata";
+App::$strings["Conversations"] = "Conversazioni";
+App::$strings["Received Messages"] = "Ricevuti";
+App::$strings["Sent Messages"] = "Inviati";
+App::$strings["No messages."] = "Nessun messaggio.";
+App::$strings["Delete conversation"] = "Elimina la conversazione";
+App::$strings["Events Tools"] = "Gestione eventi";
+App::$strings["Export Calendar"] = "Esporta calendario";
+App::$strings["Import Calendar"] = "Importa calendario";
+App::$strings["Overview"] = "Riepilogo";
+App::$strings["Chat Members"] = "Partecipanti";
+App::$strings["Wiki List"] = "Elenco wiki";
+App::$strings["Wiki Pages"] = "Pagine wiki";
+App::$strings["Bookmarked Chatrooms"] = "Chat nei segnalibri";
+App::$strings["Suggested Chatrooms"] = "Chat suggerite";
+App::$strings["photo/image"] = "foto/immagine";
+App::$strings["Click to show more"] = "Clicca per mostrare tutto";
+App::$strings["Rating Tools"] = "Valutazione";
+App::$strings["Rate Me"] = "Valutami";
+App::$strings["View Ratings"] = "Vedi le valutazioni ricevute";
+App::$strings["Forums"] = "Forum";
+App::$strings["Tasks"] = "Attività";
+App::$strings["Documentation"] = "Guida";
+App::$strings["Project/Site Information"] = "Informazioni sul sito/progetto";
+App::$strings["For Members"] = "Per gli utenti";
+App::$strings["For Administrators"] = "Per gli amministratori";
+App::$strings["For Developers"] = "Per sviluppatori";
+App::$strings["Member registrations waiting for confirmation"] = "Richieste in attesa di conferma";
+App::$strings["Inspect queue"] = "Coda di attesa";
+App::$strings["DB updates"] = "Aggiornamenti al DB";
+App::$strings["Plugin Features"] = "Plugin";
+App::$strings[" and "] = "e";
+App::$strings["public profile"] = "profilo pubblico";
+App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s ha cambiato %2\$s in &ldquo;%3\$s&rdquo;";
+App::$strings["Visit %1\$s's %2\$s"] = "Guarda %2\$s di %1\$s ";
+App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha aggiornato %2\$s cambiando %3\$s.";
+App::$strings["Attachments:"] = "Allegati:";
+App::$strings["\$Projectname event notification:"] = "Notifica evento \$Projectname:";
 App::$strings["Delete this item?"] = "Eliminare questo elemento?";
-App::$strings["[-] show less"] = "[-] riduci";
-App::$strings["[+] expand"] = "[+] mostra tutto";
-App::$strings["[-] collapse"] = "[-] riduci";
+App::$strings["%s show less"] = "%s riduci";
+App::$strings["%s expand"] = "%s mostra tutto";
+App::$strings["%s collapse"] = "%s minimizza";
 App::$strings["Password too short"] = "Password troppo corta";
 App::$strings["Passwords do not match"] = "Le password non corrispondono";
 App::$strings["everybody"] = "tutti";
@@ -2189,72 +2223,78 @@ App::$strings["__ctx:calendar__ month"] = "mese";
 App::$strings["__ctx:calendar__ week"] = "settimana";
 App::$strings["__ctx:calendar__ day"] = "giorno";
 App::$strings["__ctx:calendar__ All day"] = "Tutto il giorno";
-App::$strings["view full size"] = "guarda nelle dimensioni reali";
-App::$strings["No Subject"] = "Nessun titolo";
-App::$strings["Friendica"] = "Friendica";
-App::$strings["OStatus"] = "OStatus";
-App::$strings["GNU-Social"] = "GNU-Social";
-App::$strings["RSS/Atom"] = "RSS/Atom";
-App::$strings["Diaspora"] = "Diaspora";
-App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot";
-App::$strings["LinkedIn"] = "LinkedIn";
-App::$strings["XMPP/IM"] = "XMPP/IM";
-App::$strings["MySpace"] = "MySpace";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "L'immagine supera il limite massimo di %lu bytes";
-App::$strings["Image file is empty."] = "Il file dell'immagine è vuoto.";
-App::$strings["Photo storage failed."] = "Impossibile salvare la foto.";
-App::$strings["a new photo"] = "una nuova foto";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s ha pubblicato %2\$s su %3\$s";
-App::$strings["Upload New Photos"] = "Carica nuove foto";
+App::$strings["%d invitation available"] = array(
+	0 => "%d invito disponibile",
+	1 => "%d inviti disponibili",
+);
+App::$strings["Find Channels"] = "Ricerca canali";
+App::$strings["Enter name or interest"] = "Scrivi un nome o un interesse";
+App::$strings["Connect/Follow"] = "Aggiungi";
+App::$strings["Examples: Robert Morgenstein, Fishing"] = "Per esempio: Mario Rossi, Pesca";
+App::$strings["Random Profile"] = "Profilo casuale";
+App::$strings["Invite Friends"] = "Invita amici";
+App::$strings["Advanced example: name=fred and country=iceland"] = "Per esempio: name=mario e country=italy";
+App::$strings["%d connection in common"] = array(
+	0 => "%d contatto in comune",
+	1 => "%d contatti in comune",
+);
+App::$strings["show more"] = "mostra tutto";
+App::$strings["Directory Options"] = "Visibilità negli elenchi pubblici";
+App::$strings["Safe Mode"] = "Modalità SafeSearch";
+App::$strings["Public Forums Only"] = "Solo forum pubblici";
+App::$strings["This Website Only"] = "Solo in questo sito";
+App::$strings["No recipient provided."] = "Devi scegliere un destinatario.";
+App::$strings["[no subject]"] = "[nessun titolo]";
+App::$strings["Unable to determine sender."] = "Impossibile determinare il mittente.";
+App::$strings["Stored post could not be verified."] = "Non è stato possibile verificare il post.";
+App::$strings["Who can see this?"] = "Chi può vederlo?";
+App::$strings["Custom selection"] = "Selezione personalizzata";
+App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Scegli \"Mostra\" per permettere la visione. \"Non mostrare\" ha la precedenza e limita l'effetto di \"Mostra\".";
+App::$strings["Show"] = "Mostra";
+App::$strings["Don't show"] = "Non mostrare";
+App::$strings["Other networks and post services"] = "Invio ad altre reti o a siti esterni";
+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."] = "I permessi del post %s non possono essere cambiati %s dopo che un post è stato condiviso.</br />Questi permessi definiscono chi ha diritto di vedere il post.";
+App::$strings["Birthday"] = "Compleanno";
+App::$strings["Age: "] = "Età:";
+App::$strings["YYYY-MM-DD or MM-DD"] = "AAAA-MM-GG oppure MM-GG";
+App::$strings["never"] = "mai";
+App::$strings["less than a second ago"] = "meno di un secondo fa";
+App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s fa";
+App::$strings["__ctx:relative_date__ year"] = array(
+	0 => "anno",
+	1 => "anni",
+);
+App::$strings["__ctx:relative_date__ month"] = array(
+	0 => "mese",
+	1 => "mesi",
+);
+App::$strings["__ctx:relative_date__ week"] = array(
+	0 => "settimana",
+	1 => "settimane",
+);
+App::$strings["__ctx:relative_date__ day"] = array(
+	0 => "giorno",
+	1 => "giorni",
+);
+App::$strings["__ctx:relative_date__ hour"] = array(
+	0 => "ora",
+	1 => "ore",
+);
+App::$strings["__ctx:relative_date__ minute"] = array(
+	0 => "minuto",
+	1 => "minuti",
+);
+App::$strings["__ctx:relative_date__ second"] = array(
+	0 => "secondo",
+	1 => "secondi",
+);
+App::$strings["%1\$s's birthday"] = "Compleanno di %1\$s";
+App::$strings["Happy Birthday %1\$s"] = "Buon compleanno %1\$s";
+App::$strings["Public Timeline"] = "Diario pubblico";
 App::$strings["Invalid data packet"] = "Dati ricevuti non validi";
 App::$strings["Unable to verify channel signature"] = "Impossibile verificare la firma elettronica del canale";
 App::$strings["Unable to verify site signature for %s"] = "Impossibile verificare la firma elettronica del sito %s";
 App::$strings["invalid target signature"] = "la firma ricevuta non è valida";
-App::$strings["New Page"] = "Nuova pagina web";
-App::$strings["Title"] = "Titolo";
-App::$strings["Can view my normal stream and posts"] = "Può vedere i miei contenuti e i post normali";
-App::$strings["Can view my default channel profile"] = "Può vedere il profilo predefinito del canale";
-App::$strings["Can view my connections"] = "Può vedere i miei contatti";
-App::$strings["Can view my file storage and photos"] = "Può vedere il mio archivio file e foto";
-App::$strings["Can view my webpages"] = "Può vedere le mie pagine web";
-App::$strings["Can send me their channel stream and posts"] = "È tra i canali che seguo";
-App::$strings["Can post on my channel page (\"wall\")"] = "Può scrivere sulla bacheca del mio canale";
-App::$strings["Can comment on or like my posts"] = "Può commentare o aggiungere \"mi piace\" ai miei post";
-App::$strings["Can send me private mail messages"] = "Può inviarmi messaggi privati";
-App::$strings["Can like/dislike stuff"] = "Può aggiungere \"mi piace\" a tutto il resto";
-App::$strings["Profiles and things other than posts/comments"] = "Può aggiungere \"mi piace\" a tutto ciò che non riguarda i post, come per esempio il profilo";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Può inoltrare post a tutti i contatti del canale tramite una @menzione";
-App::$strings["Advanced - useful for creating group forum channels"] = "Impostazione avanzata - utile per creare un canale-forum di discussione";
-App::$strings["Can chat with me (when available)"] = "Può aprire una chat con me (se disponibile)";
-App::$strings["Can write to my file storage and photos"] = "Può modificare il mio archivio file e foto";
-App::$strings["Can edit my webpages"] = "Può modificare le mie pagine web";
-App::$strings["Can source my public posts in derived channels"] = "Può usare i miei post pubblici per creare canali derivati";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Piuttosto avanzato - molto utile nelle comunità aperte";
-App::$strings["Can administer my channel resources"] = "Può amministrare i contenuti del mio canale";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri";
-App::$strings["Social Networking"] = "Social network";
-App::$strings["Social - Mostly Public"] = "Social - Prevalentemente pubblico";
-App::$strings["Social - Restricted"] = "Social - Con restrizioni";
-App::$strings["Social - Private"] = "Social - Privato";
-App::$strings["Community Forum"] = "Forum di discussione";
-App::$strings["Forum - Mostly Public"] = "Social - Prevalentemente pubblico";
-App::$strings["Forum - Restricted"] = "Forum - Con restrizioni";
-App::$strings["Forum - Private"] = "Forum - Privato";
-App::$strings["Feed Republish"] = "Aggregatore di feed esterni";
-App::$strings["Feed - Mostly Public"] = "Feed - Prevalentemente pubblico";
-App::$strings["Feed - Restricted"] = "Feed - Con restrizioni";
-App::$strings["Special Purpose"] = "Per finalità speciali";
-App::$strings["Special - Celebrity/Soapbox"] = "Speciale - Pagina per fan";
-App::$strings["Special - Group Repository"] = "Speciale - Repository di gruppo";
-App::$strings["Custom/Expert Mode"] = "Personalizzazione per esperti";
-App::$strings[" and "] = "e";
-App::$strings["public profile"] = "profilo pubblico";
-App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s ha cambiato %2\$s in &ldquo;%3\$s&rdquo;";
-App::$strings["Visit %1\$s's %2\$s"] = "Guarda %2\$s di %1\$s ";
-App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha aggiornato %2\$s cambiando %3\$s.";
-App::$strings["Attachments:"] = "Allegati:";
-App::$strings["\$Projectname event notification:"] = "Notifica evento \$Projectname:";
 App::$strings["Focus (Hubzilla default)"] = "Focus (predefinito)";
 App::$strings["Theme settings"] = "Impostazioni del tema";
 App::$strings["Select scheme"] = "Scegli uno schema";
@@ -2294,6 +2334,7 @@ App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["Update %s failed. See error logs."] = "%s: aggiornamento fallito. Controlla i log di errore.";
 App::$strings["Update Error at %s"] = "Errore di aggiornamento su %s";
 App::$strings["Create an account to access services and applications within the Hubzilla"] = "Registrati per accedere ai servizi e alle applicazioni di Hubzilla";
+App::$strings["Login/Email"] = "Login/Email";
 App::$strings["Password"] = "Password";
 App::$strings["Remember me"] = "Resta connesso";
 App::$strings["Forgot your password?"] = "Hai dimenticato la password?";
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 59a9ed355..63f1e9a13 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -1,5 +1,5 @@
 /**
- * Red people autocomplete
+ * general autocomplete support
  *
  * require jQuery, jquery.textcomplete
  */
diff --git a/view/js/jquery-migrate-1.1.1.js b/view/js/jquery-migrate-1.1.1.js
deleted file mode 100644
index e99f954e6..000000000
--- a/view/js/jquery-migrate-1.1.1.js
+++ /dev/null
@@ -1,511 +0,0 @@
-/*!
- * jQuery Migrate - v1.1.1 - 2013-02-16
- * https://github.com/jquery/jquery-migrate
- * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
- */
-(function( jQuery, window, undefined ) {
-// See http://bugs.jquery.com/ticket/13335
-// "use strict";
-
-
-var warnedAbout = {};
-
-// List of warnings already given; public read only
-jQuery.migrateWarnings = [];
-
-// Set to true to prevent console output; migrateWarnings still maintained
-// jQuery.migrateMute = false;
-
-// Show a message on the console so devs know we're active
-if ( !jQuery.migrateMute && window.console && console.log ) {
-	console.log("JQMIGRATE: Logging is active");
-}
-
-// Set to false to disable traces that appear with warnings
-if ( jQuery.migrateTrace === undefined ) {
-	jQuery.migrateTrace = true;
-}
-
-// Forget any warnings we've already given; public
-jQuery.migrateReset = function() {
-	warnedAbout = {};
-	jQuery.migrateWarnings.length = 0;
-};
-
-function migrateWarn( msg) {
-	if ( !warnedAbout[ msg ] ) {
-		warnedAbout[ msg ] = true;
-		jQuery.migrateWarnings.push( msg );
-		if ( window.console && console.warn && !jQuery.migrateMute ) {
-			console.warn( "JQMIGRATE: " + msg );
-			if ( jQuery.migrateTrace && console.trace ) {
-				console.trace();
-			}
-		}
-	}
-}
-
-function migrateWarnProp( obj, prop, value, msg ) {
-	if ( Object.defineProperty ) {
-		// On ES5 browsers (non-oldIE), warn if the code tries to get prop;
-		// allow property to be overwritten in case some other plugin wants it
-		try {
-			Object.defineProperty( obj, prop, {
-				configurable: true,
-				enumerable: true,
-				get: function() {
-					migrateWarn( msg );
-					return value;
-				},
-				set: function( newValue ) {
-					migrateWarn( msg );
-					value = newValue;
-				}
-			});
-			return;
-		} catch( err ) {
-			// IE8 is a dope about Object.defineProperty, can't warn there
-		}
-	}
-
-	// Non-ES5 (or broken) browser; just set the property
-	jQuery._definePropertyBroken = true;
-	obj[ prop ] = value;
-}
-
-if ( document.compatMode === "BackCompat" ) {
-	// jQuery has never supported or tested Quirks Mode
-	migrateWarn( "jQuery is not compatible with Quirks Mode" );
-}
-
-
-var attrFn = jQuery( "<input/>", { size: 1 } ).attr("size") && jQuery.attrFn,
-	oldAttr = jQuery.attr,
-	valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
-		function() { return null; },
-	valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set ||
-		function() { return undefined; },
-	rnoType = /^(?:input|button)$/i,
-	rnoAttrNodeType = /^[238]$/,
-	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
-	ruseDefault = /^(?:checked|selected)$/i;
-
-// jQuery.attrFn
-migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" );
-
-jQuery.attr = function( elem, name, value, pass ) {
-	var lowerName = name.toLowerCase(),
-		nType = elem && elem.nodeType;
-
-	if ( pass ) {
-		// Since pass is used internally, we only warn for new jQuery
-		// versions where there isn't a pass arg in the formal params
-		if ( oldAttr.length < 4 ) {
-			migrateWarn("jQuery.fn.attr( props, pass ) is deprecated");
-		}
-		if ( elem && !rnoAttrNodeType.test( nType ) &&
-			(attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) {
-			return jQuery( elem )[ name ]( value );
-		}
-	}
-
-	// Warn if user tries to set `type`, since it breaks on IE 6/7/8; by checking
-	// for disconnected elements we don't warn on $( "<button>", { type: "button" } ).
-	if ( name === "type" && value !== undefined && rnoType.test( elem.nodeName ) && elem.parentNode ) {
-		migrateWarn("Can't change the 'type' of an input or button in IE 6/7/8");
-	}
-
-	// Restore boolHook for boolean property/attribute synchronization
-	if ( !jQuery.attrHooks[ lowerName ] && rboolean.test( lowerName ) ) {
-		jQuery.attrHooks[ lowerName ] = {
-			get: function( elem, name ) {
-				// Align boolean attributes with corresponding properties
-				// Fall back to attribute presence where some booleans are not supported
-				var attrNode,
-					property = jQuery.prop( elem, name );
-				return property === true || typeof property !== "boolean" &&
-					( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
-
-					name.toLowerCase() :
-					undefined;
-			},
-			set: function( elem, value, name ) {
-				var propName;
-				if ( value === false ) {
-					// Remove boolean attributes when set to false
-					jQuery.removeAttr( elem, name );
-				} else {
-					// value is true since we know at this point it's type boolean and not false
-					// Set boolean attributes to the same name and set the DOM property
-					propName = jQuery.propFix[ name ] || name;
-					if ( propName in elem ) {
-						// Only set the IDL specifically if it already exists on the element
-						elem[ propName ] = true;
-					}
-
-					elem.setAttribute( name, name.toLowerCase() );
-				}
-				return name;
-			}
-		};
-
-		// Warn only for attributes that can remain distinct from their properties post-1.9
-		if ( ruseDefault.test( lowerName ) ) {
-			migrateWarn( "jQuery.fn.attr('" + lowerName + "') may use property instead of attribute" );
-		}
-	}
-
-	return oldAttr.call( jQuery, elem, name, value );
-};
-
-// attrHooks: value
-jQuery.attrHooks.value = {
-	get: function( elem, name ) {
-		var nodeName = ( elem.nodeName || "" ).toLowerCase();
-		if ( nodeName === "button" ) {
-			return valueAttrGet.apply( this, arguments );
-		}
-		if ( nodeName !== "input" && nodeName !== "option" ) {
-			migrateWarn("jQuery.fn.attr('value') no longer gets properties");
-		}
-		return name in elem ?
-			elem.value :
-			null;
-	},
-	set: function( elem, value ) {
-		var nodeName = ( elem.nodeName || "" ).toLowerCase();
-		if ( nodeName === "button" ) {
-			return valueAttrSet.apply( this, arguments );
-		}
-		if ( nodeName !== "input" && nodeName !== "option" ) {
-			migrateWarn("jQuery.fn.attr('value', val) no longer sets properties");
-		}
-		// Does not return so that setAttribute is also used
-		elem.value = value;
-	}
-};
-
-
-var matched, browser,
-	oldInit = jQuery.fn.init,
-	oldParseJSON = jQuery.parseJSON,
-	// Note this does NOT include the #9521 XSS fix from 1.7!
-	rquickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*|#([\w\-]*))$/;
-
-// $(html) "looks like html" rule change
-jQuery.fn.init = function( selector, context, rootjQuery ) {
-	var match;
-
-	if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) &&
-			(match = rquickExpr.exec( selector )) && match[1] ) {
-		// This is an HTML string according to the "old" rules; is it still?
-		if ( selector.charAt( 0 ) !== "<" ) {
-			migrateWarn("$(html) HTML strings must start with '<' character");
-		}
-		// Now process using loose rules; let pre-1.8 play too
-		if ( context && context.context ) {
-			// jQuery object as context; parseHTML expects a DOM object
-			context = context.context;
-		}
-		if ( jQuery.parseHTML ) {
-			return oldInit.call( this, jQuery.parseHTML( jQuery.trim(selector), context, true ),
-					context, rootjQuery );
-		}
-	}
-	return oldInit.apply( this, arguments );
-};
-jQuery.fn.init.prototype = jQuery.fn;
-
-// Let $.parseJSON(falsy_value) return null
-jQuery.parseJSON = function( json ) {
-	if ( !json && json !== null ) {
-		migrateWarn("jQuery.parseJSON requires a valid JSON string");
-		return null;
-	}
-	return oldParseJSON.apply( this, arguments );
-};
-
-jQuery.uaMatch = function( ua ) {
-	ua = ua.toLowerCase();
-
-	var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
-		/(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-		/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
-		/(msie) ([\w.]+)/.exec( ua ) ||
-		ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
-		[];
-
-	return {
-		browser: match[ 1 ] || "",
-		version: match[ 2 ] || "0"
-	};
-};
-
-// Don't clobber any existing jQuery.browser in case it's different
-if ( !jQuery.browser ) {
-	matched = jQuery.uaMatch( navigator.userAgent );
-	browser = {};
-
-	if ( matched.browser ) {
-		browser[ matched.browser ] = true;
-		browser.version = matched.version;
-	}
-
-	// Chrome is Webkit, but Webkit is also Safari.
-	if ( browser.chrome ) {
-		browser.webkit = true;
-	} else if ( browser.webkit ) {
-		browser.safari = true;
-	}
-
-	jQuery.browser = browser;
-}
-
-// Warn if the code tries to get jQuery.browser
-migrateWarnProp( jQuery, "browser", jQuery.browser, "jQuery.browser is deprecated" );
-
-jQuery.sub = function() {
-	function jQuerySub( selector, context ) {
-		return new jQuerySub.fn.init( selector, context );
-	}
-	jQuery.extend( true, jQuerySub, this );
-	jQuerySub.superclass = this;
-	jQuerySub.fn = jQuerySub.prototype = this();
-	jQuerySub.fn.constructor = jQuerySub;
-	jQuerySub.sub = this.sub;
-	jQuerySub.fn.init = function init( selector, context ) {
-		if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-			context = jQuerySub( context );
-		}
-
-		return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-	};
-	jQuerySub.fn.init.prototype = jQuerySub.fn;
-	var rootjQuerySub = jQuerySub(document);
-	migrateWarn( "jQuery.sub() is deprecated" );
-	return jQuerySub;
-};
-
-
-// Ensure that $.ajax gets the new parseJSON defined in core.js
-jQuery.ajaxSetup({
-	converters: {
-		"text json": jQuery.parseJSON
-	}
-});
-
-
-var oldFnData = jQuery.fn.data;
-
-jQuery.fn.data = function( name ) {
-	var ret, evt,
-		elem = this[0];
-
-	// Handles 1.7 which has this behavior and 1.8 which doesn't
-	if ( elem && name === "events" && arguments.length === 1 ) {
-		ret = jQuery.data( elem, name );
-		evt = jQuery._data( elem, name );
-		if ( ( ret === undefined || ret === evt ) && evt !== undefined ) {
-			migrateWarn("Use of jQuery.fn.data('events') is deprecated");
-			return evt;
-		}
-	}
-	return oldFnData.apply( this, arguments );
-};
-
-
-var rscriptType = /\/(java|ecma)script/i,
-	oldSelf = jQuery.fn.andSelf || jQuery.fn.addBack;
-
-jQuery.fn.andSelf = function() {
-	migrateWarn("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()");
-	return oldSelf.apply( this, arguments );
-};
-
-// Since jQuery.clean is used internally on older versions, we only shim if it's missing
-if ( !jQuery.clean ) {
-	jQuery.clean = function( elems, context, fragment, scripts ) {
-		// Set context per 1.8 logic
-		context = context || document;
-		context = !context.nodeType && context[0] || context;
-		context = context.ownerDocument || context;
-
-		migrateWarn("jQuery.clean() is deprecated");
-
-		var i, elem, handleScript, jsTags,
-			ret = [];
-
-		jQuery.merge( ret, jQuery.buildFragment( elems, context ).childNodes );
-
-		// Complex logic lifted directly from jQuery 1.8
-		if ( fragment ) {
-			// Special handling of each script element
-			handleScript = function( elem ) {
-				// Check if we consider it executable
-				if ( !elem.type || rscriptType.test( elem.type ) ) {
-					// Detach the script and store it in the scripts array (if provided) or the fragment
-					// Return truthy to indicate that it has been handled
-					return scripts ?
-						scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
-						fragment.appendChild( elem );
-				}
-			};
-
-			for ( i = 0; (elem = ret[i]) != null; i++ ) {
-				// Check if we're done after handling an executable script
-				if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
-					// Append to fragment and handle embedded scripts
-					fragment.appendChild( elem );
-					if ( typeof elem.getElementsByTagName !== "undefined" ) {
-						// handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
-						jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
-
-						// Splice the scripts into ret after their former ancestor and advance our index beyond them
-						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
-						i += jsTags.length;
-					}
-				}
-			}
-		}
-
-		return ret;
-	};
-}
-
-var eventAdd = jQuery.event.add,
-	eventRemove = jQuery.event.remove,
-	eventTrigger = jQuery.event.trigger,
-	oldToggle = jQuery.fn.toggle,
-	oldLive = jQuery.fn.live,
-	oldDie = jQuery.fn.die,
-	ajaxEvents = "ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",
-	rajaxEvent = new RegExp( "\\b(?:" + ajaxEvents + ")\\b" ),
-	rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
-	hoverHack = function( events ) {
-		if ( typeof( events ) !== "string" || jQuery.event.special.hover ) {
-			return events;
-		}
-		if ( rhoverHack.test( events ) ) {
-			migrateWarn("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'");
-		}
-		return events && events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
-	};
-
-// Event props removed in 1.9, put them back if needed; no practical way to warn them
-if ( jQuery.event.props && jQuery.event.props[ 0 ] !== "attrChange" ) {
-	jQuery.event.props.unshift( "attrChange", "attrName", "relatedNode", "srcElement" );
-}
-
-// Undocumented jQuery.event.handle was "deprecated" in jQuery 1.7
-if ( jQuery.event.dispatch ) {
-	migrateWarnProp( jQuery.event, "handle", jQuery.event.dispatch, "jQuery.event.handle is undocumented and deprecated" );
-}
-
-// Support for 'hover' pseudo-event and ajax event warnings
-jQuery.event.add = function( elem, types, handler, data, selector ){
-	if ( elem !== document && rajaxEvent.test( types ) ) {
-		migrateWarn( "AJAX events should be attached to document: " + types );
-	}
-	eventAdd.call( this, elem, hoverHack( types || "" ), handler, data, selector );
-};
-jQuery.event.remove = function( elem, types, handler, selector, mappedTypes ){
-	eventRemove.call( this, elem, hoverHack( types ) || "", handler, selector, mappedTypes );
-};
-
-jQuery.fn.error = function() {
-	var args = Array.prototype.slice.call( arguments, 0);
-	migrateWarn("jQuery.fn.error() is deprecated");
-	args.splice( 0, 0, "error" );
-	if ( arguments.length ) {
-		return this.bind.apply( this, args );
-	}
-	// error event should not bubble to window, although it does pre-1.7
-	this.triggerHandler.apply( this, args );
-	return this;
-};
-
-jQuery.fn.toggle = function( fn, fn2 ) {
-
-	// Don't mess with animation or css toggles
-	if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) {
-		return oldToggle.apply( this, arguments );
-	}
-	migrateWarn("jQuery.fn.toggle(handler, handler...) is deprecated");
-
-	// Save reference to arguments for access in closure
-	var args = arguments,
-		guid = fn.guid || jQuery.guid++,
-		i = 0,
-		toggler = function( event ) {
-			// Figure out which function to execute
-			var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-			jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-			// Make sure that clicks stop
-			event.preventDefault();
-
-			// and execute the function
-			return args[ lastToggle ].apply( this, arguments ) || false;
-		};
-
-	// link all the functions, so any of them can unbind this click handler
-	toggler.guid = guid;
-	while ( i < args.length ) {
-		args[ i++ ].guid = guid;
-	}
-
-	return this.click( toggler );
-};
-
-jQuery.fn.live = function( types, data, fn ) {
-	migrateWarn("jQuery.fn.live() is deprecated");
-	if ( oldLive ) {
-		return oldLive.apply( this, arguments );
-	}
-	jQuery( this.context ).on( types, this.selector, data, fn );
-	return this;
-};
-
-jQuery.fn.die = function( types, fn ) {
-	migrateWarn("jQuery.fn.die() is deprecated");
-	if ( oldDie ) {
-		return oldDie.apply( this, arguments );
-	}
-	jQuery( this.context ).off( types, this.selector || "**", fn );
-	return this;
-};
-
-// Turn global events into document-triggered events
-jQuery.event.trigger = function( event, data, elem, onlyHandlers  ){
-	if ( !elem && !rajaxEvent.test( event ) ) {
-		migrateWarn( "Global events are undocumented and deprecated" );
-	}
-	return eventTrigger.call( this,  event, data, elem || document, onlyHandlers  );
-};
-jQuery.each( ajaxEvents.split("|"),
-	function( _, name ) {
-		jQuery.event.special[ name ] = {
-			setup: function() {
-				var elem = this;
-
-				// The document needs no shimming; must be !== for oldIE
-				if ( elem !== document ) {
-					jQuery.event.add( document, name + "." + jQuery.guid, function() {
-						jQuery.event.trigger( name, null, elem, true );
-					});
-					jQuery._data( this, name, jQuery.guid++ );
-				}
-				return false;
-			},
-			teardown: function() {
-				if ( this !== document ) {
-					jQuery.event.remove( document, name + "." + jQuery._data( this, name ) );
-				}
-				return false;
-			}
-		};
-	}
-);
-
-
-})( jQuery, window );
diff --git a/view/js/jquery.js b/view/js/jquery.js
index d26ce7f6a..046447ce9 100644
--- a/view/js/jquery.js
+++ b/view/js/jquery.js
@@ -1,5 +1,5 @@
-/*! jQuery v1.11.2 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.2",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=hb(),z=hb(),A=hb(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},eb=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fb){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function gb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(f=_.exec(a)))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+rb(o[l]);w=ab.test(a)&&pb(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function hb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ib(a){return a[u]=!0,a}function jb(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function kb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function lb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function nb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function ob(a){return ib(function(b){return b=+b,ib(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function pb(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=gb.support={},f=gb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=gb.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",eb,!1):e.attachEvent&&e.attachEvent("onunload",eb)),p=!f(g),c.attributes=jb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=jb(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=jb(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(jb(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),jb(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&jb(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return lb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?lb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},gb.matches=function(a,b){return gb(a,null,null,b)},gb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return gb(b,n,null,[a]).length>0},gb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},gb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},gb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},gb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=gb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=gb.selectors={cacheLength:50,createPseudo:ib,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||gb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&gb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=gb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(Q," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||gb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ib(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ib(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ib(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ib(function(a){return function(b){return gb(a,b).length>0}}),contains:ib(function(a){return a=a.replace(cb,db),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ib(function(a){return W.test(a||"")||gb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:ob(function(){return[0]}),last:ob(function(a,b){return[b-1]}),eq:ob(function(a,b,c){return[0>c?c+b:c]}),even:ob(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:ob(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:ob(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:ob(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=mb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=nb(b);function qb(){}qb.prototype=d.filters=d.pseudos,d.setFilters=new qb,g=gb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?gb.error(a):z(a,i).slice(0)};function rb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function tb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ub(a,b,c){for(var d=0,e=b.length;e>d;d++)gb(a,b[d],c);return c}function vb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function wb(a,b,c,d,e,f){return d&&!d[u]&&(d=wb(d)),e&&!e[u]&&(e=wb(e,f)),ib(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ub(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:vb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=vb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=vb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sb(function(a){return a===b},h,!0),l=sb(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sb(tb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return wb(i>1&&tb(m),i>1&&rb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xb(a.slice(i,e)),f>e&&xb(a=a.slice(e)),f>e&&rb(a))}m.push(c)}return tb(m)}function yb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=F.call(i));s=vb(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&gb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ib(f):f}return h=gb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,yb(e,d)),f.selector=a}return f},i=gb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&pb(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&rb(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&pb(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=jb(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),jb(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||kb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&jb(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||kb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),jb(function(a){return null==a.getAttribute("disabled")})||kb(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),gb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
-return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==cb()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===cb()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ab:bb):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:bb,isPropagationStopped:bb,isImmediatePropagationStopped:bb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ab,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ab,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ab,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},m.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){m.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!m.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.submitBubbles||(m.event.special.submit={setup:function(){return m.nodeName(this,"form")?!1:void m.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=m.nodeName(b,"input")||m.nodeName(b,"button")?b.form:void 0;c&&!m._data(c,"submitBubbles")&&(m.event.add(c,"submit._submit",function(a){a._submit_bubble=!0}),m._data(c,"submitBubbles",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&m.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){return m.nodeName(this,"form")?!1:void m.event.remove(this,"._submit")}}),k.changeBubbles||(m.event.special.change={setup:function(){return X.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(m.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._just_changed=!0)}),m.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),m.event.simulate("change",this,a,!0)})),!1):void m.event.add(this,"beforeactivate._change",function(a){var b=a.target;X.test(b.nodeName)&&!m._data(b,"changeBubbles")&&(m.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||m.event.simulate("change",this.parentNode,a,!0)}),m._data(b,"changeBubbles",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return m.event.remove(this,"._change"),!X.test(this.nodeName)}}),k.focusinBubbles||m.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){m.event.simulate(b,a.target,m.event.fix(a),!0)};m.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=m._data(d,b);e||d.addEventListener(a,c,!0),m._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=m._data(d,b)-1;e?m._data(d,b,e):(d.removeEventListener(a,c,!0),m._removeData(d,b))}}}),m.fn.extend({on:function(a,b,c,d,e){var f,g;if("object"==typeof a){"string"!=typeof b&&(c=c||b,b=void 0);for(f in a)this.on(f,b,c,a[f],e);return this}if(null==c&&null==d?(d=b,c=b=void 0):null==d&&("string"==typeof b?(d=c,c=void 0):(d=c,c=b,b=void 0)),d===!1)d=bb;else if(!d)return this;return 1===e&&(g=d,d=function(a){return m().off(a),g.apply(this,arguments)},d.guid=g.guid||(g.guid=m.guid++)),this.each(function(){m.event.add(this,a,d,c,b)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,m(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return(b===!1||"function"==typeof b)&&(c=b,b=void 0),c===!1&&(c=bb),this.each(function(){m.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){m.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?m.event.trigger(a,b,c,!0):void 0}});function db(a){var b=eb.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}var eb="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",fb=/ jQuery\d+="(?:null|\d+)"/g,gb=new RegExp("<(?:"+eb+")[\\s/>]","i"),hb=/^\s+/,ib=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,jb=/<([\w:]+)/,kb=/<tbody/i,lb=/<|&#?\w+;/,mb=/<(?:script|style|link)/i,nb=/checked\s*(?:[^=]|=\s*.checked.)/i,ob=/^$|\/(?:java|ecma)script/i,pb=/^true\/(.*)/,qb=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,rb={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:k.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},sb=db(y),tb=sb.appendChild(y.createElement("div"));rb.optgroup=rb.option,rb.tbody=rb.tfoot=rb.colgroup=rb.caption=rb.thead,rb.th=rb.td;function ub(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==K?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==K?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||m.nodeName(d,b)?f.push(d):m.merge(f,ub(d,b));return void 0===b||b&&m.nodeName(a,b)?m.merge([a],f):f}function vb(a){W.test(a.type)&&(a.defaultChecked=a.checked)}function wb(a,b){return m.nodeName(a,"table")&&m.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function xb(a){return a.type=(null!==m.find.attr(a,"type"))+"/"+a.type,a}function yb(a){var b=pb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function zb(a,b){for(var c,d=0;null!=(c=a[d]);d++)m._data(c,"globalEval",!b||m._data(b[d],"globalEval"))}function Ab(a,b){if(1===b.nodeType&&m.hasData(a)){var c,d,e,f=m._data(a),g=m._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)m.event.add(b,c,h[c][d])}g.data&&(g.data=m.extend({},g.data))}}function Bb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!k.noCloneEvent&&b[m.expando]){e=m._data(b);for(d in e.events)m.removeEvent(b,d,e.handle);b.removeAttribute(m.expando)}"script"===c&&b.text!==a.text?(xb(b).text=a.text,yb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),k.html5Clone&&a.innerHTML&&!m.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&W.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}m.extend({clone:function(a,b,c){var d,e,f,g,h,i=m.contains(a.ownerDocument,a);if(k.html5Clone||m.isXMLDoc(a)||!gb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(tb.innerHTML=a.outerHTML,tb.removeChild(f=tb.firstChild)),!(k.noCloneEvent&&k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||m.isXMLDoc(a)))for(d=ub(f),h=ub(a),g=0;null!=(e=h[g]);++g)d[g]&&Bb(e,d[g]);if(b)if(c)for(h=h||ub(a),d=d||ub(f),g=0;null!=(e=h[g]);g++)Ab(e,d[g]);else Ab(a,f);return d=ub(f,"script"),d.length>0&&zb(d,!i&&ub(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,l,n=a.length,o=db(b),p=[],q=0;n>q;q++)if(f=a[q],f||0===f)if("object"===m.type(f))m.merge(p,f.nodeType?[f]:f);else if(lb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(jb.exec(f)||["",""])[1].toLowerCase(),l=rb[i]||rb._default,h.innerHTML=l[1]+f.replace(ib,"<$1></$2>")+l[2],e=l[0];while(e--)h=h.lastChild;if(!k.leadingWhitespace&&hb.test(f)&&p.push(b.createTextNode(hb.exec(f)[0])),!k.tbody){f="table"!==i||kb.test(f)?"<table>"!==l[1]||kb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)m.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}m.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),k.appendChecked||m.grep(ub(p,"input"),vb),q=0;while(f=p[q++])if((!d||-1===m.inArray(f,d))&&(g=m.contains(f.ownerDocument,f),h=ub(o.appendChild(f),"script"),g&&zb(h),c)){e=0;while(f=h[e++])ob.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=m.expando,j=m.cache,l=k.deleteExpando,n=m.event.special;null!=(d=a[h]);h++)if((b||m.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)n[e]?m.event.remove(d,e):m.removeEvent(d,e,g.handle);j[f]&&(delete j[f],l?delete d[i]:typeof d.removeAttribute!==K?d.removeAttribute(i):d[i]=null,c.push(f))}}}),m.fn.extend({text:function(a){return V(this,function(a){return void 0===a?m.text(this):this.empty().append((this[0]&&this[0].ownerDocument||y).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=wb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?m.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||m.cleanData(ub(c)),c.parentNode&&(b&&m.contains(c.ownerDocument,c)&&zb(ub(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&m.cleanData(ub(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&m.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return m.clone(this,a,b)})},html:function(a){return V(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(fb,""):void 0;if(!("string"!=typeof a||mb.test(a)||!k.htmlSerialize&&gb.test(a)||!k.leadingWhitespace&&hb.test(a)||rb[(jb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(ib,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(m.cleanData(ub(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,m.cleanData(ub(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,n=this,o=l-1,p=a[0],q=m.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&nb.test(p))return this.each(function(c){var d=n.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(i=m.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=m.map(ub(i,"script"),xb),f=g.length;l>j;j++)d=i,j!==o&&(d=m.clone(d,!0,!0),f&&m.merge(g,ub(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,m.map(g,yb),j=0;f>j;j++)d=g[j],ob.test(d.type||"")&&!m._data(d,"globalEval")&&m.contains(h,d)&&(d.src?m._evalUrl&&m._evalUrl(d.src):m.globalEval((d.text||d.textContent||d.innerHTML||"").replace(qb,"")));i=c=null}return this}}),m.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){m.fn[a]=function(a){for(var c,d=0,e=[],g=m(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),m(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Cb,Db={};function Eb(b,c){var d,e=m(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:m.css(e[0],"display");return e.detach(),f}function Fb(a){var b=y,c=Db[a];return c||(c=Eb(a,b),"none"!==c&&c||(Cb=(Cb||m("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Cb[0].contentWindow||Cb[0].contentDocument).document,b.write(),b.close(),c=Eb(a,b),Cb.detach()),Db[a]=c),c}!function(){var a;k.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,d;return c=y.getElementsByTagName("body")[0],c&&c.style?(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(y.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(d),a):void 0}}();var Gb=/^margin/,Hb=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ib,Jb,Kb=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ib=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c.getPropertyValue(b)||c[b]:void 0,c&&(""!==g||m.contains(a.ownerDocument,a)||(g=m.style(a,b)),Hb.test(g)&&Gb.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0===g?g:g+""}):y.documentElement.currentStyle&&(Ib=function(a){return a.currentStyle},Jb=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ib(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Hb.test(g)&&!Kb.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Lb(a,b){return{get:function(){var c=a();if(null!=c)return c?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d,e,f,g,h;if(b=y.createElement("div"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=d&&d.style){c.cssText="float:left;opacity:.5",k.opacity="0.5"===c.opacity,k.cssFloat=!!c.cssFloat,b.style.backgroundClip="content-box",b.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===b.style.backgroundClip,k.boxSizing=""===c.boxSizing||""===c.MozBoxSizing||""===c.WebkitBoxSizing,m.extend(k,{reliableHiddenOffsets:function(){return null==g&&i(),g},boxSizingReliable:function(){return null==f&&i(),f},pixelPosition:function(){return null==e&&i(),e},reliableMarginRight:function(){return null==h&&i(),h}});function i(){var b,c,d,i;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),b.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",e=f=!1,h=!0,a.getComputedStyle&&(e="1%"!==(a.getComputedStyle(b,null)||{}).top,f="4px"===(a.getComputedStyle(b,null)||{width:"4px"}).width,i=b.appendChild(y.createElement("div")),i.style.cssText=b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",i.style.marginRight=i.style.width="0",b.style.width="1px",h=!parseFloat((a.getComputedStyle(i,null)||{}).marginRight),b.removeChild(i)),b.innerHTML="<table><tr><td></td><td>t</td></tr></table>",i=b.getElementsByTagName("td"),i[0].style.cssText="margin:0;border:0;padding:0;display:none",g=0===i[0].offsetHeight,g&&(i[0].style.display="",i[1].style.display="none",g=0===i[0].offsetHeight),c.removeChild(d))}}}(),m.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var Mb=/alpha\([^)]*\)/i,Nb=/opacity\s*=\s*([^)]*)/,Ob=/^(none|table(?!-c[ea]).+)/,Pb=new RegExp("^("+S+")(.*)$","i"),Qb=new RegExp("^([+-])=("+S+")","i"),Rb={position:"absolute",visibility:"hidden",display:"block"},Sb={letterSpacing:"0",fontWeight:"400"},Tb=["Webkit","O","Moz","ms"];function Ub(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=Tb.length;while(e--)if(b=Tb[e]+c,b in a)return b;return d}function Vb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=m._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&U(d)&&(f[g]=m._data(d,"olddisplay",Fb(d.nodeName)))):(e=U(d),(c&&"none"!==c||!e)&&m._data(d,"olddisplay",e?c:m.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function Wb(a,b,c){var d=Pb.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Xb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=m.css(a,c+T[f],!0,e)),d?("content"===c&&(g-=m.css(a,"padding"+T[f],!0,e)),"margin"!==c&&(g-=m.css(a,"border"+T[f]+"Width",!0,e))):(g+=m.css(a,"padding"+T[f],!0,e),"padding"!==c&&(g+=m.css(a,"border"+T[f]+"Width",!0,e)));return g}function Yb(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ib(a),g=k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Jb(a,b,f),(0>e||null==e)&&(e=a.style[b]),Hb.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Xb(a,b,c||(g?"border":"content"),d,f)+"px"}m.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Jb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":k.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=m.camelCase(b),i=a.style;if(b=m.cssProps[h]||(m.cssProps[h]=Ub(i,h)),g=m.cssHooks[b]||m.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=Qb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(m.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||m.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=m.camelCase(b);return b=m.cssProps[h]||(m.cssProps[h]=Ub(a.style,h)),g=m.cssHooks[b]||m.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Jb(a,b,d)),"normal"===f&&b in Sb&&(f=Sb[b]),""===c||c?(e=parseFloat(f),c===!0||m.isNumeric(e)?e||0:f):f}}),m.each(["height","width"],function(a,b){m.cssHooks[b]={get:function(a,c,d){return c?Ob.test(m.css(a,"display"))&&0===a.offsetWidth?m.swap(a,Rb,function(){return Yb(a,b,d)}):Yb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ib(a);return Wb(a,c,d?Xb(a,b,d,k.boxSizing&&"border-box"===m.css(a,"boxSizing",!1,e),e):0)}}}),k.opacity||(m.cssHooks.opacity={get:function(a,b){return Nb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=m.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===m.trim(f.replace(Mb,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Mb.test(f)?f.replace(Mb,e):f+" "+e)}}),m.cssHooks.marginRight=Lb(k.reliableMarginRight,function(a,b){return b?m.swap(a,{display:"inline-block"},Jb,[a,"marginRight"]):void 0}),m.each({margin:"",padding:"",border:"Width"},function(a,b){m.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+T[d]+b]=f[d]||f[d-2]||f[0];return e}},Gb.test(a)||(m.cssHooks[a+b].set=Wb)}),m.fn.extend({css:function(a,b){return V(this,function(a,b,c){var d,e,f={},g=0;if(m.isArray(b)){for(d=Ib(a),e=b.length;e>g;g++)f[b[g]]=m.css(a,b[g],!1,d);return f}return void 0!==c?m.style(a,b,c):m.css(a,b)},a,b,arguments.length>1)},show:function(){return Vb(this,!0)},hide:function(){return Vb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){U(this)?m(this).show():m(this).hide()})}});function Zb(a,b,c,d,e){return new Zb.prototype.init(a,b,c,d,e)
-}m.Tween=Zb,Zb.prototype={constructor:Zb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(m.cssNumber[c]?"":"px")},cur:function(){var a=Zb.propHooks[this.prop];return a&&a.get?a.get(this):Zb.propHooks._default.get(this)},run:function(a){var b,c=Zb.propHooks[this.prop];return this.pos=b=this.options.duration?m.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Zb.propHooks._default.set(this),this}},Zb.prototype.init.prototype=Zb.prototype,Zb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=m.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){m.fx.step[a.prop]?m.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[m.cssProps[a.prop]]||m.cssHooks[a.prop])?m.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Zb.propHooks.scrollTop=Zb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},m.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},m.fx=Zb.prototype.init,m.fx.step={};var $b,_b,ac=/^(?:toggle|show|hide)$/,bc=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),cc=/queueHooks$/,dc=[ic],ec={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=bc.exec(b),f=e&&e[3]||(m.cssNumber[a]?"":"px"),g=(m.cssNumber[a]||"px"!==f&&+d)&&bc.exec(m.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do h=h||".5",g/=h,m.style(c.elem,a,g+f);while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};function fc(){return setTimeout(function(){$b=void 0}),$b=m.now()}function gc(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=T[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function hc(a,b,c){for(var d,e=(ec[b]||[]).concat(ec["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ic(a,b,c){var d,e,f,g,h,i,j,l,n=this,o={},p=a.style,q=a.nodeType&&U(a),r=m._data(a,"fxshow");c.queue||(h=m._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,n.always(function(){n.always(function(){h.unqueued--,m.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=m.css(a,"display"),l="none"===j?m._data(a,"olddisplay")||Fb(a.nodeName):j,"inline"===l&&"none"===m.css(a,"float")&&(k.inlineBlockNeedsLayout&&"inline"!==Fb(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",k.shrinkWrapBlocks()||n.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],ac.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||m.style(a,d)}else j=void 0;if(m.isEmptyObject(o))"inline"===("none"===j?Fb(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=m._data(a,"fxshow",{}),f&&(r.hidden=!q),q?m(a).show():n.done(function(){m(a).hide()}),n.done(function(){var b;m._removeData(a,"fxshow");for(b in o)m.style(a,b,o[b])});for(d in o)g=hc(q?r[d]:0,d,n),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function jc(a,b){var c,d,e,f,g;for(c in a)if(d=m.camelCase(c),e=b[d],f=a[c],m.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=m.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kc(a,b,c){var d,e,f=0,g=dc.length,h=m.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=$b||fc(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:m.extend({},b),opts:m.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:$b||fc(),duration:c.duration,tweens:[],createTween:function(b,c){var d=m.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jc(k,j.opts.specialEasing);g>f;f++)if(d=dc[f].call(j,a,k,j.opts))return d;return m.map(k,hc,j),m.isFunction(j.opts.start)&&j.opts.start.call(a,j),m.fx.timer(m.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}m.Animation=m.extend(kc,{tweener:function(a,b){m.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],ec[c]=ec[c]||[],ec[c].unshift(b)},prefilter:function(a,b){b?dc.unshift(a):dc.push(a)}}),m.speed=function(a,b,c){var d=a&&"object"==typeof a?m.extend({},a):{complete:c||!c&&b||m.isFunction(a)&&a,duration:a,easing:c&&b||b&&!m.isFunction(b)&&b};return d.duration=m.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in m.fx.speeds?m.fx.speeds[d.duration]:m.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){m.isFunction(d.old)&&d.old.call(this),d.queue&&m.dequeue(this,d.queue)},d},m.fn.extend({fadeTo:function(a,b,c,d){return this.filter(U).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=m.isEmptyObject(a),f=m.speed(b,c,d),g=function(){var b=kc(this,m.extend({},a),f);(e||m._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=m.timers,g=m._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&cc.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&m.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=m._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=m.timers,g=d?d.length:0;for(c.finish=!0,m.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),m.each(["toggle","show","hide"],function(a,b){var c=m.fn[b];m.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gc(b,!0),a,d,e)}}),m.each({slideDown:gc("show"),slideUp:gc("hide"),slideToggle:gc("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){m.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),m.timers=[],m.fx.tick=function(){var a,b=m.timers,c=0;for($b=m.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||m.fx.stop(),$b=void 0},m.fx.timer=function(a){m.timers.push(a),a()?m.fx.start():m.timers.pop()},m.fx.interval=13,m.fx.start=function(){_b||(_b=setInterval(m.fx.tick,m.fx.interval))},m.fx.stop=function(){clearInterval(_b),_b=null},m.fx.speeds={slow:600,fast:200,_default:400},m.fn.delay=function(a,b){return a=m.fx?m.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},function(){var a,b,c,d,e;b=y.createElement("div"),b.setAttribute("className","t"),b.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",d=b.getElementsByTagName("a")[0],c=y.createElement("select"),e=c.appendChild(y.createElement("option")),a=b.getElementsByTagName("input")[0],d.style.cssText="top:1px",k.getSetAttribute="t"!==b.className,k.style=/top/.test(d.getAttribute("style")),k.hrefNormalized="/a"===d.getAttribute("href"),k.checkOn=!!a.value,k.optSelected=e.selected,k.enctype=!!y.createElement("form").enctype,c.disabled=!0,k.optDisabled=!e.disabled,a=y.createElement("input"),a.setAttribute("value",""),k.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),k.radioValue="t"===a.value}();var lc=/\r/g;m.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=m.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,m(this).val()):a,null==e?e="":"number"==typeof e?e+="":m.isArray(e)&&(e=m.map(e,function(a){return null==a?"":a+""})),b=m.valHooks[this.type]||m.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=m.valHooks[e.type]||m.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(lc,""):null==c?"":c)}}}),m.extend({valHooks:{option:{get:function(a){var b=m.find.attr(a,"value");return null!=b?b:m.trim(m.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&m.nodeName(c.parentNode,"optgroup"))){if(b=m(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=m.makeArray(b),g=e.length;while(g--)if(d=e[g],m.inArray(m.valHooks.option.get(d),f)>=0)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),m.each(["radio","checkbox"],function(){m.valHooks[this]={set:function(a,b){return m.isArray(b)?a.checked=m.inArray(m(a).val(),b)>=0:void 0}},k.checkOn||(m.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var mc,nc,oc=m.expr.attrHandle,pc=/^(?:checked|selected)$/i,qc=k.getSetAttribute,rc=k.input;m.fn.extend({attr:function(a,b){return V(this,m.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){m.removeAttr(this,a)})}}),m.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===K?m.prop(a,b,c):(1===f&&m.isXMLDoc(a)||(b=b.toLowerCase(),d=m.attrHooks[b]||(m.expr.match.bool.test(b)?nc:mc)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=m.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void m.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)while(c=f[e++])d=m.propFix[c]||c,m.expr.match.bool.test(c)?rc&&qc||!pc.test(c)?a[d]=!1:a[m.camelCase("default-"+c)]=a[d]=!1:m.attr(a,c,""),a.removeAttribute(qc?c:d)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&m.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),nc={set:function(a,b,c){return b===!1?m.removeAttr(a,c):rc&&qc||!pc.test(c)?a.setAttribute(!qc&&m.propFix[c]||c,c):a[m.camelCase("default-"+c)]=a[c]=!0,c}},m.each(m.expr.match.bool.source.match(/\w+/g),function(a,b){var c=oc[b]||m.find.attr;oc[b]=rc&&qc||!pc.test(b)?function(a,b,d){var e,f;return d||(f=oc[b],oc[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,oc[b]=f),e}:function(a,b,c){return c?void 0:a[m.camelCase("default-"+b)]?b.toLowerCase():null}}),rc&&qc||(m.attrHooks.value={set:function(a,b,c){return m.nodeName(a,"input")?void(a.defaultValue=b):mc&&mc.set(a,b,c)}}),qc||(mc={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},oc.id=oc.name=oc.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},m.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:mc.set},m.attrHooks.contenteditable={set:function(a,b,c){mc.set(a,""===b?!1:b,c)}},m.each(["width","height"],function(a,b){m.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),k.style||(m.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var sc=/^(?:input|select|textarea|button|object)$/i,tc=/^(?:a|area)$/i;m.fn.extend({prop:function(a,b){return V(this,m.prop,a,b,arguments.length>1)},removeProp:function(a){return a=m.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),m.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!m.isXMLDoc(a),f&&(b=m.propFix[b]||b,e=m.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=m.find.attr(a,"tabindex");return b?parseInt(b,10):sc.test(a.nodeName)||tc.test(a.nodeName)&&a.href?0:-1}}}}),k.hrefNormalized||m.each(["href","src"],function(a,b){m.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),k.optSelected||(m.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}}),m.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){m.propFix[this.toLowerCase()]=this}),k.enctype||(m.propFix.enctype="encoding");var uc=/[\t\r\n\f]/g;m.fn.extend({addClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j="string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).addClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=m.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0,i=this.length,j=0===arguments.length||"string"==typeof a&&a;if(m.isFunction(a))return this.each(function(b){m(this).removeClass(a.call(this,b,this.className))});if(j)for(b=(a||"").match(E)||[];i>h;h++)if(c=this[h],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(uc," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?m.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(m.isFunction(a)?function(c){m(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=m(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===K||"boolean"===c)&&(this.className&&m._data(this,"__className__",this.className),this.className=this.className||a===!1?"":m._data(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(uc," ").indexOf(b)>=0)return!0;return!1}}),m.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){m.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),m.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var vc=m.now(),wc=/\?/,xc=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;m.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=m.trim(b+"");return e&&!m.trim(e.replace(xc,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():m.error("Invalid JSON: "+b)},m.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||m.error("Invalid XML: "+b),c};var yc,zc,Ac=/#.*$/,Bc=/([?&])_=[^&]*/,Cc=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Dc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Ec=/^(?:GET|HEAD)$/,Fc=/^\/\//,Gc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hc={},Ic={},Jc="*/".concat("*");try{zc=location.href}catch(Kc){zc=y.createElement("a"),zc.href="",zc=zc.href}yc=Gc.exec(zc.toLowerCase())||[];function Lc(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(m.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Mc(a,b,c,d){var e={},f=a===Ic;function g(h){var i;return e[h]=!0,m.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Nc(a,b){var c,d,e=m.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&m.extend(!0,a,c),a}function Oc(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Pc(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}m.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:zc,type:"GET",isLocal:Dc.test(yc[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Jc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":m.parseJSON,"text xml":m.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Nc(Nc(a,m.ajaxSettings),b):Nc(m.ajaxSettings,a)},ajaxPrefilter:Lc(Hc),ajaxTransport:Lc(Ic),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=m.ajaxSetup({},b),l=k.context||k,n=k.context&&(l.nodeType||l.jquery)?m(l):m.event,o=m.Deferred(),p=m.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!j){j={};while(b=Cc.exec(f))j[b[1].toLowerCase()]=b[2]}b=j[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?f:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return i&&i.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||zc)+"").replace(Ac,"").replace(Fc,yc[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=m.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(c=Gc.exec(k.url.toLowerCase()),k.crossDomain=!(!c||c[1]===yc[1]&&c[2]===yc[2]&&(c[3]||("http:"===c[1]?"80":"443"))===(yc[3]||("http:"===yc[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=m.param(k.data,k.traditional)),Mc(Hc,k,b,v),2===t)return v;h=m.event&&k.global,h&&0===m.active++&&m.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!Ec.test(k.type),e=k.url,k.hasContent||(k.data&&(e=k.url+=(wc.test(e)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=Bc.test(e)?e.replace(Bc,"$1_="+vc++):e+(wc.test(e)?"&":"?")+"_="+vc++)),k.ifModified&&(m.lastModified[e]&&v.setRequestHeader("If-Modified-Since",m.lastModified[e]),m.etag[e]&&v.setRequestHeader("If-None-Match",m.etag[e])),(k.data&&k.hasContent&&k.contentType!==!1||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+Jc+"; q=0.01":""):k.accepts["*"]);for(d in k.headers)v.setRequestHeader(d,k.headers[d]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(d in{success:1,error:1,complete:1})v[d](k[d]);if(i=Mc(Ic,k,b,v)){v.readyState=1,h&&n.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,i.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,c,d){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),i=void 0,f=d||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,c&&(u=Oc(k,v,c)),u=Pc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(m.lastModified[e]=w),w=v.getResponseHeader("etag"),w&&(m.etag[e]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.state,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,h&&n.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),h&&(n.trigger("ajaxComplete",[v,k]),--m.active||m.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return m.get(a,b,c,"json")},getScript:function(a,b){return m.get(a,void 0,b,"script")}}),m.each(["get","post"],function(a,b){m[b]=function(a,c,d,e){return m.isFunction(c)&&(e=e||d,d=c,c=void 0),m.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),m._evalUrl=function(a){return m.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},m.fn.extend({wrapAll:function(a){if(m.isFunction(a))return this.each(function(b){m(this).wrapAll(a.call(this,b))});if(this[0]){var b=m(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return this.each(m.isFunction(a)?function(b){m(this).wrapInner(a.call(this,b))}:function(){var b=m(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=m.isFunction(a);return this.each(function(c){m(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){m.nodeName(this,"body")||m(this).replaceWith(this.childNodes)}).end()}}),m.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0||!k.reliableHiddenOffsets()&&"none"===(a.style&&a.style.display||m.css(a,"display"))},m.expr.filters.visible=function(a){return!m.expr.filters.hidden(a)};var Qc=/%20/g,Rc=/\[\]$/,Sc=/\r?\n/g,Tc=/^(?:submit|button|image|reset|file)$/i,Uc=/^(?:input|select|textarea|keygen)/i;function Vc(a,b,c,d){var e;if(m.isArray(b))m.each(b,function(b,e){c||Rc.test(a)?d(a,e):Vc(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==m.type(b))d(a,b);else for(e in b)Vc(a+"["+e+"]",b[e],c,d)}m.param=function(a,b){var c,d=[],e=function(a,b){b=m.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=m.ajaxSettings&&m.ajaxSettings.traditional),m.isArray(a)||a.jquery&&!m.isPlainObject(a))m.each(a,function(){e(this.name,this.value)});else for(c in a)Vc(c,a[c],b,e);return d.join("&").replace(Qc,"+")},m.fn.extend({serialize:function(){return m.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=m.prop(this,"elements");return a?m.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!m(this).is(":disabled")&&Uc.test(this.nodeName)&&!Tc.test(a)&&(this.checked||!W.test(a))}).map(function(a,b){var c=m(this).val();return null==c?null:m.isArray(c)?m.map(c,function(a){return{name:b.name,value:a.replace(Sc,"\r\n")}}):{name:b.name,value:c.replace(Sc,"\r\n")}}).get()}}),m.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zc()||$c()}:Zc;var Wc=0,Xc={},Yc=m.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Xc)Xc[a](void 0,!0)}),k.cors=!!Yc&&"withCredentials"in Yc,Yc=k.ajax=!!Yc,Yc&&m.ajaxTransport(function(a){if(!a.crossDomain||k.cors){var b;return{send:function(c,d){var e,f=a.xhr(),g=++Wc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)void 0!==c[e]&&f.setRequestHeader(e,c[e]+"");f.send(a.hasContent&&a.data||null),b=function(c,e){var h,i,j;if(b&&(e||4===f.readyState))if(delete Xc[g],b=void 0,f.onreadystatechange=m.noop,e)4!==f.readyState&&f.abort();else{j={},h=f.status,"string"==typeof f.responseText&&(j.text=f.responseText);try{i=f.statusText}catch(k){i=""}h||!a.isLocal||a.crossDomain?1223===h&&(h=204):h=j.text?200:404}j&&d(h,i,j,f.getAllResponseHeaders())},a.async?4===f.readyState?setTimeout(b):f.onreadystatechange=Xc[g]=b:b()},abort:function(){b&&b(void 0,!0)}}}});function Zc(){try{return new a.XMLHttpRequest}catch(b){}}function $c(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}m.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return m.globalEval(a),a}}}),m.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),m.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=y.head||m("head")[0]||y.documentElement;return{send:function(d,e){b=y.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||e(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var _c=[],ad=/(=)\?(?=&|$)|\?\?/;m.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=_c.pop()||m.expando+"_"+vc++;return this[a]=!0,a}}),m.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(ad.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&ad.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=m.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(ad,"$1"+e):b.jsonp!==!1&&(b.url+=(wc.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||m.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,_c.push(e)),g&&m.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),m.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||y;var d=u.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=m.buildFragment([a],b,e),e&&e.length&&m(e).remove(),m.merge([],d.childNodes))};var bd=m.fn.load;m.fn.load=function(a,b,c){if("string"!=typeof a&&bd)return bd.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=m.trim(a.slice(h,a.length)),a=a.slice(0,h)),m.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(f="POST"),g.length>0&&m.ajax({url:a,type:f,dataType:"html",data:b}).done(function(a){e=arguments,g.html(d?m("<div>").append(m.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,e||[a.responseText,b,a])}),this},m.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){m.fn[b]=function(a){return this.on(b,a)}}),m.expr.filters.animated=function(a){return m.grep(m.timers,function(b){return a===b.elem}).length};var cd=a.document.documentElement;function dd(a){return m.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}m.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=m.css(a,"position"),l=m(a),n={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=m.css(a,"top"),i=m.css(a,"left"),j=("absolute"===k||"fixed"===k)&&m.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),m.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(n.top=b.top-h.top+g),null!=b.left&&(n.left=b.left-h.left+e),"using"in b?b.using.call(a,n):l.css(n)}},m.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){m.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,m.contains(b,e)?(typeof e.getBoundingClientRect!==K&&(d=e.getBoundingClientRect()),c=dd(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===m.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),m.nodeName(a[0],"html")||(c=a.offset()),c.top+=m.css(a[0],"borderTopWidth",!0),c.left+=m.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-m.css(d,"marginTop",!0),left:b.left-c.left-m.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||cd;while(a&&!m.nodeName(a,"html")&&"static"===m.css(a,"position"))a=a.offsetParent;return a||cd})}}),m.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);m.fn[a]=function(d){return V(this,function(a,d,e){var f=dd(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?m(f).scrollLeft():e,c?e:m(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),m.each(["top","left"],function(a,b){m.cssHooks[b]=Lb(k.pixelPosition,function(a,c){return c?(c=Jb(a,b),Hb.test(c)?m(a).position()[b]+"px":c):void 0})}),m.each({Height:"height",Width:"width"},function(a,b){m.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){m.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return V(this,function(b,c,d){var e;return m.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?m.css(b,c,g):m.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),m.fn.size=function(){return this.length},m.fn.andSelf=m.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return m});var ed=a.jQuery,fd=a.$;return m.noConflict=function(b){return a.$===m&&(a.$=fd),b&&a.jQuery===m&&(a.jQuery=ed),m},typeof b===K&&(a.jQuery=a.$=m),m});
+/*! jQuery v3.1.0 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.1.0",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null!=a?a<0?this[a+this.length]:this[a]:f.call(this)},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=r.isArray(d)))?(e?(e=!1,f=c&&r.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"label"in b&&b.disabled===a||"form"in b&&b.disabled===a||"form"in b&&b.disabled===!1&&(b.isDisabled===a||b.isDisabled!==!a&&("label"in b||!ea(b))!==a)}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c<b;c+=2)a.push(c);return a}),odd:pa(function(a,b){for(var c=1;c<b;c+=2)a.push(c);return a}),lt:pa(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function ra(){}ra.prototype=d.filters=d.pseudos,d.setFilters=new ra,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=Q.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function sa(a){for(var b=0,c=a.length,d="";b<c;b++)d+=a[b].value;return d}function ta(a,b,c){var d=b.dir,e=b.next,f=e||d,g=c&&"parentNode"===f,h=x++;return b.first?function(b,c,e){while(b=b[d])if(1===b.nodeType||g)return a(b,c,e)}:function(b,c,i){var j,k,l,m=[w,h];if(i){while(b=b[d])if((1===b.nodeType||g)&&a(b,c,i))return!0}else while(b=b[d])if(1===b.nodeType||g)if(l=b[u]||(b[u]={}),k=l[b.uniqueID]||(l[b.uniqueID]={}),e&&e===b.nodeName.toLowerCase())b=b[d]||b;else{if((j=k[f])&&j[0]===w&&j[1]===h)return m[2]=j[2];if(k[f]=m,m[2]=a(b,c,i))return!0}}}function ua(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d<e;d++)ga(a,b[d],c);return c}function wa(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;h<i;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function xa(a,b,c,d,e,f){return d&&!d[u]&&(d=xa(d)),e&&!e[u]&&(e=xa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||va(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:wa(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=wa(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i<f;i++)if(c=d.relative[a[i].type])m=[ta(ua(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;e<f;e++)if(d.relative[a[e].type])break;return xa(i>1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i<e&&ya(a.slice(i,e)),e<f&&ya(a=a.slice(e)),e<f&&sa(a))}m.push(c)}return ua(m)}function za(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(_,aa),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=V.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(_,aa),$.test(j[0].type)&&qa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&sa(j),!a)return G.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||$.test(a)&&qa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext,B=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,C=/^.[^:#\[\.,]*$/;function D(a,b,c){if(r.isFunction(b))return r.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return r.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(C.test(b))return r.filter(b,a,c);b=r.filter(b,a)}return r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType})}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b<d;b++)if(r.contains(e[b],this))return!0}));for(c=this.pushStack([]),b=0;b<d;b++)r.find(a,e[b],c);return d>1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(D(this,a||[],!1))},not:function(a){return this.pushStack(D(this,a||[],!0))},is:function(a){return!!D(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var E,F=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,G=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||E,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:F.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),B.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};G.prototype=r.fn,E=r(d);var H=/^(?:parents|prev(?:Until|All))/,I={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a<c;a++)if(r.contains(this,b[a]))return!0})},closest:function(a,b){var c,d=0,e=this.length,f=[],g="string"!=typeof a&&r(a);if(!A.test(a))for(;d<e;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function J(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return J(a,"nextSibling")},prev:function(a){return J(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return a.contentDocument||r.merge([],a.childNodes)}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(I[a]||r.uniqueSort(e),H.test(a)&&e.reverse()),this.pushStack(e)}});var K=/\S+/g;function L(a){var b={};return r.each(a.match(K)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?L(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){r.each(b,function(b,c){r.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==r.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return r.each(arguments,function(a,b){var c;while((c=r.inArray(b,f,c))>-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function M(a){return a}function N(a){throw a}function O(a,b,c){var d;try{a&&r.isFunction(d=a.promise)?d.call(a).done(b).fail(c):a&&r.isFunction(d=a.then)?d.call(a,b,c):b.call(void 0,a)}catch(a){c.call(void 0,a)}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b<f)){if(a=d.apply(h,i),a===c.promise())throw new TypeError("Thenable self-resolution");j=a&&("object"==typeof a||"function"==typeof a)&&a.then,r.isFunction(j)?e?j.call(a,g(f,c,M,e),g(f,c,N,e)):(f++,j.call(a,g(f,c,M,e),g(f,c,N,e),g(f,c,M,c.notifyWith))):(d!==M&&(h=void 0,i=[a]),(e||c.resolveWith)(h,i))}},k=e?j:function(){try{j()}catch(a){r.Deferred.exceptionHook&&r.Deferred.exceptionHook(a,k.stackTrace),b+1>=f&&(d!==N&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:M,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:M)),c[2][3].add(g(0,a,r.isFunction(d)?d:N))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(O(a,g.done(h(c)).resolve,g.reject),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)O(e[c],h(c),g.reject);return g.promise()}});var P=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&P.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var Q=r.Deferred();r.fn.ready=function(a){return Q.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,holdReady:function(a){a?r.readyWait++:r.ready(!0)},ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||Q.resolveWith(d,[r]))}}),r.ready.then=Q.then;function R(){d.removeEventListener("DOMContentLoaded",R),a.removeEventListener("load",R),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",R),a.addEventListener("load",R));var S=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)S(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,
+r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},T=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function U(){this.expando=r.expando+U.uid++}U.uid=1,U.prototype={cache:function(a){var b=a[this.expando];return b||(b={},T(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){r.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(K)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var V=new U,W=new U,X=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Y=/[A-Z]/g;function Z(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Y,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c||"false"!==c&&("null"===c?null:+c+""===c?+c:X.test(c)?JSON.parse(c):c)}catch(e){}W.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return W.hasData(a)||V.hasData(a)},data:function(a,b,c){return W.access(a,b,c)},removeData:function(a,b){W.remove(a,b)},_data:function(a,b,c){return V.access(a,b,c)},_removeData:function(a,b){V.remove(a,b)}}),r.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=W.get(f),1===f.nodeType&&!V.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),Z(f,d,e[d])));V.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){W.set(this,a)}):S(this,function(b){var c;if(f&&void 0===b){if(c=W.get(f,a),void 0!==c)return c;if(c=Z(f,a),void 0!==c)return c}else this.each(function(){W.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){W.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=V.get(a,b),c&&(!d||r.isArray(c)?d=V.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return V.get(a,c)||V.access(a,c,{empty:r.Callbacks("once memory").add(function(){V.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=V.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var $=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,_=new RegExp("^(?:([+-])=|)("+$+")([a-z%]*)$","i"),aa=["Top","Right","Bottom","Left"],ba=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},ca=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};function da(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&_.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var ea={};function fa(a){var b,c=a.ownerDocument,d=a.nodeName,e=ea[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e="block"),ea[d]=e,e)}function ga(a,b){for(var c,d,e=[],f=0,g=a.length;f<g;f++)d=a[f],d.style&&(c=d.style.display,b?("none"===c&&(e[f]=V.get(d,"display")||null,e[f]||(d.style.display="")),""===d.style.display&&ba(d)&&(e[f]=fa(d))):"none"!==c&&(e[f]="none",V.set(d,"display",c)));for(f=0;f<g;f++)null!=e[f]&&(a[f].style.display=e[f]);return a}r.fn.extend({show:function(){return ga(this,!0)},hide:function(){return ga(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){ba(this)?r(this).show():r(this).hide()})}});var ha=/^(?:checkbox|radio)$/i,ia=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,ja=/^$|\/(?:java|ecma)script/i,ka={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ka.optgroup=ka.option,ka.tbody=ka.tfoot=ka.colgroup=ka.caption=ka.thead,ka.th=ka.td;function la(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&r.nodeName(a,b)?r.merge([a],c):c}function ma(a,b){for(var c=0,d=a.length;c<d;c++)V.set(a[c],"globalEval",!b||V.get(b[c],"globalEval"))}var na=/<|&#?\w+;/;function oa(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],n=0,o=a.length;n<o;n++)if(f=a[n],f||0===f)if("object"===r.type(f))r.merge(m,f.nodeType?[f]:f);else if(na.test(f)){g=g||l.appendChild(b.createElement("div")),h=(ia.exec(f)||["",""])[1].toLowerCase(),i=ka[h]||ka._default,g.innerHTML=i[1]+r.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;r.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",n=0;while(f=m[n++])if(d&&r.inArray(f,d)>-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=la(l.appendChild(f),"script"),j&&ma(g),c){k=0;while(f=g[k++])ja.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var pa=d.documentElement,qa=/^key/,ra=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,sa=/^([^.]*)(?:\.(.+)|)/;function ta(){return!0}function ua(){return!1}function va(){try{return d.activeElement}catch(a){}}function wa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)wa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ua;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(pa,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(K)||[""],j=b.length;while(j--)h=sa.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=V.hasData(a)&&V.get(a);if(q&&(i=q.events)){b=(b||"").match(K)||[""],j=b.length;while(j--)if(h=sa.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&V.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(V.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c<arguments.length;c++)i[c]=arguments[c];if(b.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,b)!==!1){h=r.event.handlers.call(this,b,j),c=0;while((f=h[c++])&&!b.isPropagationStopped()){b.currentTarget=f.elem,d=0;while((g=f.handlers[d++])&&!b.isImmediatePropagationStopped())b.rnamespace&&!b.rnamespace.test(g.namespace)||(b.handleObj=g,b.data=g.data,e=((r.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(b.result=e)===!1&&(b.preventDefault(),b.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,b),b.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;c<h;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?r(e,this).index(i)>-1:r.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},addProp:function(a,b){Object.defineProperty(r.Event.prototype,a,{enumerable:!0,configurable:!0,get:r.isFunction(b)?function(){if(this.originalEvent)return b(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[a]},set:function(b){Object.defineProperty(this,a,{enumerable:!0,configurable:!0,writable:!0,value:b})}})},fix:function(a){return a[r.expando]?a:new r.Event(a)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==va()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===va()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&r.nodeName(this,"input"))return this.click(),!1},_default:function(a){return r.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},r.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},r.Event=function(a,b){return this instanceof r.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ta:ua,this.target=a.target&&3===a.target.nodeType?a.target.parentNode:a.target,this.currentTarget=a.currentTarget,this.relatedTarget=a.relatedTarget):this.type=a,b&&r.extend(this,b),this.timeStamp=a&&a.timeStamp||r.now(),void(this[r.expando]=!0)):new r.Event(a,b)},r.Event.prototype={constructor:r.Event,isDefaultPrevented:ua,isPropagationStopped:ua,isImmediatePropagationStopped:ua,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ta,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ta,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ta,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},r.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(a){var b=a.button;return null==a.which&&qa.test(a.type)?null!=a.charCode?a.charCode:a.keyCode:!a.which&&void 0!==b&&ra.test(a.type)?1&b?1:2&b?3:4&b?2:0:a.which}},r.event.addProp),r.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){r.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||r.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),r.fn.extend({on:function(a,b,c,d){return wa(this,a,b,c,d)},one:function(a,b,c,d){return wa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,r(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=ua),this.each(function(){r.event.remove(this,a,c,b)})}});var xa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,ya=/<script|<style|<link/i,za=/checked\s*(?:[^=]|=\s*.checked.)/i,Aa=/^true\/(.*)/,Ba=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Ca(a,b){return r.nodeName(a,"table")&&r.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a:a}function Da(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Ea(a){var b=Aa.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(V.hasData(a)&&(f=V.access(a),g=V.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c<d;c++)r.event.add(b,e,j[e][c])}W.hasData(a)&&(h=W.access(a),i=r.extend({},h),W.set(b,i))}}function Ga(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ha.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function Ha(a,b,c,d){b=g.apply([],b);var e,f,h,i,j,k,l=0,m=a.length,n=m-1,q=b[0],s=r.isFunction(q);if(s||m>1&&"string"==typeof q&&!o.checkClone&&za.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(m&&(e=oa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(la(e,"script"),Da),i=h.length;l<m;l++)j=e,l!==n&&(j=r.clone(j,!0,!0),i&&r.merge(h,la(j,"script"))),c.call(a[l],j,l);if(i)for(k=h[h.length-1].ownerDocument,r.map(h,Ea),l=0;l<i;l++)j=h[l],ja.test(j.type||"")&&!V.access(j,"globalEval")&&r.contains(k,j)&&(j.src?r._evalUrl&&r._evalUrl(j.src):p(j.textContent.replace(Ba,""),k))}return a}function Ia(a,b,c){for(var d,e=b?r.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||r.cleanData(la(d)),d.parentNode&&(c&&r.contains(d.ownerDocument,d)&&ma(la(d,"script")),d.parentNode.removeChild(d));return a}r.extend({htmlPrefilter:function(a){return a.replace(xa,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=la(h),f=la(a),d=0,e=f.length;d<e;d++)Ga(f[d],g[d]);if(b)if(c)for(f=f||la(a),g=g||la(h),d=0,e=f.length;d<e;d++)Fa(f[d],g[d]);else Fa(a,h);return g=la(h,"script"),g.length>0&&ma(g,!i&&la(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(T(c)){if(b=c[V.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[V.expando]=void 0}c[W.expando]&&(c[W.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return S(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(la(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return S(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!ya.test(a)&&!ka[(ia.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c<d;c++)b=this[c]||{},1===b.nodeType&&(r.cleanData(la(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;r.inArray(this,a)<0&&(r.cleanData(la(this)),c&&c.replaceChild(b,this))},a)}}),r.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){r.fn[a]=function(a){for(var c,d=[],e=r(a),f=e.length-1,g=0;g<=f;g++)c=g===f?this:this.clone(!0),r(e[g])[b](c),h.apply(d,c.get());return this.pushStack(d)}});var Ja=/^margin/,Ka=new RegExp("^("+$+")(?!px)[a-z%]+$","i"),La=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)};!function(){function b(){if(i){i.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",i.innerHTML="",pa.appendChild(h);var b=a.getComputedStyle(i);c="1%"!==b.top,g="2px"===b.marginLeft,e="4px"===b.width,i.style.marginRight="50%",f="4px"===b.marginRight,pa.removeChild(h),i=null}}var c,e,f,g,h=d.createElement("div"),i=d.createElement("div");i.style&&(i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",o.clearCloneStyle="content-box"===i.style.backgroundClip,h.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",h.appendChild(i),r.extend(o,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return b(),e},pixelMarginRight:function(){return b(),f},reliableMarginLeft:function(){return b(),g}}))}();function Ma(a,b,c){var d,e,f,g,h=a.style;return c=c||La(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||r.contains(a.ownerDocument,a)||(g=r.style(a,b)),!o.pixelMarginRight()&&Ka.test(g)&&Ja.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function Na(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Oa=/^(none|table(?!-c[ea]).+)/,Pa={position:"absolute",visibility:"hidden",display:"block"},Qa={letterSpacing:"0",fontWeight:"400"},Ra=["Webkit","Moz","ms"],Sa=d.createElement("div").style;function Ta(a){if(a in Sa)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ra.length;while(c--)if(a=Ra[c]+b,a in Sa)return a}function Ua(a,b,c){var d=_.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Va(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;f<4;f+=2)"margin"===c&&(g+=r.css(a,c+aa[f],!0,e)),d?("content"===c&&(g-=r.css(a,"padding"+aa[f],!0,e)),"margin"!==c&&(g-=r.css(a,"border"+aa[f]+"Width",!0,e))):(g+=r.css(a,"padding"+aa[f],!0,e),"padding"!==c&&(g+=r.css(a,"border"+aa[f]+"Width",!0,e)));return g}function Wa(a,b,c){var d,e=!0,f=La(a),g="border-box"===r.css(a,"boxSizing",!1,f);if(a.getClientRects().length&&(d=a.getBoundingClientRect()[b]),d<=0||null==d){if(d=Ma(a,b,f),(d<0||null==d)&&(d=a.style[b]),Ka.test(d))return d;e=g&&(o.boxSizingReliable()||d===a.style[b]),d=parseFloat(d)||0}return d+Va(a,b,c||(g?"border":"content"),e,f)+"px"}r.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Ma(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=r.camelCase(b),i=a.style;return b=r.cssProps[h]||(r.cssProps[h]=Ta(h)||h),g=r.cssHooks[b]||r.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=_.exec(c))&&e[1]&&(c=da(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(r.cssNumber[h]?"":"px")),o.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=r.camelCase(b);return b=r.cssProps[h]||(r.cssProps[h]=Ta(h)||h),g=r.cssHooks[b]||r.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Ma(a,b,d)),"normal"===e&&b in Qa&&(e=Qa[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),r.each(["height","width"],function(a,b){r.cssHooks[b]={get:function(a,c,d){if(c)return!Oa.test(r.css(a,"display"))||a.getClientRects().length&&a.getBoundingClientRect().width?Wa(a,b,d):ca(a,Pa,function(){return Wa(a,b,d)})},set:function(a,c,d){var e,f=d&&La(a),g=d&&Va(a,b,d,"border-box"===r.css(a,"boxSizing",!1,f),f);return g&&(e=_.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=r.css(a,b)),Ua(a,c,g)}}}),r.cssHooks.marginLeft=Na(o.reliableMarginLeft,function(a,b){if(b)return(parseFloat(Ma(a,"marginLeft"))||a.getBoundingClientRect().left-ca(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px"}),r.each({margin:"",padding:"",border:"Width"},function(a,b){r.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];d<4;d++)e[a+aa[d]+b]=f[d]||f[d-2]||f[0];return e}},Ja.test(a)||(r.cssHooks[a+b].set=Ua)}),r.fn.extend({css:function(a,b){return S(this,function(a,b,c){var d,e,f={},g=0;if(r.isArray(b)){for(d=La(a),e=b.length;g<e;g++)f[b[g]]=r.css(a,b[g],!1,d);return f}return void 0!==c?r.style(a,b,c):r.css(a,b)},a,b,arguments.length>1)}});function Xa(a,b,c,d,e){return new Xa.prototype.init(a,b,c,d,e)}r.Tween=Xa,Xa.prototype={constructor:Xa,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=Xa.propHooks[this.prop];return a&&a.get?a.get(this):Xa.propHooks._default.get(this)},run:function(a){var b,c=Xa.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Xa.propHooks._default.set(this),this}},Xa.prototype.init.prototype=Xa.prototype,Xa.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},Xa.propHooks.scrollTop=Xa.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=Xa.prototype.init,r.fx.step={};var Ya,Za,$a=/^(?:toggle|show|hide)$/,_a=/queueHooks$/;function ab(){Za&&(a.requestAnimationFrame(ab),r.fx.tick())}function bb(){return a.setTimeout(function(){Ya=void 0}),Ya=r.now()}function cb(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=aa[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function db(a,b,c){for(var d,e=(gb.tweeners[b]||[]).concat(gb.tweeners["*"]),f=0,g=e.length;f<g;f++)if(d=e[f].call(c,b,a))return d}function eb(a,b,c){var d,e,f,g,h,i,j,k,l="width"in b||"height"in b,m=this,n={},o=a.style,p=a.nodeType&&ba(a),q=V.get(a,"fxshow");c.queue||(g=r._queueHooks(a,"fx"),null==g.unqueued&&(g.unqueued=0,h=g.empty.fire,g.empty.fire=function(){g.unqueued||h()}),g.unqueued++,m.always(function(){m.always(function(){g.unqueued--,r.queue(a,"fx").length||g.empty.fire()})}));for(d in b)if(e=b[d],$a.test(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}n[d]=q&&q[d]||r.style(a,d)}if(i=!r.isEmptyObject(b),i||!r.isEmptyObject(n)){l&&1===a.nodeType&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=q&&q.display,null==j&&(j=V.get(a,"display")),k=r.css(a,"display"),"none"===k&&(j?k=j:(ga([a],!0),j=a.style.display||j,k=r.css(a,"display"),ga([a]))),("inline"===k||"inline-block"===k&&null!=j)&&"none"===r.css(a,"float")&&(i||(m.done(function(){o.display=j}),null==j&&(k=o.display,j="none"===k?"":k)),o.display="inline-block")),c.overflow&&(o.overflow="hidden",m.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]})),i=!1;for(d in n)i||(q?"hidden"in q&&(p=q.hidden):q=V.access(a,"fxshow",{display:j}),f&&(q.hidden=!p),p&&ga([a],!0),m.done(function(){p||ga([a]),V.remove(a,"fxshow");for(d in n)r.style(a,d,n[d])})),i=db(p?q[d]:0,d,m),d in q||(q[d]=i.start,p&&(i.end=i.start,i.start=0))}}function fb(a,b){var c,d,e,f,g;for(c in a)if(d=r.camelCase(c),e=b[d],f=a[c],r.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=r.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function gb(a,b,c){var d,e,f=0,g=gb.prefilters.length,h=r.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Ya||bb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;g<i;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),f<1&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:r.extend({},b),opts:r.extend(!0,{specialEasing:{},easing:r.easing._default},c),originalProperties:b,originalOptions:c,startTime:Ya||bb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=r.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;c<d;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(fb(k,j.opts.specialEasing);f<g;f++)if(d=gb.prefilters[f].call(j,a,k,j.opts))return r.isFunction(d.stop)&&(r._queueHooks(j.elem,j.opts.queue).stop=r.proxy(d.stop,d)),d;return r.map(k,db,j),r.isFunction(j.opts.start)&&j.opts.start.call(a,j),r.fx.timer(r.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}r.Animation=r.extend(gb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return da(c.elem,a,_.exec(b),c),c}]},tweener:function(a,b){r.isFunction(a)?(b=a,a=["*"]):a=a.match(K);for(var c,d=0,e=a.length;d<e;d++)c=a[d],gb.tweeners[c]=gb.tweeners[c]||[],gb.tweeners[c].unshift(b)},prefilters:[eb],prefilter:function(a,b){b?gb.prefilters.unshift(a):gb.prefilters.push(a)}}),r.speed=function(a,b,c){var e=a&&"object"==typeof a?r.extend({},a):{complete:c||!c&&b||r.isFunction(a)&&a,duration:a,easing:c&&b||b&&!r.isFunction(b)&&b};return r.fx.off||d.hidden?e.duration=0:e.duration="number"==typeof e.duration?e.duration:e.duration in r.fx.speeds?r.fx.speeds[e.duration]:r.fx.speeds._default,null!=e.queue&&e.queue!==!0||(e.queue="fx"),e.old=e.complete,e.complete=function(){r.isFunction(e.old)&&e.old.call(this),e.queue&&r.dequeue(this,e.queue)},e},r.fn.extend({fadeTo:function(a,b,c,d){return this.filter(ba).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=r.isEmptyObject(a),f=r.speed(b,c,d),g=function(){var b=gb(this,r.extend({},a),f);(e||V.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=r.timers,g=V.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&_a.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||r.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=V.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=r.timers,g=d?d.length:0;for(c.finish=!0,r.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;b<g;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),r.each(["toggle","show","hide"],function(a,b){var c=r.fn[b];r.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(cb(b,!0),a,d,e)}}),r.each({slideDown:cb("show"),slideUp:cb("hide"),slideToggle:cb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){r.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),r.timers=[],r.fx.tick=function(){var a,b=0,c=r.timers;for(Ya=r.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||r.fx.stop(),Ya=void 0},r.fx.timer=function(a){r.timers.push(a),a()?r.fx.start():r.timers.pop()},r.fx.interval=13,r.fx.start=function(){Za||(Za=a.requestAnimationFrame?a.requestAnimationFrame(ab):a.setInterval(r.fx.tick,r.fx.interval))},r.fx.stop=function(){a.cancelAnimationFrame?a.cancelAnimationFrame(Za):a.clearInterval(Za),Za=null},r.fx.speeds={slow:600,fast:200,_default:400},r.fn.delay=function(b,c){return b=r.fx?r.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",o.checkOn=""!==a.value,o.optSelected=c.selected,a=d.createElement("input"),a.value="t",a.type="radio",o.radioValue="t"===a.value}();var hb,ib=r.expr.attrHandle;r.fn.extend({attr:function(a,b){return S(this,r.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?hb:void 0)),void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&r.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(K);
+if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),hb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=ib[b]||r.find.attr;ib[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=ib[g],ib[g]=e,e=null!=c(a,b,d)?g:null,ib[g]=f),e}});var jb=/^(?:input|select|textarea|button)$/i,kb=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return S(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):jb.test(a.nodeName)||kb.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});var lb=/[\t\r\n\f]/g;function mb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,mb(this)))});if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=mb(c),d=1===c.nodeType&&(" "+e+" ").replace(lb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=r.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,mb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(K)||[];while(c=this[i++])if(e=mb(c),d=1===c.nodeType&&(" "+e+" ").replace(lb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=r.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,mb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(K)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=mb(this),b&&V.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":V.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+mb(c)+" ").replace(lb," ").indexOf(b)>-1)return!0;return!1}});var nb=/\r/g,ob=/[\x20\t\r\n\f]+/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":r.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(nb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:r.trim(r.text(a)).replace(ob," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type,g=f?null:[],h=f?e+1:d.length,i=e<0?h:f?e:0;i<h;i++)if(c=d[i],(c.selected||i===e)&&!c.disabled&&(!c.parentNode.disabled||!r.nodeName(c.parentNode,"optgroup"))){if(b=r(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(r.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var pb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!pb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,pb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(V.get(h,"events")||{})[b.type]&&V.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&T(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!T(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=V.access(d,b);e||d.addEventListener(a,c,!0),V.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=V.access(d,b)-1;e?V.access(d,b,e):(d.removeEventListener(a,c,!0),V.remove(d,b))}}});var qb=a.location,rb=r.now(),sb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var tb=/\[\]$/,ub=/\r?\n/g,vb=/^(?:submit|button|image|reset|file)$/i,wb=/^(?:input|select|textarea|keygen)/i;function xb(a,b,c,d){var e;if(r.isArray(b))r.each(b,function(b,e){c||tb.test(a)?d(a,e):xb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)xb(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(r.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)xb(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&wb.test(this.nodeName)&&!vb.test(a)&&(this.checked||!ha.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:r.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(ub,"\r\n")}}):{name:b.name,value:c.replace(ub,"\r\n")}}).get()}});var yb=/%20/g,zb=/#.*$/,Ab=/([?&])_=[^&]*/,Bb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Cb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Db=/^(?:GET|HEAD)$/,Eb=/^\/\//,Fb={},Gb={},Hb="*/".concat("*"),Ib=d.createElement("a");Ib.href=qb.href;function Jb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(K)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Kb(a,b,c,d){var e={},f=a===Gb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Lb(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Mb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Nb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:qb.href,type:"GET",isLocal:Cb.test(qb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Hb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Lb(Lb(a,r.ajaxSettings),b):Lb(r.ajaxSettings,a)},ajaxPrefilter:Jb(Fb),ajaxTransport:Jb(Gb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Bb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||qb.href)+"").replace(Eb,qb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(K)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Ib.protocol+"//"+Ib.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Kb(Fb,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Db.test(o.type),f=o.url.replace(zb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(yb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(sb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Ab,""),n=(sb.test(f)?"&":"?")+"_="+rb++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Hb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Kb(Gb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Mb(o,y,d)),v=Nb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Ob={0:200,1223:204},Pb=r.ajaxSettings.xhr();o.cors=!!Pb&&"withCredentials"in Pb,o.ajax=Pb=!!Pb,r.ajaxTransport(function(b){var c,d;if(o.cors||Pb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Ob[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Qb=[],Rb=/(=)\?(?=&|$)|\?\?/;r.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Qb.pop()||r.expando+"_"+rb++;return this[a]=!0,a}}),r.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Rb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Rb.test(b.data)&&"data");if(h||"jsonp"===b.dataTypes[0])return e=b.jsonpCallback=r.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Rb,"$1"+e):b.jsonp!==!1&&(b.url+=(sb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||r.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?r(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Qb.push(e)),g&&r.isFunction(f)&&f(g[0]),g=f=void 0}),"script"}),o.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),r.parseHTML=function(a,b,c){if("string"!=typeof a)return[];"boolean"==typeof b&&(c=b,b=!1);var e,f,g;return b||(o.createHTMLDocument?(b=d.implementation.createHTMLDocument(""),e=b.createElement("base"),e.href=d.location.href,b.head.appendChild(e)):b=d),f=B.exec(a),g=!c&&[],f?[b.createElement(f[1])]:(f=oa([a],b,g),g&&g.length&&r(g).remove(),r.merge([],f.childNodes))},r.fn.load=function(a,b,c){var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=r.trim(a.slice(h)),a=a.slice(0,h)),r.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&r.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?r("<div>").append(r.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},r.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){r.fn[b]=function(a){return this.on(b,a)}}),r.expr.pseudos.animated=function(a){return r.grep(r.timers,function(b){return a===b.elem}).length};function Sb(a){return r.isWindow(a)?a:9===a.nodeType&&a.defaultView}r.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=r.css(a,"position"),l=r(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=r.css(a,"top"),i=r.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),r.isFunction(b)&&(b=b.call(a,c,r.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},r.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){r.offset.setOffset(this,a,b)});var b,c,d,e,f=this[0];if(f)return f.getClientRects().length?(d=f.getBoundingClientRect(),d.width||d.height?(e=f.ownerDocument,c=Sb(e),b=e.documentElement,{top:d.top+c.pageYOffset-b.clientTop,left:d.left+c.pageXOffset-b.clientLeft}):d):{top:0,left:0}},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===r.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),r.nodeName(a[0],"html")||(d=a.offset()),d={top:d.top+r.css(a[0],"borderTopWidth",!0),left:d.left+r.css(a[0],"borderLeftWidth",!0)}),{top:b.top-d.top-r.css(c,"marginTop",!0),left:b.left-d.left-r.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===r.css(a,"position"))a=a.offsetParent;return a||pa})}}),r.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;r.fn[a]=function(d){return S(this,function(a,d,e){var f=Sb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),r.each(["top","left"],function(a,b){r.cssHooks[b]=Na(o.pixelPosition,function(a,c){if(c)return c=Ma(a,b),Ka.test(c)?r(a).position()[b]+"px":c})}),r.each({Height:"height",Width:"width"},function(a,b){r.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){r.fn[d]=function(e,f){var g=arguments.length&&(c||"boolean"!=typeof e),h=c||(e===!0||f===!0?"margin":"border");return S(this,function(b,c,e){var f;return r.isWindow(b)?0===d.indexOf("outer")?b["inner"+a]:b.document.documentElement["client"+a]:9===b.nodeType?(f=b.documentElement,Math.max(b.body["scroll"+a],f["scroll"+a],b.body["offset"+a],f["offset"+a],f["client"+a])):void 0===e?r.css(b,c,h):r.style(b,c,e,h)},b,g?e:void 0,g)}})}),r.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),r.parseJSON=JSON.parse,"function"==typeof define&&define.amd&&define("jquery",[],function(){return r});var Tb=a.jQuery,Ub=a.$;return r.noConflict=function(b){return a.$===r&&(a.$=Ub),b&&a.jQuery===r&&(a.jQuery=Tb),r},b||(a.jQuery=a.$=r),r});
 
diff --git a/view/js/jquery.migrate-3.0.0.js b/view/js/jquery.migrate-3.0.0.js
new file mode 100644
index 000000000..99e0dd20a
--- /dev/null
+++ b/view/js/jquery.migrate-3.0.0.js
@@ -0,0 +1,2 @@
+/*! jQuery Migrate v3.0.0 | (c) jQuery Foundation and other contributors | jquery.org/license */
+"undefined"==typeof jQuery.migrateMute&&(jQuery.migrateMute=!0),function(a,b){"use strict";function c(c){var d=b.console;e[c]||(e[c]=!0,a.migrateWarnings.push(c),d&&d.warn&&!a.migrateMute&&(d.warn("JQMIGRATE: "+c),a.migrateTrace&&d.trace&&d.trace()))}function d(a,b,d,e){Object.defineProperty(a,b,{configurable:!0,enumerable:!0,get:function(){return c(e),d}})}a.migrateVersion="3.0.0",function(){var c=b.console&&b.console.log&&function(){b.console.log.apply(b.console,arguments)},d=/^[12]\./;c&&(a&&!d.test(a.fn.jquery)||c("JQMIGRATE: jQuery 3.0.0+ REQUIRED"),a.migrateWarnings&&c("JQMIGRATE: Migrate plugin loaded multiple times"),c("JQMIGRATE: Migrate is installed"+(a.migrateMute?"":" with logging active")+", version "+a.migrateVersion))}();var e={};a.migrateWarnings=[],void 0===a.migrateTrace&&(a.migrateTrace=!0),a.migrateReset=function(){e={},a.migrateWarnings.length=0},"BackCompat"===document.compatMode&&c("jQuery is not compatible with Quirks Mode");var f=a.fn.init,g=a.isNumeric,h=a.find,i=/\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/,j=/\[(\s*[-\w]+\s*)([~|^$*]?=)\s*([-\w#]*?#[-\w#]*)\s*\]/g;a.fn.init=function(a){var b=Array.prototype.slice.call(arguments);return"string"==typeof a&&"#"===a&&(c("jQuery( '#' ) is not a valid selector"),b[0]=[]),f.apply(this,b)},a.fn.init.prototype=a.fn,a.find=function(a){var b=Array.prototype.slice.call(arguments);if("string"==typeof a&&i.test(a))try{document.querySelector(a)}catch(d){a=a.replace(j,function(a,b,c,d){return"["+b+c+'"'+d+'"]'});try{document.querySelector(a),c("Attribute selector with '#' must be quoted: "+b[0]),b[0]=a}catch(e){c("Attribute selector with '#' was not fixed: "+b[0])}}return h.apply(this,b)};var k;for(k in h)Object.prototype.hasOwnProperty.call(h,k)&&(a.find[k]=h[k]);a.fn.size=function(){return c("jQuery.fn.size() is deprecated; use the .length property"),this.length},a.parseJSON=function(){return c("jQuery.parseJSON is deprecated; use JSON.parse"),JSON.parse.apply(null,arguments)},a.isNumeric=function(b){function d(b){var c=b&&b.toString();return!a.isArray(b)&&c-parseFloat(c)+1>=0}var e=g(b),f=d(b);return e!==f&&c("jQuery.isNumeric() should not be called on constructed objects"),f},d(a,"unique",a.uniqueSort,"jQuery.unique is deprecated, use jQuery.uniqueSort"),d(a.expr,"filters",a.expr.pseudos,"jQuery.expr.filters is now jQuery.expr.pseudos"),d(a.expr,":",a.expr.pseudos,'jQuery.expr[":"] is now jQuery.expr.pseudos');var l=a.ajax;a.ajax=function(){var a=l.apply(this,arguments);return a.promise&&(d(a,"success",a.done,"jQXHR.success is deprecated and removed"),d(a,"error",a.fail,"jQXHR.error is deprecated and removed"),d(a,"complete",a.always,"jQXHR.complete is deprecated and removed")),a};var m=a.fn.removeAttr,n=a.fn.toggleClass,o=/\S+/g;a.fn.removeAttr=function(b){var d=this;return a.each(b.match(o),function(b,e){a.expr.match.bool.test(e)&&(c("jQuery.fn.removeAttr no longer sets boolean properties: "+e),d.prop(e,!1))}),m.apply(this,arguments)},a.fn.toggleClass=function(b){return void 0!==b&&"boolean"!=typeof b?n.apply(this,arguments):(c("jQuery.fn.toggleClass( boolean ) is deprecated"),this.each(function(){var c=this.getAttribute&&this.getAttribute("class")||"";c&&a.data(this,"__className__",c),this.setAttribute&&this.setAttribute("class",c||b===!1?"":a.data(this,"__className__")||"")}))};var p=!1;a.swap&&a.each(["height","width","reliableMarginRight"],function(b,c){var d=a.cssHooks[c]&&a.cssHooks[c].get;d&&(a.cssHooks[c].get=function(){var a;return p=!0,a=d.apply(this,arguments),p=!1,a})}),a.swap=function(a,b,d,e){var f,g,h={};p||c("jQuery.swap() is undocumented and deprecated");for(g in b)h[g]=a.style[g],a.style[g]=b[g];f=d.apply(a,e||[]);for(g in b)a.style[g]=h[g];return f};var q=a.data;a.data=function(b,d,e){var f;return d&&d!==a.camelCase(d)&&(f=a.hasData(b)&&q.call(this,b),f&&d in f)?(c("jQuery.data() always sets/gets camelCased names: "+d),arguments.length>2&&(f[d]=e),f[d]):q.apply(this,arguments)};var r=a.Tween.prototype.run;a.Tween.prototype.run=function(b){a.easing[this.easing].length>1&&(c('easing function "jQuery.easing.'+this.easing.toString()+'" should use only first argument'),a.easing[this.easing]=a.easing[this.easing].bind(a.easing,b,this.options.duration*b,0,1,this.options.duration)),r.apply(this,arguments)};var s=a.fn.load,t=a.event.fix;a.event.props=[],a.event.fixHooks={},a.event.fix=function(b){var d,e=b.type,f=this.fixHooks[e],g=a.event.props;if(g.length)for(c("jQuery.event.props are deprecated and removed: "+g.join());g.length;)a.event.addProp(g.pop());if(f&&!f._migrated_&&(f._migrated_=!0,c("jQuery.event.fixHooks are deprecated and removed: "+e),(g=f.props)&&g.length))for(;g.length;)a.event.addProp(g.pop());return d=t.call(this,b),f&&f.filter?f.filter(d,b):d},a.each(["load","unload","error"],function(b,d){a.fn[d]=function(){var a=Array.prototype.slice.call(arguments,0);return"load"===d&&"string"==typeof a[0]?s.apply(this,a):(c("jQuery.fn."+d+"() is deprecated"),a.splice(0,0,d),arguments.length?this.on.apply(this,a):(this.triggerHandler.apply(this,a),this))}}),a(function(){a(document).triggerHandler("ready")}),a.event.special.ready={setup:function(){this===document&&c("'ready' event is deprecated")}},a.fn.extend({bind:function(a,b,d){return c("jQuery.fn.bind() is deprecated"),this.on(a,null,b,d)},unbind:function(a,b){return c("jQuery.fn.unbind() is deprecated"),this.off(a,null,b)},delegate:function(a,b,d,e){return c("jQuery.fn.delegate() is deprecated"),this.on(b,a,d,e)},undelegate:function(a,b,d){return c("jQuery.fn.undelegate() is deprecated"),1===arguments.length?this.off(a,"**"):this.off(b,a||"**",d)}});var u=a.fn.offset;a.fn.offset=function(){var b,d=this[0],e={top:0,left:0};return d&&d.nodeType?(b=(d.ownerDocument||document).documentElement,a.contains(b,d)?u.apply(this,arguments):(c("jQuery.fn.offset() requires an element connected to a document"),e)):(c("jQuery.fn.offset() requires a valid DOM element"),e)};var v=a.param;a.param=function(b,d){var e=a.ajaxSettings&&a.ajaxSettings.traditional;return void 0===d&&e&&(c("jQuery.param() no longer uses jQuery.ajaxSettings.traditional"),d=e),v.call(this,b,d)};var w=a.fn.andSelf||a.fn.addBack;a.fn.andSelf=function(){return c("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()"),w.apply(this,arguments)};var x=a.Deferred,y=[["resolve","done",a.Callbacks("once memory"),a.Callbacks("once memory"),"resolved"],["reject","fail",a.Callbacks("once memory"),a.Callbacks("once memory"),"rejected"],["notify","progress",a.Callbacks("memory"),a.Callbacks("memory")]];a.Deferred=function(b){var d=x(),e=d.promise();return d.pipe=e.pipe=function(){var b=arguments;return c("deferred.pipe() is deprecated"),a.Deferred(function(c){a.each(y,function(f,g){var h=a.isFunction(b[f])&&b[f];d[g[1]](function(){var b=h&&h.apply(this,arguments);b&&a.isFunction(b.promise)?b.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[g[0]+"With"](this===e?c.promise():this,h?[b]:arguments)})}),b=null}).promise()},b&&b.call(d,d),d}}(jQuery,window);
diff --git a/view/js/main.js b/view/js/main.js
index f279417d9..a288f98f5 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -283,12 +283,13 @@ $(function() {
 	/* Turn elements with one of our special rel tags into popup menus */
 	/* CHANGES: let bootstrap handle popups and only do the loading here */
 
-	$('a[rel^=#]').click(function(e){
+
+	$('a[rel^="#"]').click(function(e){
 		manage_popup_menu(this, e);
 		return;
 	});
 
-	$('span[rel^=#]').click(function(e){
+	$('span[rel^="#"]').click(function(e){
 		manage_popup_menu(this, e);
 		return;
 	});
@@ -639,7 +640,7 @@ function updateConvItems(mode,data) {
 	var bimgcount = bimgs.length;
 
 	if (bimgcount) {
-		bimgs.load(function() {
+		bimgs.on('load',function() {
 			bimgcount--;
 			if (! bimgcount) {
 				collapseHeight();
@@ -652,7 +653,7 @@ function updateConvItems(mode,data) {
 }
 
 function collapseHeight() {
-	var origContentHeight = parseInt($("#region_2").height());
+	var origContentHeight = Math.ceil($("#region_2").height());
 	var cDiff = 0;
 	var i = 0;
 	var position = $(window).scrollTop();
@@ -662,25 +663,19 @@ function collapseHeight() {
 		if(orgHeight > divmore_height) {
 			if(! $(this).hasClass('divmore')) {
 
-				//var trigger = $(window).scrollTop() < $(this).offset().top ? true : false;
-				//console.log($(this).offset().top + divmore_height - $(window).scrollTop() + cDiff - ($(".divgrow-showmore").outerHeight() * i));
-
 				// check if we will collapse some content above the visible content and compensate the diff later
 				if($(this).offset().top + divmore_height - $(window).scrollTop() + cDiff - ($(".divgrow-showmore").outerHeight() * i) < 65) {
-					//$(this).css('color', 'red');
-					//console.log($(this).offset().top + divmore_height + ' / ' + $(window).scrollTop());
 					diff = orgHeight - divmore_height;
 					cDiff = cDiff + diff;
 					i++;
 				}
 
-				//if(trigger) {
 				$(this).readmore({
 					speed: 0,
 					heightMargin: 50,
 					collapsedHeight: divmore_height,
-					moreLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowmore + '</a>',
-					lessLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowless + '</a>',
+					moreLink: '<a href="#" class="divgrow-showmore fakelink">' + aStr.divgrowmore + '</a>',
+					lessLink: '<a href="#" class="divgrow-showmore fakelink">' + aStr.divgrowless + '</a>',
 					beforeToggle: function(trigger, element, expanded) {
 						if(expanded) {
 							if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) {
@@ -690,12 +685,11 @@ function collapseHeight() {
 					}
 				});
 				$(this).addClass('divmore');
-				//}
 			}
 		}
 	});
 
-	var collapsedContentHeight = parseInt($("#region_2").height());
+	var collapsedContentHeight = Math.ceil($("#region_2").height());
 	contentHeightDiff = origContentHeight - collapsedContentHeight;
 	console.log('collapseHeight() - contentHeightDiff: ' + contentHeightDiff + 'px');
 
@@ -941,6 +935,11 @@ function dropItem(url, object) {
 				$('body').css('cursor', 'auto');
 			});
 		});
+		return true;
+
+	}
+	else {
+		return false;
 	}
 }
 
diff --git a/view/js/mod_cal.js b/view/js/mod_cal.js
new file mode 100644
index 000000000..5867f676e
--- /dev/null
+++ b/view/js/mod_cal.js
@@ -0,0 +1,22 @@
+/**
+ * JavaScript for mod/cal
+ */
+
+$(document).ready( function() {
+	$(document).on('click','#fullscreen-btn', on_fullscreen);
+	$(document).on('click','#inline-btn', on_inline);
+});
+
+function on_fullscreen() {
+	var view = $('#events-calendar').fullCalendar('getView');
+	if(view.type === 'month') {
+		$('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (top and bottom) of .generic-content-wrapper
+	}
+}
+
+function on_inline() {
+	var view = $('#events-calendar').fullCalendar('getView');
+	if(view.type === 'month') {
+		$('#events-calendar').fullCalendar('option', 'height', '');
+	}
+}
diff --git a/view/js/mod_events.js b/view/js/mod_events.js
index 74b811dd6..a507a84d7 100644
--- a/view/js/mod_events.js
+++ b/view/js/mod_events.js
@@ -5,11 +5,24 @@
 $(document).ready( function() {
 	enableDisableFinishDate();
 	$('#comment-edit-text-desc, #comment-edit-text-loc').bbco_autocomplete('bbcode');
+
+	$(document).on('click','#fullscreen-btn', on_fullscreen);
+	$(document).on('click','#inline-btn', on_inline);
 });
 
+
 function enableDisableFinishDate() {
 	if( $('#id_nofinish').is(':checked'))
 		$('#id_finish_text').prop("disabled", true);
 	else
 		$('#id_finish_text').prop("disabled", false);
 }
+
+function on_fullscreen() {
+	$('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
+}
+
+function on_inline() {
+	var view = $('#events-calendar').fullCalendar('getView');
+	((view.type === 'month') ? $('#events-calendar').fullCalendar('option', 'height', '') : $('#events-calendar').fullCalendar('option', 'height', 'auto'));
+}
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
index 3e55c8aeb..46574a63d 100644
--- a/view/js/mod_mail.js
+++ b/view/js/mod_mail.js
@@ -1,5 +1,5 @@
 $(document).ready(function() { 
-	$("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) {
+	$("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) {
 		$("#recip-complete").val(data.xid);
 	});
 	$(".autotime").timeago()
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index 006be5f23..e3df3ca68 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -3,7 +3,7 @@
  */
 $(document).ready(function() {
 
-	$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'p', false, function(data) {
+	$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) {
 		$("#photo-edit-newtag").val('@' + data.name);
 	});
 
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 640c154dd..0f45e0d16 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -5,6 +5,9 @@
 $(document).ready(function() {
 	$('form').areYouSure({'addRemoveFieldsMarksDirty':true, 'message': aStr['leavethispage'] }); // Warn user about unsaved settings
 
+	$('.token-mirror').html($('#id_token').val());
+	$('#id_token').keyup( function() { $('.token-mirror').html($('#id_token').val()); });
+
 	$("#id_permissions_role").change(function() {
 		var role = $("#id_permissions_role").val();
 		if(role == 'custom')
diff --git a/view/nb-no/hmessages.po b/view/nb-no/hmessages.po
index bcb926d90..7165d2647 100644
--- a/view/nb-no/hmessages.po
+++ b/view/nb-no/hmessages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Redmatrix\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-10 00:02-0700\n"
-"PO-Revision-Date: 2016-06-10 09:14+0000\n"
+"POT-Creation-Date: 2016-07-22 00:02-0700\n"
+"PO-Revision-Date: 2016-07-25 08:54+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/Friendica/red-matrix/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -18,11 +18,156 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../../Zotlabs/Access/PermissionRoles.php:182
+#: ../../include/permissions.php:904
+msgid "Social Networking"
+msgstr "Sosialt nettverk"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:183
+#: ../../include/permissions.php:904
+msgid "Social - Mostly Public"
+msgstr "Sosial - ganske offentlig"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:184
+#: ../../include/permissions.php:904
+msgid "Social - Restricted"
+msgstr "Sosial - begrenset"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:185
+#: ../../include/permissions.php:904
+msgid "Social - Private"
+msgstr "Sosial - privat"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:188
+#: ../../include/permissions.php:905
+msgid "Community Forum"
+msgstr "Forum for fellesskap"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:189
+#: ../../include/permissions.php:905
+msgid "Forum - Mostly Public"
+msgstr "Forum - ganske offentlig"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:190
+#: ../../include/permissions.php:905
+msgid "Forum - Restricted"
+msgstr "Forum - begrenset"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:191
+#: ../../include/permissions.php:905
+msgid "Forum - Private"
+msgstr "Forum - privat"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:194
+#: ../../include/permissions.php:906
+msgid "Feed Republish"
+msgstr "Republisering av strømmet innhold"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:195
+#: ../../include/permissions.php:906
+msgid "Feed - Mostly Public"
+msgstr "Strøm - ganske offentlig"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:196
+#: ../../include/permissions.php:906
+msgid "Feed - Restricted"
+msgstr "Strøm - begrenset"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:199
+#: ../../include/permissions.php:907
+msgid "Special Purpose"
+msgstr "Spesiell bruk"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:200
+#: ../../include/permissions.php:907
+msgid "Special - Celebrity/Soapbox"
+msgstr "Spesiell - kjendis/talerstol"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:201
+#: ../../include/permissions.php:907
+msgid "Special - Group Repository"
+msgstr "Spesiell - gruppelager"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:204 ../../include/selectors.php:49
+#: ../../include/selectors.php:66 ../../include/selectors.php:104
+#: ../../include/selectors.php:140 ../../include/permissions.php:908
+msgid "Other"
+msgstr "Annen"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:205
+#: ../../include/permissions.php:908
+msgid "Custom/Expert Mode"
+msgstr "Tilpasset/Ekspertmodus"
+
+#: ../../Zotlabs/Access/Permissions.php:30
+msgid "Can view my channel stream and posts"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:31 ../../include/permissions.php:33
+msgid "Can send me their channel stream and posts"
+msgstr "Kan sende meg deres kanalstrøm og innlegg"
+
+#: ../../Zotlabs/Access/Permissions.php:32 ../../include/permissions.php:27
+msgid "Can view my default channel profile"
+msgstr "Kan se min standard kanalprofil"
+
+#: ../../Zotlabs/Access/Permissions.php:33 ../../include/permissions.php:28
+msgid "Can view my connections"
+msgstr "Kan se mine forbindelser"
+
+#: ../../Zotlabs/Access/Permissions.php:34 ../../include/permissions.php:29
+msgid "Can view my file storage and photos"
+msgstr "Kan se mine filer og bilder"
+
+#: ../../Zotlabs/Access/Permissions.php:35
+msgid "Can upload/modify my file storage and photos"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:36
+msgid "Can view my channel webpages"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:37
+msgid "Can create/edit my channel webpages"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:38
+msgid "Can post on my channel (wall) page"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:39 ../../include/permissions.php:35
+msgid "Can comment on or like my posts"
+msgstr "Kan kommentere på eller like mine innlegg"
+
+#: ../../Zotlabs/Access/Permissions.php:40 ../../include/permissions.php:36
+msgid "Can send me private mail messages"
+msgstr "Kan sende meg private meldinger"
+
+#: ../../Zotlabs/Access/Permissions.php:41
+msgid "Can like/dislike profiles and profile things"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:42
+msgid "Can forward to all my channel connections via @+ mentions in posts"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:43
+msgid "Can chat with me"
+msgstr ""
+
+#: ../../Zotlabs/Access/Permissions.php:44 ../../include/permissions.php:44
+msgid "Can source my public posts in derived channels"
+msgstr "Kan bruke mine offentlige innlegg som kanalkilde i egne kanaler"
+
+#: ../../Zotlabs/Access/Permissions.php:45
+msgid "Can administer my channel"
+msgstr ""
+
 #: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
 msgid "parent"
 msgstr "opp et nivå"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2620
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2605
 msgid "Collection"
 msgstr "Samling"
 
@@ -46,16 +191,17 @@ msgstr "Tidsplan innboks"
 msgid "Schedule Outbox"
 msgstr "Tidsplan utboks"
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
-#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486
-#: ../../Zotlabs/Lib/Apps.php:561 ../../include/widgets.php:1505
-#: ../../include/conversation.php:1032
+#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:796
+#: ../../Zotlabs/Module/Photos.php:1241
+#: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:490
+#: ../../Zotlabs/Lib/Apps.php:565 ../../include/conversation.php:1035
+#: ../../include/widgets.php:1599
 msgid "Unknown"
 msgstr "Ukjent"
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93
-#: ../../include/conversation.php:1639
+#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:93
+#: ../../include/conversation.php:1654
 msgid "Files"
 msgstr "Filer"
 
@@ -68,22 +214,23 @@ msgid "Shared"
 msgstr "Delt"
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
-#: ../../Zotlabs/Module/Webpages.php:186
+#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/New_channel.php:142
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Webpages.php:193
 msgid "Create"
 msgstr "Lag"
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1518
+#: ../../Zotlabs/Module/Photos.php:823 ../../Zotlabs/Module/Photos.php:1362
+#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1612
 msgid "Upload"
 msgstr "Last opp"
 
 #: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:247
-#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:592
-#: ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:646
+#: ../../Zotlabs/Module/Settings.php:672
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr "Navn"
@@ -93,7 +240,7 @@ msgid "Type"
 msgstr "Type"
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1344
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1324
 msgid "Size"
 msgstr "Størrelse"
 
@@ -102,34 +249,32 @@ msgstr "Størrelse"
 msgid "Last Modified"
 msgstr "Sist endret"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Editpost.php:84
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Editlayout.php:113
-#: ../../Zotlabs/Module/Editwebpage.php:146
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:187
-#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Lib/ThreadItem.php:106
-#: ../../include/channel.php:937 ../../include/channel.php:941
-#: ../../include/menu.php:108 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36
+#: ../../Zotlabs/Module/Editlayout.php:114
+#: ../../Zotlabs/Module/Editwebpage.php:145
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Settings.php:706 ../../Zotlabs/Module/Thing.php:260
+#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/page_widgets.php:9
+#: ../../include/page_widgets.php:39 ../../include/channel.php:976
+#: ../../include/channel.php:980 ../../include/menu.php:108
 msgid "Edit"
 msgstr "Endre"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Connedit.php:572
-#: ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Connedit.php:602
 #: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Editlayout.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039
+#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Photos.php:1171 ../../Zotlabs/Module/Admin.php:1039
 #: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114
-#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261
-#: ../../Zotlabs/Module/Webpages.php:189 ../../Zotlabs/Lib/Apps.php:338
-#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:657
+#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Module/Settings.php:707 ../../Zotlabs/Module/Thing.php:261
+#: ../../Zotlabs/Module/Webpages.php:196 ../../Zotlabs/Lib/Apps.php:342
+#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660
 msgid "Delete"
 msgstr "Slett"
 
@@ -155,74 +300,73 @@ msgstr "Lag ny mappe"
 msgid "Upload file"
 msgstr "Last opp fil"
 
-#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:112
+#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Module/Import_items.php:114
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../include/items.php:385
+#: ../../include/items.php:384
 msgid "Permission denied"
 msgstr "Tillatelse avvist"
 
-#: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Channel.php:105
-#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:65
+#: ../../Zotlabs/Module/Achievements.php:34
+#: ../../Zotlabs/Module/Connedit.php:390 ../../Zotlabs/Module/Id.php:76
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Events.php:264
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Events.php:265
-#: ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Chat.php:100
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:69
-#: ../../Zotlabs/Module/Editwebpage.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Filestorage.php:24
-#: ../../Zotlabs/Module/Filestorage.php:79
-#: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:210
-#: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070
+#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:104
+#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Pdledit.php:26
+#: ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:93
+#: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
+#: ../../Zotlabs/Module/Item.php:213 ../../Zotlabs/Module/Item.php:221
+#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Photos.php:73
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:121
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Channel.php:104
+#: ../../Zotlabs/Module/Channel.php:225 ../../Zotlabs/Module/Channel.php:266
 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Notifications.php:70
-#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68
-#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203
-#: ../../Zotlabs/Module/Profiles.php:601
-#: ../../Zotlabs/Module/Profile_photo.php:256
-#: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Appman.php:75
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
+#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Profile_photo.php:265
+#: ../../Zotlabs/Module/Profile_photo.php:278
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Editblock.php:67
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
-#: ../../Zotlabs/Module/Sharedwithme.php:11
+#: ../../Zotlabs/Module/Settings.php:626 ../../Zotlabs/Module/Setup.php:215
+#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Thing.php:274
+#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:331
 #: ../../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:25
-#: ../../Zotlabs/Module/Viewconnections.php:30
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
-#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/items.php:3438
-#: ../../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/photos.php:27
+#: ../../Zotlabs/Module/Webpages.php:73
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Api.php:13
+#: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../include/photos.php:27 ../../include/attach.php:141
+#: ../../include/attach.php:189 ../../include/attach.php:252
+#: ../../include/attach.php:266 ../../include/attach.php:273
+#: ../../include/attach.php:338 ../../include/attach.php:352
+#: ../../include/attach.php:359 ../../include/attach.php:439
+#: ../../include/attach.php:901 ../../include/attach.php:972
+#: ../../include/attach.php:1124 ../../include/items.php:3448
 msgid "Permission denied."
 msgstr "Tillatelse avslått."
 
@@ -230,9 +374,9 @@ msgstr "Tillatelse avslått."
 msgid "Not Found"
 msgstr "Ikke funnet"
 
-#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97
-#: ../../Zotlabs/Module/Page.php:93
+#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Display.php:118
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Help.php:97
+#: ../../Zotlabs/Module/Block.php:79
 msgid "Page not found."
 msgstr "Siden ikke funnet."
 
@@ -248,13 +392,13 @@ msgstr "Fjernautentisering blokkert. Du er logget inn på dette nettstedet lokal
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Velkommen %s. Ekstern autentisering er vellykket."
 
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../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/channel.php:837
+#: ../../Zotlabs/Module/Achievements.php:15
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Layouts.php:31
+#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:33
+#: ../../include/channel.php:876
 msgid "Requested profile is not available."
 msgstr "Forespurt profil er ikke tilgjengelig."
 
@@ -262,229 +406,6 @@ msgstr "Forespurt profil er ikke tilgjengelig."
 msgid "Some blurb about what to do when you're new here"
 msgstr "En standardtekst om hva du bør gjøre som ny her"
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152
-#: ../../Zotlabs/Module/Editblock.php:108
-msgid "Block Name"
-msgstr "Byggeklossens navn"
-
-#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2265
-msgid "Blocks"
-msgstr "Byggeklosser"
-
-#: ../../Zotlabs/Module/Blocks.php:153
-msgid "Block Title"
-msgstr "Byggeklossens tittel"
-
-#: ../../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 "Laget"
-
-#: ../../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 "Endret"
-
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
-#: ../../include/conversation.php:1208
-msgid "Share"
-msgstr "Del"
-
-#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193
-#: ../../include/page_widgets.php:39
-msgid "View"
-msgstr "Vis"
-
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Block.php:43
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
-msgid "Channel not found."
-msgstr "Kanalen ble ikke funnet."
-
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr "Tillatelse avvist."
-
-#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
-msgid "l, F j"
-msgstr "l, F j"
-
-#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
-#: ../../include/text.php:1732
-msgid "Link to Source"
-msgstr "Lenke til kilde"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Edit Event"
-msgstr "Endre hendelse"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Create Event"
-msgstr "Lag hendelse"
-
-#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
-#: ../../Zotlabs/Module/Photos.php:949
-msgid "Previous"
-msgstr "Forrige"
-
-#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
-#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
-msgid "Next"
-msgstr "Neste"
-
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
-#: ../../include/widgets.php:755
-msgid "Export"
-msgstr "Eksport"
-
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
-#: ../../include/widgets.php:756
-msgid "Import"
-msgstr "Importer"
-
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Import.php:550
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Photos.php:677
-#: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
-#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032
-#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421
-#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733
-#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Appman.php:126
-#: ../../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:312
-#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
-#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:757
-#: ../../include/widgets.php:769 ../../include/js_strings.php:22
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Submit"
-msgstr "Send"
-
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
-msgid "Today"
-msgstr "Idag"
-
-#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
-msgid "You must be logged in to see this page."
-msgstr "Du må være innloegget for å se denne siden."
-
-#: ../../Zotlabs/Module/Channel.php:41
-msgid "Posts and comments"
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:42
-msgid "Only posts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:102
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Utilstrekkelig tillatelse. Forespørsel omdirigert til profilsiden."
-
-#: ../../Zotlabs/Module/Chat.php:181
-msgid "Room not found"
-msgstr "Rommet ble ikke funnet"
-
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "Leave Room"
-msgstr "Forlat rom"
-
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "Delete Room"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:199
-msgid "I am away right now"
-msgstr "Jeg er borte akkurat nå"
-
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "I am online"
-msgstr "Jeg er online"
-
-#: ../../Zotlabs/Module/Chat.php:202
-msgid "Bookmark this room"
-msgstr "Bokmerk dette rommet"
-
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
-#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176
-msgid "Please enter a link URL:"
-msgstr "Vennligst skriv inn en lenke URL:"
-
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
-#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
-#: ../../include/conversation.php:1256
-msgid "Encrypt text"
-msgstr "Krypter tekst"
-
-#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143
-msgid "Insert web link"
-msgstr "Sett inn web-lenke"
-
-#: ../../Zotlabs/Module/Chat.php:218
-msgid "Feature disabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "New Chatroom"
-msgstr "Nytt chatrom"
-
-#: ../../Zotlabs/Module/Chat.php:233
-msgid "Chatroom name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:234
-msgid "Expiration of chats (minutes)"
-msgstr "Chat utgår (antall minutter)"
-
-#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
-#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
-#: ../../include/acl_selectors.php:283
-msgid "Permissions"
-msgstr "Tillatelser"
-
-#: ../../Zotlabs/Module/Chat.php:246
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "%1$s sine chatrom"
-
-#: ../../Zotlabs/Module/Chat.php:251
-msgid "No chatrooms available"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Create New"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:255
-msgid "Expiration"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:256
-msgid "min"
-msgstr ""
-
 #: ../../Zotlabs/Module/Chatsvc.php:117
 msgid "Away"
 msgstr "Borte"
@@ -493,65 +414,6 @@ msgstr "Borte"
 msgid "Online"
 msgstr "Online"
 
-#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40
-msgid "Invalid item."
-msgstr "Ugyldig element."
-
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
-msgstr "Bokmerke lagt til"
-
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
-msgstr "Mine bokmerker"
-
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
-msgstr "Mine forbindelsers bokmerker"
-
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
-msgstr "Fortsett"
-
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
-msgstr "Premiumkanal-oppsett"
-
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
-msgstr "Slå på restriksjoner for forbindelse med premiumkanal"
-
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Vennligst skriv dine restriksjoner og betingelser, slik som PayPal-kvittering, retningslinjer for bruk, og så videre."
-
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Denne kanalen kan kreve ytterligere steg og bekreftelse av følgende betingelser før tilkobling:"
-
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Potensielle forbindelser vil da se følgende tekst før de går videre:"
-
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på denne siden."
-
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Ingen spesifikke instruksjoner er gitt av kanaleieren.)"
-
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
-msgstr "Begrenset kanal eller premiumkanal"
-
 #: ../../Zotlabs/Module/Connedit.php:80
 msgid "Could not access contact record."
 msgstr "Fikk ikke tilgang til kontaktinformasjonen."
@@ -560,317 +422,350 @@ msgstr "Fikk ikke tilgang til kontaktinformasjonen."
 msgid "Could not locate selected profile."
 msgstr "Fant ikke valgt profil."
 
-#: ../../Zotlabs/Module/Connedit.php:227
+#: ../../Zotlabs/Module/Connedit.php:248
 msgid "Connection updated."
 msgstr "Forbindelsen er oppdatert."
 
-#: ../../Zotlabs/Module/Connedit.php:229
+#: ../../Zotlabs/Module/Connedit.php:250
 msgid "Failed to update connection record."
 msgstr "Mislyktes med å oppdatere forbindelsesinformasjonen."
 
-#: ../../Zotlabs/Module/Connedit.php:276
+#: ../../Zotlabs/Module/Connedit.php:300
 msgid "is now connected to"
 msgstr "er nå forbundet til"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89
-#: ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:459
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Connedit.php:685
+#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:459 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:89
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "No"
 msgstr "Nei"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
-#: ../../Zotlabs/Module/Api.php:88 ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:461
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:461 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:88
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../Zotlabs/Module/Connedit.php:411
+#: ../../Zotlabs/Module/Connedit.php:435
 msgid "Could not access address book record."
 msgstr "Fikk ikke tilgang til informasjonen i adresseboken."
 
-#: ../../Zotlabs/Module/Connedit.php:425
+#: ../../Zotlabs/Module/Connedit.php:455
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Oppfrisking mislyktes - kanalen er for øyeblikket utilgjengelig."
 
-#: ../../Zotlabs/Module/Connedit.php:440 ../../Zotlabs/Module/Connedit.php:449
-#: ../../Zotlabs/Module/Connedit.php:458 ../../Zotlabs/Module/Connedit.php:467
-#: ../../Zotlabs/Module/Connedit.php:480
+#: ../../Zotlabs/Module/Connedit.php:470 ../../Zotlabs/Module/Connedit.php:479
+#: ../../Zotlabs/Module/Connedit.php:488 ../../Zotlabs/Module/Connedit.php:497
+#: ../../Zotlabs/Module/Connedit.php:510
 msgid "Unable to set address book parameters."
 msgstr "Ikke i stand til å angi parametre for adresseboken."
 
-#: ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:533
 msgid "Connection has been removed."
 msgstr "Forbindelsen har blitt fjernet."
 
-#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219
-#: ../../include/nav.php:86 ../../include/conversation.php:954
+#: ../../Zotlabs/Module/Connedit.php:549 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:86 ../../include/conversation.php:957
 msgid "View Profile"
 msgstr "Vis profil"
 
-#: ../../Zotlabs/Module/Connedit.php:522
+#: ../../Zotlabs/Module/Connedit.php:552
 #, php-format
 msgid "View %s's profile"
 msgstr "Vis %s sin profil"
 
-#: ../../Zotlabs/Module/Connedit.php:526
+#: ../../Zotlabs/Module/Connedit.php:556
 msgid "Refresh Permissions"
 msgstr "Oppfrisk tillatelser"
 
-#: ../../Zotlabs/Module/Connedit.php:529
+#: ../../Zotlabs/Module/Connedit.php:559
 msgid "Fetch updated permissions"
 msgstr "Hent oppdaterte tillatelser"
 
-#: ../../Zotlabs/Module/Connedit.php:533
+#: ../../Zotlabs/Module/Connedit.php:563
 msgid "Recent Activity"
 msgstr "Nylig aktivitet"
 
-#: ../../Zotlabs/Module/Connedit.php:536
+#: ../../Zotlabs/Module/Connedit.php:566
 msgid "View recent posts and comments"
 msgstr "Vis nylige innlegg og kommentarer"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1041
 msgid "Unblock"
 msgstr "Ikke blokker lenger"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1040
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1040
 msgid "Block"
 msgstr "Blokker"
 
-#: ../../Zotlabs/Module/Connedit.php:543
+#: ../../Zotlabs/Module/Connedit.php:573
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blokker eller fjern blokkering av all kommunikasjon med denne forbindelsen"
 
-#: ../../Zotlabs/Module/Connedit.php:544
+#: ../../Zotlabs/Module/Connedit.php:574
 msgid "This connection is blocked!"
 msgstr "Denne forbindelsen er blokkert!"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 msgid "Unignore"
 msgstr "Ikke ignorer lenger"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 #: ../../Zotlabs/Module/Connections.php:277
 #: ../../Zotlabs/Module/Notifications.php:55
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: ../../Zotlabs/Module/Connedit.php:551
+#: ../../Zotlabs/Module/Connedit.php:581
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Ignorer eller fjern ignorering av all inngående kommunikasjon fra denne forbindelsen"
 
-#: ../../Zotlabs/Module/Connedit.php:552
+#: ../../Zotlabs/Module/Connedit.php:582
 msgid "This connection is ignored!"
 msgstr "Denne forbindelsen er ignorert!"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Unarchive"
 msgstr "Ikke arkiver lenger"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Archive"
 msgstr "Arkiver"
 
-#: ../../Zotlabs/Module/Connedit.php:559
+#: ../../Zotlabs/Module/Connedit.php:589
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Arkiver eller fjern arkivering av denne forbindelsen - marker kanal som død, men behold innhold"
 
-#: ../../Zotlabs/Module/Connedit.php:560
+#: ../../Zotlabs/Module/Connedit.php:590
 msgid "This connection is archived!"
 msgstr "Denne forbindelsen er arkivert!"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Unhide"
 msgstr "Ikke skjul lenger"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Hide"
 msgstr "Skjul"
 
-#: ../../Zotlabs/Module/Connedit.php:567
+#: ../../Zotlabs/Module/Connedit.php:597
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Skjul eller fjern skjuling av denne forbindelsen fra dine andre forbindelser"
 
-#: ../../Zotlabs/Module/Connedit.php:568
+#: ../../Zotlabs/Module/Connedit.php:598
 msgid "This connection is hidden!"
 msgstr "Denne forbindelsen er skjult!"
 
-#: ../../Zotlabs/Module/Connedit.php:575
+#: ../../Zotlabs/Module/Connedit.php:605
 msgid "Delete this connection"
 msgstr "Slett denne forbindelsen"
 
-#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493
+#: ../../Zotlabs/Module/Connedit.php:620 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Meg"
 
-#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494
+#: ../../Zotlabs/Module/Connedit.php:621 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Familie"
 
-#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342
-#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
-#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
-#: ../../include/widgets.php:495 ../../include/selectors.php:123
-#: ../../include/channel.php:389 ../../include/channel.php:390
-#: ../../include/channel.php:397
+#: ../../Zotlabs/Module/Connedit.php:622 ../../Zotlabs/Module/Settings.php:391
+#: ../../Zotlabs/Module/Settings.php:395 ../../Zotlabs/Module/Settings.php:396
+#: ../../Zotlabs/Module/Settings.php:399 ../../Zotlabs/Module/Settings.php:410
+#: ../../include/channel.php:402 ../../include/channel.php:403
+#: ../../include/channel.php:410 ../../include/selectors.php:123
+#: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "Venner"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496
+#: ../../Zotlabs/Module/Connedit.php:623 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Bekjente"
 
-#: ../../Zotlabs/Module/Connedit.php:594
+#: ../../Zotlabs/Module/Connedit.php:624
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
 msgid "All"
 msgstr "Alle"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Approve this connection"
 msgstr "Godta denne forbindelsen"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Accept connection to allow communication"
 msgstr "Godta denne forbindelsen for å tillate kommunikasjon"
 
-#: ../../Zotlabs/Module/Connedit.php:659
+#: ../../Zotlabs/Module/Connedit.php:690
 msgid "Set Affinity"
 msgstr "Angi nærhet"
 
-#: ../../Zotlabs/Module/Connedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:693
 msgid "Set Profile"
 msgstr "Angi profil"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Zotlabs/Module/Connedit.php:696
 msgid "Set Affinity & Profile"
 msgstr "Angi nærhet og profil"
 
-#: ../../Zotlabs/Module/Connedit.php:698
+#: ../../Zotlabs/Module/Connedit.php:745
 msgid "none"
 msgstr "ingen"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/widgets.php:623
 msgid "Connection Default Permissions"
 msgstr "Forbindelsens standard tillatelser"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3926
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/items.php:3935
 #, php-format
 msgid "Connection: %s"
 msgstr "Forbindelse: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Apply these permissions automatically"
 msgstr "Bruk disse tillatelsene automatisk"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Connection requests will be approved without your interaction"
 msgstr "Forespørsler om forbindelse vil bli godkjent automatisk"
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Zotlabs/Module/Connedit.php:752
 msgid "This connection's primary address is"
 msgstr "Denne forbindelsens primære adresse er"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:753
 msgid "Available locations:"
 msgstr "Tilgjengelige plasseringer:"
 
-#: ../../Zotlabs/Module/Connedit.php:710
+#: ../../Zotlabs/Module/Connedit.php:757
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Tillatelsene angitt på denne siden gjøres gjeldende for alle nye forbindelser."
 
-#: ../../Zotlabs/Module/Connedit.php:711
+#: ../../Zotlabs/Module/Connedit.php:758
 msgid "Connection Tools"
-msgstr ""
+msgstr "Forbindelsesverktøy"
 
-#: ../../Zotlabs/Module/Connedit.php:713
+#: ../../Zotlabs/Module/Connedit.php:760
 msgid "Slide to adjust your degree of friendship"
 msgstr "Flytt for å justere din grad av vennskap"
 
-#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159
+#: ../../Zotlabs/Module/Connedit.php:761 ../../Zotlabs/Module/Rate.php:159
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Vurdering"
 
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Zotlabs/Module/Connedit.php:762
 msgid "Slide to adjust your rating"
 msgstr "Flytt for å justere din vurdering"
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:763 ../../Zotlabs/Module/Connedit.php:768
 msgid "Optionally explain your rating"
 msgstr "Velg om du vil forklare vurderingen"
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Zotlabs/Module/Connedit.php:765
 msgid "Custom Filter"
 msgstr "Tilpasset filter"
 
-#: ../../Zotlabs/Module/Connedit.php:719
+#: ../../Zotlabs/Module/Connedit.php:766
 msgid "Only import posts with this text"
 msgstr "Bare importer innlegg med disse ordene"
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:766 ../../Zotlabs/Module/Connedit.php:767
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "ord per linje eller #merkelapper eller /mønster/ eller språk lang=xx, la stå blankt for å importere alle innlegg"
 
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:767
 msgid "Do not import posts with this text"
 msgstr "Ikke importer innlegg med denne teksten"
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:769
 msgid "This information is public!"
 msgstr "Denne informasjonen er offentlig!"
 
-#: ../../Zotlabs/Module/Connedit.php:727
+#: ../../Zotlabs/Module/Connedit.php:774
 msgid "Connection Pending Approval"
 msgstr "Forbindelse venter på godkjenning"
 
-#: ../../Zotlabs/Module/Connedit.php:730
+#: ../../Zotlabs/Module/Connedit.php:777
 msgid "inherited"
 msgstr "arvet"
 
-#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Module/Connedit.php:778 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:238
+#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Pdledit.php:66
+#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Import.php:560
+#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Mail.php:370 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771
+#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1211
+#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Admin.php:1648
+#: ../../Zotlabs/Module/Admin.php:1733 ../../Zotlabs/Module/Admin.php:2116
+#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Settings.php:644
+#: ../../Zotlabs/Module/Settings.php:757 ../../Zotlabs/Module/Settings.php:806
+#: ../../Zotlabs/Module/Settings.php:832 ../../Zotlabs/Module/Settings.php:855
+#: ../../Zotlabs/Module/Settings.php:943
+#: ../../Zotlabs/Module/Settings.php:1129 ../../Zotlabs/Module/Setup.php:312
+#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Thing.php:316
+#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:763
+#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:99
+msgid "Submit"
+msgstr "Send"
+
+#: ../../Zotlabs/Module/Connedit.php:779
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Vennligst velg profilen du ønsker å vise %s når profilen din ses på en sikret måte. "
 
-#: ../../Zotlabs/Module/Connedit.php:734
+#: ../../Zotlabs/Module/Connedit.php:781
 msgid "Their Settings"
 msgstr "Deres innstillinger"
 
-#: ../../Zotlabs/Module/Connedit.php:735
+#: ../../Zotlabs/Module/Connedit.php:782
 msgid "My Settings"
 msgstr "Mine innstillinger"
 
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:784
 msgid "Individual Permissions"
 msgstr "Individuelle tillatelser"
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Zotlabs/Module/Connedit.php:785
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -878,7 +773,7 @@ msgid ""
 " settings here."
 msgstr "Noen tillatelser kan være arvet fra din kanals <a ref=\"settings\"><strong>personverninnstillinger</strong></a>, som har høyere prioritet enn individuelle innstillinger. Du kan <strong>ikke</strong> endre arvede innstillingene her."
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Zotlabs/Module/Connedit.php:786
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -886,17 +781,121 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Noen tillatelser kan være arvet fra din kanals <a ref=\"settings\"><strong>personverninnstillinger</strong></a>, som har høyere prioritet enn individuelle innstillinger. Du kan endre disse innstillingene her, men de vil ikke få noen effekt før de arvede innstillingene endres."
 
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Connedit.php:787
 msgid "Last update:"
 msgstr "Siste oppdatering:"
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Directory.php:63
+#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:20
+#: ../../Zotlabs/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr "Offentlig tilgang avvist."
 
+#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:32
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
+#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3369
+msgid "Item not found."
+msgstr "Elementet ble ikke funnet."
+
+#: ../../Zotlabs/Module/Id.php:13
+msgid "First Name"
+msgstr "Fornavn"
+
+#: ../../Zotlabs/Module/Id.php:14
+msgid "Last Name"
+msgstr "Etternavn"
+
+#: ../../Zotlabs/Module/Id.php:15
+msgid "Nickname"
+msgstr "Kallenavn"
+
+#: ../../Zotlabs/Module/Id.php:16
+msgid "Full Name"
+msgstr "Fullt navn"
+
+#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../include/network.php:2203
+msgid "Email"
+msgstr "E-post"
+
+#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
+#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:238
+msgid "Profile Photo"
+msgstr "Profilbilde"
+
+#: ../../Zotlabs/Module/Id.php:22
+msgid "Profile Photo 16px"
+msgstr "Profilbilde 16px"
+
+#: ../../Zotlabs/Module/Id.php:23
+msgid "Profile Photo 32px"
+msgstr "Profilbilde 32px"
+
+#: ../../Zotlabs/Module/Id.php:24
+msgid "Profile Photo 48px"
+msgstr "Profilbilde 48px"
+
+#: ../../Zotlabs/Module/Id.php:25
+msgid "Profile Photo 64px"
+msgstr "Profilbilde 64px"
+
+#: ../../Zotlabs/Module/Id.php:26
+msgid "Profile Photo 80px"
+msgstr "Profilbilde 80px"
+
+#: ../../Zotlabs/Module/Id.php:27
+msgid "Profile Photo 128px"
+msgstr "Profilbilde 128px"
+
+#: ../../Zotlabs/Module/Id.php:28
+msgid "Timezone"
+msgstr "Tidssone"
+
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
+msgid "Homepage URL"
+msgstr "Hjemmeside URL"
+
+#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:236
+msgid "Language"
+msgstr "Språk"
+
+#: ../../Zotlabs/Module/Id.php:31
+msgid "Birth Year"
+msgstr "Fødselsår"
+
+#: ../../Zotlabs/Module/Id.php:32
+msgid "Birth Month"
+msgstr "Fødselsmåne"
+
+#: ../../Zotlabs/Module/Id.php:33
+msgid "Birth Day"
+msgstr "Fødselsdag"
+
+#: ../../Zotlabs/Module/Id.php:34
+msgid "Birthdate"
+msgstr "Fødselsdato"
+
+#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
+msgid "Gender"
+msgstr "Kjønn"
+
+#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Male"
+msgstr "Mannlig"
+
+#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Female"
+msgstr "Kvinnelig"
+
+#: ../../Zotlabs/Module/Follow.php:34
+msgid "Channel added."
+msgstr "Kanal lagt til."
+
 #: ../../Zotlabs/Module/Directory.php:243
 #, php-format
 msgid "%d rating"
@@ -916,12 +915,12 @@ msgstr "Status:"
 msgid "Homepage: "
 msgstr "Hjemmeside:"
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1223
 msgid "Age:"
 msgstr "Alder:"
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
-#: ../../include/event.php:84 ../../include/channel.php:1027
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/channel.php:1066
+#: ../../include/event.php:52 ../../include/event.php:84
 #: ../../include/bb2diaspora.php:507
 msgid "Location:"
 msgstr "Plassering:"
@@ -930,18 +929,18 @@ msgstr "Plassering:"
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1239
 msgid "Hometown:"
 msgstr "Hjemby:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1247
 msgid "About:"
 msgstr "Om:"
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147
-#: ../../include/widgets.php:184 ../../include/connections.php:78
-#: ../../include/conversation.php:956 ../../include/channel.php:1012
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1051
+#: ../../include/connections.php:78 ../../include/conversation.php:959
+#: ../../include/widgets.php:147 ../../include/widgets.php:184
 msgid "Connect"
 msgstr "Koble"
 
@@ -1017,38 +1016,322 @@ msgstr "Eldst til nyest"
 msgid "No entries (some entries may be hidden)."
 msgstr "Ingen oppføringer (noen oppføringer kan være skjult)."
 
-#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
-#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3359
-msgid "Item not found."
-msgstr "Elementet ble ikke funnet."
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
+msgstr "Fortsett"
+
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
+msgstr "Premiumkanal-oppsett"
+
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
+msgstr "Slå på restriksjoner for forbindelse med premiumkanal"
+
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Vennligst skriv dine restriksjoner og betingelser, slik som PayPal-kvittering, retningslinjer for bruk, og så videre."
+
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Denne kanalen kan kreve ytterligere steg og bekreftelse av følgende betingelser før tilkobling:"
+
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Potensielle forbindelser vil da se følgende tekst før de går videre:"
+
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på denne siden."
+
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Ingen spesifikke instruksjoner er gitt av kanaleieren.)"
+
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
+msgstr "Begrenset kanal eller premiumkanal"
+
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
+msgstr "Kalenderhendelsene er importert."
+
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+msgstr "Ingen kalenderhendelser funnet."
+
+#: ../../Zotlabs/Module/Events.php:104
+msgid "Event can not end before it has started."
+msgstr "Hendelsen kan ikke slutte før den starter."
+
+#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
+#: ../../Zotlabs/Module/Events.php:135
+msgid "Unable to generate preview."
+msgstr "Klarer ikke å lage forhåndsvisning."
+
+#: ../../Zotlabs/Module/Events.php:113
+msgid "Event title and start time are required."
+msgstr "Hendelsestittel og starttidspunkt er påkrevd."
+
+#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
+msgid "Event not found."
+msgstr "Hendelsen ble ikke funnet."
+
+#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:372
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
+#: ../../include/text.php:1924 ../../include/event.php:951
+msgid "event"
+msgstr "hendelse"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Edit event title"
+msgstr "Endre tittel på hendelse"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Event title"
+msgstr "Tittel på hendelse"
+
+#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
+#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
+#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
+#: ../../include/datetime.php:245
+msgid "Required"
+msgstr "Påkrevd"
+
+#: ../../Zotlabs/Module/Events.php:450
+msgid "Categories (comma-separated list)"
+msgstr "Kategorier (kommaseparert liste)"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Edit Category"
+msgstr "Endre kategori"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Category"
+msgstr "Kategori"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Edit start date and time"
+msgstr "Endre startdato og tidspunkt"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Start date and time"
+msgstr "Startdato og tidspunkt"
+
+#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
+msgid "Finish date and time are not known or not relevant"
+msgstr "Sluttdato og tidspunkt er ikke kjent eller ikke relevant"
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Edit finish date and time"
+msgstr "Endre sluttdato og tidspunkt"
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Finish date and time"
+msgstr "Sluttdato og tidspunkt"
+
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+msgid "Adjust for viewer timezone"
+msgstr "Juster i forhold til tilskuerens tidssone"
+
+#: ../../Zotlabs/Module/Events.php:459
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
+msgstr "Viktig for hendelser som skjer på et bestemt sted. Ikke praktisk for globale ferier eller fridager."
+
+#: ../../Zotlabs/Module/Events.php:461
+msgid "Edit Description"
+msgstr "Endre beskrivelse"
+
+#: ../../Zotlabs/Module/Events.php:461 ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Rbmark.php:101
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Location"
+msgstr "Endre plassering"
+
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Profiles.php:477
+#: ../../Zotlabs/Module/Profiles.php:698 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
+msgid "Location"
+msgstr "Plassering"
+
+#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
+msgid "Share this event"
+msgstr "Del denne hendelsen"
+
+#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1091
+#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Lib/ThreadItem.php:719
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1198
+msgid "Preview"
+msgstr "Forhåndsvisning"
+
+#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1247
+msgid "Permission settings"
+msgstr "Tillatelser - innstillinger"
+
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Advanced Options"
+msgstr "Avanserte alternativer"
+
+#: ../../Zotlabs/Module/Events.php:587 ../../Zotlabs/Module/Cal.php:259
+msgid "l, F j"
+msgstr "l, F j"
+
+#: ../../Zotlabs/Module/Events.php:609
+msgid "Edit event"
+msgstr "Endre hendelse"
+
+#: ../../Zotlabs/Module/Events.php:611
+msgid "Delete event"
+msgstr "Slett hendelse"
+
+#: ../../Zotlabs/Module/Events.php:636 ../../Zotlabs/Module/Cal.php:308
+#: ../../include/text.php:1712
+msgid "Link to Source"
+msgstr "Lenke til kilde"
+
+#: ../../Zotlabs/Module/Events.php:645
+msgid "calendar"
+msgstr "kalender"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Edit Event"
+msgstr "Endre hendelse"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Create Event"
+msgstr "Lag hendelse"
+
+#: ../../Zotlabs/Module/Events.php:665 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
+#: ../../Zotlabs/Module/Photos.php:947
+msgid "Previous"
+msgstr "Forrige"
+
+#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:675
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
+#: ../../Zotlabs/Module/Photos.php:956 ../../Zotlabs/Module/Setup.php:267
+msgid "Next"
+msgstr "Neste"
+
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Cal.php:334
+msgid "Export"
+msgstr "Eksport"
+
+#: ../../Zotlabs/Module/Events.php:670 ../../Zotlabs/Module/Layouts.php:197
+#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Webpages.php:200 ../../include/page_widgets.php:42
+msgid "View"
+msgstr "Vis"
+
+#: ../../Zotlabs/Module/Events.php:671
+msgid "Month"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:672
+msgid "Week"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:673
+msgid "Day"
+msgstr ""
+
+#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:341
+msgid "Today"
+msgstr "Idag"
+
+#: ../../Zotlabs/Module/Events.php:707
+msgid "Event removed"
+msgstr "Hendelse slettet"
+
+#: ../../Zotlabs/Module/Events.php:710
+msgid "Failed to remove event"
+msgstr "Mislyktes med å slette hendelse"
+
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
+msgstr "Bokmerke lagt til"
+
+#: ../../Zotlabs/Module/Bookmarks.php:75
+msgid "My Bookmarks"
+msgstr "Mine bokmerker"
+
+#: ../../Zotlabs/Module/Bookmarks.php:86
+msgid "My Connections Bookmarks"
+msgstr "Mine forbindelsers bokmerker"
 
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 #: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:81
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 msgid "Item not found"
 msgstr "Elementet ble ikke funnet."
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228
-msgid "Title (optional)"
-msgstr "Tittel (valgfri)"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
+msgstr "Elementet kan ikke endres"
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
-msgstr "Endre byggekloss"
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:134
+msgid "Edit post"
+msgstr "Endre innlegg"
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
-msgstr "Ingen kanal."
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222
+#: ../../include/nav.php:92 ../../include/conversation.php:1647
+msgid "Photos"
+msgstr "Bilder"
 
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
-msgstr "Felles forbindelser"
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:645
+#: ../../Zotlabs/Module/Settings.php:671 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Wiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:202 ../../include/conversation.php:1235
+#: ../../include/conversation.php:1274
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
-msgstr "Ingen forbindelser felles."
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
+msgstr "Ugyldig element."
+
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Wall_upload.php:33
+msgid "Channel not found."
+msgstr "Kanalen ble ikke funnet."
+
+#: ../../Zotlabs/Module/Page.php:131
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
+" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Save to Folder:"
+msgstr "Lagre til mappe:"
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "- select -"
+msgstr "- velg -"
+
+#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
+#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:926
+#: ../../include/text.php:938 ../../include/widgets.php:201
+msgid "Save"
+msgstr "Lagre"
 
 #: ../../Zotlabs/Module/Connections.php:56
 #: ../../Zotlabs/Module/Connections.php:161
@@ -1076,7 +1359,7 @@ msgstr "Arkivert"
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1535
+#: ../../include/conversation.php:1550
 msgid "New"
 msgstr "Nye"
 
@@ -1163,15 +1446,15 @@ msgstr "Ignorer forbindelse"
 msgid "Recent activity"
 msgstr "Nylig aktivitet"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
-#: ../../include/text.php:875 ../../include/nav.php:186
+#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209
+#: ../../include/nav.php:188 ../../include/text.php:855
 msgid "Connections"
 msgstr "Forbindelser"
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:228 ../../include/text.php:945
-#: ../../include/text.php:957 ../../include/nav.php:165
-#: ../../include/acl_selectors.php:276
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:167
+#: ../../include/text.php:925 ../../include/text.php:937
+#: ../../include/acl_selectors.php:274
 msgid "Search"
 msgstr "Søk"
 
@@ -1184,7 +1467,7 @@ msgid "Connections search"
 msgstr "Søk blant forbindelser"
 
 #: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:79
+#: ../../Zotlabs/Module/Profile_photo.php:61
 msgid "Image uploaded but image cropping failed."
 msgstr "Bildet ble lastet opp, men beskjæring av bildet mislyktes."
 
@@ -1194,66 +1477,66 @@ msgid "Cover Photos"
 msgstr "Forsidebilder"
 
 #: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:133
+#: ../../Zotlabs/Module/Profile_photo.php:135
 msgid "Image resize failed."
 msgstr "Endring av bildestørrelse mislyktes."
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144
+#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:148
 msgid "Unable to process image"
 msgstr "Kan ikke behandle bildet"
 
 #: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:217
+#: ../../Zotlabs/Module/Profile_photo.php:223
 msgid "Image upload failed."
 msgstr "Opplasting av bildet mislyktes."
 
 #: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:236
+#: ../../Zotlabs/Module/Profile_photo.php:242
 msgid "Unable to process image."
 msgstr "Kan ikke behandle bildet."
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4270
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4283
 msgid "female"
 msgstr "kvinne"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4271
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4284
 #, php-format
 msgid "%1$s updated her %2$s"
 msgstr "%1$s oppdaterte %2$s sitt"
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4272
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4285
 msgid "male"
 msgstr "mann"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4273
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4286
 #, php-format
 msgid "%1$s updated his %2$s"
 msgstr "%1$s oppdaterte %2$s sitt"
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4275
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4288
 #, php-format
 msgid "%1$s updated their %2$s"
 msgstr "%1$s oppdaterte %2$s deres"
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1661
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1726
 msgid "cover photo"
 msgstr "forsidebilde"
 
 #: ../../Zotlabs/Module/Cover_photo.php:303
 #: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:283
-#: ../../Zotlabs/Module/Profile_photo.php:324
+#: ../../Zotlabs/Module/Profile_photo.php:300
+#: ../../Zotlabs/Module/Profile_photo.php:341
 msgid "Photo not available."
 msgstr "Bildet er ikke tilgjengelig."
 
 #: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:387
 msgid "Upload File:"
 msgstr "Last opp fil:"
 
 #: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:366
+#: ../../Zotlabs/Module/Profile_photo.php:388
 msgid "Select a profile:"
 msgstr "Velg en profil:"
 
@@ -1262,200 +1545,69 @@ msgid "Upload Cover Photo"
 msgstr "Last opp forsidebilde"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:985
+#: ../../Zotlabs/Module/Profile_photo.php:396
+#: ../../Zotlabs/Module/Settings.php:1080
 msgid "or"
 msgstr "eller"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "skip this step"
 msgstr "hopp over dette steget"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "select a photo from your photo albums"
 msgstr "velg et bilde fra dine fotoalbum"
 
 #: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Profile_photo.php:415
 msgid "Crop Image"
 msgstr "Beskjær bildet"
 
 #: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:391
+#: ../../Zotlabs/Module/Profile_photo.php:416
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Vennligst juster bildebeskjæringen for optimal visning."
 
 #: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:393
+#: ../../Zotlabs/Module/Profile_photo.php:418
 msgid "Done Editing"
 msgstr "Avslutt redigering"
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
-msgstr "Elementet kan ikke endres"
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
+msgid "webpage"
+msgstr "nettside"
 
-#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
-msgid "Edit post"
-msgstr "Endre innlegg"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
+msgid "block"
+msgstr "byggekloss"
 
-#: ../../Zotlabs/Module/Events.php:26
-msgid "Calendar entries imported."
-msgstr "Kalenderhendelsene er importert."
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
+msgid "layout"
+msgstr "layout"
 
-#: ../../Zotlabs/Module/Events.php:28
-msgid "No calendar entries found."
-msgstr "Ingen kalenderhendelser funnet."
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
+msgid "menu"
+msgstr "meny"
 
-#: ../../Zotlabs/Module/Events.php:105
-msgid "Event can not end before it has started."
-msgstr "Hendelsen kan ikke slutte før den starter."
+#: ../../Zotlabs/Module/Impel.php:187
+#, php-format
+msgid "%s element installed"
+msgstr "%s element installert"
 
-#: ../../Zotlabs/Module/Events.php:107 ../../Zotlabs/Module/Events.php:116
-#: ../../Zotlabs/Module/Events.php:136
-msgid "Unable to generate preview."
-msgstr "Klarer ikke å lage forhåndsvisning."
+#: ../../Zotlabs/Module/Impel.php:190
+#, php-format
+msgid "%s element installation failed"
+msgstr "Installasjon av %s-element mislyktes"
 
-#: ../../Zotlabs/Module/Events.php:114
-msgid "Event title and start time are required."
-msgstr "Hendelsestittel og starttidspunkt er påkrevd."
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
+msgstr "Tillatelse avvist."
 
-#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
-msgid "Event not found."
-msgstr "Hendelsen ble ikke funnet."
-
-#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949
-#: ../../include/text.php:1943 ../../include/conversation.php:123
-msgid "event"
-msgstr "hendelse"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Edit event title"
-msgstr "Endre tittel på hendelse"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Event title"
-msgstr "Tittel på hendelse"
-
-#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
-#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
-#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
-#: ../../include/datetime.php:245
-msgid "Required"
-msgstr "Påkrevd"
-
-#: ../../Zotlabs/Module/Events.php:451
-msgid "Categories (comma-separated list)"
-msgstr "Kategorier (kommaseparert liste)"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Edit Category"
-msgstr "Endre kategori"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Category"
-msgstr "Kategori"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Edit start date and time"
-msgstr "Endre startdato og tidspunkt"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Start date and time"
-msgstr "Startdato og tidspunkt"
-
-#: ../../Zotlabs/Module/Events.php:456 ../../Zotlabs/Module/Events.php:459
-msgid "Finish date and time are not known or not relevant"
-msgstr "Sluttdato og tidspunkt er ikke kjent eller ikke relevant"
-
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Edit finish date and time"
-msgstr "Endre sluttdato og tidspunkt"
-
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Finish date and time"
-msgstr "Sluttdato og tidspunkt"
-
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
-msgid "Adjust for viewer timezone"
-msgstr "Juster i forhold til tilskuerens tidssone"
-
-#: ../../Zotlabs/Module/Events.php:460
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
-msgstr "Viktig for hendelser som skjer på et bestemt sted. Ikke praktisk for globale ferier eller fridager."
-
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Edit Description"
-msgstr "Endre beskrivelse"
-
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117
-#: ../../Zotlabs/Module/Rbmark.php:101
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: ../../Zotlabs/Module/Events.php:464
-msgid "Edit Location"
-msgstr "Endre plassering"
-
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
-#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
-msgid "Location"
-msgstr "Plassering"
-
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
-msgid "Share this event"
-msgstr "Del denne hendelsen"
-
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:719
-#: ../../include/conversation.php:1187 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr "Forhåndsvisning"
-
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232
-msgid "Permission settings"
-msgstr "Tillatelser - innstillinger"
-
-#: ../../Zotlabs/Module/Events.php:476
-msgid "Advanced Options"
-msgstr "Avanserte alternativer"
-
-#: ../../Zotlabs/Module/Events.php:610
-msgid "Edit event"
-msgstr "Endre hendelse"
-
-#: ../../Zotlabs/Module/Events.php:612
-msgid "Delete event"
-msgstr "Slett hendelse"
-
-#: ../../Zotlabs/Module/Events.php:646
-msgid "calendar"
-msgstr "kalender"
-
-#: ../../Zotlabs/Module/Events.php:706
-msgid "Event removed"
-msgstr "Hendelse slettet"
-
-#: ../../Zotlabs/Module/Events.php:709
-msgid "Failed to remove event"
-msgstr "Mislyktes med å slette hendelse"
-
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220
-#: ../../include/nav.php:92 ../../include/conversation.php:1632
-msgid "Photos"
-msgstr "Bilder"
-
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591
-#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259
-msgid "Cancel"
-msgstr "Avbryt"
+#: ../../Zotlabs/Module/Cal.php:337
+msgid "Import"
+msgstr "Importer"
 
 #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
 msgid "This site is not a directory server"
@@ -1465,112 +1617,184 @@ msgstr "Dette nettstedet er ikke en katalogtjener"
 msgid "This directory server requires an access token"
 msgstr "Denne katalogtjeneren krever en tilgangsnøkkel (access token)"
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
-msgstr "Lagre til mappe:"
+#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:28
+#: ../../Zotlabs/Module/Wiki.php:20
+msgid "You must be logged in to see this page."
+msgstr "Du må være innloegget for å se denne siden."
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
-msgstr "- velg -"
+#: ../../Zotlabs/Module/Chat.php:181
+msgid "Room not found"
+msgstr "Rommet ble ikke funnet"
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
-#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:946
-#: ../../include/text.php:958 ../../include/widgets.php:201
-msgid "Save"
-msgstr "Lagre"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "Leave Room"
+msgstr "Forlat rom"
 
-#: ../../Zotlabs/Module/Dreport.php:27
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "Delete Room"
+msgstr "Slett rom"
+
+#: ../../Zotlabs/Module/Chat.php:199
+msgid "I am away right now"
+msgstr "Jeg er borte akkurat nå"
+
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "I am online"
+msgstr "Jeg er online"
+
+#: ../../Zotlabs/Module/Chat.php:202
+msgid "Bookmark this room"
+msgstr "Bokmerk dette rommet"
+
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:197
+#: ../../Zotlabs/Module/Mail.php:306 ../../include/conversation.php:1181
+msgid "Please enter a link URL:"
+msgstr "Vennligst skriv inn en lenke URL:"
+
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:250
+#: ../../Zotlabs/Module/Mail.php:375 ../../Zotlabs/Lib/ThreadItem.php:722
+#: ../../include/conversation.php:1271
+msgid "Encrypt text"
+msgstr "Krypter tekst"
+
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editwebpage.php:146
+#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:369
+#: ../../Zotlabs/Module/Editblock.php:111 ../../include/conversation.php:1146
+msgid "Insert web link"
+msgstr "Sett inn web-lenke"
+
+#: ../../Zotlabs/Module/Chat.php:218
+msgid "Feature disabled."
+msgstr "Funksjonen er avskrudd."
+
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "New Chatroom"
+msgstr "Nytt chatrom"
+
+#: ../../Zotlabs/Module/Chat.php:233
+msgid "Chatroom name"
+msgstr "Navn på chatrom"
+
+#: ../../Zotlabs/Module/Chat.php:234
+msgid "Expiration of chats (minutes)"
+msgstr "Chat utgår (antall minutter)"
+
+#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
+#: ../../include/acl_selectors.php:281
+msgid "Permissions"
+msgstr "Tillatelser"
+
+#: ../../Zotlabs/Module/Chat.php:246
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "%1$s sine chatrom"
+
+#: ../../Zotlabs/Module/Chat.php:251
+msgid "No chatrooms available"
+msgstr "Ingen tilgjengelige chatrom"
+
+#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create New"
+msgstr "Lag ny"
+
+#: ../../Zotlabs/Module/Chat.php:255
+msgid "Expiration"
+msgstr "Utløper"
+
+#: ../../Zotlabs/Module/Chat.php:256
+msgid "min"
+msgstr "min"
+
+#: ../../Zotlabs/Module/Dreport.php:44
 msgid "Invalid message"
 msgstr "Ugyldig melding"
 
-#: ../../Zotlabs/Module/Dreport.php:59
+#: ../../Zotlabs/Module/Dreport.php:76
 msgid "no results"
 msgstr "ingen resultater"
 
-#: ../../Zotlabs/Module/Dreport.php:64
+#: ../../Zotlabs/Module/Dreport.php:91
+msgid "channel sync processed"
+msgstr "Kanalsynkronisering er behandlet"
+
+#: ../../Zotlabs/Module/Dreport.php:95
+msgid "queued"
+msgstr "lagt i kø"
+
+#: ../../Zotlabs/Module/Dreport.php:99
+msgid "posted"
+msgstr "lagt inn"
+
+#: ../../Zotlabs/Module/Dreport.php:103
+msgid "accepted for delivery"
+msgstr "akseptert for levering"
+
+#: ../../Zotlabs/Module/Dreport.php:107
+msgid "updated"
+msgstr "oppdatert"
+
+#: ../../Zotlabs/Module/Dreport.php:110
+msgid "update ignored"
+msgstr "oppdatering ignorert"
+
+#: ../../Zotlabs/Module/Dreport.php:113
+msgid "permission denied"
+msgstr "tillatelse avvist"
+
+#: ../../Zotlabs/Module/Dreport.php:117
+msgid "recipient not found"
+msgstr "mottaker ble ikke funnet"
+
+#: ../../Zotlabs/Module/Dreport.php:120
+msgid "mail recalled"
+msgstr "melding tilbakekalt"
+
+#: ../../Zotlabs/Module/Dreport.php:123
+msgid "duplicate mail received"
+msgstr "duplikat av melding mottatt"
+
+#: ../../Zotlabs/Module/Dreport.php:126
+msgid "mail delivered"
+msgstr "melding mottatt"
+
+#: ../../Zotlabs/Module/Dreport.php:146
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Leveringsrapport for %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "channel sync processed"
-msgstr "Kanalsynkronisering er behandlet"
+#: ../../Zotlabs/Module/Dreport.php:149
+msgid "Options"
+msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:82
-msgid "queued"
-msgstr "lagt i kø"
+#: ../../Zotlabs/Module/Dreport.php:150
+msgid "Redeliver"
+msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:86
-msgid "posted"
-msgstr "lagt inn"
-
-#: ../../Zotlabs/Module/Dreport.php:90
-msgid "accepted for delivery"
-msgstr "akseptert for levering"
-
-#: ../../Zotlabs/Module/Dreport.php:94
-msgid "updated"
-msgstr "oppdatert"
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "update ignored"
-msgstr "oppdatering ignorert"
-
-#: ../../Zotlabs/Module/Dreport.php:100
-msgid "permission denied"
-msgstr "tillatelse avvist"
-
-#: ../../Zotlabs/Module/Dreport.php:104
-msgid "recipient not found"
-msgstr "mottaker ble ikke funnet"
-
-#: ../../Zotlabs/Module/Dreport.php:107
-msgid "mail recalled"
-msgstr "melding tilbakekalt"
-
-#: ../../Zotlabs/Module/Dreport.php:110
-msgid "duplicate mail received"
-msgstr "duplikat av melding mottatt"
-
-#: ../../Zotlabs/Module/Dreport.php:113
-msgid "mail delivered"
-msgstr "melding mottatt"
-
-#: ../../Zotlabs/Module/Editlayout.php:126
-#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
+#: ../../Zotlabs/Module/Editlayout.php:127
+#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
 msgid "Layout Name"
 msgstr "Layout-navn"
 
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:130
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:131
 msgid "Layout Description (Optional)"
 msgstr "Layoutens beskrivelse (valgfritt)"
 
-#: ../../Zotlabs/Module/Editlayout.php:135
+#: ../../Zotlabs/Module/Editlayout.php:136
 msgid "Edit Layout"
 msgstr "Endre layout"
 
-#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Zotlabs/Module/Editwebpage.php:142
 msgid "Page link"
-msgstr ""
+msgstr "Sidelenke"
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Editwebpage.php:168
 msgid "Edit Webpage"
 msgstr "Endre webside"
 
-#: ../../Zotlabs/Module/Follow.php:34
-msgid "Channel added."
-msgstr "Kanal lagt til."
-
-#: ../../Zotlabs/Module/Acl.php:227
-msgid "network"
-msgstr "nettverk"
-
-#: ../../Zotlabs/Module/Acl.php:237
-msgid "RSS"
-msgstr "RSS"
-
 #: ../../Zotlabs/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "Personverngruppen er opprettet."
@@ -1580,7 +1804,7 @@ msgid "Could not create privacy group."
 msgstr "Kunne ikke opprette personverngruppen."
 
 #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3893
+#: ../../include/items.php:3902
 msgid "Privacy group not found."
 msgstr "Personverngruppen ble ikke funnet"
 
@@ -1624,31 +1848,57 @@ msgstr "Alle tilkoblede kanaler"
 msgid "Click on a channel to add or remove."
 msgstr "Klikk på en kanal for å legge til eller fjerne."
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
-msgid "Share content from Firefox to $Projectname"
-msgstr "Del innhold fra Firefox til $Projectname"
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+msgid "App installed."
+msgstr "App installert."
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
-msgid "Activate the Firefox $Projectname provider"
-msgstr "Skru på Firefox $Projectname tilbyderen"
+#: ../../Zotlabs/Module/Appman.php:46
+msgid "Malformed app."
+msgstr "Feil oppsett for app-en."
 
-#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
-msgid "Authorize application connection"
-msgstr "Tillat programforbindelse"
+#: ../../Zotlabs/Module/Appman.php:104
+msgid "Embed code"
+msgstr "Innbyggingskode"
 
-#: ../../Zotlabs/Module/Api.php:62
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Gå tilbake til din app og legg inn denne sikkerhetskoden:"
+#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
+msgid "Edit App"
+msgstr "Endre app"
 
-#: ../../Zotlabs/Module/Api.php:72
-msgid "Please login to continue."
-msgstr "Vennligst logg inn for å fortsette."
+#: ../../Zotlabs/Module/Appman.php:110
+msgid "Create App"
+msgstr "Lag app"
 
-#: ../../Zotlabs/Module/Api.php:87
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" and/or create new posts for you?"
-msgstr "Vil du tillate dette programmet å få tilgang til dine innlegg og kontakter, og/eller lage nye innlegg for deg?"
+#: ../../Zotlabs/Module/Appman.php:115
+msgid "Name of app"
+msgstr "Navn på app"
+
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Location (URL) of app"
+msgstr "Plassering (URL) til app"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Photo icon URL"
+msgstr "Bildeikon URL"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "80 x 80 pixels - optional"
+msgstr "80 x80 pixler - valgfritt"
+
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "Categories (optional, comma separated list)"
+msgstr "Kategorier (valgfri, kommaseparert liste)"
+
+#: ../../Zotlabs/Module/Appman.php:120
+msgid "Version ID"
+msgstr "Versjons-ID"
+
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Price of app"
+msgstr "Pris på app"
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Location (URL) to purchase app"
+msgstr "Plassering (URL) for å kjøpe app"
 
 #: ../../Zotlabs/Module/Help.php:26
 msgid "Documentation Search"
@@ -1660,8 +1910,8 @@ msgid "Help:"
 msgstr "Hjelp:"
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223
-#: ../../include/nav.php:159
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/nav.php:161
 msgid "Help"
 msgstr "Hjelp"
 
@@ -1669,335 +1919,124 @@ msgstr "Hjelp"
 msgid "$Projectname Documentation"
 msgstr "$Projectname dokumentasjon"
 
-#: ../../Zotlabs/Module/Filestorage.php:88
-msgid "Permission Denied."
-msgstr "Tillatelse avvist."
-
-#: ../../Zotlabs/Module/Filestorage.php:104
-msgid "File not found."
-msgstr "Filen ble ikke funnet."
-
-#: ../../Zotlabs/Module/Filestorage.php:147
-msgid "Edit file permissions"
-msgstr "Endre filtillatelser"
-
-#: ../../Zotlabs/Module/Filestorage.php:156
-msgid "Set/edit permissions"
-msgstr "Angi/endre tillatelser"
-
-#: ../../Zotlabs/Module/Filestorage.php:157
-msgid "Include all files and sub folders"
-msgstr "Inkluder alle filer og undermapper"
-
-#: ../../Zotlabs/Module/Filestorage.php:158
-msgid "Return to file list"
-msgstr "Gå tilbake til filoversikten"
-
-#: ../../Zotlabs/Module/Filestorage.php:160
-msgid "Copy/paste this code to attach file to a post"
-msgstr "Kopier og lim inn denne koden for å legge til filen i et innlegg"
-
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Copy/paste this URL to link file from a web page"
-msgstr "Kopier og lim inn denne URL-en for å lenke til filen fra en webside"
-
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Share this file"
-msgstr "Del denne filen"
-
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Show URL to this file"
-msgstr "Vis URLen til denne filen"
-
-#: ../../Zotlabs/Module/Filestorage.php:165
-msgid "Notify your contacts about this file"
-msgstr "Varsle dine kontakter om denne filen"
-
-#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
-#: ../../include/nav.php:163
-msgid "Apps"
-msgstr "Apper"
-
 #: ../../Zotlabs/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Elementet er ikke tilgjengelig."
 
-#: ../../Zotlabs/Module/Import.php:32
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "Din tjenesteplan tillater bare %d kanaler."
+#: ../../Zotlabs/Module/Pdledit.php:18
+msgid "Layout updated."
+msgstr "Layout er oppdatert."
 
-#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
-msgstr "Ingenting å importere."
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
+msgid "Edit System Page Description"
+msgstr "Endre beskrivelsen av systemsiden"
 
-#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
-msgstr "Ikke i stand til å laste ned data fra gammel tjener"
+#: ../../Zotlabs/Module/Pdledit.php:56
+msgid "Layout not found."
+msgstr "Layouten ble ikke funnet."
 
-#: ../../Zotlabs/Module/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
-msgstr "Importert fil er tom."
+#: ../../Zotlabs/Module/Pdledit.php:62
+msgid "Module Name:"
+msgstr "Modulnavn:"
 
-#: ../../Zotlabs/Module/Import.php:122
-#: ../../Zotlabs/Module/Import_items.php:86
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Advarsel: databaseversjoner avviker med %1$d oppdateringer."
+#: ../../Zotlabs/Module/Pdledit.php:63
+msgid "Layout Help"
+msgstr "Layout-hjelp"
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
-msgid "Cloned channel not found. Import failed."
-msgstr "Klonet kanal ble ikke funnet. Import mislyktes."
+#: ../../Zotlabs/Module/Ffsapi.php:12
+msgid "Share content from Firefox to $Projectname"
+msgstr "Del innhold fra Firefox til $Projectname"
 
-#: ../../Zotlabs/Module/Import.php:160
-msgid "No channel. Import failed."
-msgstr "Ingen kanal. Import mislyktes."
+#: ../../Zotlabs/Module/Ffsapi.php:15
+msgid "Activate the Firefox $Projectname provider"
+msgstr "Skru på Firefox $Projectname tilbyderen"
 
-#: ../../Zotlabs/Module/Import.php:510
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
-msgstr "Import ferdig."
+#: ../../Zotlabs/Module/Acl.php:312
+msgid "network"
+msgstr "nettverk"
 
-#: ../../Zotlabs/Module/Import.php:532
-msgid "You must be logged in to use this feature."
-msgstr "Du må være innlogget for å bruke denne funksjonen."
+#: ../../Zotlabs/Module/Acl.php:322
+msgid "RSS"
+msgstr "RSS"
 
-#: ../../Zotlabs/Module/Import.php:537
-msgid "Import Channel"
-msgstr "Importer kanal"
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
+msgstr "Tillatelse avvist."
 
-#: ../../Zotlabs/Module/Import.php:538
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You"
-" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file."
-msgstr "Bruk dette skjemaet for å importere en eksisterende kanal fra en annen tjener/hub. Du kan hente inn kanalidentiteten fra den gamle tjeneren/huben via nettverket eller ved å bruke en eksportfil."
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
+msgstr "Filen ble ikke funnet."
 
-#: ../../Zotlabs/Module/Import.php:539
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "File to Upload"
-msgstr "Fil som skal lastes opp"
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
+msgstr "Endre filtillatelser"
 
-#: ../../Zotlabs/Module/Import.php:540
-msgid "Or provide the old server/hub details"
-msgstr "Eller oppgi detaljene fra den gamle tjeneren/hub-en"
+#: ../../Zotlabs/Module/Filestorage.php:155
+msgid "Set/edit permissions"
+msgstr "Angi/endre tillatelser"
 
-#: ../../Zotlabs/Module/Import.php:541
-msgid "Your old identity address (xyz@example.com)"
-msgstr "Din gamle identitetsadresse (xyz@example.com)"
+#: ../../Zotlabs/Module/Filestorage.php:156
+msgid "Include all files and sub folders"
+msgstr "Inkluder alle filer og undermapper"
 
-#: ../../Zotlabs/Module/Import.php:542
-msgid "Your old login email address"
-msgstr "Din gamle innloggings e-postadresse"
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Return to file list"
+msgstr "Gå tilbake til filoversikten"
 
-#: ../../Zotlabs/Module/Import.php:543
-msgid "Your old login password"
-msgstr "Ditt gamle innloggingspassord"
+#: ../../Zotlabs/Module/Filestorage.php:159
+msgid "Copy/paste this code to attach file to a post"
+msgstr "Kopier og lim inn denne koden for å legge til filen i et innlegg"
 
-#: ../../Zotlabs/Module/Import.php:544
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be"
-" able to post from either location, but only one can be marked as the "
-"primary location for files, photos, and media."
-msgstr "Enten du tar det ene eller det andre valget, vennligst angi om du vil at denne hubben skal være din nye primære adresse, eller om din gamle plassering skal fortsette å ha denne rollen. Du kan lage innlegg fra den ene eller den andre plasseringen, men bare en av dem kan markeres som den primære plasseringen for filer, bilder og media."
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Copy/paste this URL to link file from a web page"
+msgstr "Kopier og lim inn denne URL-en for å lenke til filen fra en webside"
 
-#: ../../Zotlabs/Module/Import.php:545
-msgid "Make this hub my primary location"
-msgstr "Gjør dette nettstedet til min primære plassering"
+#: ../../Zotlabs/Module/Filestorage.php:162
+msgid "Share this file"
+msgstr "Del denne filen"
 
-#: ../../Zotlabs/Module/Import.php:546
-msgid ""
-"Import existing posts if possible (experimental - limited by available "
-"memory"
-msgstr "Importer eksisterende innlegg om mulig (eksperimentelt - begrenset av tilgjengelig minne)"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Show URL to this file"
+msgstr "Vis URLen til denne filen"
 
-#: ../../Zotlabs/Module/Import.php:547
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
-msgstr "Denne prosessen kan ta flere minutter å fullføre. Vennligst send inn dette skjemaet bare en gang og la siden være åpen inntil den er ferdig."
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Notify your contacts about this file"
+msgstr "Varsle dine kontakter om denne filen"
 
-#: ../../Zotlabs/Module/Item.php:178
-msgid "Unable to locate original post."
-msgstr "Ikke i stand til å finne opprinnelig innlegg."
-
-#: ../../Zotlabs/Module/Item.php:427
-msgid "Empty post discarded."
-msgstr "Tomt innlegg forkastet."
-
-#: ../../Zotlabs/Module/Item.php:467
-msgid "Executable content type not permitted to this channel."
-msgstr "Kjørbar innholdstype er ikke tillat for denne kanalen."
-
-#: ../../Zotlabs/Module/Item.php:847
-msgid "Duplicate post suppressed."
-msgstr "Duplikat av innlegg forhindret."
-
-#: ../../Zotlabs/Module/Item.php:977
-msgid "System error. Post not saved."
-msgstr "Systemfeil. Innlegg ble ikke lagret."
-
-#: ../../Zotlabs/Module/Item.php:1241
-msgid "Unable to obtain post information from database."
-msgstr "Ikke i stand til å få tak i informasjon om innlegg fra databasen."
-
-#: ../../Zotlabs/Module/Item.php:1248
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Du har nådd din grense på %1$.0f startinnlegg."
-
-#: ../../Zotlabs/Module/Item.php:1255
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Du har nådd din grense på %1$.0f websider."
-
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2267
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2240
 msgid "Layouts"
 msgstr "Layout"
 
-#: ../../Zotlabs/Module/Layouts.php:183
+#: ../../Zotlabs/Module/Layouts.php:185
 msgid "Comanche page description language help"
 msgstr "Hjelp med Comanche sidebeskrivelsesspråk"
 
-#: ../../Zotlabs/Module/Layouts.php:187
+#: ../../Zotlabs/Module/Layouts.php:189
 msgid "Layout Description"
 msgstr "Layout-beskrivelse"
 
-#: ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:114
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Webpages.php:205
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr "Laget"
+
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:115
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Webpages.php:206
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+msgstr "Endret"
+
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1070
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:195
+#: ../../include/conversation.php:1219
+msgid "Share"
+msgstr "Del"
+
+#: ../../Zotlabs/Module/Layouts.php:194
 msgid "Download PDL file"
 msgstr "Last ned PDL-fil"
 
-#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
-#: ../../Zotlabs/Module/Siteinfo.php:65
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../Zotlabs/Module/Home.php:79
-#, php-format
-msgid "Welcome to %s"
-msgstr "Velkommen til %s"
-
-#: ../../Zotlabs/Module/Id.php:13
-msgid "First Name"
-msgstr "Fornavn"
-
-#: ../../Zotlabs/Module/Id.php:14
-msgid "Last Name"
-msgstr "Etternavn"
-
-#: ../../Zotlabs/Module/Id.php:15
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#: ../../Zotlabs/Module/Id.php:16
-msgid "Full Name"
-msgstr "Fullt navn"
-
-#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
-#: ../../include/network.php:2151 ../../boot.php:1705
-msgid "Email"
-msgstr "E-post"
-
-#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236
-msgid "Profile Photo"
-msgstr "Profilbilde"
-
-#: ../../Zotlabs/Module/Id.php:22
-msgid "Profile Photo 16px"
-msgstr "Profilbilde 16px"
-
-#: ../../Zotlabs/Module/Id.php:23
-msgid "Profile Photo 32px"
-msgstr "Profilbilde 32px"
-
-#: ../../Zotlabs/Module/Id.php:24
-msgid "Profile Photo 48px"
-msgstr "Profilbilde 48px"
-
-#: ../../Zotlabs/Module/Id.php:25
-msgid "Profile Photo 64px"
-msgstr "Profilbilde 64px"
-
-#: ../../Zotlabs/Module/Id.php:26
-msgid "Profile Photo 80px"
-msgstr "Profilbilde 80px"
-
-#: ../../Zotlabs/Module/Id.php:27
-msgid "Profile Photo 128px"
-msgstr "Profilbilde 128px"
-
-#: ../../Zotlabs/Module/Id.php:28
-msgid "Timezone"
-msgstr "Tidssone"
-
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
-msgid "Homepage URL"
-msgstr "Hjemmeside URL"
-
-#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234
-msgid "Language"
-msgstr "Språk"
-
-#: ../../Zotlabs/Module/Id.php:31
-msgid "Birth Year"
-msgstr "Fødselsår"
-
-#: ../../Zotlabs/Module/Id.php:32
-msgid "Birth Month"
-msgstr "Fødselsmåne"
-
-#: ../../Zotlabs/Module/Id.php:33
-msgid "Birth Day"
-msgstr "Fødselsdag"
-
-#: ../../Zotlabs/Module/Id.php:34
-msgid "Birthdate"
-msgstr "Fødselsdato"
-
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
-msgid "Gender"
-msgstr "Kjønn"
-
-#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Male"
-msgstr "Mannlig"
-
-#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Female"
-msgstr "Kvinnelig"
-
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
-msgid "webpage"
-msgstr "nettside"
-
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
-msgid "block"
-msgstr "byggekloss"
-
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
-msgid "layout"
-msgstr "layout"
-
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
-msgid "menu"
-msgstr "meny"
-
-#: ../../Zotlabs/Module/Impel.php:196
-#, php-format
-msgid "%s element installed"
-msgstr "%s element installert"
-
-#: ../../Zotlabs/Module/Impel.php:199
-#, php-format
-msgid "%s element installation failed"
-msgstr "Installasjon av %s-element mislyktes"
-
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr "Liker/Liker ikke"
@@ -2033,74 +2072,782 @@ msgstr "Kanalen er utilgjengelig."
 msgid "Previous action reversed."
 msgstr "Forrige handling er omgjort."
 
-#: ../../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/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
+#: ../../include/text.php:1921
 msgid "photo"
 msgstr "foto"
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/text.php:1946 ../../include/conversation.php:148
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../include/conversation.php:148 ../../include/text.php:1927
 msgid "status"
 msgstr "status"
 
-#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
+#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s liker %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s liker ikke %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Like.php:424
+#: ../../Zotlabs/Module/Like.php:423
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s er enig med %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Like.php:426
+#: ../../Zotlabs/Module/Like.php:425
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s er ikke enig med %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Like.php:428
+#: ../../Zotlabs/Module/Like.php:427
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s avstår fra å mene noe om %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Like.php:430
+#: ../../Zotlabs/Module/Like.php:429
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s deltar på %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:432
+#: ../../Zotlabs/Module/Like.php:431
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s deltar ikke på %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:434
+#: ../../Zotlabs/Module/Like.php:433
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s deltar kanskje på %2$ss %3$s"
 
-#: ../../Zotlabs/Module/Like.php:537
+#: ../../Zotlabs/Module/Like.php:536
 msgid "Action completed."
 msgstr "Handling ferdig."
 
-#: ../../Zotlabs/Module/Like.php:538
+#: ../../Zotlabs/Module/Like.php:537
 msgid "Thank you."
 msgstr "Tusen takk."
 
-#: ../../Zotlabs/Module/Import_items.php:102
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
+#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
+msgid "Profile not found."
+msgstr "Profilen ble ikke funnet."
+
+#: ../../Zotlabs/Module/Profiles.php:44
+msgid "Profile deleted."
+msgstr "Profilen er slettet."
+
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
+msgid "Profile-"
+msgstr "Profil-"
+
+#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132
+msgid "New profile created."
+msgstr "Ny profil opprettet."
+
+#: ../../Zotlabs/Module/Profiles.php:110
+msgid "Profile unavailable to clone."
+msgstr "Profilen er utilgjengelig for klonen."
+
+#: ../../Zotlabs/Module/Profiles.php:151
+msgid "Profile unavailable to export."
+msgstr "Profilen er utilgjengelig for eksport."
+
+#: ../../Zotlabs/Module/Profiles.php:256
+msgid "Profile Name is required."
+msgstr "Profilnavn er påkrevd."
+
+#: ../../Zotlabs/Module/Profiles.php:427
+msgid "Marital Status"
+msgstr "Sivilstand"
+
+#: ../../Zotlabs/Module/Profiles.php:431
+msgid "Romantic Partner"
+msgstr "Romantisk partner"
+
+#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736
+msgid "Likes"
+msgstr "Liker"
+
+#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737
+msgid "Dislikes"
+msgstr "Liker ikke"
+
+#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744
+msgid "Work/Employment"
+msgstr "Arbeid/sysselsetting"
+
+#: ../../Zotlabs/Module/Profiles.php:446
+msgid "Religion"
+msgstr "Religion"
+
+#: ../../Zotlabs/Module/Profiles.php:450
+msgid "Political Views"
+msgstr "Politiske synspunkter"
+
+#: ../../Zotlabs/Module/Profiles.php:458
+msgid "Sexual Preference"
+msgstr "Seksuelle preferanser"
+
+#: ../../Zotlabs/Module/Profiles.php:462
+msgid "Homepage"
+msgstr "Hjemmeside"
+
+#: ../../Zotlabs/Module/Profiles.php:466
+msgid "Interests"
+msgstr "Interesser"
+
+#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1224
+msgid "Address"
+msgstr "Adresse"
+
+#: ../../Zotlabs/Module/Profiles.php:560
+msgid "Profile updated."
+msgstr "Profilen er oppdatert."
+
+#: ../../Zotlabs/Module/Profiles.php:644
+msgid "Hide your connections list from viewers of this profile"
+msgstr "Skjul listen med forbindelser fra besøkende som ser denne profilen"
+
+#: ../../Zotlabs/Module/Profiles.php:686
+msgid "Edit Profile Details"
+msgstr "Endre profildetaljer"
+
+#: ../../Zotlabs/Module/Profiles.php:688
+msgid "View this profile"
+msgstr "Vis denne profilen"
+
+#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
+#: ../../include/channel.php:998
+msgid "Edit visibility"
+msgstr "Endre synlighet"
+
+#: ../../Zotlabs/Module/Profiles.php:690
+msgid "Profile Tools"
+msgstr "Profilverktøy"
+
+#: ../../Zotlabs/Module/Profiles.php:691
+msgid "Change cover photo"
+msgstr "Endre forsidebilde"
+
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:969
+msgid "Change profile photo"
+msgstr "Endre profilbilde"
+
+#: ../../Zotlabs/Module/Profiles.php:693
+msgid "Create a new profile using these settings"
+msgstr "Lag en ny profil ved å bruke disse innstillingene"
+
+#: ../../Zotlabs/Module/Profiles.php:694
+msgid "Clone this profile"
+msgstr "Klon denne profilen"
+
+#: ../../Zotlabs/Module/Profiles.php:695
+msgid "Delete this profile"
+msgstr "Slett denne profilen"
+
+#: ../../Zotlabs/Module/Profiles.php:696
+msgid "Add profile things"
+msgstr "Legg til profilting"
+
+#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541
+#: ../../include/widgets.php:105
+msgid "Personal"
+msgstr "Personlig"
+
+#: ../../Zotlabs/Module/Profiles.php:699
+msgid "Relation"
+msgstr "Forhold"
+
+#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48
+msgid "Miscellaneous"
+msgstr "Forskjellig"
+
+#: ../../Zotlabs/Module/Profiles.php:702
+msgid "Import profile from file"
+msgstr "Importer profil fra fil"
+
+#: ../../Zotlabs/Module/Profiles.php:703
+msgid "Export profile to file"
+msgstr "Eksporter profil til fil"
+
+#: ../../Zotlabs/Module/Profiles.php:704
+msgid "Your gender"
+msgstr "Ditt kjønn"
+
+#: ../../Zotlabs/Module/Profiles.php:705
+msgid "Marital status"
+msgstr "Sivilstand"
+
+#: ../../Zotlabs/Module/Profiles.php:706
+msgid "Sexual preference"
+msgstr "Seksuelle preferanser"
+
+#: ../../Zotlabs/Module/Profiles.php:709
+msgid "Profile name"
+msgstr "Profilnavn"
+
+#: ../../Zotlabs/Module/Profiles.php:711
+msgid "This is your default profile."
+msgstr "Dette er din standardprofil."
+
+#: ../../Zotlabs/Module/Profiles.php:713
+msgid "Your full name"
+msgstr "Ditt fulle navn"
+
+#: ../../Zotlabs/Module/Profiles.php:714
+msgid "Title/Description"
+msgstr "Tittel/beskrivelse"
+
+#: ../../Zotlabs/Module/Profiles.php:717
+msgid "Street address"
+msgstr "Gateadresse"
+
+#: ../../Zotlabs/Module/Profiles.php:718
+msgid "Locality/City"
+msgstr "Sted/by"
+
+#: ../../Zotlabs/Module/Profiles.php:719
+msgid "Region/State"
+msgstr "Region/fylke"
+
+#: ../../Zotlabs/Module/Profiles.php:720
+msgid "Postal/Zip code"
+msgstr "Postnummer/ZIP-kode"
+
+#: ../../Zotlabs/Module/Profiles.php:721
+msgid "Country"
+msgstr "Land"
+
+#: ../../Zotlabs/Module/Profiles.php:726
+msgid "Who (if applicable)"
+msgstr "Hvem (hvis det er aktuelt)"
+
+#: ../../Zotlabs/Module/Profiles.php:726
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+msgstr "Eksempler: kari123, Kari Villiamsen, kari@example.com"
+
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "Since (date)"
+msgstr "Siden (dato)"
+
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Tell us about yourself"
+msgstr "Fortell oss om deg selv"
+
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Hometown"
+msgstr "Hjemby"
+
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Political views"
+msgstr "Politiske synspunkter"
+
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Religious views"
+msgstr "Religiøse synspunkter"
+
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Keywords used in directory listings"
+msgstr "Nøkkelord bruk i katalogoppføringer"
+
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Example: fishing photography software"
+msgstr "Eksempel: fisking fotografering programvare"
+
+#: ../../Zotlabs/Module/Profiles.php:738
+msgid "Musical interests"
+msgstr "Musikkinteresser"
+
+#: ../../Zotlabs/Module/Profiles.php:739
+msgid "Books, literature"
+msgstr "Bøker, litteratur"
+
+#: ../../Zotlabs/Module/Profiles.php:740
+msgid "Television"
+msgstr "TV/fjernsyn"
+
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Film/Dance/Culture/Entertainment"
+msgstr "Film/dans/kultur/underholdning"
+
+#: ../../Zotlabs/Module/Profiles.php:742
+msgid "Hobbies/Interests"
+msgstr "Hobbier/Interesser"
+
+#: ../../Zotlabs/Module/Profiles.php:743
+msgid "Love/Romance"
+msgstr "Kjærlighet/romantikk"
+
+#: ../../Zotlabs/Module/Profiles.php:745
+msgid "School/Education"
+msgstr "Skole/utdanning"
+
+#: ../../Zotlabs/Module/Profiles.php:746
+msgid "Contact information and social networks"
+msgstr "Kontaktinformasjon og sosiale nettverk"
+
+#: ../../Zotlabs/Module/Profiles.php:747
+msgid "My other channels"
+msgstr "Mine andre kanaler"
+
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:994
+msgid "Profile Image"
+msgstr "Profilbilde"
+
+#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
+#: ../../include/channel.php:976
+msgid "Edit Profiles"
+msgstr "Endre profiler"
+
+#: ../../Zotlabs/Module/Import.php:33
+#, php-format
+msgid "Your service plan only allows %d channels."
+msgstr "Din tjenesteplan tillater bare %d kanaler."
+
+#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42
+msgid "Nothing to import."
+msgstr "Ingenting å importere."
+
+#: ../../Zotlabs/Module/Import.php:95 ../../Zotlabs/Module/Import_items.php:66
+msgid "Unable to download data from old server"
+msgstr "Ikke i stand til å laste ned data fra gammel tjener"
+
+#: ../../Zotlabs/Module/Import.php:101
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Imported file is empty."
+msgstr "Importert fil er tom."
+
+#: ../../Zotlabs/Module/Import.php:123
+#: ../../Zotlabs/Module/Import_items.php:88
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Advarsel: databaseversjoner avviker med %1$d oppdateringer."
+
+#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107
+msgid "Cloned channel not found. Import failed."
+msgstr "Klonet kanal ble ikke funnet. Import mislyktes."
+
+#: ../../Zotlabs/Module/Import.php:163
+msgid "No channel. Import failed."
+msgstr "Ingen kanal. Import mislyktes."
+
+#: ../../Zotlabs/Module/Import.php:520
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
+msgstr "Import ferdig."
+
+#: ../../Zotlabs/Module/Import.php:542
+msgid "You must be logged in to use this feature."
+msgstr "Du må være innlogget for å bruke denne funksjonen."
+
+#: ../../Zotlabs/Module/Import.php:547
+msgid "Import Channel"
+msgstr "Importer kanal"
+
+#: ../../Zotlabs/Module/Import.php:548
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file."
+msgstr "Bruk dette skjemaet for å importere en eksisterende kanal fra en annen tjener/hub. Du kan hente inn kanalidentiteten fra den gamle tjeneren/huben via nettverket eller ved å bruke en eksportfil."
+
+#: ../../Zotlabs/Module/Import.php:549
+#: ../../Zotlabs/Module/Import_items.php:121
+msgid "File to Upload"
+msgstr "Fil som skal lastes opp"
+
+#: ../../Zotlabs/Module/Import.php:550
+msgid "Or provide the old server/hub details"
+msgstr "Eller oppgi detaljene fra den gamle tjeneren/hub-en"
+
+#: ../../Zotlabs/Module/Import.php:551
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Din gamle identitetsadresse (xyz@example.com)"
+
+#: ../../Zotlabs/Module/Import.php:552
+msgid "Your old login email address"
+msgstr "Din gamle innloggings e-postadresse"
+
+#: ../../Zotlabs/Module/Import.php:553
+msgid "Your old login password"
+msgstr "Ditt gamle innloggingspassord"
+
+#: ../../Zotlabs/Module/Import.php:554
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Enten du tar det ene eller det andre valget, vennligst angi om du vil at denne hubben skal være din nye primære adresse, eller om din gamle plassering skal fortsette å ha denne rollen. Du kan lage innlegg fra den ene eller den andre plasseringen, men bare en av dem kan markeres som den primære plasseringen for filer, bilder og media."
+
+#: ../../Zotlabs/Module/Import.php:555
+msgid "Make this hub my primary location"
+msgstr "Gjør dette nettstedet til min primære plassering"
+
+#: ../../Zotlabs/Module/Import.php:556
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importer eksisterende innlegg om mulig (eksperimentelt - begrenset av tilgjengelig minne)"
+
+#: ../../Zotlabs/Module/Import.php:557
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Denne prosessen kan ta flere minutter å fullføre. Vennligst send inn dette skjemaet bare en gang og la siden være åpen inntil den er ferdig."
+
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../Zotlabs/Module/Siteinfo.php:48
+msgid "$Projectname"
+msgstr "$Projectname"
+
+#: ../../Zotlabs/Module/Home.php:92
+#, php-format
+msgid "Welcome to %s"
+msgstr "Velkommen til %s"
+
+#: ../../Zotlabs/Module/Item.php:179
+msgid "Unable to locate original post."
+msgstr "Ikke i stand til å finne opprinnelig innlegg."
+
+#: ../../Zotlabs/Module/Item.php:432
+msgid "Empty post discarded."
+msgstr "Tomt innlegg forkastet."
+
+#: ../../Zotlabs/Module/Item.php:472
+msgid "Executable content type not permitted to this channel."
+msgstr "Kjørbar innholdstype er ikke tillat for denne kanalen."
+
+#: ../../Zotlabs/Module/Item.php:856
+msgid "Duplicate post suppressed."
+msgstr "Duplikat av innlegg forhindret."
+
+#: ../../Zotlabs/Module/Item.php:989
+msgid "System error. Post not saved."
+msgstr "Systemfeil. Innlegg ble ikke lagret."
+
+#: ../../Zotlabs/Module/Item.php:1242
+msgid "Unable to obtain post information from database."
+msgstr "Ikke i stand til å få tak i informasjon om innlegg fra databasen."
+
+#: ../../Zotlabs/Module/Item.php:1249
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Du har nådd din grense på %1$.0f startinnlegg."
+
+#: ../../Zotlabs/Module/Item.php:1256
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Du har nådd din grense på %1$.0f websider."
+
+#: ../../Zotlabs/Module/Photos.php:82
+msgid "Page owner information could not be retrieved."
+msgstr "Informasjon om sideeier kunne ikke hentes."
+
+#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:741
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:212
+#: ../../Zotlabs/Module/Profile_photo.php:311
+#: ../../include/photo/photo_driver.php:718
+msgid "Profile Photos"
+msgstr "Profilbilder"
+
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147
+msgid "Album not found."
+msgstr "Albumet ble ikke funnet."
+
+#: ../../Zotlabs/Module/Photos.php:130
+msgid "Delete Album"
+msgstr "Slett album"
+
+#: ../../Zotlabs/Module/Photos.php:151
+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 "Flere lagringsmapper finnes med dette albumnavnet, men i ulike mapper. Vennligst fjern den ønskede mappen eller mappene med filbehandleren."
+
+#: ../../Zotlabs/Module/Photos.php:208 ../../Zotlabs/Module/Photos.php:1051
+msgid "Delete Photo"
+msgstr "Slett bilde"
+
+#: ../../Zotlabs/Module/Photos.php:531
+msgid "No photos selected"
+msgstr "Ingen bilder valgt"
+
+#: ../../Zotlabs/Module/Photos.php:580
+msgid "Access to this item is restricted."
+msgstr "Tilgang til dette elementet er begrenset."
+
+#: ../../Zotlabs/Module/Photos.php:619
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt."
+
+#: ../../Zotlabs/Module/Photos.php:622
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB lagringsplass til bilder er brukt."
+
+#: ../../Zotlabs/Module/Photos.php:658
+msgid "Upload Photos"
+msgstr "Last opp bilder"
+
+#: ../../Zotlabs/Module/Photos.php:662
+msgid "Enter an album name"
+msgstr "Skriv et albumnavn"
+
+#: ../../Zotlabs/Module/Photos.php:663
+msgid "or select an existing album (doubleclick)"
+msgstr "eller velg et eksisterende album (dobbeltklikk)"
+
+#: ../../Zotlabs/Module/Photos.php:664
+msgid "Create a status post for this upload"
+msgstr "Lag et statusinnlegg for denne opplastingen"
+
+#: ../../Zotlabs/Module/Photos.php:665
+msgid "Caption (optional):"
+msgstr "Bildetekst (valgfritt):"
+
+#: ../../Zotlabs/Module/Photos.php:666
+msgid "Description (optional):"
+msgstr "Beskrivelse (valgfritt):"
+
+#: ../../Zotlabs/Module/Photos.php:693
+msgid "Album name could not be decoded"
+msgstr "Albumnavnet kunne ikke dekodes"
+
+#: ../../Zotlabs/Module/Photos.php:741
+msgid "Contact Photos"
+msgstr "Kontaktbilder"
+
+#: ../../Zotlabs/Module/Photos.php:764
+msgid "Show Newest First"
+msgstr "Vis nyeste først"
+
+#: ../../Zotlabs/Module/Photos.php:766
+msgid "Show Oldest First"
+msgstr "Vis eldste først"
+
+#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1329
+#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1593
+msgid "View Photo"
+msgstr "Vis foto"
+
+#: ../../Zotlabs/Module/Photos.php:821
+#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1610
+msgid "Edit Album"
+msgstr "Endre album"
+
+#: ../../Zotlabs/Module/Photos.php:868
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Tillatelse avvist. Tilgang til dette elementet kan være begrenset."
+
+#: ../../Zotlabs/Module/Photos.php:870
+msgid "Photo not available"
+msgstr "Bilde er utilgjengelig"
+
+#: ../../Zotlabs/Module/Photos.php:928
+msgid "Use as profile photo"
+msgstr "Bruk som profilbilde"
+
+#: ../../Zotlabs/Module/Photos.php:929
+msgid "Use as cover photo"
+msgstr "Bruk som forsidebilde"
+
+#: ../../Zotlabs/Module/Photos.php:936
+msgid "Private Photo"
+msgstr "Privat bilde"
+
+#: ../../Zotlabs/Module/Photos.php:951
+msgid "View Full Size"
+msgstr "Vis i full størrelse"
+
+#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Admin.php:1437
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
+msgstr "Fjern"
+
+#: ../../Zotlabs/Module/Photos.php:1030
+msgid "Edit photo"
+msgstr "Endre bilde"
+
+#: ../../Zotlabs/Module/Photos.php:1032
+msgid "Rotate CW (right)"
+msgstr "Roter med klokka (mot høyre)"
+
+#: ../../Zotlabs/Module/Photos.php:1033
+msgid "Rotate CCW (left)"
+msgstr "Roter mot klokka (venstre)"
+
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "Enter a new album name"
+msgstr "Skriv et nytt albumnavn"
+
+#: ../../Zotlabs/Module/Photos.php:1037
+msgid "or select an existing one (doubleclick)"
+msgstr "eller velg et eksisterende album (dobbeltklikk)"
+
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Caption"
+msgstr "Overskrift"
+
+#: ../../Zotlabs/Module/Photos.php:1042
+msgid "Add a Tag"
+msgstr "Legg til merkelapp"
+
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Eksempel: @bob, @Barbara_Jensen, @jim@example.com"
+
+#: ../../Zotlabs/Module/Photos.php:1049
+msgid "Flag as adult in album view"
+msgstr "Flag som voksent i albumvisning"
+
+#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Lib/ThreadItem.php:261
+msgid "I like this (toggle)"
+msgstr "Jeg liker dette (skru av og på)"
+
+#: ../../Zotlabs/Module/Photos.php:1069 ../../Zotlabs/Lib/ThreadItem.php:262
+msgid "I don't like this (toggle)"
+msgstr "Jeg liker ikke dette (skru av og på)"
+
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:397
+#: ../../include/conversation.php:743
+msgid "Please wait"
+msgstr "Vennligst vent"
+
+#: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1205
+#: ../../Zotlabs/Lib/ThreadItem.php:707
+msgid "This is you"
+msgstr "Dette er deg"
+
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
+#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr "Kommentar"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
+msgstr "Liker"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
+msgstr "Liker ikke"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
+msgstr "Enig"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
+msgstr "Uenig"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
+msgstr "Avstår"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
+msgstr "Deltar"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
+msgstr "Deltar ikke"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
+msgstr "Deltar kanskje"
+
+#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1136
+#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../include/conversation.php:1738
+msgid "View all"
+msgstr "Vis alle"
+
+#: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../include/taxonomy.php:403 ../../include/channel.php:1198
+#: ../../include/conversation.php:1762
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "Liker"
+msgstr[1] "Liker"
+
+#: ../../Zotlabs/Module/Photos.php:1133 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/conversation.php:1765
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "Liker ikke"
+msgstr[1] "Liker ikke"
+
+#: ../../Zotlabs/Module/Photos.php:1233
+msgid "Photo Tools"
+msgstr "Fotoverktøy"
+
+#: ../../Zotlabs/Module/Photos.php:1242
+msgid "In This Photo:"
+msgstr "I dette bildet:"
+
+#: ../../Zotlabs/Module/Photos.php:1247
+msgid "Map"
+msgstr "Kart"
+
+#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/ThreadItem.php:386
+msgctxt "noun"
+msgid "Likes"
+msgstr "Liker"
+
+#: ../../Zotlabs/Module/Photos.php:1256 ../../Zotlabs/Lib/ThreadItem.php:387
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "Liker ikke"
+
+#: ../../Zotlabs/Module/Photos.php:1261 ../../Zotlabs/Lib/ThreadItem.php:392
+#: ../../include/acl_selectors.php:283
+msgid "Close"
+msgstr "Lukk"
+
+#: ../../Zotlabs/Module/Photos.php:1335
+msgid "View Album"
+msgstr "Vis album"
+
+#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359
+#: ../../Zotlabs/Module/Photos.php:1360
+msgid "Recent Photos"
+msgstr "Nye bilder"
+
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
+msgstr "Ekstern personverninformasjon er ikke tilgjengelig."
+
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
+msgstr "Synlig for:"
+
+#: ../../Zotlabs/Module/Import_items.php:104
 msgid "Import completed"
 msgstr "Import ferdig"
 
-#: ../../Zotlabs/Module/Import_items.php:117
+#: ../../Zotlabs/Module/Import_items.php:119
 msgid "Import Items"
 msgstr "Importer elementer"
 
-#: ../../Zotlabs/Module/Import_items.php:118
+#: ../../Zotlabs/Module/Import_items.php:120
 msgid ""
 "Use this form to import existing posts and content from an export file."
 msgstr "Bruk dette skjemaet for å importere eksisterende innlegg og innhold fra en eksportfil."
@@ -2146,7 +2893,7 @@ msgstr "Send invitasjoner"
 msgid "Enter email addresses, one per line:"
 msgstr "Skriv e-postadresser, en per linje:"
 
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
+#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:241
 msgid "Your message:"
 msgstr "Din melding:"
 
@@ -2175,14 +2922,6 @@ msgstr "eller besøke"
 msgid "3. Click [Connect]"
 msgstr "3. Klikk [Forbindelse]"
 
-#: ../../Zotlabs/Module/Lockview.php:61
-msgid "Remote privacy information not available."
-msgstr "Ekstern personverninformasjon er ikke tilgjengelig."
-
-#: ../../Zotlabs/Module/Lockview.php:82
-msgid "Visible to:"
-msgstr "Synlig for:"
-
 #: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
 msgid "Location not found."
 msgstr "Plassering er ikke funnet."
@@ -2209,14 +2948,9 @@ msgstr "Ingen plasseringer ble funnet."
 msgid "Manage Channel Locations"
 msgstr "Håndter kanalplasseringer"
 
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470
-#: ../../Zotlabs/Module/Admin.php:1224
-msgid "Address"
-msgstr "Adresse"
-
 #: ../../Zotlabs/Module/Locs.php:119
 msgid "Primary"
-msgstr ""
+msgstr "Hoved"
 
 #: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
 msgid "Drop"
@@ -2224,7 +2958,7 @@ msgstr "Slett"
 
 #: ../../Zotlabs/Module/Locs.php:122
 msgid "Sync Now"
-msgstr ""
+msgstr "Synkroniser nå"
 
 #: ../../Zotlabs/Module/Locs.php:123
 msgid "Please wait several minutes between consecutive operations."
@@ -2256,87 +2990,87 @@ msgstr "Ikke i stand til å kommunisere med forespurt kanal."
 msgid "Cannot verify requested channel."
 msgstr "Kan ikke bekrefte forespurt kanal."
 
-#: ../../Zotlabs/Module/Mail.php:78
+#: ../../Zotlabs/Module/Mail.php:70
 msgid "Selected channel has private message restrictions. Send failed."
 msgstr "Valgt kanal har restriksjoner for private meldinger. Sending feilet."
 
-#: ../../Zotlabs/Module/Mail.php:143
+#: ../../Zotlabs/Module/Mail.php:135
 msgid "Messages"
 msgstr "Meldinger"
 
-#: ../../Zotlabs/Module/Mail.php:178
+#: ../../Zotlabs/Module/Mail.php:170
 msgid "Message recalled."
 msgstr "Innlegg tilbakekalt."
 
-#: ../../Zotlabs/Module/Mail.php:191
+#: ../../Zotlabs/Module/Mail.php:183
 msgid "Conversation removed."
 msgstr "Samtale fjernet."
 
-#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
+#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr "Utløper YYYY-MM-DD HH:MM"
 
-#: ../../Zotlabs/Module/Mail.php:234
+#: ../../Zotlabs/Module/Mail.php:226
 msgid "Requested channel is not in this network"
 msgstr "Forespurt kanal er ikke tilgjengelig i dette nettverket."
 
-#: ../../Zotlabs/Module/Mail.php:242
+#: ../../Zotlabs/Module/Mail.php:234
 msgid "Send Private Message"
 msgstr "Send privat melding"
 
-#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
+#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360
 msgid "To:"
 msgstr "Til:"
 
-#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
+#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362
 msgid "Subject:"
 msgstr "Emne:"
 
-#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
-#: ../../include/conversation.php:1220
+#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
+#: ../../include/conversation.php:1231
 msgid "Attach file"
 msgstr "Legg ved fil"
 
-#: ../../Zotlabs/Module/Mail.php:253
+#: ../../Zotlabs/Module/Mail.php:245
 msgid "Send"
 msgstr "Send"
 
-#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
-#: ../../include/conversation.php:1251
+#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373
+#: ../../include/conversation.php:1266
 msgid "Set expiration date"
 msgstr "Angi utløpsdato"
 
-#: ../../Zotlabs/Module/Mail.php:340
+#: ../../Zotlabs/Module/Mail.php:332
 msgid "Delete message"
 msgstr "Slett melding"
 
-#: ../../Zotlabs/Module/Mail.php:341
+#: ../../Zotlabs/Module/Mail.php:333
 msgid "Delivery report"
 msgstr "Leveringsrapport"
 
-#: ../../Zotlabs/Module/Mail.php:342
+#: ../../Zotlabs/Module/Mail.php:334
 msgid "Recall message"
 msgstr "Tilbakekall innlegg"
 
-#: ../../Zotlabs/Module/Mail.php:344
+#: ../../Zotlabs/Module/Mail.php:336
 msgid "Message has been recalled."
 msgstr "Innlegget har blitt tilbakekalt."
 
-#: ../../Zotlabs/Module/Mail.php:361
+#: ../../Zotlabs/Module/Mail.php:353
 msgid "Delete Conversation"
 msgstr "Slett samtale"
 
-#: ../../Zotlabs/Module/Mail.php:363
+#: ../../Zotlabs/Module/Mail.php:355
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr "Ingen sikret kommunikasjon tilgjengelig. Du kan <strong>muligens</strong> greie å svare via senderens profilside."
 
-#: ../../Zotlabs/Module/Mail.php:367
+#: ../../Zotlabs/Module/Mail.php:359
 msgid "Send Reply"
 msgstr "Send svar"
 
-#: ../../Zotlabs/Module/Mail.php:372
+#: ../../Zotlabs/Module/Mail.php:364
 #, php-format
 msgid "Your message for %s (%s):"
 msgstr "Din melding til %s (%s):"
@@ -2351,8 +3085,8 @@ msgstr "Du har laget %1$.0f av %2$.0f tillatte kanaler."
 msgid "Create a new channel"
 msgstr "Lag en ny kanal"
 
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
-#: ../../include/nav.php:206
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214
+#: ../../include/nav.php:208
 msgid "Channel Manager"
 msgstr "Kanalstyring"
 
@@ -2384,80 +3118,7 @@ msgstr "%d nye introduksjoner"
 
 #: ../../Zotlabs/Module/Manage.php:175
 msgid "Delegated Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr "Ingen gyldig konto funnet."
-
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr "Forespørsel om å tilbakestille passord er mottatt. Sjekk e-posten din."
-
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Nettstedsmedlem (%s)"
-
-#: ../../Zotlabs/Module/Lostpass.php:44
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Forespurt om å tilbakestille passord hos %s"
-
-#: ../../Zotlabs/Module/Lostpass.php:67
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Forespørsel kunne ikke bekreftes. (Du kan ha sendt den inn tidligere.) Tilbakestilling av passord mislyktes."
-
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1711
-msgid "Password Reset"
-msgstr "Tilbakestill passord"
-
-#: ../../Zotlabs/Module/Lostpass.php:91
-msgid "Your password has been reset as requested."
-msgstr "Ditt passord har blitt tilbakestilt som forespurt."
-
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your new password is"
-msgstr "Ditt nye passord er"
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Save or copy your new password - and then"
-msgstr "Lagre eller kopier ditt nye passord, og deretter kan du"
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "click here to login"
-msgstr "klikke her for å logge inn"
-
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Ditt passord kan endres på siden <em>Innstillinger</em> etter vellykket innlogging."
-
-#: ../../Zotlabs/Module/Lostpass.php:112
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Ditt passord er endret hos %s"
-
-#: ../../Zotlabs/Module/Lostpass.php:127
-msgid "Forgot your Password?"
-msgstr "Glemt passord ditt?"
-
-#: ../../Zotlabs/Module/Lostpass.php:128
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Skriv e-postadressen din og send inn for å tilbakestille passordet ditt. Sjekk deretter din e-post for videre instruksjoner."
-
-#: ../../Zotlabs/Module/Lostpass.php:129
-msgid "Email Address"
-msgstr "E-postadresse"
-
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Reset"
-msgstr "Tilbakestill"
+msgstr "Delegert kanal"
 
 #: ../../Zotlabs/Module/Menu.php:49
 msgid "Unable to update menu."
@@ -2495,7 +3156,7 @@ msgstr "Menyen kan brukes til å lagre lagrede bokmerker"
 msgid "Submit and proceed"
 msgstr "Send inn og fortsett"
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2266
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2239
 msgid "Menus"
 msgstr "Menyer"
 
@@ -2556,13 +3217,86 @@ msgstr "Tillat bokmerker"
 msgid "Not found."
 msgstr "Ikke funnet."
 
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
+msgstr "Ingen gyldig konto funnet."
+
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr "Forespørsel om å tilbakestille passord er mottatt. Sjekk e-posten din."
+
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Nettstedsmedlem (%s)"
+
+#: ../../Zotlabs/Module/Lostpass.php:44
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Forespurt om å tilbakestille passord hos %s"
+
+#: ../../Zotlabs/Module/Lostpass.php:67
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Forespørsel kunne ikke bekreftes. (Du kan ha sendt den inn tidligere.) Tilbakestilling av passord mislyktes."
+
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1712
+msgid "Password Reset"
+msgstr "Tilbakestill passord"
+
+#: ../../Zotlabs/Module/Lostpass.php:91
+msgid "Your password has been reset as requested."
+msgstr "Ditt passord har blitt tilbakestilt som forespurt."
+
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your new password is"
+msgstr "Ditt nye passord er"
+
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Save or copy your new password - and then"
+msgstr "Lagre eller kopier ditt nye passord, og deretter kan du"
+
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "click here to login"
+msgstr "klikke her for å logge inn"
+
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Ditt passord kan endres på siden <em>Innstillinger</em> etter vellykket innlogging."
+
+#: ../../Zotlabs/Module/Lostpass.php:112
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Ditt passord er endret hos %s"
+
+#: ../../Zotlabs/Module/Lostpass.php:127
+msgid "Forgot your Password?"
+msgstr "Glemt passord ditt?"
+
+#: ../../Zotlabs/Module/Lostpass.php:128
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Skriv e-postadressen din og send inn for å tilbakestille passordet ditt. Sjekk deretter din e-post for videre instruksjoner."
+
+#: ../../Zotlabs/Module/Lostpass.php:129
+msgid "Email Address"
+msgstr "E-postadresse"
+
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Reset"
+msgstr "Tilbakestill"
+
 #: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
 #, php-format
 msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr "%1$s er %2$s"
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227
 msgid "Mood"
 msgstr "Stemning"
 
@@ -2570,6 +3304,44 @@ msgstr "Stemning"
 msgid "Set your current mood and tell your friends"
 msgstr "Angi ditt nåværende humør og fortell dine venner"
 
+#: ../../Zotlabs/Module/Network.php:94
+msgid "No such group"
+msgstr "Gruppen finnes ikke"
+
+#: ../../Zotlabs/Module/Network.php:134
+msgid "No such channel"
+msgstr "Ingen slik kanal"
+
+#: ../../Zotlabs/Module/Network.php:139
+msgid "forum"
+msgstr "forum"
+
+#: ../../Zotlabs/Module/Network.php:151
+msgid "Search Results For:"
+msgstr "Søkeresultat for:"
+
+#: ../../Zotlabs/Module/Network.php:215
+msgid "Privacy group is empty"
+msgstr "Personverngruppen er tom"
+
+#: ../../Zotlabs/Module/Network.php:224
+msgid "Privacy group: "
+msgstr "Personverngruppe:"
+
+#: ../../Zotlabs/Module/Network.php:250
+msgid "Invalid connection."
+msgstr "Ugyldig forbindelse."
+
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:98
+msgid "No more system notifications."
+msgstr "Ingen flere systemvarsler."
+
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:102
+msgid "System Notifications"
+msgstr "Systemvarsler"
+
 #: ../../Zotlabs/Module/Match.php:26
 msgid "Profile Match"
 msgstr "Profiltreff"
@@ -2586,43 +3358,17 @@ msgstr "er interessert i:"
 msgid "No matches"
 msgstr "Ingen treff"
 
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
-msgstr "Gruppen finnes ikke"
+#: ../../Zotlabs/Module/Channel.php:40
+msgid "Posts and comments"
+msgstr "Innlegg og kommentarer"
 
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
-msgstr "Ingen slik kanal"
+#: ../../Zotlabs/Module/Channel.php:41
+msgid "Only posts"
+msgstr "Bare innlegg"
 
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
-msgstr "forum"
-
-#: ../../Zotlabs/Module/Network.php:153
-msgid "Search Results For:"
-msgstr "Søkeresultat for:"
-
-#: ../../Zotlabs/Module/Network.php:217
-msgid "Privacy group is empty"
-msgstr "Personverngruppen er tom"
-
-#: ../../Zotlabs/Module/Network.php:226
-msgid "Privacy group: "
-msgstr "Personverngruppe:"
-
-#: ../../Zotlabs/Module/Network.php:252
-msgid "Invalid connection."
-msgstr "Ugyldig forbindelse."
-
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:98
-msgid "No more system notifications."
-msgstr "Ingen flere systemvarsler."
-
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:102
-msgid "System Notifications"
-msgstr "Systemvarsler"
+#: ../../Zotlabs/Module/Channel.php:101
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Utilstrekkelig tillatelse. Forespørsel omdirigert til profilsiden."
 
 #: ../../Zotlabs/Module/Mitem.php:52
 msgid "Unable to create element."
@@ -2641,7 +3387,7 @@ msgid "Menu Item Permissions"
 msgstr "Menyelement Tillatelser"
 
 #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1068
+#: ../../Zotlabs/Module/Settings.php:1163
 msgid "(click to open/close)"
 msgstr "(klikk for å åpne/lukke)"
 
@@ -2741,845 +3487,6 @@ msgstr "Endre menyelement"
 msgid "Link text"
 msgstr "Lenketekst"
 
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Name or caption"
-msgstr "Navn eller overskrift"
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
-msgstr "Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\", \"Sykkelgruppa\""
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-msgid "Choose a short nickname"
-msgstr "Velg et kort kallenavn"
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-#, php-format
-msgid ""
-"Your nickname will be used to create an easy to remember channel address "
-"e.g. nickname%s"
-msgstr "Ditt kallenavn brukes til å lage en kanaladresse som er enkel å huske, for eksempel kallenavn%s"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Channel role and privacy"
-msgstr "Kanalrolle og personvern"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Select a channel role with your privacy requirements."
-msgstr "Velg en kanalrolle for ditt personvernbehov."
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Read more about roles"
-msgstr "Les mer om roller"
-
-#: ../../Zotlabs/Module/New_channel.php:135
-msgid "Create Channel"
-msgstr "Lag kanal"
-
-#: ../../Zotlabs/Module/New_channel.php:136
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
-msgstr "En kanal er din identitet i dette nettverket. Den kan representere en person, en blogg eller et forum for å nevne noe. Kanaler kan ha forbindelser til andre kanaler for å dele informasjon, og med svært detaljerte tillatelser."
-
-#: ../../Zotlabs/Module/New_channel.php:137
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr "eller <a href=\"import\">importer en eksisterende kanal</a> fra et annet sted."
-
-#: ../../Zotlabs/Module/Notifications.php:30
-msgid "Invalid request identifier."
-msgstr "Ugyldig forespørselsidentifikator."
-
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "Discard"
-msgstr "Forkast"
-
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
-msgid "Mark all system notifications seen"
-msgstr "Merk alle systemvarsler som sett"
-
-#: ../../Zotlabs/Module/Photos.php:84
-msgid "Page owner information could not be retrieved."
-msgstr "Informasjon om sideeier kunne ikke hentes."
-
-#: ../../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
-#: ../../include/photo/photo_driver.php:718
-msgid "Profile Photos"
-msgstr "Profilbilder"
-
-#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
-msgid "Album not found."
-msgstr "Albumet ble ikke funnet."
-
-#: ../../Zotlabs/Module/Photos.php:132
-msgid "Delete Album"
-msgstr "Slett album"
-
-#: ../../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:210 ../../Zotlabs/Module/Photos.php:1053
-msgid "Delete Photo"
-msgstr "Slett bilde"
-
-#: ../../Zotlabs/Module/Photos.php:533
-msgid "No photos selected"
-msgstr "Ingen bilder valgt"
-
-#: ../../Zotlabs/Module/Photos.php:582
-msgid "Access to this item is restricted."
-msgstr "Tilgang til dette elementet er begrenset."
-
-#: ../../Zotlabs/Module/Photos.php:621
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt."
-
-#: ../../Zotlabs/Module/Photos.php:624
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB lagringsplass til bilder er brukt."
-
-#: ../../Zotlabs/Module/Photos.php:660
-msgid "Upload Photos"
-msgstr "Last opp bilder"
-
-#: ../../Zotlabs/Module/Photos.php:664
-msgid "Enter an album name"
-msgstr "Skriv et albumnavn"
-
-#: ../../Zotlabs/Module/Photos.php:665
-msgid "or select an existing album (doubleclick)"
-msgstr "eller velg et eksisterende album (dobbeltklikk)"
-
-#: ../../Zotlabs/Module/Photos.php:666
-msgid "Create a status post for this upload"
-msgstr "Lag et statusinnlegg for denne opplastingen"
-
-#: ../../Zotlabs/Module/Photos.php:667
-msgid "Caption (optional):"
-msgstr "Bildetekst (valgfritt):"
-
-#: ../../Zotlabs/Module/Photos.php:668
-msgid "Description (optional):"
-msgstr "Beskrivelse (valgfritt):"
-
-#: ../../Zotlabs/Module/Photos.php:695
-msgid "Album name could not be decoded"
-msgstr "Albumnavnet kunne ikke dekodes"
-
-#: ../../Zotlabs/Module/Photos.php:743
-msgid "Contact Photos"
-msgstr "Kontaktbilder"
-
-#: ../../Zotlabs/Module/Photos.php:766
-msgid "Show Newest First"
-msgstr "Vis nyeste først"
-
-#: ../../Zotlabs/Module/Photos.php:768
-msgid "Show Oldest First"
-msgstr "Vis eldste først"
-
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
-#: ../../include/widgets.php:1499
-msgid "View Photo"
-msgstr "Vis foto"
-
-#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1516
-msgid "Edit Album"
-msgstr "Endre album"
-
-#: ../../Zotlabs/Module/Photos.php:870
-msgid "Permission denied. Access to this item may be restricted."
-msgstr "Tillatelse avvist. Tilgang til dette elementet kan være begrenset."
-
-#: ../../Zotlabs/Module/Photos.php:872
-msgid "Photo not available"
-msgstr "Bilde er utilgjengelig"
-
-#: ../../Zotlabs/Module/Photos.php:930
-msgid "Use as profile photo"
-msgstr "Bruk som profilbilde"
-
-#: ../../Zotlabs/Module/Photos.php:931
-msgid "Use as cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:938
-msgid "Private Photo"
-msgstr "Privat bilde"
-
-#: ../../Zotlabs/Module/Photos.php:953
-msgid "View Full Size"
-msgstr "Vis i full størrelse"
-
-#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437
-#: ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr "Fjern"
-
-#: ../../Zotlabs/Module/Photos.php:1032
-msgid "Edit photo"
-msgstr "Endre bilde"
-
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Rotate CW (right)"
-msgstr "Roter med klokka (mot høyre)"
-
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CCW (left)"
-msgstr "Roter mot klokka (venstre)"
-
-#: ../../Zotlabs/Module/Photos.php:1038
-msgid "Enter a new album name"
-msgstr "Skriv et nytt albumnavn"
-
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "or select an existing one (doubleclick)"
-msgstr "eller velg et eksisterende album (dobbeltklikk)"
-
-#: ../../Zotlabs/Module/Photos.php:1042
-msgid "Caption"
-msgstr "Overskrift"
-
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Add a Tag"
-msgstr "Legg til merkelapp"
-
-#: ../../Zotlabs/Module/Photos.php:1048
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr "Eksempel: @bob, @Barbara_Jensen, @jim@example.com"
-
-#: ../../Zotlabs/Module/Photos.php:1051
-msgid "Flag as adult in album view"
-msgstr "Flag som voksent i albumvisning"
-
-#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
-msgid "I like this (toggle)"
-msgstr "Jeg liker dette (skru av og på)"
-
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
-msgid "I don't like this (toggle)"
-msgstr "Jeg liker ikke dette (skru av og på)"
-
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
-#: ../../include/conversation.php:740
-msgid "Please wait"
-msgstr "Vennligst vent"
-
-#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../Zotlabs/Lib/ThreadItem.php:707
-msgid "This is you"
-msgstr "Dette er deg"
-
-#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
-msgid "Comment"
-msgstr "Kommentar"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Likes"
-msgstr "Liker"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Dislikes"
-msgstr "Liker ikke"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Agree"
-msgstr "Enig"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Disagree"
-msgstr "Uenig"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Abstain"
-msgstr "Avstår"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Attending"
-msgstr "Deltar"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Not attending"
-msgstr "Deltar ikke"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Might attend"
-msgstr "Deltar kanskje"
-
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
-#: ../../include/conversation.php:1717
-msgid "View all"
-msgstr "Vis alle"
-
-#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1741
-#: ../../include/channel.php:1158
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "Liker"
-msgstr[1] "Liker"
-
-#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/conversation.php:1744
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "Liker ikke"
-msgstr[1] "Liker ikke"
-
-#: ../../Zotlabs/Module/Photos.php:1235
-msgid "Photo Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Photos.php:1244
-msgid "In This Photo:"
-msgstr "I dette bildet:"
-
-#: ../../Zotlabs/Module/Photos.php:1249
-msgid "Map"
-msgstr "Kart"
-
-#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
-msgctxt "noun"
-msgid "Likes"
-msgstr "Liker"
-
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
-msgctxt "noun"
-msgid "Dislikes"
-msgstr "Liker ikke"
-
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
-#: ../../include/acl_selectors.php:285
-msgid "Close"
-msgstr "Lukk"
-
-#: ../../Zotlabs/Module/Photos.php:1337
-msgid "View Album"
-msgstr "Vis album"
-
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362
-msgid "Recent Photos"
-msgstr "Nye bilder"
-
-#: ../../Zotlabs/Module/Ping.php:265
-msgid "sent you a private message"
-msgstr "sendte deg en privat melding"
-
-#: ../../Zotlabs/Module/Ping.php:313
-msgid "added your channel"
-msgstr "la til din kanal"
-
-#: ../../Zotlabs/Module/Ping.php:323
-msgid "g A l F d"
-msgstr "g A l F d"
-
-#: ../../Zotlabs/Module/Ping.php:346
-msgid "[today]"
-msgstr "[idag]"
-
-#: ../../Zotlabs/Module/Ping.php:355
-msgid "posted an event"
-msgstr "la ut en hendelse"
-
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr "Ikke i stand til å finne hubben din."
-
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr "Innlegg vellykket."
-
-#: ../../Zotlabs/Module/Openid.php:30
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID protokollfeil. Ingen ID ble returnert."
-
-#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
-msgid "Login failed."
-msgstr "Innlogging mislyktes."
-
-#: ../../Zotlabs/Module/Page.php:133
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
-" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Denne innstillingen krever spesiell behandling og redigering har blitt blokkert."
-
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
-msgstr "Konfigurasjonsbehandler"
-
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please"
-" leave this page unless you are comfortable with and knowledgeable about how"
-" to correctly use this feature."
-msgstr "Advarsel: kanalen din kan slutte å virke ved endring av enkelte innstillinger. Vennligst forlat denne siden med mindre du er komfortabel med dette og vet hvordan du bruker denne funksjonen riktig."
-
-#: ../../Zotlabs/Module/Pdledit.php:18
-msgid "Layout updated."
-msgstr "Layout er oppdatert."
-
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
-msgid "Edit System Page Description"
-msgstr "Endre beskrivelsen av systemsiden"
-
-#: ../../Zotlabs/Module/Pdledit.php:56
-msgid "Layout not found."
-msgstr "Layouten ble ikke funnet."
-
-#: ../../Zotlabs/Module/Pdledit.php:62
-msgid "Module Name:"
-msgstr "Modulnavn:"
-
-#: ../../Zotlabs/Module/Pdledit.php:63
-msgid "Layout Help"
-msgstr "Layout-hjelp"
-
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226
-#: ../../include/conversation.php:960
-msgid "Poke"
-msgstr "Prikk"
-
-#: ../../Zotlabs/Module/Poke.php:169
-msgid "Poke somebody"
-msgstr "Dult noen"
-
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
-msgstr "Prikke/oppildne"
-
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
-msgstr "Dult, prikk eller gjør andre ting med noen"
-
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
-msgstr "Mottaker"
-
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
-msgstr "Velg hva du ønsker å gjøre med mottakeren"
-
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
-msgstr "Gjør dette innlegget privat"
-
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
-#, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr "Henting av URL gir følgende feil: %1$s"
-
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
-#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
-msgid "Profile not found."
-msgstr "Profilen ble ikke funnet."
-
-#: ../../Zotlabs/Module/Profiles.php:44
-msgid "Profile deleted."
-msgstr "Profilen er slettet."
-
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
-msgid "Profile-"
-msgstr "Profil-"
-
-#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132
-msgid "New profile created."
-msgstr "Ny profil opprettet."
-
-#: ../../Zotlabs/Module/Profiles.php:110
-msgid "Profile unavailable to clone."
-msgstr "Profilen er utilgjengelig for klonen."
-
-#: ../../Zotlabs/Module/Profiles.php:151
-msgid "Profile unavailable to export."
-msgstr "Profilen er utilgjengelig for eksport."
-
-#: ../../Zotlabs/Module/Profiles.php:256
-msgid "Profile Name is required."
-msgstr "Profilnavn er påkrevd."
-
-#: ../../Zotlabs/Module/Profiles.php:427
-msgid "Marital Status"
-msgstr "Sivilstand"
-
-#: ../../Zotlabs/Module/Profiles.php:431
-msgid "Romantic Partner"
-msgstr "Romantisk partner"
-
-#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736
-msgid "Likes"
-msgstr "Liker"
-
-#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737
-msgid "Dislikes"
-msgstr "Liker ikke"
-
-#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744
-msgid "Work/Employment"
-msgstr "Arbeid/sysselsetting"
-
-#: ../../Zotlabs/Module/Profiles.php:446
-msgid "Religion"
-msgstr "Religion"
-
-#: ../../Zotlabs/Module/Profiles.php:450
-msgid "Political Views"
-msgstr "Politiske synspunkter"
-
-#: ../../Zotlabs/Module/Profiles.php:458
-msgid "Sexual Preference"
-msgstr "Seksuelle preferanser"
-
-#: ../../Zotlabs/Module/Profiles.php:462
-msgid "Homepage"
-msgstr "Hjemmeside"
-
-#: ../../Zotlabs/Module/Profiles.php:466
-msgid "Interests"
-msgstr "Interesser"
-
-#: ../../Zotlabs/Module/Profiles.php:560
-msgid "Profile updated."
-msgstr "Profilen er oppdatert."
-
-#: ../../Zotlabs/Module/Profiles.php:644
-msgid "Hide your connections list from viewers of this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:686
-msgid "Edit Profile Details"
-msgstr "Endre profildetaljer"
-
-#: ../../Zotlabs/Module/Profiles.php:688
-msgid "View this profile"
-msgstr "Vis denne profilen"
-
-#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
-#: ../../include/channel.php:959
-msgid "Edit visibility"
-msgstr "Endre synlighet"
-
-#: ../../Zotlabs/Module/Profiles.php:690
-msgid "Profile Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:691
-msgid "Change cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930
-msgid "Change profile photo"
-msgstr "Endre profilbilde"
-
-#: ../../Zotlabs/Module/Profiles.php:693
-msgid "Create a new profile using these settings"
-msgstr "Lag en ny profil ved å bruke disse innstillingene"
-
-#: ../../Zotlabs/Module/Profiles.php:694
-msgid "Clone this profile"
-msgstr "Klon denne profilen"
-
-#: ../../Zotlabs/Module/Profiles.php:695
-msgid "Delete this profile"
-msgstr "Slett denne profilen"
-
-#: ../../Zotlabs/Module/Profiles.php:696
-msgid "Add profile things"
-msgstr "Legg til profilting"
-
-#: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105
-#: ../../include/conversation.php:1526
-msgid "Personal"
-msgstr "Personlig"
-
-#: ../../Zotlabs/Module/Profiles.php:699
-msgid "Relation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48
-msgid "Miscellaneous"
-msgstr "Forskjellig"
-
-#: ../../Zotlabs/Module/Profiles.php:702
-msgid "Import profile from file"
-msgstr "Importer profil fra fil"
-
-#: ../../Zotlabs/Module/Profiles.php:703
-msgid "Export profile to file"
-msgstr "Eksporter profil til fil"
-
-#: ../../Zotlabs/Module/Profiles.php:704
-msgid "Your gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:705
-msgid "Marital status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:706
-msgid "Sexual preference"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:709
-msgid "Profile name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:711
-msgid "This is your default profile."
-msgstr "Dette er din standardprofil."
-
-#: ../../Zotlabs/Module/Profiles.php:713
-msgid "Your full name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:714
-msgid "Title/Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:717
-msgid "Street address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:718
-msgid "Locality/City"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:719
-msgid "Region/State"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:720
-msgid "Postal/Zip code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:721
-msgid "Country"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "Who (if applicable)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr "Eksempler: kari123, Kari Villiamsen, kari@example.com"
-
-#: ../../Zotlabs/Module/Profiles.php:727
-msgid "Since (date)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:730
-msgid "Tell us about yourself"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Hometown"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Political views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Religious views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Keywords used in directory listings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Example: fishing photography software"
-msgstr "Eksempel: fisking fotografering programvare"
-
-#: ../../Zotlabs/Module/Profiles.php:738
-msgid "Musical interests"
-msgstr "Musikkinteresser"
-
-#: ../../Zotlabs/Module/Profiles.php:739
-msgid "Books, literature"
-msgstr "Bøker, litteratur"
-
-#: ../../Zotlabs/Module/Profiles.php:740
-msgid "Television"
-msgstr "TV/fjernsyn"
-
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "Film/Dance/Culture/Entertainment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:742
-msgid "Hobbies/Interests"
-msgstr "Hobbier/Interesser"
-
-#: ../../Zotlabs/Module/Profiles.php:743
-msgid "Love/Romance"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:745
-msgid "School/Education"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:746
-msgid "Contact information and social networks"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:747
-msgid "My other channels"
-msgstr "Mine andre kanaler"
-
-#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955
-msgid "Profile Image"
-msgstr "Profilbilde"
-
-#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
-#: ../../include/channel.php:937
-msgid "Edit Profiles"
-msgstr "Endre profiler"
-
-#: ../../Zotlabs/Module/Profile_photo.php:179
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens mellomlager hvis det nye bildet ikke vises umiddelbart."
-
-#: ../../Zotlabs/Module/Profile_photo.php:367
-msgid "Upload Profile Photo"
-msgstr "Last opp profilbilde:"
-
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr "Ugyldig profil-identifikator."
-
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
-msgstr "Endre profilsynlighet"
-
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249
-msgid "Profile"
-msgstr "Profil"
-
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
-msgstr "Klikk på en kontakt for å legge til eller fjerne."
-
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
-msgstr "Synlig for"
-
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1270
-msgid "Public Hubs"
-msgstr "Offentlige huber"
-
-#: ../../Zotlabs/Module/Pubsites.php:25
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
-msgstr "Nettstedene på listen tillater offentlig registrering i $Projectname-nettverket. Alle nettsteder i nettverket er forbundet så medlemskap på enhver av dem formidler medlemskap i nettverket som helhet. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Nettstedene selv <strong>kan</strong> gi tilleggsopplysninger."
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Hub URL"
-msgstr "Nettstedets URL"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Access Type"
-msgstr "Tilgangstype"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Registration Policy"
-msgstr "Retningslinjer for registrering"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Stats"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Software"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:959
-msgid "Ratings"
-msgstr "Vurderinger"
-
-#: ../../Zotlabs/Module/Pubsites.php:38
-msgid "Rate"
-msgstr "Vurder"
-
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Website:"
-msgstr "Nettsted:"
-
-#: ../../Zotlabs/Module/Rate.php:163
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Fjerntliggende kanal [%s] (foreløpig ikke kjent på dette nettstedet)"
-
-#: ../../Zotlabs/Module/Rate.php:164
-msgid "Rating (this information is public)"
-msgstr "Vurdering (denne informasjonen er offentlig)"
-
-#: ../../Zotlabs/Module/Rate.php:165
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Velg om du vil forklare din vurdering (denne informasjonen er offentlig)"
-
-#: ../../Zotlabs/Module/Ratings.php:73
-msgid "No ratings"
-msgstr "Ingen vurderinger"
-
-#: ../../Zotlabs/Module/Ratings.php:104
-msgid "Rating: "
-msgstr "Vurdering:"
-
-#: ../../Zotlabs/Module/Ratings.php:105
-msgid "Website: "
-msgstr "Nettsted:"
-
-#: ../../Zotlabs/Module/Ratings.php:107
-msgid "Description: "
-msgstr "Beskrivelse:"
-
 #: ../../Zotlabs/Module/Admin.php:77
 msgid "Theme settings updated."
 msgstr "Temainnstillinger er oppdatert."
@@ -3618,7 +3525,7 @@ msgstr "Meldingskøer"
 
 #: ../../Zotlabs/Module/Admin.php:236
 msgid "Your software should be updated"
-msgstr ""
+msgstr "Programvaren din bør oppdateres"
 
 #: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:490
 #: ../../Zotlabs/Module/Admin.php:711 ../../Zotlabs/Module/Admin.php:755
@@ -3655,21 +3562,21 @@ msgstr "Versjon"
 
 #: ../../Zotlabs/Module/Admin.php:250
 msgid "Repository version (master)"
-msgstr ""
+msgstr "Depotversjon (master)"
 
 #: ../../Zotlabs/Module/Admin.php:251
 msgid "Repository version (dev)"
-msgstr ""
+msgstr "Depotversjon (dev)"
 
 #: ../../Zotlabs/Module/Admin.php:373
 msgid "Site settings updated."
 msgstr "Nettstedsinnstillinger er oppdatert."
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2841
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2829
 msgid "Default"
 msgstr "Standard"
 
-#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:899
 msgid "mobile"
 msgstr "mobil"
 
@@ -3701,7 +3608,7 @@ msgstr "Mitt nettsted har kun gratis tilgang"
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mitt nettsted tilbyr gratis konto med valgfri oppgradering til betalt tjeneste"
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1382
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1476
 msgid "Site"
 msgstr "Nettsted"
 
@@ -3897,7 +3804,7 @@ msgstr "Importer og gi tilgang til offentlig innhold trukket inn fra andre netts
 
 #: ../../Zotlabs/Module/Admin.php:522
 msgid "Login on Homepage"
-msgstr ""
+msgstr "Logg inn på hjemmesiden"
 
 #: ../../Zotlabs/Module/Admin.php:522
 msgid ""
@@ -3907,13 +3814,13 @@ msgstr "Presenter en innloggingsboks til besøkende på hjemmesiden hvis ikke no
 
 #: ../../Zotlabs/Module/Admin.php:523
 msgid "Enable context help"
-msgstr ""
+msgstr "Skru på kontekstsensitiv hjelp"
 
 #: ../../Zotlabs/Module/Admin.php:523
 msgid ""
 "Display contextual help for the current page when the help button is "
 "pressed."
-msgstr ""
+msgstr "Vis hjelp for den gjeldende siden når Hjelp-knappen trykkes."
 
 #: ../../Zotlabs/Module/Admin.php:525
 msgid "Directory Server URL"
@@ -3989,12 +3896,12 @@ msgid "0 for no expiration of imported content"
 msgstr "0 dersom importert innhold ikke skal utgå"
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "Off"
 msgstr "Av"
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "On"
 msgstr "På"
 
@@ -4031,27 +3938,27 @@ msgstr "Tjener"
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently"
 " insecure."
-msgstr ""
+msgstr "Standardinnstillingen er at ufiltrert HTML er tillat ved innebygging av media. Dette er grunnleggende usikkert."
 
 #: ../../Zotlabs/Module/Admin.php:749
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
-msgstr ""
+msgstr "Anbefalt innstilling er å bare tillate ufiltrert HTML fra følgende nettsteder:"
 
 #: ../../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 ""
+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 ""
+msgstr "Alt annet innebygget innhold vil bli filtrert, <strong>med mindre</strong> innebygget innhold fra det nettstedet er eksplisitt blokkert."
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1385
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1479
 msgid "Security"
 msgstr "Sikkerhet"
 
@@ -4067,11 +3974,11 @@ msgstr "Kryss av for å blokkere tilgang til alle personlige sider som ellers vi
 
 #: ../../Zotlabs/Module/Admin.php:759
 msgid "Set \"Transport Security\" HTTP header"
-msgstr ""
+msgstr "Sett HTTP header \"Transport Security\""
 
 #: ../../Zotlabs/Module/Admin.php:760
 msgid "Set \"Content Security Policy\" HTTP header"
-msgstr ""
+msgstr "Sett HTTP header \"Content Security Policy\""
 
 #: ../../Zotlabs/Module/Admin.php:761
 msgid "Allow communications only from these sites"
@@ -4103,15 +4010,15 @@ msgstr "Blokker kommunikasjon fra disse kanalene"
 
 #: ../../Zotlabs/Module/Admin.php:765
 msgid "Only allow embeds from secure (SSL) websites and links."
-msgstr ""
+msgstr "Bare tillat innebygging fra sikrede (SSL) nettsteder og lenker."
 
 #: ../../Zotlabs/Module/Admin.php:766
 msgid "Allow unfiltered embedded HTML content only from these domains"
-msgstr ""
+msgstr "Tillat ufiltrert innebygging av HTML-innhold bare fra disse domenene"
 
 #: ../../Zotlabs/Module/Admin.php:766
 msgid "One site per line. By default embedded content is filtered."
-msgstr ""
+msgstr "Et nettsted per linje. Det er standard at innebygget innhold er filtrert."
 
 #: ../../Zotlabs/Module/Admin.php:767
 msgid "Block embedded HTML from these domains"
@@ -4219,7 +4126,7 @@ msgid "Account '%s' unblocked"
 msgstr "Kontoen '%s' er ikke blokkert lenger"
 
 #: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
-#: ../../include/widgets.php:1383
+#: ../../include/widgets.php:1477
 msgid "Accounts"
 msgstr "Kontoer"
 
@@ -4229,7 +4136,7 @@ msgstr "velg alle"
 
 #: ../../Zotlabs/Module/Admin.php:1034
 msgid "Registrations waiting for confirm"
-msgstr ""
+msgstr "Registreringer venter på bekreftelse"
 
 #: ../../Zotlabs/Module/Admin.php:1035
 msgid "Request date"
@@ -4325,7 +4232,7 @@ msgstr "Kanal '%s' kode tillatt"
 msgid "Channel '%s' code disallowed"
 msgstr "Kanal '%s' kode ikke tillatt"
 
-#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1384
+#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1478
 msgid "Channels"
 msgstr "Kanaler"
 
@@ -4345,7 +4252,7 @@ msgstr "Tillat kode"
 msgid "Disallow Code"
 msgstr "Ikke tillat kode"
 
-#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1611
+#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626
 msgid "Channel"
 msgstr "Kanal"
 
@@ -4384,7 +4291,7 @@ msgid "Enable"
 msgstr "Skru på"
 
 #: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
-#: ../../include/widgets.php:1387
+#: ../../include/widgets.php:1481
 msgid "Plugins"
 msgstr "Tilleggsfunksjoner"
 
@@ -4393,8 +4300,8 @@ msgid "Toggle"
 msgstr "Skru av og på"
 
 #: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
-#: ../../Zotlabs/Lib/Apps.php:215 ../../include/widgets.php:638
-#: ../../include/nav.php:208
+#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:210
+#: ../../include/widgets.php:647
 msgid "Settings"
 msgstr "Innstillinger"
 
@@ -4428,52 +4335,52 @@ msgstr "Skrudd av - versjonsinkompatibilitet"
 
 #: ../../Zotlabs/Module/Admin.php:1394
 msgid "Enter the public git repository URL of the plugin repo."
-msgstr ""
+msgstr "Skriv inn URL-en til det offentlige git-depoet til tillegget."
 
 #: ../../Zotlabs/Module/Admin.php:1395
 msgid "Plugin repo git URL"
-msgstr ""
+msgstr "Git-URL-en til tillegget"
 
 #: ../../Zotlabs/Module/Admin.php:1396
 msgid "Custom repo name"
-msgstr ""
+msgstr "Tilpasset depotnavn"
 
 #: ../../Zotlabs/Module/Admin.php:1396
 msgid "(optional)"
-msgstr ""
+msgstr "(valgfritt)"
 
 #: ../../Zotlabs/Module/Admin.php:1397
 msgid "Download Plugin Repo"
-msgstr ""
+msgstr "Last ned depotet til tillegget"
 
 #: ../../Zotlabs/Module/Admin.php:1404
 msgid "Install new repo"
-msgstr ""
+msgstr "Installer nytt depot"
 
-#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:334
 msgid "Install"
 msgstr "Installer"
 
 #: ../../Zotlabs/Module/Admin.php:1427
 msgid "Manage Repos"
-msgstr ""
+msgstr "Håndter depoter"
 
 #: ../../Zotlabs/Module/Admin.php:1428
 msgid "Installed Plugin Repositories"
-msgstr ""
+msgstr "Installerede tilleggsdepoter"
 
 #: ../../Zotlabs/Module/Admin.php:1429
 msgid "Install a New Plugin Repository"
-msgstr ""
+msgstr "Installer et nytt tillleggsdepot"
 
-#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:72
+#: ../../Zotlabs/Module/Settings.php:670 ../../Zotlabs/Lib/Apps.php:334
 msgid "Update"
 msgstr "Oppdater"
 
 #: ../../Zotlabs/Module/Admin.php:1436
 msgid "Switch branch"
-msgstr ""
+msgstr "Bytt gren"
 
 #: ../../Zotlabs/Module/Admin.php:1550
 msgid "No themes found."
@@ -4484,7 +4391,7 @@ msgid "Screenshot"
 msgstr "Skjermbilde"
 
 #: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
-#: ../../include/widgets.php:1388
+#: ../../include/widgets.php:1482
 msgid "Themes"
 msgstr "Temaer"
 
@@ -4500,8 +4407,8 @@ msgstr "[Ingen støtte]"
 msgid "Log settings updated."
 msgstr "Logginnstillinger er oppdatert."
 
-#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1409
-#: ../../include/widgets.php:1419
+#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1503
+#: ../../include/widgets.php:1513
 msgid "Logs"
 msgstr "Logger"
 
@@ -4521,7 +4428,7 @@ msgstr "Loggfil"
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
-msgstr ""
+msgstr "Må kunne skrives til av webtjenesten. Relativ til din toppnivåkatalog på webtjeneren."
 
 #: ../../Zotlabs/Module/Admin.php:1742
 msgid "Log level"
@@ -4567,85 +4474,412 @@ msgstr "Feltdefinisjonen ble ikke funnet"
 msgid "Edit Profile Field"
 msgstr "Endre profilfelt"
 
-#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1390
+#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1484
 msgid "Profile Fields"
-msgstr ""
+msgstr "Profilfelter"
 
 #: ../../Zotlabs/Module/Admin.php:2107
 msgid "Basic Profile Fields"
-msgstr ""
+msgstr "Grunnleggende profilfelter"
 
 #: ../../Zotlabs/Module/Admin.php:2108
 msgid "Advanced Profile Fields"
-msgstr ""
+msgstr "Avanserte profilfelter"
 
 #: ../../Zotlabs/Module/Admin.php:2108
 msgid "(In addition to basic fields)"
-msgstr ""
+msgstr "(i tillegg til grunnleggende felter)"
 
 #: ../../Zotlabs/Module/Admin.php:2110
 msgid "All available fields"
-msgstr ""
+msgstr "Alle tilgjengelige felter"
 
 #: ../../Zotlabs/Module/Admin.php:2111
 msgid "Custom Fields"
-msgstr ""
+msgstr "Tilpassede felter"
 
 #: ../../Zotlabs/Module/Admin.php:2115
 msgid "Create Custom Field"
-msgstr ""
+msgstr "Lag tilpasset felt"
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
-msgid "App installed."
-msgstr "App installert."
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Name or caption"
+msgstr "Navn eller overskrift"
 
-#: ../../Zotlabs/Module/Appman.php:46
-msgid "Malformed app."
-msgstr "Feil oppsett for app-en."
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
+msgstr "Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\", \"Sykkelgruppa\""
 
-#: ../../Zotlabs/Module/Appman.php:104
-msgid "Embed code"
-msgstr "Innbyggingskode"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+msgid "Choose a short nickname"
+msgstr "Velg et kort kallenavn"
 
-#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
-msgid "Edit App"
-msgstr "Endre app"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+#, php-format
+msgid ""
+"Your nickname will be used to create an easy to remember channel address "
+"e.g. nickname%s"
+msgstr "Ditt kallenavn brukes til å lage en kanaladresse som er enkel å huske, for eksempel kallenavn%s"
 
-#: ../../Zotlabs/Module/Appman.php:110
-msgid "Create App"
-msgstr "Lag app"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Channel role and privacy"
+msgstr "Kanalrolle og personvern"
 
-#: ../../Zotlabs/Module/Appman.php:115
-msgid "Name of app"
-msgstr "Navn på app"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Select a channel role with your privacy requirements."
+msgstr "Velg en kanalrolle for ditt personvernbehov."
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Location (URL) of app"
-msgstr "Plassering (URL) til app"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Read more about roles"
+msgstr "Les mer om roller"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "Photo icon URL"
-msgstr "Bildeikon URL"
+#: ../../Zotlabs/Module/New_channel.php:135
+msgid "Create Channel"
+msgstr "Lag kanal"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "80 x 80 pixels - optional"
-msgstr "80 x80 pixler - valgfritt"
+#: ../../Zotlabs/Module/New_channel.php:136
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
+msgstr "En kanal er din identitet i dette nettverket. Den kan representere en person, en blogg eller et forum for å nevne noe. Kanaler kan ha forbindelser til andre kanaler for å dele informasjon, og med svært detaljerte tillatelser."
 
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Categories (optional, comma separated list)"
-msgstr ""
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr "eller <a href=\"import\">importer en eksisterende kanal</a> fra et annet sted."
 
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Version ID"
-msgstr "Versjons-ID"
+#: ../../Zotlabs/Module/Ping.php:265
+msgid "sent you a private message"
+msgstr "sendte deg en privat melding"
 
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Price of app"
-msgstr "Pris på app"
+#: ../../Zotlabs/Module/Ping.php:313
+msgid "added your channel"
+msgstr "la til din kanal"
 
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Location (URL) to purchase app"
-msgstr "Plassering (URL) for å kjøpe app"
+#: ../../Zotlabs/Module/Ping.php:323
+msgid "g A l F d"
+msgstr "g A l F d"
+
+#: ../../Zotlabs/Module/Ping.php:346
+msgid "[today]"
+msgstr "[idag]"
+
+#: ../../Zotlabs/Module/Ping.php:355
+msgid "posted an event"
+msgstr "la ut en hendelse"
+
+#: ../../Zotlabs/Module/Notifications.php:30
+msgid "Invalid request identifier."
+msgstr "Ugyldig forespørselsidentifikator."
+
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "Discard"
+msgstr "Forkast"
+
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:193
+msgid "Mark all system notifications seen"
+msgstr "Merk alle systemvarsler som sett"
+
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228
+#: ../../include/conversation.php:963
+msgid "Poke"
+msgstr "Prikk"
+
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
+msgstr "Dult noen"
+
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
+msgstr "Prikke/oppildne"
+
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
+msgstr "Dult, prikk eller gjør andre ting med noen"
+
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
+msgstr "Mottaker"
+
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
+msgstr "Velg hva du ønsker å gjøre med mottakeren"
+
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
+msgstr "Gjør dette innlegget privat"
+
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr "Ikke i stand til å finne hubben din."
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr "Innlegg vellykket."
+
+#: ../../Zotlabs/Module/Openid.php:30
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID protokollfeil. Ingen ID ble returnert."
+
+#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:285
+msgid "Login failed."
+msgstr "Innlogging mislyktes."
+
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr "Ugyldig profil-identifikator."
+
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
+msgstr "Endre profilsynlighet"
+
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1290
+msgid "Profile"
+msgstr "Profil"
+
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
+msgstr "Klikk på en kontakt for å legge til eller fjerne."
+
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
+msgstr "Synlig for"
+
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Denne innstillingen krever spesiell behandling og redigering har blitt blokkert."
+
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
+msgstr "Konfigurasjonsbehandler"
+
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Advarsel: kanalen din kan slutte å virke ved endring av enkelte innstillinger. Vennligst forlat denne siden med mindre du er komfortabel med dette og vet hvordan du bruker denne funksjonen riktig."
+
+#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "Henting av URL gir følgende feil: %1$s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:19
+#, php-format
+msgid "Version %s"
+msgstr "Versjon %s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Installed plugins/addons/apps:"
+msgstr "Installerte tilleggsfunksjoner/tillegg/apper:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:36
+msgid "No installed plugins/addons/apps"
+msgstr "Ingen installerte tilleggsfunksjoner/tillegg/apper"
+
+#: ../../Zotlabs/Module/Siteinfo.php:49
+msgid ""
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Dette er en $Projectname-hub - et globalt samhandlende nettverk av desentraliserte nettsteder med innbygget personvern."
+
+#: ../../Zotlabs/Module/Siteinfo.php:51
+msgid "Tag: "
+msgstr "Merkelapp:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:53
+msgid "Last background fetch: "
+msgstr "Siste innhenting i bakgrunnen:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:55
+msgid "Current load average: "
+msgstr "Gjeldende belastningsgjennomsnitt:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:58
+msgid "Running at web location"
+msgstr "Kjører på webplasseringen"
+
+#: ../../Zotlabs/Module/Siteinfo.php:59
+msgid ""
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr "Vennligst besøk <a href=\"http://hubzilla.org\">hubzilla.org</a> for å lære mer om $Projectname."
+
+#: ../../Zotlabs/Module/Siteinfo.php:60
+msgid "Bug reports and issues: please visit"
+msgstr "Feilmeldinger og feilretting: vennligst besøk"
+
+#: ../../Zotlabs/Module/Siteinfo.php:62
+msgid "$projectname issues"
+msgstr "$projectname problemer"
+
+#: ../../Zotlabs/Module/Siteinfo.php:63
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Forslag, ros og så videre - vennligst e-post \"redmatrix\" hos librelist - punktum com"
+
+#: ../../Zotlabs/Module/Siteinfo.php:65
+msgid "Site Administrators"
+msgstr "Nettstedsadministratorer"
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "Vi støtte på et problem under innloggingen med din OpenID. Vennligst sjekk at ID-en er stavet riktig."
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid "The error message was:"
+msgstr "Feilmeldingen var:"
+
+#: ../../Zotlabs/Module/Rmagic.php:48
+msgid "Authentication failed."
+msgstr "Autentisering mislyktes."
+
+#: ../../Zotlabs/Module/Rmagic.php:88
+msgid "Remote Authentication"
+msgstr "Fjernautentisering"
+
+#: ../../Zotlabs/Module/Rmagic.php:89
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Skriv din kanaladresse (for eksempel channel@exampel.com)"
+
+#: ../../Zotlabs/Module/Rmagic.php:90
+msgid "Authenticate"
+msgstr "Autentiser"
+
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1337
+msgid "Public Hubs"
+msgstr "Offentlige huber"
+
+#: ../../Zotlabs/Module/Pubsites.php:25
+msgid ""
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
+msgstr "Nettstedene på listen tillater offentlig registrering i $Projectname-nettverket. Alle nettsteder i nettverket er forbundet så medlemskap på enhver av dem formidler medlemskap i nettverket som helhet. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Nettstedene selv <strong>kan</strong> gi tilleggsopplysninger."
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Hub URL"
+msgstr "Nettstedets URL"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Access Type"
+msgstr "Tilgangstype"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Registration Policy"
+msgstr "Retningslinjer for registrering"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Stats"
+msgstr "Statistikk"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Software"
+msgstr "Programvare"
+
+#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
+#: ../../include/conversation.php:962
+msgid "Ratings"
+msgstr "Vurderinger"
+
+#: ../../Zotlabs/Module/Pubsites.php:38
+msgid "Rate"
+msgstr "Vurder"
+
+#: ../../Zotlabs/Module/Profile_photo.php:186
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens mellomlager hvis det nye bildet ikke vises umiddelbart."
+
+#: ../../Zotlabs/Module/Profile_photo.php:389
+msgid "Upload Profile Photo"
+msgstr "Last opp profilbilde:"
+
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Editblock.php:108
+msgid "Block Name"
+msgstr "Byggeklossens navn"
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2238
+msgid "Blocks"
+msgstr "Byggeklosser"
+
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr "Byggeklossens tittel"
+
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Website:"
+msgstr "Nettsted:"
+
+#: ../../Zotlabs/Module/Rate.php:163
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Fjerntliggende kanal [%s] (foreløpig ikke kjent på dette nettstedet)"
+
+#: ../../Zotlabs/Module/Rate.php:164
+msgid "Rating (this information is public)"
+msgstr "Vurdering (denne informasjonen er offentlig)"
+
+#: ../../Zotlabs/Module/Rate.php:165
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Velg om du vil forklare din vurdering (denne informasjonen er offentlig)"
+
+#: ../../Zotlabs/Module/Ratings.php:73
+msgid "No ratings"
+msgstr "Ingen vurderinger"
+
+#: ../../Zotlabs/Module/Ratings.php:104
+msgid "Rating: "
+msgstr "Vurdering:"
+
+#: ../../Zotlabs/Module/Ratings.php:105
+msgid "Website: "
+msgstr "Nettsted:"
+
+#: ../../Zotlabs/Module/Ratings.php:107
+msgid "Description: "
+msgstr "Beskrivelse:"
+
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:165
+#: ../../include/widgets.php:102
+msgid "Apps"
+msgstr "Apper"
+
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243
+msgid "Title (optional)"
+msgstr "Tittel (valgfri)"
+
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
+msgstr "Endre byggekloss"
+
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr "Ingen kanal."
+
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr "Felles forbindelser"
+
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
+msgstr "Ingen forbindelser felles."
 
 #: ../../Zotlabs/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
@@ -4750,120 +4984,154 @@ msgstr "ja"
 msgid "Membership on this site is by invitation only."
 msgstr "Medlemskap ved dette nettstedet skjer kun via invitasjon."
 
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
-#: ../../boot.php:1685
+#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:149
+#: ../../boot.php:1686
 msgid "Register"
 msgstr "Registrer"
 
-#: ../../Zotlabs/Module/Register.php:262
-msgid "Proceed to create your first channel"
-msgstr "Gå videre for å lage din første kanal"
+#: ../../Zotlabs/Module/Register.php:263
+msgid ""
+"This site may require email verification after submitting this form. If you "
+"are returned to a login page, please check your email for instructions."
+msgstr ""
 
 #: ../../Zotlabs/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Vennligst logg inn."
 
-#: ../../Zotlabs/Module/Removeaccount.php:34
+#: ../../Zotlabs/Module/Removeaccount.php:35
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Sletting av kontoer er ikke tillatt innen 48 timer etter endring av kontopassordet."
 
-#: ../../Zotlabs/Module/Removeaccount.php:56
+#: ../../Zotlabs/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Slett denne kontoen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "WARNING: "
 msgstr "ADVARSEL:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Denne kontoen og alle dens kanaler vil bli fullstendig fjernet fra nettverket."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This action is permanent and can not be undone!"
 msgstr "Denne handlingen er permanent og kan ikke angres!"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeme.php:62
 msgid "Please enter your password for verification:"
 msgstr "Vennligst skriv ditt passord for å få bekreftelse:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Slett denne kontoen, alle dens kanaler og alle dens kanalkloner fra dette nettverket"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Som standard vil bare forekomster av kanalene lokalisert på denne hubben bli slettet fra nettverket"
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
-#: ../../Zotlabs/Module/Settings.php:705
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings.php:759
 msgid "Remove Account"
 msgstr "Slett konto"
 
-#: ../../Zotlabs/Module/Removeme.php:33
+#: ../../Zotlabs/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Fjerning av kanaler er ikke tillatt innen 48 timer etter endring av kontopassordet."
 
-#: ../../Zotlabs/Module/Removeme.php:58
+#: ../../Zotlabs/Module/Removeme.php:60
 msgid "Remove This Channel"
 msgstr "Fjern denne kanalen"
 
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This channel will be completely removed from the network. "
 msgstr "Denne kanalen vil bli fullstendig fjernet fra nettverket."
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid "Remove this channel and all its clones from the network"
 msgstr "Fjern denne kanalen og alle dens kloner fra nettverket"
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "Som standard vil bare forekomsten av denne kanalen lokalisert på denne hubben bli fjernet fra nettverket"
 
-#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Removeme.php:64 ../../Zotlabs/Module/Settings.php:1219
 msgid "Remove Channel"
 msgstr "Fjern kanal"
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+msgid "Export Channel"
+msgstr "Eksporter kanal"
+
+#: ../../Zotlabs/Module/Uexport.php:57
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "Vi støtte på et problem under innloggingen med din OpenID. Vennligst sjekk at ID-en er stavet riktig."
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Eksporter grunnleggende informasjon om kanalen din til en fil. Denne er en sikkerhetskopi av dine forbindelser, tillatelser, profil og grunnleggende data, som kan brukes til å importere dine data til en ny hub, men den tar ikke med innholdet."
 
-#: ../../Zotlabs/Module/Rmagic.php:44
-msgid "The error message was:"
-msgstr "Feilmeldingen var:"
+#: ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Content"
+msgstr "Eksporter innhold"
 
-#: ../../Zotlabs/Module/Rmagic.php:48
-msgid "Authentication failed."
-msgstr "Autentisering mislyktes."
+#: ../../Zotlabs/Module/Uexport.php:59
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Eksporter din kanalinformasjon og det nyeste innholdet til en JSON-sikkerhetskopi, som kan gjenopprettes eller importeres til en annen hub. Denne lager en sikkerhetskopi av alle dine forbindelser, tillatelser, profildata og flere måneder av innholdet ditt. Denne filen kan være SVÆRT stor. Vennligst vær tålmodig - det kan ta flere minutter før denne nedlastningen begynner."
 
-#: ../../Zotlabs/Module/Rmagic.php:88
-msgid "Remote Authentication"
-msgstr "Fjernautentisering"
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export your posts from a given year."
+msgstr "Eksporter dine innlegg fra et bestemt år"
 
-#: ../../Zotlabs/Module/Rmagic.php:89
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Skriv din kanaladresse (for eksempel channel@exampel.com)"
+#: ../../Zotlabs/Module/Uexport.php:62
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "Du kan også eksportere dine innlegg og samtaler for et bestemt år eller måned. Juster datoen i din nettlesers adresselinje for å velge andre datoer. Hvis eksporten feiler (muligens på grunn av utilstrekkelig minne på din hub), vennligst prøv igjen med et mer begrenset datoområde."
 
-#: ../../Zotlabs/Module/Rmagic.php:90
-msgid "Authenticate"
-msgstr "Autentiser"
+#: ../../Zotlabs/Module/Uexport.php:63
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a "
+"href=\"%1$s\">%2$s</a>"
+msgstr "For å velge alle innlegg for et gitt år, slik som iår, besøk <a href=\"%1$s\">%2$s</a>"
+
+#: ../../Zotlabs/Module/Uexport.php:64
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr "For å velge alle innlegg fra en gitt måned, slik som januar i år, besøk <a href=\"%1$s\">%2$s</a>"
+
+#: ../../Zotlabs/Module/Uexport.php:65
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a "
+"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
+" please import or restore these in date order (oldest first)."
+msgstr "Disse innholdsfilene kan importeres eller gjenopprettes ved å besøke <a href=\"%1$s\">%2$s</a> på ethvert nettsted som inneholder din kanal. For best resultat, vennligst importer eller gjenopprett disse etter dato (eldste først)."
 
 #: ../../Zotlabs/Module/Search.php:216
 #, php-format
@@ -4879,609 +5147,652 @@ msgstr "Søkeresultater for: %s"
 msgid "No service class restrictions found."
 msgstr "Ingen restriksjoner er funnet i tjenesteklasse."
 
-#: ../../Zotlabs/Module/Settings.php:69
+#: ../../Zotlabs/Module/Settings.php:64
 msgid "Name is required"
 msgstr "Navn er påkrevd"
 
-#: ../../Zotlabs/Module/Settings.php:73
+#: ../../Zotlabs/Module/Settings.php:68
 msgid "Key and Secret are required"
 msgstr "Nøkkel og hemmelighet er påkrevd"
 
-#: ../../Zotlabs/Module/Settings.php:225
+#: ../../Zotlabs/Module/Settings.php:138
+#, php-format
+msgid "This channel is limited to %d tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:144
+msgid "Name and Password are required."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:168
+msgid "Token saved."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:274
 msgid "Not valid email."
 msgstr "Ikke gyldig e-post."
 
-#: ../../Zotlabs/Module/Settings.php:228
+#: ../../Zotlabs/Module/Settings.php:277
 msgid "Protected email address. Cannot change to that email."
 msgstr "Beskyttet e-postadresse. Kan ikke endre til den e-postadressen."
 
-#: ../../Zotlabs/Module/Settings.php:237
+#: ../../Zotlabs/Module/Settings.php:286
 msgid "System failure storing new email. Please try again."
 msgstr "Systemfeil ved lagring av ny e-post. Vennligst prøv igjen."
 
-#: ../../Zotlabs/Module/Settings.php:254
+#: ../../Zotlabs/Module/Settings.php:303
 msgid "Password verification failed."
 msgstr "Passordbekreftelsen mislyktes."
 
-#: ../../Zotlabs/Module/Settings.php:261
+#: ../../Zotlabs/Module/Settings.php:310
 msgid "Passwords do not match. Password unchanged."
 msgstr "Passordene stemmer ikke overens. Passord uforandret."
 
-#: ../../Zotlabs/Module/Settings.php:265
+#: ../../Zotlabs/Module/Settings.php:314
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Tomme passord er ikke tillatt. Passord uforandret."
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Zotlabs/Module/Settings.php:328
 msgid "Password changed."
 msgstr "Passord endret."
 
-#: ../../Zotlabs/Module/Settings.php:281
+#: ../../Zotlabs/Module/Settings.php:330
 msgid "Password update failed. Please try again."
 msgstr "Passord oppdatering mislyktes. Vennligst prøv igjen."
 
-#: ../../Zotlabs/Module/Settings.php:525
+#: ../../Zotlabs/Module/Settings.php:579
 msgid "Settings updated."
 msgstr "Innstillinger oppdatert."
 
-#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
-#: ../../Zotlabs/Module/Settings.php:651
+#: ../../Zotlabs/Module/Settings.php:643 ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:705
 msgid "Add application"
 msgstr "Legg til program"
 
-#: ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:646
 msgid "Name of application"
 msgstr "Navn på program"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:673
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:648
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatisk laget - kan endres om du vil. Største lengde 20"
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:648 ../../Zotlabs/Module/Settings.php:674
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
+#: ../../Zotlabs/Module/Settings.php:649 ../../Zotlabs/Module/Settings.php:675
 msgid "Redirect"
 msgstr "Omdirigering"
 
-#: ../../Zotlabs/Module/Settings.php:595
+#: ../../Zotlabs/Module/Settings.php:649
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires "
 "this"
 msgstr "Omdirigerings-URI - la stå tomt hvis ikke ditt program spesifikt krever dette"
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Settings.php:622
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Settings.php:676
 msgid "Icon url"
 msgstr "Ikon-URL"
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Sources.php:112
 #: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr "Valgfritt"
 
-#: ../../Zotlabs/Module/Settings.php:607
+#: ../../Zotlabs/Module/Settings.php:661
 msgid "Application not found."
 msgstr "Programmet ble ikke funnet."
 
-#: ../../Zotlabs/Module/Settings.php:650
+#: ../../Zotlabs/Module/Settings.php:704
 msgid "Connected Apps"
 msgstr "Tilkoblede app-er"
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:708
 msgid "Client key starts with"
 msgstr "Klientnøkkel starter med"
 
-#: ../../Zotlabs/Module/Settings.php:655
+#: ../../Zotlabs/Module/Settings.php:709
 msgid "No name"
 msgstr "Ikke noe navn"
 
-#: ../../Zotlabs/Module/Settings.php:656
+#: ../../Zotlabs/Module/Settings.php:710
 msgid "Remove authorization"
 msgstr "Fjern tillatelse"
 
-#: ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:723
 msgid "No feature settings configured"
 msgstr "Ingen funksjonsinnstillinger er konfigurert"
 
-#: ../../Zotlabs/Module/Settings.php:676
+#: ../../Zotlabs/Module/Settings.php:730
 msgid "Feature/Addon Settings"
 msgstr "Funksjons-/Tilleggsinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:753
 msgid "Account Settings"
 msgstr "Kontoinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:754
 msgid "Current Password"
 msgstr "Nåværende passord"
 
-#: ../../Zotlabs/Module/Settings.php:701
+#: ../../Zotlabs/Module/Settings.php:755
 msgid "Enter New Password"
 msgstr "Skriv nytt passord"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 msgid "Confirm New Password"
 msgstr "Bekreft nytt passord"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 msgid "Leave password fields blank unless changing"
 msgstr "La passordfeltene stå blanke om det ikke skal endres"
 
-#: ../../Zotlabs/Module/Settings.php:704
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:758
+#: ../../Zotlabs/Module/Settings.php:1136
 msgid "Email Address:"
 msgstr "E-postadresse:"
 
-#: ../../Zotlabs/Module/Settings.php:706
+#: ../../Zotlabs/Module/Settings.php:760
 msgid "Remove this account including all its channels"
 msgstr "Slett denne kontoen inkludert alle dens kanaler"
 
-#: ../../Zotlabs/Module/Settings.php:729
+#: ../../Zotlabs/Module/Settings.php:789
+msgid ""
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in Access Control Lists and "
+"visitors may login using these credentials to access the private content."
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:791
+msgid ""
+"You may also provide <em>dropbox</em> style access links to friends and "
+"associates by adding the Login Password to any specific site URL as shown. "
+"Examples:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:796 ../../include/widgets.php:614
+msgid "Guest Access Tokens"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:803
+msgid "Login Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:804
+msgid "Login Password"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:805
+msgid "Expires (yyyy-mm-dd)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Settings.php:830
 msgid "Additional Features"
 msgstr "Ekstra funksjoner"
 
-#: ../../Zotlabs/Module/Settings.php:753
+#: ../../Zotlabs/Module/Settings.php:854
 msgid "Connector Settings"
 msgstr "Koblingsinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:792
+#: ../../Zotlabs/Module/Settings.php:893
 msgid "No special theme for mobile devices"
 msgstr "Ikke noe spesielt tema for mobile enheter"
 
-#: ../../Zotlabs/Module/Settings.php:795
+#: ../../Zotlabs/Module/Settings.php:896
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (Eksperimentelt)"
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:938
 msgid "Display Settings"
 msgstr "Visningsinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:939
 msgid "Theme Settings"
 msgstr "Temainnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:839
+#: ../../Zotlabs/Module/Settings.php:940
 msgid "Custom Theme Settings"
 msgstr "Tilpassede temainnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:840
+#: ../../Zotlabs/Module/Settings.php:941
 msgid "Content Settings"
 msgstr "Innholdsinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:947
 msgid "Display Theme:"
 msgstr "Visningstema:"
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:948
 msgid "Mobile Theme:"
 msgstr "Mobiltema:"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 msgid "Preload images before rendering the page"
 msgstr "Last inn bildene før gjengivelsen av siden"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 msgid ""
 "The subjective page load time will be longer but the page will be ready when"
 " displayed"
 msgstr "Den personlige opplevelsen av lastetiden vil være lenger, men siden vil være klar når den vises"
 
-#: ../../Zotlabs/Module/Settings.php:849
+#: ../../Zotlabs/Module/Settings.php:950
 msgid "Enable user zoom on mobile devices"
 msgstr "Skru på brukerstyrt zoom på mobile enheter"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Update browser every xx seconds"
 msgstr "Oppdater nettleser hvert xx sekunder"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 sekunder, ikke noe maksimum"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:952
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maksimalt antall samtaler å laste samtidig:"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:952
 msgid "Maximum of 100 items"
 msgstr "Maksimum 100 elementer"
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:953
 msgid "Show emoticons (smilies) as images"
 msgstr "Vis emoticons (smilefjes) som bilder"
 
-#: ../../Zotlabs/Module/Settings.php:853
+#: ../../Zotlabs/Module/Settings.php:954
 msgid "Link post titles to source"
 msgstr "Lenk innleggets tittel til kilden"
 
-#: ../../Zotlabs/Module/Settings.php:854
+#: ../../Zotlabs/Module/Settings.php:955
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Systemsidens layoutbehandler - (avansert)"
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:958
 msgid "Use blog/list mode on channel page"
 msgstr "Bruk blogg-/listemodus på kanalsiden"
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:958 ../../Zotlabs/Module/Settings.php:959
 msgid "(comments displayed separately)"
 msgstr "(kommentarer vist separat)"
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:959
 msgid "Use blog/list mode on grid page"
 msgstr "Bruk blogg-/liste-modus på nettverkssiden"
 
-#: ../../Zotlabs/Module/Settings.php:859
+#: ../../Zotlabs/Module/Settings.php:960
 msgid "Channel page max height of content (in pixels)"
 msgstr "Kanalsidens makshøyde for innhold (i pixler)"
 
-#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:960 ../../Zotlabs/Module/Settings.php:961
 msgid "click to expand content exceeding this height"
 msgstr "klikk for å utvide innhold som overstiger denne høyden"
 
-#: ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:961
 msgid "Grid page max height of content (in pixels)"
 msgstr "Nettverkssidens makshøyde for innhold (i piksler)"
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Zotlabs/Module/Settings.php:990
 msgid "Nobody except yourself"
 msgstr "Ingen unntatt deg selv"
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:991
 msgid "Only those you specifically allow"
 msgstr "Bare de du spesifikt tillater"
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:992
 msgid "Approved connections"
 msgstr "Godkjente forbindelser"
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:993
 msgid "Any connections"
 msgstr "Enhver forbindelse"
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:994
 msgid "Anybody on this website"
 msgstr "Enhver ved dette nettstedet"
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:995
 msgid "Anybody in this network"
 msgstr "Enhver i dette nettverket"
 
-#: ../../Zotlabs/Module/Settings.php:900
+#: ../../Zotlabs/Module/Settings.php:996
 msgid "Anybody authenticated"
 msgstr "Enhver som er autentisert"
 
-#: ../../Zotlabs/Module/Settings.php:901
+#: ../../Zotlabs/Module/Settings.php:997
 msgid "Anybody on the internet"
 msgstr "Enhver på Internett"
 
-#: ../../Zotlabs/Module/Settings.php:976
+#: ../../Zotlabs/Module/Settings.php:1071
 msgid "Publish your default profile in the network directory"
 msgstr "Publiser din standardprofil i nettverkskatalogen"
 
-#: ../../Zotlabs/Module/Settings.php:981
+#: ../../Zotlabs/Module/Settings.php:1076
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Tillat oss å foreslå deg som en mulig venn til nye medlemmer?"
 
-#: ../../Zotlabs/Module/Settings.php:990
+#: ../../Zotlabs/Module/Settings.php:1085
 msgid "Your channel address is"
 msgstr "Din kanaladresse er"
 
-#: ../../Zotlabs/Module/Settings.php:1032
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Channel Settings"
 msgstr "Kanalinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:1134
 msgid "Basic Settings"
 msgstr "Grunninnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140
+#: ../../Zotlabs/Module/Settings.php:1135 ../../include/channel.php:1180
 msgid "Full Name:"
 msgstr "Fullt navn:"
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1137
 msgid "Your Timezone:"
 msgstr "Din tidssone:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Default Post Location:"
 msgstr "Standard plassering ved innlegg:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Geographical location to display on your posts"
 msgstr "Geografisk plassering som vises på dine innlegg"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1139
 msgid "Use Browser Location:"
 msgstr "Bruk nettleseren sin plassering:"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 msgid "Adult Content"
 msgstr "Voksent innhold"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr "Denne kanalen vil ofte eller jevnlig publisere voksent innhold. (Vennligst merk alt voksent materiale og/eller nakenhet med #NSFW)"
 
-#: ../../Zotlabs/Module/Settings.php:1048
+#: ../../Zotlabs/Module/Settings.php:1143
 msgid "Security and Privacy Settings"
 msgstr "Sikkerhets- og personverninnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1146
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr "Dine tillatelser er allerede satt. Klikk for å se/justere."
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 msgid "Hide my online presence"
 msgstr "Skjul min tilstedeværelse online"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 msgid "Prevents displaying in your profile that you are online"
 msgstr "Forhindrer visning på din profil av at du er online "
 
-#: ../../Zotlabs/Module/Settings.php:1055
+#: ../../Zotlabs/Module/Settings.php:1150
 msgid "Simple Privacy Settings:"
 msgstr "Enkle personverninnstillinger:"
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1151
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr "Svært offentlig - <em>ekstremt åpent (bør brukes med varsomhet)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Zotlabs/Module/Settings.php:1152
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr "Typisk - <em>standard er offentlig, personvern når ønsket (likner på tillatelser i sosiale nettverk, men med forbedret personvern)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1058
+#: ../../Zotlabs/Module/Settings.php:1153
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privat - <em>standard er privat, aldri åpen eller offentlig</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1154
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Blokkert - <em>standard blokkert til/fra alle</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 msgid "Allow others to tag your posts"
 msgstr "Tillat andre å merke dine innlegg"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr "Ofte brukt av fellesskapet for å merke upassende innhold i etterkant"
 
-#: ../../Zotlabs/Module/Settings.php:1063
+#: ../../Zotlabs/Module/Settings.php:1158
 msgid "Advanced Privacy Settings"
 msgstr "Avanserte personverninnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "Expire other channel content after this many days"
 msgstr "Annet kanal innhold utløper etter så mange dager"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "0 or blank to use the website limit."
-msgstr ""
+msgstr "0 eller ikke noe for å bruke nettstedets grense."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 #, php-format
 msgid "This website expires after %d days."
-msgstr ""
+msgstr "Dette nettstedet utgår etter %d dager."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "This website does not expire imported content."
-msgstr ""
+msgstr "Dette nettstedet lar ikke importert innhold utgå."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "The website limit takes precedence if lower than your limit."
-msgstr ""
+msgstr "Nettstedets grense bestemmer hvis lavere enn din grense."
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maksimalt antall venneforespørsler per dag:"
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "May reduce spam activity"
 msgstr "Kan redusere søppelpostaktivitet"
 
-#: ../../Zotlabs/Module/Settings.php:1067
+#: ../../Zotlabs/Module/Settings.php:1162
 msgid "Default Post and Publish Permissions"
-msgstr ""
+msgstr "Standard innleggs- og publiseringstillatelser"
 
-#: ../../Zotlabs/Module/Settings.php:1069
+#: ../../Zotlabs/Module/Settings.php:1164
 msgid "Use my default audience setting for the type of object published"
-msgstr ""
+msgstr "Bruk min standard målgruppeinnstilling for objekttypen som publiseres"
 
-#: ../../Zotlabs/Module/Settings.php:1072
+#: ../../Zotlabs/Module/Settings.php:1167
 msgid "Channel permissions category:"
 msgstr "Kategori med kanaltillatelser:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maksimalt antall private meldinger per dag fra ukjente personer:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Useful to reduce spamming"
 msgstr "Nyttig for å redusere søppelpost"
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1176
 msgid "Notification Settings"
 msgstr "Varslingsinnstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1177
 msgid "By default post a status message when:"
 msgstr "Legg inn en statusmelding når du:"
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1178
 msgid "accepting a friend request"
 msgstr "aksepterer en venneforespørsel"
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1179
 msgid "joining a forum/community"
 msgstr "blir med i et forum/miljø"
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1180
 msgid "making an <em>interesting</em> profile change"
 msgstr "gjør en <em>interessant</em> profilendring"
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1181
 msgid "Send a notification email when:"
 msgstr "Send en varsel-e-post når:"
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1182
 msgid "You receive a connection request"
 msgstr "Du har mottatt en forespørsel om forbindelse"
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1183
 msgid "Your connections are confirmed"
 msgstr "Dine forbindelser er bekreftet"
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1184
 msgid "Someone writes on your profile wall"
 msgstr "Noen skriver på din profilvegg"
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1185
 msgid "Someone writes a followup comment"
 msgstr "Noen skriver en oppfølgende kommentar"
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1186
 msgid "You receive a private message"
 msgstr "Du mottar en privat melding"
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1187
 msgid "You receive a friend suggestion"
 msgstr "Du mottok et venneforslag"
 
-#: ../../Zotlabs/Module/Settings.php:1093
+#: ../../Zotlabs/Module/Settings.php:1188
 msgid "You are tagged in a post"
 msgstr "Du merkes i et innlegg"
 
-#: ../../Zotlabs/Module/Settings.php:1094
+#: ../../Zotlabs/Module/Settings.php:1189
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Du ble prikket/oppildnet/og så vider i et innlegg"
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1192
 msgid "Show visual notifications including:"
 msgstr "Vis visuelle varslinger om:"
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1194
 msgid "Unseen grid activity"
 msgstr "Usett nettverksaktivitet"
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1195
 msgid "Unseen channel activity"
 msgstr "Usett kanalaktivitet"
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1196
 msgid "Unseen private messages"
 msgstr "Usette private meldinger"
 
-#: ../../Zotlabs/Module/Settings.php:1101
-#: ../../Zotlabs/Module/Settings.php:1106
-#: ../../Zotlabs/Module/Settings.php:1107
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1196
+#: ../../Zotlabs/Module/Settings.php:1201
+#: ../../Zotlabs/Module/Settings.php:1202
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "Recommended"
 msgstr "Anbefalt"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1197
 msgid "Upcoming events"
 msgstr "Kommende hendelser"
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1198
 msgid "Events today"
 msgstr "Hendelser idag"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Upcoming birthdays"
 msgstr "Kommende fødselsdager"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Not available in all themes"
 msgstr "Ikke tilgjengelig i alle temaer"
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1200
 msgid "System (personal) notifications"
 msgstr "System (personlige) varslinger"
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1201
 msgid "System info messages"
 msgstr "System infomeldinger"
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1202
 msgid "System critical alerts"
 msgstr "System kritiske varsel"
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "New connections"
 msgstr "Nye forbindelser"
 
-#: ../../Zotlabs/Module/Settings.php:1109
+#: ../../Zotlabs/Module/Settings.php:1204
 msgid "System Registrations"
 msgstr "Systemregistreringer"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1205
 msgid ""
 "Also show new wall posts, private messages and connections under Notices"
 msgstr "Vis også nye vegginnlegg, private meldinger og forbindelser under Varsler"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 msgid "Notify me of events this many days in advance"
 msgstr "Varsle meg om hendelser dette antall dager på forhånd"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 msgid "Must be greater than 0"
 msgstr "Må være større enn 0"
 
-#: ../../Zotlabs/Module/Settings.php:1114
+#: ../../Zotlabs/Module/Settings.php:1209
 msgid "Advanced Account/Page Type Settings"
 msgstr "Avanserte innstillinger for konto/sidetype"
 
-#: ../../Zotlabs/Module/Settings.php:1115
+#: ../../Zotlabs/Module/Settings.php:1210
 msgid "Change the behaviour of this account for special situations"
 msgstr "Endre oppførselen til denne kontoen i spesielle situasjoner"
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1213
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr "Vennligst skru på ekspertmodus (under <a href=\"settings/features\">Innstillinger > Ekstra funksjoner</a>) for å justere!"
 
-#: ../../Zotlabs/Module/Settings.php:1119
+#: ../../Zotlabs/Module/Settings.php:1214
 msgid "Miscellaneous Settings"
 msgstr "Diverse innstillinger"
 
-#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1215
 msgid "Default photo upload folder"
 msgstr "Standard mappe for opplasting av bilder"
 
-#: ../../Zotlabs/Module/Settings.php:1120
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1215
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - nåværende år, %m - nåværende måned"
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "Default file upload folder"
 msgstr "Standard mappe for opplasting av filer"
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1218
 msgid "Personal menu to display in your channel pages"
 msgstr "Personlig meny som kan vises på dine kanalsider"
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Zotlabs/Module/Settings.php:1220
 msgid "Remove this channel."
 msgstr "Fjern denne kanalen."
 
-#: ../../Zotlabs/Module/Settings.php:1126
+#: ../../Zotlabs/Module/Settings.php:1221
 msgid "Firefox Share $Projectname provider"
 msgstr "$Projectname Firefox Share tilbyder"
 
-#: ../../Zotlabs/Module/Settings.php:1127
+#: ../../Zotlabs/Module/Settings.php:1222
 msgid "Start calendar week on monday"
 msgstr "Start uken med mandag i kalenderen"
 
@@ -5514,7 +5825,7 @@ msgid ""
 msgstr "Du må kanskje importere filen \"install/schmea_xxx.sql\" manuelt ved å bruke en databaseklient."
 
 #: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
-#: ../../Zotlabs/Module/Setup.php:721
+#: ../../Zotlabs/Module/Setup.php:722
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Vennligst les filen \"install/INSTALL.txt\"."
 
@@ -5618,11 +5929,11 @@ msgstr "Noen avanserte egenskaper, som - selv om de er nyttige - kanskje passer
 
 #: ../../Zotlabs/Module/Setup.php:388
 msgid "PHP version 5.5 or greater is required."
-msgstr ""
+msgstr "PHP-versjon 5.5 eller høyere er påkrevet."
 
 #: ../../Zotlabs/Module/Setup.php:389
 msgid "PHP version"
-msgstr ""
+msgstr "PHP-versjon"
 
 #: ../../Zotlabs/Module/Setup.php:404
 msgid "Could not find a command line version of PHP in the web server PATH."
@@ -5714,199 +6025,200 @@ msgid "mb_string PHP module"
 msgstr "mb_string PHP-modul"
 
 #: ../../Zotlabs/Module/Setup.php:496
-msgid "mcrypt PHP module"
-msgstr "mcrypt PHP-modul"
-
-#: ../../Zotlabs/Module/Setup.php:497
 msgid "xml PHP module"
 msgstr "XML PHP modul"
 
-#: ../../Zotlabs/Module/Setup.php:501 ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:500 ../../Zotlabs/Module/Setup.php:502
 msgid "Apache mod_rewrite module"
 msgstr "Apache mod_rewrite-modul"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Zotlabs/Module/Setup.php:500
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr "Feil: Apache web-tjenerens mod-rewrite-modul er påkrevd, men ikke installert."
 
-#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:506 ../../Zotlabs/Module/Setup.php:509
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Zotlabs/Module/Setup.php:506
 msgid ""
 "Error: proc_open is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr "Feil: proc_open er påkrevd, men er enten ikke installert eller har blitt avskrudd i php.ini"
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:514
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Feil: libCURL PHP-modul er påkrevd, men er ikke installert."
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:518
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr "Feil: GD graphics PHP-modul med JPEG-støtte er påkrevd, men er ikke installert."
 
-#: ../../Zotlabs/Module/Setup.php:523
+#: ../../Zotlabs/Module/Setup.php:522
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Feil: openssl PHP-modul er påkrevd, men er ikke installert."
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Zotlabs/Module/Setup.php:526
 msgid ""
 "Error: mysqli or postgres PHP module required but neither are installed."
 msgstr "Feil: mysqli eller postgres PHP modul er påkrevd, men ingen av dem er installert."
 
-#: ../../Zotlabs/Module/Setup.php:531
+#: ../../Zotlabs/Module/Setup.php:530
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Feil: mb_string PHP-modul er påkrevd, men  er ikke installert."
 
-#: ../../Zotlabs/Module/Setup.php:535
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Feil: mcrypt PHP-modul er påkrevd, men er ikke installert."
-
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Zotlabs/Module/Setup.php:534
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr "Feil: XML PHP modul er påkrevet for DAV, men den er ikke installert."
 
-#: ../../Zotlabs/Module/Setup.php:557
+#: ../../Zotlabs/Module/Setup.php:552
 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 "Web-installasjonen må kunne lage en fil kalt \".htconfig.php\" i toppkatalogen til web-tjeneren din, men dette får den ikke til."
 
-#: ../../Zotlabs/Module/Setup.php:558
+#: ../../Zotlabs/Module/Setup.php:553
 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 "Dette er oftest tillatelsesinnstilling, ettersom webtjeneren kanskje kan skrive til filer i din mappe - selv om du kan."
 
-#: ../../Zotlabs/Module/Setup.php:559
+#: ../../Zotlabs/Module/Setup.php:554
 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 "På slutten av denne prosedyren vil vi gi deg en tekst til å lagre i en fil kalt .htconfig.php i toppkatalogen til din Red."
 
-#: ../../Zotlabs/Module/Setup.php:560
+#: ../../Zotlabs/Module/Setup.php:555
 msgid ""
 "You can alternatively skip this procedure and perform a manual installation."
 " Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr "Alternativt, så kan du hoppe over denne prosedyren og gjennomføre en manuell installasjon. Vennligst se filen \"install/INSTALL.txt\" for instruksjoner."
 
-#: ../../Zotlabs/Module/Setup.php:563
+#: ../../Zotlabs/Module/Setup.php:558
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php kan skrives til"
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Zotlabs/Module/Setup.php:572
 msgid ""
 "Red uses the Smarty3 template engine to render its web views. Smarty3 "
 "compiles templates to PHP to speed up rendering."
 msgstr "Red bruker malmotoren Smarty3 for å gjengi sine webvisninger. Smarty3 kompilerer malene om til PHP for å framskynde gjengivelsen."
 
-#: ../../Zotlabs/Module/Setup.php:578
+#: ../../Zotlabs/Module/Setup.php:573
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
-msgstr ""
+msgstr "For å kunne lagre disse kompilerte malene, så må webtjeneren ha skrivetilgang til katalogen %s under hovedmappen."
 
-#: ../../Zotlabs/Module/Setup.php:579 ../../Zotlabs/Module/Setup.php:600
+#: ../../Zotlabs/Module/Setup.php:574 ../../Zotlabs/Module/Setup.php:595
 msgid ""
 "Please ensure that the user that your web server runs as (e.g. www-data) has"
 " write access to this folder."
 msgstr "Vennligst sikre at brukeren som din web-tjeneste kjører som (for eksempel www-data) har skrivetilgang til denne katalogen."
 
-#: ../../Zotlabs/Module/Setup.php:580
+#: ../../Zotlabs/Module/Setup.php:575
 #, 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 "Merknad: som et sikkerhetstiltak bør du bare gi webtjerenn skrivetilgang til %s - ikke til malfilene (.tpl) som den inneholder."
 
-#: ../../Zotlabs/Module/Setup.php:583
+#: ../../Zotlabs/Module/Setup.php:578
 #, php-format
 msgid "%s is writable"
 msgstr "%s kan skrives til"
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Zotlabs/Module/Setup.php:594
 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 bruker lagringsmappen for å lagre opplastede filer. Webtjeneren trenger å ha skrivetilgang til lagringsmappen under Red sin toppnivåmappe."
+"This software 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:603
+#: ../../Zotlabs/Module/Setup.php:598
 msgid "store is writable"
 msgstr "lageret kan skrives til"
 
-#: ../../Zotlabs/Module/Setup.php:636
+#: ../../Zotlabs/Module/Setup.php:631
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access"
 " to this site."
 msgstr "SSL-sertifikatet kan ikke kontrolleres. Fiks sertifikatet eller skru av https tilgang til dette nettstedet."
 
-#: ../../Zotlabs/Module/Setup.php:637
+#: ../../Zotlabs/Module/Setup.php:632
 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 "Hvis du har HTTPS-tilgang til ditt nettsted eller tillater forbindelser til TCP port 443 (HTTPS-porten), så MÅ du bruke nettlesergodkjent sertifkater. Du MÅ IKKE bruke egensignert sertifikater!"
 
-#: ../../Zotlabs/Module/Setup.php:638
+#: ../../Zotlabs/Module/Setup.php:633
 msgid ""
 "This restriction is incorporated because public posts from you may for "
 "example contain references to images on your own hub."
 msgstr "Denne begrensningen er tatt inn fordi offentlige innlegg fra deg kan for eksempel inneholde referanser til bilder på din egen hub."
 
-#: ../../Zotlabs/Module/Setup.php:639
+#: ../../Zotlabs/Module/Setup.php:634
 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 "Hvis sertifikatet ditt ikke gjenkjennes, så vil medlemmer på andre nettsteder (som selv kan ha godkjente sertifikater) få en beskjed med en advarsel på deres eget nettsted som klager over sikkerhetsproblemer."
 
-#: ../../Zotlabs/Module/Setup.php:640
+#: ../../Zotlabs/Module/Setup.php:635
 msgid ""
 "This can cause usability issues elsewhere (not just on your own site) so we "
 "must insist on this requirement."
 msgstr "Dette kan gi problemer med brukervennlighet (ikke bare på ditt eget nettsted), så vi må insistere på dette kravet."
 
-#: ../../Zotlabs/Module/Setup.php:641
+#: ../../Zotlabs/Module/Setup.php:636
 msgid ""
 "Providers are available that issue free certificates which are browser-"
 "valid."
 msgstr "Det finnes tilbydere som utsteder gratis sertifikater som er gyldige i nettlesere."
 
-#: ../../Zotlabs/Module/Setup.php:643
+#: ../../Zotlabs/Module/Setup.php:638
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:641
 msgid "SSL certificate validation"
 msgstr "SSL sertifikat-kontroll"
 
-#: ../../Zotlabs/Module/Setup.php:649
+#: ../../Zotlabs/Module/Setup.php:647
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server "
 "configuration.Test: "
 msgstr "URL omskriving (rewrite) i .htaccess virker ikke. Sjekk konfigurasjonen til tjeneren din. Test:"
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Zotlabs/Module/Setup.php:650
 msgid "Url rewrite is working"
 msgstr "URL rewrite virker"
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:659
 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 "Databasekonfigurasjonsfilen \".htconfig.php\" kunne ikke skrives. Vennligst bruk den medfølgende teksten for å lage en konfigurasjonsfil i toppkatalogen av din web-tjener."
 
-#: ../../Zotlabs/Module/Setup.php:685
+#: ../../Zotlabs/Module/Setup.php:683
 msgid "Errors encountered creating database tables."
 msgstr "Feil oppstod under opprettelsen av databasetabeller."
 
-#: ../../Zotlabs/Module/Setup.php:719
+#: ../../Zotlabs/Module/Setup.php:720
 msgid "<h1>What next</h1>"
 msgstr "<h1>Hva gjenstår</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:720
+#: ../../Zotlabs/Module/Setup.php:721
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -5928,184 +6240,6 @@ msgstr "Fjern alle filer"
 msgid "Remove this file"
 msgstr "Fjern denne filen"
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
-#, php-format
-msgid "Version %s"
-msgstr "Versjon %s"
-
-#: ../../Zotlabs/Module/Siteinfo.php:40
-msgid "Installed plugins/addons/apps:"
-msgstr "Installerte tilleggsfunksjoner/tillegg/apper:"
-
-#: ../../Zotlabs/Module/Siteinfo.php:53
-msgid "No installed plugins/addons/apps"
-msgstr "Ingen installerte tilleggsfunksjoner/tillegg/apper"
-
-#: ../../Zotlabs/Module/Siteinfo.php:66
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
-msgstr "Dette er en $Projectname-hub - et globalt samhandlende nettverk av desentraliserte nettsteder med innbygget personvern."
-
-#: ../../Zotlabs/Module/Siteinfo.php:68
-msgid "Tag: "
-msgstr "Merkelapp:"
-
-#: ../../Zotlabs/Module/Siteinfo.php:70
-msgid "Last background fetch: "
-msgstr "Siste innhenting i bakgrunnen:"
-
-#: ../../Zotlabs/Module/Siteinfo.php:72
-msgid "Current load average: "
-msgstr "Gjeldende belastningsgjennomsnitt:"
-
-#: ../../Zotlabs/Module/Siteinfo.php:75
-msgid "Running at web location"
-msgstr "Kjører på webplasseringen"
-
-#: ../../Zotlabs/Module/Siteinfo.php:76
-msgid ""
-"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
-"about $Projectname."
-msgstr "Vennligst besøk <a href=\"http://hubzilla.org\">hubzilla.org</a> for å lære mer om $Projectname."
-
-#: ../../Zotlabs/Module/Siteinfo.php:77
-msgid "Bug reports and issues: please visit"
-msgstr "Feilmeldinger og feilretting: vennligst besøk"
-
-#: ../../Zotlabs/Module/Siteinfo.php:79
-msgid "$projectname issues"
-msgstr "$projectname problemer"
-
-#: ../../Zotlabs/Module/Siteinfo.php:80
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Forslag, ros og så videre - vennligst e-post \"redmatrix\" hos librelist - punktum com"
-
-#: ../../Zotlabs/Module/Siteinfo.php:82
-msgid "Site Administrators"
-msgstr "Nettstedsadministratorer"
-
-#: ../../Zotlabs/Module/Sources.php:37
-msgid "Failed to create source. No channel selected."
-msgstr "Mislyktes med å lage kilde. Ingen kanal er valgt."
-
-#: ../../Zotlabs/Module/Sources.php:51
-msgid "Source created."
-msgstr "Kilden er laget."
-
-#: ../../Zotlabs/Module/Sources.php:64
-msgid "Source updated."
-msgstr "Kilden er oppdatert."
-
-#: ../../Zotlabs/Module/Sources.php:90
-msgid "*"
-msgstr "*"
-
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630
-#: ../../include/features.php:71
-msgid "Channel Sources"
-msgstr "Kanalkilder"
-
-#: ../../Zotlabs/Module/Sources.php:97
-msgid "Manage remote sources of content for your channel."
-msgstr "Håndtere eksterne innholdskilder til din kanal."
-
-#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
-msgid "New Source"
-msgstr "Ny kilde"
-
-#: ../../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 "Importer alt eller et utvalgt av innhold fra følgende kanal inn i denne kanalen og distribuer det i henhold til dine egne kanalinnstillinger."
-
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
-msgid "Only import content with these words (one per line)"
-msgstr "Bare importer innhold med disse ordene (ett ord per linje)"
-
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
-msgid "Leave blank to import all public content"
-msgstr "La stå tomt for å importere alt offentlig innhold"
-
-#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
-msgid "Channel Name"
-msgstr "Kanalnavn"
-
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
-msgid ""
-"Add the following categories to posts imported from this source (comma "
-"separated)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
-msgid "Source not found."
-msgstr "Kilden ble ikke funnet."
-
-#: ../../Zotlabs/Module/Sources.php:140
-msgid "Edit Source"
-msgstr "Endre kilde"
-
-#: ../../Zotlabs/Module/Sources.php:141
-msgid "Delete Source"
-msgstr "Slett kilde"
-
-#: ../../Zotlabs/Module/Sources.php:169
-msgid "Source removed"
-msgstr "Kilden er fjernet"
-
-#: ../../Zotlabs/Module/Sources.php:171
-msgid "Unable to remove source."
-msgstr "Ikke i stand til å fjerne kilde."
-
-#: ../../Zotlabs/Module/Subthread.php:118
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
-msgstr "%1$s følger %2$s sin %3$s"
-
-#: ../../Zotlabs/Module/Subthread.php:120
-#, php-format
-msgid "%1$s stopped following %2$s's %3$s"
-msgstr "%1$s stopped å følge %2$s sin %3$s"
-
-#: ../../Zotlabs/Module/Suggest.php:39
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr "Ingen forslag tilgjengelige. Hvis dette er et nytt nettsted, vennligst prøv igjen om 24 timer."
-
-#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:149
-msgid "Ignore/Hide"
-msgstr "Ignorer/Skjul"
-
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256
-msgid "post"
-msgstr "innlegg"
-
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1948
-#: ../../include/conversation.php:150
-msgid "comment"
-msgstr "kommentar"
-
-#: ../../Zotlabs/Module/Tagger.php:100
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
-msgstr "%1$s merket %3$s til %2$s med %4$s"
-
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
-msgid "Tag removed"
-msgstr "Merkelapp fjernet"
-
-#: ../../Zotlabs/Module/Tagrm.php:123
-msgid "Remove Item Tag"
-msgstr "Fjern merkelapp fra element"
-
-#: ../../Zotlabs/Module/Tagrm.php:125
-msgid "Select a tag to remove: "
-msgstr "Velg merkelapp å fjerne:"
-
 #: ../../Zotlabs/Module/Thing.php:114
 msgid "Thing updated"
 msgstr "Tingen er oppdatert"
@@ -6163,74 +6297,229 @@ msgstr "URL til bilde av ting (valgfritt)"
 msgid "Add Thing to your Profile"
 msgstr "Legg til ting i din profil"
 
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
-msgid "Export Channel"
-msgstr "Eksporter kanal"
+#: ../../Zotlabs/Module/Sources.php:37
+msgid "Failed to create source. No channel selected."
+msgstr "Mislyktes med å lage kilde. Ingen kanal er valgt."
 
-#: ../../Zotlabs/Module/Uexport.php:57
+#: ../../Zotlabs/Module/Sources.php:51
+msgid "Source created."
+msgstr "Kilden er laget."
+
+#: ../../Zotlabs/Module/Sources.php:64
+msgid "Source updated."
+msgstr "Kilden er oppdatert."
+
+#: ../../Zotlabs/Module/Sources.php:90
+msgid "*"
+msgstr "*"
+
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:72
+#: ../../include/widgets.php:639
+msgid "Channel Sources"
+msgstr "Kanalkilder"
+
+#: ../../Zotlabs/Module/Sources.php:97
+msgid "Manage remote sources of content for your channel."
+msgstr "Håndtere eksterne innholdskilder til din kanal."
+
+#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
+msgid "New Source"
+msgstr "Ny kilde"
+
+#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
 msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
-msgstr "Eksporter grunnleggende informasjon om kanalen din til en fil. Denne er en sikkerhetskopi av dine forbindelser, tillatelser, profil og grunnleggende data, som kan brukes til å importere dine data til en ny hub, men den tar ikke med innholdet."
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
+msgstr "Importer alt eller et utvalgt av innhold fra følgende kanal inn i denne kanalen og distribuer det i henhold til dine egne kanalinnstillinger."
 
-#: ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Content"
-msgstr "Eksporter innhold"
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+msgid "Only import content with these words (one per line)"
+msgstr "Bare importer innhold med disse ordene (ett ord per linje)"
 
-#: ../../Zotlabs/Module/Uexport.php:59
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+msgid "Leave blank to import all public content"
+msgstr "La stå tomt for å importere alt offentlig innhold"
+
+#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
+msgid "Channel Name"
+msgstr "Kanalnavn"
+
+#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
 msgid ""
-"Export your channel information and recent content to a JSON backup that can"
-" be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for"
-" this download to begin."
-msgstr "Eksporter din kanalinformasjon og det nyeste innholdet til en JSON-sikkerhetskopi, som kan gjenopprettes eller importeres til en annen hub. Denne lager en sikkerhetskopi av alle dine forbindelser, tillatelser, profildata og flere måneder av innholdet ditt. Denne filen kan være SVÆRT stor. Vennligst vær tålmodig - det kan ta flere minutter før denne nedlastningen begynner."
+"Add the following categories to posts imported from this source (comma "
+"separated)"
+msgstr "Legg til følgende kategorier til innlegg importert fra denne kilden (kommeseparert)"
 
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export your posts from a given year."
-msgstr "Eksporter dine innlegg fra et bestemt år"
+#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
+msgid "Source not found."
+msgstr "Kilden ble ikke funnet."
 
-#: ../../Zotlabs/Module/Uexport.php:62
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
-msgstr "Du kan også eksportere dine innlegg og samtaler for et bestemt år eller måned. Juster datoen i din nettlesers adresselinje for å velge andre datoer. Hvis eksporten feiler (muligens på grunn av utilstrekkelig minne på din hub), vennligst prøv igjen med et mer begrenset datoområde."
+#: ../../Zotlabs/Module/Sources.php:140
+msgid "Edit Source"
+msgstr "Endre kilde"
 
-#: ../../Zotlabs/Module/Uexport.php:63
+#: ../../Zotlabs/Module/Sources.php:141
+msgid "Delete Source"
+msgstr "Slett kilde"
+
+#: ../../Zotlabs/Module/Sources.php:169
+msgid "Source removed"
+msgstr "Kilden er fjernet"
+
+#: ../../Zotlabs/Module/Sources.php:171
+msgid "Unable to remove source."
+msgstr "Ikke i stand til å fjerne kilde."
+
+#: ../../Zotlabs/Module/Subthread.php:118
 #, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a "
-"href=\"%1$s\">%2$s</a>"
-msgstr "For å velge alle innlegg for et gitt år, slik som iår, besøk <a href=\"%1$s\">%2$s</a>"
+msgid "%1$s is following %2$s's %3$s"
+msgstr "%1$s følger %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Uexport.php:64
+#: ../../Zotlabs/Module/Subthread.php:120
 #, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr "For å velge alle innlegg fra en gitt måned, slik som januar i år, besøk <a href=\"%1$s\">%2$s</a>"
+msgid "%1$s stopped following %2$s's %3$s"
+msgstr "%1$s stopped å følge %2$s sin %3$s"
 
-#: ../../Zotlabs/Module/Uexport.php:65
+#: ../../Zotlabs/Module/Suggest.php:39
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr "Ingen forslag tilgjengelige. Hvis dette er et nytt nettsted, vennligst prøv igjen om 24 timer."
+
+#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:149
+msgid "Ignore/Hide"
+msgstr "Ignorer/Skjul"
+
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:263
+msgid "post"
+msgstr "innlegg"
+
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
+#: ../../include/text.php:1929
+msgid "comment"
+msgstr "kommentar"
+
+#: ../../Zotlabs/Module/Tagger.php:100
 #, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a "
-"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
-" please import or restore these in date order (oldest first)."
-msgstr "Disse innholdsfilene kan importeres eller gjenopprettes ved å besøke <a href=\"%1$s\">%2$s</a> på ethvert nettsted som inneholder din kanal. For best resultat, vennligst importer eller gjenopprett disse etter dato (eldste først)."
+msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgstr "%1$s merket %3$s til %2$s med %4$s"
 
-#: ../../Zotlabs/Module/Viewconnections.php:62
+#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+msgid "Tag removed"
+msgstr "Merkelapp fjernet"
+
+#: ../../Zotlabs/Module/Tagrm.php:123
+msgid "Remove Item Tag"
+msgstr "Fjern merkelapp fra element"
+
+#: ../../Zotlabs/Module/Tagrm.php:125
+msgid "Select a tag to remove: "
+msgstr "Velg merkelapp å fjerne:"
+
+#: ../../Zotlabs/Module/Webpages.php:191 ../../Zotlabs/Lib/Apps.php:218
+#: ../../include/nav.php:106 ../../include/conversation.php:1700
+msgid "Webpages"
+msgstr "Websider"
+
+#: ../../Zotlabs/Module/Webpages.php:202 ../../include/page_widgets.php:44
+msgid "Actions"
+msgstr "Handlinger"
+
+#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:45
+msgid "Page Link"
+msgstr "Sidelenke"
+
+#: ../../Zotlabs/Module/Webpages.php:204
+msgid "Page Title"
+msgstr "Sidetittel"
+
+#: ../../Zotlabs/Module/Wiki.php:34
+msgid "Not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:92 ../../Zotlabs/Lib/Apps.php:219
+#: ../../include/nav.php:108 ../../include/conversation.php:1710
+#: ../../include/conversation.php:1713 ../../include/features.php:55
+msgid "Wiki"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:93
+msgid "Sandbox"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:95
+msgid ""
+"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be"
+" saved*.\""
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:164
+msgid "Revision Comparison"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:165
+msgid "Revert"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:192
+msgid "Enter the name of your new wiki:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:193
+msgid "Enter the name of the new page:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:194
+msgid "Enter the new name:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:200 ../../include/conversation.php:1150
+msgid "Embed image from photo albums"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:201 ../../include/conversation.php:1234
+msgid "Embed an image from your albums"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:203 ../../include/conversation.php:1236
+#: ../../include/conversation.php:1273
+msgid "OK"
+msgstr "OK"
+
+#: ../../Zotlabs/Module/Wiki.php:204 ../../include/conversation.php:1186
+msgid "Choose images to embed"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:205 ../../include/conversation.php:1187
+msgid "Choose an album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:206 ../../include/conversation.php:1188
+msgid "Choose a different album..."
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:207 ../../include/conversation.php:1189
+msgid "Error getting album list"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:208 ../../include/conversation.php:1190
+msgid "Error getting photo link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1191
+msgid "Error getting album"
+msgstr ""
+
+#: ../../Zotlabs/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr "Ingen forbindelser."
 
-#: ../../Zotlabs/Module/Viewconnections.php:75
+#: ../../Zotlabs/Module/Viewconnections.php:78
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Besøk %s sin profil [%s]"
 
-#: ../../Zotlabs/Module/Viewconnections.php:104
+#: ../../Zotlabs/Module/Viewconnections.php:107
 msgid "View Connections"
 msgstr "Vis forbindelser"
 
@@ -6238,22 +6527,23 @@ msgstr "Vis forbindelser"
 msgid "Source of Item"
 msgstr "Kilde til element"
 
-#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217
-#: ../../include/nav.php:106 ../../include/conversation.php:1685
-msgid "Webpages"
-msgstr "Websider"
+#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
+msgid "Authorize application connection"
+msgstr "Tillat programforbindelse"
 
-#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
-msgid "Actions"
-msgstr "Handlinger"
+#: ../../Zotlabs/Module/Api.php:62
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Gå tilbake til din app og legg inn denne sikkerhetskoden:"
 
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
-msgid "Page Link"
-msgstr "Sidelenke"
+#: ../../Zotlabs/Module/Api.php:72
+msgid "Please login to continue."
+msgstr "Vennligst logg inn for å fortsette."
 
-#: ../../Zotlabs/Module/Webpages.php:197
-msgid "Page Title"
-msgstr "Sidetittel"
+#: ../../Zotlabs/Module/Api.php:87
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" and/or create new posts for you?"
+msgstr "Vil du tillate dette programmet å få tilgang til dine innlegg og kontakter, og/eller lage nye innlegg for deg?"
 
 #: ../../Zotlabs/Module/Xchan.php:10
 msgid "Xchan Lookup"
@@ -6263,92 +6553,6 @@ msgstr "Xchan oppslag"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Slå opp xchan som begynner med (eller webbie):"
 
-#: ../../Zotlabs/Lib/Apps.php:204
-msgid "Site Admin"
-msgstr "Nettstedsadministrator"
-
-#: ../../Zotlabs/Lib/Apps.php:205
-msgid "Bug Report"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:206
-msgid "View Bookmarks"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:207
-msgid "My Chatrooms"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:209
-msgid "Firefox Share"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:210
-msgid "Remote Diagnostics"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
-msgid "Suggest Channels"
-msgstr "Foreslå kanaler"
-
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
-#: ../../boot.php:1703
-msgid "Login"
-msgstr "Logg inn"
-
-#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
-msgid "Grid"
-msgstr "Nett"
-
-#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182
-msgid "Channel Home"
-msgstr "Kanalhjem"
-
-#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:201
-#: ../../include/conversation.php:1649 ../../include/conversation.php:1652
-msgid "Events"
-msgstr "Hendelser"
-
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167
-msgid "Directory"
-msgstr "Katalog"
-
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193
-msgid "Mail"
-msgstr "Melding"
-
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96
-msgid "Chat"
-msgstr "Chat"
-
-#: ../../Zotlabs/Lib/Apps.php:229
-msgid "Probe"
-msgstr "Undersøk"
-
-#: ../../Zotlabs/Lib/Apps.php:230
-msgid "Suggest"
-msgstr "Forreslå"
-
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Random Channel"
-msgstr "Tilfeldig kanal"
-
-#: ../../Zotlabs/Lib/Apps.php:232
-msgid "Invite"
-msgstr "Inviter"
-
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1386
-msgid "Features"
-msgstr "Funksjoner"
-
-#: ../../Zotlabs/Lib/Apps.php:235
-msgid "Post"
-msgstr "Innlegg"
-
-#: ../../Zotlabs/Lib/Apps.php:335
-msgid "Purchase"
-msgstr "Kjøp"
-
 #: ../../Zotlabs/Lib/Chatroom.php:27
 msgid "Missing room name"
 msgstr "Mangler romnavn"
@@ -6369,19 +6573,19 @@ msgstr "Rommet ble ikke funnet."
 msgid "Room is full"
 msgstr "Rommet er fullt"
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1882
 msgid "$Projectname Notification"
 msgstr "$Projectname varsling"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1883
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1885
 msgid "Thank You,"
 msgstr "Tusen takk,"
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1887
 #, php-format
 msgid "%s Administrator"
 msgstr "%s administrator"
@@ -6574,11 +6778,97 @@ msgstr "laget et nytt innlegg"
 msgid "commented on %s's post"
 msgstr "kommenterte på %s sitt innlegg"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:664
+#: ../../Zotlabs/Lib/Apps.php:205
+msgid "Site Admin"
+msgstr "Nettstedsadministrator"
+
+#: ../../Zotlabs/Lib/Apps.php:206
+msgid "Bug Report"
+msgstr "Feilmelding"
+
+#: ../../Zotlabs/Lib/Apps.php:207
+msgid "View Bookmarks"
+msgstr "Vis bokmerker"
+
+#: ../../Zotlabs/Lib/Apps.php:208
+msgid "My Chatrooms"
+msgstr "Mine chatrom"
+
+#: ../../Zotlabs/Lib/Apps.php:210
+msgid "Firefox Share"
+msgstr "Firefox-deling"
+
+#: ../../Zotlabs/Lib/Apps.php:211
+msgid "Remote Diagnostics"
+msgstr "Fjerndiagnostisering"
+
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:90
+msgid "Suggest Channels"
+msgstr "Foreslå kanaler"
+
+#: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:112
+#: ../../boot.php:1704
+msgid "Login"
+msgstr "Logg inn"
+
+#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:181
+msgid "Grid"
+msgstr "Nett"
+
+#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:184
+msgid "Channel Home"
+msgstr "Kanalhjem"
+
+#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:203
+#: ../../include/conversation.php:1664 ../../include/conversation.php:1667
+msgid "Events"
+msgstr "Hendelser"
+
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:169
+msgid "Directory"
+msgstr "Katalog"
+
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:195
+msgid "Mail"
+msgstr "Melding"
+
+#: ../../Zotlabs/Lib/Apps.php:229 ../../include/nav.php:96
+msgid "Chat"
+msgstr "Chat"
+
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Probe"
+msgstr "Undersøk"
+
+#: ../../Zotlabs/Lib/Apps.php:232
+msgid "Suggest"
+msgstr "Forreslå"
+
+#: ../../Zotlabs/Lib/Apps.php:233
+msgid "Random Channel"
+msgstr "Tilfeldig kanal"
+
+#: ../../Zotlabs/Lib/Apps.php:234
+msgid "Invite"
+msgstr "Inviter"
+
+#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1480
+msgid "Features"
+msgstr "Funksjoner"
+
+#: ../../Zotlabs/Lib/Apps.php:237
+msgid "Post"
+msgstr "Innlegg"
+
+#: ../../Zotlabs/Lib/Apps.php:339
+msgid "Purchase"
+msgstr "Kjøp"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:667
 msgid "Private Message"
 msgstr "Privat melding"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:656
+#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:659
 msgid "Select"
 msgstr "Velg"
 
@@ -6626,11 +6916,11 @@ msgstr "Skru av og på stjernestatus"
 msgid "starred"
 msgstr "stjernemerket"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:671
+#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:674
 msgid "Message signature validated"
 msgstr "Innleggets signatur er bekreftet"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:672
+#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:675
 msgid "Message signature incorrect"
 msgstr "Innleggets signatur er feil"
 
@@ -6686,17 +6976,17 @@ msgstr "vegg-til-vegg"
 msgid "via Wall-To-Wall:"
 msgstr "via vegg-til-vegg:"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:719
+#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:722
 #, php-format
 msgid "from %s"
 msgstr "fra %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:722
+#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:725
 #, php-format
 msgid "last edited: %s"
 msgstr "sist endret: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:723
+#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:726
 #, php-format
 msgid "Expires: %s"
 msgstr "Utløper: %s"
@@ -6714,26 +7004,27 @@ msgid "Mark all seen"
 msgstr "Merk alle som sett"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
-msgid "[+] show all"
-msgstr "[+] Vis alle"
+#, php-format
+msgid "%s show all"
+msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1215
+#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1226
 msgid "Bold"
 msgstr "Uthevet"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1216
+#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1227
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1217
+#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1228
 msgid "Underline"
 msgstr "Understreket"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1218
+#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1229
 msgid "Quote"
 msgstr "Sitat"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1219
+#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1230
 msgid "Code"
 msgstr "Kode"
 
@@ -6749,11 +7040,74 @@ msgstr "Sett inn lenke"
 msgid "Video"
 msgstr "Video"
 
+#: ../../Zotlabs/Lib/PermissionDescription.php:31
+#: ../../include/acl_selectors.php:230
+msgid "Visible to your default audience"
+msgstr "Synlig for ditt standard publikum"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:106
+#: ../../include/acl_selectors.php:266
+msgid "Only me"
+msgstr "Bare meg"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+msgid "Public"
+msgstr "Offentlig"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Anybody in the $Projectname network"
+msgstr "Enhver i $Projectname -nettverket"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+#, php-format
+msgid "Any account on %s"
+msgstr "Enhver konto på %s"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+msgid "Any of my connections"
+msgstr "Enhver av mine forbindelser"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Only connections I specifically allow"
+msgstr "Bare forbindelser som jeg spesifikt tillater"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Enhver som er autentisert (kan inkludere besøkende fra andre nettverk)"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Enhver forbindelse inkluder de som ennå ikke er blitt godkjent"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
+msgstr "Dette er dine standardinnstillinger for publikumet til din normale strøm og innlegg."
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
+msgid ""
+"This is your default setting for who can view your default channel profile"
+msgstr "Dette er din standardinnstilling for hvem som kan se din standard kanalprofil"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+msgid "This is your default setting for who can view your connections"
+msgstr "Dette er din standardinnstilling for hvem som kan se dine forbindelser"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:155
+msgid ""
+"This is your default setting for who can view your file storage and photos"
+msgstr "Dette er din standardinnstilling for hvem som kan se fillagreret ditt og bilder"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:156
+msgid "This is your default setting for the audience of your webpages"
+msgstr "Dette er din standardinnstilling for besøkende til dine websider"
+
 #: ../../include/Import/import_diaspora.php:16
 msgid "No username found in import file."
 msgstr "Ingen brukernavn ble funnet i importfilen."
 
-#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50
+#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:51
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "Klarte ikke å lage en unik kanaladresse. Import mislyktes."
 
@@ -6762,6 +7116,291 @@ msgstr "Klarte ikke å lage en unik kanaladresse. Import mislyktes."
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kan ikke finne DNS-informasjon om databasetjener '%s'"
 
+#: ../../include/photos.php:114
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr "Bilde overstiger nettstedets størrelsesbegrensning på %lu bytes"
+
+#: ../../include/photos.php:121
+msgid "Image file is empty."
+msgstr "Bildefilen er tom."
+
+#: ../../include/photos.php:259
+msgid "Photo storage failed."
+msgstr "Bildelagring mislyktes."
+
+#: ../../include/photos.php:299
+msgid "a new photo"
+msgstr "et nytt bilde"
+
+#: ../../include/photos.php:303
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
+msgstr "%1$s la inn %2$s til %3$s"
+
+#: ../../include/photos.php:506 ../../include/conversation.php:1650
+msgid "Photo Albums"
+msgstr "Fotoalbum"
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Last opp nye bilder"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1703
+msgid "Logout"
+msgstr "Logg ut"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115
+msgid "End this session"
+msgstr "Avslutt denne økten"
+
+#: ../../include/nav.php:85 ../../include/nav.php:146
+msgid "Home"
+msgstr "Hjem"
+
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
+msgstr "Dine innlegg og samtaler"
+
+#: ../../include/nav.php:86
+msgid "Your profile page"
+msgstr "Din profilside"
+
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
+msgstr "Håndter/endre profiler"
+
+#: ../../include/nav.php:90 ../../include/channel.php:980
+msgid "Edit Profile"
+msgstr "Endre profil"
+
+#: ../../include/nav.php:90
+msgid "Edit your profile"
+msgstr "Endre din profil"
+
+#: ../../include/nav.php:92
+msgid "Your photos"
+msgstr "Dine bilder"
+
+#: ../../include/nav.php:93
+msgid "Your files"
+msgstr "Dine filer"
+
+#: ../../include/nav.php:96
+msgid "Your chatrooms"
+msgstr "Dine chatterom"
+
+#: ../../include/nav.php:102 ../../include/conversation.php:1690
+msgid "Bookmarks"
+msgstr "Bokmerker"
+
+#: ../../include/nav.php:102
+msgid "Your bookmarks"
+msgstr "Dine bokmerker"
+
+#: ../../include/nav.php:106
+msgid "Your webpages"
+msgstr "Dine websider"
+
+#: ../../include/nav.php:108
+msgid "Your wiki"
+msgstr ""
+
+#: ../../include/nav.php:112
+msgid "Sign in"
+msgstr "Logg på"
+
+#: ../../include/nav.php:129
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - klikk for å logge ut"
+
+#: ../../include/nav.php:132
+msgid "Remote authentication"
+msgstr "Fjernautentisering"
+
+#: ../../include/nav.php:132
+msgid "Click to authenticate to your home hub"
+msgstr "Klikk for å godkjennes mot din hjemme-hub"
+
+#: ../../include/nav.php:146
+msgid "Home Page"
+msgstr "Hjemmeside"
+
+#: ../../include/nav.php:149
+msgid "Create an account"
+msgstr "Lag en konto"
+
+#: ../../include/nav.php:161
+msgid "Help and documentation"
+msgstr "Hjelp og dokumentasjon"
+
+#: ../../include/nav.php:165
+msgid "Applications, utilities, links, games"
+msgstr "Programmer, verktøy, lenker, spill"
+
+#: ../../include/nav.php:167
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Søk nettstedet for @navn, #merkelapp, ?dokumentasjon, innhold"
+
+#: ../../include/nav.php:169
+msgid "Channel Directory"
+msgstr "Kanalkatalog"
+
+#: ../../include/nav.php:181
+msgid "Your grid"
+msgstr "Ditt nett"
+
+#: ../../include/nav.php:182
+msgid "Mark all grid notifications seen"
+msgstr "Marker alle nettvarsler som sett"
+
+#: ../../include/nav.php:184
+msgid "Channel home"
+msgstr "Kanalhjem"
+
+#: ../../include/nav.php:185
+msgid "Mark all channel notifications seen"
+msgstr "Merk alle kanalvarsler som sett"
+
+#: ../../include/nav.php:191
+msgid "Notices"
+msgstr "Varsel"
+
+#: ../../include/nav.php:191
+msgid "Notifications"
+msgstr "Varsler"
+
+#: ../../include/nav.php:192
+msgid "See all notifications"
+msgstr "Se alle varsler"
+
+#: ../../include/nav.php:195
+msgid "Private mail"
+msgstr "Privat post"
+
+#: ../../include/nav.php:196
+msgid "See all private messages"
+msgstr "Se alle private meldinger"
+
+#: ../../include/nav.php:197
+msgid "Mark all private messages seen"
+msgstr "Merk alle private meldinger som sett"
+
+#: ../../include/nav.php:198 ../../include/widgets.php:667
+msgid "Inbox"
+msgstr "Innboks"
+
+#: ../../include/nav.php:199 ../../include/widgets.php:672
+msgid "Outbox"
+msgstr "Utboks"
+
+#: ../../include/nav.php:200 ../../include/widgets.php:677
+msgid "New Message"
+msgstr "Ny melding"
+
+#: ../../include/nav.php:203
+msgid "Event Calendar"
+msgstr "Kalender"
+
+#: ../../include/nav.php:204
+msgid "See all events"
+msgstr "Se alle hendelser"
+
+#: ../../include/nav.php:205
+msgid "Mark all events seen"
+msgstr "Merk alle hendelser som sett"
+
+#: ../../include/nav.php:208
+msgid "Manage Your Channels"
+msgstr "Håndter dine kanaler"
+
+#: ../../include/nav.php:210
+msgid "Account/Channel Settings"
+msgstr "Konto-/kanal-innstillinger"
+
+#: ../../include/nav.php:218 ../../include/widgets.php:1510
+msgid "Admin"
+msgstr "Administrator"
+
+#: ../../include/nav.php:218
+msgid "Site Setup and Configuration"
+msgstr "Nettstedsoppsett og -konfigurasjon"
+
+#: ../../include/nav.php:249 ../../include/conversation.php:854
+msgid "Loading..."
+msgstr "Laster..."
+
+#: ../../include/nav.php:254
+msgid "@name, #tag, ?doc, content"
+msgstr "@navn, #merkelapp, ?dokumentasjon, innhold"
+
+#: ../../include/nav.php:255
+msgid "Please wait..."
+msgstr "Vennligst vent..."
+
+#: ../../include/network.php:704
+msgid "view full size"
+msgstr "vis full størrelse"
+
+#: ../../include/network.php:1930 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr "Administrator"
+
+#: ../../include/network.php:1944
+msgid "No Subject"
+msgstr "Uten emne"
+
+#: ../../include/network.php:2198 ../../include/network.php:2199
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/network.php:2200
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/network.php:2201
+msgid "GNU-Social"
+msgstr "GNU-Social"
+
+#: ../../include/network.php:2202
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/network.php:2204
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/network.php:2205
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/network.php:2206
+msgid "Zot"
+msgstr "Zot"
+
+#: ../../include/network.php:2207
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/network.php:2208
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/network.php:2209
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/page_widgets.php:7
+msgid "New Page"
+msgstr "Ny side"
+
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr "Tittel"
+
 #: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
 #: ../../include/widgets.php:46 ../../include/widgets.php:429
 #: ../../include/contact_widgets.php:91
@@ -6800,952 +7439,159 @@ msgstr "liker"
 msgid "dislikes"
 msgstr "misliker"
 
-#: ../../include/event.php:22 ../../include/event.php:69
-#: ../../include/bb2diaspora.php:485
-msgid "l F d, Y \\@ g:i A"
-msgstr "l F d, Y \\@ g:i A"
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
+msgstr "Klarer ikke å få tak i identitetsinformasjon fra databasen"
 
-#: ../../include/event.php:30 ../../include/event.php:73
-#: ../../include/bb2diaspora.php:491
-msgid "Starts:"
-msgstr "Starter:"
+#: ../../include/channel.php:67
+msgid "Empty name"
+msgstr "Mangler navn"
 
-#: ../../include/event.php:40 ../../include/event.php:77
-#: ../../include/bb2diaspora.php:499
-msgid "Finishes:"
-msgstr "Slutter:"
+#: ../../include/channel.php:70
+msgid "Name too long"
+msgstr "Navnet er for langt"
 
-#: ../../include/event.php:812
-msgid "This event has been added to your calendar."
-msgstr "Denne hendelsen er lagt til i din kalender."
+#: ../../include/channel.php:181
+msgid "No account identifier"
+msgstr "Ingen kontoidentifikator"
 
-#: ../../include/event.php:1012
-msgid "Not specified"
-msgstr "Ikke spesifisert"
+#: ../../include/channel.php:193
+msgid "Nickname is required."
+msgstr "Kallenavn er påkrevd."
 
-#: ../../include/event.php:1013
-msgid "Needs Action"
-msgstr "Trenger handling"
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Reservert kallenavn. Vennligst velg et annet."
 
-#: ../../include/event.php:1014
-msgid "Completed"
-msgstr "Ferdig"
-
-#: ../../include/event.php:1015
-msgid "In Process"
-msgstr "Igang"
-
-#: ../../include/event.php:1016
-msgid "Cancelled"
-msgstr "Avbrutt"
-
-#: ../../include/import.php:29
+#: ../../include/channel.php:212
 msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kan ikke lage en kopi av kanal-identifikatoren på dette systemet. Import mislyktes."
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Kallenavnet inneholder tegn som ikke er støttet eller det er allerede i bruk på dette nettstedet."
 
-#: ../../include/import.php:76
-msgid "Channel clone failed. Import failed."
-msgstr "Kanalkloning mislyktes. Import mislyktes."
+#: ../../include/channel.php:272
+msgid "Unable to retrieve created identity"
+msgstr "Klarer ikke å hente den lagede identiteten"
 
-#: ../../include/items.php:892 ../../include/items.php:937
-msgid "(Unknown)"
-msgstr "(Ukjent)"
+#: ../../include/channel.php:341
+msgid "Default Profile"
+msgstr "Standardprofil"
 
-#: ../../include/items.php:1136
-msgid "Visible to anybody on the internet."
-msgstr "Synlig for enhver på Internett."
+#: ../../include/channel.php:830
+msgid "Requested channel is not available."
+msgstr "Forespurt kanal er ikke tilgjengelig."
 
-#: ../../include/items.php:1138
-msgid "Visible to you only."
-msgstr "Synlig bare for deg."
+#: ../../include/channel.php:977
+msgid "Create New Profile"
+msgstr "Lag ny profil"
 
-#: ../../include/items.php:1140
-msgid "Visible to anybody in this network."
-msgstr "Synlig for enhver i dette nettverket."
+#: ../../include/channel.php:997
+msgid "Visible to everybody"
+msgstr "Synlig for alle"
 
-#: ../../include/items.php:1142
-msgid "Visible to anybody authenticated."
-msgstr "Synlig for enhver som er autentisert."
+#: ../../include/channel.php:1070 ../../include/channel.php:1182
+msgid "Gender:"
+msgstr "Kjønn:"
 
-#: ../../include/items.php:1144
+#: ../../include/channel.php:1071 ../../include/channel.php:1226
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../include/channel.php:1072 ../../include/channel.php:1237
+msgid "Homepage:"
+msgstr "Hjemmeside:"
+
+#: ../../include/channel.php:1073
+msgid "Online Now"
+msgstr "Online nå"
+
+#: ../../include/channel.php:1187
+msgid "Like this channel"
+msgstr "Lik denne kanalen"
+
+#: ../../include/channel.php:1211
+msgid "j F, Y"
+msgstr "j F, Y"
+
+#: ../../include/channel.php:1212
+msgid "j F"
+msgstr "j F"
+
+#: ../../include/channel.php:1219
+msgid "Birthday:"
+msgstr "Fødselsdag:"
+
+#: ../../include/channel.php:1232
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr "Synlig for alle på %s."
+msgid "for %1$d %2$s"
+msgstr "for %1$d %2$s"
 
-#: ../../include/items.php:1146
-msgid "Visible to all connections."
-msgstr "Synlig for alle forbindelser."
+#: ../../include/channel.php:1235
+msgid "Sexual Preference:"
+msgstr "Seksuell preferanse:"
 
-#: ../../include/items.php:1148
-msgid "Visible to approved connections."
-msgstr "Synlig for godkjente forbindelser."
+#: ../../include/channel.php:1241
+msgid "Tags:"
+msgstr "Merkelapper:"
 
-#: ../../include/items.php:1150
-msgid "Visible to specific connections."
-msgstr "Synlig for spesifikke forbindelser."
+#: ../../include/channel.php:1243
+msgid "Political Views:"
+msgstr "Politiske synspunkter:"
 
-#: ../../include/items.php:3909
-msgid "Privacy group is empty."
-msgstr "Personverngruppen er tom."
+#: ../../include/channel.php:1245
+msgid "Religion:"
+msgstr "Religion:"
 
-#: ../../include/items.php:3916
-#, php-format
-msgid "Privacy group: %s"
-msgstr "Personverngruppe: %s"
+#: ../../include/channel.php:1249
+msgid "Hobbies/Interests:"
+msgstr "Hobbyer/interesser:"
 
-#: ../../include/items.php:3928
-msgid "Connection not found."
-msgstr "Forbindelsen ble ikke funnet."
+#: ../../include/channel.php:1251
+msgid "Likes:"
+msgstr "Liker:"
 
-#: ../../include/items.php:4277
-msgid "profile photo"
-msgstr "profilbilde"
+#: ../../include/channel.php:1253
+msgid "Dislikes:"
+msgstr "Misliker:"
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
-msgstr "Ingen mottaker angitt."
+#: ../../include/channel.php:1255
+msgid "Contact information and Social Networks:"
+msgstr "Kontaktinformasjon og sosiale nettverk:"
 
-#: ../../include/message.php:25
-msgid "[no subject]"
-msgstr "[ikke noe emne]"
+#: ../../include/channel.php:1257
+msgid "My other channels:"
+msgstr "Mine andre kanaler:"
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "Kan ikke avgjøre avsender."
+#: ../../include/channel.php:1259
+msgid "Musical interests:"
+msgstr "Musikkinteresse:"
 
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
-msgstr "Lagret innlegg kunne ikke bekreftes."
+#: ../../include/channel.php:1261
+msgid "Books, literature:"
+msgstr "Bøker, litteratur:"
 
-#: ../../include/text.php:428
-msgid "prev"
-msgstr "forrige"
+#: ../../include/channel.php:1263
+msgid "Television:"
+msgstr "TV:"
 
-#: ../../include/text.php:430
-msgid "first"
-msgstr "første"
+#: ../../include/channel.php:1265
+msgid "Film/dance/culture/entertainment:"
+msgstr "Film/dans/kultur/underholdning:"
 
-#: ../../include/text.php:459
-msgid "last"
-msgstr "siste"
+#: ../../include/channel.php:1267
+msgid "Love/Romance:"
+msgstr "Kjærlighet/romantikk:"
 
-#: ../../include/text.php:462
-msgid "next"
-msgstr "neste"
+#: ../../include/channel.php:1269
+msgid "Work/employment:"
+msgstr "Arbeid/sysselsetting:"
 
-#: ../../include/text.php:472
-msgid "older"
-msgstr "eldre"
+#: ../../include/channel.php:1271
+msgid "School/education:"
+msgstr "Skole/utdannelse:"
 
-#: ../../include/text.php:474
-msgid "newer"
-msgstr "nyere"
-
-#: ../../include/text.php:863
-msgid "No connections"
-msgstr "Ingen forbindelser"
-
-#: ../../include/text.php:888
-#, php-format
-msgid "View all %s connections"
-msgstr "Vis alle %s forbindelser"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-msgid "poke"
-msgstr "prikk"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-#: ../../include/conversation.php:243
-msgid "poked"
-msgstr "prikket"
-
-#: ../../include/text.php:1039
-msgid "ping"
-msgstr "varsle"
-
-#: ../../include/text.php:1039
-msgid "pinged"
-msgstr "varslet"
-
-#: ../../include/text.php:1040
-msgid "prod"
-msgstr "oppildne"
-
-#: ../../include/text.php:1040
-msgid "prodded"
-msgstr "oppildnet"
-
-#: ../../include/text.php:1041
-msgid "slap"
-msgstr "daske"
-
-#: ../../include/text.php:1041
-msgid "slapped"
-msgstr "dasket"
-
-#: ../../include/text.php:1042
-msgid "finger"
-msgstr "fingre"
-
-#: ../../include/text.php:1042
-msgid "fingered"
-msgstr "fingret"
-
-#: ../../include/text.php:1043
-msgid "rebuff"
-msgstr "tilbakevise"
-
-#: ../../include/text.php:1043
-msgid "rebuffed"
-msgstr "tilbakeviste"
-
-#: ../../include/text.php:1055
-msgid "happy"
-msgstr "glad"
-
-#: ../../include/text.php:1056
-msgid "sad"
-msgstr "trist"
-
-#: ../../include/text.php:1057
-msgid "mellow"
-msgstr "dempet"
-
-#: ../../include/text.php:1058
-msgid "tired"
-msgstr "trøtt"
-
-#: ../../include/text.php:1059
-msgid "perky"
-msgstr "oppkvikket"
-
-#: ../../include/text.php:1060
-msgid "angry"
-msgstr "sint"
-
-#: ../../include/text.php:1061
-msgid "stupefied"
-msgstr "lamslått"
-
-#: ../../include/text.php:1062
-msgid "puzzled"
-msgstr "forundret"
-
-#: ../../include/text.php:1063
-msgid "interested"
-msgstr "interessert"
-
-#: ../../include/text.php:1064
-msgid "bitter"
-msgstr "bitter"
-
-#: ../../include/text.php:1065
-msgid "cheerful"
-msgstr "munter"
-
-#: ../../include/text.php:1066
-msgid "alive"
-msgstr "levende"
-
-#: ../../include/text.php:1067
-msgid "annoyed"
-msgstr "irritert"
-
-#: ../../include/text.php:1068
-msgid "anxious"
-msgstr "nervøs"
-
-#: ../../include/text.php:1069
-msgid "cranky"
-msgstr "gretten"
-
-#: ../../include/text.php:1070
-msgid "disturbed"
-msgstr "foruroliget"
-
-#: ../../include/text.php:1071
-msgid "frustrated"
-msgstr "frustrert"
-
-#: ../../include/text.php:1072
-msgid "depressed"
-msgstr "lei seg"
-
-#: ../../include/text.php:1073
-msgid "motivated"
-msgstr "motivert"
-
-#: ../../include/text.php:1074
-msgid "relaxed"
-msgstr "avslappet"
-
-#: ../../include/text.php:1075
-msgid "surprised"
-msgstr "overrasket"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:70
-msgid "Monday"
-msgstr "mandag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:71
-msgid "Tuesday"
-msgstr "tirsdag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:72
-msgid "Wednesday"
-msgstr "onsdag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:73
-msgid "Thursday"
-msgstr "torsdag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:74
-msgid "Friday"
-msgstr "fredag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:75
-msgid "Saturday"
-msgstr "lørdag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:69
-msgid "Sunday"
-msgstr "søndag"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:45
-msgid "January"
-msgstr "januar"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:46
-msgid "February"
-msgstr "februar"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:47
-msgid "March"
-msgstr "mars"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:48
-msgid "April"
-msgstr "april"
-
-#: ../../include/text.php:1261
-msgid "May"
-msgstr "mai"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:50
-msgid "June"
-msgstr "juni"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:51
-msgid "July"
-msgstr "juli"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:52
-msgid "August"
-msgstr "august"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:53
-msgid "September"
-msgstr "september"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:54
-msgid "October"
-msgstr "oktober"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:55
-msgid "November"
-msgstr "november"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:56
-msgid "December"
-msgstr "desember"
-
-#: ../../include/text.php:1338 ../../include/text.php:1342
-msgid "Unknown Attachment"
-msgstr "Ukjent vedlegg"
-
-#: ../../include/text.php:1344
-msgid "unknown"
-msgstr "ukjent"
-
-#: ../../include/text.php:1380
-msgid "remove category"
-msgstr "fjern kategori"
-
-#: ../../include/text.php:1457
-msgid "remove from file"
-msgstr "fjern fra fil"
-
-#: ../../include/text.php:1753 ../../include/text.php:1824
-msgid "default"
-msgstr "standard"
-
-#: ../../include/text.php:1761
-msgid "Page layout"
-msgstr "Sidens layout"
-
-#: ../../include/text.php:1761
-msgid "You can create your own with the layouts tool"
-msgstr "Du kan lage din egen med layout-verktøyet"
-
-#: ../../include/text.php:1803
-msgid "Page content type"
-msgstr "Sidens innholdstype"
-
-#: ../../include/text.php:1836
-msgid "Select an alternate language"
-msgstr "Velg et annet språk"
-
-#: ../../include/text.php:1953
-msgid "activity"
-msgstr "aktivitet"
-
-#: ../../include/text.php:2262
-msgid "Design Tools"
-msgstr "Designverktøy"
-
-#: ../../include/text.php:2268
-msgid "Pages"
-msgstr "Sider"
-
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr "System"
-
-#: ../../include/widgets.php:106
-msgid "New App"
-msgstr ""
-
-#: ../../include/widgets.php:154
-msgid "Suggestions"
-msgstr "Forslag"
-
-#: ../../include/widgets.php:155
-msgid "See more..."
-msgstr "Se mer..."
-
-#: ../../include/widgets.php:175
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr "Du har %1$.0f av %2$.0f tillate forbindelser."
-
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
-msgstr "Legg til ny forbindelse"
-
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr "Skriv kanaladressen"
-
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Eksempel: ola@eksempel.no, https://eksempel.no/kari"
-
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr "Merknader"
-
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr "Fjern begrep"
-
-#: ../../include/widgets.php:281 ../../include/features.php:84
-msgid "Saved Searches"
-msgstr "Lagrede søk"
-
-#: ../../include/widgets.php:282 ../../include/group.php:316
-msgid "add"
-msgstr "legg til"
-
-#: ../../include/widgets.php:310 ../../include/contact_widgets.php:53
-#: ../../include/features.php:98
-msgid "Saved Folders"
-msgstr "Lagrede mapper"
-
-#: ../../include/widgets.php:313 ../../include/widgets.php:432
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-msgid "Everything"
-msgstr "Alt"
-
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr "Arkiv"
-
-#: ../../include/widgets.php:516
-msgid "Refresh"
-msgstr "Forny"
-
-#: ../../include/widgets.php:556
-msgid "Account settings"
-msgstr "Kontoinnstillinger"
-
-#: ../../include/widgets.php:562
-msgid "Channel settings"
-msgstr "Kanalinnstillinger"
-
-#: ../../include/widgets.php:571
-msgid "Additional features"
-msgstr "Tilleggsfunksjoner"
-
-#: ../../include/widgets.php:578
-msgid "Feature/Addon settings"
-msgstr "Funksjons-/Tilleggsinnstillinger"
-
-#: ../../include/widgets.php:584
-msgid "Display settings"
-msgstr "Visningsinnstillinger"
-
-#: ../../include/widgets.php:591
-msgid "Manage locations"
-msgstr ""
-
-#: ../../include/widgets.php:600
-msgid "Export channel"
-msgstr "Eksporter kanal"
-
-#: ../../include/widgets.php:607
-msgid "Connected apps"
-msgstr "Tilkoblede app-er"
-
-#: ../../include/widgets.php:622
-msgid "Premium Channel Settings"
-msgstr "Premiumkanal-innstillinger"
-
-#: ../../include/widgets.php:651
-msgid "Private Mail Menu"
-msgstr "Meny for privat post"
-
-#: ../../include/widgets.php:653
-msgid "Combined View"
-msgstr "Kombinert visning"
-
-#: ../../include/widgets.php:658 ../../include/nav.php:196
-msgid "Inbox"
-msgstr "Innboks"
-
-#: ../../include/widgets.php:663 ../../include/nav.php:197
-msgid "Outbox"
-msgstr "Utboks"
-
-#: ../../include/widgets.php:668 ../../include/nav.php:198
-msgid "New Message"
-msgstr "Ny melding"
-
-#: ../../include/widgets.php:685 ../../include/widgets.php:697
-msgid "Conversations"
-msgstr "Samtaler"
-
-#: ../../include/widgets.php:689
-msgid "Received Messages"
-msgstr "Mottatte meldinger"
-
-#: ../../include/widgets.php:693
-msgid "Sent Messages"
-msgstr "Sendte meldinger"
-
-#: ../../include/widgets.php:707
-msgid "No messages."
-msgstr "Ingen meldinger."
-
-#: ../../include/widgets.php:725
-msgid "Delete conversation"
-msgstr "Slett samtale"
-
-#: ../../include/widgets.php:751
-msgid "Events Menu"
-msgstr "Meny for hendelser"
-
-#: ../../include/widgets.php:752
-msgid "Day View"
-msgstr "Dag"
-
-#: ../../include/widgets.php:753
-msgid "Week View"
-msgstr "Uke"
-
-#: ../../include/widgets.php:754
-msgid "Month View"
-msgstr "Måned"
-
-#: ../../include/widgets.php:766
-msgid "Events Tools"
-msgstr "Kalenderverktøy"
-
-#: ../../include/widgets.php:767
-msgid "Export Calendar"
-msgstr "Eksporter kalender"
-
-#: ../../include/widgets.php:768
-msgid "Import Calendar"
-msgstr "Importer kalender"
-
-#: ../../include/widgets.php:842 ../../include/conversation.php:1662
-#: ../../include/conversation.php:1665
-msgid "Chatrooms"
-msgstr "Chatrom"
-
-#: ../../include/widgets.php:846
-msgid "Overview"
-msgstr ""
-
-#: ../../include/widgets.php:853
-msgid "Chat Members"
-msgstr ""
-
-#: ../../include/widgets.php:876
-msgid "Bookmarked Chatrooms"
-msgstr "Bokmerkede chatrom"
-
-#: ../../include/widgets.php:899
-msgid "Suggested Chatrooms"
-msgstr "Foreslåtte chatrom"
-
-#: ../../include/widgets.php:1044 ../../include/widgets.php:1156
-msgid "photo/image"
-msgstr "foto/bilde"
-
-#: ../../include/widgets.php:1099
-msgid "Click to show more"
-msgstr ""
-
-#: ../../include/widgets.php:1250
-msgid "Rating Tools"
-msgstr "Vurderingsverktøy"
-
-#: ../../include/widgets.php:1254 ../../include/widgets.php:1256
-msgid "Rate Me"
-msgstr "Vurder meg"
-
-#: ../../include/widgets.php:1259
-msgid "View Ratings"
-msgstr "Vis vurderinger"
-
-#: ../../include/widgets.php:1316
-msgid "Forums"
-msgstr "Forum"
-
-#: ../../include/widgets.php:1345
-msgid "Tasks"
-msgstr "Oppgaver"
-
-#: ../../include/widgets.php:1354
-msgid "Documentation"
-msgstr "Dokumentasjon"
-
-#: ../../include/widgets.php:1356
-msgid "Project/Site Information"
-msgstr "Prosjekt-/Nettstedsinformasjon"
-
-#: ../../include/widgets.php:1357
-msgid "For Members"
-msgstr "For medlemmer"
-
-#: ../../include/widgets.php:1358
-msgid "For Administrators"
-msgstr "For administratorer"
-
-#: ../../include/widgets.php:1359
-msgid "For Developers"
-msgstr "For utviklere"
-
-#: ../../include/widgets.php:1383 ../../include/widgets.php:1421
-msgid "Member registrations waiting for confirmation"
-msgstr ""
-
-#: ../../include/widgets.php:1389
-msgid "Inspect queue"
-msgstr "Inspiser kø"
-
-#: ../../include/widgets.php:1391
-msgid "DB updates"
-msgstr "Databaseoppdateringer"
-
-#: ../../include/widgets.php:1416 ../../include/nav.php:216
-msgid "Admin"
-msgstr "Administrator"
-
-#: ../../include/widgets.php:1417
-msgid "Plugin Features"
-msgstr "Tilleggsfunksjoner"
-
-#: ../../include/follow.php:27
-msgid "Channel is blocked on this site."
-msgstr "Kanalen er blokkert på dette nettstedet."
-
-#: ../../include/follow.php:32
-msgid "Channel location missing."
-msgstr "Kanalplassering mangler."
-
-#: ../../include/follow.php:81
-msgid "Response from remote channel was incomplete."
-msgstr "Svaret fra den andre kanalen var ikke komplett."
-
-#: ../../include/follow.php:98
-msgid "Channel was deleted and no longer exists."
-msgstr "Kanalen er slettet og finnes ikke lenger."
-
-#: ../../include/follow.php:154 ../../include/follow.php:190
-msgid "Protocol disabled."
-msgstr "Protokollen er avskrudd."
-
-#: ../../include/follow.php:178
-msgid "Channel discovery failed."
-msgstr "Kanaloppdagelse mislyktes."
-
-#: ../../include/follow.php:216
-msgid "Cannot connect to yourself."
-msgstr "Kan ikke lage forbindelse med deg selv."
-
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "%1$s sine bokmerker"
-
-#: ../../include/api.php:1336
-msgid "Public Timeline"
-msgstr "Offentlig tidslinje"
-
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:844
-#: ../../include/bbcode.php:847 ../../include/bbcode.php:852
-#: ../../include/bbcode.php:855 ../../include/bbcode.php:858
-#: ../../include/bbcode.php:861 ../../include/bbcode.php:866
-#: ../../include/bbcode.php:869 ../../include/bbcode.php:874
-#: ../../include/bbcode.php:877 ../../include/bbcode.php:880
-#: ../../include/bbcode.php:883
-msgid "Image/photo"
-msgstr "Bilde/fotografi"
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:894
-msgid "Encrypted content"
-msgstr "Kryptert innhold"
-
-#: ../../include/bbcode.php:178
-#, php-format
-msgid "Install %s element: "
-msgstr "Installer %s element:"
-
-#: ../../include/bbcode.php:182
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Dette innlegget inneholder det installerbare elementet %s, men du mangler tillatelse til å installere det på dette nettstedet."
-
-#: ../../include/bbcode.php:254
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s skrev følgende %2$s %3$s"
-
-#: ../../include/bbcode.php:331 ../../include/bbcode.php:339
-msgid "Click to open/close"
-msgstr "Klikk for å åpne/lukke"
-
-#: ../../include/bbcode.php:339
-msgid "spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:585
-msgid "Different viewers will see this text differently"
-msgstr "Denne teksten vil se forskjellig ut for ulike besøkende"
-
-#: ../../include/bbcode.php:832
-msgid "$1 wrote:"
-msgstr "$1 skrev:"
-
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr "Kataloginnstillinger"
-
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr "Trygt modus"
-
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr "Bare offentlige forum"
-
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr "Kun dette nettstedet"
-
-#: ../../include/security.php:383
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "Skjemaets sikkerhetspollett var ikke gyldig. Dette skjedde antakelig fordi skjemaet har vært åpnet for lenge (>3 timer) før det ble sendt inn."
-
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1702
-msgid "Logout"
-msgstr "Logg ut"
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
-msgstr "Avslutt denne økten"
-
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
-msgstr "Hjem"
-
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr "Dine innlegg og samtaler"
-
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr "Din profilside"
-
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr "Håndter/endre profiler"
-
-#: ../../include/nav.php:90 ../../include/channel.php:941
-msgid "Edit Profile"
-msgstr "Endre profil"
-
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr "Endre din profil"
-
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr "Dine bilder"
-
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr "Dine filer"
-
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
-msgstr "Dine chatterom"
-
-#: ../../include/nav.php:102 ../../include/conversation.php:1675
-msgid "Bookmarks"
-msgstr "Bokmerker"
-
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
-msgstr "Dine bokmerker"
-
-#: ../../include/nav.php:106
-msgid "Your webpages"
-msgstr "Dine websider"
-
-#: ../../include/nav.php:110
-msgid "Sign in"
-msgstr "Logg på"
-
-#: ../../include/nav.php:127
-#, php-format
-msgid "%s - click to logout"
-msgstr "%s - klikk for å logge ut"
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr "Fjernautentisering"
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr "Klikk for å godkjennes mot din hjemme-hub"
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr "Hjemmeside"
-
-#: ../../include/nav.php:147
-msgid "Create an account"
-msgstr "Lag en konto"
-
-#: ../../include/nav.php:159
-msgid "Help and documentation"
-msgstr "Hjelp og dokumentasjon"
-
-#: ../../include/nav.php:163
-msgid "Applications, utilities, links, games"
-msgstr "Programmer, verktøy, lenker, spill"
-
-#: ../../include/nav.php:165
-msgid "Search site @name, #tag, ?docs, content"
-msgstr "Søk nettstedet for @navn, #merkelapp, ?dokumentasjon, innhold"
-
-#: ../../include/nav.php:167
-msgid "Channel Directory"
-msgstr "Kanalkatalog"
-
-#: ../../include/nav.php:179
-msgid "Your grid"
-msgstr "Ditt nett"
-
-#: ../../include/nav.php:180
-msgid "Mark all grid notifications seen"
-msgstr "Marker alle nettvarsler som sett"
-
-#: ../../include/nav.php:182
-msgid "Channel home"
-msgstr "Kanalhjem"
-
-#: ../../include/nav.php:183
-msgid "Mark all channel notifications seen"
-msgstr "Merk alle kanalvarsler som sett"
-
-#: ../../include/nav.php:189
-msgid "Notices"
-msgstr "Varsel"
-
-#: ../../include/nav.php:189
-msgid "Notifications"
-msgstr "Varsler"
-
-#: ../../include/nav.php:190
-msgid "See all notifications"
-msgstr "Se alle varsler"
-
-#: ../../include/nav.php:193
-msgid "Private mail"
-msgstr "Privat post"
-
-#: ../../include/nav.php:194
-msgid "See all private messages"
-msgstr "Se alle private meldinger"
-
-#: ../../include/nav.php:195
-msgid "Mark all private messages seen"
-msgstr "Merk alle private meldinger som sett"
-
-#: ../../include/nav.php:201
-msgid "Event Calendar"
-msgstr "Kalender"
-
-#: ../../include/nav.php:202
-msgid "See all events"
-msgstr "Se alle hendelser"
-
-#: ../../include/nav.php:203
-msgid "Mark all events seen"
-msgstr "Merk alle hendelser som sett"
-
-#: ../../include/nav.php:206
-msgid "Manage Your Channels"
-msgstr "Håndter dine kanaler"
-
-#: ../../include/nav.php:208
-msgid "Account/Channel Settings"
-msgstr "Konto-/kanal-innstillinger"
-
-#: ../../include/nav.php:216
-msgid "Site Setup and Configuration"
-msgstr "Nettstedsoppsett og -konfigurasjon"
-
-#: ../../include/nav.php:247 ../../include/conversation.php:851
-msgid "Loading..."
-msgstr "Laster..."
-
-#: ../../include/nav.php:252
-msgid "@name, #tag, ?doc, content"
-msgstr "@navn, #merkelapp, ?dokumentasjon, innhold"
-
-#: ../../include/nav.php:253
-msgid "Please wait..."
-msgstr "Vennligst vent..."
+#: ../../include/channel.php:1292
+msgid "Like this thing"
+msgstr "Lik denne tingen"
 
 #: ../../include/connections.php:95
 msgid "New window"
@@ -7760,52 +7606,6 @@ msgstr "Åpne det valgte stedet i et annet vindu eller nettleser-fane"
 msgid "User '%s' deleted"
 msgstr "Brukeren '%s' er slettet"
 
-#: ../../include/contact_widgets.php:11
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d invitasjon tilgjengelig"
-msgstr[1] "%d invitasjoner tilgjengelig"
-
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
-msgstr "Finn kanaler"
-
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
-msgstr "Skriv navn eller interesse"
-
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
-msgstr "Forbindelse/Følg"
-
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Eksempler: Ola Nordmann, fisking"
-
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
-msgstr "Tilfeldig profil"
-
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
-msgstr "Inviter venner"
-
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Avansert eksempel: navn=fred og land=island"
-
-#: ../../include/contact_widgets.php:122
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d forbindelse felles"
-msgstr[1] "%d forbindelser felles"
-
-#: ../../include/contact_widgets.php:127
-msgid "show more"
-msgstr "vis mer"
-
 #: ../../include/conversation.php:204
 #, php-format
 msgid "%1$s is now connected with %2$s"
@@ -7816,258 +7616,269 @@ msgstr "%1$s er nå forbundet med %2$s"
 msgid "%1$s poked %2$s"
 msgstr "%1$s prikket %2$s"
 
-#: ../../include/conversation.php:691
+#: ../../include/conversation.php:243 ../../include/text.php:1013
+#: ../../include/text.php:1018
+msgid "poked"
+msgstr "prikket"
+
+#: ../../include/conversation.php:694
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Vis %s sin profile @ %s"
 
-#: ../../include/conversation.php:710
+#: ../../include/conversation.php:713
 msgid "Categories:"
 msgstr "Kategorier:"
 
-#: ../../include/conversation.php:711
+#: ../../include/conversation.php:714
 msgid "Filed under:"
 msgstr "Sortert under:"
 
-#: ../../include/conversation.php:738
+#: ../../include/conversation.php:741
 msgid "View in context"
 msgstr "Vis i sammenheng"
 
-#: ../../include/conversation.php:847
+#: ../../include/conversation.php:850
 msgid "remove"
 msgstr "fjern"
 
-#: ../../include/conversation.php:852
+#: ../../include/conversation.php:855
 msgid "Delete Selected Items"
 msgstr "Slett valgte elementer"
 
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:951
 msgid "View Source"
 msgstr "Vis kilde"
 
-#: ../../include/conversation.php:949
+#: ../../include/conversation.php:952
 msgid "Follow Thread"
 msgstr "Følg tråd"
 
-#: ../../include/conversation.php:950
+#: ../../include/conversation.php:953
 msgid "Unfollow Thread"
 msgstr "Ikke følg tråd"
 
-#: ../../include/conversation.php:955
+#: ../../include/conversation.php:958
 msgid "Activity/Posts"
 msgstr "Aktivitet/Innlegg"
 
-#: ../../include/conversation.php:957
+#: ../../include/conversation.php:960
 msgid "Edit Connection"
 msgstr "Endre forbindelse"
 
-#: ../../include/conversation.php:958
+#: ../../include/conversation.php:961
 msgid "Message"
 msgstr "Melding"
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s likes this."
 msgstr "%s liker dette."
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s liker ikke dette."
 
-#: ../../include/conversation.php:1079
+#: ../../include/conversation.php:1082
 #, 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> liker dette."
 msgstr[1] "<span %1$s>%2$d personer</span> liker dette."
 
-#: ../../include/conversation.php:1081
+#: ../../include/conversation.php:1084
 #, 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> liker ikke dette."
 msgstr[1] "<span %1$s>%2$d personer</span> liker ikke dette."
 
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1090
 msgid "and"
 msgstr "og"
 
-#: ../../include/conversation.php:1090
+#: ../../include/conversation.php:1093
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ", og %d annen person"
 msgstr[1] ", og %d andre personer"
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s like this."
 msgstr "%s liker dette."
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s don't like this."
 msgstr "%s liker ikke dette."
 
-#: ../../include/conversation.php:1130
+#: ../../include/conversation.php:1133
 msgid "Set your location"
 msgstr "Angi din plassering"
 
-#: ../../include/conversation.php:1131
+#: ../../include/conversation.php:1134
 msgid "Clear browser location"
 msgstr "Fjern nettleserplassering"
 
-#: ../../include/conversation.php:1177
+#: ../../include/conversation.php:1182
 msgid "Tag term:"
 msgstr "Merkelapp:"
 
-#: ../../include/conversation.php:1178
+#: ../../include/conversation.php:1183
 msgid "Where are you right now?"
 msgstr "Hvor er du akkurat nå?"
 
-#: ../../include/conversation.php:1210
+#: ../../include/conversation.php:1221
 msgid "Page link name"
 msgstr "Sidens lenkenavn"
 
-#: ../../include/conversation.php:1213
+#: ../../include/conversation.php:1224
 msgid "Post as"
 msgstr "Lag innlegg som"
 
-#: ../../include/conversation.php:1223
+#: ../../include/conversation.php:1238
 msgid "Toggle voting"
 msgstr "Skru av eller på stemming"
 
-#: ../../include/conversation.php:1231
+#: ../../include/conversation.php:1246
 msgid "Categories (optional, comma-separated list)"
 msgstr "Kategorier (valgfri, kommaseparert liste)"
 
-#: ../../include/conversation.php:1254
+#: ../../include/conversation.php:1269
 msgid "Set publish date"
 msgstr "Angi publiseringsdato"
 
-#: ../../include/conversation.php:1258
-msgid "OK"
-msgstr "OK"
-
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1518
 msgid "Discover"
 msgstr "Oppdage"
 
-#: ../../include/conversation.php:1506
+#: ../../include/conversation.php:1521
 msgid "Imported public streams"
 msgstr "Importerte offentlige strømmer"
 
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1526
 msgid "Commented Order"
 msgstr "Kommentert"
 
-#: ../../include/conversation.php:1514
+#: ../../include/conversation.php:1529
 msgid "Sort by Comment Date"
 msgstr "Sorter etter kommentert dato"
 
-#: ../../include/conversation.php:1518
+#: ../../include/conversation.php:1533
 msgid "Posted Order"
 msgstr "Lagt inn"
 
-#: ../../include/conversation.php:1521
+#: ../../include/conversation.php:1536
 msgid "Sort by Post Date"
 msgstr "Sorter etter innleggsdato"
 
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1544
 msgid "Posts that mention or involve you"
 msgstr "Innlegg som nevner eller involverer deg"
 
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1553
 msgid "Activity Stream - by date"
 msgstr "Aktivitetsstrøm - etter dato"
 
-#: ../../include/conversation.php:1544
+#: ../../include/conversation.php:1559
 msgid "Starred"
 msgstr "Stjerne"
 
-#: ../../include/conversation.php:1547
+#: ../../include/conversation.php:1562
 msgid "Favourite Posts"
 msgstr "Favorittinnlegg"
 
-#: ../../include/conversation.php:1554
+#: ../../include/conversation.php:1569
 msgid "Spam"
 msgstr "Søppel"
 
-#: ../../include/conversation.php:1557
+#: ../../include/conversation.php:1572
 msgid "Posts flagged as SPAM"
 msgstr "Innlegg merket som SØPPEL"
 
-#: ../../include/conversation.php:1614
+#: ../../include/conversation.php:1629
 msgid "Status Messages and Posts"
 msgstr "Statusmeldinger og -innlegg"
 
-#: ../../include/conversation.php:1623
+#: ../../include/conversation.php:1638
 msgid "About"
 msgstr "Om"
 
-#: ../../include/conversation.php:1626
+#: ../../include/conversation.php:1641
 msgid "Profile Details"
 msgstr "Profildetaljer"
 
-#: ../../include/conversation.php:1635 ../../include/photos.php:502
-msgid "Photo Albums"
-msgstr "Fotoalbum"
-
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1657
 msgid "Files and Storage"
 msgstr "Filer og lagring"
 
-#: ../../include/conversation.php:1678
+#: ../../include/conversation.php:1677 ../../include/conversation.php:1680
+#: ../../include/widgets.php:836
+msgid "Chatrooms"
+msgstr "Chatrom"
+
+#: ../../include/conversation.php:1693
 msgid "Saved Bookmarks"
 msgstr "Lagrede bokmerker"
 
-#: ../../include/conversation.php:1688
+#: ../../include/conversation.php:1703
 msgid "Manage Webpages"
 msgstr "Håndtere websider"
 
-#: ../../include/conversation.php:1747
+#: ../../include/conversation.php:1768
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "Deltar"
 msgstr[1] "Deltar"
 
-#: ../../include/conversation.php:1750
+#: ../../include/conversation.php:1771
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "Deltar ikke"
 msgstr[1] "Deltar ikke"
 
-#: ../../include/conversation.php:1753
+#: ../../include/conversation.php:1774
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "Ikke bestemt"
 msgstr[1] "Ikke bestemt"
 
-#: ../../include/conversation.php:1756
+#: ../../include/conversation.php:1777
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "Enig"
 msgstr[1] "Enige"
 
-#: ../../include/conversation.php:1759
+#: ../../include/conversation.php:1780
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "Uenig"
 msgstr[1] "Uenige"
 
-#: ../../include/conversation.php:1762
+#: ../../include/conversation.php:1783
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "Avstår"
 msgstr[1] "Avstår"
 
+#: ../../include/import.php:30
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr "Kan ikke lage en kopi av kanal-identifikatoren på dette systemet. Import mislyktes."
+
+#: ../../include/import.php:97
+msgid "Channel clone failed. Import failed."
+msgstr "Kanalkloning mislyktes. Import mislyktes."
+
 #: ../../include/selectors.php:30
 msgid "Frequently"
 msgstr "Ofte"
@@ -8132,12 +7943,6 @@ msgstr "Intetkjønn"
 msgid "Non-specific"
 msgstr "Ubestemt"
 
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-#: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:881
-msgid "Other"
-msgstr "Annen"
-
 #: ../../include/selectors.php:49
 msgid "Undecided"
 msgstr "Ubestemt"
@@ -8314,361 +8119,366 @@ msgstr "Bryr meg ikke"
 msgid "Ask me"
 msgstr "Spør meg"
 
-#: ../../include/PermissionDescription.php:31
-#: ../../include/acl_selectors.php:232
-msgid "Visible to your default audience"
-msgstr "Synlig for ditt standard publikum"
-
-#: ../../include/PermissionDescription.php:115
-#: ../../include/acl_selectors.php:268
-msgid "Only me"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:116
-msgid "Public"
-msgstr "Offentlig"
-
-#: ../../include/PermissionDescription.php:117
-msgid "Anybody in the $Projectname network"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:118
+#: ../../include/bookmarks.php:35
 #, php-format
-msgid "Any account on %s"
+msgid "%1$s's bookmarks"
+msgstr "%1$s sine bokmerker"
+
+#: ../../include/security.php:109
+msgid "guest:"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:119
-msgid "Any of my connections"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:120
-msgid "Only connections I specifically allow"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:121
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:122
-msgid "Any connections including those who haven't yet been approved"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:161
+#: ../../include/security.php:427
 msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
-msgstr ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "Skjemaets sikkerhetspollett var ikke gyldig. Dette skjedde antakelig fordi skjemaet har vært åpnet for lenge (>3 timer) før det ble sendt inn."
 
-#: ../../include/PermissionDescription.php:162
+#: ../../include/text.php:404
+msgid "prev"
+msgstr "forrige"
+
+#: ../../include/text.php:406
+msgid "first"
+msgstr "første"
+
+#: ../../include/text.php:435
+msgid "last"
+msgstr "siste"
+
+#: ../../include/text.php:438
+msgid "next"
+msgstr "neste"
+
+#: ../../include/text.php:448
+msgid "older"
+msgstr "eldre"
+
+#: ../../include/text.php:450
+msgid "newer"
+msgstr "nyere"
+
+#: ../../include/text.php:843
+msgid "No connections"
+msgstr "Ingen forbindelser"
+
+#: ../../include/text.php:868
+#, php-format
+msgid "View all %s connections"
+msgstr "Vis alle %s forbindelser"
+
+#: ../../include/text.php:1013 ../../include/text.php:1018
+msgid "poke"
+msgstr "prikk"
+
+#: ../../include/text.php:1019
+msgid "ping"
+msgstr "varsle"
+
+#: ../../include/text.php:1019
+msgid "pinged"
+msgstr "varslet"
+
+#: ../../include/text.php:1020
+msgid "prod"
+msgstr "oppildne"
+
+#: ../../include/text.php:1020
+msgid "prodded"
+msgstr "oppildnet"
+
+#: ../../include/text.php:1021
+msgid "slap"
+msgstr "daske"
+
+#: ../../include/text.php:1021
+msgid "slapped"
+msgstr "dasket"
+
+#: ../../include/text.php:1022
+msgid "finger"
+msgstr "fingre"
+
+#: ../../include/text.php:1022
+msgid "fingered"
+msgstr "fingret"
+
+#: ../../include/text.php:1023
+msgid "rebuff"
+msgstr "tilbakevise"
+
+#: ../../include/text.php:1023
+msgid "rebuffed"
+msgstr "tilbakeviste"
+
+#: ../../include/text.php:1035
+msgid "happy"
+msgstr "glad"
+
+#: ../../include/text.php:1036
+msgid "sad"
+msgstr "trist"
+
+#: ../../include/text.php:1037
+msgid "mellow"
+msgstr "dempet"
+
+#: ../../include/text.php:1038
+msgid "tired"
+msgstr "trøtt"
+
+#: ../../include/text.php:1039
+msgid "perky"
+msgstr "oppkvikket"
+
+#: ../../include/text.php:1040
+msgid "angry"
+msgstr "sint"
+
+#: ../../include/text.php:1041
+msgid "stupefied"
+msgstr "lamslått"
+
+#: ../../include/text.php:1042
+msgid "puzzled"
+msgstr "forundret"
+
+#: ../../include/text.php:1043
+msgid "interested"
+msgstr "interessert"
+
+#: ../../include/text.php:1044
+msgid "bitter"
+msgstr "bitter"
+
+#: ../../include/text.php:1045
+msgid "cheerful"
+msgstr "munter"
+
+#: ../../include/text.php:1046
+msgid "alive"
+msgstr "levende"
+
+#: ../../include/text.php:1047
+msgid "annoyed"
+msgstr "irritert"
+
+#: ../../include/text.php:1048
+msgid "anxious"
+msgstr "nervøs"
+
+#: ../../include/text.php:1049
+msgid "cranky"
+msgstr "gretten"
+
+#: ../../include/text.php:1050
+msgid "disturbed"
+msgstr "foruroliget"
+
+#: ../../include/text.php:1051
+msgid "frustrated"
+msgstr "frustrert"
+
+#: ../../include/text.php:1052
+msgid "depressed"
+msgstr "lei seg"
+
+#: ../../include/text.php:1053
+msgid "motivated"
+msgstr "motivert"
+
+#: ../../include/text.php:1054
+msgid "relaxed"
+msgstr "avslappet"
+
+#: ../../include/text.php:1055
+msgid "surprised"
+msgstr "overrasket"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "mandag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "tirsdag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "onsdag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "torsdag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "fredag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "lørdag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "søndag"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:45
+msgid "January"
+msgstr "januar"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:46
+msgid "February"
+msgstr "februar"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:47
+msgid "March"
+msgstr "mars"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:48
+msgid "April"
+msgstr "april"
+
+#: ../../include/text.php:1241
+msgid "May"
+msgstr "mai"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:50
+msgid "June"
+msgstr "juni"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:51
+msgid "July"
+msgstr "juli"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:52
+msgid "August"
+msgstr "august"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:53
+msgid "September"
+msgstr "september"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:54
+msgid "October"
+msgstr "oktober"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:55
+msgid "November"
+msgstr "november"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:56
+msgid "December"
+msgstr "desember"
+
+#: ../../include/text.php:1318 ../../include/text.php:1322
+msgid "Unknown Attachment"
+msgstr "Ukjent vedlegg"
+
+#: ../../include/text.php:1324
+msgid "unknown"
+msgstr "ukjent"
+
+#: ../../include/text.php:1360
+msgid "remove category"
+msgstr "fjern kategori"
+
+#: ../../include/text.php:1437
+msgid "remove from file"
+msgstr "fjern fra fil"
+
+#: ../../include/text.php:1734 ../../include/text.php:1805
+msgid "default"
+msgstr "standard"
+
+#: ../../include/text.php:1742
+msgid "Page layout"
+msgstr "Sidens layout"
+
+#: ../../include/text.php:1742
+msgid "You can create your own with the layouts tool"
+msgstr "Du kan lage din egen med layout-verktøyet"
+
+#: ../../include/text.php:1784
+msgid "Page content type"
+msgstr "Sidens innholdstype"
+
+#: ../../include/text.php:1817
+msgid "Select an alternate language"
+msgstr "Velg et annet språk"
+
+#: ../../include/text.php:1934
+msgid "activity"
+msgstr "aktivitet"
+
+#: ../../include/text.php:2235
+msgid "Design Tools"
+msgstr "Designverktøy"
+
+#: ../../include/text.php:2241
+msgid "Pages"
+msgstr "Sider"
+
+#: ../../include/auth.php:147
+msgid "Logged out."
+msgstr "Logget ut."
+
+#: ../../include/auth.php:274
+msgid "Failed authentication"
+msgstr "Mislykket autentisering"
+
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
+msgstr "Kan se min normale strøm og innlegg"
+
+#: ../../include/permissions.php:30
+msgid "Can view my webpages"
+msgstr "Kan se mine websider"
+
+#: ../../include/permissions.php:34
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Kan lage innlegg på min kanalside (\"vegg\")"
+
+#: ../../include/permissions.php:37
+msgid "Can like/dislike stuff"
+msgstr "Kan like/ikke like forskjellige greier"
+
+#: ../../include/permissions.php:37
+msgid "Profiles and things other than posts/comments"
+msgstr "Profiler og andre ting enn innlegg/kommentarer"
+
+#: ../../include/permissions.php:39
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Kan videresende til alle mine kanalkontakter via @navn i innlegg"
+
+#: ../../include/permissions.php:39
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Avansert - nyttig for å lage forumkanaler for grupper"
+
+#: ../../include/permissions.php:40
+msgid "Can chat with me (when available)"
+msgstr "Kan chatte/sende lynmeldinger til meg (når tilgjengelig)"
+
+#: ../../include/permissions.php:41
+msgid "Can write to my file storage and photos"
+msgstr "Kan skrive til mitt lager for filer og bilder"
+
+#: ../../include/permissions.php:42
+msgid "Can edit my webpages"
+msgstr "Kan endre mine websider"
+
+#: ../../include/permissions.php:44
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Litt avansert - svært nyttig i åpne fellesskap"
+
+#: ../../include/permissions.php:46
+msgid "Can administer my channel resources"
+msgstr "Kan administrere mine kanalressurser"
+
+#: ../../include/permissions.php:46
 msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:163
-msgid "This is your default setting for who can view your connections"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:164
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:165
-msgid "This is your default setting for the audience of your webpages"
-msgstr ""
-
-#: ../../include/account.php:28
-msgid "Not a valid email address"
-msgstr "Ikke en gyldig e-postadresse"
-
-#: ../../include/account.php:30
-msgid "Your email domain is not among those allowed on this site"
-msgstr "Ditt e-postdomene er ikke blant de som er tillatt på dette stedet"
-
-#: ../../include/account.php:36
-msgid "Your email address is already registered at this site."
-msgstr "Din e-postadresse er allerede registrert på dette nettstedet."
-
-#: ../../include/account.php:68
-msgid "An invitation is required."
-msgstr "En invitasjon er påkrevd."
-
-#: ../../include/account.php:72
-msgid "Invitation could not be verified."
-msgstr "Invitasjon kunne ikke bekreftes."
-
-#: ../../include/account.php:122
-msgid "Please enter the required information."
-msgstr "Vennligst skriv inn nødvendig informasjon."
-
-#: ../../include/account.php:189
-msgid "Failed to store account information."
-msgstr "Mislyktes med å lagre kontoinformasjon."
-
-#: ../../include/account.php:249
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr "Registreringsbekreftelse for %s"
-
-#: ../../include/account.php:315
-#, php-format
-msgid "Registration request at %s"
-msgstr "Registreringsforespørsel hos %s"
-
-#: ../../include/account.php:317 ../../include/account.php:344
-#: ../../include/account.php:404 ../../include/network.php:1871
-msgid "Administrator"
-msgstr "Administrator"
-
-#: ../../include/account.php:339
-msgid "your registration password"
-msgstr "ditt registreringspassord"
-
-#: ../../include/account.php:342 ../../include/account.php:402
-#, php-format
-msgid "Registration details for %s"
-msgstr "Registreringsdetaljer for %s"
-
-#: ../../include/account.php:414
-msgid "Account approved."
-msgstr "Konto godkjent."
-
-#: ../../include/account.php:454
-#, php-format
-msgid "Registration revoked for %s"
-msgstr "Registrering trukket tilbake for %s"
-
-#: ../../include/account.php:506
-msgid "Account verified. Please login."
-msgstr "Konto bekreftet. Vennligst logg inn."
-
-#: ../../include/account.php:723 ../../include/account.php:725
-msgid "Click here to upgrade."
-msgstr "Klikk her for å oppgradere."
-
-#: ../../include/account.php:731
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Denne handlingen går utenfor grensene satt i din abonnementsplan."
-
-#: ../../include/account.php:736
-msgid "This action is not available under your subscription plan."
-msgstr "Denne handlingen er ikke tilgjengelig i din abonnementsplan."
-
-#: ../../include/attach.php:247 ../../include/attach.php:333
-msgid "Item was not found."
-msgstr "Elementet ble ikke funnet."
-
-#: ../../include/attach.php:497
-msgid "No source file."
-msgstr "Ingen kildefil."
-
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
-msgstr "Kan ikke finne filen som skal byttes ut"
-
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
-msgstr "Finner ikke filen som skal revideres/oppdateres"
-
-#: ../../include/attach.php:672
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Filens størrelse overgår grensen på %d"
-
-#: ../../include/attach.php:686
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Du har nådd din lagringsgrense for vedlegg på %1$.0f Mbytes."
-
-#: ../../include/attach.php:842
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Mislyktes med å laste opp filen. Mulig systemgrense eller handling avbrutt."
-
-#: ../../include/attach.php:855
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Lagret fil kunne ikke bekreftes. Opplasting mislyktes."
-
-#: ../../include/attach.php:909 ../../include/attach.php:925
-msgid "Path not available."
-msgstr "Stien er ikke tilgjengelig."
-
-#: ../../include/attach.php:971 ../../include/attach.php:1123
-msgid "Empty pathname"
-msgstr "Tomt sti-navn"
-
-#: ../../include/attach.php:997
-msgid "duplicate filename or path"
-msgstr "duplikat av filnavn eller sti"
-
-#: ../../include/attach.php:1019
-msgid "Path not found."
-msgstr "Stien ble ikke funnet."
-
-#: ../../include/attach.php:1077
-msgid "mkdir failed."
-msgstr "mkdir mislyktes."
-
-#: ../../include/attach.php:1081
-msgid "database storage failed."
-msgstr "databaselagring mislyktes."
-
-#: ../../include/attach.php:1129
-msgid "Empty path"
-msgstr "Tom sti"
-
-#: ../../include/channel.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "Klarer ikke å få tak i identitetsinformasjon fra databasen"
-
-#: ../../include/channel.php:66
-msgid "Empty name"
-msgstr "Mangler navn"
-
-#: ../../include/channel.php:69
-msgid "Name too long"
-msgstr "Navnet er for langt"
-
-#: ../../include/channel.php:180
-msgid "No account identifier"
-msgstr "Ingen kontoidentifikator"
-
-#: ../../include/channel.php:192
-msgid "Nickname is required."
-msgstr "Kallenavn er påkrevd."
-
-#: ../../include/channel.php:206
-msgid "Reserved nickname. Please choose another."
-msgstr "Reservert kallenavn. Vennligst velg et annet."
-
-#: ../../include/channel.php:211
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Kallenavnet inneholder tegn som ikke er støttet eller det er allerede i bruk på dette nettstedet."
-
-#: ../../include/channel.php:287
-msgid "Unable to retrieve created identity"
-msgstr "Klarer ikke å hente den lagede identiteten"
-
-#: ../../include/channel.php:345
-msgid "Default Profile"
-msgstr "Standardprofil"
-
-#: ../../include/channel.php:791
-msgid "Requested channel is not available."
-msgstr "Forespurt kanal er ikke tilgjengelig."
-
-#: ../../include/channel.php:938
-msgid "Create New Profile"
-msgstr "Lag ny profil"
-
-#: ../../include/channel.php:958
-msgid "Visible to everybody"
-msgstr ""
-
-#: ../../include/channel.php:1031 ../../include/channel.php:1142
-msgid "Gender:"
-msgstr "Kjønn:"
-
-#: ../../include/channel.php:1032 ../../include/channel.php:1186
-msgid "Status:"
-msgstr "Status:"
-
-#: ../../include/channel.php:1033 ../../include/channel.php:1197
-msgid "Homepage:"
-msgstr "Hjemmeside:"
-
-#: ../../include/channel.php:1034
-msgid "Online Now"
-msgstr "Online nå"
-
-#: ../../include/channel.php:1147
-msgid "Like this channel"
-msgstr "Lik denne kanalen"
-
-#: ../../include/channel.php:1171
-msgid "j F, Y"
-msgstr "j F, Y"
-
-#: ../../include/channel.php:1172
-msgid "j F"
-msgstr "j F"
-
-#: ../../include/channel.php:1179
-msgid "Birthday:"
-msgstr "Fødselsdag:"
-
-#: ../../include/channel.php:1192
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "for %1$d %2$s"
-
-#: ../../include/channel.php:1195
-msgid "Sexual Preference:"
-msgstr "Seksuell preferanse:"
-
-#: ../../include/channel.php:1201
-msgid "Tags:"
-msgstr "Merkelapper:"
-
-#: ../../include/channel.php:1203
-msgid "Political Views:"
-msgstr "Politiske synspunkter:"
-
-#: ../../include/channel.php:1205
-msgid "Religion:"
-msgstr "Religion:"
-
-#: ../../include/channel.php:1209
-msgid "Hobbies/Interests:"
-msgstr "Hobbyer/interesser:"
-
-#: ../../include/channel.php:1211
-msgid "Likes:"
-msgstr "Liker:"
-
-#: ../../include/channel.php:1213
-msgid "Dislikes:"
-msgstr "Misliker:"
-
-#: ../../include/channel.php:1215
-msgid "Contact information and Social Networks:"
-msgstr "Kontaktinformasjon og sosiale nettverk:"
-
-#: ../../include/channel.php:1217
-msgid "My other channels:"
-msgstr "Mine andre kanaler:"
-
-#: ../../include/channel.php:1219
-msgid "Musical interests:"
-msgstr "Musikkinteresse:"
-
-#: ../../include/channel.php:1221
-msgid "Books, literature:"
-msgstr "Bøker, litteratur:"
-
-#: ../../include/channel.php:1223
-msgid "Television:"
-msgstr "TV:"
-
-#: ../../include/channel.php:1225
-msgid "Film/dance/culture/entertainment:"
-msgstr "Film/dans/kultur/underholdning:"
-
-#: ../../include/channel.php:1227
-msgid "Love/Romance:"
-msgstr "Kjærlighet/romantikk:"
-
-#: ../../include/channel.php:1229
-msgid "Work/employment:"
-msgstr "Arbeid/sysselsetting:"
-
-#: ../../include/channel.php:1231
-msgid "School/education:"
-msgstr "Skole/utdannelse:"
-
-#: ../../include/channel.php:1251
-msgid "Like this thing"
-msgstr "Lik denne tingen"
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Ekstremt avansert. La dette være med mindre du vet hva du gjør"
 
 #: ../../include/features.php:48
 msgid "General Features"
@@ -8715,378 +8525,257 @@ msgid "Provide managed web pages on your channel"
 msgstr "Tilby kontrollerte web-sider på din kanal"
 
 #: ../../include/features.php:55
+msgid "Provide a wiki for your channel"
+msgstr ""
+
+#: ../../include/features.php:56
 msgid "Hide Rating"
 msgstr "Skjul vurdering"
 
-#: ../../include/features.php:55
+#: ../../include/features.php:56
 msgid ""
 "Hide the rating buttons on your channel and profile pages. Note: People can "
 "still rate you somewhere else."
 msgstr "Skjul vurderingsknappene for din kanal og profilsider. Merknad: folk kan fortsatt vurdere deg et annet sted."
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Private Notes"
 msgstr "Private merknader"
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr "Skru på et verktøy for å lagre notater og påminnelser (merknad: ikke kryptert)"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Navigation Channel Select"
 msgstr "Navigasjon kanalvalg"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Endre kanaler direkte fra navigasjonsmenyen"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "Photo Location"
 msgstr "Bildeplassering"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr "Hvis plasseringsdata er tilgjengelige i opplastede bilder, plasser dette på et kart."
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Access Controlled Chatrooms"
-msgstr ""
+msgstr "Tilgangsstyrte chatrom"
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Provide chatrooms and chat services with access control."
-msgstr ""
+msgstr "Tilby chatrom og chattjenester med tilgangskontroll."
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid "Smart Birthdays"
-msgstr ""
+msgstr "Smarte fødselsdager"
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid ""
 "Make birthday events timezone aware in case your friends are scattered "
 "across the planet."
-msgstr ""
+msgstr "Gjør fødselsdagshendelser oppmerksom på tidsoner i tilfelle dine venner er spredt rundt planeten."
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Expert Mode"
 msgstr "Ekspertmodus"
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr "Skru på Ekspertmodus for å tilby avanserte konfigurasjonsvalg"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid "Premium Channel"
 msgstr "Premiumkanal"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr "Lar deg angi restriksjoner og betingelser for de som kobler seg til din kanal"
 
-#: ../../include/features.php:67
+#: ../../include/features.php:68
 msgid "Post Composition Features"
 msgstr "Funksjoner for å lage innlegg"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Large Photos"
 msgstr "Store bilder"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr "Inkluder store (1024px) småbilder i innlegg. Hvis denne ikke er påskrudd, bruk små (640px) småbilder."
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Automatically import channel content from other channels or feeds"
 msgstr "Automatisk import av kanalinnhold fra andre kanaler eller strømmer"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Even More Encryption"
 msgstr "Enda mer kryptering"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr "Tillat valgfri kryptering av innhold ende-til-ende via en delt hemmelig nøkkel"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Enable Voting Tools"
 msgstr "Skru på verktøy for å stemme"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Provide a class of post which others can vote on"
 msgstr "Tilby en type innlegg som andre kan stemme på"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Delayed Posting"
 msgstr "Tidfest publisering"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Allow posts to be published at a later date"
 msgstr "Tillat innlegg å bli publisert på et senere tidspunkt"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Suppress Duplicate Posts/Comments"
 msgstr "Forhindre duplikat av innlegg/kommentarer"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr "Forhindre innlegg med identisk innhold fra å bli publisert hvis det er mindre enn to minutter mellom innsendingene."
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Network and Stream Filtering"
 msgstr "Nettverk- og strømfiltrering"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Search by Date"
 msgstr "Søk etter dato"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to select posts by date ranges"
 msgstr "Mulighet for å velge innlegg etter datoområde"
 
-#: ../../include/features.php:83 ../../include/group.php:311
+#: ../../include/features.php:84 ../../include/group.php:311
 msgid "Privacy Groups"
 msgstr "Personverngrupper"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Enable management and selection of privacy groups"
 msgstr "Skru på håndtering og valg av personverngrupper"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85 ../../include/widgets.php:281
+msgid "Saved Searches"
+msgstr "Lagrede søk"
+
+#: ../../include/features.php:85
 msgid "Save search terms for re-use"
 msgstr "Lagre søkeuttrykk for senere bruk"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Network Personal Tab"
 msgstr "Nettverk personlig fane"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Skru på fane for å bare vise Nettverksinnlegg som du har deltatt i"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Network New Tab"
 msgstr "Nettverk Ny fane"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Enable tab to display all new Network activity"
 msgstr "Skru på fane for å vise all ny nettverksaktivitet"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Affinity Tool"
 msgstr "Nærhetsverktøy"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filtrer strømaktiviteten etter releasjonsdybde"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Connection Filtering"
 msgstr "Filtrer forbindelser"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr "Filtrer innkommende innlegg fra forbindelser basert på nøkkelord/innhold"
 
-#: ../../include/features.php:89
+#: ../../include/features.php:90
 msgid "Show channel suggestions"
 msgstr "Vis kanalforslag"
 
-#: ../../include/features.php:94
+#: ../../include/features.php:95
 msgid "Post/Comment Tools"
 msgstr "Innlegg-/Kommentar-verktøy"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Community Tagging"
 msgstr "Felleskapsmerkelapper"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Ability to tag existing posts"
 msgstr "Mulighet til å merke eksisterende meldinger"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Post Categories"
 msgstr "Innleggskategorier"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Add categories to your posts"
 msgstr "Legg kategorier til dine innlegg"
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Emoji Reactions"
-msgstr ""
-
-#: ../../include/features.php:97
-msgid "Add emoji reaction ability to posts"
-msgstr ""
+msgstr "Emoji-reaksjoner"
 
 #: ../../include/features.php:98
+msgid "Add emoji reaction ability to posts"
+msgstr "Legg til muligheten for emoji-reaksjoner på innlegg"
+
+#: ../../include/features.php:99 ../../include/widgets.php:310
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Lagrede mapper"
+
+#: ../../include/features.php:99
 msgid "Ability to file posts under folders"
 msgstr "Mulighet til å sortere innlegg i mapper"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Dislike Posts"
 msgstr "Mislik innlegg"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Ability to dislike posts/comments"
 msgstr "Mulighet til å mislike innlegg/kommentarer"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Star Posts"
 msgstr "Stjerneinnlegg"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Mulighet til å merke spesielle innlegg med en stjerne"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Tag Cloud"
 msgstr "Merkelappsky"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Tilby en personlig merkelappsky på din kanalside"
 
-#: ../../include/oembed.php:324
-msgid "Embedded content"
-msgstr "Innebygget innhold"
-
-#: ../../include/oembed.php:333
-msgid "Embedding disabled"
-msgstr "Innbygging avskrudd"
-
-#: ../../include/acl_selectors.php:271
-msgid "Who can see this?"
-msgstr ""
-
-#: ../../include/acl_selectors.php:272
-msgid "Custom selection"
-msgstr ""
-
-#: ../../include/acl_selectors.php:273
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
-" the scope of \"Show\"."
-msgstr ""
-
-#: ../../include/acl_selectors.php:274
-msgid "Show"
-msgstr "Vis"
-
-#: ../../include/acl_selectors.php:275
-msgid "Don't show"
-msgstr "Ikke vis"
-
-#: ../../include/acl_selectors.php:281
-msgid "Other networks and post services"
-msgstr "Andre nettverk og innleggstjenester"
-
-#: ../../include/acl_selectors.php:311
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These"
-" permissions set who is allowed to view the post."
-msgstr ""
-
-#: ../../include/auth.php:105
-msgid "Logged out."
-msgstr "Logget ut."
-
-#: ../../include/auth.php:212
-msgid "Failed authentication"
-msgstr "Mislykket autentisering"
-
-#: ../../include/datetime.php:135
-msgid "Birthday"
-msgstr ""
-
-#: ../../include/datetime.php:137
-msgid "Age: "
-msgstr "Alder:"
-
-#: ../../include/datetime.php:139
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "YYYY-MM-DD eller MM-DD"
-
-#: ../../include/datetime.php:272 ../../boot.php:2470
-msgid "never"
-msgstr "aldri"
-
-#: ../../include/datetime.php:278
-msgid "less than a second ago"
-msgstr "for mindre enn ett sekund siden"
-
-#: ../../include/datetime.php:296
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "%1$d %2$s siden"
-
-#: ../../include/datetime.php:307
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] "år"
-msgstr[1] "år"
-
-#: ../../include/datetime.php:310
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] "måned"
-msgstr[1] "måneder"
-
-#: ../../include/datetime.php:313
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "uke"
-msgstr[1] "uker"
-
-#: ../../include/datetime.php:316
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dag"
-msgstr[1] "dager"
-
-#: ../../include/datetime.php:319
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "time"
-msgstr[1] "timer"
-
-#: ../../include/datetime.php:322
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minutt"
-msgstr[1] "minutter"
-
-#: ../../include/datetime.php:325
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "sekund"
-msgstr[1] "sekunder"
-
-#: ../../include/datetime.php:562
-#, php-format
-msgid "%1$s's birthday"
-msgstr "%1$s sin fødselsdag"
-
-#: ../../include/datetime.php:563
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr "Gratulerer med dagen, %1$s !"
-
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -9114,21 +8803,583 @@ msgstr "Legg til personverngruppe"
 msgid "Channels not in any privacy group"
 msgstr "Kanaler uten personverngruppe"
 
+#: ../../include/group.php:316 ../../include/widgets.php:282
+msgid "add"
+msgstr "legg til"
+
+#: ../../include/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:485
+msgid "l F d, Y \\@ g:i A"
+msgstr "l F d, Y \\@ g:i A"
+
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:491
+msgid "Starts:"
+msgstr "Starter:"
+
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:499
+msgid "Finishes:"
+msgstr "Slutter:"
+
+#: ../../include/event.php:814
+msgid "This event has been added to your calendar."
+msgstr "Denne hendelsen er lagt til i din kalender."
+
+#: ../../include/event.php:1014
+msgid "Not specified"
+msgstr "Ikke spesifisert"
+
+#: ../../include/event.php:1015
+msgid "Needs Action"
+msgstr "Trenger handling"
+
+#: ../../include/event.php:1016
+msgid "Completed"
+msgstr "Ferdig"
+
+#: ../../include/event.php:1017
+msgid "In Process"
+msgstr "Igang"
+
+#: ../../include/event.php:1018
+msgid "Cancelled"
+msgstr "Avbrutt"
+
+#: ../../include/account.php:28
+msgid "Not a valid email address"
+msgstr "Ikke en gyldig e-postadresse"
+
+#: ../../include/account.php:30
+msgid "Your email domain is not among those allowed on this site"
+msgstr "Ditt e-postdomene er ikke blant de som er tillatt på dette stedet"
+
+#: ../../include/account.php:36
+msgid "Your email address is already registered at this site."
+msgstr "Din e-postadresse er allerede registrert på dette nettstedet."
+
+#: ../../include/account.php:68
+msgid "An invitation is required."
+msgstr "En invitasjon er påkrevd."
+
+#: ../../include/account.php:72
+msgid "Invitation could not be verified."
+msgstr "Invitasjon kunne ikke bekreftes."
+
+#: ../../include/account.php:122
+msgid "Please enter the required information."
+msgstr "Vennligst skriv inn nødvendig informasjon."
+
+#: ../../include/account.php:189
+msgid "Failed to store account information."
+msgstr "Mislyktes med å lagre kontoinformasjon."
+
+#: ../../include/account.php:249
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr "Registreringsbekreftelse for %s"
+
+#: ../../include/account.php:315
+#, php-format
+msgid "Registration request at %s"
+msgstr "Registreringsforespørsel hos %s"
+
+#: ../../include/account.php:339
+msgid "your registration password"
+msgstr "ditt registreringspassord"
+
+#: ../../include/account.php:342 ../../include/account.php:402
+#, php-format
+msgid "Registration details for %s"
+msgstr "Registreringsdetaljer for %s"
+
+#: ../../include/account.php:414
+msgid "Account approved."
+msgstr "Konto godkjent."
+
+#: ../../include/account.php:454
+#, php-format
+msgid "Registration revoked for %s"
+msgstr "Registrering trukket tilbake for %s"
+
+#: ../../include/account.php:739 ../../include/account.php:741
+msgid "Click here to upgrade."
+msgstr "Klikk her for å oppgradere."
+
+#: ../../include/account.php:747
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr "Denne handlingen går utenfor grensene satt i din abonnementsplan."
+
+#: ../../include/account.php:752
+msgid "This action is not available under your subscription plan."
+msgstr "Denne handlingen er ikke tilgjengelig i din abonnementsplan."
+
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
+msgstr "Kanalen er blokkert på dette nettstedet."
+
+#: ../../include/follow.php:32
+msgid "Channel location missing."
+msgstr "Kanalplassering mangler."
+
+#: ../../include/follow.php:80
+msgid "Response from remote channel was incomplete."
+msgstr "Svaret fra den andre kanalen var ikke komplett."
+
+#: ../../include/follow.php:97
+msgid "Channel was deleted and no longer exists."
+msgstr "Kanalen er slettet og finnes ikke lenger."
+
+#: ../../include/follow.php:147 ../../include/follow.php:183
+msgid "Protocol disabled."
+msgstr "Protokollen er avskrudd."
+
+#: ../../include/follow.php:171
+msgid "Channel discovery failed."
+msgstr "Kanaloppdagelse mislyktes."
+
+#: ../../include/follow.php:210
+msgid "Cannot connect to yourself."
+msgstr "Kan ikke lage forbindelse med deg selv."
+
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
+msgstr "Elementet ble ikke funnet."
+
+#: ../../include/attach.php:499
+msgid "No source file."
+msgstr "Ingen kildefil."
+
+#: ../../include/attach.php:521
+msgid "Cannot locate file to replace"
+msgstr "Kan ikke finne filen som skal byttes ut"
+
+#: ../../include/attach.php:539
+msgid "Cannot locate file to revise/update"
+msgstr "Finner ikke filen som skal revideres/oppdateres"
+
+#: ../../include/attach.php:674
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Filens størrelse overgår grensen på %d"
+
+#: ../../include/attach.php:688
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Du har nådd din lagringsgrense for vedlegg på %1$.0f Mbytes."
+
+#: ../../include/attach.php:846
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Mislyktes med å laste opp filen. Mulig systemgrense eller handling avbrutt."
+
+#: ../../include/attach.php:859
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Lagret fil kunne ikke bekreftes. Opplasting mislyktes."
+
+#: ../../include/attach.php:915 ../../include/attach.php:931
+msgid "Path not available."
+msgstr "Stien er ikke tilgjengelig."
+
+#: ../../include/attach.php:977 ../../include/attach.php:1129
+msgid "Empty pathname"
+msgstr "Tomt sti-navn"
+
+#: ../../include/attach.php:1003
+msgid "duplicate filename or path"
+msgstr "duplikat av filnavn eller sti"
+
+#: ../../include/attach.php:1025
+msgid "Path not found."
+msgstr "Stien ble ikke funnet."
+
+#: ../../include/attach.php:1083
+msgid "mkdir failed."
+msgstr "mkdir mislyktes."
+
+#: ../../include/attach.php:1087
+msgid "database storage failed."
+msgstr "databaselagring mislyktes."
+
+#: ../../include/attach.php:1135
+msgid "Empty path"
+msgstr "Tom sti"
+
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:878
+#: ../../include/bbcode.php:881 ../../include/bbcode.php:886
+#: ../../include/bbcode.php:889 ../../include/bbcode.php:892
+#: ../../include/bbcode.php:895 ../../include/bbcode.php:900
+#: ../../include/bbcode.php:903 ../../include/bbcode.php:908
+#: ../../include/bbcode.php:911 ../../include/bbcode.php:914
+#: ../../include/bbcode.php:917
+msgid "Image/photo"
+msgstr "Bilde/fotografi"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:928
+msgid "Encrypted content"
+msgstr "Kryptert innhold"
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr "Installer %s element:"
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Dette innlegget inneholder det installerbare elementet %s, men du mangler tillatelse til å installere det på dette nettstedet."
+
+#: ../../include/bbcode.php:261
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s skrev følgende %2$s %3$s"
+
+#: ../../include/bbcode.php:338 ../../include/bbcode.php:346
+msgid "Click to open/close"
+msgstr "Klikk for å åpne/lukke"
+
+#: ../../include/bbcode.php:346
+msgid "spoiler"
+msgstr "avsløring"
+
+#: ../../include/bbcode.php:619
+msgid "Different viewers will see this text differently"
+msgstr "Denne teksten vil se forskjellig ut for ulike besøkende"
+
+#: ../../include/bbcode.php:866
+msgid "$1 wrote:"
+msgstr "$1 skrev:"
+
+#: ../../include/items.php:897 ../../include/items.php:942
+msgid "(Unknown)"
+msgstr "(Ukjent)"
+
+#: ../../include/items.php:1141
+msgid "Visible to anybody on the internet."
+msgstr "Synlig for enhver på Internett."
+
+#: ../../include/items.php:1143
+msgid "Visible to you only."
+msgstr "Synlig bare for deg."
+
+#: ../../include/items.php:1145
+msgid "Visible to anybody in this network."
+msgstr "Synlig for enhver i dette nettverket."
+
+#: ../../include/items.php:1147
+msgid "Visible to anybody authenticated."
+msgstr "Synlig for enhver som er autentisert."
+
+#: ../../include/items.php:1149
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Synlig for alle på %s."
+
+#: ../../include/items.php:1151
+msgid "Visible to all connections."
+msgstr "Synlig for alle forbindelser."
+
+#: ../../include/items.php:1153
+msgid "Visible to approved connections."
+msgstr "Synlig for godkjente forbindelser."
+
+#: ../../include/items.php:1155
+msgid "Visible to specific connections."
+msgstr "Synlig for spesifikke forbindelser."
+
+#: ../../include/items.php:3918
+msgid "Privacy group is empty."
+msgstr "Personverngruppen er tom."
+
+#: ../../include/items.php:3925
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Personverngruppe: %s"
+
+#: ../../include/items.php:3937
+msgid "Connection not found."
+msgstr "Forbindelsen ble ikke funnet."
+
+#: ../../include/items.php:4290
+msgid "profile photo"
+msgstr "profilbilde"
+
+#: ../../include/oembed.php:336
+msgid "Embedded content"
+msgstr "Innebygget innhold"
+
+#: ../../include/oembed.php:345
+msgid "Embedding disabled"
+msgstr "Innbygging avskrudd"
+
+#: ../../include/widgets.php:103
+msgid "System"
+msgstr "System"
+
+#: ../../include/widgets.php:106
+msgid "New App"
+msgstr "Ny app"
+
+#: ../../include/widgets.php:154
+msgid "Suggestions"
+msgstr "Forslag"
+
+#: ../../include/widgets.php:155
+msgid "See more..."
+msgstr "Se mer..."
+
+#: ../../include/widgets.php:175
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
+msgstr "Du har %1$.0f av %2$.0f tillate forbindelser."
+
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
+msgstr "Legg til ny forbindelse"
+
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
+msgstr "Skriv kanaladressen"
+
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Eksempel: ola@eksempel.no, https://eksempel.no/kari"
+
+#: ../../include/widgets.php:199
+msgid "Notes"
+msgstr "Merknader"
+
+#: ../../include/widgets.php:273
+msgid "Remove term"
+msgstr "Fjern begrep"
+
+#: ../../include/widgets.php:313 ../../include/widgets.php:432
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
+msgstr "Alt"
+
+#: ../../include/widgets.php:354
+msgid "Archives"
+msgstr "Arkiv"
+
+#: ../../include/widgets.php:516
+msgid "Refresh"
+msgstr "Forny"
+
+#: ../../include/widgets.php:556
+msgid "Account settings"
+msgstr "Kontoinnstillinger"
+
+#: ../../include/widgets.php:562
+msgid "Channel settings"
+msgstr "Kanalinnstillinger"
+
+#: ../../include/widgets.php:571
+msgid "Additional features"
+msgstr "Tilleggsfunksjoner"
+
+#: ../../include/widgets.php:578
+msgid "Feature/Addon settings"
+msgstr "Funksjons-/Tilleggsinnstillinger"
+
+#: ../../include/widgets.php:584
+msgid "Display settings"
+msgstr "Visningsinnstillinger"
+
+#: ../../include/widgets.php:591
+msgid "Manage locations"
+msgstr "Håndter plasseringer"
+
+#: ../../include/widgets.php:600
+msgid "Export channel"
+msgstr "Eksporter kanal"
+
+#: ../../include/widgets.php:607
+msgid "Connected apps"
+msgstr "Tilkoblede app-er"
+
+#: ../../include/widgets.php:631
+msgid "Premium Channel Settings"
+msgstr "Premiumkanal-innstillinger"
+
+#: ../../include/widgets.php:660
+msgid "Private Mail Menu"
+msgstr "Meny for privat post"
+
+#: ../../include/widgets.php:662
+msgid "Combined View"
+msgstr "Kombinert visning"
+
+#: ../../include/widgets.php:694 ../../include/widgets.php:706
+msgid "Conversations"
+msgstr "Samtaler"
+
+#: ../../include/widgets.php:698
+msgid "Received Messages"
+msgstr "Mottatte meldinger"
+
+#: ../../include/widgets.php:702
+msgid "Sent Messages"
+msgstr "Sendte meldinger"
+
+#: ../../include/widgets.php:716
+msgid "No messages."
+msgstr "Ingen meldinger."
+
+#: ../../include/widgets.php:734
+msgid "Delete conversation"
+msgstr "Slett samtale"
+
+#: ../../include/widgets.php:760
+msgid "Events Tools"
+msgstr "Kalenderverktøy"
+
+#: ../../include/widgets.php:761
+msgid "Export Calendar"
+msgstr "Eksporter kalender"
+
+#: ../../include/widgets.php:762
+msgid "Import Calendar"
+msgstr "Importer kalender"
+
+#: ../../include/widgets.php:840
+msgid "Overview"
+msgstr "Overblikk"
+
+#: ../../include/widgets.php:847
+msgid "Chat Members"
+msgstr "Chatmedlemmer"
+
+#: ../../include/widgets.php:869
+msgid "Wiki List"
+msgstr ""
+
+#: ../../include/widgets.php:907
+msgid "Wiki Pages"
+msgstr ""
+
+#: ../../include/widgets.php:942
+msgid "Bookmarked Chatrooms"
+msgstr "Bokmerkede chatrom"
+
+#: ../../include/widgets.php:965
+msgid "Suggested Chatrooms"
+msgstr "Foreslåtte chatrom"
+
+#: ../../include/widgets.php:1111 ../../include/widgets.php:1223
+msgid "photo/image"
+msgstr "foto/bilde"
+
+#: ../../include/widgets.php:1166
+msgid "Click to show more"
+msgstr "Klikk for å vise mer"
+
+#: ../../include/widgets.php:1317
+msgid "Rating Tools"
+msgstr "Vurderingsverktøy"
+
+#: ../../include/widgets.php:1321 ../../include/widgets.php:1323
+msgid "Rate Me"
+msgstr "Vurder meg"
+
+#: ../../include/widgets.php:1326
+msgid "View Ratings"
+msgstr "Vis vurderinger"
+
+#: ../../include/widgets.php:1410
+msgid "Forums"
+msgstr "Forum"
+
+#: ../../include/widgets.php:1439
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#: ../../include/widgets.php:1448
+msgid "Documentation"
+msgstr "Dokumentasjon"
+
+#: ../../include/widgets.php:1450
+msgid "Project/Site Information"
+msgstr "Prosjekt-/Nettstedsinformasjon"
+
+#: ../../include/widgets.php:1451
+msgid "For Members"
+msgstr "For medlemmer"
+
+#: ../../include/widgets.php:1452
+msgid "For Administrators"
+msgstr "For administratorer"
+
+#: ../../include/widgets.php:1453
+msgid "For Developers"
+msgstr "For utviklere"
+
+#: ../../include/widgets.php:1477 ../../include/widgets.php:1515
+msgid "Member registrations waiting for confirmation"
+msgstr "Medlemsregistreringer venter på bekreftelse"
+
+#: ../../include/widgets.php:1483
+msgid "Inspect queue"
+msgstr "Inspiser kø"
+
+#: ../../include/widgets.php:1485
+msgid "DB updates"
+msgstr "Databaseoppdateringer"
+
+#: ../../include/widgets.php:1511
+msgid "Plugin Features"
+msgstr "Tilleggsfunksjoner"
+
+#: ../../include/activities.php:41
+msgid " and "
+msgstr "og"
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr "offentlig profil"
+
+#: ../../include/activities.php:58
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s endret %2$s til &ldquo;%3$s&rdquo;"
+
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Besøk %1$s sitt %2$s"
+
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s har oppdatert %2$s, endret %3$s."
+
+#: ../../include/bb2diaspora.php:398
+msgid "Attachments:"
+msgstr "Vedlegg:"
+
+#: ../../include/bb2diaspora.php:487
+msgid "$Projectname event notification:"
+msgstr "$Projectname hendelsesvarsling:"
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "Slett dette elementet?"
 
 #: ../../include/js_strings.php:8
-msgid "[-] show less"
-msgstr "[-] Vis mindre"
+#, php-format
+msgid "%s show less"
+msgstr ""
 
 #: ../../include/js_strings.php:9
-msgid "[+] expand"
-msgstr "[+] Utvid"
+#, php-format
+msgid "%s expand"
+msgstr ""
 
 #: ../../include/js_strings.php:10
-msgid "[-] collapse"
-msgstr "[-] Lukk"
+#, php-format
+msgid "%s collapse"
+msgstr ""
 
 #: ../../include/js_strings.php:11
 msgid "Password too short"
@@ -9358,278 +9609,223 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "Hele dagen"
 
-#: ../../include/network.php:657
-msgid "view full size"
-msgstr "vis full størrelse"
-
-#: ../../include/network.php:1885
-msgid "No Subject"
-msgstr "Uten emne"
-
-#: ../../include/network.php:2146 ../../include/network.php:2147
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/network.php:2148
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/network.php:2149
-msgid "GNU-Social"
-msgstr ""
-
-#: ../../include/network.php:2150
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/network.php:2152
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/network.php:2153
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/network.php:2154
-msgid "Zot"
-msgstr "Zot"
-
-#: ../../include/network.php:2155
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ../../include/network.php:2156
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: ../../include/network.php:2157
-msgid "MySpace"
-msgstr "MySpace"
-
-#: ../../include/photos.php:110
+#: ../../include/contact_widgets.php:11
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Bilde overstiger nettstedets størrelsesbegrensning på %lu bytes"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d invitasjon tilgjengelig"
+msgstr[1] "%d invitasjoner tilgjengelig"
 
-#: ../../include/photos.php:117
-msgid "Image file is empty."
-msgstr "Bildefilen er tom."
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
+msgstr "Finn kanaler"
 
-#: ../../include/photos.php:255
-msgid "Photo storage failed."
-msgstr "Bildelagring mislyktes."
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
+msgstr "Skriv navn eller interesse"
 
-#: ../../include/photos.php:295
-msgid "a new photo"
-msgstr "et nytt bilde"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
+msgstr "Forbindelse/Følg"
 
-#: ../../include/photos.php:299
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Eksempler: Ola Nordmann, fisking"
+
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
+msgstr "Tilfeldig profil"
+
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
+msgstr "Inviter venner"
+
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Avansert eksempel: navn=fred og land=island"
+
+#: ../../include/contact_widgets.php:122
 #, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s la inn %2$s til %3$s"
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d forbindelse felles"
+msgstr[1] "%d forbindelser felles"
 
-#: ../../include/photos.php:506
-msgid "Upload New Photos"
-msgstr "Last opp nye bilder"
+#: ../../include/contact_widgets.php:127
+msgid "show more"
+msgstr "vis mer"
 
-#: ../../include/zot.php:699
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr "Kataloginnstillinger"
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr "Trygt modus"
+
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr "Bare offentlige forum"
+
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr "Kun dette nettstedet"
+
+#: ../../include/message.php:20
+msgid "No recipient provided."
+msgstr "Ingen mottaker angitt."
+
+#: ../../include/message.php:25
+msgid "[no subject]"
+msgstr "[ikke noe emne]"
+
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
+msgstr "Kan ikke avgjøre avsender."
+
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
+msgstr "Lagret innlegg kunne ikke bekreftes."
+
+#: ../../include/acl_selectors.php:269
+msgid "Who can see this?"
+msgstr "Hvem kan se dette?"
+
+#: ../../include/acl_selectors.php:270
+msgid "Custom selection"
+msgstr "Tilpasset utvalg"
+
+#: ../../include/acl_selectors.php:271
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
+" the scope of \"Show\"."
+msgstr "Velg \"Vis\" for å tillate visning. \"Ikke vis\" lar deg overstyre og avgrense omfanget av \"Vis\"."
+
+#: ../../include/acl_selectors.php:272
+msgid "Show"
+msgstr "Vis"
+
+#: ../../include/acl_selectors.php:273
+msgid "Don't show"
+msgstr "Ikke vis"
+
+#: ../../include/acl_selectors.php:279
+msgid "Other networks and post services"
+msgstr "Andre nettverk og innleggstjenester"
+
+#: ../../include/acl_selectors.php:309
+#, php-format
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These"
+" permissions set who is allowed to view the post."
+msgstr "Innleggstillatelsene %s kan ikke endres %s etter at et innlegg er delt.</br>Disse innstillingene angir hvem som har tillatelse til å se innlegget."
+
+#: ../../include/datetime.php:135
+msgid "Birthday"
+msgstr "Fødselsdag"
+
+#: ../../include/datetime.php:137
+msgid "Age: "
+msgstr "Alder:"
+
+#: ../../include/datetime.php:139
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "YYYY-MM-DD eller MM-DD"
+
+#: ../../include/datetime.php:272 ../../boot.php:2479
+msgid "never"
+msgstr "aldri"
+
+#: ../../include/datetime.php:278
+msgid "less than a second ago"
+msgstr "for mindre enn ett sekund siden"
+
+#: ../../include/datetime.php:296
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr "%1$d %2$s siden"
+
+#: ../../include/datetime.php:307
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] "år"
+msgstr[1] "år"
+
+#: ../../include/datetime.php:310
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] "måned"
+msgstr[1] "måneder"
+
+#: ../../include/datetime.php:313
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "uke"
+msgstr[1] "uker"
+
+#: ../../include/datetime.php:316
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dag"
+msgstr[1] "dager"
+
+#: ../../include/datetime.php:319
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "time"
+msgstr[1] "timer"
+
+#: ../../include/datetime.php:322
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minutt"
+msgstr[1] "minutter"
+
+#: ../../include/datetime.php:325
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "sekund"
+msgstr[1] "sekunder"
+
+#: ../../include/datetime.php:562
+#, php-format
+msgid "%1$s's birthday"
+msgstr "%1$s sin fødselsdag"
+
+#: ../../include/datetime.php:563
+#, php-format
+msgid "Happy Birthday %1$s"
+msgstr "Gratulerer med dagen, %1$s !"
+
+#: ../../include/api.php:1327
+msgid "Public Timeline"
+msgstr "Offentlig tidslinje"
+
+#: ../../include/zot.php:697
 msgid "Invalid data packet"
 msgstr "Ugyldig datapakke"
 
-#: ../../include/zot.php:715
+#: ../../include/zot.php:713
 msgid "Unable to verify channel signature"
 msgstr "Ikke i stand til å sjekke kanalsignaturen"
 
-#: ../../include/zot.php:2363
+#: ../../include/zot.php:2326
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Ikke i stand til å bekrefte signaturen til %s"
 
-#: ../../include/zot.php:3712
+#: ../../include/zot.php:3703
 msgid "invalid target signature"
 msgstr "Målets signatur er ugyldig"
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Ny side"
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr "Tittel"
-
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
-msgstr "Kan se min normale strøm og innlegg"
-
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
-msgstr "Kan se min standard kanalprofil"
-
-#: ../../include/permissions.php:28
-msgid "Can view my connections"
-msgstr "Kan se mine forbindelser"
-
-#: ../../include/permissions.php:29
-msgid "Can view my file storage and photos"
-msgstr "Kan se mine filer og bilder"
-
-#: ../../include/permissions.php:30
-msgid "Can view my webpages"
-msgstr "Kan se mine websider"
-
-#: ../../include/permissions.php:33
-msgid "Can send me their channel stream and posts"
-msgstr "Kan sende meg deres kanalstrøm og innlegg"
-
-#: ../../include/permissions.php:34
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Kan lage innlegg på min kanalside (\"vegg\")"
-
-#: ../../include/permissions.php:35
-msgid "Can comment on or like my posts"
-msgstr "Kan kommentere på eller like mine innlegg"
-
-#: ../../include/permissions.php:36
-msgid "Can send me private mail messages"
-msgstr "Kan sende meg private meldinger"
-
-#: ../../include/permissions.php:37
-msgid "Can like/dislike stuff"
-msgstr "Kan like/ikke like forskjellige greier"
-
-#: ../../include/permissions.php:37
-msgid "Profiles and things other than posts/comments"
-msgstr "Profiler og andre ting enn innlegg/kommentarer"
-
-#: ../../include/permissions.php:39
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Kan videresende til alle mine kanalkontakter via @navn i innlegg"
-
-#: ../../include/permissions.php:39
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Avansert - nyttig for å lage forumkanaler for grupper"
-
-#: ../../include/permissions.php:40
-msgid "Can chat with me (when available)"
-msgstr "Kan chatte/sende lynmeldinger til meg (når tilgjengelig)"
-
-#: ../../include/permissions.php:41
-msgid "Can write to my file storage and photos"
-msgstr "Kan skrive til mitt lager for filer og bilder"
-
-#: ../../include/permissions.php:42
-msgid "Can edit my webpages"
-msgstr "Kan endre mine websider"
-
-#: ../../include/permissions.php:44
-msgid "Can source my public posts in derived channels"
-msgstr "Kan bruke mine offentlige innlegg som kanalkilde i egne kanaler"
-
-#: ../../include/permissions.php:44
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Litt avansert - svært nyttig i åpne fellesskap"
-
-#: ../../include/permissions.php:46
-msgid "Can administer my channel resources"
-msgstr "Kan administrere mine kanalressurser"
-
-#: ../../include/permissions.php:46
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Ekstremt avansert. La dette være med mindre du vet hva du gjør"
-
-#: ../../include/permissions.php:877
-msgid "Social Networking"
-msgstr "Sosialt nettverk"
-
-#: ../../include/permissions.php:877
-msgid "Social - Mostly Public"
-msgstr "Sosial - ganske offentlig"
-
-#: ../../include/permissions.php:877
-msgid "Social - Restricted"
-msgstr "Sosial - begrenset"
-
-#: ../../include/permissions.php:877
-msgid "Social - Private"
-msgstr "Sosial - privat"
-
-#: ../../include/permissions.php:878
-msgid "Community Forum"
-msgstr "Forum for fellesskap"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Mostly Public"
-msgstr "Forum - ganske offentlig"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Restricted"
-msgstr "Forum - begrenset"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Private"
-msgstr "Forum - privat"
-
-#: ../../include/permissions.php:879
-msgid "Feed Republish"
-msgstr "Republisering av strømmet innhold"
-
-#: ../../include/permissions.php:879
-msgid "Feed - Mostly Public"
-msgstr "Strøm - ganske offentlig"
-
-#: ../../include/permissions.php:879
-msgid "Feed - Restricted"
-msgstr "Strøm - begrenset"
-
-#: ../../include/permissions.php:880
-msgid "Special Purpose"
-msgstr "Spesiell bruk"
-
-#: ../../include/permissions.php:880
-msgid "Special - Celebrity/Soapbox"
-msgstr "Spesiell - kjendis/talerstol"
-
-#: ../../include/permissions.php:880
-msgid "Special - Group Repository"
-msgstr "Spesiell - gruppelager"
-
-#: ../../include/permissions.php:881
-msgid "Custom/Expert Mode"
-msgstr "Tilpasset/Ekspertmodus"
-
-#: ../../include/activities.php:41
-msgid " and "
-msgstr "og"
-
-#: ../../include/activities.php:49
-msgid "public profile"
-msgstr "offentlig profil"
-
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s endret %2$s til &ldquo;%3$s&rdquo;"
-
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Besøk %1$s sitt %2$s"
-
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s har oppdatert %2$s, endret %3$s."
-
-#: ../../include/bb2diaspora.php:398
-msgid "Attachments:"
-msgstr "Vedlegg:"
-
-#: ../../include/bb2diaspora.php:487
-msgid "$Projectname event notification:"
-msgstr "$Projectname hendelsesvarsling:"
-
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (Hubzilla standardtema)"
@@ -9766,62 +9962,66 @@ msgstr "Angi størrelsen for samtalens forfatterbilde"
 msgid "Set size of followup author photos"
 msgstr "Angi størrelsen på forfatterbilder ved oppfølging"
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
-msgstr ""
+msgstr "Søk %1$s (%2$s)"
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 msgctxt "opensearch"
 msgid "$Projectname"
-msgstr ""
+msgstr "$Projectname"
 
-#: ../../boot.php:1480
+#: ../../boot.php:1481
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Oppdatering %s mislyktes. Se feilloggen."
 
-#: ../../boot.php:1483
+#: ../../boot.php:1484
 #, php-format
 msgid "Update Error at %s"
 msgstr "Oppdateringsfeil ved %s"
 
-#: ../../boot.php:1684
+#: ../../boot.php:1685
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Lag en konto for å få tilgang til tjenester og programmer i Hubzilla"
 
 #: ../../boot.php:1706
+msgid "Login/Email"
+msgstr ""
+
+#: ../../boot.php:1707
 msgid "Password"
 msgstr "Passord"
 
-#: ../../boot.php:1707
+#: ../../boot.php:1708
 msgid "Remember me"
 msgstr "Husk meg"
 
-#: ../../boot.php:1710
+#: ../../boot.php:1711
 msgid "Forgot your password?"
 msgstr "Glemt passordet ditt?"
 
-#: ../../boot.php:2276
+#: ../../boot.php:2277
 msgid "toggle mobile"
 msgstr "Skru på mobil"
 
-#: ../../boot.php:2425
+#: ../../boot.php:2432
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr "Nettstedets SSL-sertifikat er ikke gyldig. Vennligst fiks dette."
 
-#: ../../boot.php:2428
+#: ../../boot.php:2435
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] SSL-feil ved nettsted hos %s"
 
-#: ../../boot.php:2469
+#: ../../boot.php:2478
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron/planlagte oppgaver kjører ikke."
 
-#: ../../boot.php:2473
+#: ../../boot.php:2482
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr "[hubzilla] Cron-oppgaver kjører ikke på %s"
diff --git a/view/nb-no/hstrings.php b/view/nb-no/hstrings.php
index e03ba321d..53aae8c0e 100644
--- a/view/nb-no/hstrings.php
+++ b/view/nb-no/hstrings.php
@@ -4,7 +4,39 @@ if(! function_exists("string_plural_select_nb_no")) {
 function string_plural_select_nb_no($n){
 	return ($n != 1);;
 }}
-;
+App::$rtl = 0;
+App::$strings["Social Networking"] = "Sosialt nettverk";
+App::$strings["Social - Mostly Public"] = "Sosial - ganske offentlig";
+App::$strings["Social - Restricted"] = "Sosial - begrenset";
+App::$strings["Social - Private"] = "Sosial - privat";
+App::$strings["Community Forum"] = "Forum for fellesskap";
+App::$strings["Forum - Mostly Public"] = "Forum - ganske offentlig";
+App::$strings["Forum - Restricted"] = "Forum - begrenset";
+App::$strings["Forum - Private"] = "Forum - privat";
+App::$strings["Feed Republish"] = "Republisering av strømmet innhold";
+App::$strings["Feed - Mostly Public"] = "Strøm - ganske offentlig";
+App::$strings["Feed - Restricted"] = "Strøm - begrenset";
+App::$strings["Special Purpose"] = "Spesiell bruk";
+App::$strings["Special - Celebrity/Soapbox"] = "Spesiell - kjendis/talerstol";
+App::$strings["Special - Group Repository"] = "Spesiell - gruppelager";
+App::$strings["Other"] = "Annen";
+App::$strings["Custom/Expert Mode"] = "Tilpasset/Ekspertmodus";
+App::$strings["Can view my channel stream and posts"] = "";
+App::$strings["Can send me their channel stream and posts"] = "Kan sende meg deres kanalstrøm og innlegg";
+App::$strings["Can view my default channel profile"] = "Kan se min standard kanalprofil";
+App::$strings["Can view my connections"] = "Kan se mine forbindelser";
+App::$strings["Can view my file storage and photos"] = "Kan se mine filer og bilder";
+App::$strings["Can upload/modify my file storage and photos"] = "";
+App::$strings["Can view my channel webpages"] = "";
+App::$strings["Can create/edit my channel webpages"] = "";
+App::$strings["Can post on my channel (wall) page"] = "";
+App::$strings["Can comment on or like my posts"] = "Kan kommentere på eller like mine innlegg";
+App::$strings["Can send me private mail messages"] = "Kan sende meg private meldinger";
+App::$strings["Can like/dislike profiles and profile things"] = "";
+App::$strings["Can forward to all my channel connections via @+ mentions in posts"] = "";
+App::$strings["Can chat with me"] = "";
+App::$strings["Can source my public posts in derived channels"] = "Kan bruke mine offentlige innlegg som kanalkilde i egne kanaler";
+App::$strings["Can administer my channel"] = "";
 App::$strings["parent"] = "opp et nivå";
 App::$strings["Collection"] = "Samling";
 App::$strings["Principal"] = "Viktigste";
@@ -37,63 +69,8 @@ App::$strings["Remote authentication blocked. You are logged into this site loca
 App::$strings["Welcome %s. Remote authentication successful."] = "Velkommen %s. Ekstern autentisering er vellykket.";
 App::$strings["Requested profile is not available."] = "Forespurt profil er ikke tilgjengelig.";
 App::$strings["Some blurb about what to do when you're new here"] = "En standardtekst om hva du bør gjøre som ny her";
-App::$strings["Block Name"] = "Byggeklossens navn";
-App::$strings["Blocks"] = "Byggeklosser";
-App::$strings["Block Title"] = "Byggeklossens tittel";
-App::$strings["Created"] = "Laget";
-App::$strings["Edited"] = "Endret";
-App::$strings["Share"] = "Del";
-App::$strings["View"] = "Vis";
-App::$strings["Channel not found."] = "Kanalen ble ikke funnet.";
-App::$strings["Permissions denied."] = "Tillatelse avvist.";
-App::$strings["l, F j"] = "l, F j";
-App::$strings["Link to Source"] = "Lenke til kilde";
-App::$strings["Edit Event"] = "Endre hendelse";
-App::$strings["Create Event"] = "Lag hendelse";
-App::$strings["Previous"] = "Forrige";
-App::$strings["Next"] = "Neste";
-App::$strings["Export"] = "Eksport";
-App::$strings["Import"] = "Importer";
-App::$strings["Submit"] = "Send";
-App::$strings["Today"] = "Idag";
-App::$strings["You must be logged in to see this page."] = "Du må være innloegget for å se denne siden.";
-App::$strings["Posts and comments"] = "";
-App::$strings["Only posts"] = "";
-App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Utilstrekkelig tillatelse. Forespørsel omdirigert til profilsiden.";
-App::$strings["Room not found"] = "Rommet ble ikke funnet";
-App::$strings["Leave Room"] = "Forlat rom";
-App::$strings["Delete Room"] = "";
-App::$strings["I am away right now"] = "Jeg er borte akkurat nå";
-App::$strings["I am online"] = "Jeg er online";
-App::$strings["Bookmark this room"] = "Bokmerk dette rommet";
-App::$strings["Please enter a link URL:"] = "Vennligst skriv inn en lenke URL:";
-App::$strings["Encrypt text"] = "Krypter tekst";
-App::$strings["Insert web link"] = "Sett inn web-lenke";
-App::$strings["Feature disabled."] = "";
-App::$strings["New Chatroom"] = "Nytt chatrom";
-App::$strings["Chatroom name"] = "";
-App::$strings["Expiration of chats (minutes)"] = "Chat utgår (antall minutter)";
-App::$strings["Permissions"] = "Tillatelser";
-App::$strings["%1\$s's Chatrooms"] = "%1\$s sine chatrom";
-App::$strings["No chatrooms available"] = "";
-App::$strings["Create New"] = "";
-App::$strings["Expiration"] = "";
-App::$strings["min"] = "";
 App::$strings["Away"] = "Borte";
 App::$strings["Online"] = "Online";
-App::$strings["Invalid item."] = "Ugyldig element.";
-App::$strings["Bookmark added"] = "Bokmerke lagt til";
-App::$strings["My Bookmarks"] = "Mine bokmerker";
-App::$strings["My Connections Bookmarks"] = "Mine forbindelsers bokmerker";
-App::$strings["Continue"] = "Fortsett";
-App::$strings["Premium Channel Setup"] = "Premiumkanal-oppsett";
-App::$strings["Enable premium channel connection restrictions"] = "Slå på restriksjoner for forbindelse med premiumkanal";
-App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Vennligst skriv dine restriksjoner og betingelser, slik som PayPal-kvittering, retningslinjer for bruk, og så videre.";
-App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Denne kanalen kan kreve ytterligere steg og bekreftelse av følgende betingelser før tilkobling:";
-App::$strings["Potential connections will then see the following text before proceeding:"] = "Potensielle forbindelser vil da se følgende tekst før de går videre:";
-App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på denne siden.";
-App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Ingen spesifikke instruksjoner er gitt av kanaleieren.)";
-App::$strings["Restricted or Premium Channel"] = "Begrenset kanal eller premiumkanal";
 App::$strings["Could not access contact record."] = "Fikk ikke tilgang til kontaktinformasjonen.";
 App::$strings["Could not locate selected profile."] = "Fant ikke valgt profil.";
 App::$strings["Connection updated."] = "Forbindelsen er oppdatert.";
@@ -146,7 +123,7 @@ App::$strings["Connection requests will be approved without your interaction"] =
 App::$strings["This connection's primary address is"] = "Denne forbindelsens primære adresse er";
 App::$strings["Available locations:"] = "Tilgjengelige plasseringer:";
 App::$strings["The permissions indicated on this page will be applied to all new connections."] = "Tillatelsene angitt på denne siden gjøres gjeldende for alle nye forbindelser.";
-App::$strings["Connection Tools"] = "";
+App::$strings["Connection Tools"] = "Forbindelsesverktøy";
 App::$strings["Slide to adjust your degree of friendship"] = "Flytt for å justere din grad av vennskap";
 App::$strings["Rating"] = "Vurdering";
 App::$strings["Slide to adjust your rating"] = "Flytt for å justere din vurdering";
@@ -158,6 +135,7 @@ App::$strings["Do not import posts with this text"] = "Ikke importer innlegg med
 App::$strings["This information is public!"] = "Denne informasjonen er offentlig!";
 App::$strings["Connection Pending Approval"] = "Forbindelse venter på godkjenning";
 App::$strings["inherited"] = "arvet";
+App::$strings["Submit"] = "Send";
 App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Vennligst velg profilen du ønsker å vise %s når profilen din ses på en sikret måte. ";
 App::$strings["Their Settings"] = "Deres innstillinger";
 App::$strings["My Settings"] = "Mine innstillinger";
@@ -166,6 +144,30 @@ App::$strings["Some permissions may be inherited from your channel's <a href=\"s
 App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Noen tillatelser kan være arvet fra din kanals <a ref=\"settings\"><strong>personverninnstillinger</strong></a>, som har høyere prioritet enn individuelle innstillinger. Du kan endre disse innstillingene her, men de vil ikke få noen effekt før de arvede innstillingene endres.";
 App::$strings["Last update:"] = "Siste oppdatering:";
 App::$strings["Public access denied."] = "Offentlig tilgang avvist.";
+App::$strings["Item not found."] = "Elementet ble ikke funnet.";
+App::$strings["First Name"] = "Fornavn";
+App::$strings["Last Name"] = "Etternavn";
+App::$strings["Nickname"] = "Kallenavn";
+App::$strings["Full Name"] = "Fullt navn";
+App::$strings["Email"] = "E-post";
+App::$strings["Profile Photo"] = "Profilbilde";
+App::$strings["Profile Photo 16px"] = "Profilbilde 16px";
+App::$strings["Profile Photo 32px"] = "Profilbilde 32px";
+App::$strings["Profile Photo 48px"] = "Profilbilde 48px";
+App::$strings["Profile Photo 64px"] = "Profilbilde 64px";
+App::$strings["Profile Photo 80px"] = "Profilbilde 80px";
+App::$strings["Profile Photo 128px"] = "Profilbilde 128px";
+App::$strings["Timezone"] = "Tidssone";
+App::$strings["Homepage URL"] = "Hjemmeside URL";
+App::$strings["Language"] = "Språk";
+App::$strings["Birth Year"] = "Fødselsår";
+App::$strings["Birth Month"] = "Fødselsmåne";
+App::$strings["Birth Day"] = "Fødselsdag";
+App::$strings["Birthdate"] = "Fødselsdato";
+App::$strings["Gender"] = "Kjønn";
+App::$strings["Male"] = "Mannlig";
+App::$strings["Female"] = "Kvinnelig";
+App::$strings["Channel added."] = "Kanal lagt til.";
 App::$strings["%d rating"] = array(
 	0 => "%d vurdering",
 	1 => "%d vurderinger",
@@ -196,13 +198,74 @@ App::$strings["Reverse Alphabetic"] = "Omvendt alfabetisk";
 App::$strings["Newest to Oldest"] = "Nyest til eldst";
 App::$strings["Oldest to Newest"] = "Eldst til nyest";
 App::$strings["No entries (some entries may be hidden)."] = "Ingen oppføringer (noen oppføringer kan være skjult).";
-App::$strings["Item not found."] = "Elementet ble ikke funnet.";
+App::$strings["Continue"] = "Fortsett";
+App::$strings["Premium Channel Setup"] = "Premiumkanal-oppsett";
+App::$strings["Enable premium channel connection restrictions"] = "Slå på restriksjoner for forbindelse med premiumkanal";
+App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Vennligst skriv dine restriksjoner og betingelser, slik som PayPal-kvittering, retningslinjer for bruk, og så videre.";
+App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Denne kanalen kan kreve ytterligere steg og bekreftelse av følgende betingelser før tilkobling:";
+App::$strings["Potential connections will then see the following text before proceeding:"] = "Potensielle forbindelser vil da se følgende tekst før de går videre:";
+App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Ved å fortsette bekrefter jeg at jeg har oppfylt alle instruksjoner gitt på denne siden.";
+App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Ingen spesifikke instruksjoner er gitt av kanaleieren.)";
+App::$strings["Restricted or Premium Channel"] = "Begrenset kanal eller premiumkanal";
+App::$strings["Calendar entries imported."] = "Kalenderhendelsene er importert.";
+App::$strings["No calendar entries found."] = "Ingen kalenderhendelser funnet.";
+App::$strings["Event can not end before it has started."] = "Hendelsen kan ikke slutte før den starter.";
+App::$strings["Unable to generate preview."] = "Klarer ikke å lage forhåndsvisning.";
+App::$strings["Event title and start time are required."] = "Hendelsestittel og starttidspunkt er påkrevd.";
+App::$strings["Event not found."] = "Hendelsen ble ikke funnet.";
+App::$strings["event"] = "hendelse";
+App::$strings["Edit event title"] = "Endre tittel på hendelse";
+App::$strings["Event title"] = "Tittel på hendelse";
+App::$strings["Required"] = "Påkrevd";
+App::$strings["Categories (comma-separated list)"] = "Kategorier (kommaseparert liste)";
+App::$strings["Edit Category"] = "Endre kategori";
+App::$strings["Category"] = "Kategori";
+App::$strings["Edit start date and time"] = "Endre startdato og tidspunkt";
+App::$strings["Start date and time"] = "Startdato og tidspunkt";
+App::$strings["Finish date and time are not known or not relevant"] = "Sluttdato og tidspunkt er ikke kjent eller ikke relevant";
+App::$strings["Edit finish date and time"] = "Endre sluttdato og tidspunkt";
+App::$strings["Finish date and time"] = "Sluttdato og tidspunkt";
+App::$strings["Adjust for viewer timezone"] = "Juster i forhold til tilskuerens tidssone";
+App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Viktig for hendelser som skjer på et bestemt sted. Ikke praktisk for globale ferier eller fridager.";
+App::$strings["Edit Description"] = "Endre beskrivelse";
+App::$strings["Description"] = "Beskrivelse";
+App::$strings["Edit Location"] = "Endre plassering";
+App::$strings["Location"] = "Plassering";
+App::$strings["Share this event"] = "Del denne hendelsen";
+App::$strings["Preview"] = "Forhåndsvisning";
+App::$strings["Permission settings"] = "Tillatelser - innstillinger";
+App::$strings["Advanced Options"] = "Avanserte alternativer";
+App::$strings["l, F j"] = "l, F j";
+App::$strings["Edit event"] = "Endre hendelse";
+App::$strings["Delete event"] = "Slett hendelse";
+App::$strings["Link to Source"] = "Lenke til kilde";
+App::$strings["calendar"] = "kalender";
+App::$strings["Edit Event"] = "Endre hendelse";
+App::$strings["Create Event"] = "Lag hendelse";
+App::$strings["Previous"] = "Forrige";
+App::$strings["Next"] = "Neste";
+App::$strings["Export"] = "Eksport";
+App::$strings["View"] = "Vis";
+App::$strings["Month"] = "";
+App::$strings["Week"] = "";
+App::$strings["Day"] = "";
+App::$strings["Today"] = "Idag";
+App::$strings["Event removed"] = "Hendelse slettet";
+App::$strings["Failed to remove event"] = "Mislyktes med å slette hendelse";
+App::$strings["Bookmark added"] = "Bokmerke lagt til";
+App::$strings["My Bookmarks"] = "Mine bokmerker";
+App::$strings["My Connections Bookmarks"] = "Mine forbindelsers bokmerker";
 App::$strings["Item not found"] = "Elementet ble ikke funnet.";
-App::$strings["Title (optional)"] = "Tittel (valgfri)";
-App::$strings["Edit Block"] = "Endre byggekloss";
-App::$strings["No channel."] = "Ingen kanal.";
-App::$strings["Common connections"] = "Felles forbindelser";
-App::$strings["No connections in common."] = "Ingen forbindelser felles.";
+App::$strings["Item is not editable"] = "Elementet kan ikke endres";
+App::$strings["Edit post"] = "Endre innlegg";
+App::$strings["Photos"] = "Bilder";
+App::$strings["Cancel"] = "Avbryt";
+App::$strings["Invalid item."] = "Ugyldig element.";
+App::$strings["Channel not found."] = "Kanalen ble ikke funnet.";
+App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+App::$strings["Save to Folder:"] = "Lagre til mappe:";
+App::$strings["- select -"] = "- velg -";
+App::$strings["Save"] = "Lagre";
 App::$strings["Blocked"] = "Blokkert";
 App::$strings["Ignored"] = "Ignorert";
 App::$strings["Hidden"] = "Skjult";
@@ -254,51 +317,38 @@ App::$strings["select a photo from your photo albums"] = "velg et bilde fra dine
 App::$strings["Crop Image"] = "Beskjær bildet";
 App::$strings["Please adjust the image cropping for optimum viewing."] = "Vennligst juster bildebeskjæringen for optimal visning.";
 App::$strings["Done Editing"] = "Avslutt redigering";
-App::$strings["Item is not editable"] = "Elementet kan ikke endres";
-App::$strings["Edit post"] = "Endre innlegg";
-App::$strings["Calendar entries imported."] = "Kalenderhendelsene er importert.";
-App::$strings["No calendar entries found."] = "Ingen kalenderhendelser funnet.";
-App::$strings["Event can not end before it has started."] = "Hendelsen kan ikke slutte før den starter.";
-App::$strings["Unable to generate preview."] = "Klarer ikke å lage forhåndsvisning.";
-App::$strings["Event title and start time are required."] = "Hendelsestittel og starttidspunkt er påkrevd.";
-App::$strings["Event not found."] = "Hendelsen ble ikke funnet.";
-App::$strings["event"] = "hendelse";
-App::$strings["Edit event title"] = "Endre tittel på hendelse";
-App::$strings["Event title"] = "Tittel på hendelse";
-App::$strings["Required"] = "Påkrevd";
-App::$strings["Categories (comma-separated list)"] = "Kategorier (kommaseparert liste)";
-App::$strings["Edit Category"] = "Endre kategori";
-App::$strings["Category"] = "Kategori";
-App::$strings["Edit start date and time"] = "Endre startdato og tidspunkt";
-App::$strings["Start date and time"] = "Startdato og tidspunkt";
-App::$strings["Finish date and time are not known or not relevant"] = "Sluttdato og tidspunkt er ikke kjent eller ikke relevant";
-App::$strings["Edit finish date and time"] = "Endre sluttdato og tidspunkt";
-App::$strings["Finish date and time"] = "Sluttdato og tidspunkt";
-App::$strings["Adjust for viewer timezone"] = "Juster i forhold til tilskuerens tidssone";
-App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Viktig for hendelser som skjer på et bestemt sted. Ikke praktisk for globale ferier eller fridager.";
-App::$strings["Edit Description"] = "Endre beskrivelse";
-App::$strings["Description"] = "Beskrivelse";
-App::$strings["Edit Location"] = "Endre plassering";
-App::$strings["Location"] = "Plassering";
-App::$strings["Share this event"] = "Del denne hendelsen";
-App::$strings["Preview"] = "Forhåndsvisning";
-App::$strings["Permission settings"] = "Tillatelser - innstillinger";
-App::$strings["Advanced Options"] = "Avanserte alternativer";
-App::$strings["Edit event"] = "Endre hendelse";
-App::$strings["Delete event"] = "Slett hendelse";
-App::$strings["calendar"] = "kalender";
-App::$strings["Event removed"] = "Hendelse slettet";
-App::$strings["Failed to remove event"] = "Mislyktes med å slette hendelse";
-App::$strings["Photos"] = "Bilder";
-App::$strings["Cancel"] = "Avbryt";
+App::$strings["webpage"] = "nettside";
+App::$strings["block"] = "byggekloss";
+App::$strings["layout"] = "layout";
+App::$strings["menu"] = "meny";
+App::$strings["%s element installed"] = "%s element installert";
+App::$strings["%s element installation failed"] = "Installasjon av %s-element mislyktes";
+App::$strings["Permissions denied."] = "Tillatelse avvist.";
+App::$strings["Import"] = "Importer";
 App::$strings["This site is not a directory server"] = "Dette nettstedet er ikke en katalogtjener";
 App::$strings["This directory server requires an access token"] = "Denne katalogtjeneren krever en tilgangsnøkkel (access token)";
-App::$strings["Save to Folder:"] = "Lagre til mappe:";
-App::$strings["- select -"] = "- velg -";
-App::$strings["Save"] = "Lagre";
+App::$strings["You must be logged in to see this page."] = "Du må være innloegget for å se denne siden.";
+App::$strings["Room not found"] = "Rommet ble ikke funnet";
+App::$strings["Leave Room"] = "Forlat rom";
+App::$strings["Delete Room"] = "Slett rom";
+App::$strings["I am away right now"] = "Jeg er borte akkurat nå";
+App::$strings["I am online"] = "Jeg er online";
+App::$strings["Bookmark this room"] = "Bokmerk dette rommet";
+App::$strings["Please enter a link URL:"] = "Vennligst skriv inn en lenke URL:";
+App::$strings["Encrypt text"] = "Krypter tekst";
+App::$strings["Insert web link"] = "Sett inn web-lenke";
+App::$strings["Feature disabled."] = "Funksjonen er avskrudd.";
+App::$strings["New Chatroom"] = "Nytt chatrom";
+App::$strings["Chatroom name"] = "Navn på chatrom";
+App::$strings["Expiration of chats (minutes)"] = "Chat utgår (antall minutter)";
+App::$strings["Permissions"] = "Tillatelser";
+App::$strings["%1\$s's Chatrooms"] = "%1\$s sine chatrom";
+App::$strings["No chatrooms available"] = "Ingen tilgjengelige chatrom";
+App::$strings["Create New"] = "Lag ny";
+App::$strings["Expiration"] = "Utløper";
+App::$strings["min"] = "min";
 App::$strings["Invalid message"] = "Ugyldig melding";
 App::$strings["no results"] = "ingen resultater";
-App::$strings["Delivery report for %1\$s"] = "Leveringsrapport for %1\$s";
 App::$strings["channel sync processed"] = "Kanalsynkronisering er behandlet";
 App::$strings["queued"] = "lagt i kø";
 App::$strings["posted"] = "lagt inn";
@@ -310,14 +360,14 @@ App::$strings["recipient not found"] = "mottaker ble ikke funnet";
 App::$strings["mail recalled"] = "melding tilbakekalt";
 App::$strings["duplicate mail received"] = "duplikat av melding mottatt";
 App::$strings["mail delivered"] = "melding mottatt";
+App::$strings["Delivery report for %1\$s"] = "Leveringsrapport for %1\$s";
+App::$strings["Options"] = "";
+App::$strings["Redeliver"] = "";
 App::$strings["Layout Name"] = "Layout-navn";
 App::$strings["Layout Description (Optional)"] = "Layoutens beskrivelse (valgfritt)";
 App::$strings["Edit Layout"] = "Endre layout";
-App::$strings["Page link"] = "";
+App::$strings["Page link"] = "Sidelenke";
 App::$strings["Edit Webpage"] = "Endre webside";
-App::$strings["Channel added."] = "Kanal lagt til.";
-App::$strings["network"] = "nettverk";
-App::$strings["RSS"] = "RSS";
 App::$strings["Privacy group created."] = "Personverngruppen er opprettet.";
 App::$strings["Could not create privacy group."] = "Kunne ikke opprette personverngruppen.";
 App::$strings["Privacy group not found."] = "Personverngruppen ble ikke funnet";
@@ -331,16 +381,33 @@ App::$strings["Privacy group editor"] = "Personverngruppebehandler";
 App::$strings["Members"] = "Medlemmer";
 App::$strings["All Connected Channels"] = "Alle tilkoblede kanaler";
 App::$strings["Click on a channel to add or remove."] = "Klikk på en kanal for å legge til eller fjerne.";
-App::$strings["Share content from Firefox to \$Projectname"] = "Del innhold fra Firefox til \$Projectname";
-App::$strings["Activate the Firefox \$Projectname provider"] = "Skru på Firefox \$Projectname tilbyderen";
-App::$strings["Authorize application connection"] = "Tillat programforbindelse";
-App::$strings["Return to your app and insert this Securty Code:"] = "Gå tilbake til din app og legg inn denne sikkerhetskoden:";
-App::$strings["Please login to continue."] = "Vennligst logg inn for å fortsette.";
-App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vil du tillate dette programmet å få tilgang til dine innlegg og kontakter, og/eller lage nye innlegg for deg?";
+App::$strings["App installed."] = "App installert.";
+App::$strings["Malformed app."] = "Feil oppsett for app-en.";
+App::$strings["Embed code"] = "Innbyggingskode";
+App::$strings["Edit App"] = "Endre app";
+App::$strings["Create App"] = "Lag app";
+App::$strings["Name of app"] = "Navn på app";
+App::$strings["Location (URL) of app"] = "Plassering (URL) til app";
+App::$strings["Photo icon URL"] = "Bildeikon URL";
+App::$strings["80 x 80 pixels - optional"] = "80 x80 pixler - valgfritt";
+App::$strings["Categories (optional, comma separated list)"] = "Kategorier (valgfri, kommaseparert liste)";
+App::$strings["Version ID"] = "Versjons-ID";
+App::$strings["Price of app"] = "Pris på app";
+App::$strings["Location (URL) to purchase app"] = "Plassering (URL) for å kjøpe app";
 App::$strings["Documentation Search"] = "Søk i dokumentasjon";
 App::$strings["Help:"] = "Hjelp:";
 App::$strings["Help"] = "Hjelp";
 App::$strings["\$Projectname Documentation"] = "\$Projectname dokumentasjon";
+App::$strings["Item not available."] = "Elementet er ikke tilgjengelig.";
+App::$strings["Layout updated."] = "Layout er oppdatert.";
+App::$strings["Edit System Page Description"] = "Endre beskrivelsen av systemsiden";
+App::$strings["Layout not found."] = "Layouten ble ikke funnet.";
+App::$strings["Module Name:"] = "Modulnavn:";
+App::$strings["Layout Help"] = "Layout-hjelp";
+App::$strings["Share content from Firefox to \$Projectname"] = "Del innhold fra Firefox til \$Projectname";
+App::$strings["Activate the Firefox \$Projectname provider"] = "Skru på Firefox \$Projectname tilbyderen";
+App::$strings["network"] = "nettverk";
+App::$strings["RSS"] = "RSS";
 App::$strings["Permission Denied."] = "Tillatelse avvist.";
 App::$strings["File not found."] = "Filen ble ikke funnet.";
 App::$strings["Edit file permissions"] = "Endre filtillatelser";
@@ -352,70 +419,13 @@ App::$strings["Copy/paste this URL to link file from a web page"] = "Kopier og l
 App::$strings["Share this file"] = "Del denne filen";
 App::$strings["Show URL to this file"] = "Vis URLen til denne filen";
 App::$strings["Notify your contacts about this file"] = "Varsle dine kontakter om denne filen";
-App::$strings["Apps"] = "Apper";
-App::$strings["Item not available."] = "Elementet er ikke tilgjengelig.";
-App::$strings["Your service plan only allows %d channels."] = "Din tjenesteplan tillater bare %d kanaler.";
-App::$strings["Nothing to import."] = "Ingenting å importere.";
-App::$strings["Unable to download data from old server"] = "Ikke i stand til å laste ned data fra gammel tjener";
-App::$strings["Imported file is empty."] = "Importert fil er tom.";
-App::$strings["Warning: Database versions differ by %1\$d updates."] = "Advarsel: databaseversjoner avviker med %1\$d oppdateringer.";
-App::$strings["Cloned channel not found. Import failed."] = "Klonet kanal ble ikke funnet. Import mislyktes.";
-App::$strings["No channel. Import failed."] = "Ingen kanal. Import mislyktes.";
-App::$strings["Import completed."] = "Import ferdig.";
-App::$strings["You must be logged in to use this feature."] = "Du må være innlogget for å bruke denne funksjonen.";
-App::$strings["Import Channel"] = "Importer kanal";
-App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Bruk dette skjemaet for å importere en eksisterende kanal fra en annen tjener/hub. Du kan hente inn kanalidentiteten fra den gamle tjeneren/huben via nettverket eller ved å bruke en eksportfil.";
-App::$strings["File to Upload"] = "Fil som skal lastes opp";
-App::$strings["Or provide the old server/hub details"] = "Eller oppgi detaljene fra den gamle tjeneren/hub-en";
-App::$strings["Your old identity address (xyz@example.com)"] = "Din gamle identitetsadresse (xyz@example.com)";
-App::$strings["Your old login email address"] = "Din gamle innloggings e-postadresse";
-App::$strings["Your old login password"] = "Ditt gamle innloggingspassord";
-App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Enten du tar det ene eller det andre valget, vennligst angi om du vil at denne hubben skal være din nye primære adresse, eller om din gamle plassering skal fortsette å ha denne rollen. Du kan lage innlegg fra den ene eller den andre plasseringen, men bare en av dem kan markeres som den primære plasseringen for filer, bilder og media.";
-App::$strings["Make this hub my primary location"] = "Gjør dette nettstedet til min primære plassering";
-App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importer eksisterende innlegg om mulig (eksperimentelt - begrenset av tilgjengelig minne)";
-App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Denne prosessen kan ta flere minutter å fullføre. Vennligst send inn dette skjemaet bare en gang og la siden være åpen inntil den er ferdig.";
-App::$strings["Unable to locate original post."] = "Ikke i stand til å finne opprinnelig innlegg.";
-App::$strings["Empty post discarded."] = "Tomt innlegg forkastet.";
-App::$strings["Executable content type not permitted to this channel."] = "Kjørbar innholdstype er ikke tillat for denne kanalen.";
-App::$strings["Duplicate post suppressed."] = "Duplikat av innlegg forhindret.";
-App::$strings["System error. Post not saved."] = "Systemfeil. Innlegg ble ikke lagret.";
-App::$strings["Unable to obtain post information from database."] = "Ikke i stand til å få tak i informasjon om innlegg fra databasen.";
-App::$strings["You have reached your limit of %1$.0f top level posts."] = "Du har nådd din grense på %1$.0f startinnlegg.";
-App::$strings["You have reached your limit of %1$.0f webpages."] = "Du har nådd din grense på %1$.0f websider.";
 App::$strings["Layouts"] = "Layout";
 App::$strings["Comanche page description language help"] = "Hjelp med Comanche sidebeskrivelsesspråk";
 App::$strings["Layout Description"] = "Layout-beskrivelse";
+App::$strings["Created"] = "Laget";
+App::$strings["Edited"] = "Endret";
+App::$strings["Share"] = "Del";
 App::$strings["Download PDL file"] = "Last ned PDL-fil";
-App::$strings["\$Projectname"] = "\$Projectname";
-App::$strings["Welcome to %s"] = "Velkommen til %s";
-App::$strings["First Name"] = "Fornavn";
-App::$strings["Last Name"] = "Etternavn";
-App::$strings["Nickname"] = "Kallenavn";
-App::$strings["Full Name"] = "Fullt navn";
-App::$strings["Email"] = "E-post";
-App::$strings["Profile Photo"] = "Profilbilde";
-App::$strings["Profile Photo 16px"] = "Profilbilde 16px";
-App::$strings["Profile Photo 32px"] = "Profilbilde 32px";
-App::$strings["Profile Photo 48px"] = "Profilbilde 48px";
-App::$strings["Profile Photo 64px"] = "Profilbilde 64px";
-App::$strings["Profile Photo 80px"] = "Profilbilde 80px";
-App::$strings["Profile Photo 128px"] = "Profilbilde 128px";
-App::$strings["Timezone"] = "Tidssone";
-App::$strings["Homepage URL"] = "Hjemmeside URL";
-App::$strings["Language"] = "Språk";
-App::$strings["Birth Year"] = "Fødselsår";
-App::$strings["Birth Month"] = "Fødselsmåne";
-App::$strings["Birth Day"] = "Fødselsdag";
-App::$strings["Birthdate"] = "Fødselsdato";
-App::$strings["Gender"] = "Kjønn";
-App::$strings["Male"] = "Mannlig";
-App::$strings["Female"] = "Kvinnelig";
-App::$strings["webpage"] = "nettside";
-App::$strings["block"] = "byggekloss";
-App::$strings["layout"] = "layout";
-App::$strings["menu"] = "meny";
-App::$strings["%s element installed"] = "%s element installert";
-App::$strings["%s element installation failed"] = "Installasjon av %s-element mislyktes";
 App::$strings["Like/Dislike"] = "Liker/Liker ikke";
 App::$strings["This action is restricted to members."] = "Denne handlingen er begrenset til medlemmer.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Vennligst <a href=\"rmagic\">logg inn med din \$Projectname ID</a> eller <a href=\"register\">registrer deg som et nytt \$Projectname-medlem</a> for å fortsette";
@@ -436,6 +446,173 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s deltar ikke på %
 App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s deltar kanskje på %2\$ss %3\$s";
 App::$strings["Action completed."] = "Handling ferdig.";
 App::$strings["Thank you."] = "Tusen takk.";
+App::$strings["Profile not found."] = "Profilen ble ikke funnet.";
+App::$strings["Profile deleted."] = "Profilen er slettet.";
+App::$strings["Profile-"] = "Profil-";
+App::$strings["New profile created."] = "Ny profil opprettet.";
+App::$strings["Profile unavailable to clone."] = "Profilen er utilgjengelig for klonen.";
+App::$strings["Profile unavailable to export."] = "Profilen er utilgjengelig for eksport.";
+App::$strings["Profile Name is required."] = "Profilnavn er påkrevd.";
+App::$strings["Marital Status"] = "Sivilstand";
+App::$strings["Romantic Partner"] = "Romantisk partner";
+App::$strings["Likes"] = "Liker";
+App::$strings["Dislikes"] = "Liker ikke";
+App::$strings["Work/Employment"] = "Arbeid/sysselsetting";
+App::$strings["Religion"] = "Religion";
+App::$strings["Political Views"] = "Politiske synspunkter";
+App::$strings["Sexual Preference"] = "Seksuelle preferanser";
+App::$strings["Homepage"] = "Hjemmeside";
+App::$strings["Interests"] = "Interesser";
+App::$strings["Address"] = "Adresse";
+App::$strings["Profile updated."] = "Profilen er oppdatert.";
+App::$strings["Hide your connections list from viewers of this profile"] = "Skjul listen med forbindelser fra besøkende som ser denne profilen";
+App::$strings["Edit Profile Details"] = "Endre profildetaljer";
+App::$strings["View this profile"] = "Vis denne profilen";
+App::$strings["Edit visibility"] = "Endre synlighet";
+App::$strings["Profile Tools"] = "Profilverktøy";
+App::$strings["Change cover photo"] = "Endre forsidebilde";
+App::$strings["Change profile photo"] = "Endre profilbilde";
+App::$strings["Create a new profile using these settings"] = "Lag en ny profil ved å bruke disse innstillingene";
+App::$strings["Clone this profile"] = "Klon denne profilen";
+App::$strings["Delete this profile"] = "Slett denne profilen";
+App::$strings["Add profile things"] = "Legg til profilting";
+App::$strings["Personal"] = "Personlig";
+App::$strings["Relation"] = "Forhold";
+App::$strings["Miscellaneous"] = "Forskjellig";
+App::$strings["Import profile from file"] = "Importer profil fra fil";
+App::$strings["Export profile to file"] = "Eksporter profil til fil";
+App::$strings["Your gender"] = "Ditt kjønn";
+App::$strings["Marital status"] = "Sivilstand";
+App::$strings["Sexual preference"] = "Seksuelle preferanser";
+App::$strings["Profile name"] = "Profilnavn";
+App::$strings["This is your default profile."] = "Dette er din standardprofil.";
+App::$strings["Your full name"] = "Ditt fulle navn";
+App::$strings["Title/Description"] = "Tittel/beskrivelse";
+App::$strings["Street address"] = "Gateadresse";
+App::$strings["Locality/City"] = "Sted/by";
+App::$strings["Region/State"] = "Region/fylke";
+App::$strings["Postal/Zip code"] = "Postnummer/ZIP-kode";
+App::$strings["Country"] = "Land";
+App::$strings["Who (if applicable)"] = "Hvem (hvis det er aktuelt)";
+App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Eksempler: kari123, Kari Villiamsen, kari@example.com";
+App::$strings["Since (date)"] = "Siden (dato)";
+App::$strings["Tell us about yourself"] = "Fortell oss om deg selv";
+App::$strings["Hometown"] = "Hjemby";
+App::$strings["Political views"] = "Politiske synspunkter";
+App::$strings["Religious views"] = "Religiøse synspunkter";
+App::$strings["Keywords used in directory listings"] = "Nøkkelord bruk i katalogoppføringer";
+App::$strings["Example: fishing photography software"] = "Eksempel: fisking fotografering programvare";
+App::$strings["Musical interests"] = "Musikkinteresser";
+App::$strings["Books, literature"] = "Bøker, litteratur";
+App::$strings["Television"] = "TV/fjernsyn";
+App::$strings["Film/Dance/Culture/Entertainment"] = "Film/dans/kultur/underholdning";
+App::$strings["Hobbies/Interests"] = "Hobbier/Interesser";
+App::$strings["Love/Romance"] = "Kjærlighet/romantikk";
+App::$strings["School/Education"] = "Skole/utdanning";
+App::$strings["Contact information and social networks"] = "Kontaktinformasjon og sosiale nettverk";
+App::$strings["My other channels"] = "Mine andre kanaler";
+App::$strings["Profile Image"] = "Profilbilde";
+App::$strings["Edit Profiles"] = "Endre profiler";
+App::$strings["Your service plan only allows %d channels."] = "Din tjenesteplan tillater bare %d kanaler.";
+App::$strings["Nothing to import."] = "Ingenting å importere.";
+App::$strings["Unable to download data from old server"] = "Ikke i stand til å laste ned data fra gammel tjener";
+App::$strings["Imported file is empty."] = "Importert fil er tom.";
+App::$strings["Warning: Database versions differ by %1\$d updates."] = "Advarsel: databaseversjoner avviker med %1\$d oppdateringer.";
+App::$strings["Cloned channel not found. Import failed."] = "Klonet kanal ble ikke funnet. Import mislyktes.";
+App::$strings["No channel. Import failed."] = "Ingen kanal. Import mislyktes.";
+App::$strings["Import completed."] = "Import ferdig.";
+App::$strings["You must be logged in to use this feature."] = "Du må være innlogget for å bruke denne funksjonen.";
+App::$strings["Import Channel"] = "Importer kanal";
+App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Bruk dette skjemaet for å importere en eksisterende kanal fra en annen tjener/hub. Du kan hente inn kanalidentiteten fra den gamle tjeneren/huben via nettverket eller ved å bruke en eksportfil.";
+App::$strings["File to Upload"] = "Fil som skal lastes opp";
+App::$strings["Or provide the old server/hub details"] = "Eller oppgi detaljene fra den gamle tjeneren/hub-en";
+App::$strings["Your old identity address (xyz@example.com)"] = "Din gamle identitetsadresse (xyz@example.com)";
+App::$strings["Your old login email address"] = "Din gamle innloggings e-postadresse";
+App::$strings["Your old login password"] = "Ditt gamle innloggingspassord";
+App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Enten du tar det ene eller det andre valget, vennligst angi om du vil at denne hubben skal være din nye primære adresse, eller om din gamle plassering skal fortsette å ha denne rollen. Du kan lage innlegg fra den ene eller den andre plasseringen, men bare en av dem kan markeres som den primære plasseringen for filer, bilder og media.";
+App::$strings["Make this hub my primary location"] = "Gjør dette nettstedet til min primære plassering";
+App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importer eksisterende innlegg om mulig (eksperimentelt - begrenset av tilgjengelig minne)";
+App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Denne prosessen kan ta flere minutter å fullføre. Vennligst send inn dette skjemaet bare en gang og la siden være åpen inntil den er ferdig.";
+App::$strings["\$Projectname"] = "\$Projectname";
+App::$strings["Welcome to %s"] = "Velkommen til %s";
+App::$strings["Unable to locate original post."] = "Ikke i stand til å finne opprinnelig innlegg.";
+App::$strings["Empty post discarded."] = "Tomt innlegg forkastet.";
+App::$strings["Executable content type not permitted to this channel."] = "Kjørbar innholdstype er ikke tillat for denne kanalen.";
+App::$strings["Duplicate post suppressed."] = "Duplikat av innlegg forhindret.";
+App::$strings["System error. Post not saved."] = "Systemfeil. Innlegg ble ikke lagret.";
+App::$strings["Unable to obtain post information from database."] = "Ikke i stand til å få tak i informasjon om innlegg fra databasen.";
+App::$strings["You have reached your limit of %1$.0f top level posts."] = "Du har nådd din grense på %1$.0f startinnlegg.";
+App::$strings["You have reached your limit of %1$.0f webpages."] = "Du har nådd din grense på %1$.0f websider.";
+App::$strings["Page owner information could not be retrieved."] = "Informasjon om sideeier kunne ikke hentes.";
+App::$strings["Profile Photos"] = "Profilbilder";
+App::$strings["Album not found."] = "Albumet ble ikke funnet.";
+App::$strings["Delete Album"] = "Slett album";
+App::$strings["Multiple storage folders exist with this album name, but within different directories. Please remove the desired folder or folders using the Files manager"] = "Flere lagringsmapper finnes med dette albumnavnet, men i ulike mapper. Vennligst fjern den ønskede mappen eller mappene med filbehandleren.";
+App::$strings["Delete Photo"] = "Slett bilde";
+App::$strings["No photos selected"] = "Ingen bilder valgt";
+App::$strings["Access to this item is restricted."] = "Tilgang til dette elementet er begrenset.";
+App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt.";
+App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB lagringsplass til bilder er brukt.";
+App::$strings["Upload Photos"] = "Last opp bilder";
+App::$strings["Enter an album name"] = "Skriv et albumnavn";
+App::$strings["or select an existing album (doubleclick)"] = "eller velg et eksisterende album (dobbeltklikk)";
+App::$strings["Create a status post for this upload"] = "Lag et statusinnlegg for denne opplastingen";
+App::$strings["Caption (optional):"] = "Bildetekst (valgfritt):";
+App::$strings["Description (optional):"] = "Beskrivelse (valgfritt):";
+App::$strings["Album name could not be decoded"] = "Albumnavnet kunne ikke dekodes";
+App::$strings["Contact Photos"] = "Kontaktbilder";
+App::$strings["Show Newest First"] = "Vis nyeste først";
+App::$strings["Show Oldest First"] = "Vis eldste først";
+App::$strings["View Photo"] = "Vis foto";
+App::$strings["Edit Album"] = "Endre album";
+App::$strings["Permission denied. Access to this item may be restricted."] = "Tillatelse avvist. Tilgang til dette elementet kan være begrenset.";
+App::$strings["Photo not available"] = "Bilde er utilgjengelig";
+App::$strings["Use as profile photo"] = "Bruk som profilbilde";
+App::$strings["Use as cover photo"] = "Bruk som forsidebilde";
+App::$strings["Private Photo"] = "Privat bilde";
+App::$strings["View Full Size"] = "Vis i full størrelse";
+App::$strings["Remove"] = "Fjern";
+App::$strings["Edit photo"] = "Endre bilde";
+App::$strings["Rotate CW (right)"] = "Roter med klokka (mot høyre)";
+App::$strings["Rotate CCW (left)"] = "Roter mot klokka (venstre)";
+App::$strings["Enter a new album name"] = "Skriv et nytt albumnavn";
+App::$strings["or select an existing one (doubleclick)"] = "eller velg et eksisterende album (dobbeltklikk)";
+App::$strings["Caption"] = "Overskrift";
+App::$strings["Add a Tag"] = "Legg til merkelapp";
+App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Eksempel: @bob, @Barbara_Jensen, @jim@example.com";
+App::$strings["Flag as adult in album view"] = "Flag som voksent i albumvisning";
+App::$strings["I like this (toggle)"] = "Jeg liker dette (skru av og på)";
+App::$strings["I don't like this (toggle)"] = "Jeg liker ikke dette (skru av og på)";
+App::$strings["Please wait"] = "Vennligst vent";
+App::$strings["This is you"] = "Dette er deg";
+App::$strings["Comment"] = "Kommentar";
+App::$strings["__ctx:title__ Likes"] = "Liker";
+App::$strings["__ctx:title__ Dislikes"] = "Liker ikke";
+App::$strings["__ctx:title__ Agree"] = "Enig";
+App::$strings["__ctx:title__ Disagree"] = "Uenig";
+App::$strings["__ctx:title__ Abstain"] = "Avstår";
+App::$strings["__ctx:title__ Attending"] = "Deltar";
+App::$strings["__ctx:title__ Not attending"] = "Deltar ikke";
+App::$strings["__ctx:title__ Might attend"] = "Deltar kanskje";
+App::$strings["View all"] = "Vis alle";
+App::$strings["__ctx:noun__ Like"] = array(
+	0 => "Liker",
+	1 => "Liker",
+);
+App::$strings["__ctx:noun__ Dislike"] = array(
+	0 => "Liker ikke",
+	1 => "Liker ikke",
+);
+App::$strings["Photo Tools"] = "Fotoverktøy";
+App::$strings["In This Photo:"] = "I dette bildet:";
+App::$strings["Map"] = "Kart";
+App::$strings["__ctx:noun__ Likes"] = "Liker";
+App::$strings["__ctx:noun__ Dislikes"] = "Liker ikke";
+App::$strings["Close"] = "Lukk";
+App::$strings["View Album"] = "Vis album";
+App::$strings["Recent Photos"] = "Nye bilder";
+App::$strings["Remote privacy information not available."] = "Ekstern personverninformasjon er ikke tilgjengelig.";
+App::$strings["Visible to:"] = "Synlig for:";
 App::$strings["Import completed"] = "Import ferdig";
 App::$strings["Import Items"] = "Importer elementer";
 App::$strings["Use this form to import existing posts and content from an export file."] = "Bruk dette skjemaet for å importere eksisterende innlegg og innhold fra en eksportfil.";
@@ -458,18 +635,15 @@ App::$strings["1. Register at any \$Projectname location (they are all inter-con
 App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Skriv inn min \$Projectname-adresse i nettstedets søkefelt.";
 App::$strings["or visit"] = "eller besøke";
 App::$strings["3. Click [Connect]"] = "3. Klikk [Forbindelse]";
-App::$strings["Remote privacy information not available."] = "Ekstern personverninformasjon er ikke tilgjengelig.";
-App::$strings["Visible to:"] = "Synlig for:";
 App::$strings["Location not found."] = "Plassering er ikke funnet.";
 App::$strings["Location lookup failed."] = "Oppslag på plassering mislyktes.";
 App::$strings["Please select another location to become primary before removing the primary location."] = "Vennligst velg en annen plassering som primær før du sletter gjeldende primære plassering.";
 App::$strings["Syncing locations"] = "Synkroniserer plasseringer";
 App::$strings["No locations found."] = "Ingen plasseringer ble funnet.";
 App::$strings["Manage Channel Locations"] = "Håndter kanalplasseringer";
-App::$strings["Address"] = "Adresse";
-App::$strings["Primary"] = "";
+App::$strings["Primary"] = "Hoved";
 App::$strings["Drop"] = "Slett";
-App::$strings["Sync Now"] = "";
+App::$strings["Sync Now"] = "Synkroniser nå";
 App::$strings["Please wait several minutes between consecutive operations."] = "Vennligst vent flere minutter mellom hver etterfølgende operasjon.";
 App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Når mulig, fjern en plassering ved å logge inn på det nettstedet eller den hub-en og fjern din kanal.";
 App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Bruk dette skjemaet for å fjerne plasseringen hvis huben ikke er i drift lenger.";
@@ -506,23 +680,7 @@ App::$strings["Default Channel"] = "Standardkanal";
 App::$strings["Make Default"] = "Gjør til standard";
 App::$strings["%d new messages"] = "%d nye meldinger";
 App::$strings["%d new introductions"] = "%d nye introduksjoner";
-App::$strings["Delegated Channel"] = "";
-App::$strings["No valid account found."] = "Ingen gyldig konto funnet.";
-App::$strings["Password reset request issued. Check your email."] = "Forespørsel om å tilbakestille passord er mottatt. Sjekk e-posten din.";
-App::$strings["Site Member (%s)"] = "Nettstedsmedlem (%s)";
-App::$strings["Password reset requested at %s"] = "Forespurt om å tilbakestille passord hos %s";
-App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Forespørsel kunne ikke bekreftes. (Du kan ha sendt den inn tidligere.) Tilbakestilling av passord mislyktes.";
-App::$strings["Password Reset"] = "Tilbakestill passord";
-App::$strings["Your password has been reset as requested."] = "Ditt passord har blitt tilbakestilt som forespurt.";
-App::$strings["Your new password is"] = "Ditt nye passord er";
-App::$strings["Save or copy your new password - and then"] = "Lagre eller kopier ditt nye passord, og deretter kan du";
-App::$strings["click here to login"] = "klikke her for å logge inn";
-App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Ditt passord kan endres på siden <em>Innstillinger</em> etter vellykket innlogging.";
-App::$strings["Your password has changed at %s"] = "Ditt passord er endret hos %s";
-App::$strings["Forgot your Password?"] = "Glemt passord ditt?";
-App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Skriv e-postadressen din og send inn for å tilbakestille passordet ditt. Sjekk deretter din e-post for videre instruksjoner.";
-App::$strings["Email Address"] = "E-postadresse";
-App::$strings["Reset"] = "Tilbakestill";
+App::$strings["Delegated Channel"] = "Delegert kanal";
 App::$strings["Unable to update menu."] = "Ikke i stand til å oppdatere meny.";
 App::$strings["Unable to create menu."] = "Ikke i stand til å lage meny.";
 App::$strings["Menu Name"] = "Menynavn";
@@ -547,13 +705,25 @@ App::$strings["Menu title"] = "Menytittel";
 App::$strings["Menu title as seen by others"] = "Menytittelen andre ser";
 App::$strings["Allow bookmarks"] = "Tillat bokmerker";
 App::$strings["Not found."] = "Ikke funnet.";
+App::$strings["No valid account found."] = "Ingen gyldig konto funnet.";
+App::$strings["Password reset request issued. Check your email."] = "Forespørsel om å tilbakestille passord er mottatt. Sjekk e-posten din.";
+App::$strings["Site Member (%s)"] = "Nettstedsmedlem (%s)";
+App::$strings["Password reset requested at %s"] = "Forespurt om å tilbakestille passord hos %s";
+App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Forespørsel kunne ikke bekreftes. (Du kan ha sendt den inn tidligere.) Tilbakestilling av passord mislyktes.";
+App::$strings["Password Reset"] = "Tilbakestill passord";
+App::$strings["Your password has been reset as requested."] = "Ditt passord har blitt tilbakestilt som forespurt.";
+App::$strings["Your new password is"] = "Ditt nye passord er";
+App::$strings["Save or copy your new password - and then"] = "Lagre eller kopier ditt nye passord, og deretter kan du";
+App::$strings["click here to login"] = "klikke her for å logge inn";
+App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Ditt passord kan endres på siden <em>Innstillinger</em> etter vellykket innlogging.";
+App::$strings["Your password has changed at %s"] = "Ditt passord er endret hos %s";
+App::$strings["Forgot your Password?"] = "Glemt passord ditt?";
+App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Skriv e-postadressen din og send inn for å tilbakestille passordet ditt. Sjekk deretter din e-post for videre instruksjoner.";
+App::$strings["Email Address"] = "E-postadresse";
+App::$strings["Reset"] = "Tilbakestill";
 App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s er %2\$s";
 App::$strings["Mood"] = "Stemning";
 App::$strings["Set your current mood and tell your friends"] = "Angi ditt nåværende humør og fortell dine venner";
-App::$strings["Profile Match"] = "Profiltreff";
-App::$strings["No keywords to match. Please add keywords to your default profile."] = "Ingen nøkkelord å sammenlikne. Vennligst legg til nøkkelord til din standardprofil.";
-App::$strings["is interested in:"] = "er interessert i:";
-App::$strings["No matches"] = "Ingen treff";
 App::$strings["No such group"] = "Gruppen finnes ikke";
 App::$strings["No such channel"] = "Ingen slik kanal";
 App::$strings["forum"] = "forum";
@@ -563,6 +733,13 @@ App::$strings["Privacy group: "] = "Personverngruppe:";
 App::$strings["Invalid connection."] = "Ugyldig forbindelse.";
 App::$strings["No more system notifications."] = "Ingen flere systemvarsler.";
 App::$strings["System Notifications"] = "Systemvarsler";
+App::$strings["Profile Match"] = "Profiltreff";
+App::$strings["No keywords to match. Please add keywords to your default profile."] = "Ingen nøkkelord å sammenlikne. Vennligst legg til nøkkelord til din standardprofil.";
+App::$strings["is interested in:"] = "er interessert i:";
+App::$strings["No matches"] = "Ingen treff";
+App::$strings["Posts and comments"] = "Innlegg og kommentarer";
+App::$strings["Only posts"] = "Bare innlegg";
+App::$strings["Insufficient permissions.  Request redirected to profile page."] = "Utilstrekkelig tillatelse. Forespørsel omdirigert til profilsiden.";
 App::$strings["Unable to create element."] = "Klarer ikke å lage element.";
 App::$strings["Unable to update menu element."] = "Ikke i stand til å oppdatere menyelement.";
 App::$strings["Unable to add menu element."] = "Ikke i stand til å legge til menyelement.";
@@ -592,203 +769,6 @@ App::$strings["Menu item deleted."] = "Menyelement slettet.";
 App::$strings["Menu item could not be deleted."] = "Menyelement kunne ikke bli slettet.";
 App::$strings["Edit Menu Element"] = "Endre menyelement";
 App::$strings["Link text"] = "Lenketekst";
-App::$strings["Name or caption"] = "Navn eller overskrift";
-App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\", \"Sykkelgruppa\"";
-App::$strings["Choose a short nickname"] = "Velg et kort kallenavn";
-App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Ditt kallenavn brukes til å lage en kanaladresse som er enkel å huske, for eksempel kallenavn%s";
-App::$strings["Channel role and privacy"] = "Kanalrolle og personvern";
-App::$strings["Select a channel role with your privacy requirements."] = "Velg en kanalrolle for ditt personvernbehov.";
-App::$strings["Read more about roles"] = "Les mer om roller";
-App::$strings["Create Channel"] = "Lag kanal";
-App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "En kanal er din identitet i dette nettverket. Den kan representere en person, en blogg eller et forum for å nevne noe. Kanaler kan ha forbindelser til andre kanaler for å dele informasjon, og med svært detaljerte tillatelser.";
-App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "eller <a href=\"import\">importer en eksisterende kanal</a> fra et annet sted.";
-App::$strings["Invalid request identifier."] = "Ugyldig forespørselsidentifikator.";
-App::$strings["Discard"] = "Forkast";
-App::$strings["Mark all system notifications seen"] = "Merk alle systemvarsler som sett";
-App::$strings["Page owner information could not be retrieved."] = "Informasjon om sideeier kunne ikke hentes.";
-App::$strings["Profile Photos"] = "Profilbilder";
-App::$strings["Album not found."] = "Albumet ble ikke funnet.";
-App::$strings["Delete Album"] = "Slett album";
-App::$strings["Multiple storage folders exist with this album name, but within different directories. Please remove the desired folder or folders using the Files manager"] = "";
-App::$strings["Delete Photo"] = "Slett bilde";
-App::$strings["No photos selected"] = "Ingen bilder valgt";
-App::$strings["Access to this item is restricted."] = "Tilgang til dette elementet er begrenset.";
-App::$strings["%1$.2f MB of %2$.2f MB photo storage used."] = "%1$.2f MB av %2$.2f MB lagringsplass til bilder er brukt.";
-App::$strings["%1$.2f MB photo storage used."] = "%1$.2f MB lagringsplass til bilder er brukt.";
-App::$strings["Upload Photos"] = "Last opp bilder";
-App::$strings["Enter an album name"] = "Skriv et albumnavn";
-App::$strings["or select an existing album (doubleclick)"] = "eller velg et eksisterende album (dobbeltklikk)";
-App::$strings["Create a status post for this upload"] = "Lag et statusinnlegg for denne opplastingen";
-App::$strings["Caption (optional):"] = "Bildetekst (valgfritt):";
-App::$strings["Description (optional):"] = "Beskrivelse (valgfritt):";
-App::$strings["Album name could not be decoded"] = "Albumnavnet kunne ikke dekodes";
-App::$strings["Contact Photos"] = "Kontaktbilder";
-App::$strings["Show Newest First"] = "Vis nyeste først";
-App::$strings["Show Oldest First"] = "Vis eldste først";
-App::$strings["View Photo"] = "Vis foto";
-App::$strings["Edit Album"] = "Endre album";
-App::$strings["Permission denied. Access to this item may be restricted."] = "Tillatelse avvist. Tilgang til dette elementet kan være begrenset.";
-App::$strings["Photo not available"] = "Bilde er utilgjengelig";
-App::$strings["Use as profile photo"] = "Bruk som profilbilde";
-App::$strings["Use as cover photo"] = "";
-App::$strings["Private Photo"] = "Privat bilde";
-App::$strings["View Full Size"] = "Vis i full størrelse";
-App::$strings["Remove"] = "Fjern";
-App::$strings["Edit photo"] = "Endre bilde";
-App::$strings["Rotate CW (right)"] = "Roter med klokka (mot høyre)";
-App::$strings["Rotate CCW (left)"] = "Roter mot klokka (venstre)";
-App::$strings["Enter a new album name"] = "Skriv et nytt albumnavn";
-App::$strings["or select an existing one (doubleclick)"] = "eller velg et eksisterende album (dobbeltklikk)";
-App::$strings["Caption"] = "Overskrift";
-App::$strings["Add a Tag"] = "Legg til merkelapp";
-App::$strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = "Eksempel: @bob, @Barbara_Jensen, @jim@example.com";
-App::$strings["Flag as adult in album view"] = "Flag som voksent i albumvisning";
-App::$strings["I like this (toggle)"] = "Jeg liker dette (skru av og på)";
-App::$strings["I don't like this (toggle)"] = "Jeg liker ikke dette (skru av og på)";
-App::$strings["Please wait"] = "Vennligst vent";
-App::$strings["This is you"] = "Dette er deg";
-App::$strings["Comment"] = "Kommentar";
-App::$strings["__ctx:title__ Likes"] = "Liker";
-App::$strings["__ctx:title__ Dislikes"] = "Liker ikke";
-App::$strings["__ctx:title__ Agree"] = "Enig";
-App::$strings["__ctx:title__ Disagree"] = "Uenig";
-App::$strings["__ctx:title__ Abstain"] = "Avstår";
-App::$strings["__ctx:title__ Attending"] = "Deltar";
-App::$strings["__ctx:title__ Not attending"] = "Deltar ikke";
-App::$strings["__ctx:title__ Might attend"] = "Deltar kanskje";
-App::$strings["View all"] = "Vis alle";
-App::$strings["__ctx:noun__ Like"] = array(
-	0 => "Liker",
-	1 => "Liker",
-);
-App::$strings["__ctx:noun__ Dislike"] = array(
-	0 => "Liker ikke",
-	1 => "Liker ikke",
-);
-App::$strings["Photo Tools"] = "";
-App::$strings["In This Photo:"] = "I dette bildet:";
-App::$strings["Map"] = "Kart";
-App::$strings["__ctx:noun__ Likes"] = "Liker";
-App::$strings["__ctx:noun__ Dislikes"] = "Liker ikke";
-App::$strings["Close"] = "Lukk";
-App::$strings["View Album"] = "Vis album";
-App::$strings["Recent Photos"] = "Nye bilder";
-App::$strings["sent you a private message"] = "sendte deg en privat melding";
-App::$strings["added your channel"] = "la til din kanal";
-App::$strings["g A l F d"] = "g A l F d";
-App::$strings["[today]"] = "[idag]";
-App::$strings["posted an event"] = "la ut en hendelse";
-App::$strings["Unable to find your hub."] = "Ikke i stand til å finne hubben din.";
-App::$strings["Post successful."] = "Innlegg vellykket.";
-App::$strings["OpenID protocol error. No ID returned."] = "OpenID protokollfeil. Ingen ID ble returnert.";
-App::$strings["Login failed."] = "Innlogging mislyktes.";
-App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-App::$strings["This setting requires special processing and editing has been blocked."] = "Denne innstillingen krever spesiell behandling og redigering har blitt blokkert.";
-App::$strings["Configuration Editor"] = "Konfigurasjonsbehandler";
-App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Advarsel: kanalen din kan slutte å virke ved endring av enkelte innstillinger. Vennligst forlat denne siden med mindre du er komfortabel med dette og vet hvordan du bruker denne funksjonen riktig.";
-App::$strings["Layout updated."] = "Layout er oppdatert.";
-App::$strings["Edit System Page Description"] = "Endre beskrivelsen av systemsiden";
-App::$strings["Layout not found."] = "Layouten ble ikke funnet.";
-App::$strings["Module Name:"] = "Modulnavn:";
-App::$strings["Layout Help"] = "Layout-hjelp";
-App::$strings["Poke"] = "Prikk";
-App::$strings["Poke somebody"] = "Dult noen";
-App::$strings["Poke/Prod"] = "Prikke/oppildne";
-App::$strings["Poke, prod or do other things to somebody"] = "Dult, prikk eller gjør andre ting med noen";
-App::$strings["Recipient"] = "Mottaker";
-App::$strings["Choose what you wish to do to recipient"] = "Velg hva du ønsker å gjøre med mottakeren";
-App::$strings["Make this post private"] = "Gjør dette innlegget privat";
-App::$strings["Fetching URL returns error: %1\$s"] = "Henting av URL gir følgende feil: %1\$s";
-App::$strings["Profile not found."] = "Profilen ble ikke funnet.";
-App::$strings["Profile deleted."] = "Profilen er slettet.";
-App::$strings["Profile-"] = "Profil-";
-App::$strings["New profile created."] = "Ny profil opprettet.";
-App::$strings["Profile unavailable to clone."] = "Profilen er utilgjengelig for klonen.";
-App::$strings["Profile unavailable to export."] = "Profilen er utilgjengelig for eksport.";
-App::$strings["Profile Name is required."] = "Profilnavn er påkrevd.";
-App::$strings["Marital Status"] = "Sivilstand";
-App::$strings["Romantic Partner"] = "Romantisk partner";
-App::$strings["Likes"] = "Liker";
-App::$strings["Dislikes"] = "Liker ikke";
-App::$strings["Work/Employment"] = "Arbeid/sysselsetting";
-App::$strings["Religion"] = "Religion";
-App::$strings["Political Views"] = "Politiske synspunkter";
-App::$strings["Sexual Preference"] = "Seksuelle preferanser";
-App::$strings["Homepage"] = "Hjemmeside";
-App::$strings["Interests"] = "Interesser";
-App::$strings["Profile updated."] = "Profilen er oppdatert.";
-App::$strings["Hide your connections list from viewers of this profile"] = "";
-App::$strings["Edit Profile Details"] = "Endre profildetaljer";
-App::$strings["View this profile"] = "Vis denne profilen";
-App::$strings["Edit visibility"] = "Endre synlighet";
-App::$strings["Profile Tools"] = "";
-App::$strings["Change cover photo"] = "";
-App::$strings["Change profile photo"] = "Endre profilbilde";
-App::$strings["Create a new profile using these settings"] = "Lag en ny profil ved å bruke disse innstillingene";
-App::$strings["Clone this profile"] = "Klon denne profilen";
-App::$strings["Delete this profile"] = "Slett denne profilen";
-App::$strings["Add profile things"] = "Legg til profilting";
-App::$strings["Personal"] = "Personlig";
-App::$strings["Relation"] = "";
-App::$strings["Miscellaneous"] = "Forskjellig";
-App::$strings["Import profile from file"] = "Importer profil fra fil";
-App::$strings["Export profile to file"] = "Eksporter profil til fil";
-App::$strings["Your gender"] = "";
-App::$strings["Marital status"] = "";
-App::$strings["Sexual preference"] = "";
-App::$strings["Profile name"] = "";
-App::$strings["This is your default profile."] = "Dette er din standardprofil.";
-App::$strings["Your full name"] = "";
-App::$strings["Title/Description"] = "";
-App::$strings["Street address"] = "";
-App::$strings["Locality/City"] = "";
-App::$strings["Region/State"] = "";
-App::$strings["Postal/Zip code"] = "";
-App::$strings["Country"] = "";
-App::$strings["Who (if applicable)"] = "";
-App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Eksempler: kari123, Kari Villiamsen, kari@example.com";
-App::$strings["Since (date)"] = "";
-App::$strings["Tell us about yourself"] = "";
-App::$strings["Hometown"] = "";
-App::$strings["Political views"] = "";
-App::$strings["Religious views"] = "";
-App::$strings["Keywords used in directory listings"] = "";
-App::$strings["Example: fishing photography software"] = "Eksempel: fisking fotografering programvare";
-App::$strings["Musical interests"] = "Musikkinteresser";
-App::$strings["Books, literature"] = "Bøker, litteratur";
-App::$strings["Television"] = "TV/fjernsyn";
-App::$strings["Film/Dance/Culture/Entertainment"] = "";
-App::$strings["Hobbies/Interests"] = "Hobbier/Interesser";
-App::$strings["Love/Romance"] = "";
-App::$strings["School/Education"] = "";
-App::$strings["Contact information and social networks"] = "";
-App::$strings["My other channels"] = "Mine andre kanaler";
-App::$strings["Profile Image"] = "Profilbilde";
-App::$strings["Edit Profiles"] = "Endre profiler";
-App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens mellomlager hvis det nye bildet ikke vises umiddelbart.";
-App::$strings["Upload Profile Photo"] = "Last opp profilbilde:";
-App::$strings["Invalid profile identifier."] = "Ugyldig profil-identifikator.";
-App::$strings["Profile Visibility Editor"] = "Endre profilsynlighet";
-App::$strings["Profile"] = "Profil";
-App::$strings["Click on a contact to add or remove."] = "Klikk på en kontakt for å legge til eller fjerne.";
-App::$strings["Visible To"] = "Synlig for";
-App::$strings["Public Hubs"] = "Offentlige huber";
-App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Nettstedene på listen tillater offentlig registrering i \$Projectname-nettverket. Alle nettsteder i nettverket er forbundet så medlemskap på enhver av dem formidler medlemskap i nettverket som helhet. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Nettstedene selv <strong>kan</strong> gi tilleggsopplysninger.";
-App::$strings["Hub URL"] = "Nettstedets URL";
-App::$strings["Access Type"] = "Tilgangstype";
-App::$strings["Registration Policy"] = "Retningslinjer for registrering";
-App::$strings["Stats"] = "";
-App::$strings["Software"] = "";
-App::$strings["Ratings"] = "Vurderinger";
-App::$strings["Rate"] = "Vurder";
-App::$strings["Website:"] = "Nettsted:";
-App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Fjerntliggende kanal [%s] (foreløpig ikke kjent på dette nettstedet)";
-App::$strings["Rating (this information is public)"] = "Vurdering (denne informasjonen er offentlig)";
-App::$strings["Optionally explain your rating (this information is public)"] = "Velg om du vil forklare din vurdering (denne informasjonen er offentlig)";
-App::$strings["No ratings"] = "Ingen vurderinger";
-App::$strings["Rating: "] = "Vurdering:";
-App::$strings["Website: "] = "Nettsted:";
-App::$strings["Description: "] = "Beskrivelse:";
 App::$strings["Theme settings updated."] = "Temainnstillinger er oppdatert.";
 App::$strings["# Accounts"] = "# Kontoer";
 App::$strings["# blocked accounts"] = "# blokkerte kontoer";
@@ -798,7 +778,7 @@ App::$strings["# Channels"] = "# Kanaler";
 App::$strings["# primary"] = "# hoved";
 App::$strings["# clones"] = "# kloner";
 App::$strings["Message queues"] = "Meldingskøer";
-App::$strings["Your software should be updated"] = "";
+App::$strings["Your software should be updated"] = "Programvaren din bør oppdateres";
 App::$strings["Administration"] = "Administrasjon";
 App::$strings["Summary"] = "Sammendrag";
 App::$strings["Registered accounts"] = "Registrerte kontoer";
@@ -806,8 +786,8 @@ App::$strings["Pending registrations"] = "Ventende registreringer";
 App::$strings["Registered channels"] = "Registrerte kanaler";
 App::$strings["Active plugins"] = "Aktive tilleggsfunksjoner";
 App::$strings["Version"] = "Versjon";
-App::$strings["Repository version (master)"] = "";
-App::$strings["Repository version (dev)"] = "";
+App::$strings["Repository version (master)"] = "Depotversjon (master)";
+App::$strings["Repository version (dev)"] = "Depotversjon (dev)";
 App::$strings["Site settings updated."] = "Nettstedsinnstillinger er oppdatert.";
 App::$strings["Default"] = "Standard";
 App::$strings["mobile"] = "mobil";
@@ -860,10 +840,10 @@ App::$strings["Force publish"] = "Tving publisering";
 App::$strings["Check to force all profiles on this site to be listed in the site directory."] = "Kryss av for å tvinge alle profiler på dette nettstedet til å bli oppført i nettstedet sin katalog.";
 App::$strings["Import Public Streams"] = "Importer offentlige innholdsstrømmer";
 App::$strings["Import and allow access to public content pulled from other sites. Warning: this content is unmoderated."] = "Importer og gi tilgang til offentlig innhold trukket inn fra andre nettsteder. Advarsel: dette innholdet er ikke moderert.";
-App::$strings["Login on Homepage"] = "";
+App::$strings["Login on Homepage"] = "Logg inn på hjemmesiden";
 App::$strings["Present a login box to visitors on the home page if no other content has been configured."] = "Presenter en innloggingsboks til besøkende på hjemmesiden hvis ikke noe annet innhold har blitt konfigurert.";
-App::$strings["Enable context help"] = "";
-App::$strings["Display contextual help for the current page when the help button is pressed."] = "";
+App::$strings["Enable context help"] = "Skru på kontekstsensitiv hjelp";
+App::$strings["Display contextual help for the current page when the help button is pressed."] = "Vis hjelp for den gjeldende siden når Hjelp-knappen trykkes.";
 App::$strings["Directory Server URL"] = "Katalogtjener URL";
 App::$strings["Default directory server"] = "Standard katalogtjener";
 App::$strings["Proxy user"] = "Brukernavn mellomtjener";
@@ -889,24 +869,24 @@ App::$strings["ID"] = "ID";
 App::$strings["for channel"] = "for kanalen";
 App::$strings["on server"] = "på tjener";
 App::$strings["Server"] = "Tjener";
-App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "";
-App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "";
-App::$strings["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."] = "";
+App::$strings["By default, unfiltered HTML is allowed in embedded media. This is inherently insecure."] = "Standardinnstillingen er at ufiltrert HTML er tillat ved innebygging av media. Dette er grunnleggende usikkert.";
+App::$strings["The recommended setting is to only allow unfiltered HTML from the following sites:"] = "Anbefalt innstilling er å bare tillate ufiltrert HTML fra følgende nettsteder:";
+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."] = "Alt annet innebygget innhold vil bli filtrert, <strong>med mindre</strong> innebygget innhold fra det nettstedet er eksplisitt blokkert.";
 App::$strings["Security"] = "Sikkerhet";
 App::$strings["Block public"] = "Blokker offentlig tilgang";
 App::$strings["Check to block public access to all otherwise public personal pages on this site unless you are currently authenticated."] = "Kryss av for å blokkere tilgang til alle personlige sider som ellers ville vært offentlig tilgjengelige på dette nettstedet med mindre du er logget inn.";
-App::$strings["Set \"Transport Security\" HTTP header"] = "";
-App::$strings["Set \"Content Security Policy\" HTTP header"] = "";
+App::$strings["Set \"Transport Security\" HTTP header"] = "Sett HTTP header \"Transport Security\"";
+App::$strings["Set \"Content Security Policy\" HTTP header"] = "Sett HTTP header \"Content Security Policy\"";
 App::$strings["Allow communications only from these sites"] = "Tillat kommunikasjon med bare disse nettstedene";
 App::$strings["One site per line. Leave empty to allow communication from anywhere by default"] = "Et nettsted per linje. La det stå tomt for å tillate kommunikasjon med ethvert nettsted som standard";
 App::$strings["Block communications from these sites"] = "Blokker kommunikasjon fra disse nettstedene";
 App::$strings["Allow communications only from these channels"] = "Tillat kommunikasjon med bare disse kanalene";
 App::$strings["One channel (hash) per line. Leave empty to allow from any channel by default"] = "En kanal (hash) per linje. La det stå tomt for å tillate enhver kanal som standard";
 App::$strings["Block communications from these channels"] = "Blokker kommunikasjon fra disse kanalene";
-App::$strings["Only allow embeds from secure (SSL) websites and links."] = "";
-App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "";
-App::$strings["One site per line. By default embedded content is filtered."] = "";
+App::$strings["Only allow embeds from secure (SSL) websites and links."] = "Bare tillat innebygging fra sikrede (SSL) nettsteder og lenker.";
+App::$strings["Allow unfiltered embedded HTML content only from these domains"] = "Tillat ufiltrert innebygging av HTML-innhold bare fra disse domenene";
+App::$strings["One site per line. By default embedded content is filtered."] = "Et nettsted per linje. Det er standard at innebygget innhold er filtrert.";
 App::$strings["Block embedded HTML from these domains"] = "Blokker innbygget HTML fra disse domenene";
 App::$strings["Update has been marked successful"] = "Oppdateringen har blitt merket som en suksess";
 App::$strings["Executing %s failed. Check system logs."] = "Utføring av %s feilet. Sjekk systemlogger.";
@@ -938,7 +918,7 @@ App::$strings["Account '%s' blocked"] = "Kontoen '%s' blokkert";
 App::$strings["Account '%s' unblocked"] = "Kontoen '%s' er ikke blokkert lenger";
 App::$strings["Accounts"] = "Kontoer";
 App::$strings["select all"] = "velg alle";
-App::$strings["Registrations waiting for confirm"] = "";
+App::$strings["Registrations waiting for confirm"] = "Registreringer venter på bekreftelse";
 App::$strings["Request date"] = "Dato for forespørsel";
 App::$strings["No registrations."] = "Ingen registreringer.";
 App::$strings["Deny"] = "Avslå";
@@ -990,18 +970,18 @@ App::$strings["Maximum project version: "] = "Maksimum prosjektversjon:";
 App::$strings["Minimum PHP version: "] = "Minimum PHP-versjon:";
 App::$strings["Requires: "] = "Krever:";
 App::$strings["Disabled - version incompatibility"] = "Skrudd av - versjonsinkompatibilitet";
-App::$strings["Enter the public git repository URL of the plugin repo."] = "";
-App::$strings["Plugin repo git URL"] = "";
-App::$strings["Custom repo name"] = "";
-App::$strings["(optional)"] = "";
-App::$strings["Download Plugin Repo"] = "";
-App::$strings["Install new repo"] = "";
+App::$strings["Enter the public git repository URL of the plugin repo."] = "Skriv inn URL-en til det offentlige git-depoet til tillegget.";
+App::$strings["Plugin repo git URL"] = "Git-URL-en til tillegget";
+App::$strings["Custom repo name"] = "Tilpasset depotnavn";
+App::$strings["(optional)"] = "(valgfritt)";
+App::$strings["Download Plugin Repo"] = "Last ned depotet til tillegget";
+App::$strings["Install new repo"] = "Installer nytt depot";
 App::$strings["Install"] = "Installer";
-App::$strings["Manage Repos"] = "";
-App::$strings["Installed Plugin Repositories"] = "";
-App::$strings["Install a New Plugin Repository"] = "";
+App::$strings["Manage Repos"] = "Håndter depoter";
+App::$strings["Installed Plugin Repositories"] = "Installerede tilleggsdepoter";
+App::$strings["Install a New Plugin Repository"] = "Installer et nytt tillleggsdepot";
 App::$strings["Update"] = "Oppdater";
-App::$strings["Switch branch"] = "";
+App::$strings["Switch branch"] = "Bytt gren";
 App::$strings["No themes found."] = "Ingen temaer er funnet.";
 App::$strings["Screenshot"] = "Skjermbilde";
 App::$strings["Themes"] = "Temaer";
@@ -1012,7 +992,7 @@ App::$strings["Logs"] = "Logger";
 App::$strings["Clear"] = "Tøm";
 App::$strings["Debugging"] = "Feilsøking";
 App::$strings["Log file"] = "Loggfil";
-App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "";
+App::$strings["Must be writable by web server. Relative to your top-level webserver directory."] = "Må kunne skrives til av webtjenesten. Relativ til din toppnivåkatalog på webtjeneren.";
 App::$strings["Log level"] = "Loggnivå";
 App::$strings["New Profile Field"] = "Nytt profilfelt";
 App::$strings["Field nickname"] = "Feltets kallenavn";
@@ -1024,26 +1004,98 @@ App::$strings["Help text"] = "Hjelpetekst";
 App::$strings["Additional info (optional)"] = "Tilleggsinformasjon (valgfritt)";
 App::$strings["Field definition not found"] = "Feltdefinisjonen ble ikke funnet";
 App::$strings["Edit Profile Field"] = "Endre profilfelt";
-App::$strings["Profile Fields"] = "";
-App::$strings["Basic Profile Fields"] = "";
-App::$strings["Advanced Profile Fields"] = "";
-App::$strings["(In addition to basic fields)"] = "";
-App::$strings["All available fields"] = "";
-App::$strings["Custom Fields"] = "";
-App::$strings["Create Custom Field"] = "";
-App::$strings["App installed."] = "App installert.";
-App::$strings["Malformed app."] = "Feil oppsett for app-en.";
-App::$strings["Embed code"] = "Innbyggingskode";
-App::$strings["Edit App"] = "Endre app";
-App::$strings["Create App"] = "Lag app";
-App::$strings["Name of app"] = "Navn på app";
-App::$strings["Location (URL) of app"] = "Plassering (URL) til app";
-App::$strings["Photo icon URL"] = "Bildeikon URL";
-App::$strings["80 x 80 pixels - optional"] = "80 x80 pixler - valgfritt";
-App::$strings["Categories (optional, comma separated list)"] = "";
-App::$strings["Version ID"] = "Versjons-ID";
-App::$strings["Price of app"] = "Pris på app";
-App::$strings["Location (URL) to purchase app"] = "Plassering (URL) for å kjøpe app";
+App::$strings["Profile Fields"] = "Profilfelter";
+App::$strings["Basic Profile Fields"] = "Grunnleggende profilfelter";
+App::$strings["Advanced Profile Fields"] = "Avanserte profilfelter";
+App::$strings["(In addition to basic fields)"] = "(i tillegg til grunnleggende felter)";
+App::$strings["All available fields"] = "Alle tilgjengelige felter";
+App::$strings["Custom Fields"] = "Tilpassede felter";
+App::$strings["Create Custom Field"] = "Lag tilpasset felt";
+App::$strings["Name or caption"] = "Navn eller overskrift";
+App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Eksempel: \"Ola Nordmann\", \"Lisa og hestene hennes\", \"Fotball\", \"Sykkelgruppa\"";
+App::$strings["Choose a short nickname"] = "Velg et kort kallenavn";
+App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Ditt kallenavn brukes til å lage en kanaladresse som er enkel å huske, for eksempel kallenavn%s";
+App::$strings["Channel role and privacy"] = "Kanalrolle og personvern";
+App::$strings["Select a channel role with your privacy requirements."] = "Velg en kanalrolle for ditt personvernbehov.";
+App::$strings["Read more about roles"] = "Les mer om roller";
+App::$strings["Create Channel"] = "Lag kanal";
+App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "En kanal er din identitet i dette nettverket. Den kan representere en person, en blogg eller et forum for å nevne noe. Kanaler kan ha forbindelser til andre kanaler for å dele informasjon, og med svært detaljerte tillatelser.";
+App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "eller <a href=\"import\">importer en eksisterende kanal</a> fra et annet sted.";
+App::$strings["sent you a private message"] = "sendte deg en privat melding";
+App::$strings["added your channel"] = "la til din kanal";
+App::$strings["g A l F d"] = "g A l F d";
+App::$strings["[today]"] = "[idag]";
+App::$strings["posted an event"] = "la ut en hendelse";
+App::$strings["Invalid request identifier."] = "Ugyldig forespørselsidentifikator.";
+App::$strings["Discard"] = "Forkast";
+App::$strings["Mark all system notifications seen"] = "Merk alle systemvarsler som sett";
+App::$strings["Poke"] = "Prikk";
+App::$strings["Poke somebody"] = "Dult noen";
+App::$strings["Poke/Prod"] = "Prikke/oppildne";
+App::$strings["Poke, prod or do other things to somebody"] = "Dult, prikk eller gjør andre ting med noen";
+App::$strings["Recipient"] = "Mottaker";
+App::$strings["Choose what you wish to do to recipient"] = "Velg hva du ønsker å gjøre med mottakeren";
+App::$strings["Make this post private"] = "Gjør dette innlegget privat";
+App::$strings["Unable to find your hub."] = "Ikke i stand til å finne hubben din.";
+App::$strings["Post successful."] = "Innlegg vellykket.";
+App::$strings["OpenID protocol error. No ID returned."] = "OpenID protokollfeil. Ingen ID ble returnert.";
+App::$strings["Login failed."] = "Innlogging mislyktes.";
+App::$strings["Invalid profile identifier."] = "Ugyldig profil-identifikator.";
+App::$strings["Profile Visibility Editor"] = "Endre profilsynlighet";
+App::$strings["Profile"] = "Profil";
+App::$strings["Click on a contact to add or remove."] = "Klikk på en kontakt for å legge til eller fjerne.";
+App::$strings["Visible To"] = "Synlig for";
+App::$strings["This setting requires special processing and editing has been blocked."] = "Denne innstillingen krever spesiell behandling og redigering har blitt blokkert.";
+App::$strings["Configuration Editor"] = "Konfigurasjonsbehandler";
+App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Advarsel: kanalen din kan slutte å virke ved endring av enkelte innstillinger. Vennligst forlat denne siden med mindre du er komfortabel med dette og vet hvordan du bruker denne funksjonen riktig.";
+App::$strings["Fetching URL returns error: %1\$s"] = "Henting av URL gir følgende feil: %1\$s";
+App::$strings["Version %s"] = "Versjon %s";
+App::$strings["Installed plugins/addons/apps:"] = "Installerte tilleggsfunksjoner/tillegg/apper:";
+App::$strings["No installed plugins/addons/apps"] = "Ingen installerte tilleggsfunksjoner/tillegg/apper";
+App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Dette er en \$Projectname-hub - et globalt samhandlende nettverk av desentraliserte nettsteder med innbygget personvern.";
+App::$strings["Tag: "] = "Merkelapp:";
+App::$strings["Last background fetch: "] = "Siste innhenting i bakgrunnen:";
+App::$strings["Current load average: "] = "Gjeldende belastningsgjennomsnitt:";
+App::$strings["Running at web location"] = "Kjører på webplasseringen";
+App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Vennligst besøk <a href=\"http://hubzilla.org\">hubzilla.org</a> for å lære mer om \$Projectname.";
+App::$strings["Bug reports and issues: please visit"] = "Feilmeldinger og feilretting: vennligst besøk";
+App::$strings["\$projectname issues"] = "\$projectname problemer";
+App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Forslag, ros og så videre - vennligst e-post \"redmatrix\" hos librelist - punktum com";
+App::$strings["Site Administrators"] = "Nettstedsadministratorer";
+App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Vi støtte på et problem under innloggingen med din OpenID. Vennligst sjekk at ID-en er stavet riktig.";
+App::$strings["The error message was:"] = "Feilmeldingen var:";
+App::$strings["Authentication failed."] = "Autentisering mislyktes.";
+App::$strings["Remote Authentication"] = "Fjernautentisering";
+App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Skriv din kanaladresse (for eksempel channel@exampel.com)";
+App::$strings["Authenticate"] = "Autentiser";
+App::$strings["Public Hubs"] = "Offentlige huber";
+App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Nettstedene på listen tillater offentlig registrering i \$Projectname-nettverket. Alle nettsteder i nettverket er forbundet så medlemskap på enhver av dem formidler medlemskap i nettverket som helhet. Noen nettsteder kan kreve abonnement eller tilby lagdelte tjenesteavtaler. Nettstedene selv <strong>kan</strong> gi tilleggsopplysninger.";
+App::$strings["Hub URL"] = "Nettstedets URL";
+App::$strings["Access Type"] = "Tilgangstype";
+App::$strings["Registration Policy"] = "Retningslinjer for registrering";
+App::$strings["Stats"] = "Statistikk";
+App::$strings["Software"] = "Programvare";
+App::$strings["Ratings"] = "Vurderinger";
+App::$strings["Rate"] = "Vurder";
+App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Hold nede Shift-knappen og last siden på nytt eller tøm nettleserens mellomlager hvis det nye bildet ikke vises umiddelbart.";
+App::$strings["Upload Profile Photo"] = "Last opp profilbilde:";
+App::$strings["Block Name"] = "Byggeklossens navn";
+App::$strings["Blocks"] = "Byggeklosser";
+App::$strings["Block Title"] = "Byggeklossens tittel";
+App::$strings["Website:"] = "Nettsted:";
+App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Fjerntliggende kanal [%s] (foreløpig ikke kjent på dette nettstedet)";
+App::$strings["Rating (this information is public)"] = "Vurdering (denne informasjonen er offentlig)";
+App::$strings["Optionally explain your rating (this information is public)"] = "Velg om du vil forklare din vurdering (denne informasjonen er offentlig)";
+App::$strings["No ratings"] = "Ingen vurderinger";
+App::$strings["Rating: "] = "Vurdering:";
+App::$strings["Website: "] = "Nettsted:";
+App::$strings["Description: "] = "Beskrivelse:";
+App::$strings["Apps"] = "Apper";
+App::$strings["Title (optional)"] = "Tittel (valgfri)";
+App::$strings["Edit Block"] = "Endre byggekloss";
+App::$strings["No channel."] = "Ingen kanal.";
+App::$strings["Common connections"] = "Felles forbindelser";
+App::$strings["No connections in common."] = "Ingen forbindelser felles.";
 App::$strings["Select a bookmark folder"] = "Velg en bokmerkemappe";
 App::$strings["Save Bookmark"] = "Lagre bokmerke";
 App::$strings["URL of bookmark"] = "URL-en til bokmerket";
@@ -1069,7 +1121,7 @@ App::$strings["no"] = "nei";
 App::$strings["yes"] = "ja";
 App::$strings["Membership on this site is by invitation only."] = "Medlemskap ved dette nettstedet skjer kun via invitasjon.";
 App::$strings["Register"] = "Registrer";
-App::$strings["Proceed to create your first channel"] = "Gå videre for å lage din første kanal";
+App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "";
 App::$strings["Please login."] = "Vennligst logg inn.";
 App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Sletting av kontoer er ikke tillatt innen 48 timer etter endring av kontopassordet.";
 App::$strings["Remove This Account"] = "Slett denne kontoen";
@@ -1086,17 +1138,23 @@ App::$strings["This channel will be completely removed from the network. "] = "D
 App::$strings["Remove this channel and all its clones from the network"] = "Fjern denne kanalen og alle dens kloner fra nettverket";
 App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Som standard vil bare forekomsten av denne kanalen lokalisert på denne hubben bli fjernet fra nettverket";
 App::$strings["Remove Channel"] = "Fjern kanal";
-App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Vi støtte på et problem under innloggingen med din OpenID. Vennligst sjekk at ID-en er stavet riktig.";
-App::$strings["The error message was:"] = "Feilmeldingen var:";
-App::$strings["Authentication failed."] = "Autentisering mislyktes.";
-App::$strings["Remote Authentication"] = "Fjernautentisering";
-App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Skriv din kanaladresse (for eksempel channel@exampel.com)";
-App::$strings["Authenticate"] = "Autentiser";
+App::$strings["Export Channel"] = "Eksporter kanal";
+App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Eksporter grunnleggende informasjon om kanalen din til en fil. Denne er en sikkerhetskopi av dine forbindelser, tillatelser, profil og grunnleggende data, som kan brukes til å importere dine data til en ny hub, men den tar ikke med innholdet.";
+App::$strings["Export Content"] = "Eksporter innhold";
+App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Eksporter din kanalinformasjon og det nyeste innholdet til en JSON-sikkerhetskopi, som kan gjenopprettes eller importeres til en annen hub. Denne lager en sikkerhetskopi av alle dine forbindelser, tillatelser, profildata og flere måneder av innholdet ditt. Denne filen kan være SVÆRT stor. Vennligst vær tålmodig - det kan ta flere minutter før denne nedlastningen begynner.";
+App::$strings["Export your posts from a given year."] = "Eksporter dine innlegg fra et bestemt år";
+App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Du kan også eksportere dine innlegg og samtaler for et bestemt år eller måned. Juster datoen i din nettlesers adresselinje for å velge andre datoer. Hvis eksporten feiler (muligens på grunn av utilstrekkelig minne på din hub), vennligst prøv igjen med et mer begrenset datoområde.";
+App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "For å velge alle innlegg for et gitt år, slik som iår, besøk <a href=\"%1\$s\">%2\$s</a>";
+App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "For å velge alle innlegg fra en gitt måned, slik som januar i år, besøk <a href=\"%1\$s\">%2\$s</a>";
+App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Disse innholdsfilene kan importeres eller gjenopprettes ved å besøke <a href=\"%1\$s\">%2\$s</a> på ethvert nettsted som inneholder din kanal. For best resultat, vennligst importer eller gjenopprett disse etter dato (eldste først).";
 App::$strings["Items tagged with: %s"] = "Elementer merket med: %s";
 App::$strings["Search results for: %s"] = "Søkeresultater for: %s";
 App::$strings["No service class restrictions found."] = "Ingen restriksjoner er funnet i tjenesteklasse.";
 App::$strings["Name is required"] = "Navn er påkrevd";
 App::$strings["Key and Secret are required"] = "Nøkkel og hemmelighet er påkrevd";
+App::$strings["This channel is limited to %d tokens"] = "";
+App::$strings["Name and Password are required."] = "";
+App::$strings["Token saved."] = "";
 App::$strings["Not valid email."] = "Ikke gyldig e-post.";
 App::$strings["Protected email address. Cannot change to that email."] = "Beskyttet e-postadresse. Kan ikke endre til den e-postadressen.";
 App::$strings["System failure storing new email. Please try again."] = "Systemfeil ved lagring av ny e-post. Vennligst prøv igjen.";
@@ -1129,6 +1187,12 @@ App::$strings["Confirm New Password"] = "Bekreft nytt passord";
 App::$strings["Leave password fields blank unless changing"] = "La passordfeltene stå blanke om det ikke skal endres";
 App::$strings["Email Address:"] = "E-postadresse:";
 App::$strings["Remove this account including all its channels"] = "Slett denne kontoen inkludert alle dens kanaler";
+App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content."] = "";
+App::$strings["You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "";
+App::$strings["Guest Access Tokens"] = "";
+App::$strings["Login Name"] = "";
+App::$strings["Login Password"] = "";
+App::$strings["Expires (yyyy-mm-dd)"] = "";
 App::$strings["Additional Features"] = "Ekstra funksjoner";
 App::$strings["Connector Settings"] = "Koblingsinnstillinger";
 App::$strings["No special theme for mobile devices"] = "Ikke noe spesielt tema for mobile enheter";
@@ -1188,14 +1252,14 @@ App::$strings["Allow others to tag your posts"] = "Tillat andre å merke dine in
 App::$strings["Often used by the community to retro-actively flag inappropriate content"] = "Ofte brukt av fellesskapet for å merke upassende innhold i etterkant";
 App::$strings["Advanced Privacy Settings"] = "Avanserte personverninnstillinger";
 App::$strings["Expire other channel content after this many days"] = "Annet kanal innhold utløper etter så mange dager";
-App::$strings["0 or blank to use the website limit."] = "";
-App::$strings["This website expires after %d days."] = "";
-App::$strings["This website does not expire imported content."] = "";
-App::$strings["The website limit takes precedence if lower than your limit."] = "";
+App::$strings["0 or blank to use the website limit."] = "0 eller ikke noe for å bruke nettstedets grense.";
+App::$strings["This website expires after %d days."] = "Dette nettstedet utgår etter %d dager.";
+App::$strings["This website does not expire imported content."] = "Dette nettstedet lar ikke importert innhold utgå.";
+App::$strings["The website limit takes precedence if lower than your limit."] = "Nettstedets grense bestemmer hvis lavere enn din grense.";
 App::$strings["Maximum Friend Requests/Day:"] = "Maksimalt antall venneforespørsler per dag:";
 App::$strings["May reduce spam activity"] = "Kan redusere søppelpostaktivitet";
-App::$strings["Default Post and Publish Permissions"] = "";
-App::$strings["Use my default audience setting for the type of object published"] = "";
+App::$strings["Default Post and Publish Permissions"] = "Standard innleggs- og publiseringstillatelser";
+App::$strings["Use my default audience setting for the type of object published"] = "Bruk min standard målgruppeinnstilling for objekttypen som publiseres";
 App::$strings["Channel permissions category:"] = "Kategori med kanaltillatelser:";
 App::$strings["Maximum private messages per day from unknown people:"] = "Maksimalt antall private meldinger per dag fra ukjente personer:";
 App::$strings["Useful to reduce spamming"] = "Nyttig for å redusere søppelpost";
@@ -1270,8 +1334,8 @@ App::$strings["Please select a default timezone for your website"] = "Vennligst
 App::$strings["Site settings"] = "Nettstedets innstillinger";
 App::$strings["Enable \$Projectname <strong>advanced</strong> features?"] = "Skru på <strong>avanserte</strong egenskaper i \$Projectname ?";
 App::$strings["Some advanced features, while useful - may be best suited for technically proficient audiences"] = "Noen avanserte egenskaper, som - selv om de er nyttige - kanskje passer bedre for et teknisk kyndig publikum. ";
-App::$strings["PHP version 5.5 or greater is required."] = "";
-App::$strings["PHP version"] = "";
+App::$strings["PHP version 5.5 or greater is required."] = "PHP-versjon 5.5 eller høyere er påkrevet.";
+App::$strings["PHP version"] = "PHP-versjon";
 App::$strings["Could not find a command line version of PHP in the web server PATH."] = "Fant ikke en kommandolinjeversjon av PHP i webtjenerens sti (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."] = "Hvis du ikke har en kommandolinjeversjon av PHP installert på tjeneren, så vil du ikke kunne kjøre bakgrunnshenting via cron.";
 App::$strings["PHP executable path"] = "PHP-kjørefilens sti";
@@ -1291,7 +1355,6 @@ App::$strings["GD graphics PHP module"] = "GD graphics PHP-modul";
 App::$strings["OpenSSL PHP module"] = "OpenSSL PHP-modul";
 App::$strings["mysqli or postgres PHP module"] = "MySQLi eller Postgres PHP modul";
 App::$strings["mb_string PHP module"] = "mb_string PHP-modul";
-App::$strings["mcrypt PHP module"] = "mcrypt PHP-modul";
 App::$strings["xml PHP module"] = "XML PHP modul";
 App::$strings["Apache mod_rewrite module"] = "Apache mod_rewrite-modul";
 App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Feil: Apache web-tjenerens mod-rewrite-modul er påkrevd, men ikke installert.";
@@ -1302,7 +1365,6 @@ App::$strings["Error: GD graphics PHP module with JPEG support required but not
 App::$strings["Error: openssl PHP module required but not installed."] = "Feil: openssl PHP-modul er påkrevd, men er ikke installert.";
 App::$strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Feil: mysqli eller postgres PHP modul er påkrevd, men ingen av dem er installert.";
 App::$strings["Error: mb_string PHP module required but not installed."] = "Feil: mb_string PHP-modul er påkrevd, men  er ikke installert.";
-App::$strings["Error: mcrypt PHP module required but not installed."] = "Feil: mcrypt PHP-modul er påkrevd, men er ikke installert.";
 App::$strings["Error: xml PHP module required for DAV but not installed."] = "Feil: XML PHP modul er påkrevet for DAV, men den er ikke installert.";
 App::$strings["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."] = "Web-installasjonen må kunne lage en fil kalt \".htconfig.php\" i toppkatalogen til web-tjeneren din, men dette får den ikke til.";
 App::$strings["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."] = "Dette er oftest tillatelsesinnstilling, ettersom webtjeneren kanskje kan skrive til filer i din mappe - selv om du kan.";
@@ -1310,11 +1372,11 @@ App::$strings["At the end of this procedure, we will give you a text to save in
 App::$strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"install/INSTALL.txt\" for instructions."] = "Alternativt, så kan du hoppe over denne prosedyren og gjennomføre en manuell installasjon. Vennligst se filen \"install/INSTALL.txt\" for instruksjoner.";
 App::$strings[".htconfig.php is writable"] = ".htconfig.php kan skrives til";
 App::$strings["Red uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering."] = "Red bruker malmotoren Smarty3 for å gjengi sine webvisninger. Smarty3 kompilerer malene om til PHP for å framskynde gjengivelsen.";
-App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "";
+App::$strings["In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."] = "For å kunne lagre disse kompilerte malene, så må webtjeneren ha skrivetilgang til katalogen %s under hovedmappen.";
 App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Vennligst sikre at brukeren som din web-tjeneste kjører som (for eksempel www-data) har skrivetilgang til denne katalogen.";
 App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Merknad: som et sikkerhetstiltak bør du bare gi webtjerenn skrivetilgang til %s - ikke til malfilene (.tpl) som den inneholder.";
 App::$strings["%s is writable"] = "%s kan skrives til";
-App::$strings["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"] = "Red bruker lagringsmappen for å lagre opplastede filer. Webtjeneren trenger å ha skrivetilgang til lagringsmappen under Red sin toppnivåmappe.";
+App::$strings["This software 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"] = "";
 App::$strings["store is writable"] = "lageret kan skrives til";
 App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL-sertifikatet kan ikke kontrolleres. Fiks sertifikatet eller skru av https tilgang til dette nettstedet.";
 App::$strings["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!"] = "Hvis du har HTTPS-tilgang til ditt nettsted eller tillater forbindelser til TCP port 443 (HTTPS-porten), så MÅ du bruke nettlesergodkjent sertifkater. Du MÅ IKKE bruke egensignert sertifikater!";
@@ -1322,6 +1384,7 @@ App::$strings["This restriction is incorporated because public posts from you ma
 App::$strings["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."] = "Hvis sertifikatet ditt ikke gjenkjennes, så vil medlemmer på andre nettsteder (som selv kan ha godkjente sertifikater) få en beskjed med en advarsel på deres eget nettsted som klager over sikkerhetsproblemer.";
 App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "Dette kan gi problemer med brukervennlighet (ikke bare på ditt eget nettsted), så vi må insistere på dette kravet.";
 App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Det finnes tilbydere som utsteder gratis sertifikater som er gyldige i nettlesere.";
+App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "";
 App::$strings["SSL certificate validation"] = "SSL sertifikat-kontroll";
 App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "URL omskriving (rewrite) i .htaccess virker ikke. Sjekk konfigurasjonen til tjeneren din. Test:";
 App::$strings["Url rewrite is working"] = "URL rewrite virker";
@@ -1333,19 +1396,20 @@ App::$strings["Files: shared with me"] = "Filer: delt med meg";
 App::$strings["NEW"] = "NY";
 App::$strings["Remove all files"] = "Fjern alle filer";
 App::$strings["Remove this file"] = "Fjern denne filen";
-App::$strings["Version %s"] = "Versjon %s";
-App::$strings["Installed plugins/addons/apps:"] = "Installerte tilleggsfunksjoner/tillegg/apper:";
-App::$strings["No installed plugins/addons/apps"] = "Ingen installerte tilleggsfunksjoner/tillegg/apper";
-App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Dette er en \$Projectname-hub - et globalt samhandlende nettverk av desentraliserte nettsteder med innbygget personvern.";
-App::$strings["Tag: "] = "Merkelapp:";
-App::$strings["Last background fetch: "] = "Siste innhenting i bakgrunnen:";
-App::$strings["Current load average: "] = "Gjeldende belastningsgjennomsnitt:";
-App::$strings["Running at web location"] = "Kjører på webplasseringen";
-App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Vennligst besøk <a href=\"http://hubzilla.org\">hubzilla.org</a> for å lære mer om \$Projectname.";
-App::$strings["Bug reports and issues: please visit"] = "Feilmeldinger og feilretting: vennligst besøk";
-App::$strings["\$projectname issues"] = "\$projectname problemer";
-App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Forslag, ros og så videre - vennligst e-post \"redmatrix\" hos librelist - punktum com";
-App::$strings["Site Administrators"] = "Nettstedsadministratorer";
+App::$strings["Thing updated"] = "Tingen er oppdatert";
+App::$strings["Object store: failed"] = "Objektlagring: mislyktes";
+App::$strings["Thing added"] = "Ting lagt til";
+App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+App::$strings["Show Thing"] = "Vis ting";
+App::$strings["item not found."] = "element ble ikke funnet.";
+App::$strings["Edit Thing"] = "Endre ting";
+App::$strings["Select a profile"] = "Velg en profil";
+App::$strings["Post an activity"] = "Legg inn en aktivitet";
+App::$strings["Only sends to viewers of the applicable profile"] = "Sender bare til seere av den aktuelle profilen";
+App::$strings["Name of thing e.g. something"] = "Navn på ting for eksempel noe";
+App::$strings["URL of thing (optional)"] = "URL til ting (valgfritt)";
+App::$strings["URL for photo of thing (optional)"] = "URL til bilde av ting (valgfritt)";
+App::$strings["Add Thing to your Profile"] = "Legg til ting i din profil";
 App::$strings["Failed to create source. No channel selected."] = "Mislyktes med å lage kilde. Ingen kanal er valgt.";
 App::$strings["Source created."] = "Kilden er laget.";
 App::$strings["Source updated."] = "Kilden er oppdatert.";
@@ -1357,7 +1421,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)"] = "Bare importer innhold med disse ordene (ett ord per linje)";
 App::$strings["Leave blank to import all public content"] = "La stå tomt for å importere alt offentlig innhold";
 App::$strings["Channel Name"] = "Kanalnavn";
-App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "";
+App::$strings["Add the following categories to posts imported from this source (comma separated)"] = "Legg til følgende kategorier til innlegg importert fra denne kilden (kommeseparert)";
 App::$strings["Source not found."] = "Kilden ble ikke funnet.";
 App::$strings["Edit Source"] = "Endre kilde";
 App::$strings["Delete Source"] = "Slett kilde";
@@ -1373,60 +1437,38 @@ App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s merket %3\$s til
 App::$strings["Tag removed"] = "Merkelapp fjernet";
 App::$strings["Remove Item Tag"] = "Fjern merkelapp fra element";
 App::$strings["Select a tag to remove: "] = "Velg merkelapp å fjerne:";
-App::$strings["Thing updated"] = "Tingen er oppdatert";
-App::$strings["Object store: failed"] = "Objektlagring: mislyktes";
-App::$strings["Thing added"] = "Ting lagt til";
-App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-App::$strings["Show Thing"] = "Vis ting";
-App::$strings["item not found."] = "element ble ikke funnet.";
-App::$strings["Edit Thing"] = "Endre ting";
-App::$strings["Select a profile"] = "Velg en profil";
-App::$strings["Post an activity"] = "Legg inn en aktivitet";
-App::$strings["Only sends to viewers of the applicable profile"] = "Sender bare til seere av den aktuelle profilen";
-App::$strings["Name of thing e.g. something"] = "Navn på ting for eksempel noe";
-App::$strings["URL of thing (optional)"] = "URL til ting (valgfritt)";
-App::$strings["URL for photo of thing (optional)"] = "URL til bilde av ting (valgfritt)";
-App::$strings["Add Thing to your Profile"] = "Legg til ting i din profil";
-App::$strings["Export Channel"] = "Eksporter kanal";
-App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Eksporter grunnleggende informasjon om kanalen din til en fil. Denne er en sikkerhetskopi av dine forbindelser, tillatelser, profil og grunnleggende data, som kan brukes til å importere dine data til en ny hub, men den tar ikke med innholdet.";
-App::$strings["Export Content"] = "Eksporter innhold";
-App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Eksporter din kanalinformasjon og det nyeste innholdet til en JSON-sikkerhetskopi, som kan gjenopprettes eller importeres til en annen hub. Denne lager en sikkerhetskopi av alle dine forbindelser, tillatelser, profildata og flere måneder av innholdet ditt. Denne filen kan være SVÆRT stor. Vennligst vær tålmodig - det kan ta flere minutter før denne nedlastningen begynner.";
-App::$strings["Export your posts from a given year."] = "Eksporter dine innlegg fra et bestemt år";
-App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Du kan også eksportere dine innlegg og samtaler for et bestemt år eller måned. Juster datoen i din nettlesers adresselinje for å velge andre datoer. Hvis eksporten feiler (muligens på grunn av utilstrekkelig minne på din hub), vennligst prøv igjen med et mer begrenset datoområde.";
-App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "For å velge alle innlegg for et gitt år, slik som iår, besøk <a href=\"%1\$s\">%2\$s</a>";
-App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "For å velge alle innlegg fra en gitt måned, slik som januar i år, besøk <a href=\"%1\$s\">%2\$s</a>";
-App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Disse innholdsfilene kan importeres eller gjenopprettes ved å besøke <a href=\"%1\$s\">%2\$s</a> på ethvert nettsted som inneholder din kanal. For best resultat, vennligst importer eller gjenopprett disse etter dato (eldste først).";
-App::$strings["No connections."] = "Ingen forbindelser.";
-App::$strings["Visit %s's profile [%s]"] = "Besøk %s sin profil [%s]";
-App::$strings["View Connections"] = "Vis forbindelser";
-App::$strings["Source of Item"] = "Kilde til element";
 App::$strings["Webpages"] = "Websider";
 App::$strings["Actions"] = "Handlinger";
 App::$strings["Page Link"] = "Sidelenke";
 App::$strings["Page Title"] = "Sidetittel";
+App::$strings["Not found"] = "";
+App::$strings["Wiki"] = "";
+App::$strings["Sandbox"] = "";
+App::$strings["\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be saved*.\""] = "";
+App::$strings["Revision Comparison"] = "";
+App::$strings["Revert"] = "";
+App::$strings["Enter the name of your new wiki:"] = "";
+App::$strings["Enter the name of the new page:"] = "";
+App::$strings["Enter the new name:"] = "";
+App::$strings["Embed image from photo albums"] = "";
+App::$strings["Embed an image from your albums"] = "";
+App::$strings["OK"] = "OK";
+App::$strings["Choose images to embed"] = "";
+App::$strings["Choose an album"] = "";
+App::$strings["Choose a different album..."] = "";
+App::$strings["Error getting album list"] = "";
+App::$strings["Error getting photo link"] = "";
+App::$strings["Error getting album"] = "";
+App::$strings["No connections."] = "Ingen forbindelser.";
+App::$strings["Visit %s's profile [%s]"] = "Besøk %s sin profil [%s]";
+App::$strings["View Connections"] = "Vis forbindelser";
+App::$strings["Source of Item"] = "Kilde til element";
+App::$strings["Authorize application connection"] = "Tillat programforbindelse";
+App::$strings["Return to your app and insert this Securty Code:"] = "Gå tilbake til din app og legg inn denne sikkerhetskoden:";
+App::$strings["Please login to continue."] = "Vennligst logg inn for å fortsette.";
+App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vil du tillate dette programmet å få tilgang til dine innlegg og kontakter, og/eller lage nye innlegg for deg?";
 App::$strings["Xchan Lookup"] = "Xchan oppslag";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Slå opp xchan som begynner med (eller webbie):";
-App::$strings["Site Admin"] = "Nettstedsadministrator";
-App::$strings["Bug Report"] = "";
-App::$strings["View Bookmarks"] = "";
-App::$strings["My Chatrooms"] = "";
-App::$strings["Firefox Share"] = "";
-App::$strings["Remote Diagnostics"] = "";
-App::$strings["Suggest Channels"] = "Foreslå kanaler";
-App::$strings["Login"] = "Logg inn";
-App::$strings["Grid"] = "Nett";
-App::$strings["Channel Home"] = "Kanalhjem";
-App::$strings["Events"] = "Hendelser";
-App::$strings["Directory"] = "Katalog";
-App::$strings["Mail"] = "Melding";
-App::$strings["Chat"] = "Chat";
-App::$strings["Probe"] = "Undersøk";
-App::$strings["Suggest"] = "Forreslå";
-App::$strings["Random Channel"] = "Tilfeldig kanal";
-App::$strings["Invite"] = "Inviter";
-App::$strings["Features"] = "Funksjoner";
-App::$strings["Post"] = "Innlegg";
-App::$strings["Purchase"] = "Kjøp";
 App::$strings["Missing room name"] = "Mangler romnavn";
 App::$strings["Duplicate room name"] = "Duplikat romnavn";
 App::$strings["Invalid room specifier."] = "Ugyldig rom-spesifisering";
@@ -1474,6 +1516,27 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Vennlig
 App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Notify]";
 App::$strings["created a new post"] = "laget et nytt innlegg";
 App::$strings["commented on %s's post"] = "kommenterte på %s sitt innlegg";
+App::$strings["Site Admin"] = "Nettstedsadministrator";
+App::$strings["Bug Report"] = "Feilmelding";
+App::$strings["View Bookmarks"] = "Vis bokmerker";
+App::$strings["My Chatrooms"] = "Mine chatrom";
+App::$strings["Firefox Share"] = "Firefox-deling";
+App::$strings["Remote Diagnostics"] = "Fjerndiagnostisering";
+App::$strings["Suggest Channels"] = "Foreslå kanaler";
+App::$strings["Login"] = "Logg inn";
+App::$strings["Grid"] = "Nett";
+App::$strings["Channel Home"] = "Kanalhjem";
+App::$strings["Events"] = "Hendelser";
+App::$strings["Directory"] = "Katalog";
+App::$strings["Mail"] = "Melding";
+App::$strings["Chat"] = "Chat";
+App::$strings["Probe"] = "Undersøk";
+App::$strings["Suggest"] = "Forreslå";
+App::$strings["Random Channel"] = "Tilfeldig kanal";
+App::$strings["Invite"] = "Inviter";
+App::$strings["Features"] = "Funksjoner";
+App::$strings["Post"] = "Innlegg";
+App::$strings["Purchase"] = "Kjøp";
 App::$strings["Private Message"] = "Privat melding";
 App::$strings["Select"] = "Velg";
 App::$strings["Save to Folder"] = "Lagre i mappe";
@@ -1510,7 +1573,7 @@ App::$strings["Expires: %s"] = "Utløper: %s";
 App::$strings["Save Bookmarks"] = "Lagre bokmerker";
 App::$strings["Add to Calendar"] = "Legg til i kalender";
 App::$strings["Mark all seen"] = "Merk alle som sett";
-App::$strings["[+] show all"] = "[+] Vis alle";
+App::$strings["%s show all"] = "";
 App::$strings["Bold"] = "Uthevet";
 App::$strings["Italic"] = "Kursiv";
 App::$strings["Underline"] = "Understreket";
@@ -1519,9 +1582,93 @@ App::$strings["Code"] = "Kode";
 App::$strings["Image"] = "Bilde";
 App::$strings["Insert Link"] = "Sett inn lenke";
 App::$strings["Video"] = "Video";
+App::$strings["Visible to your default audience"] = "Synlig for ditt standard publikum";
+App::$strings["Only me"] = "Bare meg";
+App::$strings["Public"] = "Offentlig";
+App::$strings["Anybody in the \$Projectname network"] = "Enhver i \$Projectname -nettverket";
+App::$strings["Any account on %s"] = "Enhver konto på %s";
+App::$strings["Any of my connections"] = "Enhver av mine forbindelser";
+App::$strings["Only connections I specifically allow"] = "Bare forbindelser som jeg spesifikt tillater";
+App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Enhver som er autentisert (kan inkludere besøkende fra andre nettverk)";
+App::$strings["Any connections including those who haven't yet been approved"] = "Enhver forbindelse inkluder de som ennå ikke er blitt godkjent";
+App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Dette er dine standardinnstillinger for publikumet til din normale strøm og innlegg.";
+App::$strings["This is your default setting for who can view your default channel profile"] = "Dette er din standardinnstilling for hvem som kan se din standard kanalprofil";
+App::$strings["This is your default setting for who can view your connections"] = "Dette er din standardinnstilling for hvem som kan se dine forbindelser";
+App::$strings["This is your default setting for who can view your file storage and photos"] = "Dette er din standardinnstilling for hvem som kan se fillagreret ditt og bilder";
+App::$strings["This is your default setting for the audience of your webpages"] = "Dette er din standardinnstilling for besøkende til dine websider";
 App::$strings["No username found in import file."] = "Ingen brukernavn ble funnet i importfilen.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "Klarte ikke å lage en unik kanaladresse. Import mislyktes.";
 App::$strings["Cannot locate DNS info for database server '%s'"] = "Kan ikke finne DNS-informasjon om databasetjener '%s'";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "Bilde overstiger nettstedets størrelsesbegrensning på %lu bytes";
+App::$strings["Image file is empty."] = "Bildefilen er tom.";
+App::$strings["Photo storage failed."] = "Bildelagring mislyktes.";
+App::$strings["a new photo"] = "et nytt bilde";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s la inn %2\$s til %3\$s";
+App::$strings["Photo Albums"] = "Fotoalbum";
+App::$strings["Upload New Photos"] = "Last opp nye bilder";
+App::$strings["Logout"] = "Logg ut";
+App::$strings["End this session"] = "Avslutt denne økten";
+App::$strings["Home"] = "Hjem";
+App::$strings["Your posts and conversations"] = "Dine innlegg og samtaler";
+App::$strings["Your profile page"] = "Din profilside";
+App::$strings["Manage/Edit profiles"] = "Håndter/endre profiler";
+App::$strings["Edit Profile"] = "Endre profil";
+App::$strings["Edit your profile"] = "Endre din profil";
+App::$strings["Your photos"] = "Dine bilder";
+App::$strings["Your files"] = "Dine filer";
+App::$strings["Your chatrooms"] = "Dine chatterom";
+App::$strings["Bookmarks"] = "Bokmerker";
+App::$strings["Your bookmarks"] = "Dine bokmerker";
+App::$strings["Your webpages"] = "Dine websider";
+App::$strings["Your wiki"] = "";
+App::$strings["Sign in"] = "Logg på";
+App::$strings["%s - click to logout"] = "%s - klikk for å logge ut";
+App::$strings["Remote authentication"] = "Fjernautentisering";
+App::$strings["Click to authenticate to your home hub"] = "Klikk for å godkjennes mot din hjemme-hub";
+App::$strings["Home Page"] = "Hjemmeside";
+App::$strings["Create an account"] = "Lag en konto";
+App::$strings["Help and documentation"] = "Hjelp og dokumentasjon";
+App::$strings["Applications, utilities, links, games"] = "Programmer, verktøy, lenker, spill";
+App::$strings["Search site @name, #tag, ?docs, content"] = "Søk nettstedet for @navn, #merkelapp, ?dokumentasjon, innhold";
+App::$strings["Channel Directory"] = "Kanalkatalog";
+App::$strings["Your grid"] = "Ditt nett";
+App::$strings["Mark all grid notifications seen"] = "Marker alle nettvarsler som sett";
+App::$strings["Channel home"] = "Kanalhjem";
+App::$strings["Mark all channel notifications seen"] = "Merk alle kanalvarsler som sett";
+App::$strings["Notices"] = "Varsel";
+App::$strings["Notifications"] = "Varsler";
+App::$strings["See all notifications"] = "Se alle varsler";
+App::$strings["Private mail"] = "Privat post";
+App::$strings["See all private messages"] = "Se alle private meldinger";
+App::$strings["Mark all private messages seen"] = "Merk alle private meldinger som sett";
+App::$strings["Inbox"] = "Innboks";
+App::$strings["Outbox"] = "Utboks";
+App::$strings["New Message"] = "Ny melding";
+App::$strings["Event Calendar"] = "Kalender";
+App::$strings["See all events"] = "Se alle hendelser";
+App::$strings["Mark all events seen"] = "Merk alle hendelser som sett";
+App::$strings["Manage Your Channels"] = "Håndter dine kanaler";
+App::$strings["Account/Channel Settings"] = "Konto-/kanal-innstillinger";
+App::$strings["Admin"] = "Administrator";
+App::$strings["Site Setup and Configuration"] = "Nettstedsoppsett og -konfigurasjon";
+App::$strings["Loading..."] = "Laster...";
+App::$strings["@name, #tag, ?doc, content"] = "@navn, #merkelapp, ?dokumentasjon, innhold";
+App::$strings["Please wait..."] = "Vennligst vent...";
+App::$strings["view full size"] = "vis full størrelse";
+App::$strings["Administrator"] = "Administrator";
+App::$strings["No Subject"] = "Uten emne";
+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["New Page"] = "Ny side";
+App::$strings["Title"] = "Tittel";
 App::$strings["Categories"] = "Kategorier";
 App::$strings["Tags"] = "Merkelapper";
 App::$strings["Keywords"] = "Nøkkelord";
@@ -1531,34 +1678,196 @@ App::$strings["want"] = "ønsker";
 App::$strings["wants"] = "ønsker";
 App::$strings["likes"] = "liker";
 App::$strings["dislikes"] = "misliker";
-App::$strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
-App::$strings["Starts:"] = "Starter:";
-App::$strings["Finishes:"] = "Slutter:";
-App::$strings["This event has been added to your calendar."] = "Denne hendelsen er lagt til i din kalender.";
-App::$strings["Not specified"] = "Ikke spesifisert";
-App::$strings["Needs Action"] = "Trenger handling";
-App::$strings["Completed"] = "Ferdig";
-App::$strings["In Process"] = "Igang";
-App::$strings["Cancelled"] = "Avbrutt";
+App::$strings["Unable to obtain identity information from database"] = "Klarer ikke å få tak i identitetsinformasjon fra databasen";
+App::$strings["Empty name"] = "Mangler navn";
+App::$strings["Name too long"] = "Navnet er for langt";
+App::$strings["No account identifier"] = "Ingen kontoidentifikator";
+App::$strings["Nickname is required."] = "Kallenavn er påkrevd.";
+App::$strings["Reserved nickname. Please choose another."] = "Reservert kallenavn. Vennligst velg et annet.";
+App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Kallenavnet inneholder tegn som ikke er støttet eller det er allerede i bruk på dette nettstedet.";
+App::$strings["Unable to retrieve created identity"] = "Klarer ikke å hente den lagede identiteten";
+App::$strings["Default Profile"] = "Standardprofil";
+App::$strings["Requested channel is not available."] = "Forespurt kanal er ikke tilgjengelig.";
+App::$strings["Create New Profile"] = "Lag ny profil";
+App::$strings["Visible to everybody"] = "Synlig for alle";
+App::$strings["Gender:"] = "Kjønn:";
+App::$strings["Status:"] = "Status:";
+App::$strings["Homepage:"] = "Hjemmeside:";
+App::$strings["Online Now"] = "Online nå";
+App::$strings["Like this channel"] = "Lik denne kanalen";
+App::$strings["j F, Y"] = "j F, Y";
+App::$strings["j F"] = "j F";
+App::$strings["Birthday:"] = "Fødselsdag:";
+App::$strings["for %1\$d %2\$s"] = "for %1\$d %2\$s";
+App::$strings["Sexual Preference:"] = "Seksuell preferanse:";
+App::$strings["Tags:"] = "Merkelapper:";
+App::$strings["Political Views:"] = "Politiske synspunkter:";
+App::$strings["Religion:"] = "Religion:";
+App::$strings["Hobbies/Interests:"] = "Hobbyer/interesser:";
+App::$strings["Likes:"] = "Liker:";
+App::$strings["Dislikes:"] = "Misliker:";
+App::$strings["Contact information and Social Networks:"] = "Kontaktinformasjon og sosiale nettverk:";
+App::$strings["My other channels:"] = "Mine andre kanaler:";
+App::$strings["Musical interests:"] = "Musikkinteresse:";
+App::$strings["Books, literature:"] = "Bøker, litteratur:";
+App::$strings["Television:"] = "TV:";
+App::$strings["Film/dance/culture/entertainment:"] = "Film/dans/kultur/underholdning:";
+App::$strings["Love/Romance:"] = "Kjærlighet/romantikk:";
+App::$strings["Work/employment:"] = "Arbeid/sysselsetting:";
+App::$strings["School/education:"] = "Skole/utdannelse:";
+App::$strings["Like this thing"] = "Lik denne tingen";
+App::$strings["New window"] = "Nytt vindu";
+App::$strings["Open the selected location in a different window or browser tab"] = "Åpne det valgte stedet i et annet vindu eller nettleser-fane";
+App::$strings["User '%s' deleted"] = "Brukeren '%s' er slettet";
+App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s er nå forbundet med %2\$s";
+App::$strings["%1\$s poked %2\$s"] = "%1\$s prikket %2\$s";
+App::$strings["poked"] = "prikket";
+App::$strings["View %s's profile @ %s"] = "Vis %s sin profile @ %s";
+App::$strings["Categories:"] = "Kategorier:";
+App::$strings["Filed under:"] = "Sortert under:";
+App::$strings["View in context"] = "Vis i sammenheng";
+App::$strings["remove"] = "fjern";
+App::$strings["Delete Selected Items"] = "Slett valgte elementer";
+App::$strings["View Source"] = "Vis kilde";
+App::$strings["Follow Thread"] = "Følg tråd";
+App::$strings["Unfollow Thread"] = "Ikke følg tråd";
+App::$strings["Activity/Posts"] = "Aktivitet/Innlegg";
+App::$strings["Edit Connection"] = "Endre forbindelse";
+App::$strings["Message"] = "Melding";
+App::$strings["%s likes this."] = "%s liker dette.";
+App::$strings["%s doesn't like this."] = "%s liker ikke dette.";
+App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
+	0 => "<span %1\$s>%2\$d person</span> liker dette.",
+	1 => "<span %1\$s>%2\$d personer</span> liker dette.",
+);
+App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
+	0 => "<span %1\$s>%2\$d person</span> liker ikke dette.",
+	1 => "<span %1\$s>%2\$d personer</span> liker ikke dette.",
+);
+App::$strings["and"] = "og";
+App::$strings[", and %d other people"] = array(
+	0 => ", og %d annen person",
+	1 => ", og %d andre personer",
+);
+App::$strings["%s like this."] = "%s liker dette.";
+App::$strings["%s don't like this."] = "%s liker ikke dette.";
+App::$strings["Set your location"] = "Angi din plassering";
+App::$strings["Clear browser location"] = "Fjern nettleserplassering";
+App::$strings["Tag term:"] = "Merkelapp:";
+App::$strings["Where are you right now?"] = "Hvor er du akkurat nå?";
+App::$strings["Page link name"] = "Sidens lenkenavn";
+App::$strings["Post as"] = "Lag innlegg som";
+App::$strings["Toggle voting"] = "Skru av eller på stemming";
+App::$strings["Categories (optional, comma-separated list)"] = "Kategorier (valgfri, kommaseparert liste)";
+App::$strings["Set publish date"] = "Angi publiseringsdato";
+App::$strings["Discover"] = "Oppdage";
+App::$strings["Imported public streams"] = "Importerte offentlige strømmer";
+App::$strings["Commented Order"] = "Kommentert";
+App::$strings["Sort by Comment Date"] = "Sorter etter kommentert dato";
+App::$strings["Posted Order"] = "Lagt inn";
+App::$strings["Sort by Post Date"] = "Sorter etter innleggsdato";
+App::$strings["Posts that mention or involve you"] = "Innlegg som nevner eller involverer deg";
+App::$strings["Activity Stream - by date"] = "Aktivitetsstrøm - etter dato";
+App::$strings["Starred"] = "Stjerne";
+App::$strings["Favourite Posts"] = "Favorittinnlegg";
+App::$strings["Spam"] = "Søppel";
+App::$strings["Posts flagged as SPAM"] = "Innlegg merket som SØPPEL";
+App::$strings["Status Messages and Posts"] = "Statusmeldinger og -innlegg";
+App::$strings["About"] = "Om";
+App::$strings["Profile Details"] = "Profildetaljer";
+App::$strings["Files and Storage"] = "Filer og lagring";
+App::$strings["Chatrooms"] = "Chatrom";
+App::$strings["Saved Bookmarks"] = "Lagrede bokmerker";
+App::$strings["Manage Webpages"] = "Håndtere websider";
+App::$strings["__ctx:noun__ Attending"] = array(
+	0 => "Deltar",
+	1 => "Deltar",
+);
+App::$strings["__ctx:noun__ Not Attending"] = array(
+	0 => "Deltar ikke",
+	1 => "Deltar ikke",
+);
+App::$strings["__ctx:noun__ Undecided"] = array(
+	0 => "Ikke bestemt",
+	1 => "Ikke bestemt",
+);
+App::$strings["__ctx:noun__ Agree"] = array(
+	0 => "Enig",
+	1 => "Enige",
+);
+App::$strings["__ctx:noun__ Disagree"] = array(
+	0 => "Uenig",
+	1 => "Uenige",
+);
+App::$strings["__ctx:noun__ Abstain"] = array(
+	0 => "Avstår",
+	1 => "Avstår",
+);
 App::$strings["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan ikke lage en kopi av kanal-identifikatoren på dette systemet. Import mislyktes.";
 App::$strings["Channel clone failed. Import failed."] = "Kanalkloning mislyktes. Import mislyktes.";
-App::$strings["(Unknown)"] = "(Ukjent)";
-App::$strings["Visible to anybody on the internet."] = "Synlig for enhver på Internett.";
-App::$strings["Visible to you only."] = "Synlig bare for deg.";
-App::$strings["Visible to anybody in this network."] = "Synlig for enhver i dette nettverket.";
-App::$strings["Visible to anybody authenticated."] = "Synlig for enhver som er autentisert.";
-App::$strings["Visible to anybody on %s."] = "Synlig for alle på %s.";
-App::$strings["Visible to all connections."] = "Synlig for alle forbindelser.";
-App::$strings["Visible to approved connections."] = "Synlig for godkjente forbindelser.";
-App::$strings["Visible to specific connections."] = "Synlig for spesifikke forbindelser.";
-App::$strings["Privacy group is empty."] = "Personverngruppen er tom.";
-App::$strings["Privacy group: %s"] = "Personverngruppe: %s";
-App::$strings["Connection not found."] = "Forbindelsen ble ikke funnet.";
-App::$strings["profile photo"] = "profilbilde";
-App::$strings["No recipient provided."] = "Ingen mottaker angitt.";
-App::$strings["[no subject]"] = "[ikke noe emne]";
-App::$strings["Unable to determine sender."] = "Kan ikke avgjøre avsender.";
-App::$strings["Stored post could not be verified."] = "Lagret innlegg kunne ikke bekreftes.";
+App::$strings["Frequently"] = "Ofte";
+App::$strings["Hourly"] = "Hver time";
+App::$strings["Twice daily"] = "To ganger daglig";
+App::$strings["Daily"] = "Daglig";
+App::$strings["Weekly"] = "Ukentlig";
+App::$strings["Monthly"] = "Månedlig";
+App::$strings["Currently Male"] = "For tiden mann";
+App::$strings["Currently Female"] = "For tiden kvinne";
+App::$strings["Mostly Male"] = "For det meste mann";
+App::$strings["Mostly Female"] = "For det meste kvinne";
+App::$strings["Transgender"] = "Transkjønnet";
+App::$strings["Intersex"] = "interkjønnet";
+App::$strings["Transsexual"] = "Transseksuell";
+App::$strings["Hermaphrodite"] = "Hermafroditt";
+App::$strings["Neuter"] = "Intetkjønn";
+App::$strings["Non-specific"] = "Ubestemt";
+App::$strings["Undecided"] = "Ubestemt";
+App::$strings["Males"] = "Menn";
+App::$strings["Females"] = "Kvinner";
+App::$strings["Gay"] = "Homo";
+App::$strings["Lesbian"] = "Lesbisk";
+App::$strings["No Preference"] = "Ingen preferanse";
+App::$strings["Bisexual"] = "Biseksuell";
+App::$strings["Autosexual"] = "Autoseksuell";
+App::$strings["Abstinent"] = "Avholdende";
+App::$strings["Virgin"] = "Jomfru";
+App::$strings["Deviant"] = "Avviker";
+App::$strings["Fetish"] = "Fetisj";
+App::$strings["Oodles"] = "Masse";
+App::$strings["Nonsexual"] = "Ikke-seksuell";
+App::$strings["Single"] = "Enslig";
+App::$strings["Lonely"] = "Ensom";
+App::$strings["Available"] = "Tilgjengelig";
+App::$strings["Unavailable"] = "Ikke tilgjengelig";
+App::$strings["Has crush"] = "Er forelsket";
+App::$strings["Infatuated"] = "Betatt";
+App::$strings["Dating"] = "Sammen med";
+App::$strings["Unfaithful"] = "Utro";
+App::$strings["Sex Addict"] = "Sexavhengig";
+App::$strings["Friends/Benefits"] = "Venner med frynsegoder";
+App::$strings["Casual"] = "Tilfeldig";
+App::$strings["Engaged"] = "Forlovet";
+App::$strings["Married"] = "Gift";
+App::$strings["Imaginarily married"] = "Gift i fantasien";
+App::$strings["Partners"] = "Partnere";
+App::$strings["Cohabiting"] = "Samboer";
+App::$strings["Common law"] = "Samboer";
+App::$strings["Happy"] = "Lykkelig";
+App::$strings["Not looking"] = "Ikke på utkikk";
+App::$strings["Swinger"] = "Partnerbytte";
+App::$strings["Betrayed"] = "Bedratt";
+App::$strings["Separated"] = "Separert";
+App::$strings["Unstable"] = "Ustabilt";
+App::$strings["Divorced"] = "Skilt";
+App::$strings["Imaginarily divorced"] = "Skilt i fantasien";
+App::$strings["Widowed"] = "Enke";
+App::$strings["Uncertain"] = "Usikkert";
+App::$strings["It's complicated"] = "Det er komplisert";
+App::$strings["Don't care"] = "Bryr meg ikke";
+App::$strings["Ask me"] = "Spør meg";
+App::$strings["%1\$s's bookmarks"] = "%1\$s sine bokmerker";
+App::$strings["guest:"] = "";
+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."] = "Skjemaets sikkerhetspollett var ikke gyldig. Dette skjedde antakelig fordi skjemaet har vært åpnet for lenge (>3 timer) før det ble sendt inn.";
 App::$strings["prev"] = "forrige";
 App::$strings["first"] = "første";
 App::$strings["last"] = "siste";
@@ -1568,7 +1877,6 @@ App::$strings["newer"] = "nyere";
 App::$strings["No connections"] = "Ingen forbindelser";
 App::$strings["View all %s connections"] = "Vis alle %s forbindelser";
 App::$strings["poke"] = "prikk";
-App::$strings["poked"] = "prikket";
 App::$strings["ping"] = "varsle";
 App::$strings["pinged"] = "varslet";
 App::$strings["prod"] = "oppildne";
@@ -1631,385 +1939,21 @@ App::$strings["Select an alternate language"] = "Velg et annet språk";
 App::$strings["activity"] = "aktivitet";
 App::$strings["Design Tools"] = "Designverktøy";
 App::$strings["Pages"] = "Sider";
-App::$strings["System"] = "System";
-App::$strings["New App"] = "";
-App::$strings["Suggestions"] = "Forslag";
-App::$strings["See more..."] = "Se mer...";
-App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Du har %1$.0f av %2$.0f tillate forbindelser.";
-App::$strings["Add New Connection"] = "Legg til ny forbindelse";
-App::$strings["Enter channel address"] = "Skriv kanaladressen";
-App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Eksempel: ola@eksempel.no, https://eksempel.no/kari";
-App::$strings["Notes"] = "Merknader";
-App::$strings["Remove term"] = "Fjern begrep";
-App::$strings["Saved Searches"] = "Lagrede søk";
-App::$strings["add"] = "legg til";
-App::$strings["Saved Folders"] = "Lagrede mapper";
-App::$strings["Everything"] = "Alt";
-App::$strings["Archives"] = "Arkiv";
-App::$strings["Refresh"] = "Forny";
-App::$strings["Account settings"] = "Kontoinnstillinger";
-App::$strings["Channel settings"] = "Kanalinnstillinger";
-App::$strings["Additional features"] = "Tilleggsfunksjoner";
-App::$strings["Feature/Addon settings"] = "Funksjons-/Tilleggsinnstillinger";
-App::$strings["Display settings"] = "Visningsinnstillinger";
-App::$strings["Manage locations"] = "";
-App::$strings["Export channel"] = "Eksporter kanal";
-App::$strings["Connected apps"] = "Tilkoblede app-er";
-App::$strings["Premium Channel Settings"] = "Premiumkanal-innstillinger";
-App::$strings["Private Mail Menu"] = "Meny for privat post";
-App::$strings["Combined View"] = "Kombinert visning";
-App::$strings["Inbox"] = "Innboks";
-App::$strings["Outbox"] = "Utboks";
-App::$strings["New Message"] = "Ny melding";
-App::$strings["Conversations"] = "Samtaler";
-App::$strings["Received Messages"] = "Mottatte meldinger";
-App::$strings["Sent Messages"] = "Sendte meldinger";
-App::$strings["No messages."] = "Ingen meldinger.";
-App::$strings["Delete conversation"] = "Slett samtale";
-App::$strings["Events Menu"] = "Meny for hendelser";
-App::$strings["Day View"] = "Dag";
-App::$strings["Week View"] = "Uke";
-App::$strings["Month View"] = "Måned";
-App::$strings["Events Tools"] = "Kalenderverktøy";
-App::$strings["Export Calendar"] = "Eksporter kalender";
-App::$strings["Import Calendar"] = "Importer kalender";
-App::$strings["Chatrooms"] = "Chatrom";
-App::$strings["Overview"] = "";
-App::$strings["Chat Members"] = "";
-App::$strings["Bookmarked Chatrooms"] = "Bokmerkede chatrom";
-App::$strings["Suggested Chatrooms"] = "Foreslåtte chatrom";
-App::$strings["photo/image"] = "foto/bilde";
-App::$strings["Click to show more"] = "";
-App::$strings["Rating Tools"] = "Vurderingsverktøy";
-App::$strings["Rate Me"] = "Vurder meg";
-App::$strings["View Ratings"] = "Vis vurderinger";
-App::$strings["Forums"] = "Forum";
-App::$strings["Tasks"] = "Oppgaver";
-App::$strings["Documentation"] = "Dokumentasjon";
-App::$strings["Project/Site Information"] = "Prosjekt-/Nettstedsinformasjon";
-App::$strings["For Members"] = "For medlemmer";
-App::$strings["For Administrators"] = "For administratorer";
-App::$strings["For Developers"] = "For utviklere";
-App::$strings["Member registrations waiting for confirmation"] = "";
-App::$strings["Inspect queue"] = "Inspiser kø";
-App::$strings["DB updates"] = "Databaseoppdateringer";
-App::$strings["Admin"] = "Administrator";
-App::$strings["Plugin Features"] = "Tilleggsfunksjoner";
-App::$strings["Channel is blocked on this site."] = "Kanalen er blokkert på dette nettstedet.";
-App::$strings["Channel location missing."] = "Kanalplassering mangler.";
-App::$strings["Response from remote channel was incomplete."] = "Svaret fra den andre kanalen var ikke komplett.";
-App::$strings["Channel was deleted and no longer exists."] = "Kanalen er slettet og finnes ikke lenger.";
-App::$strings["Protocol disabled."] = "Protokollen er avskrudd.";
-App::$strings["Channel discovery failed."] = "Kanaloppdagelse mislyktes.";
-App::$strings["Cannot connect to yourself."] = "Kan ikke lage forbindelse med deg selv.";
-App::$strings["%1\$s's bookmarks"] = "%1\$s sine bokmerker";
-App::$strings["Public Timeline"] = "Offentlig tidslinje";
-App::$strings["Image/photo"] = "Bilde/fotografi";
-App::$strings["Encrypted content"] = "Kryptert innhold";
-App::$strings["Install %s element: "] = "Installer %s element:";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dette innlegget inneholder det installerbare elementet %s, men du mangler tillatelse til å installere det på dette nettstedet.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s skrev følgende %2\$s %3\$s";
-App::$strings["Click to open/close"] = "Klikk for å åpne/lukke";
-App::$strings["spoiler"] = "";
-App::$strings["Different viewers will see this text differently"] = "Denne teksten vil se forskjellig ut for ulike besøkende";
-App::$strings["$1 wrote:"] = "$1 skrev:";
-App::$strings["Directory Options"] = "Kataloginnstillinger";
-App::$strings["Safe Mode"] = "Trygt modus";
-App::$strings["Public Forums Only"] = "Bare offentlige forum";
-App::$strings["This Website Only"] = "Kun dette nettstedet";
-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."] = "Skjemaets sikkerhetspollett var ikke gyldig. Dette skjedde antakelig fordi skjemaet har vært åpnet for lenge (>3 timer) før det ble sendt inn.";
-App::$strings["Logout"] = "Logg ut";
-App::$strings["End this session"] = "Avslutt denne økten";
-App::$strings["Home"] = "Hjem";
-App::$strings["Your posts and conversations"] = "Dine innlegg og samtaler";
-App::$strings["Your profile page"] = "Din profilside";
-App::$strings["Manage/Edit profiles"] = "Håndter/endre profiler";
-App::$strings["Edit Profile"] = "Endre profil";
-App::$strings["Edit your profile"] = "Endre din profil";
-App::$strings["Your photos"] = "Dine bilder";
-App::$strings["Your files"] = "Dine filer";
-App::$strings["Your chatrooms"] = "Dine chatterom";
-App::$strings["Bookmarks"] = "Bokmerker";
-App::$strings["Your bookmarks"] = "Dine bokmerker";
-App::$strings["Your webpages"] = "Dine websider";
-App::$strings["Sign in"] = "Logg på";
-App::$strings["%s - click to logout"] = "%s - klikk for å logge ut";
-App::$strings["Remote authentication"] = "Fjernautentisering";
-App::$strings["Click to authenticate to your home hub"] = "Klikk for å godkjennes mot din hjemme-hub";
-App::$strings["Home Page"] = "Hjemmeside";
-App::$strings["Create an account"] = "Lag en konto";
-App::$strings["Help and documentation"] = "Hjelp og dokumentasjon";
-App::$strings["Applications, utilities, links, games"] = "Programmer, verktøy, lenker, spill";
-App::$strings["Search site @name, #tag, ?docs, content"] = "Søk nettstedet for @navn, #merkelapp, ?dokumentasjon, innhold";
-App::$strings["Channel Directory"] = "Kanalkatalog";
-App::$strings["Your grid"] = "Ditt nett";
-App::$strings["Mark all grid notifications seen"] = "Marker alle nettvarsler som sett";
-App::$strings["Channel home"] = "Kanalhjem";
-App::$strings["Mark all channel notifications seen"] = "Merk alle kanalvarsler som sett";
-App::$strings["Notices"] = "Varsel";
-App::$strings["Notifications"] = "Varsler";
-App::$strings["See all notifications"] = "Se alle varsler";
-App::$strings["Private mail"] = "Privat post";
-App::$strings["See all private messages"] = "Se alle private meldinger";
-App::$strings["Mark all private messages seen"] = "Merk alle private meldinger som sett";
-App::$strings["Event Calendar"] = "Kalender";
-App::$strings["See all events"] = "Se alle hendelser";
-App::$strings["Mark all events seen"] = "Merk alle hendelser som sett";
-App::$strings["Manage Your Channels"] = "Håndter dine kanaler";
-App::$strings["Account/Channel Settings"] = "Konto-/kanal-innstillinger";
-App::$strings["Site Setup and Configuration"] = "Nettstedsoppsett og -konfigurasjon";
-App::$strings["Loading..."] = "Laster...";
-App::$strings["@name, #tag, ?doc, content"] = "@navn, #merkelapp, ?dokumentasjon, innhold";
-App::$strings["Please wait..."] = "Vennligst vent...";
-App::$strings["New window"] = "Nytt vindu";
-App::$strings["Open the selected location in a different window or browser tab"] = "Åpne det valgte stedet i et annet vindu eller nettleser-fane";
-App::$strings["User '%s' deleted"] = "Brukeren '%s' er slettet";
-App::$strings["%d invitation available"] = array(
-	0 => "%d invitasjon tilgjengelig",
-	1 => "%d invitasjoner tilgjengelig",
-);
-App::$strings["Find Channels"] = "Finn kanaler";
-App::$strings["Enter name or interest"] = "Skriv navn eller interesse";
-App::$strings["Connect/Follow"] = "Forbindelse/Følg";
-App::$strings["Examples: Robert Morgenstein, Fishing"] = "Eksempler: Ola Nordmann, fisking";
-App::$strings["Random Profile"] = "Tilfeldig profil";
-App::$strings["Invite Friends"] = "Inviter venner";
-App::$strings["Advanced example: name=fred and country=iceland"] = "Avansert eksempel: navn=fred og land=island";
-App::$strings["%d connection in common"] = array(
-	0 => "%d forbindelse felles",
-	1 => "%d forbindelser felles",
-);
-App::$strings["show more"] = "vis mer";
-App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s er nå forbundet med %2\$s";
-App::$strings["%1\$s poked %2\$s"] = "%1\$s prikket %2\$s";
-App::$strings["View %s's profile @ %s"] = "Vis %s sin profile @ %s";
-App::$strings["Categories:"] = "Kategorier:";
-App::$strings["Filed under:"] = "Sortert under:";
-App::$strings["View in context"] = "Vis i sammenheng";
-App::$strings["remove"] = "fjern";
-App::$strings["Delete Selected Items"] = "Slett valgte elementer";
-App::$strings["View Source"] = "Vis kilde";
-App::$strings["Follow Thread"] = "Følg tråd";
-App::$strings["Unfollow Thread"] = "Ikke følg tråd";
-App::$strings["Activity/Posts"] = "Aktivitet/Innlegg";
-App::$strings["Edit Connection"] = "Endre forbindelse";
-App::$strings["Message"] = "Melding";
-App::$strings["%s likes this."] = "%s liker dette.";
-App::$strings["%s doesn't like this."] = "%s liker ikke dette.";
-App::$strings["<span  %1\$s>%2\$d people</span> like this."] = array(
-	0 => "<span %1\$s>%2\$d person</span> liker dette.",
-	1 => "<span %1\$s>%2\$d personer</span> liker dette.",
-);
-App::$strings["<span  %1\$s>%2\$d people</span> don't like this."] = array(
-	0 => "<span %1\$s>%2\$d person</span> liker ikke dette.",
-	1 => "<span %1\$s>%2\$d personer</span> liker ikke dette.",
-);
-App::$strings["and"] = "og";
-App::$strings[", and %d other people"] = array(
-	0 => ", og %d annen person",
-	1 => ", og %d andre personer",
-);
-App::$strings["%s like this."] = "%s liker dette.";
-App::$strings["%s don't like this."] = "%s liker ikke dette.";
-App::$strings["Set your location"] = "Angi din plassering";
-App::$strings["Clear browser location"] = "Fjern nettleserplassering";
-App::$strings["Tag term:"] = "Merkelapp:";
-App::$strings["Where are you right now?"] = "Hvor er du akkurat nå?";
-App::$strings["Page link name"] = "Sidens lenkenavn";
-App::$strings["Post as"] = "Lag innlegg som";
-App::$strings["Toggle voting"] = "Skru av eller på stemming";
-App::$strings["Categories (optional, comma-separated list)"] = "Kategorier (valgfri, kommaseparert liste)";
-App::$strings["Set publish date"] = "Angi publiseringsdato";
-App::$strings["OK"] = "OK";
-App::$strings["Discover"] = "Oppdage";
-App::$strings["Imported public streams"] = "Importerte offentlige strømmer";
-App::$strings["Commented Order"] = "Kommentert";
-App::$strings["Sort by Comment Date"] = "Sorter etter kommentert dato";
-App::$strings["Posted Order"] = "Lagt inn";
-App::$strings["Sort by Post Date"] = "Sorter etter innleggsdato";
-App::$strings["Posts that mention or involve you"] = "Innlegg som nevner eller involverer deg";
-App::$strings["Activity Stream - by date"] = "Aktivitetsstrøm - etter dato";
-App::$strings["Starred"] = "Stjerne";
-App::$strings["Favourite Posts"] = "Favorittinnlegg";
-App::$strings["Spam"] = "Søppel";
-App::$strings["Posts flagged as SPAM"] = "Innlegg merket som SØPPEL";
-App::$strings["Status Messages and Posts"] = "Statusmeldinger og -innlegg";
-App::$strings["About"] = "Om";
-App::$strings["Profile Details"] = "Profildetaljer";
-App::$strings["Photo Albums"] = "Fotoalbum";
-App::$strings["Files and Storage"] = "Filer og lagring";
-App::$strings["Saved Bookmarks"] = "Lagrede bokmerker";
-App::$strings["Manage Webpages"] = "Håndtere websider";
-App::$strings["__ctx:noun__ Attending"] = array(
-	0 => "Deltar",
-	1 => "Deltar",
-);
-App::$strings["__ctx:noun__ Not Attending"] = array(
-	0 => "Deltar ikke",
-	1 => "Deltar ikke",
-);
-App::$strings["__ctx:noun__ Undecided"] = array(
-	0 => "Ikke bestemt",
-	1 => "Ikke bestemt",
-);
-App::$strings["__ctx:noun__ Agree"] = array(
-	0 => "Enig",
-	1 => "Enige",
-);
-App::$strings["__ctx:noun__ Disagree"] = array(
-	0 => "Uenig",
-	1 => "Uenige",
-);
-App::$strings["__ctx:noun__ Abstain"] = array(
-	0 => "Avstår",
-	1 => "Avstår",
-);
-App::$strings["Frequently"] = "Ofte";
-App::$strings["Hourly"] = "Hver time";
-App::$strings["Twice daily"] = "To ganger daglig";
-App::$strings["Daily"] = "Daglig";
-App::$strings["Weekly"] = "Ukentlig";
-App::$strings["Monthly"] = "Månedlig";
-App::$strings["Currently Male"] = "For tiden mann";
-App::$strings["Currently Female"] = "For tiden kvinne";
-App::$strings["Mostly Male"] = "For det meste mann";
-App::$strings["Mostly Female"] = "For det meste kvinne";
-App::$strings["Transgender"] = "Transkjønnet";
-App::$strings["Intersex"] = "interkjønnet";
-App::$strings["Transsexual"] = "Transseksuell";
-App::$strings["Hermaphrodite"] = "Hermafroditt";
-App::$strings["Neuter"] = "Intetkjønn";
-App::$strings["Non-specific"] = "Ubestemt";
-App::$strings["Other"] = "Annen";
-App::$strings["Undecided"] = "Ubestemt";
-App::$strings["Males"] = "Menn";
-App::$strings["Females"] = "Kvinner";
-App::$strings["Gay"] = "Homo";
-App::$strings["Lesbian"] = "Lesbisk";
-App::$strings["No Preference"] = "Ingen preferanse";
-App::$strings["Bisexual"] = "Biseksuell";
-App::$strings["Autosexual"] = "Autoseksuell";
-App::$strings["Abstinent"] = "Avholdende";
-App::$strings["Virgin"] = "Jomfru";
-App::$strings["Deviant"] = "Avviker";
-App::$strings["Fetish"] = "Fetisj";
-App::$strings["Oodles"] = "Masse";
-App::$strings["Nonsexual"] = "Ikke-seksuell";
-App::$strings["Single"] = "Enslig";
-App::$strings["Lonely"] = "Ensom";
-App::$strings["Available"] = "Tilgjengelig";
-App::$strings["Unavailable"] = "Ikke tilgjengelig";
-App::$strings["Has crush"] = "Er forelsket";
-App::$strings["Infatuated"] = "Betatt";
-App::$strings["Dating"] = "Sammen med";
-App::$strings["Unfaithful"] = "Utro";
-App::$strings["Sex Addict"] = "Sexavhengig";
-App::$strings["Friends/Benefits"] = "Venner med frynsegoder";
-App::$strings["Casual"] = "Tilfeldig";
-App::$strings["Engaged"] = "Forlovet";
-App::$strings["Married"] = "Gift";
-App::$strings["Imaginarily married"] = "Gift i fantasien";
-App::$strings["Partners"] = "Partnere";
-App::$strings["Cohabiting"] = "Samboer";
-App::$strings["Common law"] = "Samboer";
-App::$strings["Happy"] = "Lykkelig";
-App::$strings["Not looking"] = "Ikke på utkikk";
-App::$strings["Swinger"] = "Partnerbytte";
-App::$strings["Betrayed"] = "Bedratt";
-App::$strings["Separated"] = "Separert";
-App::$strings["Unstable"] = "Ustabilt";
-App::$strings["Divorced"] = "Skilt";
-App::$strings["Imaginarily divorced"] = "Skilt i fantasien";
-App::$strings["Widowed"] = "Enke";
-App::$strings["Uncertain"] = "Usikkert";
-App::$strings["It's complicated"] = "Det er komplisert";
-App::$strings["Don't care"] = "Bryr meg ikke";
-App::$strings["Ask me"] = "Spør meg";
-App::$strings["Visible to your default audience"] = "Synlig for ditt standard publikum";
-App::$strings["Only me"] = "";
-App::$strings["Public"] = "Offentlig";
-App::$strings["Anybody in the \$Projectname network"] = "";
-App::$strings["Any account on %s"] = "";
-App::$strings["Any of my connections"] = "";
-App::$strings["Only connections I specifically allow"] = "";
-App::$strings["Anybody authenticated (could include visitors from other networks)"] = "";
-App::$strings["Any connections including those who haven't yet been approved"] = "";
-App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "";
-App::$strings["This is your default setting for who can view your default channel profile"] = "";
-App::$strings["This is your default setting for who can view your connections"] = "";
-App::$strings["This is your default setting for who can view your file storage and photos"] = "";
-App::$strings["This is your default setting for the audience of your webpages"] = "";
-App::$strings["Not a valid email address"] = "Ikke en gyldig e-postadresse";
-App::$strings["Your email domain is not among those allowed on this site"] = "Ditt e-postdomene er ikke blant de som er tillatt på dette stedet";
-App::$strings["Your email address is already registered at this site."] = "Din e-postadresse er allerede registrert på dette nettstedet.";
-App::$strings["An invitation is required."] = "En invitasjon er påkrevd.";
-App::$strings["Invitation could not be verified."] = "Invitasjon kunne ikke bekreftes.";
-App::$strings["Please enter the required information."] = "Vennligst skriv inn nødvendig informasjon.";
-App::$strings["Failed to store account information."] = "Mislyktes med å lagre kontoinformasjon.";
-App::$strings["Registration confirmation for %s"] = "Registreringsbekreftelse for %s";
-App::$strings["Registration request at %s"] = "Registreringsforespørsel hos %s";
-App::$strings["Administrator"] = "Administrator";
-App::$strings["your registration password"] = "ditt registreringspassord";
-App::$strings["Registration details for %s"] = "Registreringsdetaljer for %s";
-App::$strings["Account approved."] = "Konto godkjent.";
-App::$strings["Registration revoked for %s"] = "Registrering trukket tilbake for %s";
-App::$strings["Account verified. Please login."] = "Konto bekreftet. Vennligst logg inn.";
-App::$strings["Click here to upgrade."] = "Klikk her for å oppgradere.";
-App::$strings["This action exceeds the limits set by your subscription plan."] = "Denne handlingen går utenfor grensene satt i din abonnementsplan.";
-App::$strings["This action is not available under your subscription plan."] = "Denne handlingen er ikke tilgjengelig i din abonnementsplan.";
-App::$strings["Item was not found."] = "Elementet ble ikke funnet.";
-App::$strings["No source file."] = "Ingen kildefil.";
-App::$strings["Cannot locate file to replace"] = "Kan ikke finne filen som skal byttes ut";
-App::$strings["Cannot locate file to revise/update"] = "Finner ikke filen som skal revideres/oppdateres";
-App::$strings["File exceeds size limit of %d"] = "Filens størrelse overgår grensen på %d";
-App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Du har nådd din lagringsgrense for vedlegg på %1$.0f Mbytes.";
-App::$strings["File upload failed. Possible system limit or action terminated."] = "Mislyktes med å laste opp filen. Mulig systemgrense eller handling avbrutt.";
-App::$strings["Stored file could not be verified. Upload failed."] = "Lagret fil kunne ikke bekreftes. Opplasting mislyktes.";
-App::$strings["Path not available."] = "Stien er ikke tilgjengelig.";
-App::$strings["Empty pathname"] = "Tomt sti-navn";
-App::$strings["duplicate filename or path"] = "duplikat av filnavn eller sti";
-App::$strings["Path not found."] = "Stien ble ikke funnet.";
-App::$strings["mkdir failed."] = "mkdir mislyktes.";
-App::$strings["database storage failed."] = "databaselagring mislyktes.";
-App::$strings["Empty path"] = "Tom sti";
-App::$strings["Unable to obtain identity information from database"] = "Klarer ikke å få tak i identitetsinformasjon fra databasen";
-App::$strings["Empty name"] = "Mangler navn";
-App::$strings["Name too long"] = "Navnet er for langt";
-App::$strings["No account identifier"] = "Ingen kontoidentifikator";
-App::$strings["Nickname is required."] = "Kallenavn er påkrevd.";
-App::$strings["Reserved nickname. Please choose another."] = "Reservert kallenavn. Vennligst velg et annet.";
-App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Kallenavnet inneholder tegn som ikke er støttet eller det er allerede i bruk på dette nettstedet.";
-App::$strings["Unable to retrieve created identity"] = "Klarer ikke å hente den lagede identiteten";
-App::$strings["Default Profile"] = "Standardprofil";
-App::$strings["Requested channel is not available."] = "Forespurt kanal er ikke tilgjengelig.";
-App::$strings["Create New Profile"] = "Lag ny profil";
-App::$strings["Visible to everybody"] = "";
-App::$strings["Gender:"] = "Kjønn:";
-App::$strings["Status:"] = "Status:";
-App::$strings["Homepage:"] = "Hjemmeside:";
-App::$strings["Online Now"] = "Online nå";
-App::$strings["Like this channel"] = "Lik denne kanalen";
-App::$strings["j F, Y"] = "j F, Y";
-App::$strings["j F"] = "j F";
-App::$strings["Birthday:"] = "Fødselsdag:";
-App::$strings["for %1\$d %2\$s"] = "for %1\$d %2\$s";
-App::$strings["Sexual Preference:"] = "Seksuell preferanse:";
-App::$strings["Tags:"] = "Merkelapper:";
-App::$strings["Political Views:"] = "Politiske synspunkter:";
-App::$strings["Religion:"] = "Religion:";
-App::$strings["Hobbies/Interests:"] = "Hobbyer/interesser:";
-App::$strings["Likes:"] = "Liker:";
-App::$strings["Dislikes:"] = "Misliker:";
-App::$strings["Contact information and Social Networks:"] = "Kontaktinformasjon og sosiale nettverk:";
-App::$strings["My other channels:"] = "Mine andre kanaler:";
-App::$strings["Musical interests:"] = "Musikkinteresse:";
-App::$strings["Books, literature:"] = "Bøker, litteratur:";
-App::$strings["Television:"] = "TV:";
-App::$strings["Film/dance/culture/entertainment:"] = "Film/dans/kultur/underholdning:";
-App::$strings["Love/Romance:"] = "Kjærlighet/romantikk:";
-App::$strings["Work/employment:"] = "Arbeid/sysselsetting:";
-App::$strings["School/education:"] = "Skole/utdannelse:";
-App::$strings["Like this thing"] = "Lik denne tingen";
+App::$strings["Logged out."] = "Logget ut.";
+App::$strings["Failed authentication"] = "Mislykket autentisering";
+App::$strings["Can view my normal stream and posts"] = "Kan se min normale strøm og innlegg";
+App::$strings["Can view my webpages"] = "Kan se mine websider";
+App::$strings["Can post on my channel page (\"wall\")"] = "Kan lage innlegg på min kanalside (\"vegg\")";
+App::$strings["Can like/dislike stuff"] = "Kan like/ikke like forskjellige greier";
+App::$strings["Profiles and things other than posts/comments"] = "Profiler og andre ting enn innlegg/kommentarer";
+App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kan videresende til alle mine kanalkontakter via @navn i innlegg";
+App::$strings["Advanced - useful for creating group forum channels"] = "Avansert - nyttig for å lage forumkanaler for grupper";
+App::$strings["Can chat with me (when available)"] = "Kan chatte/sende lynmeldinger til meg (når tilgjengelig)";
+App::$strings["Can write to my file storage and photos"] = "Kan skrive til mitt lager for filer og bilder";
+App::$strings["Can edit my webpages"] = "Kan endre mine websider";
+App::$strings["Somewhat advanced - very useful in open communities"] = "Litt avansert - svært nyttig i åpne fellesskap";
+App::$strings["Can administer my channel resources"] = "Kan administrere mine kanalressurser";
+App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Ekstremt avansert. La dette være med mindre du vet hva du gjør";
 App::$strings["General Features"] = "Generelle funksjoner";
 App::$strings["Content Expiration"] = "Innholdet utløper";
 App::$strings["Remove posts/comments and/or private messages at a future time"] = "Fjern innlegg/kommentarer og/eller private meldinger på et angitt tidspunkt i fremtiden";
@@ -2021,6 +1965,7 @@ App::$strings["Profile Import/Export"] = "Profil-import/-eksport";
 App::$strings["Save and load profile details across sites/channels"] = "Lagre og åpne profildetaljer på tvers av nettsteder/kanaler";
 App::$strings["Web Pages"] = "Web-sider";
 App::$strings["Provide managed web pages on your channel"] = "Tilby kontrollerte web-sider på din kanal";
+App::$strings["Provide a wiki for your channel"] = "";
 App::$strings["Hide Rating"] = "Skjul vurdering";
 App::$strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Skjul vurderingsknappene for din kanal og profilsider. Merknad: folk kan fortsatt vurdere deg et annet sted.";
 App::$strings["Private Notes"] = "Private merknader";
@@ -2029,10 +1974,10 @@ App::$strings["Navigation Channel Select"] = "Navigasjon kanalvalg";
 App::$strings["Change channels directly from within the navigation dropdown menu"] = "Endre kanaler direkte fra navigasjonsmenyen";
 App::$strings["Photo Location"] = "Bildeplassering";
 App::$strings["If location data is available on uploaded photos, link this to a map."] = "Hvis plasseringsdata er tilgjengelige i opplastede bilder, plasser dette på et kart.";
-App::$strings["Access Controlled Chatrooms"] = "";
-App::$strings["Provide chatrooms and chat services with access control."] = "";
-App::$strings["Smart Birthdays"] = "";
-App::$strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "";
+App::$strings["Access Controlled Chatrooms"] = "Tilgangsstyrte chatrom";
+App::$strings["Provide chatrooms and chat services with access control."] = "Tilby chatrom og chattjenester med tilgangskontroll.";
+App::$strings["Smart Birthdays"] = "Smarte fødselsdager";
+App::$strings["Make birthday events timezone aware in case your friends are scattered across the planet."] = "Gjør fødselsdagshendelser oppmerksom på tidsoner i tilfelle dine venner er spredt rundt planeten.";
 App::$strings["Expert Mode"] = "Ekspertmodus";
 App::$strings["Enable Expert Mode to provide advanced configuration options"] = "Skru på Ekspertmodus for å tilby avanserte konfigurasjonsvalg";
 App::$strings["Premium Channel"] = "Premiumkanal";
@@ -2054,6 +1999,7 @@ App::$strings["Search by Date"] = "Søk etter dato";
 App::$strings["Ability to select posts by date ranges"] = "Mulighet for å velge innlegg etter datoområde";
 App::$strings["Privacy Groups"] = "Personverngrupper";
 App::$strings["Enable management and selection of privacy groups"] = "Skru på håndtering og valg av personverngrupper";
+App::$strings["Saved Searches"] = "Lagrede søk";
 App::$strings["Save search terms for re-use"] = "Lagre søkeuttrykk for senere bruk";
 App::$strings["Network Personal Tab"] = "Nettverk personlig fane";
 App::$strings["Enable tab to display only Network posts that you've interacted on"] = "Skru på fane for å bare vise Nettverksinnlegg som du har deltatt i";
@@ -2069,8 +2015,9 @@ App::$strings["Community Tagging"] = "Felleskapsmerkelapper";
 App::$strings["Ability to tag existing posts"] = "Mulighet til å merke eksisterende meldinger";
 App::$strings["Post Categories"] = "Innleggskategorier";
 App::$strings["Add categories to your posts"] = "Legg kategorier til dine innlegg";
-App::$strings["Emoji Reactions"] = "";
-App::$strings["Add emoji reaction ability to posts"] = "";
+App::$strings["Emoji Reactions"] = "Emoji-reaksjoner";
+App::$strings["Add emoji reaction ability to posts"] = "Legg til muligheten for emoji-reaksjoner på innlegg";
+App::$strings["Saved Folders"] = "Lagrede mapper";
 App::$strings["Ability to file posts under folders"] = "Mulighet til å sortere innlegg i mapper";
 App::$strings["Dislike Posts"] = "Mislik innlegg";
 App::$strings["Ability to dislike posts/comments"] = "Mulighet til å mislike innlegg/kommentarer";
@@ -2078,63 +2025,149 @@ App::$strings["Star Posts"] = "Stjerneinnlegg";
 App::$strings["Ability to mark special posts with a star indicator"] = "Mulighet til å merke spesielle innlegg med en stjerne";
 App::$strings["Tag Cloud"] = "Merkelappsky";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Tilby en personlig merkelappsky på din kanalside";
-App::$strings["Embedded content"] = "Innebygget innhold";
-App::$strings["Embedding disabled"] = "Innbygging avskrudd";
-App::$strings["Who can see this?"] = "";
-App::$strings["Custom selection"] = "";
-App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "";
-App::$strings["Show"] = "Vis";
-App::$strings["Don't show"] = "Ikke vis";
-App::$strings["Other networks and post services"] = "Andre nettverk og innleggstjenester";
-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."] = "";
-App::$strings["Logged out."] = "Logget ut.";
-App::$strings["Failed authentication"] = "Mislykket autentisering";
-App::$strings["Birthday"] = "";
-App::$strings["Age: "] = "Alder:";
-App::$strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD eller MM-DD";
-App::$strings["never"] = "aldri";
-App::$strings["less than a second ago"] = "for mindre enn ett sekund siden";
-App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s siden";
-App::$strings["__ctx:relative_date__ year"] = array(
-	0 => "år",
-	1 => "år",
-);
-App::$strings["__ctx:relative_date__ month"] = array(
-	0 => "måned",
-	1 => "måneder",
-);
-App::$strings["__ctx:relative_date__ week"] = array(
-	0 => "uke",
-	1 => "uker",
-);
-App::$strings["__ctx:relative_date__ day"] = array(
-	0 => "dag",
-	1 => "dager",
-);
-App::$strings["__ctx:relative_date__ hour"] = array(
-	0 => "time",
-	1 => "timer",
-);
-App::$strings["__ctx:relative_date__ minute"] = array(
-	0 => "minutt",
-	1 => "minutter",
-);
-App::$strings["__ctx:relative_date__ second"] = array(
-	0 => "sekund",
-	1 => "sekunder",
-);
-App::$strings["%1\$s's birthday"] = "%1\$s sin fødselsdag";
-App::$strings["Happy Birthday %1\$s"] = "Gratulerer med dagen, %1\$s !";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "En slettet gruppe med dette navnet ble gjenopprettet. Eksisterende tillatelser for elementet <strong>kan</strong> gjelde for denne gruppen og fremtidige medlemmer. Hvis du ønsket noe annet, vennligst lag en ny gruppe med et annet navn.";
 App::$strings["Add new connections to this privacy group"] = "Legg nye forbindelser i denne personverngruppen";
 App::$strings["edit"] = "endre";
 App::$strings["Edit group"] = "Endre gruppe";
 App::$strings["Add privacy group"] = "Legg til personverngruppe";
 App::$strings["Channels not in any privacy group"] = "Kanaler uten personverngruppe";
+App::$strings["add"] = "legg til";
+App::$strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
+App::$strings["Starts:"] = "Starter:";
+App::$strings["Finishes:"] = "Slutter:";
+App::$strings["This event has been added to your calendar."] = "Denne hendelsen er lagt til i din kalender.";
+App::$strings["Not specified"] = "Ikke spesifisert";
+App::$strings["Needs Action"] = "Trenger handling";
+App::$strings["Completed"] = "Ferdig";
+App::$strings["In Process"] = "Igang";
+App::$strings["Cancelled"] = "Avbrutt";
+App::$strings["Not a valid email address"] = "Ikke en gyldig e-postadresse";
+App::$strings["Your email domain is not among those allowed on this site"] = "Ditt e-postdomene er ikke blant de som er tillatt på dette stedet";
+App::$strings["Your email address is already registered at this site."] = "Din e-postadresse er allerede registrert på dette nettstedet.";
+App::$strings["An invitation is required."] = "En invitasjon er påkrevd.";
+App::$strings["Invitation could not be verified."] = "Invitasjon kunne ikke bekreftes.";
+App::$strings["Please enter the required information."] = "Vennligst skriv inn nødvendig informasjon.";
+App::$strings["Failed to store account information."] = "Mislyktes med å lagre kontoinformasjon.";
+App::$strings["Registration confirmation for %s"] = "Registreringsbekreftelse for %s";
+App::$strings["Registration request at %s"] = "Registreringsforespørsel hos %s";
+App::$strings["your registration password"] = "ditt registreringspassord";
+App::$strings["Registration details for %s"] = "Registreringsdetaljer for %s";
+App::$strings["Account approved."] = "Konto godkjent.";
+App::$strings["Registration revoked for %s"] = "Registrering trukket tilbake for %s";
+App::$strings["Click here to upgrade."] = "Klikk her for å oppgradere.";
+App::$strings["This action exceeds the limits set by your subscription plan."] = "Denne handlingen går utenfor grensene satt i din abonnementsplan.";
+App::$strings["This action is not available under your subscription plan."] = "Denne handlingen er ikke tilgjengelig i din abonnementsplan.";
+App::$strings["Channel is blocked on this site."] = "Kanalen er blokkert på dette nettstedet.";
+App::$strings["Channel location missing."] = "Kanalplassering mangler.";
+App::$strings["Response from remote channel was incomplete."] = "Svaret fra den andre kanalen var ikke komplett.";
+App::$strings["Channel was deleted and no longer exists."] = "Kanalen er slettet og finnes ikke lenger.";
+App::$strings["Protocol disabled."] = "Protokollen er avskrudd.";
+App::$strings["Channel discovery failed."] = "Kanaloppdagelse mislyktes.";
+App::$strings["Cannot connect to yourself."] = "Kan ikke lage forbindelse med deg selv.";
+App::$strings["Item was not found."] = "Elementet ble ikke funnet.";
+App::$strings["No source file."] = "Ingen kildefil.";
+App::$strings["Cannot locate file to replace"] = "Kan ikke finne filen som skal byttes ut";
+App::$strings["Cannot locate file to revise/update"] = "Finner ikke filen som skal revideres/oppdateres";
+App::$strings["File exceeds size limit of %d"] = "Filens størrelse overgår grensen på %d";
+App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Du har nådd din lagringsgrense for vedlegg på %1$.0f Mbytes.";
+App::$strings["File upload failed. Possible system limit or action terminated."] = "Mislyktes med å laste opp filen. Mulig systemgrense eller handling avbrutt.";
+App::$strings["Stored file could not be verified. Upload failed."] = "Lagret fil kunne ikke bekreftes. Opplasting mislyktes.";
+App::$strings["Path not available."] = "Stien er ikke tilgjengelig.";
+App::$strings["Empty pathname"] = "Tomt sti-navn";
+App::$strings["duplicate filename or path"] = "duplikat av filnavn eller sti";
+App::$strings["Path not found."] = "Stien ble ikke funnet.";
+App::$strings["mkdir failed."] = "mkdir mislyktes.";
+App::$strings["database storage failed."] = "databaselagring mislyktes.";
+App::$strings["Empty path"] = "Tom sti";
+App::$strings["Image/photo"] = "Bilde/fotografi";
+App::$strings["Encrypted content"] = "Kryptert innhold";
+App::$strings["Install %s element: "] = "Installer %s element:";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dette innlegget inneholder det installerbare elementet %s, men du mangler tillatelse til å installere det på dette nettstedet.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s skrev følgende %2\$s %3\$s";
+App::$strings["Click to open/close"] = "Klikk for å åpne/lukke";
+App::$strings["spoiler"] = "avsløring";
+App::$strings["Different viewers will see this text differently"] = "Denne teksten vil se forskjellig ut for ulike besøkende";
+App::$strings["$1 wrote:"] = "$1 skrev:";
+App::$strings["(Unknown)"] = "(Ukjent)";
+App::$strings["Visible to anybody on the internet."] = "Synlig for enhver på Internett.";
+App::$strings["Visible to you only."] = "Synlig bare for deg.";
+App::$strings["Visible to anybody in this network."] = "Synlig for enhver i dette nettverket.";
+App::$strings["Visible to anybody authenticated."] = "Synlig for enhver som er autentisert.";
+App::$strings["Visible to anybody on %s."] = "Synlig for alle på %s.";
+App::$strings["Visible to all connections."] = "Synlig for alle forbindelser.";
+App::$strings["Visible to approved connections."] = "Synlig for godkjente forbindelser.";
+App::$strings["Visible to specific connections."] = "Synlig for spesifikke forbindelser.";
+App::$strings["Privacy group is empty."] = "Personverngruppen er tom.";
+App::$strings["Privacy group: %s"] = "Personverngruppe: %s";
+App::$strings["Connection not found."] = "Forbindelsen ble ikke funnet.";
+App::$strings["profile photo"] = "profilbilde";
+App::$strings["Embedded content"] = "Innebygget innhold";
+App::$strings["Embedding disabled"] = "Innbygging avskrudd";
+App::$strings["System"] = "System";
+App::$strings["New App"] = "Ny app";
+App::$strings["Suggestions"] = "Forslag";
+App::$strings["See more..."] = "Se mer...";
+App::$strings["You have %1$.0f of %2$.0f allowed connections."] = "Du har %1$.0f av %2$.0f tillate forbindelser.";
+App::$strings["Add New Connection"] = "Legg til ny forbindelse";
+App::$strings["Enter channel address"] = "Skriv kanaladressen";
+App::$strings["Examples: bob@example.com, https://example.com/barbara"] = "Eksempel: ola@eksempel.no, https://eksempel.no/kari";
+App::$strings["Notes"] = "Merknader";
+App::$strings["Remove term"] = "Fjern begrep";
+App::$strings["Everything"] = "Alt";
+App::$strings["Archives"] = "Arkiv";
+App::$strings["Refresh"] = "Forny";
+App::$strings["Account settings"] = "Kontoinnstillinger";
+App::$strings["Channel settings"] = "Kanalinnstillinger";
+App::$strings["Additional features"] = "Tilleggsfunksjoner";
+App::$strings["Feature/Addon settings"] = "Funksjons-/Tilleggsinnstillinger";
+App::$strings["Display settings"] = "Visningsinnstillinger";
+App::$strings["Manage locations"] = "Håndter plasseringer";
+App::$strings["Export channel"] = "Eksporter kanal";
+App::$strings["Connected apps"] = "Tilkoblede app-er";
+App::$strings["Premium Channel Settings"] = "Premiumkanal-innstillinger";
+App::$strings["Private Mail Menu"] = "Meny for privat post";
+App::$strings["Combined View"] = "Kombinert visning";
+App::$strings["Conversations"] = "Samtaler";
+App::$strings["Received Messages"] = "Mottatte meldinger";
+App::$strings["Sent Messages"] = "Sendte meldinger";
+App::$strings["No messages."] = "Ingen meldinger.";
+App::$strings["Delete conversation"] = "Slett samtale";
+App::$strings["Events Tools"] = "Kalenderverktøy";
+App::$strings["Export Calendar"] = "Eksporter kalender";
+App::$strings["Import Calendar"] = "Importer kalender";
+App::$strings["Overview"] = "Overblikk";
+App::$strings["Chat Members"] = "Chatmedlemmer";
+App::$strings["Wiki List"] = "";
+App::$strings["Wiki Pages"] = "";
+App::$strings["Bookmarked Chatrooms"] = "Bokmerkede chatrom";
+App::$strings["Suggested Chatrooms"] = "Foreslåtte chatrom";
+App::$strings["photo/image"] = "foto/bilde";
+App::$strings["Click to show more"] = "Klikk for å vise mer";
+App::$strings["Rating Tools"] = "Vurderingsverktøy";
+App::$strings["Rate Me"] = "Vurder meg";
+App::$strings["View Ratings"] = "Vis vurderinger";
+App::$strings["Forums"] = "Forum";
+App::$strings["Tasks"] = "Oppgaver";
+App::$strings["Documentation"] = "Dokumentasjon";
+App::$strings["Project/Site Information"] = "Prosjekt-/Nettstedsinformasjon";
+App::$strings["For Members"] = "For medlemmer";
+App::$strings["For Administrators"] = "For administratorer";
+App::$strings["For Developers"] = "For utviklere";
+App::$strings["Member registrations waiting for confirmation"] = "Medlemsregistreringer venter på bekreftelse";
+App::$strings["Inspect queue"] = "Inspiser kø";
+App::$strings["DB updates"] = "Databaseoppdateringer";
+App::$strings["Plugin Features"] = "Tilleggsfunksjoner";
+App::$strings[" and "] = "og";
+App::$strings["public profile"] = "offentlig profil";
+App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s endret %2\$s til &ldquo;%3\$s&rdquo;";
+App::$strings["Visit %1\$s's %2\$s"] = "Besøk %1\$s sitt %2\$s";
+App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s har oppdatert %2\$s, endret %3\$s.";
+App::$strings["Attachments:"] = "Vedlegg:";
+App::$strings["\$Projectname event notification:"] = "\$Projectname hendelsesvarsling:";
 App::$strings["Delete this item?"] = "Slett dette elementet?";
-App::$strings["[-] show less"] = "[-] Vis mindre";
-App::$strings["[+] expand"] = "[+] Utvid";
-App::$strings["[-] collapse"] = "[-] Lukk";
+App::$strings["%s show less"] = "";
+App::$strings["%s expand"] = "";
+App::$strings["%s collapse"] = "";
 App::$strings["Password too short"] = "Passordet er for kort";
 App::$strings["Passwords do not match"] = "Passordene er ikke like";
 App::$strings["everybody"] = "alle";
@@ -2189,72 +2222,78 @@ App::$strings["__ctx:calendar__ month"] = "måned";
 App::$strings["__ctx:calendar__ week"] = "uke";
 App::$strings["__ctx:calendar__ day"] = "dag";
 App::$strings["__ctx:calendar__ All day"] = "Hele dagen";
-App::$strings["view full size"] = "vis full størrelse";
-App::$strings["No Subject"] = "Uten emne";
-App::$strings["Friendica"] = "Friendica";
-App::$strings["OStatus"] = "OStatus";
-App::$strings["GNU-Social"] = "";
-App::$strings["RSS/Atom"] = "RSS/Atom";
-App::$strings["Diaspora"] = "Diaspora";
-App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot";
-App::$strings["LinkedIn"] = "LinkedIn";
-App::$strings["XMPP/IM"] = "XMPP/IM";
-App::$strings["MySpace"] = "MySpace";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "Bilde overstiger nettstedets størrelsesbegrensning på %lu bytes";
-App::$strings["Image file is empty."] = "Bildefilen er tom.";
-App::$strings["Photo storage failed."] = "Bildelagring mislyktes.";
-App::$strings["a new photo"] = "et nytt bilde";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s la inn %2\$s til %3\$s";
-App::$strings["Upload New Photos"] = "Last opp nye bilder";
+App::$strings["%d invitation available"] = array(
+	0 => "%d invitasjon tilgjengelig",
+	1 => "%d invitasjoner tilgjengelig",
+);
+App::$strings["Find Channels"] = "Finn kanaler";
+App::$strings["Enter name or interest"] = "Skriv navn eller interesse";
+App::$strings["Connect/Follow"] = "Forbindelse/Følg";
+App::$strings["Examples: Robert Morgenstein, Fishing"] = "Eksempler: Ola Nordmann, fisking";
+App::$strings["Random Profile"] = "Tilfeldig profil";
+App::$strings["Invite Friends"] = "Inviter venner";
+App::$strings["Advanced example: name=fred and country=iceland"] = "Avansert eksempel: navn=fred og land=island";
+App::$strings["%d connection in common"] = array(
+	0 => "%d forbindelse felles",
+	1 => "%d forbindelser felles",
+);
+App::$strings["show more"] = "vis mer";
+App::$strings["Directory Options"] = "Kataloginnstillinger";
+App::$strings["Safe Mode"] = "Trygt modus";
+App::$strings["Public Forums Only"] = "Bare offentlige forum";
+App::$strings["This Website Only"] = "Kun dette nettstedet";
+App::$strings["No recipient provided."] = "Ingen mottaker angitt.";
+App::$strings["[no subject]"] = "[ikke noe emne]";
+App::$strings["Unable to determine sender."] = "Kan ikke avgjøre avsender.";
+App::$strings["Stored post could not be verified."] = "Lagret innlegg kunne ikke bekreftes.";
+App::$strings["Who can see this?"] = "Hvem kan se dette?";
+App::$strings["Custom selection"] = "Tilpasset utvalg";
+App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Velg \"Vis\" for å tillate visning. \"Ikke vis\" lar deg overstyre og avgrense omfanget av \"Vis\".";
+App::$strings["Show"] = "Vis";
+App::$strings["Don't show"] = "Ikke vis";
+App::$strings["Other networks and post services"] = "Andre nettverk og innleggstjenester";
+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."] = "Innleggstillatelsene %s kan ikke endres %s etter at et innlegg er delt.</br>Disse innstillingene angir hvem som har tillatelse til å se innlegget.";
+App::$strings["Birthday"] = "Fødselsdag";
+App::$strings["Age: "] = "Alder:";
+App::$strings["YYYY-MM-DD or MM-DD"] = "YYYY-MM-DD eller MM-DD";
+App::$strings["never"] = "aldri";
+App::$strings["less than a second ago"] = "for mindre enn ett sekund siden";
+App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s siden";
+App::$strings["__ctx:relative_date__ year"] = array(
+	0 => "år",
+	1 => "år",
+);
+App::$strings["__ctx:relative_date__ month"] = array(
+	0 => "måned",
+	1 => "måneder",
+);
+App::$strings["__ctx:relative_date__ week"] = array(
+	0 => "uke",
+	1 => "uker",
+);
+App::$strings["__ctx:relative_date__ day"] = array(
+	0 => "dag",
+	1 => "dager",
+);
+App::$strings["__ctx:relative_date__ hour"] = array(
+	0 => "time",
+	1 => "timer",
+);
+App::$strings["__ctx:relative_date__ minute"] = array(
+	0 => "minutt",
+	1 => "minutter",
+);
+App::$strings["__ctx:relative_date__ second"] = array(
+	0 => "sekund",
+	1 => "sekunder",
+);
+App::$strings["%1\$s's birthday"] = "%1\$s sin fødselsdag";
+App::$strings["Happy Birthday %1\$s"] = "Gratulerer med dagen, %1\$s !";
+App::$strings["Public Timeline"] = "Offentlig tidslinje";
 App::$strings["Invalid data packet"] = "Ugyldig datapakke";
 App::$strings["Unable to verify channel signature"] = "Ikke i stand til å sjekke kanalsignaturen";
 App::$strings["Unable to verify site signature for %s"] = "Ikke i stand til å bekrefte signaturen til %s";
 App::$strings["invalid target signature"] = "Målets signatur er ugyldig";
-App::$strings["New Page"] = "Ny side";
-App::$strings["Title"] = "Tittel";
-App::$strings["Can view my normal stream and posts"] = "Kan se min normale strøm og innlegg";
-App::$strings["Can view my default channel profile"] = "Kan se min standard kanalprofil";
-App::$strings["Can view my connections"] = "Kan se mine forbindelser";
-App::$strings["Can view my file storage and photos"] = "Kan se mine filer og bilder";
-App::$strings["Can view my webpages"] = "Kan se mine websider";
-App::$strings["Can send me their channel stream and posts"] = "Kan sende meg deres kanalstrøm og innlegg";
-App::$strings["Can post on my channel page (\"wall\")"] = "Kan lage innlegg på min kanalside (\"vegg\")";
-App::$strings["Can comment on or like my posts"] = "Kan kommentere på eller like mine innlegg";
-App::$strings["Can send me private mail messages"] = "Kan sende meg private meldinger";
-App::$strings["Can like/dislike stuff"] = "Kan like/ikke like forskjellige greier";
-App::$strings["Profiles and things other than posts/comments"] = "Profiler og andre ting enn innlegg/kommentarer";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kan videresende til alle mine kanalkontakter via @navn i innlegg";
-App::$strings["Advanced - useful for creating group forum channels"] = "Avansert - nyttig for å lage forumkanaler for grupper";
-App::$strings["Can chat with me (when available)"] = "Kan chatte/sende lynmeldinger til meg (når tilgjengelig)";
-App::$strings["Can write to my file storage and photos"] = "Kan skrive til mitt lager for filer og bilder";
-App::$strings["Can edit my webpages"] = "Kan endre mine websider";
-App::$strings["Can source my public posts in derived channels"] = "Kan bruke mine offentlige innlegg som kanalkilde i egne kanaler";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Litt avansert - svært nyttig i åpne fellesskap";
-App::$strings["Can administer my channel resources"] = "Kan administrere mine kanalressurser";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Ekstremt avansert. La dette være med mindre du vet hva du gjør";
-App::$strings["Social Networking"] = "Sosialt nettverk";
-App::$strings["Social - Mostly Public"] = "Sosial - ganske offentlig";
-App::$strings["Social - Restricted"] = "Sosial - begrenset";
-App::$strings["Social - Private"] = "Sosial - privat";
-App::$strings["Community Forum"] = "Forum for fellesskap";
-App::$strings["Forum - Mostly Public"] = "Forum - ganske offentlig";
-App::$strings["Forum - Restricted"] = "Forum - begrenset";
-App::$strings["Forum - Private"] = "Forum - privat";
-App::$strings["Feed Republish"] = "Republisering av strømmet innhold";
-App::$strings["Feed - Mostly Public"] = "Strøm - ganske offentlig";
-App::$strings["Feed - Restricted"] = "Strøm - begrenset";
-App::$strings["Special Purpose"] = "Spesiell bruk";
-App::$strings["Special - Celebrity/Soapbox"] = "Spesiell - kjendis/talerstol";
-App::$strings["Special - Group Repository"] = "Spesiell - gruppelager";
-App::$strings["Custom/Expert Mode"] = "Tilpasset/Ekspertmodus";
-App::$strings[" and "] = "og";
-App::$strings["public profile"] = "offentlig profil";
-App::$strings["%1\$s changed %2\$s to &ldquo;%3\$s&rdquo;"] = "%1\$s endret %2\$s til &ldquo;%3\$s&rdquo;";
-App::$strings["Visit %1\$s's %2\$s"] = "Besøk %1\$s sitt %2\$s";
-App::$strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s har oppdatert %2\$s, endret %3\$s.";
-App::$strings["Attachments:"] = "Vedlegg:";
-App::$strings["\$Projectname event notification:"] = "\$Projectname hendelsesvarsling:";
 App::$strings["Focus (Hubzilla default)"] = "Focus (Hubzilla standardtema)";
 App::$strings["Theme settings"] = "Temainnstillinger";
 App::$strings["Select scheme"] = "Velg skjema";
@@ -2289,11 +2328,12 @@ App::$strings["Left align page content"] = "Venstrejuster sideinnhold";
 App::$strings["Set minimum opacity of nav bar - to hide it"] = "Angi minste dekkevne for navigasjonslinjen - for å skjule den";
 App::$strings["Set size of conversation author photo"] = "Angi størrelsen for samtalens forfatterbilde";
 App::$strings["Set size of followup author photos"] = "Angi størrelsen på forfatterbilder ved oppfølging";
-App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "";
-App::$strings["__ctx:opensearch__ \$Projectname"] = "";
+App::$strings["__ctx:opensearch__ Search %1\$s (%2\$s)"] = "Søk %1\$s (%2\$s)";
+App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["Update %s failed. See error logs."] = "Oppdatering %s mislyktes. Se feilloggen.";
 App::$strings["Update Error at %s"] = "Oppdateringsfeil ved %s";
 App::$strings["Create an account to access services and applications within the Hubzilla"] = "Lag en konto for å få tilgang til tjenester og programmer i Hubzilla";
+App::$strings["Login/Email"] = "";
 App::$strings["Password"] = "Passord";
 App::$strings["Remember me"] = "Husk meg";
 App::$strings["Forgot your password?"] = "Glemt passordet ditt?";
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index 9219a1c06..858724e05 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-06-10 00:02-0700\n"
-"PO-Revision-Date: 2016-06-10 13:57+0000\n"
+"POT-Creation-Date: 2016-07-22 00:02-0700\n"
+"PO-Revision-Date: 2016-07-26 00:17+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"
@@ -18,11 +18,156 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../../Zotlabs/Access/PermissionRoles.php:182
+#: ../../include/permissions.php:904
+msgid "Social Networking"
+msgstr "Sociaal netwerk"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:183
+#: ../../include/permissions.php:904
+msgid "Social - Mostly Public"
+msgstr "Sociaal - Vrijwel alles openbaar"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:184
+#: ../../include/permissions.php:904
+msgid "Social - Restricted"
+msgstr "Sociaal - Beperkt zichtbaar"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:185
+#: ../../include/permissions.php:904
+msgid "Social - Private"
+msgstr "Sociaal - Verborgen kanaal"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:188
+#: ../../include/permissions.php:905
+msgid "Community Forum"
+msgstr "Groepsforum"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:189
+#: ../../include/permissions.php:905
+msgid "Forum - Mostly Public"
+msgstr "Forum - Vrijwel alles openbaar"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:190
+#: ../../include/permissions.php:905
+msgid "Forum - Restricted"
+msgstr "Forum - Beperkt zichtbaar"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:191
+#: ../../include/permissions.php:905
+msgid "Forum - Private"
+msgstr "Forum - Verborgen kanaal"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:194
+#: ../../include/permissions.php:906
+msgid "Feed Republish"
+msgstr "Feed herpubliceren"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:195
+#: ../../include/permissions.php:906
+msgid "Feed - Mostly Public"
+msgstr "Feed - Vrijwel alles openbaar"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:196
+#: ../../include/permissions.php:906
+msgid "Feed - Restricted"
+msgstr "Feed - Beperkt zichtbaar"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:199
+#: ../../include/permissions.php:907
+msgid "Special Purpose"
+msgstr "Speciaal doel"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:200
+#: ../../include/permissions.php:907
+msgid "Special - Celebrity/Soapbox"
+msgstr "Speciaal - Beroemdheid/alleen volgen"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:201
+#: ../../include/permissions.php:907
+msgid "Special - Group Repository"
+msgstr "Speciaal - Groepsopslag"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:204 ../../include/selectors.php:49
+#: ../../include/selectors.php:66 ../../include/selectors.php:104
+#: ../../include/selectors.php:140 ../../include/permissions.php:908
+msgid "Other"
+msgstr "Anders"
+
+#: ../../Zotlabs/Access/PermissionRoles.php:205
+#: ../../include/permissions.php:908
+msgid "Custom/Expert Mode"
+msgstr "Expertmodus/handmatig aanpassen"
+
+#: ../../Zotlabs/Access/Permissions.php:30
+msgid "Can view my channel stream and posts"
+msgstr "Kan mijn kanaal en berichten bekijken"
+
+#: ../../Zotlabs/Access/Permissions.php:31 ../../include/permissions.php:33
+msgid "Can send me their channel stream and posts"
+msgstr "Kan mij de inhoud van hun kanaal en berichten sturen"
+
+#: ../../Zotlabs/Access/Permissions.php:32 ../../include/permissions.php:27
+msgid "Can view my default channel profile"
+msgstr "Kan mijn standaard kanaalprofiel bekijken"
+
+#: ../../Zotlabs/Access/Permissions.php:33 ../../include/permissions.php:28
+msgid "Can view my connections"
+msgstr "Kan een lijst met mijn connecties bekijken"
+
+#: ../../Zotlabs/Access/Permissions.php:34 ../../include/permissions.php:29
+msgid "Can view my file storage and photos"
+msgstr "Kan mijn foto's en andere bestanden bekijken"
+
+#: ../../Zotlabs/Access/Permissions.php:35
+msgid "Can upload/modify my file storage and photos"
+msgstr "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen"
+
+#: ../../Zotlabs/Access/Permissions.php:36
+msgid "Can view my channel webpages"
+msgstr "Kan de webpagina's van mijn kanaal bekijken"
+
+#: ../../Zotlabs/Access/Permissions.php:37
+msgid "Can create/edit my channel webpages"
+msgstr "Kan wegpagina's van mijn kanaal aanmaken en bewerken"
+
+#: ../../Zotlabs/Access/Permissions.php:38
+msgid "Can post on my channel (wall) page"
+msgstr "Kan een bericht in mijn kanaal plaatsen"
+
+#: ../../Zotlabs/Access/Permissions.php:39 ../../include/permissions.php:35
+msgid "Can comment on or like my posts"
+msgstr "Kan op mijn berichten reageren of deze (niet) leuk vinden"
+
+#: ../../Zotlabs/Access/Permissions.php:40 ../../include/permissions.php:36
+msgid "Can send me private mail messages"
+msgstr "Kan mij privéberichten sturen"
+
+#: ../../Zotlabs/Access/Permissions.php:41
+msgid "Can like/dislike profiles and profile things"
+msgstr "Kan profielen en profieldingen leuk en niet leuk vinden "
+
+#: ../../Zotlabs/Access/Permissions.php:42
+msgid "Can forward to all my channel connections via @+ mentions in posts"
+msgstr "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+"
+
+#: ../../Zotlabs/Access/Permissions.php:43
+msgid "Can chat with me"
+msgstr "Kan met mij chatten"
+
+#: ../../Zotlabs/Access/Permissions.php:44 ../../include/permissions.php:44
+msgid "Can source my public posts in derived channels"
+msgstr "Kan mijn openbare berichten als bron voor andere kanalen gebruiken"
+
+#: ../../Zotlabs/Access/Permissions.php:45
+msgid "Can administer my channel"
+msgstr "Kan mijn kanaal beheren"
+
 #: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
 msgid "parent"
 msgstr "omhoog"
 
-#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2620
+#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2605
 msgid "Collection"
 msgstr "map"
 
@@ -46,16 +191,17 @@ msgstr "Planning-postvak IN"
 msgid "Schedule Outbox"
 msgstr "Planning-postvak UIT"
 
-#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:798
-#: ../../Zotlabs/Module/Photos.php:1243 ../../Zotlabs/Lib/Apps.php:486
-#: ../../Zotlabs/Lib/Apps.php:561 ../../include/widgets.php:1505
-#: ../../include/conversation.php:1032
+#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:796
+#: ../../Zotlabs/Module/Photos.php:1241
+#: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:490
+#: ../../Zotlabs/Lib/Apps.php:565 ../../include/conversation.php:1035
+#: ../../include/widgets.php:1599
 msgid "Unknown"
 msgstr "Onbekend"
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93
-#: ../../include/conversation.php:1639
+#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:93
+#: ../../include/conversation.php:1654
 msgid "Files"
 msgstr "Bestanden"
 
@@ -68,22 +214,23 @@ msgid "Shared"
 msgstr "Gedeeld"
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
-#: ../../Zotlabs/Module/Blocks.php:156 ../../Zotlabs/Module/Layouts.php:182
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
-#: ../../Zotlabs/Module/Webpages.php:186
+#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/New_channel.php:142
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Webpages.php:193
 msgid "Create"
 msgstr "Aanmaken"
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Profile_photo.php:368 ../../include/widgets.php:1518
+#: ../../Zotlabs/Module/Photos.php:823 ../../Zotlabs/Module/Photos.php:1362
+#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1612
 msgid "Upload"
 msgstr "Uploaden"
 
 #: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:247
-#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:592
-#: ../../Zotlabs/Module/Settings.php:618
+#: ../../Zotlabs/Module/Admin.php:1223 ../../Zotlabs/Module/Settings.php:646
+#: ../../Zotlabs/Module/Settings.php:672
 #: ../../Zotlabs/Module/Sharedwithme.php:99
 msgid "Name"
 msgstr "Naam"
@@ -93,7 +240,7 @@ msgid "Type"
 msgstr "Type"
 
 #: ../../Zotlabs/Storage/Browser.php:237
-#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1344
+#: ../../Zotlabs/Module/Sharedwithme.php:101 ../../include/text.php:1324
 msgid "Size"
 msgstr "Grootte"
 
@@ -102,34 +249,32 @@ msgstr "Grootte"
 msgid "Last Modified"
 msgstr "Laatst gewijzigd"
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Editpost.php:84
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Editlayout.php:113
-#: ../../Zotlabs/Module/Editwebpage.php:146
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Settings.php:652
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Webpages.php:187
-#: ../../Zotlabs/Lib/Apps.php:337 ../../Zotlabs/Lib/ThreadItem.php:106
-#: ../../include/channel.php:937 ../../include/channel.php:941
-#: ../../include/menu.php:108 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36
+#: ../../Zotlabs/Module/Editlayout.php:114
+#: ../../Zotlabs/Module/Editwebpage.php:145
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Settings.php:706 ../../Zotlabs/Module/Thing.php:260
+#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/page_widgets.php:9
+#: ../../include/page_widgets.php:39 ../../include/channel.php:976
+#: ../../include/channel.php:980 ../../include/menu.php:108
 msgid "Edit"
 msgstr "Bewerken"
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Blocks.php:159
-#: ../../Zotlabs/Module/Connedit.php:572
-#: ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Connedit.php:602
 #: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Editlayout.php:136
-#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039
+#: ../../Zotlabs/Module/Editlayout.php:137
+#: ../../Zotlabs/Module/Editwebpage.php:169 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Photos.php:1171 ../../Zotlabs/Module/Admin.php:1039
 #: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114
-#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261
-#: ../../Zotlabs/Module/Webpages.php:189 ../../Zotlabs/Lib/Apps.php:338
-#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:657
+#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Module/Settings.php:707 ../../Zotlabs/Module/Thing.php:261
+#: ../../Zotlabs/Module/Webpages.php:196 ../../Zotlabs/Lib/Apps.php:342
+#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -155,74 +300,73 @@ msgstr "Nieuwe map aanmaken"
 msgid "Upload file"
 msgstr "Bestand uploaden"
 
-#: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:112
+#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Module/Import_items.php:114
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../include/items.php:385
+#: ../../include/items.php:384
 msgid "Permission denied"
 msgstr "Toegang geweigerd"
 
-#: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Channel.php:105
-#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Block.php:26
-#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Editblock.php:67
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:65
+#: ../../Zotlabs/Module/Achievements.php:34
+#: ../../Zotlabs/Module/Connedit.php:390 ../../Zotlabs/Module/Id.php:76
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Events.php:264
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290
-#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Events.php:265
-#: ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Chat.php:100
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:69
-#: ../../Zotlabs/Module/Editwebpage.php:90
-#: ../../Zotlabs/Module/Editwebpage.php:105
-#: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Api.php:13 ../../Zotlabs/Module/Api.php:18
-#: ../../Zotlabs/Module/Filestorage.php:24
-#: ../../Zotlabs/Module/Filestorage.php:79
-#: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Item.php:210
-#: ../../Zotlabs/Module/Item.php:218 ../../Zotlabs/Module/Item.php:1070
+#: ../../Zotlabs/Module/Editwebpage.php:68
+#: ../../Zotlabs/Module/Editwebpage.php:89
+#: ../../Zotlabs/Module/Editwebpage.php:104
+#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Pdledit.php:26
+#: ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Filestorage.php:78
+#: ../../Zotlabs/Module/Filestorage.php:93
+#: ../../Zotlabs/Module/Filestorage.php:120
 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
-#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Id.php:76
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
+#: ../../Zotlabs/Module/Item.php:213 ../../Zotlabs/Module/Item.php:221
+#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Photos.php:73
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:121
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Channel.php:104
+#: ../../Zotlabs/Module/Channel.php:225 ../../Zotlabs/Module/Channel.php:266
 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
-#: ../../Zotlabs/Module/Notifications.php:70
-#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:90 ../../Zotlabs/Module/Pdledit.php:26
-#: ../../Zotlabs/Module/Poke.php:137 ../../Zotlabs/Module/Profile.php:68
-#: ../../Zotlabs/Module/Profile.php:76 ../../Zotlabs/Module/Profiles.php:203
-#: ../../Zotlabs/Module/Profiles.php:601
-#: ../../Zotlabs/Module/Profile_photo.php:256
-#: ../../Zotlabs/Module/Profile_photo.php:269
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Appman.php:75
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137
+#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
+#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Profile_photo.php:265
+#: ../../Zotlabs/Module/Profile_photo.php:278
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Editblock.php:67
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
-#: ../../Zotlabs/Module/Sharedwithme.php:11
+#: ../../Zotlabs/Module/Settings.php:626 ../../Zotlabs/Module/Setup.php:215
+#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Thing.php:274
+#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:331
 #: ../../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:25
-#: ../../Zotlabs/Module/Viewconnections.php:30
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Webpages.php:74
-#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/items.php:3438
-#: ../../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/photos.php:27
+#: ../../Zotlabs/Module/Webpages.php:73
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Api.php:13
+#: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../include/photos.php:27 ../../include/attach.php:141
+#: ../../include/attach.php:189 ../../include/attach.php:252
+#: ../../include/attach.php:266 ../../include/attach.php:273
+#: ../../include/attach.php:338 ../../include/attach.php:352
+#: ../../include/attach.php:359 ../../include/attach.php:439
+#: ../../include/attach.php:901 ../../include/attach.php:972
+#: ../../include/attach.php:1124 ../../include/items.php:3448
 msgid "Permission denied."
 msgstr "Toegang geweigerd."
 
@@ -230,9 +374,9 @@ msgstr "Toegang geweigerd."
 msgid "Not Found"
 msgstr "Niet gevonden"
 
-#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:117 ../../Zotlabs/Module/Help.php:97
-#: ../../Zotlabs/Module/Page.php:93
+#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Display.php:118
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Help.php:97
+#: ../../Zotlabs/Module/Block.php:79
 msgid "Page not found."
 msgstr "Pagina niet gevonden."
 
@@ -248,13 +392,13 @@ msgstr "Authenticatie op afstand geblokkeerd. Je bent lokaal op deze hub ingelog
 msgid "Welcome %s. Remote authentication successful."
 msgstr "Welkom %s. Authenticatie op afstand geslaagd."
 
-#: ../../Zotlabs/Module/Achievements.php:15 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Editlayout.php:31
-#: ../../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/channel.php:837
+#: ../../Zotlabs/Module/Achievements.php:15
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Layouts.php:31
+#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:33
+#: ../../include/channel.php:876
 msgid "Requested profile is not available."
 msgstr "Opgevraagd profiel is niet beschikbaar"
 
@@ -262,229 +406,6 @@ msgstr "Opgevraagd profiel is niet beschikbaar"
 msgid "Some blurb about what to do when you're new here"
 msgstr "Welkom op $Projectname. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook <a href=\"directory\">apps</a>, waar je vrijwel alle functies van $Projectname kunt vinden. Voor <a href=\"directory\">hulp</a> met $Projectname klik je op het vraagteken."
 
-#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:152
-#: ../../Zotlabs/Module/Editblock.php:108
-msgid "Block Name"
-msgstr "Bloknaam"
-
-#: ../../Zotlabs/Module/Blocks.php:151 ../../include/text.php:2265
-msgid "Blocks"
-msgstr "Blokken"
-
-#: ../../Zotlabs/Module/Blocks.php:153
-msgid "Block Title"
-msgstr "Bloktitel"
-
-#: ../../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: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:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Module/Webpages.php:188
-#: ../../include/conversation.php:1208
-msgid "Share"
-msgstr "Delen"
-
-#: ../../Zotlabs/Module/Blocks.php:163 ../../Zotlabs/Module/Layouts.php:195
-#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Webpages.php:193
-#: ../../include/page_widgets.php:39
-msgid "View"
-msgstr "Weergeven"
-
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Block.php:43
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Wall_upload.php:33
-msgid "Channel not found."
-msgstr "Kanaal niet gevonden."
-
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
-msgstr "Permissies niet toegestaan"
-
-#: ../../Zotlabs/Module/Cal.php:259 ../../Zotlabs/Module/Events.php:588
-msgid "l, F j"
-msgstr "l j F"
-
-#: ../../Zotlabs/Module/Cal.php:308 ../../Zotlabs/Module/Events.php:637
-#: ../../include/text.php:1732
-msgid "Link to Source"
-msgstr "Originele locatie"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Edit Event"
-msgstr "Gebeurtenis bewerken"
-
-#: ../../Zotlabs/Module/Cal.php:331 ../../Zotlabs/Module/Events.php:665
-msgid "Create Event"
-msgstr "Gebeurtenis aanmaken"
-
-#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
-#: ../../Zotlabs/Module/Photos.php:949
-msgid "Previous"
-msgstr "Vorige"
-
-#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
-#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
-msgid "Next"
-msgstr "Volgende"
-
-#: ../../Zotlabs/Module/Cal.php:334 ../../Zotlabs/Module/Events.php:668
-#: ../../include/widgets.php:755
-msgid "Export"
-msgstr "Exporteren"
-
-#: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Events.php:671
-#: ../../include/widgets.php:756
-msgid "Import"
-msgstr "Importeren"
-
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Connect.php:98
-#: ../../Zotlabs/Module/Connedit.php:731 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Import.php:550
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Photos.php:677
-#: ../../Zotlabs/Module/Photos.php:1052 ../../Zotlabs/Module/Photos.php:1092
-#: ../../Zotlabs/Module/Photos.php:1210 ../../Zotlabs/Module/Pconfig.php:107
-#: ../../Zotlabs/Module/Pdledit.php:66 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Rate.php:170
-#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032
-#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421
-#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733
-#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Appman.php:126
-#: ../../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:312
-#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
-#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:757
-#: ../../include/widgets.php:769 ../../include/js_strings.php:22
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Submit"
-msgstr "Opslaan"
-
-#: ../../Zotlabs/Module/Cal.php:341 ../../Zotlabs/Module/Events.php:675
-msgid "Today"
-msgstr "Vandaag"
-
-#: ../../Zotlabs/Module/Channel.php:29 ../../Zotlabs/Module/Chat.php:25
-msgid "You must be logged in to see this page."
-msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken."
-
-#: ../../Zotlabs/Module/Channel.php:41
-msgid "Posts and comments"
-msgstr "Berichten en reacties"
-
-#: ../../Zotlabs/Module/Channel.php:42
-msgid "Only posts"
-msgstr "Alleen berichten"
-
-#: ../../Zotlabs/Module/Channel.php:102
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
-
-#: ../../Zotlabs/Module/Chat.php:181
-msgid "Room not found"
-msgstr "Chatkanaal niet gevonden"
-
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "Leave Room"
-msgstr "Chatkanaal verlaten"
-
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "Delete Room"
-msgstr "Chatkanaal verwijderen"
-
-#: ../../Zotlabs/Module/Chat.php:199
-msgid "I am away right now"
-msgstr "Ik ben momenteel afwezig"
-
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "I am online"
-msgstr "Ik ben online"
-
-#: ../../Zotlabs/Module/Chat.php:202
-msgid "Bookmark this room"
-msgstr "Chatkanaal aan bladwijzers toevoegen"
-
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
-#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1176
-msgid "Please enter a link URL:"
-msgstr "Vul een URL in:"
-
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
-#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
-#: ../../include/conversation.php:1256
-msgid "Encrypt text"
-msgstr "Tekst versleutelen"
-
-#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1143
-msgid "Insert web link"
-msgstr "Weblink invoegen"
-
-#: ../../Zotlabs/Module/Chat.php:218
-msgid "Feature disabled."
-msgstr "Functie uitgeschakeld."
-
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "New Chatroom"
-msgstr "Nieuw chatkanaal"
-
-#: ../../Zotlabs/Module/Chat.php:233
-msgid "Chatroom name"
-msgstr "Naam chatkanaal"
-
-#: ../../Zotlabs/Module/Chat.php:234
-msgid "Expiration of chats (minutes)"
-msgstr "Aantal minuten voordat chatberichten worden verwijderd"
-
-#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
-#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
-#: ../../include/acl_selectors.php:283
-msgid "Permissions"
-msgstr "Permissies"
-
-#: ../../Zotlabs/Module/Chat.php:246
-#, php-format
-msgid "%1$s's Chatrooms"
-msgstr "Chatkanalen van %1$s"
-
-#: ../../Zotlabs/Module/Chat.php:251
-msgid "No chatrooms available"
-msgstr "Geen chatkanalen beschikbaar"
-
-#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Create New"
-msgstr "Nieuwe aanmaken"
-
-#: ../../Zotlabs/Module/Chat.php:255
-msgid "Expiration"
-msgstr "Verloopt na"
-
-#: ../../Zotlabs/Module/Chat.php:256
-msgid "min"
-msgstr "min"
-
 #: ../../Zotlabs/Module/Chatsvc.php:117
 msgid "Away"
 msgstr "Afwezig"
@@ -493,65 +414,6 @@ msgstr "Afwezig"
 msgid "Online"
 msgstr "Online"
 
-#: ../../Zotlabs/Module/Block.php:31 ../../Zotlabs/Module/Page.php:40
-msgid "Invalid item."
-msgstr "Ongeldig item."
-
-#: ../../Zotlabs/Module/Bookmarks.php:53
-msgid "Bookmark added"
-msgstr "Bladwijzer toegevoegd"
-
-#: ../../Zotlabs/Module/Bookmarks.php:75
-msgid "My Bookmarks"
-msgstr "Mijn bladwijzers"
-
-#: ../../Zotlabs/Module/Bookmarks.php:86
-msgid "My Connections Bookmarks"
-msgstr "Bladwijzers van mijn connecties"
-
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
-msgstr "Ga verder"
-
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
-msgstr "Instellen premiumkanaal "
-
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
-msgstr "Restricties voor connecties van premiumkanaal toestaan"
-
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
-msgstr "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, voorschriften voor leden, enz."
-
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
-msgstr "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:"
-
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
-msgstr "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:"
-
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided"
-" on this page."
-msgstr "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina."
-
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
-msgstr "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaal-eigenaar verstrekt) "
-
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
-msgstr "Beperkt of premiumkanaal"
-
 #: ../../Zotlabs/Module/Connedit.php:80
 msgid "Could not access contact record."
 msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
@@ -560,317 +422,350 @@ msgstr "Kon geen toegang krijgen tot de connectie-gegevens."
 msgid "Could not locate selected profile."
 msgstr "Kon het gekozen profiel niet vinden."
 
-#: ../../Zotlabs/Module/Connedit.php:227
+#: ../../Zotlabs/Module/Connedit.php:248
 msgid "Connection updated."
 msgstr "Connectie bijgewerkt."
 
-#: ../../Zotlabs/Module/Connedit.php:229
+#: ../../Zotlabs/Module/Connedit.php:250
 msgid "Failed to update connection record."
 msgstr "Bijwerken van connectie-gegevens mislukt."
 
-#: ../../Zotlabs/Module/Connedit.php:276
+#: ../../Zotlabs/Module/Connedit.php:300
 msgid "is now connected to"
 msgstr "is nu verbonden met"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:654
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Api.php:89
-#: ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:459
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Connedit.php:685
+#: ../../Zotlabs/Module/Events.php:458 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:459 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:89
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "No"
 msgstr "Nee"
 
-#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
-#: ../../Zotlabs/Module/Api.php:88 ../../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:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Admin.php:461
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
+#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Events.php:458
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:468
+#: ../../Zotlabs/Module/Filestorage.php:156
+#: ../../Zotlabs/Module/Filestorage.php:164
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:664
+#: ../../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/Admin.php:461 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Settings.php:635 ../../Zotlabs/Module/Api.php:88
 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
 #: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1707
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
 msgid "Yes"
 msgstr "Ja"
 
-#: ../../Zotlabs/Module/Connedit.php:411
+#: ../../Zotlabs/Module/Connedit.php:435
 msgid "Could not access address book record."
 msgstr "Kon geen toegang krijgen tot de record van de connectie."
 
-#: ../../Zotlabs/Module/Connedit.php:425
+#: ../../Zotlabs/Module/Connedit.php:455
 msgid "Refresh failed - channel is currently unavailable."
 msgstr "Vernieuwen mislukt - kanaal is momenteel niet beschikbaar"
 
-#: ../../Zotlabs/Module/Connedit.php:440 ../../Zotlabs/Module/Connedit.php:449
-#: ../../Zotlabs/Module/Connedit.php:458 ../../Zotlabs/Module/Connedit.php:467
-#: ../../Zotlabs/Module/Connedit.php:480
+#: ../../Zotlabs/Module/Connedit.php:470 ../../Zotlabs/Module/Connedit.php:479
+#: ../../Zotlabs/Module/Connedit.php:488 ../../Zotlabs/Module/Connedit.php:497
+#: ../../Zotlabs/Module/Connedit.php:510
 msgid "Unable to set address book parameters."
 msgstr "Niet in staat om de parameters van connecties in te stellen."
 
-#: ../../Zotlabs/Module/Connedit.php:503
+#: ../../Zotlabs/Module/Connedit.php:533
 msgid "Connection has been removed."
 msgstr "Connectie is verwijderd"
 
-#: ../../Zotlabs/Module/Connedit.php:519 ../../Zotlabs/Lib/Apps.php:219
-#: ../../include/nav.php:86 ../../include/conversation.php:954
+#: ../../Zotlabs/Module/Connedit.php:549 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/nav.php:86 ../../include/conversation.php:957
 msgid "View Profile"
 msgstr "Profiel weergeven"
 
-#: ../../Zotlabs/Module/Connedit.php:522
+#: ../../Zotlabs/Module/Connedit.php:552
 #, php-format
 msgid "View %s's profile"
 msgstr "Profiel van %s weergeven"
 
-#: ../../Zotlabs/Module/Connedit.php:526
+#: ../../Zotlabs/Module/Connedit.php:556
 msgid "Refresh Permissions"
 msgstr "Permissies vernieuwen"
 
-#: ../../Zotlabs/Module/Connedit.php:529
+#: ../../Zotlabs/Module/Connedit.php:559
 msgid "Fetch updated permissions"
 msgstr "Aangepaste permissies ophalen"
 
-#: ../../Zotlabs/Module/Connedit.php:533
+#: ../../Zotlabs/Module/Connedit.php:563
 msgid "Recent Activity"
 msgstr "Recente activiteit/berichten"
 
-#: ../../Zotlabs/Module/Connedit.php:536
+#: ../../Zotlabs/Module/Connedit.php:566
 msgid "View recent posts and comments"
 msgstr "Recente berichten en reacties weergeven"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1041
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1041
 msgid "Unblock"
 msgstr "Deblokkeren"
 
-#: ../../Zotlabs/Module/Connedit.php:540 ../../Zotlabs/Module/Admin.php:1040
+#: ../../Zotlabs/Module/Connedit.php:570 ../../Zotlabs/Module/Admin.php:1040
 msgid "Block"
 msgstr "Blokkeren"
 
-#: ../../Zotlabs/Module/Connedit.php:543
+#: ../../Zotlabs/Module/Connedit.php:573
 msgid "Block (or Unblock) all communications with this connection"
 msgstr "Blokkeer (of deblokkeer) alle communicatie met deze connectie"
 
-#: ../../Zotlabs/Module/Connedit.php:544
+#: ../../Zotlabs/Module/Connedit.php:574
 msgid "This connection is blocked!"
 msgstr "Deze connectie is geblokkeerd!"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 msgid "Unignore"
 msgstr "Niet meer negeren"
 
-#: ../../Zotlabs/Module/Connedit.php:548
+#: ../../Zotlabs/Module/Connedit.php:578
 #: ../../Zotlabs/Module/Connections.php:277
 #: ../../Zotlabs/Module/Notifications.php:55
 msgid "Ignore"
 msgstr "Negeren"
 
-#: ../../Zotlabs/Module/Connedit.php:551
+#: ../../Zotlabs/Module/Connedit.php:581
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr "Negeer (of negeer niet meer) alle inkomende communicatie van deze connectie"
 
-#: ../../Zotlabs/Module/Connedit.php:552
+#: ../../Zotlabs/Module/Connedit.php:582
 msgid "This connection is ignored!"
 msgstr "Deze connectie wordt genegeerd!"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Unarchive"
 msgstr "Niet meer archiveren"
 
-#: ../../Zotlabs/Module/Connedit.php:556
+#: ../../Zotlabs/Module/Connedit.php:586
 msgid "Archive"
 msgstr "Archiveren"
 
-#: ../../Zotlabs/Module/Connedit.php:559
+#: ../../Zotlabs/Module/Connedit.php:589
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr "Archiveer (of dearchiveer) deze connectie - markeer het kanaal als dood, maar bewaar de inhoud"
 
-#: ../../Zotlabs/Module/Connedit.php:560
+#: ../../Zotlabs/Module/Connedit.php:590
 msgid "This connection is archived!"
 msgstr "Deze connectie is gearchiveerd!"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Unhide"
 msgstr "Niet meer verbergen"
 
-#: ../../Zotlabs/Module/Connedit.php:564
+#: ../../Zotlabs/Module/Connedit.php:594
 msgid "Hide"
 msgstr "Verbergen"
 
-#: ../../Zotlabs/Module/Connedit.php:567
+#: ../../Zotlabs/Module/Connedit.php:597
 msgid "Hide or Unhide this connection from your other connections"
 msgstr "Deze connectie verbergen (of niet meer verbergen) voor jouw andere connecties"
 
-#: ../../Zotlabs/Module/Connedit.php:568
+#: ../../Zotlabs/Module/Connedit.php:598
 msgid "This connection is hidden!"
 msgstr "Deze connectie is verborgen!"
 
-#: ../../Zotlabs/Module/Connedit.php:575
+#: ../../Zotlabs/Module/Connedit.php:605
 msgid "Delete this connection"
 msgstr "Deze connectie verwijderen"
 
-#: ../../Zotlabs/Module/Connedit.php:590 ../../include/widgets.php:493
+#: ../../Zotlabs/Module/Connedit.php:620 ../../include/widgets.php:493
 msgid "Me"
 msgstr "Ik"
 
-#: ../../Zotlabs/Module/Connedit.php:591 ../../include/widgets.php:494
+#: ../../Zotlabs/Module/Connedit.php:621 ../../include/widgets.php:494
 msgid "Family"
 msgstr "Familie"
 
-#: ../../Zotlabs/Module/Connedit.php:592 ../../Zotlabs/Module/Settings.php:342
-#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
-#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
-#: ../../include/widgets.php:495 ../../include/selectors.php:123
-#: ../../include/channel.php:389 ../../include/channel.php:390
-#: ../../include/channel.php:397
+#: ../../Zotlabs/Module/Connedit.php:622 ../../Zotlabs/Module/Settings.php:391
+#: ../../Zotlabs/Module/Settings.php:395 ../../Zotlabs/Module/Settings.php:396
+#: ../../Zotlabs/Module/Settings.php:399 ../../Zotlabs/Module/Settings.php:410
+#: ../../include/channel.php:402 ../../include/channel.php:403
+#: ../../include/channel.php:410 ../../include/selectors.php:123
+#: ../../include/widgets.php:495
 msgid "Friends"
 msgstr "Vrienden"
 
-#: ../../Zotlabs/Module/Connedit.php:593 ../../include/widgets.php:496
+#: ../../Zotlabs/Module/Connedit.php:623 ../../include/widgets.php:496
 msgid "Acquaintances"
 msgstr "Kennissen"
 
-#: ../../Zotlabs/Module/Connedit.php:594
+#: ../../Zotlabs/Module/Connedit.php:624
 #: ../../Zotlabs/Module/Connections.php:92
 #: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
 msgid "All"
 msgstr "Alles"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Approve this connection"
 msgstr "Deze connectie accepteren"
 
-#: ../../Zotlabs/Module/Connedit.php:654
+#: ../../Zotlabs/Module/Connedit.php:685
 msgid "Accept connection to allow communication"
 msgstr "Keur deze connectie goed om communicatie toe te staan"
 
-#: ../../Zotlabs/Module/Connedit.php:659
+#: ../../Zotlabs/Module/Connedit.php:690
 msgid "Set Affinity"
 msgstr "Verwantschapsfilter instellen"
 
-#: ../../Zotlabs/Module/Connedit.php:662
+#: ../../Zotlabs/Module/Connedit.php:693
 msgid "Set Profile"
 msgstr "Profiel instellen"
 
-#: ../../Zotlabs/Module/Connedit.php:665
+#: ../../Zotlabs/Module/Connedit.php:696
 msgid "Set Affinity & Profile"
 msgstr "Verwantschapsfilter en profiel instellen"
 
-#: ../../Zotlabs/Module/Connedit.php:698
+#: ../../Zotlabs/Module/Connedit.php:745
 msgid "none"
 msgstr "geen"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/widgets.php:614
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/widgets.php:623
 msgid "Connection Default Permissions"
 msgstr "Standaard permissies voor connecties"
 
-#: ../../Zotlabs/Module/Connedit.php:702 ../../include/items.php:3926
+#: ../../Zotlabs/Module/Connedit.php:749 ../../include/items.php:3935
 #, php-format
 msgid "Connection: %s"
 msgstr "Connectie: %s"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Apply these permissions automatically"
 msgstr "Deze permissies automatisch toepassen"
 
-#: ../../Zotlabs/Module/Connedit.php:703
+#: ../../Zotlabs/Module/Connedit.php:750
 msgid "Connection requests will be approved without your interaction"
 msgstr "Connectieverzoeken zullen automatisch worden geaccepteerd"
 
-#: ../../Zotlabs/Module/Connedit.php:705
+#: ../../Zotlabs/Module/Connedit.php:752
 msgid "This connection's primary address is"
 msgstr "Het primaire kanaaladres van deze connectie is"
 
-#: ../../Zotlabs/Module/Connedit.php:706
+#: ../../Zotlabs/Module/Connedit.php:753
 msgid "Available locations:"
 msgstr "Beschikbare locaties:"
 
-#: ../../Zotlabs/Module/Connedit.php:710
+#: ../../Zotlabs/Module/Connedit.php:757
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr "Permissies die op deze pagina staan vermeld worden op alle nieuwe connecties toegepast."
 
-#: ../../Zotlabs/Module/Connedit.php:711
+#: ../../Zotlabs/Module/Connedit.php:758
 msgid "Connection Tools"
 msgstr "Hulpmiddelen"
 
-#: ../../Zotlabs/Module/Connedit.php:713
+#: ../../Zotlabs/Module/Connedit.php:760
 msgid "Slide to adjust your degree of friendship"
 msgstr "Schuif om te bepalen hoe goed je iemand kent en/of mag"
 
-#: ../../Zotlabs/Module/Connedit.php:714 ../../Zotlabs/Module/Rate.php:159
+#: ../../Zotlabs/Module/Connedit.php:761 ../../Zotlabs/Module/Rate.php:159
 #: ../../include/js_strings.php:20
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: ../../Zotlabs/Module/Connedit.php:715
+#: ../../Zotlabs/Module/Connedit.php:762
 msgid "Slide to adjust your rating"
 msgstr "Gebruik de schuif om je beoordeling te geven"
 
-#: ../../Zotlabs/Module/Connedit.php:716 ../../Zotlabs/Module/Connedit.php:721
+#: ../../Zotlabs/Module/Connedit.php:763 ../../Zotlabs/Module/Connedit.php:768
 msgid "Optionally explain your rating"
 msgstr "Verklaar jouw beoordeling (niet verplicht)"
 
-#: ../../Zotlabs/Module/Connedit.php:718
+#: ../../Zotlabs/Module/Connedit.php:765
 msgid "Custom Filter"
 msgstr "Berichtenfilter"
 
-#: ../../Zotlabs/Module/Connedit.php:719
+#: ../../Zotlabs/Module/Connedit.php:766
 msgid "Only import posts with this text"
 msgstr "Importeer alleen berichten met deze tekst"
 
-#: ../../Zotlabs/Module/Connedit.php:719 ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:766 ../../Zotlabs/Module/Connedit.php:767
 msgid ""
 "words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
 "all posts"
 msgstr "woorden (één per regel), #tags, /regex/ of talen (lang=iso639-1)  - laat leeg om alle berichten te importeren"
 
-#: ../../Zotlabs/Module/Connedit.php:720
+#: ../../Zotlabs/Module/Connedit.php:767
 msgid "Do not import posts with this text"
 msgstr "Importeer geen berichten met deze tekst"
 
-#: ../../Zotlabs/Module/Connedit.php:722
+#: ../../Zotlabs/Module/Connedit.php:769
 msgid "This information is public!"
 msgstr "Deze informatie is openbaar!"
 
-#: ../../Zotlabs/Module/Connedit.php:727
+#: ../../Zotlabs/Module/Connedit.php:774
 msgid "Connection Pending Approval"
 msgstr "Connectie moet nog geaccepteerd worden"
 
-#: ../../Zotlabs/Module/Connedit.php:730
+#: ../../Zotlabs/Module/Connedit.php:777
 msgid "inherited"
 msgstr "geërfd"
 
-#: ../../Zotlabs/Module/Connedit.php:732
+#: ../../Zotlabs/Module/Connedit.php:778 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Events.php:474 ../../Zotlabs/Module/Cal.php:338
+#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:238
+#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Pdledit.php:66
+#: ../../Zotlabs/Module/Filestorage.php:161
+#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Import.php:560
+#: ../../Zotlabs/Module/Photos.php:675 ../../Zotlabs/Module/Photos.php:1050
+#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208
+#: ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Mail.php:370 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771
+#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1211
+#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Admin.php:1648
+#: ../../Zotlabs/Module/Admin.php:1733 ../../Zotlabs/Module/Admin.php:2116
+#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Settings.php:644
+#: ../../Zotlabs/Module/Settings.php:757 ../../Zotlabs/Module/Settings.php:806
+#: ../../Zotlabs/Module/Settings.php:832 ../../Zotlabs/Module/Settings.php:855
+#: ../../Zotlabs/Module/Settings.php:943
+#: ../../Zotlabs/Module/Settings.php:1129 ../../Zotlabs/Module/Setup.php:312
+#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Thing.php:316
+#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:763
+#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:99
+msgid "Submit"
+msgstr "Opslaan"
+
+#: ../../Zotlabs/Module/Connedit.php:779
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken."
 
-#: ../../Zotlabs/Module/Connedit.php:734
+#: ../../Zotlabs/Module/Connedit.php:781
 msgid "Their Settings"
 msgstr "Hun instellingen"
 
-#: ../../Zotlabs/Module/Connedit.php:735
+#: ../../Zotlabs/Module/Connedit.php:782
 msgid "My Settings"
 msgstr "Mijn instellingen"
 
-#: ../../Zotlabs/Module/Connedit.php:737
+#: ../../Zotlabs/Module/Connedit.php:784
 msgid "Individual Permissions"
 msgstr "Individuele permissies"
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Zotlabs/Module/Connedit.php:785
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -878,7 +773,7 @@ msgid ""
 " settings here."
 msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele instellingen. Je kan je deze overgeërfde permissies hier <strong>niet</strong> veranderen."
 
-#: ../../Zotlabs/Module/Connedit.php:739
+#: ../../Zotlabs/Module/Connedit.php:786
 msgid ""
 "Some permissions may be inherited from your channel's <a "
 "href=\"settings\"><strong>privacy settings</strong></a>, which have higher "
@@ -886,17 +781,121 @@ msgid ""
 "they wont have any impact unless the inherited setting changes."
 msgstr "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. "
 
-#: ../../Zotlabs/Module/Connedit.php:740
+#: ../../Zotlabs/Module/Connedit.php:787
 msgid "Last update:"
 msgstr "Laatste wijziging:"
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Directory.php:63
+#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:20
+#: ../../Zotlabs/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr "Openbare toegang geweigerd."
 
+#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:32
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
+#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3369
+msgid "Item not found."
+msgstr "Item niet gevonden."
+
+#: ../../Zotlabs/Module/Id.php:13
+msgid "First Name"
+msgstr "Voornaam"
+
+#: ../../Zotlabs/Module/Id.php:14
+msgid "Last Name"
+msgstr "Achternaam"
+
+#: ../../Zotlabs/Module/Id.php:15
+msgid "Nickname"
+msgstr "Bijnaam"
+
+#: ../../Zotlabs/Module/Id.php:16
+msgid "Full Name"
+msgstr "Volledige naam"
+
+#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../include/network.php:2203
+msgid "Email"
+msgstr "E-mail"
+
+#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
+#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:238
+msgid "Profile Photo"
+msgstr "Profielfoto"
+
+#: ../../Zotlabs/Module/Id.php:22
+msgid "Profile Photo 16px"
+msgstr "Profielfoto 16px"
+
+#: ../../Zotlabs/Module/Id.php:23
+msgid "Profile Photo 32px"
+msgstr "Profielfoto 32px"
+
+#: ../../Zotlabs/Module/Id.php:24
+msgid "Profile Photo 48px"
+msgstr "Profielfoto 48px"
+
+#: ../../Zotlabs/Module/Id.php:25
+msgid "Profile Photo 64px"
+msgstr "Profielfoto 64px"
+
+#: ../../Zotlabs/Module/Id.php:26
+msgid "Profile Photo 80px"
+msgstr "Profielfoto 80px"
+
+#: ../../Zotlabs/Module/Id.php:27
+msgid "Profile Photo 128px"
+msgstr "Profielfoto 128px"
+
+#: ../../Zotlabs/Module/Id.php:28
+msgid "Timezone"
+msgstr "Tijdzone"
+
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
+msgid "Homepage URL"
+msgstr "URL homepagina"
+
+#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:236
+msgid "Language"
+msgstr "Taal"
+
+#: ../../Zotlabs/Module/Id.php:31
+msgid "Birth Year"
+msgstr "Geboortejaar"
+
+#: ../../Zotlabs/Module/Id.php:32
+msgid "Birth Month"
+msgstr "Geboortemaand"
+
+#: ../../Zotlabs/Module/Id.php:33
+msgid "Birth Day"
+msgstr "Geboortedag"
+
+#: ../../Zotlabs/Module/Id.php:34
+msgid "Birthdate"
+msgstr "Geboortedatum"
+
+#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
+msgid "Gender"
+msgstr "Geslacht"
+
+#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Male"
+msgstr "Man"
+
+#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Female"
+msgstr "Vrouw"
+
+#: ../../Zotlabs/Module/Follow.php:34
+msgid "Channel added."
+msgstr "Kanaal toegevoegd."
+
 #: ../../Zotlabs/Module/Directory.php:243
 #, php-format
 msgid "%d rating"
@@ -916,12 +915,12 @@ msgstr "Status: "
 msgid "Homepage: "
 msgstr "Homepage: "
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1183
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1223
 msgid "Age:"
 msgstr "Leeftijd:"
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/event.php:52
-#: ../../include/event.php:84 ../../include/channel.php:1027
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/channel.php:1066
+#: ../../include/event.php:52 ../../include/event.php:84
 #: ../../include/bb2diaspora.php:507
 msgid "Location:"
 msgstr "Plaats:"
@@ -930,18 +929,18 @@ msgstr "Plaats:"
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1199
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1239
 msgid "Hometown:"
 msgstr "Oorspronkelijk uit:"
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1207
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1247
 msgid "About:"
 msgstr "Over:"
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147
-#: ../../include/widgets.php:184 ../../include/connections.php:78
-#: ../../include/conversation.php:956 ../../include/channel.php:1012
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1051
+#: ../../include/connections.php:78 ../../include/conversation.php:959
+#: ../../include/widgets.php:147 ../../include/widgets.php:184
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -1017,38 +1016,322 @@ msgstr "Oud naar nieuw"
 msgid "No entries (some entries may be hidden)."
 msgstr "Niets gevonden (sommige kanalen kunnen verborgen zijn)."
 
-#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
-#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3359
-msgid "Item not found."
-msgstr "Item niet gevonden."
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
+msgstr "Ga verder"
+
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
+msgstr "Instellen premiumkanaal "
+
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
+msgstr "Restricties voor connecties van premiumkanaal toestaan"
+
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
+msgstr "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, voorschriften voor leden, enz."
+
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
+msgstr "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:"
+
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
+msgstr "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:"
+
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided"
+" on this page."
+msgstr "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina."
+
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
+msgstr "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaal-eigenaar verstrekt) "
+
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
+msgstr "Beperkt of premiumkanaal"
+
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
+msgstr "Agenda-items geïmporteerd."
+
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
+msgstr "Geen agenda-items gevonden."
+
+#: ../../Zotlabs/Module/Events.php:104
+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
+msgid "Unable to generate preview."
+msgstr "Niet in staat om voorvertoning te genereren"
+
+#: ../../Zotlabs/Module/Events.php:113
+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
+msgid "Event not found."
+msgstr "Gebeurtenis niet gevonden"
+
+#: ../../Zotlabs/Module/Events.php:253 ../../Zotlabs/Module/Like.php:372
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
+#: ../../include/text.php:1924 ../../include/event.php:951
+msgid "event"
+msgstr "gebeurtenis"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Edit event title"
+msgstr "Titel bewerken"
+
+#: ../../Zotlabs/Module/Events.php:448
+msgid "Event title"
+msgstr "Titel"
+
+#: ../../Zotlabs/Module/Events.php:448 ../../Zotlabs/Module/Events.php:453
+#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
+#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
+#: ../../include/datetime.php:245
+msgid "Required"
+msgstr "Vereist"
+
+#: ../../Zotlabs/Module/Events.php:450
+msgid "Categories (comma-separated list)"
+msgstr "Categorieën (door komma's gescheiden lijst)"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Edit Category"
+msgstr "Categorie"
+
+#: ../../Zotlabs/Module/Events.php:451
+msgid "Category"
+msgstr "Categorie"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Edit start date and time"
+msgstr "Begindatum en -tijd bewerken"
+
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Start date and time"
+msgstr "Begindatum en -tijd"
+
+#: ../../Zotlabs/Module/Events.php:455 ../../Zotlabs/Module/Events.php:458
+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
+msgid "Edit finish date and time"
+msgstr "Einddatum en -tijd bewerken"
+
+#: ../../Zotlabs/Module/Events.php:457
+msgid "Finish date and time"
+msgstr "Einddatum en -tijd"
+
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+msgid "Adjust for viewer timezone"
+msgstr "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt"
+
+#: ../../Zotlabs/Module/Events.php:459
+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
+msgid "Edit Description"
+msgstr "Omschrijving bewerken"
+
+#: ../../Zotlabs/Module/Events.php:461 ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Rbmark.php:101
+msgid "Description"
+msgstr "Omschrijving"
+
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Location"
+msgstr "Locatie bewerken"
+
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Profiles.php:477
+#: ../../Zotlabs/Module/Profiles.php:698 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
+msgid "Location"
+msgstr "Locatie"
+
+#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Events.php:468
+msgid "Share this event"
+msgstr "Deel deze gebeurtenis"
+
+#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Photos.php:1091
+#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Lib/ThreadItem.php:719
+#: ../../include/page_widgets.php:43 ../../include/conversation.php:1198
+msgid "Preview"
+msgstr "Voorvertoning"
+
+#: ../../Zotlabs/Module/Events.php:470 ../../include/conversation.php:1247
+msgid "Permission settings"
+msgstr "Permissies"
+
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Advanced Options"
+msgstr "Geavanceerde opties"
+
+#: ../../Zotlabs/Module/Events.php:587 ../../Zotlabs/Module/Cal.php:259
+msgid "l, F j"
+msgstr "l j F"
+
+#: ../../Zotlabs/Module/Events.php:609
+msgid "Edit event"
+msgstr "Gebeurtenis bewerken"
+
+#: ../../Zotlabs/Module/Events.php:611
+msgid "Delete event"
+msgstr "Gebeurtenis verwijderen"
+
+#: ../../Zotlabs/Module/Events.php:636 ../../Zotlabs/Module/Cal.php:308
+#: ../../include/text.php:1712
+msgid "Link to Source"
+msgstr "Originele locatie"
+
+#: ../../Zotlabs/Module/Events.php:645
+msgid "calendar"
+msgstr "agenda"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Edit Event"
+msgstr "Gebeurtenis bewerken"
+
+#: ../../Zotlabs/Module/Events.php:664 ../../Zotlabs/Module/Cal.php:331
+msgid "Create Event"
+msgstr "Gebeurtenis aanmaken"
+
+#: ../../Zotlabs/Module/Events.php:665 ../../Zotlabs/Module/Events.php:674
+#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
+#: ../../Zotlabs/Module/Photos.php:947
+msgid "Previous"
+msgstr "Vorige"
+
+#: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:675
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
+#: ../../Zotlabs/Module/Photos.php:956 ../../Zotlabs/Module/Setup.php:267
+msgid "Next"
+msgstr "Volgende"
+
+#: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Cal.php:334
+msgid "Export"
+msgstr "Exporteren"
+
+#: ../../Zotlabs/Module/Events.php:670 ../../Zotlabs/Module/Layouts.php:197
+#: ../../Zotlabs/Module/Pubsites.php:47 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Webpages.php:200 ../../include/page_widgets.php:42
+msgid "View"
+msgstr "Weergeven"
+
+#: ../../Zotlabs/Module/Events.php:671
+msgid "Month"
+msgstr "Maand"
+
+#: ../../Zotlabs/Module/Events.php:672
+msgid "Week"
+msgstr "Week"
+
+#: ../../Zotlabs/Module/Events.php:673
+msgid "Day"
+msgstr "Dag"
+
+#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Cal.php:341
+msgid "Today"
+msgstr "Vandaag"
+
+#: ../../Zotlabs/Module/Events.php:707
+msgid "Event removed"
+msgstr "Gebeurtenis verwijderd"
+
+#: ../../Zotlabs/Module/Events.php:710
+msgid "Failed to remove event"
+msgstr "Verwijderen gebeurtenis mislukt"
+
+#: ../../Zotlabs/Module/Bookmarks.php:53
+msgid "Bookmark added"
+msgstr "Bladwijzer toegevoegd"
+
+#: ../../Zotlabs/Module/Bookmarks.php:75
+msgid "My Bookmarks"
+msgstr "Mijn bladwijzers"
+
+#: ../../Zotlabs/Module/Bookmarks.php:86
+msgid "My Connections Bookmarks"
+msgstr "Bladwijzers van mijn connecties"
 
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 #: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:81
+#: ../../Zotlabs/Module/Editwebpage.php:80
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
 msgid "Item not found"
 msgstr "Item niet gevonden"
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1228
-msgid "Title (optional)"
-msgstr "Titel (optioneel)"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
+msgstr "Item is niet te bewerken"
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
-msgstr "Blok bewerken"
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:134
+msgid "Edit post"
+msgstr "Bericht bewerken"
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
-msgstr "Geen kanaal."
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222
+#: ../../include/nav.php:92 ../../include/conversation.php:1647
+msgid "Photos"
+msgstr "Foto's"
 
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
-msgstr "Veel voorkomende connecties"
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:645
+#: ../../Zotlabs/Module/Settings.php:671 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Wiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:202 ../../include/conversation.php:1235
+#: ../../include/conversation.php:1274
+msgid "Cancel"
+msgstr "Annuleren"
 
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
-msgstr "Geen gemeenschappelijke connecties."
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
+msgstr "Ongeldig item."
+
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Wall_upload.php:33
+msgid "Channel not found."
+msgstr "Kanaal niet gevonden."
+
+#: ../../Zotlabs/Module/Page.php:131
+msgid ""
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
+" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "Save to Folder:"
+msgstr "Bewaar in map: "
+
+#: ../../Zotlabs/Module/Filer.php:52
+msgid "- select -"
+msgstr "- kies map -"
+
+#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
+#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:926
+#: ../../include/text.php:938 ../../include/widgets.php:201
+msgid "Save"
+msgstr "Opslaan"
 
 #: ../../Zotlabs/Module/Connections.php:56
 #: ../../Zotlabs/Module/Connections.php:161
@@ -1076,7 +1359,7 @@ msgstr "Gearchiveerd"
 
 #: ../../Zotlabs/Module/Connections.php:76
 #: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1535
+#: ../../include/conversation.php:1550
 msgid "New"
 msgstr "Nieuw"
 
@@ -1163,15 +1446,15 @@ msgstr "Connectie negeren"
 msgid "Recent activity"
 msgstr "Recente activiteit"
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
-#: ../../include/text.php:875 ../../include/nav.php:186
+#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209
+#: ../../include/nav.php:188 ../../include/text.php:855
 msgid "Connections"
 msgstr "Connecties"
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:228 ../../include/text.php:945
-#: ../../include/text.php:957 ../../include/nav.php:165
-#: ../../include/acl_selectors.php:276
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:167
+#: ../../include/text.php:925 ../../include/text.php:937
+#: ../../include/acl_selectors.php:274
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1184,7 +1467,7 @@ msgid "Connections search"
 msgstr "Connecties zoeken"
 
 #: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:79
+#: ../../Zotlabs/Module/Profile_photo.php:61
 msgid "Image uploaded but image cropping failed."
 msgstr "Afbeelding geüpload, maar afbeelding kon niet worden bijgesneden. "
 
@@ -1194,66 +1477,66 @@ msgid "Cover Photos"
 msgstr "Omslagfoto's"
 
 #: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:133
+#: ../../Zotlabs/Module/Profile_photo.php:135
 msgid "Image resize failed."
 msgstr "Afbeelding kon niet van grootte veranderd worden."
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:192 ../../include/photos.php:144
+#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:148
 msgid "Unable to process image"
 msgstr "Afbeelding kan niet verwerkt worden"
 
 #: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:217
+#: ../../Zotlabs/Module/Profile_photo.php:223
 msgid "Image upload failed."
 msgstr "Uploaden afbeelding mislukt"
 
 #: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:236
+#: ../../Zotlabs/Module/Profile_photo.php:242
 msgid "Unable to process image."
 msgstr "Niet in staat om afbeelding te verwerken."
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4270
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4283
 msgid "female"
 msgstr "vrouw"
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4271
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4284
 #, 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:4272
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4285
 msgid "male"
 msgstr "man"
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4273
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4286
 #, 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:4275
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4288
 #, 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/channel.php:1661
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1726
 msgid "cover photo"
 msgstr "omslagfoto"
 
 #: ../../Zotlabs/Module/Cover_photo.php:303
 #: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:283
-#: ../../Zotlabs/Module/Profile_photo.php:324
+#: ../../Zotlabs/Module/Profile_photo.php:300
+#: ../../Zotlabs/Module/Profile_photo.php:341
 msgid "Photo not available."
 msgstr "Foto niet beschikbaar."
 
 #: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:365
+#: ../../Zotlabs/Module/Profile_photo.php:387
 msgid "Upload File:"
 msgstr "Bestand uploaden:"
 
 #: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:366
+#: ../../Zotlabs/Module/Profile_photo.php:388
 msgid "Select a profile:"
 msgstr "Kies een profiel:"
 
@@ -1262,200 +1545,69 @@ msgid "Upload Cover Photo"
 msgstr "Omslagfoto uploaden"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
-#: ../../Zotlabs/Module/Settings.php:985
+#: ../../Zotlabs/Module/Profile_photo.php:396
+#: ../../Zotlabs/Module/Settings.php:1080
 msgid "or"
 msgstr "of"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "skip this step"
 msgstr "sla deze stap over"
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:374
+#: ../../Zotlabs/Module/Profile_photo.php:396
 msgid "select a photo from your photo albums"
 msgstr "Kies een foto uit jouw fotoalbums"
 
 #: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:390
+#: ../../Zotlabs/Module/Profile_photo.php:415
 msgid "Crop Image"
 msgstr "Afbeelding bijsnijden"
 
 #: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:391
+#: ../../Zotlabs/Module/Profile_photo.php:416
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr "Snij de afbeelding zo uit dat deze optimaal wordt weergegeven."
 
 #: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:393
+#: ../../Zotlabs/Module/Profile_photo.php:418
 msgid "Done Editing"
 msgstr "Klaar met bewerken"
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
-msgstr "Item is niet te bewerken"
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
+msgid "webpage"
+msgstr "Webpagina"
 
-#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:135
-msgid "Edit post"
-msgstr "Bericht bewerken"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
+msgid "block"
+msgstr "blok"
 
-#: ../../Zotlabs/Module/Events.php:26
-msgid "Calendar entries imported."
-msgstr "Agenda-items geïmporteerd."
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
+msgid "layout"
+msgstr "lay-out"
 
-#: ../../Zotlabs/Module/Events.php:28
-msgid "No calendar entries found."
-msgstr "Geen agenda-items gevonden."
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
+msgid "menu"
+msgstr "menu"
 
-#: ../../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/Impel.php:187
+#, php-format
+msgid "%s element installed"
+msgstr "%s onderdeel geïnstalleerd"
 
-#: ../../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/Impel.php:190
+#, php-format
+msgid "%s element installation failed"
+msgstr "Installatie %s-element mislukt"
 
-#: ../../Zotlabs/Module/Events.php:114
-msgid "Event title and start time are required."
-msgstr "Titel en begintijd van gebeurtenis zijn vereist."
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
+msgstr "Permissies niet toegestaan"
 
-#: ../../Zotlabs/Module/Events.php:134 ../../Zotlabs/Module/Events.php:259
-msgid "Event not found."
-msgstr "Gebeurtenis niet gevonden"
-
-#: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949
-#: ../../include/text.php:1943 ../../include/conversation.php:123
-msgid "event"
-msgstr "gebeurtenis"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Edit event title"
-msgstr "Titel bewerken"
-
-#: ../../Zotlabs/Module/Events.php:449
-msgid "Event title"
-msgstr "Titel"
-
-#: ../../Zotlabs/Module/Events.php:449 ../../Zotlabs/Module/Events.php:454
-#: ../../Zotlabs/Module/Profiles.php:709 ../../Zotlabs/Module/Profiles.php:713
-#: ../../Zotlabs/Module/Appman.php:115 ../../Zotlabs/Module/Appman.php:116
-#: ../../include/datetime.php:245
-msgid "Required"
-msgstr "Vereist"
-
-#: ../../Zotlabs/Module/Events.php:451
-msgid "Categories (comma-separated list)"
-msgstr "Categorieën (door komma's gescheiden lijst)"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Edit Category"
-msgstr "Categorie"
-
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Category"
-msgstr "Categorie"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Edit start date and time"
-msgstr "Begindatum en -tijd bewerken"
-
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Start date and time"
-msgstr "Begindatum en -tijd"
-
-#: ../../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:458
-msgid "Edit finish date and time"
-msgstr "Einddatum en -tijd bewerken"
-
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Finish date and time"
-msgstr "Einddatum en -tijd"
-
-#: ../../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: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:462
-msgid "Edit Description"
-msgstr "Omschrijving bewerken"
-
-#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Appman.php:117
-#: ../../Zotlabs/Module/Rbmark.php:101
-msgid "Description"
-msgstr "Omschrijving"
-
-#: ../../Zotlabs/Module/Events.php:464
-msgid "Edit Location"
-msgstr "Locatie bewerken"
-
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
-#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
-msgid "Location"
-msgstr "Locatie"
-
-#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:469
-msgid "Share this event"
-msgstr "Deel deze gebeurtenis"
-
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
-#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Lib/ThreadItem.php:719
-#: ../../include/conversation.php:1187 ../../include/page_widgets.php:40
-msgid "Preview"
-msgstr "Voorvertoning"
-
-#: ../../Zotlabs/Module/Events.php:471 ../../include/conversation.php:1232
-msgid "Permission settings"
-msgstr "Permissies"
-
-#: ../../Zotlabs/Module/Events.php:476
-msgid "Advanced Options"
-msgstr "Geavanceerde opties"
-
-#: ../../Zotlabs/Module/Events.php:610
-msgid "Edit event"
-msgstr "Gebeurtenis bewerken"
-
-#: ../../Zotlabs/Module/Events.php:612
-msgid "Delete event"
-msgstr "Gebeurtenis verwijderen"
-
-#: ../../Zotlabs/Module/Events.php:646
-msgid "calendar"
-msgstr "agenda"
-
-#: ../../Zotlabs/Module/Events.php:706
-msgid "Event removed"
-msgstr "Gebeurtenis verwijderd"
-
-#: ../../Zotlabs/Module/Events.php:709
-msgid "Failed to remove event"
-msgstr "Verwijderen gebeurtenis mislukt"
-
-#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:220
-#: ../../include/nav.php:92 ../../include/conversation.php:1632
-msgid "Photos"
-msgstr "Foto's"
-
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591
-#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1259
-msgid "Cancel"
-msgstr "Annuleren"
+#: ../../Zotlabs/Module/Cal.php:337
+msgid "Import"
+msgstr "Importeren"
 
 #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
 msgid "This site is not a directory server"
@@ -1465,112 +1617,184 @@ msgstr "Deze hub is geen kanalengidshub (directoryserver)"
 msgid "This directory server requires an access token"
 msgstr "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig"
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "Save to Folder:"
-msgstr "Bewaar in map: "
+#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:28
+#: ../../Zotlabs/Module/Wiki.php:20
+msgid "You must be logged in to see this page."
+msgstr "Je moet zijn ingelogd om deze pagina te kunnen bekijken."
 
-#: ../../Zotlabs/Module/Filer.php:52
-msgid "- select -"
-msgstr "- kies map -"
+#: ../../Zotlabs/Module/Chat.php:181
+msgid "Room not found"
+msgstr "Chatkanaal niet gevonden"
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
-#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:946
-#: ../../include/text.php:958 ../../include/widgets.php:201
-msgid "Save"
-msgstr "Opslaan"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "Leave Room"
+msgstr "Chatkanaal verlaten"
 
-#: ../../Zotlabs/Module/Dreport.php:27
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "Delete Room"
+msgstr "Chatkanaal verwijderen"
+
+#: ../../Zotlabs/Module/Chat.php:199
+msgid "I am away right now"
+msgstr "Ik ben momenteel afwezig"
+
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "I am online"
+msgstr "Ik ben online"
+
+#: ../../Zotlabs/Module/Chat.php:202
+msgid "Bookmark this room"
+msgstr "Chatkanaal aan bladwijzers toevoegen"
+
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:197
+#: ../../Zotlabs/Module/Mail.php:306 ../../include/conversation.php:1181
+msgid "Please enter a link URL:"
+msgstr "Vul een URL in:"
+
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:250
+#: ../../Zotlabs/Module/Mail.php:375 ../../Zotlabs/Lib/ThreadItem.php:722
+#: ../../include/conversation.php:1271
+msgid "Encrypt text"
+msgstr "Tekst versleutelen"
+
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editwebpage.php:146
+#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:369
+#: ../../Zotlabs/Module/Editblock.php:111 ../../include/conversation.php:1146
+msgid "Insert web link"
+msgstr "Weblink invoegen"
+
+#: ../../Zotlabs/Module/Chat.php:218
+msgid "Feature disabled."
+msgstr "Functie uitgeschakeld."
+
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "New Chatroom"
+msgstr "Nieuw chatkanaal"
+
+#: ../../Zotlabs/Module/Chat.php:233
+msgid "Chatroom name"
+msgstr "Naam chatkanaal"
+
+#: ../../Zotlabs/Module/Chat.php:234
+msgid "Expiration of chats (minutes)"
+msgstr "Aantal minuten voordat chatberichten worden verwijderd"
+
+#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1043
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
+#: ../../include/acl_selectors.php:281
+msgid "Permissions"
+msgstr "Permissies"
+
+#: ../../Zotlabs/Module/Chat.php:246
+#, php-format
+msgid "%1$s's Chatrooms"
+msgstr "Chatkanalen van %1$s"
+
+#: ../../Zotlabs/Module/Chat.php:251
+msgid "No chatrooms available"
+msgstr "Geen chatkanalen beschikbaar"
+
+#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create New"
+msgstr "Nieuwe aanmaken"
+
+#: ../../Zotlabs/Module/Chat.php:255
+msgid "Expiration"
+msgstr "Verloopt na"
+
+#: ../../Zotlabs/Module/Chat.php:256
+msgid "min"
+msgstr "min"
+
+#: ../../Zotlabs/Module/Dreport.php:44
 msgid "Invalid message"
 msgstr "Ongeldig bericht"
 
-#: ../../Zotlabs/Module/Dreport.php:59
+#: ../../Zotlabs/Module/Dreport.php:76
 msgid "no results"
 msgstr "geen resultaten"
 
-#: ../../Zotlabs/Module/Dreport.php:64
+#: ../../Zotlabs/Module/Dreport.php:91
+msgid "channel sync processed"
+msgstr "kanaalsync verwerkt"
+
+#: ../../Zotlabs/Module/Dreport.php:95
+msgid "queued"
+msgstr "in wachtrij"
+
+#: ../../Zotlabs/Module/Dreport.php:99
+msgid "posted"
+msgstr "verstuurd"
+
+#: ../../Zotlabs/Module/Dreport.php:103
+msgid "accepted for delivery"
+msgstr "geaccepteerd om afgeleverd te worden"
+
+#: ../../Zotlabs/Module/Dreport.php:107
+msgid "updated"
+msgstr "geüpdatet"
+
+#: ../../Zotlabs/Module/Dreport.php:110
+msgid "update ignored"
+msgstr "update genegeerd"
+
+#: ../../Zotlabs/Module/Dreport.php:113
+msgid "permission denied"
+msgstr "toegang geweigerd"
+
+#: ../../Zotlabs/Module/Dreport.php:117
+msgid "recipient not found"
+msgstr "ontvanger niet gevonden"
+
+#: ../../Zotlabs/Module/Dreport.php:120
+msgid "mail recalled"
+msgstr "Privébericht ingetrokken"
+
+#: ../../Zotlabs/Module/Dreport.php:123
+msgid "duplicate mail received"
+msgstr "dubbel privébericht ontvangen"
+
+#: ../../Zotlabs/Module/Dreport.php:126
+msgid "mail delivered"
+msgstr "privébericht afgeleverd"
+
+#: ../../Zotlabs/Module/Dreport.php:146
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr "Afleveringsrapport voor %1$s"
 
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "channel sync processed"
-msgstr "kanaalsync verwerkt"
+#: ../../Zotlabs/Module/Dreport.php:149
+msgid "Options"
+msgstr "Opties"
 
-#: ../../Zotlabs/Module/Dreport.php:82
-msgid "queued"
-msgstr "in wachtrij"
+#: ../../Zotlabs/Module/Dreport.php:150
+msgid "Redeliver"
+msgstr "Opnieuw afleveren"
 
-#: ../../Zotlabs/Module/Dreport.php:86
-msgid "posted"
-msgstr "verstuurd"
-
-#: ../../Zotlabs/Module/Dreport.php:90
-msgid "accepted for delivery"
-msgstr "geaccepteerd om afgeleverd te worden"
-
-#: ../../Zotlabs/Module/Dreport.php:94
-msgid "updated"
-msgstr "geüpdatet"
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "update ignored"
-msgstr "update genegeerd"
-
-#: ../../Zotlabs/Module/Dreport.php:100
-msgid "permission denied"
-msgstr "toegang geweigerd"
-
-#: ../../Zotlabs/Module/Dreport.php:104
-msgid "recipient not found"
-msgstr "ontvanger niet gevonden"
-
-#: ../../Zotlabs/Module/Dreport.php:107
-msgid "mail recalled"
-msgstr "Privébericht ingetrokken"
-
-#: ../../Zotlabs/Module/Dreport.php:110
-msgid "duplicate mail received"
-msgstr "dubbel privébericht ontvangen"
-
-#: ../../Zotlabs/Module/Dreport.php:113
-msgid "mail delivered"
-msgstr "privébericht afgeleverd"
-
-#: ../../Zotlabs/Module/Editlayout.php:126
-#: ../../Zotlabs/Module/Layouts.php:127 ../../Zotlabs/Module/Layouts.php:186
+#: ../../Zotlabs/Module/Editlayout.php:127
+#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
 msgid "Layout Name"
 msgstr "Naam lay-out"
 
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:130
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:131
 msgid "Layout Description (Optional)"
 msgstr "Lay-out-omschrijving (optioneel)"
 
-#: ../../Zotlabs/Module/Editlayout.php:135
+#: ../../Zotlabs/Module/Editlayout.php:136
 msgid "Edit Layout"
 msgstr "Lay-out bewerken"
 
-#: ../../Zotlabs/Module/Editwebpage.php:143
+#: ../../Zotlabs/Module/Editwebpage.php:142
 msgid "Page link"
 msgstr "Paginalink"
 
-#: ../../Zotlabs/Module/Editwebpage.php:169
+#: ../../Zotlabs/Module/Editwebpage.php:168
 msgid "Edit Webpage"
 msgstr "Webpagina bewerken"
 
-#: ../../Zotlabs/Module/Follow.php:34
-msgid "Channel added."
-msgstr "Kanaal toegevoegd."
-
-#: ../../Zotlabs/Module/Acl.php:227
-msgid "network"
-msgstr "netwerk"
-
-#: ../../Zotlabs/Module/Acl.php:237
-msgid "RSS"
-msgstr "RSS"
-
 #: ../../Zotlabs/Module/Group.php:24
 msgid "Privacy group created."
 msgstr "Privacygroep aangemaakt"
@@ -1580,7 +1804,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:3893
+#: ../../include/items.php:3902
 msgid "Privacy group not found."
 msgstr "Privacygroep niet gevonden"
 
@@ -1624,31 +1848,57 @@ msgstr "Alle kanaalconnecties"
 msgid "Click on a channel to add or remove."
 msgstr "Klik op een kanaal om deze toe te voegen of te verwijderen."
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
-msgid "Share content from Firefox to $Projectname"
-msgstr "Deel webpagina's vanuit Firefox met "
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+msgid "App installed."
+msgstr "App geïnstalleerd"
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
-msgid "Activate the Firefox $Projectname provider"
-msgstr "Activeer de $Projectname-service in Firefox"
+#: ../../Zotlabs/Module/Appman.php:46
+msgid "Malformed app."
+msgstr "Misvormde app."
 
-#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
-msgid "Authorize application connection"
-msgstr "Geef toestemming voor applicatiekoppeling"
+#: ../../Zotlabs/Module/Appman.php:104
+msgid "Embed code"
+msgstr "Insluitcode"
 
-#: ../../Zotlabs/Module/Api.php:62
-msgid "Return to your app and insert this Securty Code:"
-msgstr "Ga terug naar je app en voeg deze beveiligingscode in:"
+#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
+msgid "Edit App"
+msgstr "App bewerken"
 
-#: ../../Zotlabs/Module/Api.php:72
-msgid "Please login to continue."
-msgstr "Inloggen om verder te kunnen gaan."
+#: ../../Zotlabs/Module/Appman.php:110
+msgid "Create App"
+msgstr "App maken"
 
-#: ../../Zotlabs/Module/Api.php:87
-msgid ""
-"Do you want to authorize this application to access your posts and contacts,"
-" 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:115
+msgid "Name of app"
+msgstr "Naam van app"
+
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Location (URL) of app"
+msgstr "Locatie (URL) van app"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Photo icon URL"
+msgstr "URL van pictogram"
+
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "80 x 80 pixels - optional"
+msgstr "80 x 80 pixels (optioneel)"
+
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "Categories (optional, comma separated list)"
+msgstr "Categorieën (optioneel,  door komma's gescheiden lijst)"
+
+#: ../../Zotlabs/Module/Appman.php:120
+msgid "Version ID"
+msgstr "Versie-ID"
+
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Price of app"
+msgstr "Prijs van de app"
+
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Location (URL) to purchase app"
+msgstr "Locatie (URL) om de app aan te schaffen"
 
 #: ../../Zotlabs/Module/Help.php:26
 msgid "Documentation Search"
@@ -1660,8 +1910,8 @@ msgid "Help:"
 msgstr "Hulp:"
 
 #: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:183 ../../Zotlabs/Lib/Apps.php:223
-#: ../../include/nav.php:159
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:225
+#: ../../include/nav.php:161
 msgid "Help"
 msgstr "Hulp"
 
@@ -1669,335 +1919,124 @@ msgstr "Hulp"
 msgid "$Projectname Documentation"
 msgstr "$Projectname-documentatie"
 
-#: ../../Zotlabs/Module/Filestorage.php:88
-msgid "Permission Denied."
-msgstr "Toegang geweigerd"
-
-#: ../../Zotlabs/Module/Filestorage.php:104
-msgid "File not found."
-msgstr "Bestand niet gevonden."
-
-#: ../../Zotlabs/Module/Filestorage.php:147
-msgid "Edit file permissions"
-msgstr "Bestandsrechten bewerken"
-
-#: ../../Zotlabs/Module/Filestorage.php:156
-msgid "Set/edit permissions"
-msgstr "Rechten instellen/bewerken"
-
-#: ../../Zotlabs/Module/Filestorage.php:157
-msgid "Include all files and sub folders"
-msgstr "Toepassen op alle bestanden en submappen"
-
-#: ../../Zotlabs/Module/Filestorage.php:158
-msgid "Return to file list"
-msgstr "Terugkeren naar bestandlijst "
-
-#: ../../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: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:163
-msgid "Share this file"
-msgstr "Dit bestand delen"
-
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Show URL to this file"
-msgstr "Toon URL van dit bestand"
-
-#: ../../Zotlabs/Module/Filestorage.php:165
-msgid "Notify your contacts about this file"
-msgstr "Jouw connecties over dit bestand berichten"
-
-#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
-#: ../../include/nav.php:163
-msgid "Apps"
-msgstr "Apps"
-
 #: ../../Zotlabs/Module/Attach.php:13
 msgid "Item not available."
 msgstr "Item is niet aanwezig."
 
-#: ../../Zotlabs/Module/Import.php:32
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr "Jouw abonnement staat maar %d kanalen toe."
+#: ../../Zotlabs/Module/Pdledit.php:18
+msgid "Layout updated."
+msgstr "Lay-out bijgewerkt."
 
-#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
-msgstr "Niets gevonden om te importeren"
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
+msgid "Edit System Page Description"
+msgstr "Systeempagina's bewerken"
 
-#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
-msgstr "Niet in staat om gegevens van de oude hub te downloaden"
+#: ../../Zotlabs/Module/Pdledit.php:56
+msgid "Layout not found."
+msgstr "Lay-out niet gevonden."
 
-#: ../../Zotlabs/Module/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
-msgstr "Geïmporteerde bestand is leeg"
+#: ../../Zotlabs/Module/Pdledit.php:62
+msgid "Module Name:"
+msgstr "Modulenaam:"
 
-#: ../../Zotlabs/Module/Import.php:122
-#: ../../Zotlabs/Module/Import_items.php:86
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr "Waarschuwing: database-versies lopen %1$d updates achter."
+#: ../../Zotlabs/Module/Pdledit.php:63
+msgid "Layout Help"
+msgstr "Lay-out-hulp"
 
-#: ../../Zotlabs/Module/Import.php:150 ../../include/import.php:86
-msgid "Cloned channel not found. Import failed."
-msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
+#: ../../Zotlabs/Module/Ffsapi.php:12
+msgid "Share content from Firefox to $Projectname"
+msgstr "Deel webpagina's vanuit Firefox met "
 
-#: ../../Zotlabs/Module/Import.php:160
-msgid "No channel. Import failed."
-msgstr "Geen kanaal. Importeren mislukt."
+#: ../../Zotlabs/Module/Ffsapi.php:15
+msgid "Activate the Firefox $Projectname provider"
+msgstr "Activeer de $Projectname-service in Firefox"
 
-#: ../../Zotlabs/Module/Import.php:510
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
-msgstr "Import voltooid."
+#: ../../Zotlabs/Module/Acl.php:312
+msgid "network"
+msgstr "netwerk"
 
-#: ../../Zotlabs/Module/Import.php:532
-msgid "You must be logged in to use this feature."
-msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."
+#: ../../Zotlabs/Module/Acl.php:322
+msgid "RSS"
+msgstr "RSS"
 
-#: ../../Zotlabs/Module/Import.php:537
-msgid "Import Channel"
-msgstr "Kanaal importeren"
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
+msgstr "Toegang geweigerd"
 
-#: ../../Zotlabs/Module/Import.php:538
-msgid ""
-"Use this form to import an existing channel from a different server/hub. You"
-" may retrieve the channel identity from the old server/hub via the network "
-"or provide an export file."
-msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken."
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
+msgstr "Bestand niet gevonden."
 
-#: ../../Zotlabs/Module/Import.php:539
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "File to Upload"
-msgstr "Bestand om te uploaden"
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
+msgstr "Bestandsrechten bewerken"
 
-#: ../../Zotlabs/Module/Import.php:540
-msgid "Or provide the old server/hub details"
-msgstr "Of vul de gegevens van de oude hub in"
+#: ../../Zotlabs/Module/Filestorage.php:155
+msgid "Set/edit permissions"
+msgstr "Rechten instellen/bewerken"
 
-#: ../../Zotlabs/Module/Import.php:541
-msgid "Your old identity address (xyz@example.com)"
-msgstr "Jouw oude kanaaladres (xyz@example.com)"
+#: ../../Zotlabs/Module/Filestorage.php:156
+msgid "Include all files and sub folders"
+msgstr "Toepassen op alle bestanden en submappen"
 
-#: ../../Zotlabs/Module/Import.php:542
-msgid "Your old login email address"
-msgstr "Het e-mailadres van je oude account"
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Return to file list"
+msgstr "Terugkeren naar bestandlijst "
 
-#: ../../Zotlabs/Module/Import.php:543
-msgid "Your old login password"
-msgstr "Wachtwoord van jouw oude account"
+#: ../../Zotlabs/Module/Filestorage.php:159
+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/Import.php:544
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be"
-" able to post from either location, but only one can be marked as the "
-"primary location for files, photos, and media."
-msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."
+#: ../../Zotlabs/Module/Filestorage.php:160
+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/Import.php:545
-msgid "Make this hub my primary location"
-msgstr "Stel deze hub als mijn primaire locatie in"
+#: ../../Zotlabs/Module/Filestorage.php:162
+msgid "Share this file"
+msgstr "Dit bestand delen"
 
-#: ../../Zotlabs/Module/Import.php:546
-msgid ""
-"Import existing posts if possible (experimental - limited by available "
-"memory"
-msgstr "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van beschikbaar servergeheugen)"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Show URL to this file"
+msgstr "Toon URL van dit bestand"
 
-#: ../../Zotlabs/Module/Import.php:547
-msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
-msgstr "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid."
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Notify your contacts about this file"
+msgstr "Jouw connecties over dit bestand berichten"
 
-#: ../../Zotlabs/Module/Item.php:178
-msgid "Unable to locate original post."
-msgstr "Niet in staat om de originele locatie van het bericht te vinden. "
-
-#: ../../Zotlabs/Module/Item.php:427
-msgid "Empty post discarded."
-msgstr "Leeg bericht geannuleerd"
-
-#: ../../Zotlabs/Module/Item.php:467
-msgid "Executable content type not permitted to this channel."
-msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."
-
-#: ../../Zotlabs/Module/Item.php:847
-msgid "Duplicate post suppressed."
-msgstr "Dubbel bericht tegengehouden."
-
-#: ../../Zotlabs/Module/Item.php:977
-msgid "System error. Post not saved."
-msgstr "Systeemfout. Bericht niet opgeslagen."
-
-#: ../../Zotlabs/Module/Item.php:1241
-msgid "Unable to obtain post information from database."
-msgstr "Niet in staat om informatie over dit bericht uit de database te verkrijgen."
-
-#: ../../Zotlabs/Module/Item.php:1248
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
-
-#: ../../Zotlabs/Module/Item.php:1255
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
-
-#: ../../Zotlabs/Module/Layouts.php:181 ../../include/text.php:2267
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2240
 msgid "Layouts"
 msgstr "Lay-outs"
 
-#: ../../Zotlabs/Module/Layouts.php:183
+#: ../../Zotlabs/Module/Layouts.php:185
 msgid "Comanche page description language help"
 msgstr "Hulp met de paginabeschrijvingstaal Comanche"
 
-#: ../../Zotlabs/Module/Layouts.php:187
+#: ../../Zotlabs/Module/Layouts.php:189
 msgid "Layout Description"
 msgstr "Lay-out-omschrijving"
 
-#: ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:114
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Webpages.php:205
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr "Aangemaakt"
+
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:115
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Webpages.php:206
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+msgstr "Bewerkt"
+
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1070
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:195
+#: ../../include/conversation.php:1219
+msgid "Share"
+msgstr "Delen"
+
+#: ../../Zotlabs/Module/Layouts.php:194
 msgid "Download PDL file"
 msgstr "Download PDL-bestand"
 
-#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
-#: ../../Zotlabs/Module/Siteinfo.php:65
-msgid "$Projectname"
-msgstr "$Projectname"
-
-#: ../../Zotlabs/Module/Home.php:79
-#, php-format
-msgid "Welcome to %s"
-msgstr "Welkom op %s"
-
-#: ../../Zotlabs/Module/Id.php:13
-msgid "First Name"
-msgstr "Voornaam"
-
-#: ../../Zotlabs/Module/Id.php:14
-msgid "Last Name"
-msgstr "Achternaam"
-
-#: ../../Zotlabs/Module/Id.php:15
-msgid "Nickname"
-msgstr "Bijnaam"
-
-#: ../../Zotlabs/Module/Id.php:16
-msgid "Full Name"
-msgstr "Volledige naam"
-
-#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
-#: ../../include/network.php:2151 ../../boot.php:1705
-msgid "Email"
-msgstr "E-mail"
-
-#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:236
-msgid "Profile Photo"
-msgstr "Profielfoto"
-
-#: ../../Zotlabs/Module/Id.php:22
-msgid "Profile Photo 16px"
-msgstr "Profielfoto 16px"
-
-#: ../../Zotlabs/Module/Id.php:23
-msgid "Profile Photo 32px"
-msgstr "Profielfoto 32px"
-
-#: ../../Zotlabs/Module/Id.php:24
-msgid "Profile Photo 48px"
-msgstr "Profielfoto 48px"
-
-#: ../../Zotlabs/Module/Id.php:25
-msgid "Profile Photo 64px"
-msgstr "Profielfoto 64px"
-
-#: ../../Zotlabs/Module/Id.php:26
-msgid "Profile Photo 80px"
-msgstr "Profielfoto 80px"
-
-#: ../../Zotlabs/Module/Id.php:27
-msgid "Profile Photo 128px"
-msgstr "Profielfoto 128px"
-
-#: ../../Zotlabs/Module/Id.php:28
-msgid "Timezone"
-msgstr "Tijdzone"
-
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
-msgid "Homepage URL"
-msgstr "URL homepagina"
-
-#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:234
-msgid "Language"
-msgstr "Taal"
-
-#: ../../Zotlabs/Module/Id.php:31
-msgid "Birth Year"
-msgstr "Geboortejaar"
-
-#: ../../Zotlabs/Module/Id.php:32
-msgid "Birth Month"
-msgstr "Geboortemaand"
-
-#: ../../Zotlabs/Module/Id.php:33
-msgid "Birth Day"
-msgstr "Geboortedag"
-
-#: ../../Zotlabs/Module/Id.php:34
-msgid "Birthdate"
-msgstr "Geboortedatum"
-
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
-msgid "Gender"
-msgstr "Geslacht"
-
-#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Male"
-msgstr "Man"
-
-#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Female"
-msgstr "Vrouw"
-
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
-msgid "webpage"
-msgstr "Webpagina"
-
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
-msgid "block"
-msgstr "blok"
-
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
-msgid "layout"
-msgstr "lay-out"
-
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
-msgid "menu"
-msgstr "menu"
-
-#: ../../Zotlabs/Module/Impel.php:196
-#, php-format
-msgid "%s element installed"
-msgstr "%s onderdeel geïnstalleerd"
-
-#: ../../Zotlabs/Module/Impel.php:199
-#, php-format
-msgid "%s element installation failed"
-msgstr "Installatie %s-element mislukt"
-
 #: ../../Zotlabs/Module/Like.php:19
 msgid "Like/Dislike"
 msgstr "Leuk/niet leuk"
@@ -2033,1180 +2072,65 @@ msgstr "Kanaal  niet beschikbaar."
 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/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
+#: ../../include/text.php:1921
 msgid "photo"
 msgstr "foto"
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/text.php:1946 ../../include/conversation.php:148
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../include/conversation.php:148 ../../include/text.php:1927
 msgid "status"
 msgstr "bericht"
 
-#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
+#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s vindt %3$s van %2$s leuk"
 
-#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s vindt %3$s van %2$s niet leuk"
 
-#: ../../Zotlabs/Module/Like.php:424
+#: ../../Zotlabs/Module/Like.php:423
 #, php-format
 msgid "%1$s agrees with %2$s's %3$s"
 msgstr "%1$s is het eens met %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:426
+#: ../../Zotlabs/Module/Like.php:425
 #, php-format
 msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr "%1$s is het niet eens met %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:428
+#: ../../Zotlabs/Module/Like.php:427
 #, php-format
 msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr "%1$s onthoudt zich van een besluit over %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:430
+#: ../../Zotlabs/Module/Like.php:429
 #, php-format
 msgid "%1$s is attending %2$s's %3$s"
 msgstr "%1$s is aanwezig op %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:432
+#: ../../Zotlabs/Module/Like.php:431
 #, php-format
 msgid "%1$s is not attending %2$s's %3$s"
 msgstr "%1$s is niet aanwezig op %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:434
+#: ../../Zotlabs/Module/Like.php:433
 #, php-format
 msgid "%1$s may attend %2$s's %3$s"
 msgstr "%1$s is mogelijk aanwezig op %2$s's %3$s"
 
-#: ../../Zotlabs/Module/Like.php:537
+#: ../../Zotlabs/Module/Like.php:536
 msgid "Action completed."
 msgstr "Actie voltooid"
 
-#: ../../Zotlabs/Module/Like.php:538
+#: ../../Zotlabs/Module/Like.php:537
 msgid "Thank you."
 msgstr "Bedankt"
 
-#: ../../Zotlabs/Module/Import_items.php:102
-msgid "Import completed"
-msgstr "Importeren voltooid"
-
-#: ../../Zotlabs/Module/Import_items.php:117
-msgid "Import Items"
-msgstr "Importeer items"
-
-#: ../../Zotlabs/Module/Import_items.php:118
-msgid ""
-"Use this form to import existing posts and content from an export file."
-msgstr "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren."
-
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
-msgstr "Limiet voor aantal uitnodigingen overschreden."
-
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr "%s : Geen geldig e-mailadres."
-
-#: ../../Zotlabs/Module/Invite.php:63
-msgid "Please join us on $Projectname"
-msgstr "Uitnodiging voor $Projectname"
-
-#: ../../Zotlabs/Module/Invite.php:74
-msgid "Invitation limit exceeded. Please contact your site administrator."
-msgstr "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder."
-
-#: ../../Zotlabs/Module/Invite.php:79
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr "%s: Aflevering bericht mislukt."
-
-#: ../../Zotlabs/Module/Invite.php:83
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] "%d bericht verzonden."
-msgstr[1] "%d berichten verzonden."
-
-#: ../../Zotlabs/Module/Invite.php:102
-msgid "You have no more invitations available"
-msgstr "Je hebt geen uitnodigingen meer beschikbaar"
-
-#: ../../Zotlabs/Module/Invite.php:133
-msgid "Send invitations"
-msgstr "Uitnodigingen verzenden"
-
-#: ../../Zotlabs/Module/Invite.php:134
-msgid "Enter email addresses, one per line:"
-msgstr "Voer e-mailadressen in, één per regel:"
-
-#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:249
-msgid "Your message:"
-msgstr "Jouw bericht:"
-
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Please join my community on $Projectname."
-msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op $Projectname te vergezellen. Lees meer over $Projectname  op http://hubzilla.org"
-
-#: ../../Zotlabs/Module/Invite.php:138
-msgid "You will need to supply this invitation code:"
-msgstr "Je moet deze uitnodigingscode opgeven:"
-
-#: ../../Zotlabs/Module/Invite.php:139
-msgid ""
-"1. Register at any $Projectname location (they are all inter-connected)"
-msgstr "1. Registreer je op een willekeurige $Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):"
-
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "2. Enter my $Projectname network address into the site searchbar."
-msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn $Projectname-kanaaladres in het zoekveld invullen:"
-
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "or visit"
-msgstr "of bezoek"
-
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "3. Click [Connect]"
-msgstr "3. Klik op [+ Verbinden]"
-
-#: ../../Zotlabs/Module/Lockview.php:61
-msgid "Remote privacy information not available."
-msgstr "Privacy-informatie op afstand niet beschikbaar."
-
-#: ../../Zotlabs/Module/Lockview.php:82
-msgid "Visible to:"
-msgstr "Zichtbaar voor:"
-
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
-msgstr "Locatie niet gevonden."
-
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
-msgstr "Opzoeken locatie mislukt"
-
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary"
-" location."
-msgstr "Kies eerst een andere primaire locatie alvorens de huidige primaire locatie te verwijderen."
-
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
-msgstr "Locaties synchronizeren"
-
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
-msgstr "Geen locaties gevonden."
-
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
-msgstr "Kanaallocaties beheren"
-
-#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Profiles.php:470
-#: ../../Zotlabs/Module/Admin.php:1224
-msgid "Address"
-msgstr "Kanaaladres"
-
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
-msgstr "Primair"
-
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
-msgid "Drop"
-msgstr "Verwijderen"
-
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
-msgstr "Nu synchroniseren"
-
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
-msgstr "Wacht enkele minuten tussen opeenvolgende handelingen."
-
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing"
-" your channel."
-msgstr "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen."
-
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
-msgstr "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is."
-
-#: ../../Zotlabs/Module/Magic.php:71
-msgid "Hub not found."
-msgstr "Hub niet gevonden."
-
-#: ../../Zotlabs/Module/Mail.php:38
-msgid "Unable to lookup recipient."
-msgstr "Niet in staat om ontvanger op te zoeken."
-
-#: ../../Zotlabs/Module/Mail.php:45
-msgid "Unable to communicate with requested channel."
-msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
-
-#: ../../Zotlabs/Module/Mail.php:52
-msgid "Cannot verify requested channel."
-msgstr "Kan opgevraagd kanaal niet verifieren"
-
-#: ../../Zotlabs/Module/Mail.php:78
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
-
-#: ../../Zotlabs/Module/Mail.php:143
-msgid "Messages"
-msgstr "Berichten"
-
-#: ../../Zotlabs/Module/Mail.php:178
-msgid "Message recalled."
-msgstr "Bericht ingetrokken."
-
-#: ../../Zotlabs/Module/Mail.php:191
-msgid "Conversation removed."
-msgstr "Conversatie verwijderd"
-
-#: ../../Zotlabs/Module/Mail.php:206 ../../Zotlabs/Module/Mail.php:315
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr "Verloopt op DD-MM-YYYY om HH:MM"
-
-#: ../../Zotlabs/Module/Mail.php:234
-msgid "Requested channel is not in this network"
-msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar"
-
-#: ../../Zotlabs/Module/Mail.php:242
-msgid "Send Private Message"
-msgstr "Privébericht versturen"
-
-#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
-msgid "To:"
-msgstr "Aan:"
-
-#: ../../Zotlabs/Module/Mail.php:246 ../../Zotlabs/Module/Mail.php:370
-msgid "Subject:"
-msgstr "Onderwerp:"
-
-#: ../../Zotlabs/Module/Mail.php:251 ../../Zotlabs/Module/Mail.php:376
-#: ../../include/conversation.php:1220
-msgid "Attach file"
-msgstr "Bestand toevoegen"
-
-#: ../../Zotlabs/Module/Mail.php:253
-msgid "Send"
-msgstr "Verzenden"
-
-#: ../../Zotlabs/Module/Mail.php:256 ../../Zotlabs/Module/Mail.php:381
-#: ../../include/conversation.php:1251
-msgid "Set expiration date"
-msgstr "Verloopdatum instellen"
-
-#: ../../Zotlabs/Module/Mail.php:340
-msgid "Delete message"
-msgstr "Bericht verwijderen"
-
-#: ../../Zotlabs/Module/Mail.php:341
-msgid "Delivery report"
-msgstr "Afleveringsrapport"
-
-#: ../../Zotlabs/Module/Mail.php:342
-msgid "Recall message"
-msgstr "Bericht intrekken"
-
-#: ../../Zotlabs/Module/Mail.php:344
-msgid "Message has been recalled."
-msgstr "Bericht is ingetrokken."
-
-#: ../../Zotlabs/Module/Mail.php:361
-msgid "Delete Conversation"
-msgstr "Verwijder conversatie"
-
-#: ../../Zotlabs/Module/Mail.php:363
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender."
-
-#: ../../Zotlabs/Module/Mail.php:367
-msgid "Send Reply"
-msgstr "Antwoord versturen"
-
-#: ../../Zotlabs/Module/Mail.php:372
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr "Jouw privébericht aan %s (%s):"
-
-#: ../../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:143
-msgid "Create a new channel"
-msgstr "Nieuw kanaal aanmaken"
-
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
-#: ../../include/nav.php:206
-msgid "Channel Manager"
-msgstr "Kanaalbeheer"
-
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
-msgstr "Huidig kanaal"
-
-#: ../../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:168
-msgid "Default Channel"
-msgstr "Standaardkanaal"
-
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
-msgstr "Als standaard instellen"
-
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
-msgstr "%d nieuwe berichten"
-
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
-msgstr "%d nieuwe connectieverzoeken"
-
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
-msgstr "Uitbesteed kanaal"
-
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
-msgstr "Geen geldige account gevonden."
-
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
-msgstr "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail."
-
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
-#, php-format
-msgid "Site Member (%s)"
-msgstr "Lid van hub (%s)"
-
-#: ../../Zotlabs/Module/Lostpass.php:44
-#, php-format
-msgid "Password reset requested at %s"
-msgstr "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend"
-
-#: ../../Zotlabs/Module/Lostpass.php:67
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."
-
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1711
-msgid "Password Reset"
-msgstr "Wachtwoord vergeten?"
-
-#: ../../Zotlabs/Module/Lostpass.php:91
-msgid "Your password has been reset as requested."
-msgstr "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht."
-
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your new password is"
-msgstr "Jouw nieuwe wachtwoord is"
-
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Save or copy your new password - and then"
-msgstr "Kopieer of sla je nieuwe wachtwoord op - en"
-
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "click here to login"
-msgstr "klik dan hier om in te loggen"
-
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr "Jouw wachtwoord kan worden veranderd onder <em>instellingen</em>, nadat je succesvol bent ingelogd."
-
-#: ../../Zotlabs/Module/Lostpass.php:112
-#, php-format
-msgid "Your password has changed at %s"
-msgstr "Jouw wachtwoord op %s is veranderd"
-
-#: ../../Zotlabs/Module/Lostpass.php:127
-msgid "Forgot your Password?"
-msgstr "Wachtwoord vergeten?"
-
-#: ../../Zotlabs/Module/Lostpass.php:128
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies."
-
-#: ../../Zotlabs/Module/Lostpass.php:129
-msgid "Email Address"
-msgstr "E-mailadres"
-
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Reset"
-msgstr "Opnieuw instellen"
-
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
-msgstr "Niet in staat om menu aan te passen"
-
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
-msgstr "Niet in staat om menu aan te maken."
-
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
-msgstr "Menunaam"
-
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
-msgstr "Unieke naam vereist (niet zichtbaar op webpagina)"
-
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
-msgstr "Menutitel"
-
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
-msgstr "Zichtbaar op webpagina (leeg laten voor geen titel)"
-
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
-msgstr "Bladwijzers toestaan"
-
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
-msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan"
-
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
-msgstr "Opslaan en doorgaan"
-
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2266
-msgid "Menus"
-msgstr "Menu's"
-
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
-msgstr "Bladwijzers toegestaan"
-
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
-msgstr "Menu verwijderen"
-
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
-msgstr "Bewerk de inhoud van het menu"
-
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
-msgstr "Dit menu bewerken"
-
-#: ../../Zotlabs/Module/Menu.php:136
-msgid "Menu could not be deleted."
-msgstr "Menu kon niet verwijderd worden."
-
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
-msgid "Menu not found."
-msgstr "Menu niet gevonden."
-
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
-msgstr "Menu bewerken"
-
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
-msgstr "Items aan dit menu toevoegen of verwijder"
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
-msgstr "Naam van menu"
-
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
-msgstr "Moet uniek zijn en is alleen zichtbaar voor jou."
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
-msgstr "Titel van menu"
-
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title as seen by others"
-msgstr "Titel van menu zoals anderen dat zien."
-
-#: ../../Zotlabs/Module/Menu.php:157
-msgid "Allow bookmarks"
-msgstr "Bladwijzers toestaan"
-
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
-msgstr "Niet gevonden."
-
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr "%1$s is %2$s"
-
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:225
-msgid "Mood"
-msgstr "Stemming"
-
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
-msgstr "Noteer je huidige stemming en toon het aan je connecties"
-
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
-msgstr "Profielovereenkomst"
-
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
-msgstr "Je hebt geen trefwoorden waarmee overeenkomsten gevonden kunnen worden. Voeg enkele trefwoorden aan je standaardprofiel toe."
-
-#: ../../Zotlabs/Module/Match.php:67
-msgid "is interested in:"
-msgstr "is geïnteresseerd in:"
-
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
-msgstr "Geen overeenkomsten"
-
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
-msgstr "Collectie niet gevonden"
-
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
-msgstr "Niet zo'n kanaal"
-
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
-msgstr "forum"
-
-#: ../../Zotlabs/Module/Network.php:153
-msgid "Search Results For:"
-msgstr "Zoekresultaten voor:"
-
-#: ../../Zotlabs/Module/Network.php:217
-msgid "Privacy group is empty"
-msgstr "Privacygroep is leeg"
-
-#: ../../Zotlabs/Module/Network.php:226
-msgid "Privacy group: "
-msgstr "Privacygroep: "
-
-#: ../../Zotlabs/Module/Network.php:252
-msgid "Invalid connection."
-msgstr "Ongeldige connectie."
-
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:98
-msgid "No more system notifications."
-msgstr "Geen systeemnotificaties meer."
-
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:102
-msgid "System Notifications"
-msgstr "Systeemnotificaties"
-
-#: ../../Zotlabs/Module/Mitem.php:52
-msgid "Unable to create element."
-msgstr "Niet in staat om onderdeel aan te maken."
-
-#: ../../Zotlabs/Module/Mitem.php:76
-msgid "Unable to update menu element."
-msgstr "Menu-onderdeel kan niet worden geüpdatet."
-
-#: ../../Zotlabs/Module/Mitem.php:92
-msgid "Unable to add menu element."
-msgstr "Menu-onderdeel kan niet worden toegevoegd."
-
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
-msgid "Menu Item Permissions"
-msgstr "Permissies menu-item"
-
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
-#: ../../Zotlabs/Module/Settings.php:1068
-msgid "(click to open/close)"
-msgstr "(klik om te openen/sluiten)"
-
-#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
-msgid "Link Name"
-msgstr "Linknaam"
-
-#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
-msgid "Link or Submenu Target"
-msgstr "Linkdoel of submenu-doel"
-
-#: ../../Zotlabs/Module/Mitem.php:157
-msgid "Enter URL of the link or select a menu name to create a submenu"
-msgstr "Geef de URL van de link of kies een menunaam om een submenu aan te maken"
-
-#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
-msgid "Use magic-auth if available"
-msgstr "Gebruik magic-auth wanneer beschikbaar"
-
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
-msgid "Open link in new window"
-msgstr "Open link in nieuw venster"
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Order in list"
-msgstr "Volgorde in lijst"
-
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
-msgid "Higher numbers will sink to bottom of listing"
-msgstr "Hogere nummers komen onderaan de lijst terecht"
-
-#: ../../Zotlabs/Module/Mitem.php:161
-msgid "Submit and finish"
-msgstr "Opslaan en afsluiten"
-
-#: ../../Zotlabs/Module/Mitem.php:162
-msgid "Submit and continue"
-msgstr "Opslaan en doorgaan"
-
-#: ../../Zotlabs/Module/Mitem.php:170
-msgid "Menu:"
-msgstr "Menu:"
-
-#: ../../Zotlabs/Module/Mitem.php:173
-msgid "Link Target"
-msgstr "Linkdoel"
-
-#: ../../Zotlabs/Module/Mitem.php:176
-msgid "Edit menu"
-msgstr "Menu bewerken"
-
-#: ../../Zotlabs/Module/Mitem.php:179
-msgid "Edit element"
-msgstr "Onderdeel bewerken"
-
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Drop element"
-msgstr "Onderdeel verwijderen"
-
-#: ../../Zotlabs/Module/Mitem.php:181
-msgid "New element"
-msgstr "Nieuw element"
-
-#: ../../Zotlabs/Module/Mitem.php:182
-msgid "Edit this menu container"
-msgstr "Deze menu-container bewerken"
-
-#: ../../Zotlabs/Module/Mitem.php:183
-msgid "Add menu element"
-msgstr "Menu-element toevoegen"
-
-#: ../../Zotlabs/Module/Mitem.php:184
-msgid "Delete this menu item"
-msgstr "Dit menu-item verwijderen"
-
-#: ../../Zotlabs/Module/Mitem.php:185
-msgid "Edit this menu item"
-msgstr "Dit menu-item bewerken"
-
-#: ../../Zotlabs/Module/Mitem.php:202
-msgid "Menu item not found."
-msgstr "Menu-item niet gevonden."
-
-#: ../../Zotlabs/Module/Mitem.php:215
-msgid "Menu item deleted."
-msgstr "Menu-item verwijderd."
-
-#: ../../Zotlabs/Module/Mitem.php:217
-msgid "Menu item could not be deleted."
-msgstr "Menu-item kon niet worden verwijderd."
-
-#: ../../Zotlabs/Module/Mitem.php:224
-msgid "Edit Menu Element"
-msgstr "Menu-element bewerken"
-
-#: ../../Zotlabs/Module/Mitem.php:230
-msgid "Link text"
-msgstr "Linktekst"
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Name or caption"
-msgstr "Naam"
-
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
-msgstr "Voorbeelden: \"Jan Pietersen\", \"Willems weblog\", \"Computerforum\""
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-msgid "Choose a short nickname"
-msgstr "Korte bijnaam"
-
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-#, php-format
-msgid ""
-"Your nickname will be used to create an easy to remember channel address "
-"e.g. nickname%s"
-msgstr "Deze bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres van jouw kanaal aan te maken, die je dan met anderen kunt delen. Bijvoorbeeld: bijnaam%s"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Channel role and privacy"
-msgstr "Kanaaltype en privacy"
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Select a channel role with your privacy requirements."
-msgstr "Kies een kanaaltype met het door jou gewenste privacyniveau."
-
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Read more about roles"
-msgstr "Lees meer over kanaaltypes"
-
-#: ../../Zotlabs/Module/New_channel.php:135
-msgid "Create Channel"
-msgstr "Kanaal aanmaken"
-
-#: ../../Zotlabs/Module/New_channel.php:136
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
-msgstr "Een kanaal is jouw identiteit in dit netwerk. Het kan bijvoorbeeld een persoon, een blog of een forum vertegenwoordigen. Door met elkaar te verbinden kunnen kanalen, met behulp van uitgebreide permissies, informatie uitwisselen."
-
-#: ../../Zotlabs/Module/New_channel.php:137
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr "Of <a href=\"import\">importeer een bestaand kanaal</a> vanaf een andere locatie"
-
-#: ../../Zotlabs/Module/Notifications.php:30
-msgid "Invalid request identifier."
-msgstr "Ongeldige verzoek identificator (request identifier)"
-
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "Discard"
-msgstr "Annuleren"
-
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
-msgid "Mark all system notifications seen"
-msgstr "Markeer alle systeemnotificaties als bekeken"
-
-#: ../../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:99 ../../Zotlabs/Module/Photos.php:743
-#: ../../Zotlabs/Module/Profile_photo.php:114
-#: ../../Zotlabs/Module/Profile_photo.php:206
-#: ../../Zotlabs/Module/Profile_photo.php:294
-#: ../../include/photo/photo_driver.php:718
-msgid "Profile Photos"
-msgstr "Profielfoto's"
-
-#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
-msgid "Album not found."
-msgstr "Album niet gevonden."
-
-#: ../../Zotlabs/Module/Photos.php:132
-msgid "Delete Album"
-msgstr "Verwijder album"
-
-#: ../../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:210 ../../Zotlabs/Module/Photos.php:1053
-msgid "Delete Photo"
-msgstr "Verwijder foto"
-
-#: ../../Zotlabs/Module/Photos.php:533
-msgid "No photos selected"
-msgstr "Geen foto's geselecteerd"
-
-#: ../../Zotlabs/Module/Photos.php:582
-msgid "Access to this item is restricted."
-msgstr "Toegang tot dit item is beperkt."
-
-#: ../../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:624
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr "%1$.2f MB aan foto-opslag gebruikt."
-
-#: ../../Zotlabs/Module/Photos.php:660
-msgid "Upload Photos"
-msgstr "Foto's uploaden"
-
-#: ../../Zotlabs/Module/Photos.php:664
-msgid "Enter an album name"
-msgstr "Vul een albumnaam in"
-
-#: ../../Zotlabs/Module/Photos.php:665
-msgid "or select an existing album (doubleclick)"
-msgstr "of kies een bestaand album (dubbelklikken)"
-
-#: ../../Zotlabs/Module/Photos.php:666
-msgid "Create a status post for this upload"
-msgstr "Plaats een bericht voor deze upload."
-
-#: ../../Zotlabs/Module/Photos.php:667
-msgid "Caption (optional):"
-msgstr "Bijschrift (optioneel):"
-
-#: ../../Zotlabs/Module/Photos.php:668
-msgid "Description (optional):"
-msgstr "Omschrijving (optioneel):"
-
-#: ../../Zotlabs/Module/Photos.php:695
-msgid "Album name could not be decoded"
-msgstr "Albumnaam kon niet gedecodeerd worden"
-
-#: ../../Zotlabs/Module/Photos.php:743
-msgid "Contact Photos"
-msgstr "Connectiefoto's"
-
-#: ../../Zotlabs/Module/Photos.php:766
-msgid "Show Newest First"
-msgstr "Nieuwste eerst weergeven"
-
-#: ../../Zotlabs/Module/Photos.php:768
-msgid "Show Oldest First"
-msgstr "Oudste eerst weergeven"
-
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
-#: ../../include/widgets.php:1499
-msgid "View Photo"
-msgstr "Foto weergeven"
-
-#: ../../Zotlabs/Module/Photos.php:823 ../../include/widgets.php:1516
-msgid "Edit Album"
-msgstr "Album bewerken"
-
-#: ../../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:872
-msgid "Photo not available"
-msgstr "Foto niet aanwezig"
-
-#: ../../Zotlabs/Module/Photos.php:930
-msgid "Use as profile photo"
-msgstr "Als profielfoto gebruiken"
-
-#: ../../Zotlabs/Module/Photos.php:931
-msgid "Use as cover photo"
-msgstr "Als omslagfoto gebruiken"
-
-#: ../../Zotlabs/Module/Photos.php:938
-msgid "Private Photo"
-msgstr "Privéfoto"
-
-#: ../../Zotlabs/Module/Photos.php:953
-msgid "View Full Size"
-msgstr "Volledige grootte weergeven"
-
-#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437
-#: ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr "Verwijderen"
-
-#: ../../Zotlabs/Module/Photos.php:1032
-msgid "Edit photo"
-msgstr "Foto bewerken"
-
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Rotate CW (right)"
-msgstr "Draai met de klok mee (naar rechts)"
-
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CCW (left)"
-msgstr "Draai tegen de klok in (naar links)"
-
-#: ../../Zotlabs/Module/Photos.php:1038
-msgid "Enter a new album name"
-msgstr "Vul een nieuwe albumnaam in"
-
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "or select an existing one (doubleclick)"
-msgstr "of kies een bestaand album (dubbelklikken)"
-
-#: ../../Zotlabs/Module/Photos.php:1042
-msgid "Caption"
-msgstr "Bijschrift"
-
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Add a Tag"
-msgstr "Tag toevoegen"
-
-#: ../../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:1051
-msgid "Flag as adult in album view"
-msgstr "Markeer als voor volwassenen in albumweergave"
-
-#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
-msgid "I like this (toggle)"
-msgstr "Vind ik leuk"
-
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
-msgid "I don't like this (toggle)"
-msgstr "Vind ik niet leuk"
-
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
-#: ../../include/conversation.php:740
-msgid "Please wait"
-msgstr "Even wachten"
-
-#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../Zotlabs/Lib/ThreadItem.php:707
-msgid "This is you"
-msgstr "Dit ben jij"
-
-#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
-msgid "Comment"
-msgstr "Reactie"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Likes"
-msgstr "vinden dit leuk"
-
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:574
-msgctxt "title"
-msgid "Dislikes"
-msgstr "vinden dit niet leuk"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Agree"
-msgstr "eens"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Disagree"
-msgstr "oneens"
-
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:575
-msgctxt "title"
-msgid "Abstain"
-msgstr "onthoudingen"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Attending"
-msgstr "aanwezig"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Not attending"
-msgstr "niet aanwezig"
-
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:576
-msgctxt "title"
-msgid "Might attend"
-msgstr "mogelijk aanwezig"
-
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
-#: ../../include/conversation.php:1717
-msgid "View all"
-msgstr "Toon alles"
-
-#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1741
-#: ../../include/channel.php:1158
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] "vindt dit leuk"
-msgstr[1] "vinden dit leuk"
-
-#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/conversation.php:1744
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] "vindt dit niet leuk"
-msgstr[1] "vinden dit niet leuk"
-
-#: ../../Zotlabs/Module/Photos.php:1235
-msgid "Photo Tools"
-msgstr "Hulpmiddelen"
-
-#: ../../Zotlabs/Module/Photos.php:1244
-msgid "In This Photo:"
-msgstr "Op deze foto:"
-
-#: ../../Zotlabs/Module/Photos.php:1249
-msgid "Map"
-msgstr "Kaart"
-
-#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
-msgctxt "noun"
-msgid "Likes"
-msgstr "vinden dit leuk"
-
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
-msgctxt "noun"
-msgid "Dislikes"
-msgstr "vinden dit niet leuk"
-
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
-#: ../../include/acl_selectors.php:285
-msgid "Close"
-msgstr "Sluiten"
-
-#: ../../Zotlabs/Module/Photos.php:1337
-msgid "View Album"
-msgstr "Album weergeven"
-
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362
-msgid "Recent Photos"
-msgstr "Recente foto's"
-
-#: ../../Zotlabs/Module/Ping.php:265
-msgid "sent you a private message"
-msgstr "stuurde jou een privébericht"
-
-#: ../../Zotlabs/Module/Ping.php:313
-msgid "added your channel"
-msgstr "voegde jouw kanaal toe"
-
-#: ../../Zotlabs/Module/Ping.php:323
-msgid "g A l F d"
-msgstr "G:i, l d F"
-
-#: ../../Zotlabs/Module/Ping.php:346
-msgid "[today]"
-msgstr "[vandaag]"
-
-#: ../../Zotlabs/Module/Ping.php:355
-msgid "posted an event"
-msgstr "plaatste een gebeurtenis"
-
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
-msgstr "Niet in staat om je hub te vinden"
-
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
-msgstr "Verzenden bericht geslaagd."
-
-#: ../../Zotlabs/Module/Openid.php:30
-msgid "OpenID protocol error. No ID returned."
-msgstr "OpenID-protocolfout. Geen ID terugontvangen."
-
-#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
-msgid "Login failed."
-msgstr "Inloggen mislukt."
-
-#: ../../Zotlabs/Module/Page.php:133
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,"
-" quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-msgstr "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
-
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
-msgstr "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd."
-
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
-msgstr "Configuratiebewerker"
-
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please"
-" leave this page unless you are comfortable with and knowledgeable about how"
-" to correctly use this feature."
-msgstr "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. "
-
-#: ../../Zotlabs/Module/Pdledit.php:18
-msgid "Layout updated."
-msgstr "Lay-out bijgewerkt."
-
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
-msgid "Edit System Page Description"
-msgstr "Systeempagina's bewerken"
-
-#: ../../Zotlabs/Module/Pdledit.php:56
-msgid "Layout not found."
-msgstr "Lay-out niet gevonden."
-
-#: ../../Zotlabs/Module/Pdledit.php:62
-msgid "Module Name:"
-msgstr "Modulenaam:"
-
-#: ../../Zotlabs/Module/Pdledit.php:63
-msgid "Layout Help"
-msgstr "Lay-out-hulp"
-
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:226
-#: ../../include/conversation.php:960
-msgid "Poke"
-msgstr "Aanstoten"
-
-#: ../../Zotlabs/Module/Poke.php:169
-msgid "Poke somebody"
-msgstr "Iemand aanstoten"
-
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
-msgstr "Aanstoten/porren"
-
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
-msgstr "Iemand bijvoorbeeld aanstoten of poren"
-
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
-msgstr "Ontvanger"
-
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
-msgstr "Kies wat je met de ontvanger wil doen"
-
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
-msgstr "Maak dit bericht privé"
-
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
-#, php-format
-msgid "Fetching URL returns error: %1$s"
-msgstr "Ophalen URL gaf een foutmelding terug: %1$s"
-
 #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
 #: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
 msgid "Profile not found."
@@ -3276,6 +2200,11 @@ msgstr "Homepage"
 msgid "Interests"
 msgstr "Interesses"
 
+#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1224
+msgid "Address"
+msgstr "Kanaaladres"
+
 #: ../../Zotlabs/Module/Profiles.php:560
 msgid "Profile updated."
 msgstr "Profiel bijgewerkt"
@@ -3293,7 +2222,7 @@ msgid "View this profile"
 msgstr "Profiel weergeven"
 
 #: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
-#: ../../include/channel.php:959
+#: ../../include/channel.php:998
 msgid "Edit visibility"
 msgstr "Zichtbaarheid bewerken"
 
@@ -3305,7 +2234,7 @@ msgstr "Hulpmiddelen"
 msgid "Change cover photo"
 msgstr "Omslagfoto wijzigen"
 
-#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:930
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:969
 msgid "Change profile photo"
 msgstr "Profielfoto veranderen"
 
@@ -3325,8 +2254,8 @@ msgstr "Dit profiel verwijderen"
 msgid "Add profile things"
 msgstr "Dingen aan je profiel toevoegen"
 
-#: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105
-#: ../../include/conversation.php:1526
+#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541
+#: ../../include/widgets.php:105
 msgid "Personal"
 msgstr "Persoonlijk"
 
@@ -3466,119 +2395,1097 @@ msgstr "Contactinformatie en sociale netwerken"
 msgid "My other channels"
 msgstr "Mijn andere kanalen"
 
-#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:955
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:994
 msgid "Profile Image"
 msgstr "Profielfoto"
 
 #: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
-#: ../../include/channel.php:937
+#: ../../include/channel.php:976
 msgid "Edit Profiles"
 msgstr "Bewerk profielen"
 
-#: ../../Zotlabs/Module/Profile_photo.php:179
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
-msgstr "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven."
-
-#: ../../Zotlabs/Module/Profile_photo.php:367
-msgid "Upload Profile Photo"
-msgstr "Profielfoto uploaden"
-
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
-msgstr "Ongeldige profiel-identificator"
-
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
-msgstr "Zichtbaarheid profiel "
-
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1249
-msgid "Profile"
-msgstr "Profiel"
-
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
-msgstr "Klik op een connectie om deze toe te voegen of te verwijderen"
-
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
-msgstr "Zichtbaar voor"
-
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1270
-msgid "Public Hubs"
-msgstr "Openbare hubs"
-
-#: ../../Zotlabs/Module/Pubsites.php:25
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
-msgstr "Op de hier weergegeven hubs kan iedereen zich voor het $Projectname-netwerk aanmelden. Alle hubs in het netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen een financiële tegemoetkoming voor bepaalde uitbreidingen. <strong>Mogelijk</strong> wordt hierover op de hub zelf meer informatie gegeven."
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Hub URL"
-msgstr "Hub-URL"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Access Type"
-msgstr "Toegangs-<br/>&nbsp;type"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Registration Policy"
-msgstr "Registratie-<br/>&nbsp;beleid"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Stats"
-msgstr "Stats"
-
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Software"
-msgstr "Software"
-
-#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:959
-msgid "Ratings"
-msgstr "Beoordelingen"
-
-#: ../../Zotlabs/Module/Pubsites.php:38
-msgid "Rate"
-msgstr "Beoordeel"
-
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Website:"
-msgstr "Website:"
-
-#: ../../Zotlabs/Module/Rate.php:163
+#: ../../Zotlabs/Module/Import.php:33
 #, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr "Kanaal op afstand [%s] (nog niet op deze hub bekend)"
+msgid "Your service plan only allows %d channels."
+msgstr "Jouw abonnement staat maar %d kanalen toe."
 
-#: ../../Zotlabs/Module/Rate.php:164
-msgid "Rating (this information is public)"
-msgstr "Beoordeling (deze informatie is openbaar)"
+#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42
+msgid "Nothing to import."
+msgstr "Niets gevonden om te importeren"
 
-#: ../../Zotlabs/Module/Rate.php:165
-msgid "Optionally explain your rating (this information is public)"
-msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"
+#: ../../Zotlabs/Module/Import.php:95 ../../Zotlabs/Module/Import_items.php:66
+msgid "Unable to download data from old server"
+msgstr "Niet in staat om gegevens van de oude hub te downloaden"
 
-#: ../../Zotlabs/Module/Ratings.php:73
-msgid "No ratings"
-msgstr "Geen beoordelingen"
+#: ../../Zotlabs/Module/Import.php:101
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Imported file is empty."
+msgstr "Geïmporteerde bestand is leeg"
 
-#: ../../Zotlabs/Module/Ratings.php:104
-msgid "Rating: "
-msgstr "Beoordeling: "
+#: ../../Zotlabs/Module/Import.php:123
+#: ../../Zotlabs/Module/Import_items.php:88
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
+msgstr "Waarschuwing: database-versies lopen %1$d updates achter."
 
-#: ../../Zotlabs/Module/Ratings.php:105
-msgid "Website: "
-msgstr "Website: "
+#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107
+msgid "Cloned channel not found. Import failed."
+msgstr "Gekloond kanaal niet gevonden. Importeren mislukt."
 
-#: ../../Zotlabs/Module/Ratings.php:107
-msgid "Description: "
-msgstr "Omschrijving: "
+#: ../../Zotlabs/Module/Import.php:163
+msgid "No channel. Import failed."
+msgstr "Geen kanaal. Importeren mislukt."
+
+#: ../../Zotlabs/Module/Import.php:520
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
+msgstr "Import voltooid."
+
+#: ../../Zotlabs/Module/Import.php:542
+msgid "You must be logged in to use this feature."
+msgstr "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken."
+
+#: ../../Zotlabs/Module/Import.php:547
+msgid "Import Channel"
+msgstr "Kanaal importeren"
+
+#: ../../Zotlabs/Module/Import.php:548
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You"
+" may retrieve the channel identity from the old server/hub via the network "
+"or provide an export file."
+msgstr "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken."
+
+#: ../../Zotlabs/Module/Import.php:549
+#: ../../Zotlabs/Module/Import_items.php:121
+msgid "File to Upload"
+msgstr "Bestand om te uploaden"
+
+#: ../../Zotlabs/Module/Import.php:550
+msgid "Or provide the old server/hub details"
+msgstr "Of vul de gegevens van de oude hub in"
+
+#: ../../Zotlabs/Module/Import.php:551
+msgid "Your old identity address (xyz@example.com)"
+msgstr "Jouw oude kanaaladres (xyz@example.com)"
+
+#: ../../Zotlabs/Module/Import.php:552
+msgid "Your old login email address"
+msgstr "Het e-mailadres van je oude account"
+
+#: ../../Zotlabs/Module/Import.php:553
+msgid "Your old login password"
+msgstr "Wachtwoord van jouw oude account"
+
+#: ../../Zotlabs/Module/Import.php:554
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be"
+" able to post from either location, but only one can be marked as the "
+"primary location for files, photos, and media."
+msgstr "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen."
+
+#: ../../Zotlabs/Module/Import.php:555
+msgid "Make this hub my primary location"
+msgstr "Stel deze hub als mijn primaire locatie in"
+
+#: ../../Zotlabs/Module/Import.php:556
+msgid ""
+"Import existing posts if possible (experimental - limited by available "
+"memory"
+msgstr "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van beschikbaar servergeheugen)"
+
+#: ../../Zotlabs/Module/Import.php:557
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
+msgstr "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid."
+
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+#: ../../Zotlabs/Module/Siteinfo.php:48
+msgid "$Projectname"
+msgstr "$Projectname"
+
+#: ../../Zotlabs/Module/Home.php:92
+#, php-format
+msgid "Welcome to %s"
+msgstr "Welkom op %s"
+
+#: ../../Zotlabs/Module/Item.php:179
+msgid "Unable to locate original post."
+msgstr "Niet in staat om de originele locatie van het bericht te vinden. "
+
+#: ../../Zotlabs/Module/Item.php:432
+msgid "Empty post discarded."
+msgstr "Leeg bericht geannuleerd"
+
+#: ../../Zotlabs/Module/Item.php:472
+msgid "Executable content type not permitted to this channel."
+msgstr "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal."
+
+#: ../../Zotlabs/Module/Item.php:856
+msgid "Duplicate post suppressed."
+msgstr "Dubbel bericht tegengehouden."
+
+#: ../../Zotlabs/Module/Item.php:989
+msgid "System error. Post not saved."
+msgstr "Systeemfout. Bericht niet opgeslagen."
+
+#: ../../Zotlabs/Module/Item.php:1242
+msgid "Unable to obtain post information from database."
+msgstr "Niet in staat om informatie over dit bericht uit de database te verkrijgen."
+
+#: ../../Zotlabs/Module/Item.php:1249
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr "Je hebt jouw limiet van %1$.0f berichten bereikt."
+
+#: ../../Zotlabs/Module/Item.php:1256
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr "Je hebt jouw limiet van %1$.0f webpagina's bereikt."
+
+#: ../../Zotlabs/Module/Photos.php:82
+msgid "Page owner information could not be retrieved."
+msgstr "Informatie over de pagina-eigenaar werd niet ontvangen."
+
+#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:741
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:212
+#: ../../Zotlabs/Module/Profile_photo.php:311
+#: ../../include/photo/photo_driver.php:718
+msgid "Profile Photos"
+msgstr "Profielfoto's"
+
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147
+msgid "Album not found."
+msgstr "Album niet gevonden."
+
+#: ../../Zotlabs/Module/Photos.php:130
+msgid "Delete Album"
+msgstr "Verwijder album"
+
+#: ../../Zotlabs/Module/Photos.php:151
+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:208 ../../Zotlabs/Module/Photos.php:1051
+msgid "Delete Photo"
+msgstr "Verwijder foto"
+
+#: ../../Zotlabs/Module/Photos.php:531
+msgid "No photos selected"
+msgstr "Geen foto's geselecteerd"
+
+#: ../../Zotlabs/Module/Photos.php:580
+msgid "Access to this item is restricted."
+msgstr "Toegang tot dit item is beperkt."
+
+#: ../../Zotlabs/Module/Photos.php:619
+#, 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:622
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr "%1$.2f MB aan foto-opslag gebruikt."
+
+#: ../../Zotlabs/Module/Photos.php:658
+msgid "Upload Photos"
+msgstr "Foto's uploaden"
+
+#: ../../Zotlabs/Module/Photos.php:662
+msgid "Enter an album name"
+msgstr "Vul een albumnaam in"
+
+#: ../../Zotlabs/Module/Photos.php:663
+msgid "or select an existing album (doubleclick)"
+msgstr "of kies een bestaand album (dubbelklikken)"
+
+#: ../../Zotlabs/Module/Photos.php:664
+msgid "Create a status post for this upload"
+msgstr "Plaats een bericht voor deze upload."
+
+#: ../../Zotlabs/Module/Photos.php:665
+msgid "Caption (optional):"
+msgstr "Bijschrift (optioneel):"
+
+#: ../../Zotlabs/Module/Photos.php:666
+msgid "Description (optional):"
+msgstr "Omschrijving (optioneel):"
+
+#: ../../Zotlabs/Module/Photos.php:693
+msgid "Album name could not be decoded"
+msgstr "Albumnaam kon niet gedecodeerd worden"
+
+#: ../../Zotlabs/Module/Photos.php:741
+msgid "Contact Photos"
+msgstr "Connectiefoto's"
+
+#: ../../Zotlabs/Module/Photos.php:764
+msgid "Show Newest First"
+msgstr "Nieuwste eerst weergeven"
+
+#: ../../Zotlabs/Module/Photos.php:766
+msgid "Show Oldest First"
+msgstr "Oudste eerst weergeven"
+
+#: ../../Zotlabs/Module/Photos.php:790 ../../Zotlabs/Module/Photos.php:1329
+#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1593
+msgid "View Photo"
+msgstr "Foto weergeven"
+
+#: ../../Zotlabs/Module/Photos.php:821
+#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1610
+msgid "Edit Album"
+msgstr "Album bewerken"
+
+#: ../../Zotlabs/Module/Photos.php:868
+msgid "Permission denied. Access to this item may be restricted."
+msgstr "Toegang geweigerd. Toegang tot dit item kan zijn beperkt."
+
+#: ../../Zotlabs/Module/Photos.php:870
+msgid "Photo not available"
+msgstr "Foto niet aanwezig"
+
+#: ../../Zotlabs/Module/Photos.php:928
+msgid "Use as profile photo"
+msgstr "Als profielfoto gebruiken"
+
+#: ../../Zotlabs/Module/Photos.php:929
+msgid "Use as cover photo"
+msgstr "Als omslagfoto gebruiken"
+
+#: ../../Zotlabs/Module/Photos.php:936
+msgid "Private Photo"
+msgstr "Privéfoto"
+
+#: ../../Zotlabs/Module/Photos.php:951
+msgid "View Full Size"
+msgstr "Volledige grootte weergeven"
+
+#: ../../Zotlabs/Module/Photos.php:996 ../../Zotlabs/Module/Admin.php:1437
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: ../../Zotlabs/Module/Photos.php:1030
+msgid "Edit photo"
+msgstr "Foto bewerken"
+
+#: ../../Zotlabs/Module/Photos.php:1032
+msgid "Rotate CW (right)"
+msgstr "Draai met de klok mee (naar rechts)"
+
+#: ../../Zotlabs/Module/Photos.php:1033
+msgid "Rotate CCW (left)"
+msgstr "Draai tegen de klok in (naar links)"
+
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "Enter a new album name"
+msgstr "Vul een nieuwe albumnaam in"
+
+#: ../../Zotlabs/Module/Photos.php:1037
+msgid "or select an existing one (doubleclick)"
+msgstr "of kies een bestaand album (dubbelklikken)"
+
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Caption"
+msgstr "Bijschrift"
+
+#: ../../Zotlabs/Module/Photos.php:1042
+msgid "Add a Tag"
+msgstr "Tag toevoegen"
+
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr "Voorbeeld: @bob, @Barbara_Jansen, @jan@voorbeeld.nl"
+
+#: ../../Zotlabs/Module/Photos.php:1049
+msgid "Flag as adult in album view"
+msgstr "Markeer als voor volwassenen in albumweergave"
+
+#: ../../Zotlabs/Module/Photos.php:1068 ../../Zotlabs/Lib/ThreadItem.php:261
+msgid "I like this (toggle)"
+msgstr "Vind ik leuk"
+
+#: ../../Zotlabs/Module/Photos.php:1069 ../../Zotlabs/Lib/ThreadItem.php:262
+msgid "I don't like this (toggle)"
+msgstr "Vind ik niet leuk"
+
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:397
+#: ../../include/conversation.php:743
+msgid "Please wait"
+msgstr "Even wachten"
+
+#: ../../Zotlabs/Module/Photos.php:1087 ../../Zotlabs/Module/Photos.php:1205
+#: ../../Zotlabs/Lib/ThreadItem.php:707
+msgid "This is you"
+msgstr "Dit ben jij"
+
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
+#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
+msgid "Comment"
+msgstr "Reactie"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
+msgstr "vinden dit leuk"
+
+#: ../../Zotlabs/Module/Photos.php:1105 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
+msgstr "vinden dit niet leuk"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
+msgstr "eens"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
+msgstr "oneens"
+
+#: ../../Zotlabs/Module/Photos.php:1106 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
+msgstr "onthoudingen"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
+msgstr "aanwezig"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
+msgstr "niet aanwezig"
+
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
+msgstr "mogelijk aanwezig"
+
+#: ../../Zotlabs/Module/Photos.php:1124 ../../Zotlabs/Module/Photos.php:1136
+#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../include/conversation.php:1738
+msgid "View all"
+msgstr "Toon alles"
+
+#: ../../Zotlabs/Module/Photos.php:1128 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../include/taxonomy.php:403 ../../include/channel.php:1198
+#: ../../include/conversation.php:1762
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] "vindt dit leuk"
+msgstr[1] "vinden dit leuk"
+
+#: ../../Zotlabs/Module/Photos.php:1133 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/conversation.php:1765
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] "vindt dit niet leuk"
+msgstr[1] "vinden dit niet leuk"
+
+#: ../../Zotlabs/Module/Photos.php:1233
+msgid "Photo Tools"
+msgstr "Hulpmiddelen"
+
+#: ../../Zotlabs/Module/Photos.php:1242
+msgid "In This Photo:"
+msgstr "Op deze foto:"
+
+#: ../../Zotlabs/Module/Photos.php:1247
+msgid "Map"
+msgstr "Kaart"
+
+#: ../../Zotlabs/Module/Photos.php:1255 ../../Zotlabs/Lib/ThreadItem.php:386
+msgctxt "noun"
+msgid "Likes"
+msgstr "vinden dit leuk"
+
+#: ../../Zotlabs/Module/Photos.php:1256 ../../Zotlabs/Lib/ThreadItem.php:387
+msgctxt "noun"
+msgid "Dislikes"
+msgstr "vinden dit niet leuk"
+
+#: ../../Zotlabs/Module/Photos.php:1261 ../../Zotlabs/Lib/ThreadItem.php:392
+#: ../../include/acl_selectors.php:283
+msgid "Close"
+msgstr "Sluiten"
+
+#: ../../Zotlabs/Module/Photos.php:1335
+msgid "View Album"
+msgstr "Album weergeven"
+
+#: ../../Zotlabs/Module/Photos.php:1346 ../../Zotlabs/Module/Photos.php:1359
+#: ../../Zotlabs/Module/Photos.php:1360
+msgid "Recent Photos"
+msgstr "Recente foto's"
+
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
+msgstr "Privacy-informatie op afstand niet beschikbaar."
+
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
+msgstr "Zichtbaar voor:"
+
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
+msgstr "Importeren voltooid"
+
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
+msgstr "Importeer items"
+
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid ""
+"Use this form to import existing posts and content from an export file."
+msgstr "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren."
+
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
+msgstr "Limiet voor aantal uitnodigingen overschreden."
+
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
+msgstr "%s : Geen geldig e-mailadres."
+
+#: ../../Zotlabs/Module/Invite.php:63
+msgid "Please join us on $Projectname"
+msgstr "Uitnodiging voor $Projectname"
+
+#: ../../Zotlabs/Module/Invite.php:74
+msgid "Invitation limit exceeded. Please contact your site administrator."
+msgstr "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder."
+
+#: ../../Zotlabs/Module/Invite.php:79
+#, php-format
+msgid "%s : Message delivery failed."
+msgstr "%s: Aflevering bericht mislukt."
+
+#: ../../Zotlabs/Module/Invite.php:83
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] "%d bericht verzonden."
+msgstr[1] "%d berichten verzonden."
+
+#: ../../Zotlabs/Module/Invite.php:102
+msgid "You have no more invitations available"
+msgstr "Je hebt geen uitnodigingen meer beschikbaar"
+
+#: ../../Zotlabs/Module/Invite.php:133
+msgid "Send invitations"
+msgstr "Uitnodigingen verzenden"
+
+#: ../../Zotlabs/Module/Invite.php:134
+msgid "Enter email addresses, one per line:"
+msgstr "Voer e-mailadressen in, één per regel:"
+
+#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:241
+msgid "Your message:"
+msgstr "Jouw bericht:"
+
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Please join my community on $Projectname."
+msgstr "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op $Projectname te vergezellen. Lees meer over $Projectname  op http://hubzilla.org"
+
+#: ../../Zotlabs/Module/Invite.php:138
+msgid "You will need to supply this invitation code:"
+msgstr "Je moet deze uitnodigingscode opgeven:"
+
+#: ../../Zotlabs/Module/Invite.php:139
+msgid ""
+"1. Register at any $Projectname location (they are all inter-connected)"
+msgstr "1. Registreer je op een willekeurige $Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):"
+
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "2. Enter my $Projectname network address into the site searchbar."
+msgstr "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn $Projectname-kanaaladres in het zoekveld invullen:"
+
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "or visit"
+msgstr "of bezoek"
+
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "3. Click [Connect]"
+msgstr "3. Klik op [+ Verbinden]"
+
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
+msgstr "Locatie niet gevonden."
+
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
+msgstr "Opzoeken locatie mislukt"
+
+#: ../../Zotlabs/Module/Locs.php:66
+msgid ""
+"Please select another location to become primary before removing the primary"
+" location."
+msgstr "Kies eerst een andere primaire locatie alvorens de huidige primaire locatie te verwijderen."
+
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
+msgstr "Locaties synchronizeren"
+
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
+msgstr "Geen locaties gevonden."
+
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
+msgstr "Kanaallocaties beheren"
+
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
+msgstr "Primair"
+
+#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
+msgid "Drop"
+msgstr "Verwijderen"
+
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
+msgstr "Nu synchroniseren"
+
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
+msgstr "Wacht enkele minuten tussen opeenvolgende handelingen."
+
+#: ../../Zotlabs/Module/Locs.php:124
+msgid ""
+"When possible, drop a location by logging into that website/hub and removing"
+" your channel."
+msgstr "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen."
+
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is."
+
+#: ../../Zotlabs/Module/Magic.php:71
+msgid "Hub not found."
+msgstr "Hub niet gevonden."
+
+#: ../../Zotlabs/Module/Mail.php:38
+msgid "Unable to lookup recipient."
+msgstr "Niet in staat om ontvanger op te zoeken."
+
+#: ../../Zotlabs/Module/Mail.php:45
+msgid "Unable to communicate with requested channel."
+msgstr "Niet in staat om met het aangevraagde kanaal te communiceren."
+
+#: ../../Zotlabs/Module/Mail.php:52
+msgid "Cannot verify requested channel."
+msgstr "Kan opgevraagd kanaal niet verifieren"
+
+#: ../../Zotlabs/Module/Mail.php:70
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt."
+
+#: ../../Zotlabs/Module/Mail.php:135
+msgid "Messages"
+msgstr "Berichten"
+
+#: ../../Zotlabs/Module/Mail.php:170
+msgid "Message recalled."
+msgstr "Bericht ingetrokken."
+
+#: ../../Zotlabs/Module/Mail.php:183
+msgid "Conversation removed."
+msgstr "Conversatie verwijderd"
+
+#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr "Verloopt op DD-MM-YYYY om HH:MM"
+
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Requested channel is not in this network"
+msgstr "Opgevraagd kanaal is niet in dit netwerk beschikbaar"
+
+#: ../../Zotlabs/Module/Mail.php:234
+msgid "Send Private Message"
+msgstr "Privébericht versturen"
+
+#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360
+msgid "To:"
+msgstr "Aan:"
+
+#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362
+msgid "Subject:"
+msgstr "Onderwerp:"
+
+#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
+#: ../../include/conversation.php:1231
+msgid "Attach file"
+msgstr "Bestand toevoegen"
+
+#: ../../Zotlabs/Module/Mail.php:245
+msgid "Send"
+msgstr "Verzenden"
+
+#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373
+#: ../../include/conversation.php:1266
+msgid "Set expiration date"
+msgstr "Verloopdatum instellen"
+
+#: ../../Zotlabs/Module/Mail.php:332
+msgid "Delete message"
+msgstr "Bericht verwijderen"
+
+#: ../../Zotlabs/Module/Mail.php:333
+msgid "Delivery report"
+msgstr "Afleveringsrapport"
+
+#: ../../Zotlabs/Module/Mail.php:334
+msgid "Recall message"
+msgstr "Bericht intrekken"
+
+#: ../../Zotlabs/Module/Mail.php:336
+msgid "Message has been recalled."
+msgstr "Bericht is ingetrokken."
+
+#: ../../Zotlabs/Module/Mail.php:353
+msgid "Delete Conversation"
+msgstr "Verwijder conversatie"
+
+#: ../../Zotlabs/Module/Mail.php:355
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender."
+
+#: ../../Zotlabs/Module/Mail.php:359
+msgid "Send Reply"
+msgstr "Antwoord versturen"
+
+#: ../../Zotlabs/Module/Mail.php:364
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr "Jouw privébericht aan %s (%s):"
+
+#: ../../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:143
+msgid "Create a new channel"
+msgstr "Nieuw kanaal aanmaken"
+
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214
+#: ../../include/nav.php:208
+msgid "Channel Manager"
+msgstr "Kanaalbeheer"
+
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
+msgstr "Huidig kanaal"
+
+#: ../../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:168
+msgid "Default Channel"
+msgstr "Standaardkanaal"
+
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
+msgstr "Als standaard instellen"
+
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
+msgstr "%d nieuwe berichten"
+
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
+msgstr "%d nieuwe connectieverzoeken"
+
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
+msgstr "Uitbesteed kanaal"
+
+#: ../../Zotlabs/Module/Menu.php:49
+msgid "Unable to update menu."
+msgstr "Niet in staat om menu aan te passen"
+
+#: ../../Zotlabs/Module/Menu.php:60
+msgid "Unable to create menu."
+msgstr "Niet in staat om menu aan te maken."
+
+#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+msgid "Menu Name"
+msgstr "Menunaam"
+
+#: ../../Zotlabs/Module/Menu.php:98
+msgid "Unique name (not visible on webpage) - required"
+msgstr "Unieke naam vereist (niet zichtbaar op webpagina)"
+
+#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+msgid "Menu Title"
+msgstr "Menutitel"
+
+#: ../../Zotlabs/Module/Menu.php:99
+msgid "Visible on webpage - leave empty for no title"
+msgstr "Zichtbaar op webpagina (leeg laten voor geen titel)"
+
+#: ../../Zotlabs/Module/Menu.php:100
+msgid "Allow Bookmarks"
+msgstr "Bladwijzers toestaan"
+
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+msgid "Menu may be used to store saved bookmarks"
+msgstr "Menu kan gebruikt worden om bladwijzers in op te slaan"
+
+#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+msgid "Submit and proceed"
+msgstr "Opslaan en doorgaan"
+
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2239
+msgid "Menus"
+msgstr "Menu's"
+
+#: ../../Zotlabs/Module/Menu.php:117
+msgid "Bookmarks allowed"
+msgstr "Bladwijzers toegestaan"
+
+#: ../../Zotlabs/Module/Menu.php:119
+msgid "Delete this menu"
+msgstr "Menu verwijderen"
+
+#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+msgid "Edit menu contents"
+msgstr "Bewerk de inhoud van het menu"
+
+#: ../../Zotlabs/Module/Menu.php:121
+msgid "Edit this menu"
+msgstr "Dit menu bewerken"
+
+#: ../../Zotlabs/Module/Menu.php:136
+msgid "Menu could not be deleted."
+msgstr "Menu kon niet verwijderd worden."
+
+#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+msgid "Menu not found."
+msgstr "Menu niet gevonden."
+
+#: ../../Zotlabs/Module/Menu.php:149
+msgid "Edit Menu"
+msgstr "Menu bewerken"
+
+#: ../../Zotlabs/Module/Menu.php:153
+msgid "Add or remove entries to this menu"
+msgstr "Items aan dit menu toevoegen of verwijder"
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Menu name"
+msgstr "Naam van menu"
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Must be unique, only seen by you"
+msgstr "Moet uniek zijn en is alleen zichtbaar voor jou."
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title"
+msgstr "Titel van menu"
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title as seen by others"
+msgstr "Titel van menu zoals anderen dat zien."
+
+#: ../../Zotlabs/Module/Menu.php:157
+msgid "Allow bookmarks"
+msgstr "Bladwijzers toestaan"
+
+#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
+#: ../../Zotlabs/Module/Xchan.php:41
+msgid "Not found."
+msgstr "Niet gevonden."
+
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
+msgstr "Geen geldige account gevonden."
+
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
+msgstr "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail."
+
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
+#, php-format
+msgid "Site Member (%s)"
+msgstr "Lid van hub (%s)"
+
+#: ../../Zotlabs/Module/Lostpass.php:44
+#, php-format
+msgid "Password reset requested at %s"
+msgstr "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend"
+
+#: ../../Zotlabs/Module/Lostpass.php:67
+msgid ""
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
+msgstr "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt."
+
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1712
+msgid "Password Reset"
+msgstr "Wachtwoord vergeten?"
+
+#: ../../Zotlabs/Module/Lostpass.php:91
+msgid "Your password has been reset as requested."
+msgstr "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht."
+
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your new password is"
+msgstr "Jouw nieuwe wachtwoord is"
+
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Save or copy your new password - and then"
+msgstr "Kopieer of sla je nieuwe wachtwoord op - en"
+
+#: ../../Zotlabs/Module/Lostpass.php:94
+msgid "click here to login"
+msgstr "klik dan hier om in te loggen"
+
+#: ../../Zotlabs/Module/Lostpass.php:95
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
+msgstr "Jouw wachtwoord kan worden veranderd onder <em>instellingen</em>, nadat je succesvol bent ingelogd."
+
+#: ../../Zotlabs/Module/Lostpass.php:112
+#, php-format
+msgid "Your password has changed at %s"
+msgstr "Jouw wachtwoord op %s is veranderd"
+
+#: ../../Zotlabs/Module/Lostpass.php:127
+msgid "Forgot your Password?"
+msgstr "Wachtwoord vergeten?"
+
+#: ../../Zotlabs/Module/Lostpass.php:128
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
+msgstr "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies."
+
+#: ../../Zotlabs/Module/Lostpass.php:129
+msgid "Email Address"
+msgstr "E-mailadres"
+
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Reset"
+msgstr "Opnieuw instellen"
+
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr "%1$s is %2$s"
+
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227
+msgid "Mood"
+msgstr "Stemming"
+
+#: ../../Zotlabs/Module/Mood.php:136
+msgid "Set your current mood and tell your friends"
+msgstr "Noteer je huidige stemming en toon het aan je connecties"
+
+#: ../../Zotlabs/Module/Network.php:94
+msgid "No such group"
+msgstr "Collectie niet gevonden"
+
+#: ../../Zotlabs/Module/Network.php:134
+msgid "No such channel"
+msgstr "Niet zo'n kanaal"
+
+#: ../../Zotlabs/Module/Network.php:139
+msgid "forum"
+msgstr "forum"
+
+#: ../../Zotlabs/Module/Network.php:151
+msgid "Search Results For:"
+msgstr "Zoekresultaten voor:"
+
+#: ../../Zotlabs/Module/Network.php:215
+msgid "Privacy group is empty"
+msgstr "Privacygroep is leeg"
+
+#: ../../Zotlabs/Module/Network.php:224
+msgid "Privacy group: "
+msgstr "Privacygroep: "
+
+#: ../../Zotlabs/Module/Network.php:250
+msgid "Invalid connection."
+msgstr "Ongeldige connectie."
+
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:98
+msgid "No more system notifications."
+msgstr "Geen systeemnotificaties meer."
+
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:102
+msgid "System Notifications"
+msgstr "Systeemnotificaties"
+
+#: ../../Zotlabs/Module/Match.php:26
+msgid "Profile Match"
+msgstr "Profielovereenkomst"
+
+#: ../../Zotlabs/Module/Match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
+msgstr "Je hebt geen trefwoorden waarmee overeenkomsten gevonden kunnen worden. Voeg enkele trefwoorden aan je standaardprofiel toe."
+
+#: ../../Zotlabs/Module/Match.php:67
+msgid "is interested in:"
+msgstr "is geïnteresseerd in:"
+
+#: ../../Zotlabs/Module/Match.php:74
+msgid "No matches"
+msgstr "Geen overeenkomsten"
+
+#: ../../Zotlabs/Module/Channel.php:40
+msgid "Posts and comments"
+msgstr "Berichten en reacties"
+
+#: ../../Zotlabs/Module/Channel.php:41
+msgid "Only posts"
+msgstr "Alleen berichten"
+
+#: ../../Zotlabs/Module/Channel.php:101
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr "Onvoldoende permissies.  Doorgestuurd naar profielpagina."
+
+#: ../../Zotlabs/Module/Mitem.php:52
+msgid "Unable to create element."
+msgstr "Niet in staat om onderdeel aan te maken."
+
+#: ../../Zotlabs/Module/Mitem.php:76
+msgid "Unable to update menu element."
+msgstr "Menu-onderdeel kan niet worden geüpdatet."
+
+#: ../../Zotlabs/Module/Mitem.php:92
+msgid "Unable to add menu element."
+msgstr "Menu-onderdeel kan niet worden toegevoegd."
+
+#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:226
+msgid "Menu Item Permissions"
+msgstr "Permissies menu-item"
+
+#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:227
+#: ../../Zotlabs/Module/Settings.php:1163
+msgid "(click to open/close)"
+msgstr "(klik om te openen/sluiten)"
+
+#: ../../Zotlabs/Module/Mitem.php:156 ../../Zotlabs/Module/Mitem.php:172
+msgid "Link Name"
+msgstr "Linknaam"
+
+#: ../../Zotlabs/Module/Mitem.php:157 ../../Zotlabs/Module/Mitem.php:231
+msgid "Link or Submenu Target"
+msgstr "Linkdoel of submenu-doel"
+
+#: ../../Zotlabs/Module/Mitem.php:157
+msgid "Enter URL of the link or select a menu name to create a submenu"
+msgstr "Geef de URL van de link of kies een menunaam om een submenu aan te maken"
+
+#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:232
+msgid "Use magic-auth if available"
+msgstr "Gebruik magic-auth wanneer beschikbaar"
+
+#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:233
+msgid "Open link in new window"
+msgstr "Open link in nieuw venster"
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Order in list"
+msgstr "Volgorde in lijst"
+
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:234
+msgid "Higher numbers will sink to bottom of listing"
+msgstr "Hogere nummers komen onderaan de lijst terecht"
+
+#: ../../Zotlabs/Module/Mitem.php:161
+msgid "Submit and finish"
+msgstr "Opslaan en afsluiten"
+
+#: ../../Zotlabs/Module/Mitem.php:162
+msgid "Submit and continue"
+msgstr "Opslaan en doorgaan"
+
+#: ../../Zotlabs/Module/Mitem.php:170
+msgid "Menu:"
+msgstr "Menu:"
+
+#: ../../Zotlabs/Module/Mitem.php:173
+msgid "Link Target"
+msgstr "Linkdoel"
+
+#: ../../Zotlabs/Module/Mitem.php:176
+msgid "Edit menu"
+msgstr "Menu bewerken"
+
+#: ../../Zotlabs/Module/Mitem.php:179
+msgid "Edit element"
+msgstr "Onderdeel bewerken"
+
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Drop element"
+msgstr "Onderdeel verwijderen"
+
+#: ../../Zotlabs/Module/Mitem.php:181
+msgid "New element"
+msgstr "Nieuw element"
+
+#: ../../Zotlabs/Module/Mitem.php:182
+msgid "Edit this menu container"
+msgstr "Deze menu-container bewerken"
+
+#: ../../Zotlabs/Module/Mitem.php:183
+msgid "Add menu element"
+msgstr "Menu-element toevoegen"
+
+#: ../../Zotlabs/Module/Mitem.php:184
+msgid "Delete this menu item"
+msgstr "Dit menu-item verwijderen"
+
+#: ../../Zotlabs/Module/Mitem.php:185
+msgid "Edit this menu item"
+msgstr "Dit menu-item bewerken"
+
+#: ../../Zotlabs/Module/Mitem.php:202
+msgid "Menu item not found."
+msgstr "Menu-item niet gevonden."
+
+#: ../../Zotlabs/Module/Mitem.php:215
+msgid "Menu item deleted."
+msgstr "Menu-item verwijderd."
+
+#: ../../Zotlabs/Module/Mitem.php:217
+msgid "Menu item could not be deleted."
+msgstr "Menu-item kon niet worden verwijderd."
+
+#: ../../Zotlabs/Module/Mitem.php:224
+msgid "Edit Menu Element"
+msgstr "Menu-element bewerken"
+
+#: ../../Zotlabs/Module/Mitem.php:230
+msgid "Link text"
+msgstr "Linktekst"
 
 #: ../../Zotlabs/Module/Admin.php:77
 msgid "Theme settings updated."
@@ -3665,11 +3572,11 @@ msgstr "Versie repository (dev)"
 msgid "Site settings updated."
 msgstr "Hub-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2841
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2829
 msgid "Default"
 msgstr "Standaard"
 
-#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:899
 msgid "mobile"
 msgstr "mobiel"
 
@@ -3701,7 +3608,7 @@ msgstr "Mijn $Projectname-hub kent alleen gratis toegang"
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr "Mijn $Projectname-hub biedt gratis accounts aan met betaalde uitbreidingen als optie"
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1382
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1476
 msgid "Site"
 msgstr "Hub-instellingen"
 
@@ -3989,12 +3896,12 @@ 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:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "Off"
 msgstr "Uit"
 
 #: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
+#: ../../Zotlabs/Module/Settings.php:823
 msgid "On"
 msgstr "Aan"
 
@@ -4051,7 +3958,7 @@ msgid ""
 "embedded content from that site is explicitly blocked."
 msgstr "Alle andere ingesloten (embedded) inhoud wordt gefilterd, <strong>tenzij</strong> ingesloten (embedded) inhoud van een website expliciet wordt geblokkeerd."
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1385
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1479
 msgid "Security"
 msgstr "Beveiliging"
 
@@ -4219,7 +4126,7 @@ msgid "Account '%s' unblocked"
 msgstr "Account '%s' gedeblokkeerd"
 
 #: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
-#: ../../include/widgets.php:1383
+#: ../../include/widgets.php:1477
 msgid "Accounts"
 msgstr "Accounts"
 
@@ -4325,7 +4232,7 @@ msgstr "Scripts toegestaan voor kanaal '%s'"
 msgid "Channel '%s' code disallowed"
 msgstr "Scripts niet toegestaan voor kanaal '%s'"
 
-#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1384
+#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1478
 msgid "Channels"
 msgstr "Kanalen"
 
@@ -4345,7 +4252,7 @@ msgstr "Scripts toestaan"
 msgid "Disallow Code"
 msgstr "Scripts niet toestaan"
 
-#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1611
+#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626
 msgid "Channel"
 msgstr "Kanaal"
 
@@ -4384,7 +4291,7 @@ msgid "Enable"
 msgstr "Inschakelen"
 
 #: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
-#: ../../include/widgets.php:1387
+#: ../../include/widgets.php:1481
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -4393,8 +4300,8 @@ msgid "Toggle"
 msgstr "Omschakelen"
 
 #: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
-#: ../../Zotlabs/Lib/Apps.php:215 ../../include/widgets.php:638
-#: ../../include/nav.php:208
+#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:210
+#: ../../include/widgets.php:647
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -4450,7 +4357,7 @@ msgstr "Plugin-repository downloaden"
 msgid "Install new repo"
 msgstr "Nieuwe repository installeren"
 
-#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:334
 msgid "Install"
 msgstr "Installeren"
 
@@ -4466,8 +4373,8 @@ msgstr "Toegevoegde plugin-repositories"
 msgid "Install a New Plugin Repository"
 msgstr "Nieuwe plugin-repository toevoegen"
 
-#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:330
+#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:72
+#: ../../Zotlabs/Module/Settings.php:670 ../../Zotlabs/Lib/Apps.php:334
 msgid "Update"
 msgstr "Bijwerken"
 
@@ -4484,7 +4391,7 @@ msgid "Screenshot"
 msgstr "Schermafdruk"
 
 #: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
-#: ../../include/widgets.php:1388
+#: ../../include/widgets.php:1482
 msgid "Themes"
 msgstr "Thema's"
 
@@ -4500,8 +4407,8 @@ msgstr "[Niet ondersteund]"
 msgid "Log settings updated."
 msgstr "Logboek-instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1409
-#: ../../include/widgets.php:1419
+#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1503
+#: ../../include/widgets.php:1513
 msgid "Logs"
 msgstr "Logboeken"
 
@@ -4567,7 +4474,7 @@ msgstr "Velddefinitie niet gevonden"
 msgid "Edit Profile Field"
 msgstr "Profielveld bewerken"
 
-#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1390
+#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1484
 msgid "Profile Fields"
 msgstr "Profielvelden"
 
@@ -4595,57 +4502,384 @@ msgstr "Extra (handmatig toegevoegde) velden"
 msgid "Create Custom Field"
 msgstr "Extra velden aanmaken"
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
-msgid "App installed."
-msgstr "App geïnstalleerd"
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Name or caption"
+msgstr "Naam"
 
-#: ../../Zotlabs/Module/Appman.php:46
-msgid "Malformed app."
-msgstr "Misvormde app."
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""
+msgstr "Voorbeelden: \"Jan Pietersen\", \"Willems weblog\", \"Computerforum\""
 
-#: ../../Zotlabs/Module/Appman.php:104
-msgid "Embed code"
-msgstr "Insluitcode"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+msgid "Choose a short nickname"
+msgstr "Korte bijnaam"
 
-#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
-msgid "Edit App"
-msgstr "App bewerken"
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+#, php-format
+msgid ""
+"Your nickname will be used to create an easy to remember channel address "
+"e.g. nickname%s"
+msgstr "Deze bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres van jouw kanaal aan te maken, die je dan met anderen kunt delen. Bijvoorbeeld: bijnaam%s"
 
-#: ../../Zotlabs/Module/Appman.php:110
-msgid "Create App"
-msgstr "App maken"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Channel role and privacy"
+msgstr "Kanaaltype en privacy"
 
-#: ../../Zotlabs/Module/Appman.php:115
-msgid "Name of app"
-msgstr "Naam van app"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Select a channel role with your privacy requirements."
+msgstr "Kies een kanaaltype met het door jou gewenste privacyniveau."
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Location (URL) of app"
-msgstr "Locatie (URL) van app"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Read more about roles"
+msgstr "Lees meer over kanaaltypes"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "Photo icon URL"
-msgstr "URL van pictogram"
+#: ../../Zotlabs/Module/New_channel.php:135
+msgid "Create Channel"
+msgstr "Kanaal aanmaken"
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "80 x 80 pixels - optional"
-msgstr "80 x 80 pixels (optioneel)"
+#: ../../Zotlabs/Module/New_channel.php:136
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
+msgstr "Een kanaal is jouw identiteit in dit netwerk. Het kan bijvoorbeeld een persoon, een blog of een forum vertegenwoordigen. Door met elkaar te verbinden kunnen kanalen, met behulp van uitgebreide permissies, informatie uitwisselen."
 
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Categories (optional, comma separated list)"
-msgstr "Categorieën (optioneel,  door komma's gescheiden lijst)"
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
+msgstr "Of <a href=\"import\">importeer een bestaand kanaal</a> vanaf een andere locatie"
 
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Version ID"
-msgstr "Versie-ID"
+#: ../../Zotlabs/Module/Ping.php:265
+msgid "sent you a private message"
+msgstr "stuurde jou een privébericht"
 
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Price of app"
-msgstr "Prijs van de app"
+#: ../../Zotlabs/Module/Ping.php:313
+msgid "added your channel"
+msgstr "voegde jouw kanaal toe"
 
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Location (URL) to purchase app"
-msgstr "Locatie (URL) om de app aan te schaffen"
+#: ../../Zotlabs/Module/Ping.php:323
+msgid "g A l F d"
+msgstr "G:i, l d F"
+
+#: ../../Zotlabs/Module/Ping.php:346
+msgid "[today]"
+msgstr "[vandaag]"
+
+#: ../../Zotlabs/Module/Ping.php:355
+msgid "posted an event"
+msgstr "plaatste een gebeurtenis"
+
+#: ../../Zotlabs/Module/Notifications.php:30
+msgid "Invalid request identifier."
+msgstr "Ongeldige verzoek identificator (request identifier)"
+
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "Discard"
+msgstr "Annuleren"
+
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:193
+msgid "Mark all system notifications seen"
+msgstr "Markeer alle systeemnotificaties als bekeken"
+
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228
+#: ../../include/conversation.php:963
+msgid "Poke"
+msgstr "Aanstoten"
+
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
+msgstr "Iemand aanstoten"
+
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
+msgstr "Aanstoten/porren"
+
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
+msgstr "Iemand bijvoorbeeld aanstoten of poren"
+
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
+msgstr "Ontvanger"
+
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
+msgstr "Kies wat je met de ontvanger wil doen"
+
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
+msgstr "Maak dit bericht privé"
+
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
+msgstr "Niet in staat om je hub te vinden"
+
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
+msgstr "Verzenden bericht geslaagd."
+
+#: ../../Zotlabs/Module/Openid.php:30
+msgid "OpenID protocol error. No ID returned."
+msgstr "OpenID-protocolfout. Geen ID terugontvangen."
+
+#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:285
+msgid "Login failed."
+msgstr "Inloggen mislukt."
+
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
+msgstr "Ongeldige profiel-identificator"
+
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
+msgstr "Zichtbaarheid profiel "
+
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1290
+msgid "Profile"
+msgstr "Profiel"
+
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
+msgstr "Klik op een connectie om deze toe te voegen of te verwijderen"
+
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
+msgstr "Zichtbaar voor"
+
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
+msgstr "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd."
+
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
+msgstr "Configuratiebewerker"
+
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please"
+" leave this page unless you are comfortable with and knowledgeable about how"
+" to correctly use this feature."
+msgstr "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. "
+
+#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
+#, php-format
+msgid "Fetching URL returns error: %1$s"
+msgstr "Ophalen URL gaf een foutmelding terug: %1$s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:19
+#, php-format
+msgid "Version %s"
+msgstr "Versie %s"
+
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Installed plugins/addons/apps:"
+msgstr "Ingeschakelde plugins en apps:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:36
+msgid "No installed plugins/addons/apps"
+msgstr "Geen ingeschakelde plugins en apps"
+
+#: ../../Zotlabs/Module/Siteinfo.php:49
+msgid ""
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
+msgstr "Dit is een $Projectname-hub - $Projectname is een wereldwijd coöperatief netwerk van gedecentraliseerde websites (hubs) met verbeterde privacy."
+
+#: ../../Zotlabs/Module/Siteinfo.php:51
+msgid "Tag: "
+msgstr "Tag: "
+
+#: ../../Zotlabs/Module/Siteinfo.php:53
+msgid "Last background fetch: "
+msgstr "Meest recente achtergrond-fetch:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:55
+msgid "Current load average: "
+msgstr "Gemiddelde systeembelasting is nu:"
+
+#: ../../Zotlabs/Module/Siteinfo.php:58
+msgid "Running at web location"
+msgstr "Draaiend op weblocatie"
+
+#: ../../Zotlabs/Module/Siteinfo.php:59
+msgid ""
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
+msgstr "Bezoek <a href=\"http://hubzilla.org\">hubzilla.org</a> "
+
+#: ../../Zotlabs/Module/Siteinfo.php:60
+msgid "Bug reports and issues: please visit"
+msgstr "Bugrapporten en andere kwesties: bezoek"
+
+#: ../../Zotlabs/Module/Siteinfo.php:62
+msgid "$projectname issues"
+msgstr "$projectname-issues"
+
+#: ../../Zotlabs/Module/Siteinfo.php:63
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
+"com"
+msgstr "Voorstellen, lofbetuigingen, enz. - e-mail  \"redmatrix\" at librelist - dot com"
+
+#: ../../Zotlabs/Module/Siteinfo.php:65
+msgid "Site Administrators"
+msgstr "Hubbeheerders: "
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten."
+
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid "The error message was:"
+msgstr "Het foutbericht was:"
+
+#: ../../Zotlabs/Module/Rmagic.php:48
+msgid "Authentication failed."
+msgstr "Authenticatie mislukt."
+
+#: ../../Zotlabs/Module/Rmagic.php:88
+msgid "Remote Authentication"
+msgstr "Authenticatie op afstand"
+
+#: ../../Zotlabs/Module/Rmagic.php:89
+msgid "Enter your channel address (e.g. channel@example.com)"
+msgstr "Vul jouw kanaaladres in (bijv. channel@example.com)"
+
+#: ../../Zotlabs/Module/Rmagic.php:90
+msgid "Authenticate"
+msgstr "Authenticeren"
+
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1337
+msgid "Public Hubs"
+msgstr "Openbare hubs"
+
+#: ../../Zotlabs/Module/Pubsites.php:25
+msgid ""
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
+msgstr "Op de hier weergegeven hubs kan iedereen zich voor het $Projectname-netwerk aanmelden. Alle hubs in het netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen een financiële tegemoetkoming voor bepaalde uitbreidingen. <strong>Mogelijk</strong> wordt hierover op de hub zelf meer informatie gegeven."
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Hub URL"
+msgstr "Hub-URL"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Access Type"
+msgstr "Toegangs-<br/>&nbsp;type"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Registration Policy"
+msgstr "Registratie-<br/>&nbsp;beleid"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Stats"
+msgstr "Stats"
+
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Software"
+msgstr "Software"
+
+#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
+#: ../../include/conversation.php:962
+msgid "Ratings"
+msgstr "Beoordelingen"
+
+#: ../../Zotlabs/Module/Pubsites.php:38
+msgid "Rate"
+msgstr "Beoordeel"
+
+#: ../../Zotlabs/Module/Profile_photo.php:186
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
+msgstr "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven."
+
+#: ../../Zotlabs/Module/Profile_photo.php:389
+msgid "Upload Profile Photo"
+msgstr "Profielfoto uploaden"
+
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Editblock.php:108
+msgid "Block Name"
+msgstr "Bloknaam"
+
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2238
+msgid "Blocks"
+msgstr "Blokken"
+
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
+msgstr "Bloktitel"
+
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Website:"
+msgstr "Website:"
+
+#: ../../Zotlabs/Module/Rate.php:163
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr "Kanaal op afstand [%s] (nog niet op deze hub bekend)"
+
+#: ../../Zotlabs/Module/Rate.php:164
+msgid "Rating (this information is public)"
+msgstr "Beoordeling (deze informatie is openbaar)"
+
+#: ../../Zotlabs/Module/Rate.php:165
+msgid "Optionally explain your rating (this information is public)"
+msgstr "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)"
+
+#: ../../Zotlabs/Module/Ratings.php:73
+msgid "No ratings"
+msgstr "Geen beoordelingen"
+
+#: ../../Zotlabs/Module/Ratings.php:104
+msgid "Rating: "
+msgstr "Beoordeling: "
+
+#: ../../Zotlabs/Module/Ratings.php:105
+msgid "Website: "
+msgstr "Website: "
+
+#: ../../Zotlabs/Module/Ratings.php:107
+msgid "Description: "
+msgstr "Omschrijving: "
+
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:165
+#: ../../include/widgets.php:102
+msgid "Apps"
+msgstr "Apps"
+
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243
+msgid "Title (optional)"
+msgstr "Titel (optioneel)"
+
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
+msgstr "Blok bewerken"
+
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr "Geen kanaal."
+
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr "Veel voorkomende connecties"
+
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
+msgstr "Geen gemeenschappelijke connecties."
 
 #: ../../Zotlabs/Module/Rbmark.php:94
 msgid "Select a bookmark folder"
@@ -4750,120 +4984,154 @@ msgstr "Ja"
 msgid "Membership on this site is by invitation only."
 msgstr "Registreren op deze $Projectname-hub kan alleen op uitnodiging."
 
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
-#: ../../boot.php:1685
+#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:149
+#: ../../boot.php:1686
 msgid "Register"
 msgstr "Registreren"
 
-#: ../../Zotlabs/Module/Register.php:262
-msgid "Proceed to create your first channel"
-msgstr "Volgende stap: aanmaken van jouw eerste kanaal"
+#: ../../Zotlabs/Module/Register.php:263
+msgid ""
+"This site may require email verification after submitting this form. If you "
+"are returned to a login page, please check your email for instructions."
+msgstr "Mogelijk moet op deze hub eerst jouw e-mail geverifieerd worden. Wanneer je na het indienen van dit formulier op de inlogpagina terecht komt, dan dien je jouw e-mail te controleren voor instructies. Controleer eventueel ook jouw spamfolder."
 
 #: ../../Zotlabs/Module/Regmod.php:15
 msgid "Please login."
 msgstr "Inloggen."
 
-#: ../../Zotlabs/Module/Removeaccount.php:34
+#: ../../Zotlabs/Module/Removeaccount.php:35
 msgid ""
 "Account removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd."
 
-#: ../../Zotlabs/Module/Removeaccount.php:56
+#: ../../Zotlabs/Module/Removeaccount.php:57
 msgid "Remove This Account"
 msgstr "Verwijder dit account"
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "WARNING: "
 msgstr "WAARSCHUWING: "
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
+#: ../../Zotlabs/Module/Removeaccount.php:58
 msgid ""
 "This account and all its channels will be completely removed from the "
 "network. "
 msgstr "Dit account en al zijn kanalen worden volledig uit het $Projectname-netwerk verwijderd."
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This action is permanent and can not be undone!"
 msgstr "Deze handeling is van permanente aard en kan niet meer worden teruggedraaid!"
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:60
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeme.php:62
 msgid "Please enter your password for verification:"
 msgstr "Vul je wachtwoord in ter verificatie:"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "Remove this account, all its channels and all its channel clones from the "
 "network"
 msgstr "Dit account, al zijn kanalen en alle klonen van zijn kanalen uit het $Projectname-netwerk verwijderen"
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeaccount.php:60
 msgid ""
 "By default only the instances of the channels located on this hub will be "
 "removed from the network"
 msgstr "Standaard worden alleen de kanalen die zich op deze hub bevinden uit het $Projectname-netwerk verwijderd"
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
-#: ../../Zotlabs/Module/Settings.php:705
+#: ../../Zotlabs/Module/Removeaccount.php:61
+#: ../../Zotlabs/Module/Settings.php:759
 msgid "Remove Account"
 msgstr "Account verwijderen"
 
-#: ../../Zotlabs/Module/Removeme.php:33
+#: ../../Zotlabs/Module/Removeme.php:35
 msgid ""
 "Channel removals are not allowed within 48 hours of changing the account "
 "password."
 msgstr "Het verwijderen van een kanaal is niet toegestaan binnen 48 uur nadat het wachtwoord van het account is veranderd."
 
-#: ../../Zotlabs/Module/Removeme.php:58
+#: ../../Zotlabs/Module/Removeme.php:60
 msgid "Remove This Channel"
 msgstr "Verwijder dit kanaal"
 
-#: ../../Zotlabs/Module/Removeme.php:59
+#: ../../Zotlabs/Module/Removeme.php:61
 msgid "This channel will be completely removed from the network. "
 msgstr "Dit kanaal wordt volledig uit het $Projectname-netwerk verwijderd."
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid "Remove this channel and all its clones from the network"
 msgstr "Dit kanaal en alle klonen hiervan uit het $Projectname-netwerk verwijderen"
 
-#: ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid ""
 "By default only the instance of the channel located on this hub will be "
 "removed from the network"
 msgstr "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het $Projectname-netwerk verwijderd"
 
-#: ../../Zotlabs/Module/Removeme.php:62 ../../Zotlabs/Module/Settings.php:1124
+#: ../../Zotlabs/Module/Removeme.php:64 ../../Zotlabs/Module/Settings.php:1219
 msgid "Remove Channel"
 msgstr "Kanaal verwijderen"
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+msgid "Export Channel"
+msgstr "Kanaal exporteren"
+
+#: ../../Zotlabs/Module/Uexport.php:57
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
-msgstr "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten."
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr "Exporteer de basisinformatie van jouw kanaal naar een bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal."
 
-#: ../../Zotlabs/Module/Rmagic.php:44
-msgid "The error message was:"
-msgstr "Het foutbericht was:"
+#: ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Content"
+msgstr "Inhoud exporteren"
 
-#: ../../Zotlabs/Module/Rmagic.php:48
-msgid "Authentication failed."
-msgstr "Authenticatie mislukt."
+#: ../../Zotlabs/Module/Uexport.php:59
+msgid ""
+"Export your channel information and recent content to a JSON backup that can"
+" be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for"
+" this download to begin."
+msgstr "Exporteer informatie en recente inhoud van jouw kanaal naar een JSON-back-up, wat kan worden gebruikt om jouw kanaal te herstellen of te importeren op een andere hub. Dit slaat al jouw connecties, permissies, profielgegevens en enkele maanden aan inhoud van jouw kanaal op. Dit bestand kan ZEER groot worden. Wees geduldig - het kan enkele minuten duren voordat de download begint."
 
-#: ../../Zotlabs/Module/Rmagic.php:88
-msgid "Remote Authentication"
-msgstr "Authenticatie op afstand"
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export your posts from a given year."
+msgstr "Exporteer jouw berichten uit een bepaald jaar."
 
-#: ../../Zotlabs/Module/Rmagic.php:89
-msgid "Enter your channel address (e.g. channel@example.com)"
-msgstr "Vul jouw kanaaladres in (bijv. channel@example.com)"
+#: ../../Zotlabs/Module/Uexport.php:62
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr "Je kan ook berichten en conversaties uit een bepaald jaar of van een bepaalde maand exporteren. Verander de datum in de adresbalk van jouw webbrowser om andere jaren en maanden te selecteren. Wanneer het exporteren mislukt (waarschijnlijk door een gebrek aan beschikbaar servergeheugen), probeer het dan nogmaals met een beperkter tijdvak."
 
-#: ../../Zotlabs/Module/Rmagic.php:90
-msgid "Authenticate"
-msgstr "Authenticeren"
+#: ../../Zotlabs/Module/Uexport.php:63
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a "
+"href=\"%1$s\">%2$s</a>"
+msgstr "Bezoek <a href=\"%1$s\">%2$s</a> om alle berichten van bijvoorbeeld dit jaar te selecteren. "
+
+#: ../../Zotlabs/Module/Uexport.php:64
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr "Bezoek  <a href=\"%1$s\">%2$s</a> om alle berichten van bijvoorbeeld januari dit jaar te selecteren."
+
+#: ../../Zotlabs/Module/Uexport.php:65
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a "
+"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
+" please import or restore these in date order (oldest first)."
+msgstr "Deze back-up-bestanden kunnen geïmporteerd of hersteld worden door op jouw hub en met jouw kanaal <a href=\"%1$s\">%2$s</a> te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen."
 
 #: ../../Zotlabs/Module/Search.php:216
 #, php-format
@@ -4879,609 +5147,652 @@ msgstr "Zoekresultaten voor %s"
 msgid "No service class restrictions found."
 msgstr "Geen abonnementsbeperkingen gevonden."
 
-#: ../../Zotlabs/Module/Settings.php:69
+#: ../../Zotlabs/Module/Settings.php:64
 msgid "Name is required"
 msgstr "Naam is vereist"
 
-#: ../../Zotlabs/Module/Settings.php:73
+#: ../../Zotlabs/Module/Settings.php:68
 msgid "Key and Secret are required"
 msgstr "Key en secret zijn vereist"
 
-#: ../../Zotlabs/Module/Settings.php:225
+#: ../../Zotlabs/Module/Settings.php:138
+#, php-format
+msgid "This channel is limited to %d tokens"
+msgstr "Dit kanaal heeft een limiet van %d tokens"
+
+#: ../../Zotlabs/Module/Settings.php:144
+msgid "Name and Password are required."
+msgstr "Naam en wachtwoord zijn vereist"
+
+#: ../../Zotlabs/Module/Settings.php:168
+msgid "Token saved."
+msgstr "Token opgeslagen."
+
+#: ../../Zotlabs/Module/Settings.php:274
 msgid "Not valid email."
 msgstr "Geen geldig e-mailadres."
 
-#: ../../Zotlabs/Module/Settings.php:228
+#: ../../Zotlabs/Module/Settings.php:277
 msgid "Protected email address. Cannot change to that email."
 msgstr "Beschermd e-mailadres. Kan dat e-mailadres niet gebruiken."
 
-#: ../../Zotlabs/Module/Settings.php:237
+#: ../../Zotlabs/Module/Settings.php:286
 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:254
+#: ../../Zotlabs/Module/Settings.php:303
 msgid "Password verification failed."
 msgstr "Wachtwoordverificatie mislukt"
 
-#: ../../Zotlabs/Module/Settings.php:261
+#: ../../Zotlabs/Module/Settings.php:310
 msgid "Passwords do not match. Password unchanged."
 msgstr "Wachtwoorden komen niet overeen. Wachtwoord onveranderd."
 
-#: ../../Zotlabs/Module/Settings.php:265
+#: ../../Zotlabs/Module/Settings.php:314
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Lege wachtwoorden zijn niet toegestaan. Wachtwoord onveranderd."
 
-#: ../../Zotlabs/Module/Settings.php:279
+#: ../../Zotlabs/Module/Settings.php:328
 msgid "Password changed."
 msgstr "Wachtwoord veranderd."
 
-#: ../../Zotlabs/Module/Settings.php:281
+#: ../../Zotlabs/Module/Settings.php:330
 msgid "Password update failed. Please try again."
 msgstr "Bijwerken wachtwoord mislukt. Probeer opnieuw."
 
-#: ../../Zotlabs/Module/Settings.php:525
+#: ../../Zotlabs/Module/Settings.php:579
 msgid "Settings updated."
 msgstr "Instellingen bijgewerkt."
 
-#: ../../Zotlabs/Module/Settings.php:589 ../../Zotlabs/Module/Settings.php:615
-#: ../../Zotlabs/Module/Settings.php:651
+#: ../../Zotlabs/Module/Settings.php:643 ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:705
 msgid "Add application"
 msgstr "Applicatie toevoegen"
 
-#: ../../Zotlabs/Module/Settings.php:592
+#: ../../Zotlabs/Module/Settings.php:646
 msgid "Name of application"
 msgstr "Naam van applicatie"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:619
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:673
 msgid "Consumer Key"
 msgstr "Consumer key"
 
-#: ../../Zotlabs/Module/Settings.php:593 ../../Zotlabs/Module/Settings.php:594
+#: ../../Zotlabs/Module/Settings.php:647 ../../Zotlabs/Module/Settings.php:648
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr "Automatische gegenereerd - verander wanneer gewenst. Maximale lengte is 20"
 
-#: ../../Zotlabs/Module/Settings.php:594 ../../Zotlabs/Module/Settings.php:620
+#: ../../Zotlabs/Module/Settings.php:648 ../../Zotlabs/Module/Settings.php:674
 msgid "Consumer Secret"
 msgstr "Consumer secret"
 
-#: ../../Zotlabs/Module/Settings.php:595 ../../Zotlabs/Module/Settings.php:621
+#: ../../Zotlabs/Module/Settings.php:649 ../../Zotlabs/Module/Settings.php:675
 msgid "Redirect"
 msgstr "Redirect/doorverwijzing"
 
-#: ../../Zotlabs/Module/Settings.php:595
+#: ../../Zotlabs/Module/Settings.php:649
 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:596 ../../Zotlabs/Module/Settings.php:622
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Settings.php:676
 msgid "Icon url"
 msgstr "Pictogram-URL"
 
-#: ../../Zotlabs/Module/Settings.php:596 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Settings.php:650 ../../Zotlabs/Module/Sources.php:112
 #: ../../Zotlabs/Module/Sources.php:147
 msgid "Optional"
 msgstr "Optioneel"
 
-#: ../../Zotlabs/Module/Settings.php:607
+#: ../../Zotlabs/Module/Settings.php:661
 msgid "Application not found."
 msgstr "Applicatie niet gevonden."
 
-#: ../../Zotlabs/Module/Settings.php:650
+#: ../../Zotlabs/Module/Settings.php:704
 msgid "Connected Apps"
 msgstr "Verbonden applicaties"
 
-#: ../../Zotlabs/Module/Settings.php:654
+#: ../../Zotlabs/Module/Settings.php:708
 msgid "Client key starts with"
 msgstr "Client key begint met"
 
-#: ../../Zotlabs/Module/Settings.php:655
+#: ../../Zotlabs/Module/Settings.php:709
 msgid "No name"
 msgstr "Geen naam"
 
-#: ../../Zotlabs/Module/Settings.php:656
+#: ../../Zotlabs/Module/Settings.php:710
 msgid "Remove authorization"
 msgstr "Autorisatie verwijderen"
 
-#: ../../Zotlabs/Module/Settings.php:669
+#: ../../Zotlabs/Module/Settings.php:723
 msgid "No feature settings configured"
 msgstr "Geen plugin-instellingen aanwezig"
 
-#: ../../Zotlabs/Module/Settings.php:676
+#: ../../Zotlabs/Module/Settings.php:730
 msgid "Feature/Addon Settings"
 msgstr "Plugin-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:699
+#: ../../Zotlabs/Module/Settings.php:753
 msgid "Account Settings"
 msgstr "Account-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:700
+#: ../../Zotlabs/Module/Settings.php:754
 msgid "Current Password"
 msgstr "Huidig wachtwoord"
 
-#: ../../Zotlabs/Module/Settings.php:701
+#: ../../Zotlabs/Module/Settings.php:755
 msgid "Enter New Password"
 msgstr "Nieuw wachtwoord invoeren"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 msgid "Confirm New Password"
 msgstr "Nieuw wachtwoord bevestigen"
 
-#: ../../Zotlabs/Module/Settings.php:702
+#: ../../Zotlabs/Module/Settings.php:756
 msgid "Leave password fields blank unless changing"
 msgstr "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen"
 
-#: ../../Zotlabs/Module/Settings.php:704
-#: ../../Zotlabs/Module/Settings.php:1041
+#: ../../Zotlabs/Module/Settings.php:758
+#: ../../Zotlabs/Module/Settings.php:1136
 msgid "Email Address:"
 msgstr "E-mailadres:"
 
-#: ../../Zotlabs/Module/Settings.php:706
+#: ../../Zotlabs/Module/Settings.php:760
 msgid "Remove this account including all its channels"
 msgstr "Dit account en al zijn kanalen verwijderen"
 
-#: ../../Zotlabs/Module/Settings.php:729
+#: ../../Zotlabs/Module/Settings.php:789
+msgid ""
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in Access Control Lists and "
+"visitors may login using these credentials to access the private content."
+msgstr "Gebruik dit formulier om tijdelijke identiteiten aan te maken, waarmee je bepaalde informatie met niet-leden kan delen. Deze identiteiten kunnen onder Permissies (handmatige selectie) worden gebruikt. Gasten kunnen inloggen met onderstaande gegevens om zo toegang te krijgen tot de privéinhoud."
+
+#: ../../Zotlabs/Module/Settings.php:791
+msgid ""
+"You may also provide <em>dropbox</em> style access links to friends and "
+"associates by adding the Login Password to any specific site URL as shown. "
+"Examples:"
+msgstr "Je kan ook <em>dropbox</em>-achtige links aan mensen geven door bovenstaand wachtwoord op onderstaande manier aan een hub-URL toe te voegen. Voorbeelden:"
+
+#: ../../Zotlabs/Module/Settings.php:796 ../../include/widgets.php:614
+msgid "Guest Access Tokens"
+msgstr "Gasttoegang"
+
+#: ../../Zotlabs/Module/Settings.php:803
+msgid "Login Name"
+msgstr "Inlognaam"
+
+#: ../../Zotlabs/Module/Settings.php:804
+msgid "Login Password"
+msgstr "Wachtwoord:"
+
+#: ../../Zotlabs/Module/Settings.php:805
+msgid "Expires (yyyy-mm-dd)"
+msgstr "Geldig t/m (yyyy-mm-dd)"
+
+#: ../../Zotlabs/Module/Settings.php:830
 msgid "Additional Features"
 msgstr "Extra functies"
 
-#: ../../Zotlabs/Module/Settings.php:753
+#: ../../Zotlabs/Module/Settings.php:854
 msgid "Connector Settings"
 msgstr "Instellingen externe koppelingen"
 
-#: ../../Zotlabs/Module/Settings.php:792
+#: ../../Zotlabs/Module/Settings.php:893
 msgid "No special theme for mobile devices"
 msgstr "Geen speciaal thema voor mobiele apparaten"
 
-#: ../../Zotlabs/Module/Settings.php:795
+#: ../../Zotlabs/Module/Settings.php:896
 #, php-format
 msgid "%s - (Experimental)"
 msgstr "%s - (experimenteel)"
 
-#: ../../Zotlabs/Module/Settings.php:837
+#: ../../Zotlabs/Module/Settings.php:938
 msgid "Display Settings"
 msgstr "Weergave-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:838
+#: ../../Zotlabs/Module/Settings.php:939
 msgid "Theme Settings"
 msgstr "Thema-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:839
+#: ../../Zotlabs/Module/Settings.php:940
 msgid "Custom Theme Settings"
 msgstr "Handmatige thema-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:840
+#: ../../Zotlabs/Module/Settings.php:941
 msgid "Content Settings"
 msgstr "Inhoudsinstellingen"
 
-#: ../../Zotlabs/Module/Settings.php:846
+#: ../../Zotlabs/Module/Settings.php:947
 msgid "Display Theme:"
 msgstr "Gebruik thema:"
 
-#: ../../Zotlabs/Module/Settings.php:847
+#: ../../Zotlabs/Module/Settings.php:948
 msgid "Mobile Theme:"
 msgstr "Mobiel thema:"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 msgid "Preload images before rendering the page"
 msgstr "Afbeeldingen laden voordat de pagina wordt weergegeven"
 
-#: ../../Zotlabs/Module/Settings.php:848
+#: ../../Zotlabs/Module/Settings.php:949
 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:849
+#: ../../Zotlabs/Module/Settings.php:950
 msgid "Enable user zoom on mobile devices"
 msgstr "Inzoomen op smartphones en tablets toestaan"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Update browser every xx seconds"
 msgstr "Ververs de webbrowser om de zoveel seconde"
 
-#: ../../Zotlabs/Module/Settings.php:850
+#: ../../Zotlabs/Module/Settings.php:951
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimaal 10 seconde, geen maximum"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:952
 msgid "Maximum number of conversations to load at any time:"
 msgstr "Maximaal aantal conversaties die per keer geladen worden:"
 
-#: ../../Zotlabs/Module/Settings.php:851
+#: ../../Zotlabs/Module/Settings.php:952
 msgid "Maximum of 100 items"
 msgstr "Maximaal 100 conversaties"
 
-#: ../../Zotlabs/Module/Settings.php:852
+#: ../../Zotlabs/Module/Settings.php:953
 msgid "Show emoticons (smilies) as images"
 msgstr "Toon emoticons (smilies) als afbeeldingen"
 
-#: ../../Zotlabs/Module/Settings.php:853
+#: ../../Zotlabs/Module/Settings.php:954
 msgid "Link post titles to source"
 msgstr "Berichtkoppen naar originele locatie linken"
 
-#: ../../Zotlabs/Module/Settings.php:854
+#: ../../Zotlabs/Module/Settings.php:955
 msgid "System Page Layout Editor - (advanced)"
 msgstr "Lay-out bewerken van systeempagina's (geavanceerd)"
 
-#: ../../Zotlabs/Module/Settings.php:857
+#: ../../Zotlabs/Module/Settings.php:958
 msgid "Use blog/list mode on channel page"
 msgstr "Gebruik blog/lijst-modus op kanaalpagina"
 
-#: ../../Zotlabs/Module/Settings.php:857 ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:958 ../../Zotlabs/Module/Settings.php:959
 msgid "(comments displayed separately)"
 msgstr "(reacties worden afzonderlijk weergeven)"
 
-#: ../../Zotlabs/Module/Settings.php:858
+#: ../../Zotlabs/Module/Settings.php:959
 msgid "Use blog/list mode on grid page"
 msgstr "Gebruik blog/lijst-modus op gridpagina"
 
-#: ../../Zotlabs/Module/Settings.php:859
+#: ../../Zotlabs/Module/Settings.php:960
 msgid "Channel page max height of content (in pixels)"
 msgstr "Maximale hoogte berichtinhoud op kanaalpagina (in pixels)"
 
-#: ../../Zotlabs/Module/Settings.php:859 ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:960 ../../Zotlabs/Module/Settings.php:961
 msgid "click to expand content exceeding this height"
 msgstr "klik om inhoud uit te klappen die deze hoogte overschrijdt"
 
-#: ../../Zotlabs/Module/Settings.php:860
+#: ../../Zotlabs/Module/Settings.php:961
 msgid "Grid page max height of content (in pixels)"
 msgstr "Maximale hoogte berichtinhoud op gridpagina (in pixels)"
 
-#: ../../Zotlabs/Module/Settings.php:894
+#: ../../Zotlabs/Module/Settings.php:990
 msgid "Nobody except yourself"
 msgstr "Niemand, behalve jezelf"
 
-#: ../../Zotlabs/Module/Settings.php:895
+#: ../../Zotlabs/Module/Settings.php:991
 msgid "Only those you specifically allow"
 msgstr "Alleen connecties met uitdrukkelijke toestemming"
 
-#: ../../Zotlabs/Module/Settings.php:896
+#: ../../Zotlabs/Module/Settings.php:992
 msgid "Approved connections"
 msgstr "Geaccepteerde connecties"
 
-#: ../../Zotlabs/Module/Settings.php:897
+#: ../../Zotlabs/Module/Settings.php:993
 msgid "Any connections"
 msgstr "Alle connecties"
 
-#: ../../Zotlabs/Module/Settings.php:898
+#: ../../Zotlabs/Module/Settings.php:994
 msgid "Anybody on this website"
 msgstr "Iedereen op deze hub"
 
-#: ../../Zotlabs/Module/Settings.php:899
+#: ../../Zotlabs/Module/Settings.php:995
 msgid "Anybody in this network"
 msgstr "Iedereen in dit netwerk"
 
-#: ../../Zotlabs/Module/Settings.php:900
+#: ../../Zotlabs/Module/Settings.php:996
 msgid "Anybody authenticated"
 msgstr "Geauthenticeerd"
 
-#: ../../Zotlabs/Module/Settings.php:901
+#: ../../Zotlabs/Module/Settings.php:997
 msgid "Anybody on the internet"
 msgstr "Iedereen op het internet"
 
-#: ../../Zotlabs/Module/Settings.php:976
+#: ../../Zotlabs/Module/Settings.php:1071
 msgid "Publish your default profile in the network directory"
 msgstr "Publiceer je standaardprofiel in de kanalengids"
 
-#: ../../Zotlabs/Module/Settings.php:981
+#: ../../Zotlabs/Module/Settings.php:1076
 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:990
+#: ../../Zotlabs/Module/Settings.php:1085
 msgid "Your channel address is"
 msgstr "Jouw kanaaladres is"
 
-#: ../../Zotlabs/Module/Settings.php:1032
+#: ../../Zotlabs/Module/Settings.php:1127
 msgid "Channel Settings"
 msgstr "Kanaal-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1039
+#: ../../Zotlabs/Module/Settings.php:1134
 msgid "Basic Settings"
 msgstr "Basis-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1140
+#: ../../Zotlabs/Module/Settings.php:1135 ../../include/channel.php:1180
 msgid "Full Name:"
 msgstr "Volledige naam:"
 
-#: ../../Zotlabs/Module/Settings.php:1042
+#: ../../Zotlabs/Module/Settings.php:1137
 msgid "Your Timezone:"
 msgstr "Jouw tijdzone:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Default Post Location:"
 msgstr "Standaardlocatie bericht:"
 
-#: ../../Zotlabs/Module/Settings.php:1043
+#: ../../Zotlabs/Module/Settings.php:1138
 msgid "Geographical location to display on your posts"
 msgstr "Geografische locatie die bij het bericht moet worden vermeld"
 
-#: ../../Zotlabs/Module/Settings.php:1044
+#: ../../Zotlabs/Module/Settings.php:1139
 msgid "Use Browser Location:"
 msgstr "Locatie van webbrowser gebruiken:"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 msgid "Adult Content"
 msgstr "Inhoud voor volwassenen"
 
-#: ../../Zotlabs/Module/Settings.php:1046
+#: ../../Zotlabs/Module/Settings.php:1141
 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:1048
+#: ../../Zotlabs/Module/Settings.php:1143
 msgid "Security and Privacy Settings"
 msgstr "Veiligheids- en privacy-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1051
+#: ../../Zotlabs/Module/Settings.php:1146
 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:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 msgid "Hide my online presence"
 msgstr "Verberg mijn aanwezigheid"
 
-#: ../../Zotlabs/Module/Settings.php:1053
+#: ../../Zotlabs/Module/Settings.php:1148
 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:1055
+#: ../../Zotlabs/Module/Settings.php:1150
 msgid "Simple Privacy Settings:"
 msgstr "Eenvoudige privacy-instellingen:"
 
-#: ../../Zotlabs/Module/Settings.php:1056
+#: ../../Zotlabs/Module/Settings.php:1151
 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:1057
+#: ../../Zotlabs/Module/Settings.php:1152
 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:1058
+#: ../../Zotlabs/Module/Settings.php:1153
 msgid "Private - <em>default private, never open or public</em>"
 msgstr "Privé <em>(standaard privé en nooit openbaar)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1154
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr "Geblokkeerd <em>(standaard geblokkeerd naar/van iedereen)</em>"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 msgid "Allow others to tag your posts"
 msgstr "Anderen toestaan om je berichten te taggen"
 
-#: ../../Zotlabs/Module/Settings.php:1061
+#: ../../Zotlabs/Module/Settings.php:1156
 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:1063
+#: ../../Zotlabs/Module/Settings.php:1158
 msgid "Advanced Privacy Settings"
 msgstr "Geavanceerde privacy-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "Expire other channel content after this many days"
 msgstr "Inhoud van andere kanalen na zoveel aantal dagen laten verlopen:"
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "0 or blank to use the website limit."
 msgstr "0 of leeg om het standaard aantal dagen van deze hub te gebruiken."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 #, php-format
 msgid "This website expires after %d days."
 msgstr "Deze hub laat de inhoud van andere kanalen na %d dagen verlopen."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "This website does not expire imported content."
 msgstr "Deze hub laat de inhoud van andere kanalen niet verlopen."
 
-#: ../../Zotlabs/Module/Settings.php:1065
+#: ../../Zotlabs/Module/Settings.php:1160
 msgid "The website limit takes precedence if lower than your limit."
 msgstr "Wanneer de standaard aantal dagen van deze hub lager ligt dan jouw aantal, dan heeft de limiet van deze hub voorrang."
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximum aantal connectieverzoeken per dag:"
 
-#: ../../Zotlabs/Module/Settings.php:1066
+#: ../../Zotlabs/Module/Settings.php:1161
 msgid "May reduce spam activity"
 msgstr "Kan eventuele spam verminderen"
 
-#: ../../Zotlabs/Module/Settings.php:1067
+#: ../../Zotlabs/Module/Settings.php:1162
 msgid "Default Post and Publish Permissions"
 msgstr "Standaard permissies voor nieuwe berichten en publicaties"
 
-#: ../../Zotlabs/Module/Settings.php:1069
+#: ../../Zotlabs/Module/Settings.php:1164
 msgid "Use my default audience setting for the type of object published"
 msgstr "Gebruik mijn standaard privacy-instelling voor dit type publicatie"
 
-#: ../../Zotlabs/Module/Settings.php:1072
+#: ../../Zotlabs/Module/Settings.php:1167
 msgid "Channel permissions category:"
 msgstr "Kanaaltype en -permissies:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximum aantal privé-berichten per dag van onbekende personen:"
 
-#: ../../Zotlabs/Module/Settings.php:1078
+#: ../../Zotlabs/Module/Settings.php:1173
 msgid "Useful to reduce spamming"
 msgstr "Kan eventuele spam verminderen"
 
-#: ../../Zotlabs/Module/Settings.php:1081
+#: ../../Zotlabs/Module/Settings.php:1176
 msgid "Notification Settings"
 msgstr "Notificatie-instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1082
+#: ../../Zotlabs/Module/Settings.php:1177
 msgid "By default post a status message when:"
 msgstr "Plaats automatisch een bericht wanneer:"
 
-#: ../../Zotlabs/Module/Settings.php:1083
+#: ../../Zotlabs/Module/Settings.php:1178
 msgid "accepting a friend request"
 msgstr "Een connectieverzoek wordt geaccepteerd"
 
-#: ../../Zotlabs/Module/Settings.php:1084
+#: ../../Zotlabs/Module/Settings.php:1179
 msgid "joining a forum/community"
 msgstr "Je lid wordt van een forum/groep"
 
-#: ../../Zotlabs/Module/Settings.php:1085
+#: ../../Zotlabs/Module/Settings.php:1180
 msgid "making an <em>interesting</em> profile change"
 msgstr "Er sprake is van een <em>interessante</em> profielwijziging"
 
-#: ../../Zotlabs/Module/Settings.php:1086
+#: ../../Zotlabs/Module/Settings.php:1181
 msgid "Send a notification email when:"
 msgstr "Verzend een notificatie per e-mail wanneer:"
 
-#: ../../Zotlabs/Module/Settings.php:1087
+#: ../../Zotlabs/Module/Settings.php:1182
 msgid "You receive a connection request"
 msgstr "Je een connectieverzoek ontvangt"
 
-#: ../../Zotlabs/Module/Settings.php:1088
+#: ../../Zotlabs/Module/Settings.php:1183
 msgid "Your connections are confirmed"
 msgstr "Jouw connecties zijn bevestigd"
 
-#: ../../Zotlabs/Module/Settings.php:1089
+#: ../../Zotlabs/Module/Settings.php:1184
 msgid "Someone writes on your profile wall"
 msgstr "Iemand iets op jouw kanaal heeft geschreven"
 
-#: ../../Zotlabs/Module/Settings.php:1090
+#: ../../Zotlabs/Module/Settings.php:1185
 msgid "Someone writes a followup comment"
 msgstr "Iemand een reactie schrijft"
 
-#: ../../Zotlabs/Module/Settings.php:1091
+#: ../../Zotlabs/Module/Settings.php:1186
 msgid "You receive a private message"
 msgstr "Je een privé-bericht ontvangt"
 
-#: ../../Zotlabs/Module/Settings.php:1092
+#: ../../Zotlabs/Module/Settings.php:1187
 msgid "You receive a friend suggestion"
 msgstr "Je een kanaalvoorstel ontvangt"
 
-#: ../../Zotlabs/Module/Settings.php:1093
+#: ../../Zotlabs/Module/Settings.php:1188
 msgid "You are tagged in a post"
 msgstr "Je expliciet in een bericht bent genoemd"
 
-#: ../../Zotlabs/Module/Settings.php:1094
+#: ../../Zotlabs/Module/Settings.php:1189
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Je bent in een bericht aangestoten/gepord/etc."
 
-#: ../../Zotlabs/Module/Settings.php:1097
+#: ../../Zotlabs/Module/Settings.php:1192
 msgid "Show visual notifications including:"
 msgstr "Toon de volgende zichtbare notificaties:"
 
-#: ../../Zotlabs/Module/Settings.php:1099
+#: ../../Zotlabs/Module/Settings.php:1194
 msgid "Unseen grid activity"
 msgstr "Niet bekeken grid-activiteit"
 
-#: ../../Zotlabs/Module/Settings.php:1100
+#: ../../Zotlabs/Module/Settings.php:1195
 msgid "Unseen channel activity"
 msgstr "Niet bekeken kanaal-activiteit"
 
-#: ../../Zotlabs/Module/Settings.php:1101
+#: ../../Zotlabs/Module/Settings.php:1196
 msgid "Unseen private messages"
 msgstr "Niet bekeken privéberichten"
 
-#: ../../Zotlabs/Module/Settings.php:1101
-#: ../../Zotlabs/Module/Settings.php:1106
-#: ../../Zotlabs/Module/Settings.php:1107
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1196
+#: ../../Zotlabs/Module/Settings.php:1201
+#: ../../Zotlabs/Module/Settings.php:1202
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "Recommended"
 msgstr "Aanbevolen"
 
-#: ../../Zotlabs/Module/Settings.php:1102
+#: ../../Zotlabs/Module/Settings.php:1197
 msgid "Upcoming events"
 msgstr "Aankomende gebeurtenissen"
 
-#: ../../Zotlabs/Module/Settings.php:1103
+#: ../../Zotlabs/Module/Settings.php:1198
 msgid "Events today"
 msgstr "Gebeurtenissen van vandaag"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Upcoming birthdays"
 msgstr "Aankomende verjaardagen"
 
-#: ../../Zotlabs/Module/Settings.php:1104
+#: ../../Zotlabs/Module/Settings.php:1199
 msgid "Not available in all themes"
 msgstr "Niet in alle thema's beschikbaar"
 
-#: ../../Zotlabs/Module/Settings.php:1105
+#: ../../Zotlabs/Module/Settings.php:1200
 msgid "System (personal) notifications"
 msgstr "(Persoonlijke) systeemnotificaties"
 
-#: ../../Zotlabs/Module/Settings.php:1106
+#: ../../Zotlabs/Module/Settings.php:1201
 msgid "System info messages"
 msgstr "Systeemmededelingen"
 
-#: ../../Zotlabs/Module/Settings.php:1107
+#: ../../Zotlabs/Module/Settings.php:1202
 msgid "System critical alerts"
 msgstr "Kritische systeemwaarschuwingen"
 
-#: ../../Zotlabs/Module/Settings.php:1108
+#: ../../Zotlabs/Module/Settings.php:1203
 msgid "New connections"
 msgstr "Nieuwe connecties"
 
-#: ../../Zotlabs/Module/Settings.php:1109
+#: ../../Zotlabs/Module/Settings.php:1204
 msgid "System Registrations"
 msgstr "Nieuwe accountregistraties op deze hub"
 
-#: ../../Zotlabs/Module/Settings.php:1110
+#: ../../Zotlabs/Module/Settings.php:1205
 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:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 msgid "Notify me of events this many days in advance"
 msgstr "Herinner mij zoveel dagen van te voren aan gebeurtenissen"
 
-#: ../../Zotlabs/Module/Settings.php:1112
+#: ../../Zotlabs/Module/Settings.php:1207
 msgid "Must be greater than 0"
 msgstr "Moet hoger dan 0 zijn"
 
-#: ../../Zotlabs/Module/Settings.php:1114
+#: ../../Zotlabs/Module/Settings.php:1209
 msgid "Advanced Account/Page Type Settings"
 msgstr "Instellingen geavanceerd account/paginatype"
 
-#: ../../Zotlabs/Module/Settings.php:1115
+#: ../../Zotlabs/Module/Settings.php:1210
 msgid "Change the behaviour of this account for special situations"
 msgstr "Verander het gedrag van dit account voor speciale situaties"
 
-#: ../../Zotlabs/Module/Settings.php:1118
+#: ../../Zotlabs/Module/Settings.php:1213
 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:1119
+#: ../../Zotlabs/Module/Settings.php:1214
 msgid "Miscellaneous Settings"
 msgstr "Diverse instellingen"
 
-#: ../../Zotlabs/Module/Settings.php:1120
+#: ../../Zotlabs/Module/Settings.php:1215
 msgid "Default photo upload folder"
 msgstr "Standaard fotoalbum voor uploads"
 
-#: ../../Zotlabs/Module/Settings.php:1120
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1215
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "%Y - current year, %m -  current month"
 msgstr "%Y - dit jaar, %m -  deze maand"
 
-#: ../../Zotlabs/Module/Settings.php:1121
+#: ../../Zotlabs/Module/Settings.php:1216
 msgid "Default file upload folder"
 msgstr "Standaard bestandsmap voor uploads"
 
-#: ../../Zotlabs/Module/Settings.php:1123
+#: ../../Zotlabs/Module/Settings.php:1218
 msgid "Personal menu to display in your channel pages"
 msgstr "Persoonlijk menu om op je kanaalpagina's weer te geven"
 
-#: ../../Zotlabs/Module/Settings.php:1125
+#: ../../Zotlabs/Module/Settings.php:1220
 msgid "Remove this channel."
 msgstr "Verwijder dit kanaal."
 
-#: ../../Zotlabs/Module/Settings.php:1126
+#: ../../Zotlabs/Module/Settings.php:1221
 msgid "Firefox Share $Projectname provider"
 msgstr "$Projectname-service voor Firefox Share"
 
-#: ../../Zotlabs/Module/Settings.php:1127
+#: ../../Zotlabs/Module/Settings.php:1222
 msgid "Start calendar week on monday"
 msgstr "Begin in de agenda de week op maandag"
 
@@ -5514,7 +5825,7 @@ msgid ""
 msgstr "You may need to import the file \"install/schema_xxx.sql\" manually using a database client."
 
 #: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
-#: ../../Zotlabs/Module/Setup.php:721
+#: ../../Zotlabs/Module/Setup.php:722
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr "Please see the file \"install/INSTALL.txt\"."
 
@@ -5714,199 +6025,200 @@ msgid "mb_string PHP module"
 msgstr "mb_string PHP module"
 
 #: ../../Zotlabs/Module/Setup.php:496
-msgid "mcrypt PHP module"
-msgstr "mcrypt PHP module"
-
-#: ../../Zotlabs/Module/Setup.php:497
 msgid "xml PHP module"
 msgstr "xml PHP module"
 
-#: ../../Zotlabs/Module/Setup.php:501 ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:500 ../../Zotlabs/Module/Setup.php:502
 msgid "Apache mod_rewrite module"
 msgstr "Apache mod_rewrite module"
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Zotlabs/Module/Setup.php:500
 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:507 ../../Zotlabs/Module/Setup.php:510
+#: ../../Zotlabs/Module/Setup.php:506 ../../Zotlabs/Module/Setup.php:509
 msgid "proc_open"
 msgstr "proc_open"
 
-#: ../../Zotlabs/Module/Setup.php:507
+#: ../../Zotlabs/Module/Setup.php:506
 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:515
+#: ../../Zotlabs/Module/Setup.php:514
 msgid "Error: libCURL PHP module required but not installed."
 msgstr "Error: libCURL PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:519
+#: ../../Zotlabs/Module/Setup.php:518
 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:523
+#: ../../Zotlabs/Module/Setup.php:522
 msgid "Error: openssl PHP module required but not installed."
 msgstr "Error: openssl PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:527
+#: ../../Zotlabs/Module/Setup.php:526
 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:531
+#: ../../Zotlabs/Module/Setup.php:530
 msgid "Error: mb_string PHP module required but not installed."
 msgstr "Error: mb_string PHP module required but not installed."
 
-#: ../../Zotlabs/Module/Setup.php:535
-msgid "Error: mcrypt PHP module required but not installed."
-msgstr "Error: mcrypt PHP module required but not installed."
-
-#: ../../Zotlabs/Module/Setup.php:539
+#: ../../Zotlabs/Module/Setup.php:534
 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:557
+#: ../../Zotlabs/Module/Setup.php:552
 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:558
+#: ../../Zotlabs/Module/Setup.php:553
 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:559
+#: ../../Zotlabs/Module/Setup.php:554
 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:560
+#: ../../Zotlabs/Module/Setup.php:555
 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:563
+#: ../../Zotlabs/Module/Setup.php:558
 msgid ".htconfig.php is writable"
 msgstr ".htconfig.php is writable"
 
-#: ../../Zotlabs/Module/Setup.php:577
+#: ../../Zotlabs/Module/Setup.php:572
 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:578
+#: ../../Zotlabs/Module/Setup.php:573
 #, php-format
 msgid ""
 "In order to store these compiled templates, the web server needs to have "
 "write access to the directory %s under the top level web folder."
 msgstr "In order to store these compiled templates, the web server needs to have write access to the directory %s under the top level web folder."
 
-#: ../../Zotlabs/Module/Setup.php:579 ../../Zotlabs/Module/Setup.php:600
+#: ../../Zotlabs/Module/Setup.php:574 ../../Zotlabs/Module/Setup.php:595
 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:580
+#: ../../Zotlabs/Module/Setup.php:575
 #, 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:583
+#: ../../Zotlabs/Module/Setup.php:578
 #, php-format
 msgid "%s is writable"
 msgstr "%s is writable"
 
-#: ../../Zotlabs/Module/Setup.php:599
+#: ../../Zotlabs/Module/Setup.php:594
 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"
+"This software 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 "This software 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:603
+#: ../../Zotlabs/Module/Setup.php:598
 msgid "store is writable"
 msgstr "store is writable"
 
-#: ../../Zotlabs/Module/Setup.php:636
+#: ../../Zotlabs/Module/Setup.php:631
 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:637
+#: ../../Zotlabs/Module/Setup.php:632
 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:638
+#: ../../Zotlabs/Module/Setup.php:633
 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:639
+#: ../../Zotlabs/Module/Setup.php:634
 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:640
+#: ../../Zotlabs/Module/Setup.php:635
 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:641
+#: ../../Zotlabs/Module/Setup.php:636
 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:643
+#: ../../Zotlabs/Module/Setup.php:638
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr "If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."
+
+#: ../../Zotlabs/Module/Setup.php:641
 msgid "SSL certificate validation"
 msgstr "SSL certificate validation"
 
-#: ../../Zotlabs/Module/Setup.php:649
+#: ../../Zotlabs/Module/Setup.php:647
 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:652
+#: ../../Zotlabs/Module/Setup.php:650
 msgid "Url rewrite is working"
 msgstr "Url rewrite is working"
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:659
 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:685
+#: ../../Zotlabs/Module/Setup.php:683
 msgid "Errors encountered creating database tables."
 msgstr "Errors encountered creating database tables."
 
-#: ../../Zotlabs/Module/Setup.php:719
+#: ../../Zotlabs/Module/Setup.php:720
 msgid "<h1>What next</h1>"
 msgstr "<h1>What next</h1>"
 
-#: ../../Zotlabs/Module/Setup.php:720
+#: ../../Zotlabs/Module/Setup.php:721
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the "
 "poller."
@@ -5928,64 +6240,62 @@ msgstr "Verwijder alle bestanden"
 msgid "Remove this file"
 msgstr "Verwijder dit bestand"
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
+#: ../../Zotlabs/Module/Thing.php:114
+msgid "Thing updated"
+msgstr "Ding bijgewerkt"
+
+#: ../../Zotlabs/Module/Thing.php:166
+msgid "Object store: failed"
+msgstr "Opslaan van ding mislukt"
+
+#: ../../Zotlabs/Module/Thing.php:170
+msgid "Thing added"
+msgstr "Ding toegevoegd"
+
+#: ../../Zotlabs/Module/Thing.php:196
 #, php-format
-msgid "Version %s"
-msgstr "Versie %s"
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr "OBJ: %1$s %2$s %3$s"
 
-#: ../../Zotlabs/Module/Siteinfo.php:40
-msgid "Installed plugins/addons/apps:"
-msgstr "Ingeschakelde plugins en apps:"
+#: ../../Zotlabs/Module/Thing.php:259
+msgid "Show Thing"
+msgstr "Ding weergeven"
 
-#: ../../Zotlabs/Module/Siteinfo.php:53
-msgid "No installed plugins/addons/apps"
-msgstr "Geen ingeschakelde plugins en apps"
+#: ../../Zotlabs/Module/Thing.php:266
+msgid "item not found."
+msgstr "Item niet gevonden"
 
-#: ../../Zotlabs/Module/Siteinfo.php:66
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
-msgstr "Dit is een $Projectname-hub - $Projectname is een wereldwijd coöperatief netwerk van gedecentraliseerde websites (hubs) met verbeterde privacy."
+#: ../../Zotlabs/Module/Thing.php:299
+msgid "Edit Thing"
+msgstr "Ding bewerken"
 
-#: ../../Zotlabs/Module/Siteinfo.php:68
-msgid "Tag: "
-msgstr "Tag: "
+#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
+msgid "Select a profile"
+msgstr "Kies een profiel"
 
-#: ../../Zotlabs/Module/Siteinfo.php:70
-msgid "Last background fetch: "
-msgstr "Meest recente achtergrond-fetch:"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Post an activity"
+msgstr "Plaats een bericht"
 
-#: ../../Zotlabs/Module/Siteinfo.php:72
-msgid "Current load average: "
-msgstr "Gemiddelde systeembelasting is nu:"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Only sends to viewers of the applicable profile"
+msgstr "Toont dit alleen aan diegene die het gekozen profiel mogen zien."
 
-#: ../../Zotlabs/Module/Siteinfo.php:75
-msgid "Running at web location"
-msgstr "Draaiend op weblocatie"
+#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
+msgid "Name of thing e.g. something"
+msgstr "Naam van ding"
 
-#: ../../Zotlabs/Module/Siteinfo.php:76
-msgid ""
-"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
-"about $Projectname."
-msgstr "Bezoek <a href=\"http://hubzilla.org\">hubzilla.org</a> "
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
+msgid "URL of thing (optional)"
+msgstr "URL van ding (optioneel)"
 
-#: ../../Zotlabs/Module/Siteinfo.php:77
-msgid "Bug reports and issues: please visit"
-msgstr "Bugrapporten en andere kwesties: bezoek"
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
+msgid "URL for photo of thing (optional)"
+msgstr "URL voor foto van ding (optioneel)"
 
-#: ../../Zotlabs/Module/Siteinfo.php:79
-msgid "$projectname issues"
-msgstr "$projectname-issues"
-
-#: ../../Zotlabs/Module/Siteinfo.php:80
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot "
-"com"
-msgstr "Voorstellen, lofbetuigingen, enz. - e-mail  \"redmatrix\" at librelist - dot com"
-
-#: ../../Zotlabs/Module/Siteinfo.php:82
-msgid "Site Administrators"
-msgstr "Hubbeheerders: "
+#: ../../Zotlabs/Module/Thing.php:349
+msgid "Add Thing to your Profile"
+msgstr "Ding aan je profiel toevoegen"
 
 #: ../../Zotlabs/Module/Sources.php:37
 msgid "Failed to create source. No channel selected."
@@ -6003,8 +6313,8 @@ msgstr "Bron aangemaakt."
 msgid "*"
 msgstr "*"
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:630
-#: ../../include/features.php:71
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:72
+#: ../../include/widgets.php:639
 msgid "Channel Sources"
 msgstr "Kanaalbronnen"
 
@@ -6080,12 +6390,12 @@ msgstr "Geen voorgestelde kanalen gevonden. Wanneer dit een nieuwe hub is, probe
 msgid "Ignore/Hide"
 msgstr "Negeren/Verbergen"
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:256
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:263
 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:1929
 msgid "comment"
 msgstr "reactie"
 
@@ -6106,131 +6416,110 @@ msgstr "Verwijder item-tag"
 msgid "Select a tag to remove: "
 msgstr "Kies een tag om te verwijderen"
 
-#: ../../Zotlabs/Module/Thing.php:114
-msgid "Thing updated"
-msgstr "Ding bijgewerkt"
+#: ../../Zotlabs/Module/Webpages.php:191 ../../Zotlabs/Lib/Apps.php:218
+#: ../../include/nav.php:106 ../../include/conversation.php:1700
+msgid "Webpages"
+msgstr "Webpagina's"
 
-#: ../../Zotlabs/Module/Thing.php:166
-msgid "Object store: failed"
-msgstr "Opslaan van ding mislukt"
+#: ../../Zotlabs/Module/Webpages.php:202 ../../include/page_widgets.php:44
+msgid "Actions"
+msgstr "Acties"
 
-#: ../../Zotlabs/Module/Thing.php:170
-msgid "Thing added"
-msgstr "Ding toegevoegd"
+#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:45
+msgid "Page Link"
+msgstr "Paginalink"
 
-#: ../../Zotlabs/Module/Thing.php:196
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr "OBJ: %1$s %2$s %3$s"
+#: ../../Zotlabs/Module/Webpages.php:204
+msgid "Page Title"
+msgstr "Paginatitel"
 
-#: ../../Zotlabs/Module/Thing.php:259
-msgid "Show Thing"
-msgstr "Ding weergeven"
+#: ../../Zotlabs/Module/Wiki.php:34
+msgid "Not found"
+msgstr "Niet gevonden"
 
-#: ../../Zotlabs/Module/Thing.php:266
-msgid "item not found."
-msgstr "Item niet gevonden"
+#: ../../Zotlabs/Module/Wiki.php:92 ../../Zotlabs/Lib/Apps.php:219
+#: ../../include/nav.php:108 ../../include/conversation.php:1710
+#: ../../include/conversation.php:1713 ../../include/features.php:55
+msgid "Wiki"
+msgstr "Wiki"
 
-#: ../../Zotlabs/Module/Thing.php:299
-msgid "Edit Thing"
-msgstr "Ding bewerken"
+#: ../../Zotlabs/Module/Wiki.php:93
+msgid "Sandbox"
+msgstr "Zandbak"
 
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
-msgid "Select a profile"
-msgstr "Kies een profiel"
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Post an activity"
-msgstr "Plaats een bericht"
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Only sends to viewers of the applicable profile"
-msgstr "Toont dit alleen aan diegene die het gekozen profiel mogen zien."
-
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
-msgid "Name of thing e.g. something"
-msgstr "Naam van ding"
-
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
-msgid "URL of thing (optional)"
-msgstr "URL van ding (optioneel)"
-
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
-msgid "URL for photo of thing (optional)"
-msgstr "URL voor foto van ding (optioneel)"
-
-#: ../../Zotlabs/Module/Thing.php:349
-msgid "Add Thing to your Profile"
-msgstr "Ding aan je profiel toevoegen"
-
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
-msgid "Export Channel"
-msgstr "Kanaal exporteren"
-
-#: ../../Zotlabs/Module/Uexport.php:57
+#: ../../Zotlabs/Module/Wiki.php:95
 msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
-msgstr "Exporteer de basisinformatie van jouw kanaal naar een bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal."
+"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be"
+" saved*.\""
+msgstr "\"# Wiki Sandbox\\n\\nWat er hier onder **edit** en **preview** staat *wordt niet opgeslagen*.\""
 
-#: ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Content"
-msgstr "Inhoud exporteren"
+#: ../../Zotlabs/Module/Wiki.php:164
+msgid "Revision Comparison"
+msgstr "Revisies vergelijken"
 
-#: ../../Zotlabs/Module/Uexport.php:59
-msgid ""
-"Export your channel information and recent content to a JSON backup that can"
-" be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for"
-" this download to begin."
-msgstr "Exporteer informatie en recente inhoud van jouw kanaal naar een JSON-back-up, wat kan worden gebruikt om jouw kanaal te herstellen of te importeren op een andere hub. Dit slaat al jouw connecties, permissies, profielgegevens en enkele maanden aan inhoud van jouw kanaal op. Dit bestand kan ZEER groot worden. Wees geduldig - het kan enkele minuten duren voordat de download begint."
+#: ../../Zotlabs/Module/Wiki.php:165
+msgid "Revert"
+msgstr "Ongedaan maken"
 
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export your posts from a given year."
-msgstr "Exporteer jouw berichten uit een bepaald jaar."
+#: ../../Zotlabs/Module/Wiki.php:192
+msgid "Enter the name of your new wiki:"
+msgstr "Vul de naam in van jouw nieuwe wiki:"
 
-#: ../../Zotlabs/Module/Uexport.php:62
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
-msgstr "Je kan ook berichten en conversaties uit een bepaald jaar of van een bepaalde maand exporteren. Verander de datum in de adresbalk van jouw webbrowser om andere jaren en maanden te selecteren. Wanneer het exporteren mislukt (waarschijnlijk door een gebrek aan beschikbaar servergeheugen), probeer het dan nogmaals met een beperkter tijdvak."
+#: ../../Zotlabs/Module/Wiki.php:193
+msgid "Enter the name of the new page:"
+msgstr "Vul de naam in van de nieuwe pagina:"
 
-#: ../../Zotlabs/Module/Uexport.php:63
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a "
-"href=\"%1$s\">%2$s</a>"
-msgstr "Bezoek <a href=\"%1$s\">%2$s</a> om alle berichten van bijvoorbeeld dit jaar te selecteren. "
+#: ../../Zotlabs/Module/Wiki.php:194
+msgid "Enter the new name:"
+msgstr "Vul de nieuwe naam in:"
 
-#: ../../Zotlabs/Module/Uexport.php:64
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
-msgstr "Bezoek  <a href=\"%1$s\">%2$s</a> om alle berichten van bijvoorbeeld januari dit jaar te selecteren."
+#: ../../Zotlabs/Module/Wiki.php:200 ../../include/conversation.php:1150
+msgid "Embed image from photo albums"
+msgstr "Afbeelding uit een fotoalbum invoegen"
 
-#: ../../Zotlabs/Module/Uexport.php:65
-#, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a "
-"href=\"%1$s\">%2$s</a> on any site containing your channel. For best results"
-" please import or restore these in date order (oldest first)."
-msgstr "Deze back-up-bestanden kunnen geïmporteerd of hersteld worden door op jouw hub en met jouw kanaal <a href=\"%1$s\">%2$s</a> te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen."
+#: ../../Zotlabs/Module/Wiki.php:201 ../../include/conversation.php:1234
+msgid "Embed an image from your albums"
+msgstr "Afbeelding uit jouw albums invoegen"
 
-#: ../../Zotlabs/Module/Viewconnections.php:62
+#: ../../Zotlabs/Module/Wiki.php:203 ../../include/conversation.php:1236
+#: ../../include/conversation.php:1273
+msgid "OK"
+msgstr "OK"
+
+#: ../../Zotlabs/Module/Wiki.php:204 ../../include/conversation.php:1186
+msgid "Choose images to embed"
+msgstr "Kies afbeeldingen om in te voegen"
+
+#: ../../Zotlabs/Module/Wiki.php:205 ../../include/conversation.php:1187
+msgid "Choose an album"
+msgstr "Kies een album"
+
+#: ../../Zotlabs/Module/Wiki.php:206 ../../include/conversation.php:1188
+msgid "Choose a different album..."
+msgstr "Kies een ander album..."
+
+#: ../../Zotlabs/Module/Wiki.php:207 ../../include/conversation.php:1189
+msgid "Error getting album list"
+msgstr "Fout met ophalen albumlijst"
+
+#: ../../Zotlabs/Module/Wiki.php:208 ../../include/conversation.php:1190
+msgid "Error getting photo link"
+msgstr "Fout met ophalen fotolink"
+
+#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1191
+msgid "Error getting album"
+msgstr "Fout met ophalen album"
+
+#: ../../Zotlabs/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr "Geen connecties."
 
-#: ../../Zotlabs/Module/Viewconnections.php:75
+#: ../../Zotlabs/Module/Viewconnections.php:78
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Bezoek het profiel van %s [%s]"
 
-#: ../../Zotlabs/Module/Viewconnections.php:104
+#: ../../Zotlabs/Module/Viewconnections.php:107
 msgid "View Connections"
 msgstr "Connecties weergeven"
 
@@ -6238,22 +6527,23 @@ msgstr "Connecties weergeven"
 msgid "Source of Item"
 msgstr "Bron van item"
 
-#: ../../Zotlabs/Module/Webpages.php:184 ../../Zotlabs/Lib/Apps.php:217
-#: ../../include/nav.php:106 ../../include/conversation.php:1685
-msgid "Webpages"
-msgstr "Webpagina's"
+#: ../../Zotlabs/Module/Api.php:61 ../../Zotlabs/Module/Api.php:85
+msgid "Authorize application connection"
+msgstr "Geef toestemming voor applicatiekoppeling"
 
-#: ../../Zotlabs/Module/Webpages.php:195 ../../include/page_widgets.php:41
-msgid "Actions"
-msgstr "Acties"
+#: ../../Zotlabs/Module/Api.php:62
+msgid "Return to your app and insert this Securty Code:"
+msgstr "Ga terug naar je app en voeg deze beveiligingscode in:"
 
-#: ../../Zotlabs/Module/Webpages.php:196 ../../include/page_widgets.php:42
-msgid "Page Link"
-msgstr "Paginalink"
+#: ../../Zotlabs/Module/Api.php:72
+msgid "Please login to continue."
+msgstr "Inloggen om verder te kunnen gaan."
 
-#: ../../Zotlabs/Module/Webpages.php:197
-msgid "Page Title"
-msgstr "Paginatitel"
+#: ../../Zotlabs/Module/Api.php:87
+msgid ""
+"Do you want to authorize this application to access your posts and contacts,"
+" 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/Xchan.php:10
 msgid "Xchan Lookup"
@@ -6263,92 +6553,6 @@ msgstr "Xchan opzoeken"
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr "Zoek een xchan (of webbie) die begint met:"
 
-#: ../../Zotlabs/Lib/Apps.php:204
-msgid "Site Admin"
-msgstr "Hubbeheerder"
-
-#: ../../Zotlabs/Lib/Apps.php:205
-msgid "Bug Report"
-msgstr "Bugrapport"
-
-#: ../../Zotlabs/Lib/Apps.php:206
-msgid "View Bookmarks"
-msgstr "Bladwijzers bekijken"
-
-#: ../../Zotlabs/Lib/Apps.php:207
-msgid "My Chatrooms"
-msgstr "Mijn chatkanalen"
-
-#: ../../Zotlabs/Lib/Apps.php:209
-msgid "Firefox Share"
-msgstr "Firefox Share"
-
-#: ../../Zotlabs/Lib/Apps.php:210
-msgid "Remote Diagnostics"
-msgstr "Diagnose op afstand"
-
-#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
-msgid "Suggest Channels"
-msgstr "Kanalen voorstellen"
-
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
-#: ../../boot.php:1703
-msgid "Login"
-msgstr "Inloggen"
-
-#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
-msgid "Grid"
-msgstr "Grid"
-
-#: ../../Zotlabs/Lib/Apps.php:218 ../../include/nav.php:182
-msgid "Channel Home"
-msgstr "Jouw kanaal"
-
-#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:201
-#: ../../include/conversation.php:1649 ../../include/conversation.php:1652
-msgid "Events"
-msgstr "Agenda"
-
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:167
-msgid "Directory"
-msgstr "Kanalengids"
-
-#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:193
-msgid "Mail"
-msgstr "Privéberichten"
-
-#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:96
-msgid "Chat"
-msgstr "Chatten"
-
-#: ../../Zotlabs/Lib/Apps.php:229
-msgid "Probe"
-msgstr "Onderzoeken"
-
-#: ../../Zotlabs/Lib/Apps.php:230
-msgid "Suggest"
-msgstr "Voorstellen"
-
-#: ../../Zotlabs/Lib/Apps.php:231
-msgid "Random Channel"
-msgstr "Willekeurig kanaal"
-
-#: ../../Zotlabs/Lib/Apps.php:232
-msgid "Invite"
-msgstr "Uitnodigen "
-
-#: ../../Zotlabs/Lib/Apps.php:233 ../../include/widgets.php:1386
-msgid "Features"
-msgstr "Extra functies"
-
-#: ../../Zotlabs/Lib/Apps.php:235
-msgid "Post"
-msgstr "Bericht"
-
-#: ../../Zotlabs/Lib/Apps.php:335
-msgid "Purchase"
-msgstr "Aanschaffen"
-
 #: ../../Zotlabs/Lib/Chatroom.php:27
 msgid "Missing room name"
 msgstr "Naam chatkanaal ontbreekt"
@@ -6369,19 +6573,19 @@ msgstr "Chatkanaal niet gevonden"
 msgid "Room is full"
 msgstr "Chatkanaal is vol"
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1823
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1882
 msgid "$Projectname Notification"
 msgstr "$Projectname-notificatie"
 
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1824
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1883
 msgid "$projectname"
 msgstr "$projectname"
 
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1826
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1885
 msgid "Thank You,"
 msgstr "Bedankt,"
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1828
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1887
 #, php-format
 msgid "%s Administrator"
 msgstr "Beheerder %s"
@@ -6574,11 +6778,97 @@ msgstr "maakte een nieuw bericht aan"
 msgid "commented on %s's post"
 msgstr "gaf een reactie op een bericht van %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:664
+#: ../../Zotlabs/Lib/Apps.php:205
+msgid "Site Admin"
+msgstr "Hubbeheerder"
+
+#: ../../Zotlabs/Lib/Apps.php:206
+msgid "Bug Report"
+msgstr "Bugrapport"
+
+#: ../../Zotlabs/Lib/Apps.php:207
+msgid "View Bookmarks"
+msgstr "Bladwijzers bekijken"
+
+#: ../../Zotlabs/Lib/Apps.php:208
+msgid "My Chatrooms"
+msgstr "Mijn chatkanalen"
+
+#: ../../Zotlabs/Lib/Apps.php:210
+msgid "Firefox Share"
+msgstr "Firefox Share"
+
+#: ../../Zotlabs/Lib/Apps.php:211
+msgid "Remote Diagnostics"
+msgstr "Diagnose op afstand"
+
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:90
+msgid "Suggest Channels"
+msgstr "Kanalen voorstellen"
+
+#: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:112
+#: ../../boot.php:1704
+msgid "Login"
+msgstr "Inloggen"
+
+#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:181
+msgid "Grid"
+msgstr "Grid"
+
+#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:184
+msgid "Channel Home"
+msgstr "Jouw kanaal"
+
+#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:203
+#: ../../include/conversation.php:1664 ../../include/conversation.php:1667
+msgid "Events"
+msgstr "Agenda"
+
+#: ../../Zotlabs/Lib/Apps.php:224 ../../include/nav.php:169
+msgid "Directory"
+msgstr "Kanalengids"
+
+#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:195
+msgid "Mail"
+msgstr "Privéberichten"
+
+#: ../../Zotlabs/Lib/Apps.php:229 ../../include/nav.php:96
+msgid "Chat"
+msgstr "Chatten"
+
+#: ../../Zotlabs/Lib/Apps.php:231
+msgid "Probe"
+msgstr "Onderzoeken"
+
+#: ../../Zotlabs/Lib/Apps.php:232
+msgid "Suggest"
+msgstr "Voorstellen"
+
+#: ../../Zotlabs/Lib/Apps.php:233
+msgid "Random Channel"
+msgstr "Willekeurig kanaal"
+
+#: ../../Zotlabs/Lib/Apps.php:234
+msgid "Invite"
+msgstr "Uitnodigen "
+
+#: ../../Zotlabs/Lib/Apps.php:235 ../../include/widgets.php:1480
+msgid "Features"
+msgstr "Extra functies"
+
+#: ../../Zotlabs/Lib/Apps.php:237
+msgid "Post"
+msgstr "Bericht"
+
+#: ../../Zotlabs/Lib/Apps.php:339
+msgid "Purchase"
+msgstr "Aanschaffen"
+
+#: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:667
 msgid "Private Message"
 msgstr "Niet voor iedereen zichtbaar"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:656
+#: ../../Zotlabs/Lib/ThreadItem.php:132 ../../include/conversation.php:659
 msgid "Select"
 msgstr "Kies"
 
@@ -6626,11 +6916,11 @@ msgstr "Ster toevoegen of verwijderen"
 msgid "starred"
 msgstr "met ster"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:671
+#: ../../Zotlabs/Lib/ThreadItem.php:234 ../../include/conversation.php:674
 msgid "Message signature validated"
 msgstr "Berichtkenmerk gevalideerd"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:672
+#: ../../Zotlabs/Lib/ThreadItem.php:235 ../../include/conversation.php:675
 msgid "Message signature incorrect"
 msgstr "Berichtkenmerk onjuist"
 
@@ -6686,17 +6976,17 @@ msgstr "Kanaal-naar-kanaal"
 msgid "via Wall-To-Wall:"
 msgstr "via kanaal-naar-kanaal"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:719
+#: ../../Zotlabs/Lib/ThreadItem.php:341 ../../include/conversation.php:722
 #, php-format
 msgid "from %s"
 msgstr "van %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:722
+#: ../../Zotlabs/Lib/ThreadItem.php:344 ../../include/conversation.php:725
 #, php-format
 msgid "last edited: %s"
 msgstr "laatst bewerkt: %s"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:723
+#: ../../Zotlabs/Lib/ThreadItem.php:345 ../../include/conversation.php:726
 #, php-format
 msgid "Expires: %s"
 msgstr "Verloopt: %s"
@@ -6714,26 +7004,27 @@ msgid "Mark all seen"
 msgstr "Markeer alles als bekeken"
 
 #: ../../Zotlabs/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
-msgid "[+] show all"
-msgstr "[+] alle"
+#, php-format
+msgid "%s show all"
+msgstr "%s alle"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1215
+#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1226
 msgid "Bold"
 msgstr "Vet"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1216
+#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1227
 msgid "Italic"
 msgstr "Cursief"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1217
+#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1228
 msgid "Underline"
 msgstr "Onderstrepen"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1218
+#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1229
 msgid "Quote"
 msgstr "Citeren"
 
-#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1219
+#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1230
 msgid "Code"
 msgstr "Broncode"
 
@@ -6749,11 +7040,74 @@ msgstr "Link invoegen"
 msgid "Video"
 msgstr "Video"
 
+#: ../../Zotlabs/Lib/PermissionDescription.php:31
+#: ../../include/acl_selectors.php:230
+msgid "Visible to your default audience"
+msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:106
+#: ../../include/acl_selectors.php:266
+msgid "Only me"
+msgstr "Alleen ik"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:107
+msgid "Public"
+msgstr "Openbaar"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:108
+msgid "Anybody in the $Projectname network"
+msgstr "Iedereen in het $Projectname-netwerk"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:109
+#, php-format
+msgid "Any account on %s"
+msgstr "Iedereen op %s"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:110
+msgid "Any of my connections"
+msgstr "Al mijn geaccepteerde connecties"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:111
+msgid "Only connections I specifically allow"
+msgstr "Alleen connecties die uitdrukkelijk door jou zijn toegestaan"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:112
+msgid "Anybody authenticated (could include visitors from other networks)"
+msgstr "Geauthenticeerde leden  (kan bezoekers van andere netwerken bevatten)"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:113
+msgid "Any connections including those who haven't yet been approved"
+msgstr "Al mijn geaccepteerde en nog niet geaccepteerde connecties"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:152
+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"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:153
+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"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:154
+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"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:155
+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"
+
+#: ../../Zotlabs/Lib/PermissionDescription.php:156
+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/Import/import_diaspora.php:16
 msgid "No username found in import file."
 msgstr "Geen gebruikersnaam in het importbestand gevonden."
 
-#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50
+#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:51
 msgid "Unable to create a unique channel address. Import failed."
 msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt."
 
@@ -6762,6 +7116,291 @@ msgstr "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislu
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Kan DNS-informatie voor databaseserver '%s' niet vinden"
 
+#: ../../include/photos.php:114
+#, 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:121
+msgid "Image file is empty."
+msgstr "Afbeeldingsbestand is leeg"
+
+#: ../../include/photos.php:259
+msgid "Photo storage failed."
+msgstr "Foto kan niet worden opgeslagen"
+
+#: ../../include/photos.php:299
+msgid "a new photo"
+msgstr "een nieuwe foto"
+
+#: ../../include/photos.php:303
+#, 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:1650
+msgid "Photo Albums"
+msgstr "Fotoalbums"
+
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
+msgstr "Nieuwe foto's uploaden"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1703
+msgid "Logout"
+msgstr "Uitloggen"
+
+#: ../../include/nav.php:82 ../../include/nav.php:115
+msgid "End this session"
+msgstr "Beëindig deze sessie"
+
+#: ../../include/nav.php:85 ../../include/nav.php:146
+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 ../../include/channel.php:980
+msgid "Edit Profile"
+msgstr "Profiel bewerken"
+
+#: ../../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 ../../include/conversation.php:1690
+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:108
+msgid "Your wiki"
+msgstr "Jouw wiki"
+
+#: ../../include/nav.php:112
+msgid "Sign in"
+msgstr "Inloggen"
+
+#: ../../include/nav.php:129
+#, php-format
+msgid "%s - click to logout"
+msgstr "%s - klik om uit te loggen"
+
+#: ../../include/nav.php:132
+msgid "Remote authentication"
+msgstr "Authenticatie op afstand"
+
+#: ../../include/nav.php:132
+msgid "Click to authenticate to your home hub"
+msgstr "Authenticeer jezelf via (bijvoorbeeld) jouw hub"
+
+#: ../../include/nav.php:146
+msgid "Home Page"
+msgstr "Homepage"
+
+#: ../../include/nav.php:149
+msgid "Create an account"
+msgstr "Maak een account aan"
+
+#: ../../include/nav.php:161
+msgid "Help and documentation"
+msgstr "Hulp en documentatie"
+
+#: ../../include/nav.php:165
+msgid "Applications, utilities, links, games"
+msgstr "Apps"
+
+#: ../../include/nav.php:167
+msgid "Search site @name, #tag, ?docs, content"
+msgstr "Zoek een @kanaal, doorzoek inhoud hub met tekst en #tags, of doorzoek ?documentatie "
+
+#: ../../include/nav.php:169
+msgid "Channel Directory"
+msgstr "Kanalengids"
+
+#: ../../include/nav.php:181
+msgid "Your grid"
+msgstr "Jouw grid"
+
+#: ../../include/nav.php:182
+msgid "Mark all grid notifications seen"
+msgstr "Markeer alle gridnotificaties als bekeken"
+
+#: ../../include/nav.php:184
+msgid "Channel home"
+msgstr "Jouw kanaal"
+
+#: ../../include/nav.php:185
+msgid "Mark all channel notifications seen"
+msgstr "Alle kanaalnotificaties als gelezen markeren"
+
+#: ../../include/nav.php:191
+msgid "Notices"
+msgstr "Notificaties"
+
+#: ../../include/nav.php:191
+msgid "Notifications"
+msgstr "Notificaties"
+
+#: ../../include/nav.php:192
+msgid "See all notifications"
+msgstr "Alle notificaties weergeven"
+
+#: ../../include/nav.php:195
+msgid "Private mail"
+msgstr "Privéberichten"
+
+#: ../../include/nav.php:196
+msgid "See all private messages"
+msgstr "Alle privéberichten weergeven"
+
+#: ../../include/nav.php:197
+msgid "Mark all private messages seen"
+msgstr "Markeer alle privéberichten als bekeken"
+
+#: ../../include/nav.php:198 ../../include/widgets.php:667
+msgid "Inbox"
+msgstr "Postvak IN"
+
+#: ../../include/nav.php:199 ../../include/widgets.php:672
+msgid "Outbox"
+msgstr "Postvak UIT"
+
+#: ../../include/nav.php:200 ../../include/widgets.php:677
+msgid "New Message"
+msgstr "Nieuw bericht"
+
+#: ../../include/nav.php:203
+msgid "Event Calendar"
+msgstr "Agenda"
+
+#: ../../include/nav.php:204
+msgid "See all events"
+msgstr "Alle gebeurtenissen weergeven"
+
+#: ../../include/nav.php:205
+msgid "Mark all events seen"
+msgstr "Markeer alle gebeurtenissen als bekeken"
+
+#: ../../include/nav.php:208
+msgid "Manage Your Channels"
+msgstr "Beheer je kanalen"
+
+#: ../../include/nav.php:210
+msgid "Account/Channel Settings"
+msgstr "Account-/kanaal-instellingen"
+
+#: ../../include/nav.php:218 ../../include/widgets.php:1510
+msgid "Admin"
+msgstr "Beheer"
+
+#: ../../include/nav.php:218
+msgid "Site Setup and Configuration"
+msgstr "Hub instellen en beheren"
+
+#: ../../include/nav.php:249 ../../include/conversation.php:854
+msgid "Loading..."
+msgstr "Aan het laden..."
+
+#: ../../include/nav.php:254
+msgid "@name, #tag, ?doc, content"
+msgstr "@kanaal, #tag, inhoud, ?hulp"
+
+#: ../../include/nav.php:255
+msgid "Please wait..."
+msgstr "Wachten aub..."
+
+#: ../../include/network.php:704
+msgid "view full size"
+msgstr "volledige grootte tonen"
+
+#: ../../include/network.php:1930 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
+msgstr "Beheerder"
+
+#: ../../include/network.php:1944
+msgid "No Subject"
+msgstr "Geen onderwerp"
+
+#: ../../include/network.php:2198 ../../include/network.php:2199
+msgid "Friendica"
+msgstr "Friendica"
+
+#: ../../include/network.php:2200
+msgid "OStatus"
+msgstr "OStatus"
+
+#: ../../include/network.php:2201
+msgid "GNU-Social"
+msgstr "GNU social"
+
+#: ../../include/network.php:2202
+msgid "RSS/Atom"
+msgstr "RSS/Atom"
+
+#: ../../include/network.php:2204
+msgid "Diaspora"
+msgstr "Diaspora"
+
+#: ../../include/network.php:2205
+msgid "Facebook"
+msgstr "Facebook"
+
+#: ../../include/network.php:2206
+msgid "Zot"
+msgstr "Zot"
+
+#: ../../include/network.php:2207
+msgid "LinkedIn"
+msgstr "LinkedIn"
+
+#: ../../include/network.php:2208
+msgid "XMPP/IM"
+msgstr "XMPP/IM"
+
+#: ../../include/network.php:2209
+msgid "MySpace"
+msgstr "MySpace"
+
+#: ../../include/page_widgets.php:7
+msgid "New Page"
+msgstr "Nieuwe pagina"
+
+#: ../../include/page_widgets.php:46
+msgid "Title"
+msgstr "Titel"
+
 #: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
 #: ../../include/widgets.php:46 ../../include/widgets.php:429
 #: ../../include/contact_widgets.php:91
@@ -6800,952 +7439,159 @@ msgstr "vindt dit leuk"
 msgid "dislikes"
 msgstr "vindt dit niet leuk"
 
-#: ../../include/event.php:22 ../../include/event.php:69
-#: ../../include/bb2diaspora.php:485
-msgid "l F d, Y \\@ g:i A"
-msgstr "l d F Y \\@ G:i"
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
+msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen"
 
-#: ../../include/event.php:30 ../../include/event.php:73
-#: ../../include/bb2diaspora.php:491
-msgid "Starts:"
-msgstr "Start:"
+#: ../../include/channel.php:67
+msgid "Empty name"
+msgstr "Ontbrekende naam"
 
-#: ../../include/event.php:40 ../../include/event.php:77
-#: ../../include/bb2diaspora.php:499
-msgid "Finishes:"
-msgstr "Einde:"
+#: ../../include/channel.php:70
+msgid "Name too long"
+msgstr "Naam te lang"
 
-#: ../../include/event.php:812
-msgid "This event has been added to your calendar."
-msgstr "Dit evenement is aan jouw agenda toegevoegd."
+#: ../../include/channel.php:181
+msgid "No account identifier"
+msgstr "Geen account-identificator"
 
-#: ../../include/event.php:1012
-msgid "Not specified"
-msgstr "Niet aangegeven"
+#: ../../include/channel.php:193
+msgid "Nickname is required."
+msgstr "Bijnaam is verplicht"
 
-#: ../../include/event.php:1013
-msgid "Needs Action"
-msgstr "Actie vereist"
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
+msgstr "Deze naam is gereserveerd. Kies een andere."
 
-#: ../../include/event.php:1014
-msgid "Completed"
-msgstr "Voltooid"
-
-#: ../../include/event.php:1015
-msgid "In Process"
-msgstr "In behandeling"
-
-#: ../../include/event.php:1016
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#: ../../include/import.php:29
+#: ../../include/channel.php:212
 msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt."
+"Nickname has unsupported characters or is already being used on this site."
+msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."
 
-#: ../../include/import.php:76
-msgid "Channel clone failed. Import failed."
-msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
+#: ../../include/channel.php:272
+msgid "Unable to retrieve created identity"
+msgstr "Niet in staat om aangemaakte identiteit te vinden"
 
-#: ../../include/items.php:892 ../../include/items.php:937
-msgid "(Unknown)"
-msgstr "(Onbekend)"
+#: ../../include/channel.php:341
+msgid "Default Profile"
+msgstr "Standaardprofiel"
 
-#: ../../include/items.php:1136
-msgid "Visible to anybody on the internet."
-msgstr "Voor iedereen op het internet zichtbaar."
+#: ../../include/channel.php:830
+msgid "Requested channel is not available."
+msgstr "Opgevraagd kanaal is niet beschikbaar."
 
-#: ../../include/items.php:1138
-msgid "Visible to you only."
-msgstr "Alleen voor jou zichtbaar."
+#: ../../include/channel.php:977
+msgid "Create New Profile"
+msgstr "Nieuw profiel aanmaken"
 
-#: ../../include/items.php:1140
-msgid "Visible to anybody in this network."
-msgstr "Voor iedereen in dit netwerk zichtbaar."
+#: ../../include/channel.php:997
+msgid "Visible to everybody"
+msgstr "Voor iedereen zichtbaar"
 
-#: ../../include/items.php:1142
-msgid "Visible to anybody authenticated."
-msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
+#: ../../include/channel.php:1070 ../../include/channel.php:1182
+msgid "Gender:"
+msgstr "Geslacht:"
 
-#: ../../include/items.php:1144
+#: ../../include/channel.php:1071 ../../include/channel.php:1226
+msgid "Status:"
+msgstr "Status:"
+
+#: ../../include/channel.php:1072 ../../include/channel.php:1237
+msgid "Homepage:"
+msgstr "Homepagina:"
+
+#: ../../include/channel.php:1073
+msgid "Online Now"
+msgstr "Nu online"
+
+#: ../../include/channel.php:1187
+msgid "Like this channel"
+msgstr "Vind dit kanaal leuk"
+
+#: ../../include/channel.php:1211
+msgid "j F, Y"
+msgstr "F j Y"
+
+#: ../../include/channel.php:1212
+msgid "j F"
+msgstr "F j"
+
+#: ../../include/channel.php:1219
+msgid "Birthday:"
+msgstr "Geboortedatum:"
+
+#: ../../include/channel.php:1232
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr "Voor iedereen op %s zichtbaar."
+msgid "for %1$d %2$s"
+msgstr "voor %1$d %2$s"
 
-#: ../../include/items.php:1146
-msgid "Visible to all connections."
-msgstr "Voor alle connecties zichtbaar."
+#: ../../include/channel.php:1235
+msgid "Sexual Preference:"
+msgstr "Seksuele voorkeur:"
 
-#: ../../include/items.php:1148
-msgid "Visible to approved connections."
-msgstr "Voor alle geaccepteerde connecties zichtbaar."
+#: ../../include/channel.php:1241
+msgid "Tags:"
+msgstr "Tags:"
 
-#: ../../include/items.php:1150
-msgid "Visible to specific connections."
-msgstr "Voor specifieke connecties zichtbaar."
+#: ../../include/channel.php:1243
+msgid "Political Views:"
+msgstr "Politieke overtuigingen:"
 
-#: ../../include/items.php:3909
-msgid "Privacy group is empty."
-msgstr "Privacygroep is leeg"
+#: ../../include/channel.php:1245
+msgid "Religion:"
+msgstr "Religie:"
 
-#: ../../include/items.php:3916
-#, php-format
-msgid "Privacy group: %s"
-msgstr "Privacygroep: %s"
+#: ../../include/channel.php:1249
+msgid "Hobbies/Interests:"
+msgstr "Hobby's/interesses:"
 
-#: ../../include/items.php:3928
-msgid "Connection not found."
-msgstr "Connectie niet gevonden."
+#: ../../include/channel.php:1251
+msgid "Likes:"
+msgstr "Houdt van:"
 
-#: ../../include/items.php:4277
-msgid "profile photo"
-msgstr "profielfoto"
+#: ../../include/channel.php:1253
+msgid "Dislikes:"
+msgstr "Houdt niet van:"
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
-msgstr "Geen ontvanger opgegeven."
+#: ../../include/channel.php:1255
+msgid "Contact information and Social Networks:"
+msgstr "Contactinformatie en sociale netwerken:"
 
-#: ../../include/message.php:25
-msgid "[no subject]"
-msgstr "[geen onderwerp]"
+#: ../../include/channel.php:1257
+msgid "My other channels:"
+msgstr "Mijn andere kanalen"
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr "Afzender kan niet bepaald worden."
+#: ../../include/channel.php:1259
+msgid "Musical interests:"
+msgstr "Muzikale interesses:"
 
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
-msgstr "Opgeslagen bericht kon niet worden geverifieerd."
+#: ../../include/channel.php:1261
+msgid "Books, literature:"
+msgstr "Boeken, literatuur:"
 
-#: ../../include/text.php:428
-msgid "prev"
-msgstr "vorige"
+#: ../../include/channel.php:1263
+msgid "Television:"
+msgstr "Televisie:"
 
-#: ../../include/text.php:430
-msgid "first"
-msgstr "eerste"
+#: ../../include/channel.php:1265
+msgid "Film/dance/culture/entertainment:"
+msgstr "Films/dansen/cultuur/vermaak:"
 
-#: ../../include/text.php:459
-msgid "last"
-msgstr "laatste"
+#: ../../include/channel.php:1267
+msgid "Love/Romance:"
+msgstr "Liefde/romantiek:"
 
-#: ../../include/text.php:462
-msgid "next"
-msgstr "volgende"
+#: ../../include/channel.php:1269
+msgid "Work/employment:"
+msgstr "Werk/beroep:"
 
-#: ../../include/text.php:472
-msgid "older"
-msgstr "ouder"
+#: ../../include/channel.php:1271
+msgid "School/education:"
+msgstr "School/opleiding:"
 
-#: ../../include/text.php:474
-msgid "newer"
-msgstr "nieuwer"
-
-#: ../../include/text.php:863
-msgid "No connections"
-msgstr "Geen connecties"
-
-#: ../../include/text.php:888
-#, php-format
-msgid "View all %s connections"
-msgstr "Toon alle %s connecties"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-msgid "poke"
-msgstr "aanstoten"
-
-#: ../../include/text.php:1033 ../../include/text.php:1038
-#: ../../include/conversation.php:243
-msgid "poked"
-msgstr "aangestoten"
-
-#: ../../include/text.php:1039
-msgid "ping"
-msgstr "ping"
-
-#: ../../include/text.php:1039
-msgid "pinged"
-msgstr "gepingd"
-
-#: ../../include/text.php:1040
-msgid "prod"
-msgstr "por"
-
-#: ../../include/text.php:1040
-msgid "prodded"
-msgstr "gepord"
-
-#: ../../include/text.php:1041
-msgid "slap"
-msgstr "slaan"
-
-#: ../../include/text.php:1041
-msgid "slapped"
-msgstr "sloeg"
-
-#: ../../include/text.php:1042
-msgid "finger"
-msgstr "finger"
-
-#: ../../include/text.php:1042
-msgid "fingered"
-msgstr "gefingerd"
-
-#: ../../include/text.php:1043
-msgid "rebuff"
-msgstr "afpoeieren"
-
-#: ../../include/text.php:1043
-msgid "rebuffed"
-msgstr "afgepoeierd"
-
-#: ../../include/text.php:1055
-msgid "happy"
-msgstr "gelukkig"
-
-#: ../../include/text.php:1056
-msgid "sad"
-msgstr "bedroefd"
-
-#: ../../include/text.php:1057
-msgid "mellow"
-msgstr "mellow"
-
-#: ../../include/text.php:1058
-msgid "tired"
-msgstr "moe"
-
-#: ../../include/text.php:1059
-msgid "perky"
-msgstr "parmantig"
-
-#: ../../include/text.php:1060
-msgid "angry"
-msgstr "boos"
-
-#: ../../include/text.php:1061
-msgid "stupefied"
-msgstr "verbijsterd"
-
-#: ../../include/text.php:1062
-msgid "puzzled"
-msgstr "verward"
-
-#: ../../include/text.php:1063
-msgid "interested"
-msgstr "geïnteresseerd"
-
-#: ../../include/text.php:1064
-msgid "bitter"
-msgstr "verbitterd"
-
-#: ../../include/text.php:1065
-msgid "cheerful"
-msgstr "vrolijk"
-
-#: ../../include/text.php:1066
-msgid "alive"
-msgstr "levendig"
-
-#: ../../include/text.php:1067
-msgid "annoyed"
-msgstr "geërgerd"
-
-#: ../../include/text.php:1068
-msgid "anxious"
-msgstr "bezorgd"
-
-#: ../../include/text.php:1069
-msgid "cranky"
-msgstr "humeurig"
-
-#: ../../include/text.php:1070
-msgid "disturbed"
-msgstr "verontrust"
-
-#: ../../include/text.php:1071
-msgid "frustrated"
-msgstr "gefrustreerd "
-
-#: ../../include/text.php:1072
-msgid "depressed"
-msgstr "gedeprimeerd"
-
-#: ../../include/text.php:1073
-msgid "motivated"
-msgstr "gemotiveerd"
-
-#: ../../include/text.php:1074
-msgid "relaxed"
-msgstr "ontspannen"
-
-#: ../../include/text.php:1075
-msgid "surprised"
-msgstr "verrast"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:70
-msgid "Monday"
-msgstr "maandag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:71
-msgid "Tuesday"
-msgstr "dinsdag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:72
-msgid "Wednesday"
-msgstr "woensdag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:73
-msgid "Thursday"
-msgstr "donderdag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:74
-msgid "Friday"
-msgstr "vrijdag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:75
-msgid "Saturday"
-msgstr "zaterdag"
-
-#: ../../include/text.php:1257 ../../include/js_strings.php:69
-msgid "Sunday"
-msgstr "zondag"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:45
-msgid "January"
-msgstr "januari"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:46
-msgid "February"
-msgstr "februari"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:47
-msgid "March"
-msgstr "maart"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:48
-msgid "April"
-msgstr "april"
-
-#: ../../include/text.php:1261
-msgid "May"
-msgstr "mei"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:50
-msgid "June"
-msgstr "juni"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:51
-msgid "July"
-msgstr "juli"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:52
-msgid "August"
-msgstr "augustus"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:53
-msgid "September"
-msgstr "september"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:54
-msgid "October"
-msgstr "oktober"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:55
-msgid "November"
-msgstr "november"
-
-#: ../../include/text.php:1261 ../../include/js_strings.php:56
-msgid "December"
-msgstr "december"
-
-#: ../../include/text.php:1338 ../../include/text.php:1342
-msgid "Unknown Attachment"
-msgstr "Onbekende bijlage"
-
-#: ../../include/text.php:1344
-msgid "unknown"
-msgstr "onbekend"
-
-#: ../../include/text.php:1380
-msgid "remove category"
-msgstr "categorie verwijderen"
-
-#: ../../include/text.php:1457
-msgid "remove from file"
-msgstr "uit map verwijderen"
-
-#: ../../include/text.php:1753 ../../include/text.php:1824
-msgid "default"
-msgstr "standaard"
-
-#: ../../include/text.php:1761
-msgid "Page layout"
-msgstr "Pagina-lay-out"
-
-#: ../../include/text.php:1761
-msgid "You can create your own with the layouts tool"
-msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
-
-#: ../../include/text.php:1803
-msgid "Page content type"
-msgstr "Opmaaktype pagina"
-
-#: ../../include/text.php:1836
-msgid "Select an alternate language"
-msgstr "Kies een andere taal"
-
-#: ../../include/text.php:1953
-msgid "activity"
-msgstr "activiteit"
-
-#: ../../include/text.php:2262
-msgid "Design Tools"
-msgstr "Ontwerp-hulpmiddelen"
-
-#: ../../include/text.php:2268
-msgid "Pages"
-msgstr "Pagina's"
-
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr "Systeem"
-
-#: ../../include/widgets.php:106
-msgid "New App"
-msgstr "Nieuwe app"
-
-#: ../../include/widgets.php:154
-msgid "Suggestions"
-msgstr "Voorgestelde kanalen"
-
-#: ../../include/widgets.php:155
-msgid "See more..."
-msgstr "Meer..."
-
-#: ../../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/widgets.php:181
-msgid "Add New Connection"
-msgstr "Nieuwe connectie toevoegen"
-
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr "Vul kanaaladres in"
-
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr "Voorbeelden: bob@example.com, http://example.com/barbara"
-
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr "Aantekeningen"
-
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr "Verwijder zoekterm"
-
-#: ../../include/widgets.php:281 ../../include/features.php:84
-msgid "Saved Searches"
-msgstr "Opgeslagen zoekopdrachten"
-
-#: ../../include/widgets.php:282 ../../include/group.php:316
-msgid "add"
-msgstr "toevoegen"
-
-#: ../../include/widgets.php:310 ../../include/contact_widgets.php:53
-#: ../../include/features.php:98
-msgid "Saved Folders"
-msgstr "Bewaarde mappen"
-
-#: ../../include/widgets.php:313 ../../include/widgets.php:432
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-msgid "Everything"
-msgstr "Alles"
-
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr "Archieven"
-
-#: ../../include/widgets.php:516
-msgid "Refresh"
-msgstr "Vernieuwen"
-
-#: ../../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/widgets.php:578
-msgid "Feature/Addon settings"
-msgstr "Plugin-instellingen"
-
-#: ../../include/widgets.php:584
-msgid "Display settings"
-msgstr "Weergave"
-
-#: ../../include/widgets.php:591
-msgid "Manage locations"
-msgstr "Locaties beheren"
-
-#: ../../include/widgets.php:600
-msgid "Export channel"
-msgstr "Kanaal exporteren"
-
-#: ../../include/widgets.php:607
-msgid "Connected apps"
-msgstr "Verbonden applicaties"
-
-#: ../../include/widgets.php:622
-msgid "Premium Channel Settings"
-msgstr "Instellingen premiumkanaal"
-
-#: ../../include/widgets.php:651
-msgid "Private Mail Menu"
-msgstr "Privéberichten"
-
-#: ../../include/widgets.php:653
-msgid "Combined View"
-msgstr "Gecombineerd postvak"
-
-#: ../../include/widgets.php:658 ../../include/nav.php:196
-msgid "Inbox"
-msgstr "Postvak IN"
-
-#: ../../include/widgets.php:663 ../../include/nav.php:197
-msgid "Outbox"
-msgstr "Postvak UIT"
-
-#: ../../include/widgets.php:668 ../../include/nav.php:198
-msgid "New Message"
-msgstr "Nieuw bericht"
-
-#: ../../include/widgets.php:685 ../../include/widgets.php:697
-msgid "Conversations"
-msgstr "Conversaties"
-
-#: ../../include/widgets.php:689
-msgid "Received Messages"
-msgstr "Ontvangen berichten"
-
-#: ../../include/widgets.php:693
-msgid "Sent Messages"
-msgstr "Verzonden berichten"
-
-#: ../../include/widgets.php:707
-msgid "No messages."
-msgstr "Geen berichten"
-
-#: ../../include/widgets.php:725
-msgid "Delete conversation"
-msgstr "Verwijder conversatie"
-
-#: ../../include/widgets.php:751
-msgid "Events Menu"
-msgstr "Agenda-menu"
-
-#: ../../include/widgets.php:752
-msgid "Day View"
-msgstr "Dag tonen"
-
-#: ../../include/widgets.php:753
-msgid "Week View"
-msgstr "Week tonen"
-
-#: ../../include/widgets.php:754
-msgid "Month View"
-msgstr "Maand tonen"
-
-#: ../../include/widgets.php:766
-msgid "Events Tools"
-msgstr "Agenda-hulpmiddelen"
-
-#: ../../include/widgets.php:767
-msgid "Export Calendar"
-msgstr "Exporteren"
-
-#: ../../include/widgets.php:768
-msgid "Import Calendar"
-msgstr "Importeren"
-
-#: ../../include/widgets.php:842 ../../include/conversation.php:1662
-#: ../../include/conversation.php:1665
-msgid "Chatrooms"
-msgstr "Chatkanalen"
-
-#: ../../include/widgets.php:846
-msgid "Overview"
-msgstr "Overzicht"
-
-#: ../../include/widgets.php:853
-msgid "Chat Members"
-msgstr "Chatleden"
-
-#: ../../include/widgets.php:876
-msgid "Bookmarked Chatrooms"
-msgstr "Bladwijzers van chatkanalen"
-
-#: ../../include/widgets.php:899
-msgid "Suggested Chatrooms"
-msgstr "Voorgestelde chatkanalen"
-
-#: ../../include/widgets.php:1044 ../../include/widgets.php:1156
-msgid "photo/image"
-msgstr "foto/afbeelding"
-
-#: ../../include/widgets.php:1099
-msgid "Click to show more"
-msgstr "Klik voor meer"
-
-#: ../../include/widgets.php:1250
-msgid "Rating Tools"
-msgstr "Beoordelingen"
-
-#: ../../include/widgets.php:1254 ../../include/widgets.php:1256
-msgid "Rate Me"
-msgstr "Beoordeel mij"
-
-#: ../../include/widgets.php:1259
-msgid "View Ratings"
-msgstr "Bekijk beoordelingen"
-
-#: ../../include/widgets.php:1316
-msgid "Forums"
-msgstr "Forums"
-
-#: ../../include/widgets.php:1345
-msgid "Tasks"
-msgstr "Taken"
-
-#: ../../include/widgets.php:1354
-msgid "Documentation"
-msgstr "Documentatie"
-
-#: ../../include/widgets.php:1356
-msgid "Project/Site Information"
-msgstr "Project- en hub-informatie"
-
-#: ../../include/widgets.php:1357
-msgid "For Members"
-msgstr "Voor leden"
-
-#: ../../include/widgets.php:1358
-msgid "For Administrators"
-msgstr "Voor beheerders"
-
-#: ../../include/widgets.php:1359
-msgid "For Developers"
-msgstr "Voor ontwikkelaars"
-
-#: ../../include/widgets.php:1383 ../../include/widgets.php:1421
-msgid "Member registrations waiting for confirmation"
-msgstr "Accounts die op goedkeuring wachten"
-
-#: ../../include/widgets.php:1389
-msgid "Inspect queue"
-msgstr "Inspecteer berichtenwachtrij"
-
-#: ../../include/widgets.php:1391
-msgid "DB updates"
-msgstr "Database-updates"
-
-#: ../../include/widgets.php:1416 ../../include/nav.php:216
-msgid "Admin"
-msgstr "Beheer"
-
-#: ../../include/widgets.php:1417
-msgid "Plugin Features"
-msgstr "Plugin-opties"
-
-#: ../../include/follow.php:27
-msgid "Channel is blocked on this site."
-msgstr "Kanaal is op deze hub geblokkeerd."
-
-#: ../../include/follow.php:32
-msgid "Channel location missing."
-msgstr "Ontbrekende kanaallocatie."
-
-#: ../../include/follow.php:81
-msgid "Response from remote channel was incomplete."
-msgstr "Antwoord van het kanaal op afstand was niet volledig."
-
-#: ../../include/follow.php:98
-msgid "Channel was deleted and no longer exists."
-msgstr "Kanaal is verwijderd en bestaat niet meer."
-
-#: ../../include/follow.php:154 ../../include/follow.php:190
-msgid "Protocol disabled."
-msgstr "Protocol uitgeschakeld."
-
-#: ../../include/follow.php:178
-msgid "Channel discovery failed."
-msgstr "Kanaal ontdekken mislukt."
-
-#: ../../include/follow.php:216
-msgid "Cannot connect to yourself."
-msgstr "Kan niet met jezelf verbinden"
-
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
-msgstr "Bladwijzers van %1$s"
-
-#: ../../include/api.php:1336
-msgid "Public Timeline"
-msgstr "Openbare tijdlijn"
-
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:844
-#: ../../include/bbcode.php:847 ../../include/bbcode.php:852
-#: ../../include/bbcode.php:855 ../../include/bbcode.php:858
-#: ../../include/bbcode.php:861 ../../include/bbcode.php:866
-#: ../../include/bbcode.php:869 ../../include/bbcode.php:874
-#: ../../include/bbcode.php:877 ../../include/bbcode.php:880
-#: ../../include/bbcode.php:883
-msgid "Image/photo"
-msgstr "Afbeelding/foto"
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:894
-msgid "Encrypted content"
-msgstr "Versleutelde inhoud"
-
-#: ../../include/bbcode.php:178
-#, php-format
-msgid "Install %s element: "
-msgstr "Installeer %s-element: "
-
-#: ../../include/bbcode.php:182
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren."
-
-#: ../../include/bbcode.php:254
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr "%1$s schreef het volgende %2$s %3$s"
-
-#: ../../include/bbcode.php:331 ../../include/bbcode.php:339
-msgid "Click to open/close"
-msgstr "Klik om te openen of te sluiten"
-
-#: ../../include/bbcode.php:339
-msgid "spoiler"
-msgstr "spoiler"
-
-#: ../../include/bbcode.php:585
-msgid "Different viewers will see this text differently"
-msgstr "Deze tekst wordt per persoon anders weergeven."
-
-#: ../../include/bbcode.php:832
-msgid "$1 wrote:"
-msgstr "$1 schreef:"
-
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr "Opties kanalengids"
-
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr "Veilig zoeken"
-
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr "Alleen openbare forums"
-
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr "Alleen deze hub"
-
-#: ../../include/security.php:383
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
-msgstr "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/nav.php:82 ../../include/nav.php:113 ../../boot.php:1702
-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 ../../include/channel.php:941
-msgid "Edit Profile"
-msgstr "Profiel bewerken"
-
-#: ../../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 ../../include/conversation.php:1675
-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
-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:247 ../../include/conversation.php:851
-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/channel.php:1292
+msgid "Like this thing"
+msgstr "Vind dit ding leuk"
 
 #: ../../include/connections.php:95
 msgid "New window"
@@ -7760,52 +7606,6 @@ msgstr "Open de geselecteerde locatie in een ander venster of tab"
 msgid "User '%s' deleted"
 msgstr "Account '%s' verwijderd"
 
-#: ../../include/contact_widgets.php:11
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] "%d uitnodiging beschikbaar"
-msgstr[1] "%d uitnodigingen beschikbaar"
-
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
-msgstr "Kanalen vinden"
-
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
-msgstr "Vul naam of interesse in"
-
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
-msgstr "Verbinden/volgen"
-
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
-msgstr "Voorbeeld: Robert Morgenstein, vissen"
-
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
-msgstr "Willekeurig profiel"
-
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
-msgstr "Vrienden uitnodigen"
-
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
-msgstr "Geavanceerd voorbeeld (Engels): name=jan en country=nederland"
-
-#: ../../include/contact_widgets.php:122
-#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] "%d gemeenschappelijke connectie"
-msgstr[1] "%d gemeenschappelijke connecties"
-
-#: ../../include/contact_widgets.php:127
-msgid "show more"
-msgstr "meer connecties weergeven"
-
 #: ../../include/conversation.php:204
 #, php-format
 msgid "%1$s is now connected with %2$s"
@@ -7816,258 +7616,269 @@ msgstr "%1$s is nu met %2$s verbonden"
 msgid "%1$s poked %2$s"
 msgstr "%1$s heeft %2$s aangestoten"
 
-#: ../../include/conversation.php:691
+#: ../../include/conversation.php:243 ../../include/text.php:1013
+#: ../../include/text.php:1018
+msgid "poked"
+msgstr "aangestoten"
+
+#: ../../include/conversation.php:694
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Bekijk het profiel van %s @ %s"
 
-#: ../../include/conversation.php:710
+#: ../../include/conversation.php:713
 msgid "Categories:"
 msgstr "Categorieën:"
 
-#: ../../include/conversation.php:711
+#: ../../include/conversation.php:714
 msgid "Filed under:"
 msgstr "Bewaard onder:"
 
-#: ../../include/conversation.php:738
+#: ../../include/conversation.php:741
 msgid "View in context"
 msgstr "In context bekijken"
 
-#: ../../include/conversation.php:847
+#: ../../include/conversation.php:850
 msgid "remove"
 msgstr "verwijderen"
 
-#: ../../include/conversation.php:852
+#: ../../include/conversation.php:855
 msgid "Delete Selected Items"
 msgstr "Verwijder de geselecteerde items"
 
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:951
 msgid "View Source"
 msgstr "Bron weergeven"
 
-#: ../../include/conversation.php:949
+#: ../../include/conversation.php:952
 msgid "Follow Thread"
 msgstr "Conversatie volgen"
 
-#: ../../include/conversation.php:950
+#: ../../include/conversation.php:953
 msgid "Unfollow Thread"
 msgstr "Conversatie niet meer volgen"
 
-#: ../../include/conversation.php:955
+#: ../../include/conversation.php:958
 msgid "Activity/Posts"
 msgstr "Activiteit/berichten connectie"
 
-#: ../../include/conversation.php:957
+#: ../../include/conversation.php:960
 msgid "Edit Connection"
 msgstr "Connectie bewerken"
 
-#: ../../include/conversation.php:958
+#: ../../include/conversation.php:961
 msgid "Message"
 msgstr "Bericht"
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s likes this."
 msgstr "%s vindt dit leuk."
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1078
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s vindt dit niet leuk."
 
-#: ../../include/conversation.php:1079
+#: ../../include/conversation.php:1082
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgid_plural "<span  %1$s>%2$d people</span> like this."
 msgstr[0] "<span  %1$s>%2$d persoon</span> vindt dit leuk."
 msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit leuk."
 
-#: ../../include/conversation.php:1081
+#: ../../include/conversation.php:1084
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgid_plural "<span  %1$s>%2$d people</span> don't like this."
 msgstr[0] "<span  %1$s>%2$d persoon</span> vindt dit niet leuk."
 msgstr[1] "<span  %1$s>%2$d personen</span> vinden dit niet leuk."
 
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1090
 msgid "and"
 msgstr "en"
 
-#: ../../include/conversation.php:1090
+#: ../../include/conversation.php:1093
 #, php-format
 msgid ", and %d other people"
 msgid_plural ", and %d other people"
 msgstr[0] ", en %d ander persoon"
 msgstr[1] ", en %d andere personen"
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s like this."
 msgstr "%s vinden dit leuk."
 
-#: ../../include/conversation.php:1091
+#: ../../include/conversation.php:1094
 #, php-format
 msgid "%s don't like this."
 msgstr "%s vinden dit niet leuk."
 
-#: ../../include/conversation.php:1130
+#: ../../include/conversation.php:1133
 msgid "Set your location"
 msgstr "Locatie instellen"
 
-#: ../../include/conversation.php:1131
+#: ../../include/conversation.php:1134
 msgid "Clear browser location"
 msgstr "Locatie van webbrowser wissen"
 
-#: ../../include/conversation.php:1177
+#: ../../include/conversation.php:1182
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:1178
+#: ../../include/conversation.php:1183
 msgid "Where are you right now?"
 msgstr "Waar bevind je je op dit moment?"
 
-#: ../../include/conversation.php:1210
+#: ../../include/conversation.php:1221
 msgid "Page link name"
 msgstr "Linknaam pagina"
 
-#: ../../include/conversation.php:1213
+#: ../../include/conversation.php:1224
 msgid "Post as"
 msgstr "Bericht plaatsen als"
 
-#: ../../include/conversation.php:1223
+#: ../../include/conversation.php:1238
 msgid "Toggle voting"
 msgstr "Peiling in- of uitschakelen"
 
-#: ../../include/conversation.php:1231
+#: ../../include/conversation.php:1246
 msgid "Categories (optional, comma-separated list)"
 msgstr "Categorieën (optioneel, door komma's gescheiden lijst)"
 
-#: ../../include/conversation.php:1254
+#: ../../include/conversation.php:1269
 msgid "Set publish date"
 msgstr "Publicatiedatum instellen"
 
-#: ../../include/conversation.php:1258
-msgid "OK"
-msgstr "OK"
-
-#: ../../include/conversation.php:1503
+#: ../../include/conversation.php:1518
 msgid "Discover"
 msgstr "Ontdekken"
 
-#: ../../include/conversation.php:1506
+#: ../../include/conversation.php:1521
 msgid "Imported public streams"
 msgstr "Openbare streams importeren"
 
-#: ../../include/conversation.php:1511
+#: ../../include/conversation.php:1526
 msgid "Commented Order"
 msgstr "Nieuwe reacties bovenaan"
 
-#: ../../include/conversation.php:1514
+#: ../../include/conversation.php:1529
 msgid "Sort by Comment Date"
 msgstr "Berichten met nieuwe reacties bovenaan"
 
-#: ../../include/conversation.php:1518
+#: ../../include/conversation.php:1533
 msgid "Posted Order"
 msgstr "Nieuwe berichten bovenaan"
 
-#: ../../include/conversation.php:1521
+#: ../../include/conversation.php:1536
 msgid "Sort by Post Date"
 msgstr "Nieuwe berichten bovenaan"
 
-#: ../../include/conversation.php:1529
+#: ../../include/conversation.php:1544
 msgid "Posts that mention or involve you"
 msgstr "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent"
 
-#: ../../include/conversation.php:1538
+#: ../../include/conversation.php:1553
 msgid "Activity Stream - by date"
 msgstr "Activiteitenstroom - volgens datum"
 
-#: ../../include/conversation.php:1544
+#: ../../include/conversation.php:1559
 msgid "Starred"
 msgstr "Met ster"
 
-#: ../../include/conversation.php:1547
+#: ../../include/conversation.php:1562
 msgid "Favourite Posts"
 msgstr "Favoriete berichten"
 
-#: ../../include/conversation.php:1554
+#: ../../include/conversation.php:1569
 msgid "Spam"
 msgstr "Spam"
 
-#: ../../include/conversation.php:1557
+#: ../../include/conversation.php:1572
 msgid "Posts flagged as SPAM"
 msgstr "Berichten gemarkeerd als SPAM"
 
-#: ../../include/conversation.php:1614
+#: ../../include/conversation.php:1629
 msgid "Status Messages and Posts"
 msgstr "Berichten in dit kanaal"
 
-#: ../../include/conversation.php:1623
+#: ../../include/conversation.php:1638
 msgid "About"
 msgstr "Over"
 
-#: ../../include/conversation.php:1626
+#: ../../include/conversation.php:1641
 msgid "Profile Details"
 msgstr "Profiel"
 
-#: ../../include/conversation.php:1635 ../../include/photos.php:502
-msgid "Photo Albums"
-msgstr "Fotoalbums"
-
-#: ../../include/conversation.php:1642
+#: ../../include/conversation.php:1657
 msgid "Files and Storage"
 msgstr "Bestanden en opslagruimte"
 
-#: ../../include/conversation.php:1678
+#: ../../include/conversation.php:1677 ../../include/conversation.php:1680
+#: ../../include/widgets.php:836
+msgid "Chatrooms"
+msgstr "Chatkanalen"
+
+#: ../../include/conversation.php:1693
 msgid "Saved Bookmarks"
 msgstr "Opgeslagen bladwijzers"
 
-#: ../../include/conversation.php:1688
+#: ../../include/conversation.php:1703
 msgid "Manage Webpages"
 msgstr "Webpagina's beheren"
 
-#: ../../include/conversation.php:1747
+#: ../../include/conversation.php:1768
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] "aanwezig"
 msgstr[1] "aanwezig"
 
-#: ../../include/conversation.php:1750
+#: ../../include/conversation.php:1771
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] "niet aanwezig"
 msgstr[1] "niet aanwezig"
 
-#: ../../include/conversation.php:1753
+#: ../../include/conversation.php:1774
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] "nog niet beslist"
 msgstr[1] "nog niet beslist"
 
-#: ../../include/conversation.php:1756
+#: ../../include/conversation.php:1777
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] "eens"
 msgstr[1] "eens"
 
-#: ../../include/conversation.php:1759
+#: ../../include/conversation.php:1780
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] "oneens"
 msgstr[1] "oneens"
 
-#: ../../include/conversation.php:1762
+#: ../../include/conversation.php:1783
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] "onthouding"
 msgstr[1] "onthoudingen"
 
+#: ../../include/import.php:30
+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:97
+msgid "Channel clone failed. Import failed."
+msgstr "Het klonen van het kanaal is mislukt. Importeren mislukt."
+
 #: ../../include/selectors.php:30
 msgid "Frequently"
 msgstr "Regelmatig"
@@ -8132,12 +7943,6 @@ msgstr "Genderneutraal"
 msgid "Non-specific"
 msgstr "Niet gespecificeerd"
 
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-#: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:881
-msgid "Other"
-msgstr "Anders"
-
 #: ../../include/selectors.php:49
 msgid "Undecided"
 msgstr "Nog niet beslist"
@@ -8314,361 +8119,366 @@ msgstr "Maakt mij niks uit"
 msgid "Ask me"
 msgstr "Vraag het me"
 
-#: ../../include/PermissionDescription.php:31
-#: ../../include/acl_selectors.php:232
-msgid "Visible to your default audience"
-msgstr "Voor iedereen zichtbaar, mits niet anders ingesteld"
-
-#: ../../include/PermissionDescription.php:115
-#: ../../include/acl_selectors.php:268
-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
+#: ../../include/bookmarks.php:35
 #, php-format
-msgid "Any account on %s"
-msgstr "Iedereen op %s"
+msgid "%1$s's bookmarks"
+msgstr "Bladwijzers van %1$s"
 
-#: ../../include/PermissionDescription.php:119
-msgid "Any of my connections"
-msgstr "Al mijn geaccepteerde connecties"
+#: ../../include/security.php:109
+msgid "guest:"
+msgstr "gast:"
 
-#: ../../include/PermissionDescription.php:120
-msgid "Only connections I specifically allow"
-msgstr "Alleen connecties die uitdrukkelijk door jou zijn toegestaan"
-
-#: ../../include/PermissionDescription.php:121
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr "Geauthenticeerde leden  (kan bezoekers van andere netwerken bevatten)"
-
-#: ../../include/PermissionDescription.php:122
-msgid "Any connections including those who haven't yet been approved"
-msgstr "Al mijn geaccepteerde en nog niet geaccepteerde connecties"
-
-#: ../../include/PermissionDescription.php:161
+#: ../../include/security.php:427
 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"
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr "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/PermissionDescription.php:162
+#: ../../include/text.php:404
+msgid "prev"
+msgstr "vorige"
+
+#: ../../include/text.php:406
+msgid "first"
+msgstr "eerste"
+
+#: ../../include/text.php:435
+msgid "last"
+msgstr "laatste"
+
+#: ../../include/text.php:438
+msgid "next"
+msgstr "volgende"
+
+#: ../../include/text.php:448
+msgid "older"
+msgstr "ouder"
+
+#: ../../include/text.php:450
+msgid "newer"
+msgstr "nieuwer"
+
+#: ../../include/text.php:843
+msgid "No connections"
+msgstr "Geen connecties"
+
+#: ../../include/text.php:868
+#, php-format
+msgid "View all %s connections"
+msgstr "Toon alle %s connecties"
+
+#: ../../include/text.php:1013 ../../include/text.php:1018
+msgid "poke"
+msgstr "aanstoten"
+
+#: ../../include/text.php:1019
+msgid "ping"
+msgstr "ping"
+
+#: ../../include/text.php:1019
+msgid "pinged"
+msgstr "gepingd"
+
+#: ../../include/text.php:1020
+msgid "prod"
+msgstr "por"
+
+#: ../../include/text.php:1020
+msgid "prodded"
+msgstr "gepord"
+
+#: ../../include/text.php:1021
+msgid "slap"
+msgstr "slaan"
+
+#: ../../include/text.php:1021
+msgid "slapped"
+msgstr "sloeg"
+
+#: ../../include/text.php:1022
+msgid "finger"
+msgstr "finger"
+
+#: ../../include/text.php:1022
+msgid "fingered"
+msgstr "gefingerd"
+
+#: ../../include/text.php:1023
+msgid "rebuff"
+msgstr "afpoeieren"
+
+#: ../../include/text.php:1023
+msgid "rebuffed"
+msgstr "afgepoeierd"
+
+#: ../../include/text.php:1035
+msgid "happy"
+msgstr "gelukkig"
+
+#: ../../include/text.php:1036
+msgid "sad"
+msgstr "bedroefd"
+
+#: ../../include/text.php:1037
+msgid "mellow"
+msgstr "mellow"
+
+#: ../../include/text.php:1038
+msgid "tired"
+msgstr "moe"
+
+#: ../../include/text.php:1039
+msgid "perky"
+msgstr "parmantig"
+
+#: ../../include/text.php:1040
+msgid "angry"
+msgstr "boos"
+
+#: ../../include/text.php:1041
+msgid "stupefied"
+msgstr "verbijsterd"
+
+#: ../../include/text.php:1042
+msgid "puzzled"
+msgstr "verward"
+
+#: ../../include/text.php:1043
+msgid "interested"
+msgstr "geïnteresseerd"
+
+#: ../../include/text.php:1044
+msgid "bitter"
+msgstr "verbitterd"
+
+#: ../../include/text.php:1045
+msgid "cheerful"
+msgstr "vrolijk"
+
+#: ../../include/text.php:1046
+msgid "alive"
+msgstr "levendig"
+
+#: ../../include/text.php:1047
+msgid "annoyed"
+msgstr "geërgerd"
+
+#: ../../include/text.php:1048
+msgid "anxious"
+msgstr "bezorgd"
+
+#: ../../include/text.php:1049
+msgid "cranky"
+msgstr "humeurig"
+
+#: ../../include/text.php:1050
+msgid "disturbed"
+msgstr "verontrust"
+
+#: ../../include/text.php:1051
+msgid "frustrated"
+msgstr "gefrustreerd "
+
+#: ../../include/text.php:1052
+msgid "depressed"
+msgstr "gedeprimeerd"
+
+#: ../../include/text.php:1053
+msgid "motivated"
+msgstr "gemotiveerd"
+
+#: ../../include/text.php:1054
+msgid "relaxed"
+msgstr "ontspannen"
+
+#: ../../include/text.php:1055
+msgid "surprised"
+msgstr "verrast"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:70
+msgid "Monday"
+msgstr "maandag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:71
+msgid "Tuesday"
+msgstr "dinsdag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:72
+msgid "Wednesday"
+msgstr "woensdag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:73
+msgid "Thursday"
+msgstr "donderdag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:74
+msgid "Friday"
+msgstr "vrijdag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:75
+msgid "Saturday"
+msgstr "zaterdag"
+
+#: ../../include/text.php:1237 ../../include/js_strings.php:69
+msgid "Sunday"
+msgstr "zondag"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:45
+msgid "January"
+msgstr "januari"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:46
+msgid "February"
+msgstr "februari"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:47
+msgid "March"
+msgstr "maart"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:48
+msgid "April"
+msgstr "april"
+
+#: ../../include/text.php:1241
+msgid "May"
+msgstr "mei"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:50
+msgid "June"
+msgstr "juni"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:51
+msgid "July"
+msgstr "juli"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:52
+msgid "August"
+msgstr "augustus"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:53
+msgid "September"
+msgstr "september"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:54
+msgid "October"
+msgstr "oktober"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:55
+msgid "November"
+msgstr "november"
+
+#: ../../include/text.php:1241 ../../include/js_strings.php:56
+msgid "December"
+msgstr "december"
+
+#: ../../include/text.php:1318 ../../include/text.php:1322
+msgid "Unknown Attachment"
+msgstr "Onbekende bijlage"
+
+#: ../../include/text.php:1324
+msgid "unknown"
+msgstr "onbekend"
+
+#: ../../include/text.php:1360
+msgid "remove category"
+msgstr "categorie verwijderen"
+
+#: ../../include/text.php:1437
+msgid "remove from file"
+msgstr "uit map verwijderen"
+
+#: ../../include/text.php:1734 ../../include/text.php:1805
+msgid "default"
+msgstr "standaard"
+
+#: ../../include/text.php:1742
+msgid "Page layout"
+msgstr "Pagina-lay-out"
+
+#: ../../include/text.php:1742
+msgid "You can create your own with the layouts tool"
+msgstr "Je kan jouw eigen lay-out ontwerpen onder lay-outs"
+
+#: ../../include/text.php:1784
+msgid "Page content type"
+msgstr "Opmaaktype pagina"
+
+#: ../../include/text.php:1817
+msgid "Select an alternate language"
+msgstr "Kies een andere taal"
+
+#: ../../include/text.php:1934
+msgid "activity"
+msgstr "activiteit"
+
+#: ../../include/text.php:2235
+msgid "Design Tools"
+msgstr "Ontwerp-hulpmiddelen"
+
+#: ../../include/text.php:2241
+msgid "Pages"
+msgstr "Pagina's"
+
+#: ../../include/auth.php:147
+msgid "Logged out."
+msgstr "Uitgelogd."
+
+#: ../../include/auth.php:274
+msgid "Failed authentication"
+msgstr "Mislukte authenticatie"
+
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
+msgstr "Kan mijn normale kanaalstream en berichten bekijken"
+
+#: ../../include/permissions.php:30
+msgid "Can view my webpages"
+msgstr "Kan mijn pagina's bekijken"
+
+#: ../../include/permissions.php:34
+msgid "Can post on my channel page (\"wall\")"
+msgstr "Kan een bericht in mijn kanaal plaatsen"
+
+#: ../../include/permissions.php:37
+msgid "Can like/dislike stuff"
+msgstr "Kan dingen leuk of niet leuk vinden"
+
+#: ../../include/permissions.php:37
+msgid "Profiles and things other than posts/comments"
+msgstr "Profielen en dingen, buiten berichten en reacties"
+
+#: ../../include/permissions.php:39
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+"
+
+#: ../../include/permissions.php:39
+msgid "Advanced - useful for creating group forum channels"
+msgstr "Geavanceerd - nuttig voor groepforums"
+
+#: ../../include/permissions.php:40
+msgid "Can chat with me (when available)"
+msgstr "Kan met mij chatten (wanneer beschikbaar)"
+
+#: ../../include/permissions.php:41
+msgid "Can write to my file storage and photos"
+msgstr "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen"
+
+#: ../../include/permissions.php:42
+msgid "Can edit my webpages"
+msgstr "Kan mijn pagina's bewerken"
+
+#: ../../include/permissions.php:44
+msgid "Somewhat advanced - very useful in open communities"
+msgstr "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)"
+
+#: ../../include/permissions.php:46
+msgid "Can administer my channel resources"
+msgstr "Kan mijn kanaal beheren"
+
+#: ../../include/permissions.php:46
 msgid ""
-"This is your default setting for who can view your default channel profile"
-msgstr "Dit is de standaard privacy-instelling voor wie jouw standaardprofiel kan bekijken"
-
-#: ../../include/PermissionDescription.php:163
-msgid "This is your default setting for who can view your connections"
-msgstr "Dit is de standaard privacy-instelling voor wie een lijst met jouw connecties kan bekijken"
-
-#: ../../include/PermissionDescription.php:164
-msgid ""
-"This is your default setting for who can view your file storage and photos"
-msgstr "Dit is de standaard privacy-instelling voor wie jouw bestanden en foto's kan bekijken"
-
-#: ../../include/PermissionDescription.php:165
-msgid "This is your default setting for the audience of your webpages"
-msgstr "Dit is de standaard privacy-instelling voor wie jouw webpagina's kan bekijken"
-
-#: ../../include/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:1871
-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:723 ../../include/account.php:725
-msgid "Click here to upgrade."
-msgstr "Klik hier om te upgraden."
-
-#: ../../include/account.php:731
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr "Deze handeling overschrijdt de beperkingen die voor jouw abonnement gelden."
-
-#: ../../include/account.php:736
-msgid "This action is not available under your subscription plan."
-msgstr "Deze handeling is niet mogelijk met jouw abonnement."
-
-#: ../../include/attach.php:247 ../../include/attach.php:333
-msgid "Item was not found."
-msgstr "Item niet gevonden"
-
-#: ../../include/attach.php:497
-msgid "No source file."
-msgstr "Geen bronbestand."
-
-#: ../../include/attach.php:519
-msgid "Cannot locate file to replace"
-msgstr "Kan het te vervangen bestand niet vinden"
-
-#: ../../include/attach.php:537
-msgid "Cannot locate file to revise/update"
-msgstr "Kan het bestand wat aangepast moet worden niet vinden"
-
-#: ../../include/attach.php:672
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr "Bestand is groter dan de toegelaten %d"
-
-#: ../../include/attach.php:686
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."
-
-#: ../../include/attach.php:842
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."
-
-#: ../../include/attach.php:855
-msgid "Stored file could not be verified. Upload failed."
-msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."
-
-#: ../../include/attach.php:909 ../../include/attach.php:925
-msgid "Path not available."
-msgstr "Pad niet beschikbaar."
-
-#: ../../include/attach.php:971 ../../include/attach.php:1123
-msgid "Empty pathname"
-msgstr "Padnaam leeg"
-
-#: ../../include/attach.php:997
-msgid "duplicate filename or path"
-msgstr "dubbele bestandsnaam of pad"
-
-#: ../../include/attach.php:1019
-msgid "Path not found."
-msgstr "Pad niet gevonden"
-
-#: ../../include/attach.php:1077
-msgid "mkdir failed."
-msgstr "directory aanmaken (mkdir) mislukt."
-
-#: ../../include/attach.php:1081
-msgid "database storage failed."
-msgstr "opslag in database mislukt."
-
-#: ../../include/attach.php:1129
-msgid "Empty path"
-msgstr "Ontbrekend bestandspad"
-
-#: ../../include/channel.php:32
-msgid "Unable to obtain identity information from database"
-msgstr "Niet in staat om identiteitsinformatie uit de database te verkrijgen"
-
-#: ../../include/channel.php:66
-msgid "Empty name"
-msgstr "Ontbrekende naam"
-
-#: ../../include/channel.php:69
-msgid "Name too long"
-msgstr "Naam te lang"
-
-#: ../../include/channel.php:180
-msgid "No account identifier"
-msgstr "Geen account-identificator"
-
-#: ../../include/channel.php:192
-msgid "Nickname is required."
-msgstr "Bijnaam is verplicht"
-
-#: ../../include/channel.php:206
-msgid "Reserved nickname. Please choose another."
-msgstr "Deze naam is gereserveerd. Kies een andere."
-
-#: ../../include/channel.php:211
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik."
-
-#: ../../include/channel.php:287
-msgid "Unable to retrieve created identity"
-msgstr "Niet in staat om aangemaakte identiteit te vinden"
-
-#: ../../include/channel.php:345
-msgid "Default Profile"
-msgstr "Standaardprofiel"
-
-#: ../../include/channel.php:791
-msgid "Requested channel is not available."
-msgstr "Opgevraagd kanaal is niet beschikbaar."
-
-#: ../../include/channel.php:938
-msgid "Create New Profile"
-msgstr "Nieuw profiel aanmaken"
-
-#: ../../include/channel.php:958
-msgid "Visible to everybody"
-msgstr "Voor iedereen zichtbaar"
-
-#: ../../include/channel.php:1031 ../../include/channel.php:1142
-msgid "Gender:"
-msgstr "Geslacht:"
-
-#: ../../include/channel.php:1032 ../../include/channel.php:1186
-msgid "Status:"
-msgstr "Status:"
-
-#: ../../include/channel.php:1033 ../../include/channel.php:1197
-msgid "Homepage:"
-msgstr "Homepagina:"
-
-#: ../../include/channel.php:1034
-msgid "Online Now"
-msgstr "Nu online"
-
-#: ../../include/channel.php:1147
-msgid "Like this channel"
-msgstr "Vind dit kanaal leuk"
-
-#: ../../include/channel.php:1171
-msgid "j F, Y"
-msgstr "F j Y"
-
-#: ../../include/channel.php:1172
-msgid "j F"
-msgstr "F j"
-
-#: ../../include/channel.php:1179
-msgid "Birthday:"
-msgstr "Geboortedatum:"
-
-#: ../../include/channel.php:1192
-#, php-format
-msgid "for %1$d %2$s"
-msgstr "voor %1$d %2$s"
-
-#: ../../include/channel.php:1195
-msgid "Sexual Preference:"
-msgstr "Seksuele voorkeur:"
-
-#: ../../include/channel.php:1201
-msgid "Tags:"
-msgstr "Tags:"
-
-#: ../../include/channel.php:1203
-msgid "Political Views:"
-msgstr "Politieke overtuigingen:"
-
-#: ../../include/channel.php:1205
-msgid "Religion:"
-msgstr "Religie:"
-
-#: ../../include/channel.php:1209
-msgid "Hobbies/Interests:"
-msgstr "Hobby's/interesses:"
-
-#: ../../include/channel.php:1211
-msgid "Likes:"
-msgstr "Houdt van:"
-
-#: ../../include/channel.php:1213
-msgid "Dislikes:"
-msgstr "Houdt niet van:"
-
-#: ../../include/channel.php:1215
-msgid "Contact information and Social Networks:"
-msgstr "Contactinformatie en sociale netwerken:"
-
-#: ../../include/channel.php:1217
-msgid "My other channels:"
-msgstr "Mijn andere kanalen"
-
-#: ../../include/channel.php:1219
-msgid "Musical interests:"
-msgstr "Muzikale interesses:"
-
-#: ../../include/channel.php:1221
-msgid "Books, literature:"
-msgstr "Boeken, literatuur:"
-
-#: ../../include/channel.php:1223
-msgid "Television:"
-msgstr "Televisie:"
-
-#: ../../include/channel.php:1225
-msgid "Film/dance/culture/entertainment:"
-msgstr "Films/dansen/cultuur/vermaak:"
-
-#: ../../include/channel.php:1227
-msgid "Love/Romance:"
-msgstr "Liefde/romantiek:"
-
-#: ../../include/channel.php:1229
-msgid "Work/employment:"
-msgstr "Werk/beroep:"
-
-#: ../../include/channel.php:1231
-msgid "School/education:"
-msgstr "School/opleiding:"
-
-#: ../../include/channel.php:1251
-msgid "Like this thing"
-msgstr "Vind dit ding leuk"
+"Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet."
 
 #: ../../include/features.php:48
 msgid "General Features"
@@ -8715,378 +8525,257 @@ msgid "Provide managed web pages on your channel"
 msgstr "Sta beheerde webpagina's op jouw kanaal toe"
 
 #: ../../include/features.php:55
+msgid "Provide a wiki for your channel"
+msgstr "Voeg een wiki aan jouw kanaal toe"
+
+#: ../../include/features.php:56
 msgid "Hide Rating"
 msgstr "Beoordelingen verbergen"
 
-#: ../../include/features.php:55
+#: ../../include/features.php:56
 msgid ""
 "Hide the rating buttons on your channel and profile pages. Note: People can "
 "still rate you somewhere else."
 msgstr "Verbergt de beoordelingsknoppen op jouw kanaal- en profielpagina's. Let op: Mensen kunnen jou nog steeds ergens anders beoordelen. "
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Private Notes"
 msgstr "Privé-aantekeningen"
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr "Een eenvoudige toepassing om aantekeningen en herinneringen in te bewaren (let op: niet versleuteld)"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Navigation Channel Select"
 msgstr "Kanaal kiezen in navigatiemenu"
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr "Kies een ander kanaal direct vanuit het dropdown-menu op de navigatiebalk"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "Photo Location"
 msgstr "Fotolocatie"
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr "Wanneer in de geüploade foto's locatiegegevens aanwezig zijn, link dit dan aan een kaart."
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Access Controlled Chatrooms"
 msgstr "Chatkanalen met toegangscontrole "
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Provide chatrooms and chat services with access control."
 msgstr "Chatkanalen en chatdiensten met toegangscontrole aanbieden."
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid "Smart Birthdays"
 msgstr "Slimme verjaardagen"
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid ""
 "Make birthday events timezone aware in case your friends are scattered "
 "across the planet."
 msgstr "Maak verjaardagen bewust van tijdzones. Voor het geval dat jouw vrienden over de hele wereld verspreid zijn."
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Expert Mode"
 msgstr "Expertmodus"
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr "Schakel de expertmodus in voor geavanceerde instellingen"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid "Premium Channel"
 msgstr "Premiumkanaal"
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr "Stelt je in staat om beperkingen en voorwaarden in te stellen voor jouw kanaal"
 
-#: ../../include/features.php:67
+#: ../../include/features.php:68
 msgid "Post Composition Features"
 msgstr "Functies voor het opstellen van berichten"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Large Photos"
 msgstr "Grote foto's"
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr "Gebruik grotere foto's (1024px) in berichten. Wanneer dit is uitgeschakeld worden er kleinere foto's (640px) gebruikt."
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Automatically import channel content from other channels or feeds"
 msgstr "Automatisch inhoud uit andere kanalen of feeds importeren."
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Even More Encryption"
 msgstr "Extra encryptie"
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr "Sta toe dat inhoud extra end-to-end wordt versleuteld met een gedeelde geheime sleutel."
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Enable Voting Tools"
 msgstr "Peilingen inschakelen"
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Provide a class of post which others can vote on"
 msgstr "Maakt het mogelijk om een bericht op te stellen, waar mensen op kunnen stemmen."
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Delayed Posting"
 msgstr "Berichten uitstellen"
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Allow posts to be published at a later date"
 msgstr "Maakt het mogelijk dat berichten op een toekomstig moment gepubliceerd kunnen worden."
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Suppress Duplicate Posts/Comments"
 msgstr "Dubbele berichten/reacties tegenhouden"
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr "Voorkomt dat berichten en reacties met identieke inhoud en die binnen twee minuten zijn verstuurd, worden gepubliceerd. "
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Network and Stream Filtering"
 msgstr "Netwerk- en streamfilter"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Search by Date"
 msgstr "Zoek op datum"
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to select posts by date ranges"
 msgstr "Mogelijkheid om berichten op datum te filteren "
 
-#: ../../include/features.php:83 ../../include/group.php:311
+#: ../../include/features.php:84 ../../include/group.php:311
 msgid "Privacy Groups"
 msgstr "Privacygroepen"
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Enable management and selection of privacy groups"
 msgstr "Beheer en selectie van privacygroepen inschakelen"
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85 ../../include/widgets.php:281
+msgid "Saved Searches"
+msgstr "Opgeslagen zoekopdrachten"
+
+#: ../../include/features.php:85
 msgid "Save search terms for re-use"
 msgstr "Sla zoekopdrachten op voor hergebruik"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Network Personal Tab"
 msgstr "Persoonlijke netwerktab"
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr "Sta het toe dat de tab netwerkberichten toont waarmee je interactie had"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Network New Tab"
 msgstr "Nieuwe netwerktab"
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Enable tab to display all new Network activity"
 msgstr "Laat de tab alle nieuwe netwerkactiviteit tonen"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Affinity Tool"
 msgstr "Verwantschapsfilter"
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Filter stream activity by depth of relationships"
 msgstr "Filter wat je in jouw grid ziet op hoe goed je iemand kent of mag"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Connection Filtering"
 msgstr "Berichtenfilters"
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 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:90
 msgid "Show channel suggestions"
 msgstr "Voor jou mogelijk interessante kanalen voorstellen"
 
-#: ../../include/features.php:94
+#: ../../include/features.php:95
 msgid "Post/Comment Tools"
 msgstr "Bericht- en reactiehulpmiddelen"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Community Tagging"
 msgstr "Taggen door anderen"
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Ability to tag existing posts"
 msgstr "Geeft andere mensen de mogelijkheid om jouw (bestaande) berichten te taggen"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Post Categories"
 msgstr "Categorieën berichten"
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Add categories to your posts"
 msgstr "Voeg categorieën toe aan je berichten"
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Emoji Reactions"
 msgstr "Emoji-reacties"
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Add emoji reaction ability to posts"
 msgstr "Emoji-reacties in berichten toestaan"
 
-#: ../../include/features.php:98
+#: ../../include/features.php:99 ../../include/widgets.php:310
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
+msgstr "Bewaarde mappen"
+
+#: ../../include/features.php:99
 msgid "Ability to file posts under folders"
 msgstr "Mogelijkheid om berichten in mappen op te slaan"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Dislike Posts"
 msgstr "Vind berichten niet leuk"
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Ability to dislike posts/comments"
 msgstr "Mogelijkheid om berichten en reacties niet leuk te vinden"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Star Posts"
 msgstr "Geef berichten een ster"
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Ability to mark special posts with a star indicator"
 msgstr "Mogelijkheid om speciale berichten met een ster te markeren"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Tag Cloud"
 msgstr "Tagwolk"
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Provide a personal tag cloud on your channel page"
 msgstr "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina"
 
-#: ../../include/oembed.php:324
-msgid "Embedded content"
-msgstr "Ingesloten (embedded) inhoud"
-
-#: ../../include/oembed.php:333
-msgid "Embedding disabled"
-msgstr "Insluiten (embedding) uitgeschakeld"
-
-#: ../../include/acl_selectors.php:271
-msgid "Who can see this?"
-msgstr "Wie kan dit zien?"
-
-#: ../../include/acl_selectors.php:272
-msgid "Custom selection"
-msgstr "Handmatige selectie"
-
-#: ../../include/acl_selectors.php:273
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
-" the scope of \"Show\"."
-msgstr "Kies \"Tonen\" om weergave toe te staan.  Met \"Niet tonen\" kan je uitzonderingen maken op \"Tonen\"."
-
-#: ../../include/acl_selectors.php:274
-msgid "Show"
-msgstr "Tonen"
-
-#: ../../include/acl_selectors.php:275
-msgid "Don't show"
-msgstr "Niet tonen"
-
-#: ../../include/acl_selectors.php:281
-msgid "Other networks and post services"
-msgstr "Andere netwerken en diensten"
-
-#: ../../include/acl_selectors.php:311
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These"
-" permissions set who is allowed to view the post."
-msgstr "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.</br />Met deze permissies bepaal je wie het bericht kan zien."
-
-#: ../../include/auth.php:105
-msgid "Logged out."
-msgstr "Uitgelogd."
-
-#: ../../include/auth.php:212
-msgid "Failed authentication"
-msgstr "Mislukte authenticatie"
-
-#: ../../include/datetime.php:135
-msgid "Birthday"
-msgstr "Verjaardag of geboortedatum"
-
-#: ../../include/datetime.php:137
-msgid "Age: "
-msgstr "Leeftijd:"
-
-#: ../../include/datetime.php:139
-msgid "YYYY-MM-DD or MM-DD"
-msgstr "JJJJ-MM-DD of MM-DD"
-
-#: ../../include/datetime.php:272 ../../boot.php:2470
-msgid "never"
-msgstr "nooit"
-
-#: ../../include/datetime.php:278
-msgid "less than a second ago"
-msgstr "minder dan een seconde geleden"
-
-#: ../../include/datetime.php:296
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr "%1$d %2$s geleden"
-
-#: ../../include/datetime.php:307
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] "jaar"
-msgstr[1] "jaren"
-
-#: ../../include/datetime.php:310
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] "maand"
-msgstr[1] "maanden"
-
-#: ../../include/datetime.php:313
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] "week"
-msgstr[1] "weken"
-
-#: ../../include/datetime.php:316
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dag"
-msgstr[1] "dagen"
-
-#: ../../include/datetime.php:319
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "uur"
-msgstr[1] "uren"
-
-#: ../../include/datetime.php:322
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuut"
-msgstr[1] "minuten"
-
-#: ../../include/datetime.php:325
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "seconde"
-msgstr[1] "seconden"
-
-#: ../../include/datetime.php:562
-#, php-format
-msgid "%1$s's birthday"
-msgstr "Verjaardag van %1$s"
-
-#: ../../include/datetime.php:563
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr "Gefeliciteerd met je verjaardag %1$s"
-
 #: ../../include/group.php:26
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -9114,21 +8803,583 @@ 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/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:485
+msgid "l F d, Y \\@ g:i A"
+msgstr "l d F Y \\@ G:i"
+
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:491
+msgid "Starts:"
+msgstr "Start:"
+
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:499
+msgid "Finishes:"
+msgstr "Einde:"
+
+#: ../../include/event.php:814
+msgid "This event has been added to your calendar."
+msgstr "Dit evenement is aan jouw agenda toegevoegd."
+
+#: ../../include/event.php:1014
+msgid "Not specified"
+msgstr "Niet aangegeven"
+
+#: ../../include/event.php:1015
+msgid "Needs Action"
+msgstr "Actie vereist"
+
+#: ../../include/event.php:1016
+msgid "Completed"
+msgstr "Voltooid"
+
+#: ../../include/event.php:1017
+msgid "In Process"
+msgstr "In behandeling"
+
+#: ../../include/event.php:1018
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#: ../../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:739 ../../include/account.php:741
+msgid "Click here to upgrade."
+msgstr "Klik hier om te upgraden."
+
+#: ../../include/account.php:747
+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:752
+msgid "This action is not available under your subscription plan."
+msgstr "Deze handeling is niet mogelijk met jouw abonnement."
+
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
+msgstr "Kanaal is op deze hub geblokkeerd."
+
+#: ../../include/follow.php:32
+msgid "Channel location missing."
+msgstr "Ontbrekende kanaallocatie."
+
+#: ../../include/follow.php:80
+msgid "Response from remote channel was incomplete."
+msgstr "Antwoord van het kanaal op afstand was niet volledig."
+
+#: ../../include/follow.php:97
+msgid "Channel was deleted and no longer exists."
+msgstr "Kanaal is verwijderd en bestaat niet meer."
+
+#: ../../include/follow.php:147 ../../include/follow.php:183
+msgid "Protocol disabled."
+msgstr "Protocol uitgeschakeld."
+
+#: ../../include/follow.php:171
+msgid "Channel discovery failed."
+msgstr "Kanaal ontdekken mislukt."
+
+#: ../../include/follow.php:210
+msgid "Cannot connect to yourself."
+msgstr "Kan niet met jezelf verbinden"
+
+#: ../../include/attach.php:247 ../../include/attach.php:333
+msgid "Item was not found."
+msgstr "Item niet gevonden"
+
+#: ../../include/attach.php:499
+msgid "No source file."
+msgstr "Geen bronbestand."
+
+#: ../../include/attach.php:521
+msgid "Cannot locate file to replace"
+msgstr "Kan het te vervangen bestand niet vinden"
+
+#: ../../include/attach.php:539
+msgid "Cannot locate file to revise/update"
+msgstr "Kan het bestand wat aangepast moet worden niet vinden"
+
+#: ../../include/attach.php:674
+#, php-format
+msgid "File exceeds size limit of %d"
+msgstr "Bestand is groter dan de toegelaten %d"
+
+#: ../../include/attach.php:688
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+msgstr "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt."
+
+#: ../../include/attach.php:846
+msgid "File upload failed. Possible system limit or action terminated."
+msgstr "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken."
+
+#: ../../include/attach.php:859
+msgid "Stored file could not be verified. Upload failed."
+msgstr "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt."
+
+#: ../../include/attach.php:915 ../../include/attach.php:931
+msgid "Path not available."
+msgstr "Pad niet beschikbaar."
+
+#: ../../include/attach.php:977 ../../include/attach.php:1129
+msgid "Empty pathname"
+msgstr "Padnaam leeg"
+
+#: ../../include/attach.php:1003
+msgid "duplicate filename or path"
+msgstr "dubbele bestandsnaam of pad"
+
+#: ../../include/attach.php:1025
+msgid "Path not found."
+msgstr "Pad niet gevonden"
+
+#: ../../include/attach.php:1083
+msgid "mkdir failed."
+msgstr "directory aanmaken (mkdir) mislukt."
+
+#: ../../include/attach.php:1087
+msgid "database storage failed."
+msgstr "opslag in database mislukt."
+
+#: ../../include/attach.php:1135
+msgid "Empty path"
+msgstr "Ontbrekend bestandspad"
+
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:878
+#: ../../include/bbcode.php:881 ../../include/bbcode.php:886
+#: ../../include/bbcode.php:889 ../../include/bbcode.php:892
+#: ../../include/bbcode.php:895 ../../include/bbcode.php:900
+#: ../../include/bbcode.php:903 ../../include/bbcode.php:908
+#: ../../include/bbcode.php:911 ../../include/bbcode.php:914
+#: ../../include/bbcode.php:917
+msgid "Image/photo"
+msgstr "Afbeelding/foto"
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:928
+msgid "Encrypted content"
+msgstr "Versleutelde inhoud"
+
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
+msgstr "Installeer %s-element: "
+
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
+msgstr "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren."
+
+#: ../../include/bbcode.php:261
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
+msgstr "%1$s schreef het volgende %2$s %3$s"
+
+#: ../../include/bbcode.php:338 ../../include/bbcode.php:346
+msgid "Click to open/close"
+msgstr "Klik om te openen of te sluiten"
+
+#: ../../include/bbcode.php:346
+msgid "spoiler"
+msgstr "spoiler"
+
+#: ../../include/bbcode.php:619
+msgid "Different viewers will see this text differently"
+msgstr "Deze tekst wordt per persoon anders weergeven."
+
+#: ../../include/bbcode.php:866
+msgid "$1 wrote:"
+msgstr "$1 schreef:"
+
+#: ../../include/items.php:897 ../../include/items.php:942
+msgid "(Unknown)"
+msgstr "(Onbekend)"
+
+#: ../../include/items.php:1141
+msgid "Visible to anybody on the internet."
+msgstr "Voor iedereen op het internet zichtbaar."
+
+#: ../../include/items.php:1143
+msgid "Visible to you only."
+msgstr "Alleen voor jou zichtbaar."
+
+#: ../../include/items.php:1145
+msgid "Visible to anybody in this network."
+msgstr "Voor iedereen in dit netwerk zichtbaar."
+
+#: ../../include/items.php:1147
+msgid "Visible to anybody authenticated."
+msgstr "Voor iedereen die geauthenticeerd is zichtbaar."
+
+#: ../../include/items.php:1149
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr "Voor iedereen op %s zichtbaar."
+
+#: ../../include/items.php:1151
+msgid "Visible to all connections."
+msgstr "Voor alle connecties zichtbaar."
+
+#: ../../include/items.php:1153
+msgid "Visible to approved connections."
+msgstr "Voor alle geaccepteerde connecties zichtbaar."
+
+#: ../../include/items.php:1155
+msgid "Visible to specific connections."
+msgstr "Voor specifieke connecties zichtbaar."
+
+#: ../../include/items.php:3918
+msgid "Privacy group is empty."
+msgstr "Privacygroep is leeg"
+
+#: ../../include/items.php:3925
+#, php-format
+msgid "Privacy group: %s"
+msgstr "Privacygroep: %s"
+
+#: ../../include/items.php:3937
+msgid "Connection not found."
+msgstr "Connectie niet gevonden."
+
+#: ../../include/items.php:4290
+msgid "profile photo"
+msgstr "profielfoto"
+
+#: ../../include/oembed.php:336
+msgid "Embedded content"
+msgstr "Ingesloten (embedded) inhoud"
+
+#: ../../include/oembed.php:345
+msgid "Embedding disabled"
+msgstr "Insluiten (embedding) uitgeschakeld"
+
+#: ../../include/widgets.php:103
+msgid "System"
+msgstr "Systeem"
+
+#: ../../include/widgets.php:106
+msgid "New App"
+msgstr "Nieuwe app"
+
+#: ../../include/widgets.php:154
+msgid "Suggestions"
+msgstr "Voorgestelde kanalen"
+
+#: ../../include/widgets.php:155
+msgid "See more..."
+msgstr "Meer..."
+
+#: ../../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/widgets.php:181
+msgid "Add New Connection"
+msgstr "Nieuwe connectie toevoegen"
+
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
+msgstr "Vul kanaaladres in"
+
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
+msgstr "Voorbeelden: bob@example.com, http://example.com/barbara"
+
+#: ../../include/widgets.php:199
+msgid "Notes"
+msgstr "Aantekeningen"
+
+#: ../../include/widgets.php:273
+msgid "Remove term"
+msgstr "Verwijder zoekterm"
+
+#: ../../include/widgets.php:313 ../../include/widgets.php:432
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
+msgstr "Alles"
+
+#: ../../include/widgets.php:354
+msgid "Archives"
+msgstr "Archieven"
+
+#: ../../include/widgets.php:516
+msgid "Refresh"
+msgstr "Vernieuwen"
+
+#: ../../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/widgets.php:578
+msgid "Feature/Addon settings"
+msgstr "Plugin-instellingen"
+
+#: ../../include/widgets.php:584
+msgid "Display settings"
+msgstr "Weergave"
+
+#: ../../include/widgets.php:591
+msgid "Manage locations"
+msgstr "Locaties beheren"
+
+#: ../../include/widgets.php:600
+msgid "Export channel"
+msgstr "Kanaal exporteren"
+
+#: ../../include/widgets.php:607
+msgid "Connected apps"
+msgstr "Verbonden applicaties"
+
+#: ../../include/widgets.php:631
+msgid "Premium Channel Settings"
+msgstr "Instellingen premiumkanaal"
+
+#: ../../include/widgets.php:660
+msgid "Private Mail Menu"
+msgstr "Privéberichten"
+
+#: ../../include/widgets.php:662
+msgid "Combined View"
+msgstr "Gecombineerd postvak"
+
+#: ../../include/widgets.php:694 ../../include/widgets.php:706
+msgid "Conversations"
+msgstr "Conversaties"
+
+#: ../../include/widgets.php:698
+msgid "Received Messages"
+msgstr "Ontvangen berichten"
+
+#: ../../include/widgets.php:702
+msgid "Sent Messages"
+msgstr "Verzonden berichten"
+
+#: ../../include/widgets.php:716
+msgid "No messages."
+msgstr "Geen berichten"
+
+#: ../../include/widgets.php:734
+msgid "Delete conversation"
+msgstr "Verwijder conversatie"
+
+#: ../../include/widgets.php:760
+msgid "Events Tools"
+msgstr "Agenda-hulpmiddelen"
+
+#: ../../include/widgets.php:761
+msgid "Export Calendar"
+msgstr "Exporteren"
+
+#: ../../include/widgets.php:762
+msgid "Import Calendar"
+msgstr "Importeren"
+
+#: ../../include/widgets.php:840
+msgid "Overview"
+msgstr "Overzicht"
+
+#: ../../include/widgets.php:847
+msgid "Chat Members"
+msgstr "Chatleden"
+
+#: ../../include/widgets.php:869
+msgid "Wiki List"
+msgstr "Wiki's"
+
+#: ../../include/widgets.php:907
+msgid "Wiki Pages"
+msgstr "Wikipagina's"
+
+#: ../../include/widgets.php:942
+msgid "Bookmarked Chatrooms"
+msgstr "Bladwijzers van chatkanalen"
+
+#: ../../include/widgets.php:965
+msgid "Suggested Chatrooms"
+msgstr "Voorgestelde chatkanalen"
+
+#: ../../include/widgets.php:1111 ../../include/widgets.php:1223
+msgid "photo/image"
+msgstr "foto/afbeelding"
+
+#: ../../include/widgets.php:1166
+msgid "Click to show more"
+msgstr "Klik voor meer"
+
+#: ../../include/widgets.php:1317
+msgid "Rating Tools"
+msgstr "Beoordelingen"
+
+#: ../../include/widgets.php:1321 ../../include/widgets.php:1323
+msgid "Rate Me"
+msgstr "Beoordeel mij"
+
+#: ../../include/widgets.php:1326
+msgid "View Ratings"
+msgstr "Bekijk beoordelingen"
+
+#: ../../include/widgets.php:1410
+msgid "Forums"
+msgstr "Forums"
+
+#: ../../include/widgets.php:1439
+msgid "Tasks"
+msgstr "Taken"
+
+#: ../../include/widgets.php:1448
+msgid "Documentation"
+msgstr "Documentatie"
+
+#: ../../include/widgets.php:1450
+msgid "Project/Site Information"
+msgstr "Project- en hub-informatie"
+
+#: ../../include/widgets.php:1451
+msgid "For Members"
+msgstr "Voor leden"
+
+#: ../../include/widgets.php:1452
+msgid "For Administrators"
+msgstr "Voor beheerders"
+
+#: ../../include/widgets.php:1453
+msgid "For Developers"
+msgstr "Voor ontwikkelaars"
+
+#: ../../include/widgets.php:1477 ../../include/widgets.php:1515
+msgid "Member registrations waiting for confirmation"
+msgstr "Accounts die op goedkeuring wachten"
+
+#: ../../include/widgets.php:1483
+msgid "Inspect queue"
+msgstr "Inspecteer berichtenwachtrij"
+
+#: ../../include/widgets.php:1485
+msgid "DB updates"
+msgstr "Database-updates"
+
+#: ../../include/widgets.php:1511
+msgid "Plugin Features"
+msgstr "Plugin-opties"
+
+#: ../../include/activities.php:41
+msgid " and "
+msgstr " en "
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr "openbaar profiel"
+
+#: ../../include/activities.php:58
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr "%1$s veranderde %2$s naar &ldquo;%3$s&rdquo;"
+
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr "Bezoek het %2$s van %1$s"
+
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd."
+
+#: ../../include/bb2diaspora.php:398
+msgid "Attachments:"
+msgstr "Bijlagen:"
+
+#: ../../include/bb2diaspora.php:487
+msgid "$Projectname event notification:"
+msgstr "Notificatie $Projectname-gebeurtenis:"
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr "Dit item verwijderen?"
 
 #: ../../include/js_strings.php:8
-msgid "[-] show less"
-msgstr "[-] minder reacties weergeven"
+#, php-format
+msgid "%s show less"
+msgstr "%s minder reacties weergeven"
 
 #: ../../include/js_strings.php:9
-msgid "[+] expand"
-msgstr "[+] uitklappen"
+#, php-format
+msgid "%s expand"
+msgstr "%s uitklappen"
 
 #: ../../include/js_strings.php:10
-msgid "[-] collapse"
-msgstr "[-] inklappen"
+#, php-format
+msgid "%s collapse"
+msgstr "%s inklappen"
 
 #: ../../include/js_strings.php:11
 msgid "Password too short"
@@ -9358,278 +9609,223 @@ msgctxt "calendar"
 msgid "All day"
 msgstr "hele dag"
 
-#: ../../include/network.php:657
-msgid "view full size"
-msgstr "volledige grootte tonen"
-
-#: ../../include/network.php:1885
-msgid "No Subject"
-msgstr "Geen onderwerp"
-
-#: ../../include/network.php:2146 ../../include/network.php:2147
-msgid "Friendica"
-msgstr "Friendica"
-
-#: ../../include/network.php:2148
-msgid "OStatus"
-msgstr "OStatus"
-
-#: ../../include/network.php:2149
-msgid "GNU-Social"
-msgstr "GNU social"
-
-#: ../../include/network.php:2150
-msgid "RSS/Atom"
-msgstr "RSS/Atom"
-
-#: ../../include/network.php:2152
-msgid "Diaspora"
-msgstr "Diaspora"
-
-#: ../../include/network.php:2153
-msgid "Facebook"
-msgstr "Facebook"
-
-#: ../../include/network.php:2154
-msgid "Zot"
-msgstr "Zot"
-
-#: ../../include/network.php:2155
-msgid "LinkedIn"
-msgstr "LinkedIn"
-
-#: ../../include/network.php:2156
-msgid "XMPP/IM"
-msgstr "XMPP/IM"
-
-#: ../../include/network.php:2157
-msgid "MySpace"
-msgstr "MySpace"
-
-#: ../../include/photos.php:110
+#: ../../include/contact_widgets.php:11
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes"
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] "%d uitnodiging beschikbaar"
+msgstr[1] "%d uitnodigingen beschikbaar"
 
-#: ../../include/photos.php:117
-msgid "Image file is empty."
-msgstr "Afbeeldingsbestand is leeg"
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
+msgstr "Kanalen vinden"
 
-#: ../../include/photos.php:255
-msgid "Photo storage failed."
-msgstr "Foto kan niet worden opgeslagen"
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
+msgstr "Vul naam of interesse in"
 
-#: ../../include/photos.php:295
-msgid "a new photo"
-msgstr "een nieuwe foto"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
+msgstr "Verbinden/volgen"
 
-#: ../../include/photos.php:299
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
+msgstr "Voorbeeld: Robert Morgenstein, vissen"
+
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
+msgstr "Willekeurig profiel"
+
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
+msgstr "Vrienden uitnodigen"
+
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
+msgstr "Geavanceerd voorbeeld (Engels): name=jan en country=nederland"
+
+#: ../../include/contact_widgets.php:122
 #, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr "%1$s plaatste %2$s op %3$s"
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] "%d gemeenschappelijke connectie"
+msgstr[1] "%d gemeenschappelijke connecties"
 
-#: ../../include/photos.php:506
-msgid "Upload New Photos"
-msgstr "Nieuwe foto's uploaden"
+#: ../../include/contact_widgets.php:127
+msgid "show more"
+msgstr "meer connecties weergeven"
 
-#: ../../include/zot.php:699
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
+msgstr "Opties kanalengids"
+
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
+msgstr "Veilig zoeken"
+
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
+msgstr "Alleen openbare forums"
+
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
+msgstr "Alleen deze hub"
+
+#: ../../include/message.php:20
+msgid "No recipient provided."
+msgstr "Geen ontvanger opgegeven."
+
+#: ../../include/message.php:25
+msgid "[no subject]"
+msgstr "[geen onderwerp]"
+
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
+msgstr "Afzender kan niet bepaald worden."
+
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
+msgstr "Opgeslagen bericht kon niet worden geverifieerd."
+
+#: ../../include/acl_selectors.php:269
+msgid "Who can see this?"
+msgstr "Wie kan dit zien?"
+
+#: ../../include/acl_selectors.php:270
+msgid "Custom selection"
+msgstr "Handmatige selectie"
+
+#: ../../include/acl_selectors.php:271
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit"
+" the scope of \"Show\"."
+msgstr "Kies \"Tonen\" om weergave toe te staan.  Met \"Niet tonen\" kan je uitzonderingen maken op \"Tonen\"."
+
+#: ../../include/acl_selectors.php:272
+msgid "Show"
+msgstr "Tonen"
+
+#: ../../include/acl_selectors.php:273
+msgid "Don't show"
+msgstr "Niet tonen"
+
+#: ../../include/acl_selectors.php:279
+msgid "Other networks and post services"
+msgstr "Andere netwerken en diensten"
+
+#: ../../include/acl_selectors.php:309
+#, php-format
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These"
+" permissions set who is allowed to view the post."
+msgstr "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.</br />Met deze permissies bepaal je wie het bericht kan zien."
+
+#: ../../include/datetime.php:135
+msgid "Birthday"
+msgstr "Verjaardag of geboortedatum"
+
+#: ../../include/datetime.php:137
+msgid "Age: "
+msgstr "Leeftijd:"
+
+#: ../../include/datetime.php:139
+msgid "YYYY-MM-DD or MM-DD"
+msgstr "JJJJ-MM-DD of MM-DD"
+
+#: ../../include/datetime.php:272 ../../boot.php:2479
+msgid "never"
+msgstr "nooit"
+
+#: ../../include/datetime.php:278
+msgid "less than a second ago"
+msgstr "minder dan een seconde geleden"
+
+#: ../../include/datetime.php:296
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr "%1$d %2$s geleden"
+
+#: ../../include/datetime.php:307
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] "jaar"
+msgstr[1] "jaren"
+
+#: ../../include/datetime.php:310
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] "maand"
+msgstr[1] "maanden"
+
+#: ../../include/datetime.php:313
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "week"
+msgstr[1] "weken"
+
+#: ../../include/datetime.php:316
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] "dag"
+msgstr[1] "dagen"
+
+#: ../../include/datetime.php:319
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "uur"
+msgstr[1] "uren"
+
+#: ../../include/datetime.php:322
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuut"
+msgstr[1] "minuten"
+
+#: ../../include/datetime.php:325
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "seconde"
+msgstr[1] "seconden"
+
+#: ../../include/datetime.php:562
+#, php-format
+msgid "%1$s's birthday"
+msgstr "Verjaardag van %1$s"
+
+#: ../../include/datetime.php:563
+#, php-format
+msgid "Happy Birthday %1$s"
+msgstr "Gefeliciteerd met je verjaardag %1$s"
+
+#: ../../include/api.php:1327
+msgid "Public Timeline"
+msgstr "Openbare tijdlijn"
+
+#: ../../include/zot.php:697
 msgid "Invalid data packet"
 msgstr "Datapakket ongeldig"
 
-#: ../../include/zot.php:715
+#: ../../include/zot.php:713
 msgid "Unable to verify channel signature"
 msgstr "Kanaalkenmerk kon niet worden geverifieerd.  "
 
-#: ../../include/zot.php:2363
+#: ../../include/zot.php:2326
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr "Hubkenmerk voor %s kon niet worden geverifieerd"
 
-#: ../../include/zot.php:3712
+#: ../../include/zot.php:3703
 msgid "invalid target signature"
 msgstr "ongeldig doelkenmerk"
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr "Nieuwe pagina"
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr "Titel"
-
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
-msgstr "Kan mijn normale kanaalstream en berichten bekijken"
-
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
-msgstr "Kan mijn standaard kanaalprofiel bekijken"
-
-#: ../../include/permissions.php:28
-msgid "Can view my connections"
-msgstr "Kan een lijst met mijn connecties bekijken"
-
-#: ../../include/permissions.php:29
-msgid "Can view my file storage and photos"
-msgstr "Kan mijn foto's en andere bestanden bekijken"
-
-#: ../../include/permissions.php:30
-msgid "Can view my webpages"
-msgstr "Kan mijn pagina's bekijken"
-
-#: ../../include/permissions.php:33
-msgid "Can send me their channel stream and posts"
-msgstr "Kan mij de inhoud van hun kanaal en berichten sturen"
-
-#: ../../include/permissions.php:34
-msgid "Can post on my channel page (\"wall\")"
-msgstr "Kan een bericht in mijn kanaal plaatsen"
-
-#: ../../include/permissions.php:35
-msgid "Can comment on or like my posts"
-msgstr "Kan op mijn berichten reageren of deze (niet) leuk vinden"
-
-#: ../../include/permissions.php:36
-msgid "Can send me private mail messages"
-msgstr "Kan mij privéberichten sturen"
-
-#: ../../include/permissions.php:37
-msgid "Can like/dislike stuff"
-msgstr "Kan dingen leuk of niet leuk vinden"
-
-#: ../../include/permissions.php:37
-msgid "Profiles and things other than posts/comments"
-msgstr "Profielen en dingen, buiten berichten en reacties"
-
-#: ../../include/permissions.php:39
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+"
-
-#: ../../include/permissions.php:39
-msgid "Advanced - useful for creating group forum channels"
-msgstr "Geavanceerd - nuttig voor groepforums"
-
-#: ../../include/permissions.php:40
-msgid "Can chat with me (when available)"
-msgstr "Kan met mij chatten (wanneer beschikbaar)"
-
-#: ../../include/permissions.php:41
-msgid "Can write to my file storage and photos"
-msgstr "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen"
-
-#: ../../include/permissions.php:42
-msgid "Can edit my webpages"
-msgstr "Kan mijn pagina's bewerken"
-
-#: ../../include/permissions.php:44
-msgid "Can source my public posts in derived channels"
-msgstr "Kan mijn openbare berichten als bron voor andere kanalen gebruiken"
-
-#: ../../include/permissions.php:44
-msgid "Somewhat advanced - very useful in open communities"
-msgstr "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)"
-
-#: ../../include/permissions.php:46
-msgid "Can administer my channel resources"
-msgstr "Kan mijn kanaal beheren"
-
-#: ../../include/permissions.php:46
-msgid ""
-"Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet."
-
-#: ../../include/permissions.php:877
-msgid "Social Networking"
-msgstr "Sociaal netwerk"
-
-#: ../../include/permissions.php:877
-msgid "Social - Mostly Public"
-msgstr "Sociaal - Vrijwel alles openbaar"
-
-#: ../../include/permissions.php:877
-msgid "Social - Restricted"
-msgstr "Sociaal - Beperkt zichtbaar"
-
-#: ../../include/permissions.php:877
-msgid "Social - Private"
-msgstr "Sociaal - Verborgen kanaal"
-
-#: ../../include/permissions.php:878
-msgid "Community Forum"
-msgstr "Groepsforum"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Mostly Public"
-msgstr "Forum - Vrijwel alles openbaar"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Restricted"
-msgstr "Forum - Beperkt zichtbaar"
-
-#: ../../include/permissions.php:878
-msgid "Forum - Private"
-msgstr "Forum - Verborgen kanaal"
-
-#: ../../include/permissions.php:879
-msgid "Feed Republish"
-msgstr "Feed herpubliceren"
-
-#: ../../include/permissions.php:879
-msgid "Feed - Mostly Public"
-msgstr "Feed - Vrijwel alles openbaar"
-
-#: ../../include/permissions.php:879
-msgid "Feed - Restricted"
-msgstr "Feed - Beperkt zichtbaar"
-
-#: ../../include/permissions.php:880
-msgid "Special Purpose"
-msgstr "Speciaal doel"
-
-#: ../../include/permissions.php:880
-msgid "Special - Celebrity/Soapbox"
-msgstr "Speciaal - Beroemdheid/alleen volgen"
-
-#: ../../include/permissions.php:880
-msgid "Special - Group Repository"
-msgstr "Speciaal - Groepsopslag"
-
-#: ../../include/permissions.php:881
-msgid "Custom/Expert Mode"
-msgstr "Expertmodus/handmatig aanpassen"
-
-#: ../../include/activities.php:41
-msgid " and "
-msgstr " en "
-
-#: ../../include/activities.php:49
-msgid "public profile"
-msgstr "openbaar profiel"
-
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr "%1$s veranderde %2$s naar &ldquo;%3$s&rdquo;"
-
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr "Bezoek het %2$s van %1$s"
-
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr "%1$s heeft een aangepaste %2$s, %3$s veranderd."
-
-#: ../../include/bb2diaspora.php:398
-msgid "Attachments:"
-msgstr "Bijlagen:"
-
-#: ../../include/bb2diaspora.php:487
-msgid "$Projectname event notification:"
-msgstr "Notificatie $Projectname-gebeurtenis:"
-
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr "Focus (Hubzilla-standaard)"
@@ -9766,62 +9962,66 @@ msgstr "Grootte profielfoto's van berichten instellen"
 msgid "Set size of followup author photos"
 msgstr "Grootte profielfoto's van reacties instellen"
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr "Zoek %1$s (%2$s)"
 
-#: ../../boot.php:1162
+#: ../../boot.php:1163
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr "$Projectname"
 
-#: ../../boot.php:1480
+#: ../../boot.php:1481
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr "Update %s mislukt. Zie foutenlogboek."
 
-#: ../../boot.php:1483
+#: ../../boot.php:1484
 #, php-format
 msgid "Update Error at %s"
 msgstr "Update-fout op %s"
 
-#: ../../boot.php:1684
+#: ../../boot.php:1685
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla"
 
 #: ../../boot.php:1706
+msgid "Login/Email"
+msgstr "E-mailadres of inlognaam"
+
+#: ../../boot.php:1707
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../../boot.php:1707
+#: ../../boot.php:1708
 msgid "Remember me"
 msgstr "Aangemeld blijven"
 
-#: ../../boot.php:1710
+#: ../../boot.php:1711
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: ../../boot.php:2276
+#: ../../boot.php:2277
 msgid "toggle mobile"
 msgstr "mobiele weergave omschakelen"
 
-#: ../../boot.php:2425
+#: ../../boot.php:2432
 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:2428
+#: ../../boot.php:2435
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr "[hubzilla] Probleem met SSL-certificaat voor %s"
 
-#: ../../boot.php:2469
+#: ../../boot.php:2478
 msgid "Cron/Scheduled tasks not running."
 msgstr "Cron is niet actief"
 
-#: ../../boot.php:2473
+#: ../../boot.php:2482
 #, 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 4ff83f788..6cbc6425e 100644
--- a/view/nl/hstrings.php
+++ b/view/nl/hstrings.php
@@ -4,7 +4,39 @@ if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	return ($n != 1);;
 }}
-;
+App::$rtl = 0;
+App::$strings["Social Networking"] = "Sociaal netwerk";
+App::$strings["Social - Mostly Public"] = "Sociaal - Vrijwel alles openbaar";
+App::$strings["Social - Restricted"] = "Sociaal - Beperkt zichtbaar";
+App::$strings["Social - Private"] = "Sociaal - Verborgen kanaal";
+App::$strings["Community Forum"] = "Groepsforum";
+App::$strings["Forum - Mostly Public"] = "Forum - Vrijwel alles openbaar";
+App::$strings["Forum - Restricted"] = "Forum - Beperkt zichtbaar";
+App::$strings["Forum - Private"] = "Forum - Verborgen kanaal";
+App::$strings["Feed Republish"] = "Feed herpubliceren";
+App::$strings["Feed - Mostly Public"] = "Feed - Vrijwel alles openbaar";
+App::$strings["Feed - Restricted"] = "Feed - Beperkt zichtbaar";
+App::$strings["Special Purpose"] = "Speciaal doel";
+App::$strings["Special - Celebrity/Soapbox"] = "Speciaal - Beroemdheid/alleen volgen";
+App::$strings["Special - Group Repository"] = "Speciaal - Groepsopslag";
+App::$strings["Other"] = "Anders";
+App::$strings["Custom/Expert Mode"] = "Expertmodus/handmatig aanpassen";
+App::$strings["Can view my channel stream and posts"] = "Kan mijn kanaal en berichten bekijken";
+App::$strings["Can send me their channel stream and posts"] = "Kan mij de inhoud van hun kanaal en berichten sturen";
+App::$strings["Can view my default channel profile"] = "Kan mijn standaard kanaalprofiel bekijken";
+App::$strings["Can view my connections"] = "Kan een lijst met mijn connecties bekijken";
+App::$strings["Can view my file storage and photos"] = "Kan mijn foto's en andere bestanden bekijken";
+App::$strings["Can upload/modify my file storage and photos"] = "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen";
+App::$strings["Can view my channel webpages"] = "Kan de webpagina's van mijn kanaal bekijken";
+App::$strings["Can create/edit my channel webpages"] = "Kan wegpagina's van mijn kanaal aanmaken en bewerken";
+App::$strings["Can post on my channel (wall) page"] = "Kan een bericht in mijn kanaal plaatsen";
+App::$strings["Can comment on or like my posts"] = "Kan op mijn berichten reageren of deze (niet) leuk vinden";
+App::$strings["Can send me private mail messages"] = "Kan mij privéberichten sturen";
+App::$strings["Can like/dislike profiles and profile things"] = "Kan profielen en profieldingen leuk en niet leuk vinden ";
+App::$strings["Can forward to all my channel connections via @+ mentions in posts"] = "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+";
+App::$strings["Can chat with me"] = "Kan met mij chatten";
+App::$strings["Can source my public posts in derived channels"] = "Kan mijn openbare berichten als bron voor andere kanalen gebruiken";
+App::$strings["Can administer my channel"] = "Kan mijn kanaal beheren";
 App::$strings["parent"] = "omhoog";
 App::$strings["Collection"] = "map";
 App::$strings["Principal"] = "principal";
@@ -37,63 +69,8 @@ App::$strings["Remote authentication blocked. You are logged into this site loca
 App::$strings["Welcome %s. Remote authentication successful."] = "Welkom %s. Authenticatie op afstand geslaagd.";
 App::$strings["Requested profile is not available."] = "Opgevraagd profiel is niet beschikbaar";
 App::$strings["Some blurb about what to do when you're new here"] = "Welkom op \$Projectname. Klik op de tab ontdekken of klik rechtsboven op de <a href=\"directory\">kanalengids</a>, om kanalen te vinden. Rechtsboven vind je ook <a href=\"directory\">apps</a>, waar je vrijwel alle functies van \$Projectname kunt vinden. Voor <a href=\"directory\">hulp</a> met \$Projectname klik je op het vraagteken.";
-App::$strings["Block Name"] = "Bloknaam";
-App::$strings["Blocks"] = "Blokken";
-App::$strings["Block Title"] = "Bloktitel";
-App::$strings["Created"] = "Aangemaakt";
-App::$strings["Edited"] = "Bewerkt";
-App::$strings["Share"] = "Delen";
-App::$strings["View"] = "Weergeven";
-App::$strings["Channel not found."] = "Kanaal niet gevonden.";
-App::$strings["Permissions denied."] = "Permissies niet toegestaan";
-App::$strings["l, F j"] = "l j F";
-App::$strings["Link to Source"] = "Originele locatie";
-App::$strings["Edit Event"] = "Gebeurtenis bewerken";
-App::$strings["Create Event"] = "Gebeurtenis aanmaken";
-App::$strings["Previous"] = "Vorige";
-App::$strings["Next"] = "Volgende";
-App::$strings["Export"] = "Exporteren";
-App::$strings["Import"] = "Importeren";
-App::$strings["Submit"] = "Opslaan";
-App::$strings["Today"] = "Vandaag";
-App::$strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken.";
-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["Room not found"] = "Chatkanaal niet gevonden";
-App::$strings["Leave Room"] = "Chatkanaal verlaten";
-App::$strings["Delete Room"] = "Chatkanaal verwijderen";
-App::$strings["I am away right now"] = "Ik ben momenteel afwezig";
-App::$strings["I am online"] = "Ik ben online";
-App::$strings["Bookmark this room"] = "Chatkanaal aan bladwijzers toevoegen";
-App::$strings["Please enter a link URL:"] = "Vul een URL in:";
-App::$strings["Encrypt text"] = "Tekst versleutelen";
-App::$strings["Insert web link"] = "Weblink invoegen";
-App::$strings["Feature disabled."] = "Functie uitgeschakeld.";
-App::$strings["New Chatroom"] = "Nieuw chatkanaal";
-App::$strings["Chatroom name"] = "Naam chatkanaal";
-App::$strings["Expiration of chats (minutes)"] = "Aantal minuten voordat chatberichten worden verwijderd";
-App::$strings["Permissions"] = "Permissies";
-App::$strings["%1\$s's Chatrooms"] = "Chatkanalen van %1\$s";
-App::$strings["No chatrooms available"] = "Geen chatkanalen beschikbaar";
-App::$strings["Create New"] = "Nieuwe aanmaken";
-App::$strings["Expiration"] = "Verloopt na";
-App::$strings["min"] = "min";
 App::$strings["Away"] = "Afwezig";
 App::$strings["Online"] = "Online";
-App::$strings["Invalid item."] = "Ongeldig item.";
-App::$strings["Bookmark added"] = "Bladwijzer toegevoegd";
-App::$strings["My Bookmarks"] = "Mijn bladwijzers";
-App::$strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties";
-App::$strings["Continue"] = "Ga verder";
-App::$strings["Premium Channel Setup"] = "Instellen premiumkanaal ";
-App::$strings["Enable premium channel connection restrictions"] = "Restricties voor connecties van premiumkanaal toestaan";
-App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, voorschriften voor leden, enz.";
-App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:";
-App::$strings["Potential connections will then see the following text before proceeding:"] = "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:";
-App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina.";
-App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaal-eigenaar verstrekt) ";
-App::$strings["Restricted or Premium Channel"] = "Beperkt of premiumkanaal";
 App::$strings["Could not access contact record."] = "Kon geen toegang krijgen tot de connectie-gegevens.";
 App::$strings["Could not locate selected profile."] = "Kon het gekozen profiel niet vinden.";
 App::$strings["Connection updated."] = "Connectie bijgewerkt.";
@@ -158,6 +135,7 @@ App::$strings["Do not import posts with this text"] = "Importeer geen berichten
 App::$strings["This information is public!"] = "Deze informatie is openbaar!";
 App::$strings["Connection Pending Approval"] = "Connectie moet nog geaccepteerd worden";
 App::$strings["inherited"] = "geërfd";
+App::$strings["Submit"] = "Opslaan";
 App::$strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Kies het profiel dat je aan %s wil tonen wanneer hij/zij ingelogd jouw profiel wil bekijken.";
 App::$strings["Their Settings"] = "Hun instellingen";
 App::$strings["My Settings"] = "Mijn instellingen";
@@ -166,6 +144,30 @@ App::$strings["Some permissions may be inherited from your channel's <a href=\"s
 App::$strings["Some permissions may be inherited from your channel's <a href=\"settings\"><strong>privacy settings</strong></a>, which have higher priority than individual settings. You can change those settings here but they wont have any impact unless the inherited setting changes."] = "Sommige permissies worden mogelijk overgeërfd van de <a href=\"settings\">privacy-instellingen</a> van jouw kanaal, die een hogere prioriteit hebben dan deze individuele permissies. Je kan de permissies hier veranderen, maar die hebben geen effect, tenzij de overgeërfde permissies worden veranderd. ";
 App::$strings["Last update:"] = "Laatste wijziging:";
 App::$strings["Public access denied."] = "Openbare toegang geweigerd.";
+App::$strings["Item not found."] = "Item niet gevonden.";
+App::$strings["First Name"] = "Voornaam";
+App::$strings["Last Name"] = "Achternaam";
+App::$strings["Nickname"] = "Bijnaam";
+App::$strings["Full Name"] = "Volledige naam";
+App::$strings["Email"] = "E-mail";
+App::$strings["Profile Photo"] = "Profielfoto";
+App::$strings["Profile Photo 16px"] = "Profielfoto 16px";
+App::$strings["Profile Photo 32px"] = "Profielfoto 32px";
+App::$strings["Profile Photo 48px"] = "Profielfoto 48px";
+App::$strings["Profile Photo 64px"] = "Profielfoto 64px";
+App::$strings["Profile Photo 80px"] = "Profielfoto 80px";
+App::$strings["Profile Photo 128px"] = "Profielfoto 128px";
+App::$strings["Timezone"] = "Tijdzone";
+App::$strings["Homepage URL"] = "URL homepagina";
+App::$strings["Language"] = "Taal";
+App::$strings["Birth Year"] = "Geboortejaar";
+App::$strings["Birth Month"] = "Geboortemaand";
+App::$strings["Birth Day"] = "Geboortedag";
+App::$strings["Birthdate"] = "Geboortedatum";
+App::$strings["Gender"] = "Geslacht";
+App::$strings["Male"] = "Man";
+App::$strings["Female"] = "Vrouw";
+App::$strings["Channel added."] = "Kanaal toegevoegd.";
 App::$strings["%d rating"] = array(
 	0 => "%d beoordeling",
 	1 => "%d beoordelingen",
@@ -196,13 +198,74 @@ App::$strings["Reverse Alphabetic"] = "Omgekeerd alfabetisch";
 App::$strings["Newest to Oldest"] = "Nieuw naar oud";
 App::$strings["Oldest to Newest"] = "Oud naar nieuw";
 App::$strings["No entries (some entries may be hidden)."] = "Niets gevonden (sommige kanalen kunnen verborgen zijn).";
-App::$strings["Item not found."] = "Item niet gevonden.";
+App::$strings["Continue"] = "Ga verder";
+App::$strings["Premium Channel Setup"] = "Instellen premiumkanaal ";
+App::$strings["Enable premium channel connection restrictions"] = "Restricties voor connecties van premiumkanaal toestaan";
+App::$strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = "Vul je restricties of voorwaarden in, zoals een paypal-afschrift, voorschriften voor leden, enz.";
+App::$strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = "Dit kanaal kan extra stappen of het accepteren van de volgende voorwaarden vereisen, voordat de connectie wordt geaccepteerd:";
+App::$strings["Potential connections will then see the following text before proceeding:"] = "Mogelijke connecties zullen dan de volgende tekst zien voordat ze verder kunnen:";
+App::$strings["By continuing, I certify that I have complied with any instructions provided on this page."] = "Door verder te gaan ga ik automatisch akkoord met alle voorwaarden en aanwijzingen op deze pagina.";
+App::$strings["(No specific instructions have been provided by the channel owner.)"] = "(Er zijn geen speciale voorwaarden en aanwijzingen door de kanaal-eigenaar verstrekt) ";
+App::$strings["Restricted or Premium Channel"] = "Beperkt of premiumkanaal";
+App::$strings["Calendar entries imported."] = "Agenda-items geïmporteerd.";
+App::$strings["No calendar entries found."] = "Geen agenda-items gevonden.";
+App::$strings["Event can not end before it has started."] = "Gebeurtenis kan niet eindigen voordat het is begonnen";
+App::$strings["Unable to generate preview."] = "Niet in staat om voorvertoning te genereren";
+App::$strings["Event title and start time are required."] = "Titel en begintijd van gebeurtenis zijn vereist.";
+App::$strings["Event not found."] = "Gebeurtenis niet gevonden";
+App::$strings["event"] = "gebeurtenis";
+App::$strings["Edit event title"] = "Titel bewerken";
+App::$strings["Event title"] = "Titel";
+App::$strings["Required"] = "Vereist";
+App::$strings["Categories (comma-separated list)"] = "Categorieën (door komma's gescheiden lijst)";
+App::$strings["Edit Category"] = "Categorie";
+App::$strings["Category"] = "Categorie";
+App::$strings["Edit start date and time"] = "Begindatum en -tijd bewerken";
+App::$strings["Start date and time"] = "Begindatum en -tijd";
+App::$strings["Finish date and time are not known or not relevant"] = "Einddatum en -tijd zijn niet bekend of niet van toepassing";
+App::$strings["Edit finish date and time"] = "Einddatum en -tijd bewerken";
+App::$strings["Finish date and time"] = "Einddatum en -tijd";
+App::$strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt";
+App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen.";
+App::$strings["Edit Description"] = "Omschrijving bewerken";
+App::$strings["Description"] = "Omschrijving";
+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["l, F j"] = "l j F";
+App::$strings["Edit event"] = "Gebeurtenis bewerken";
+App::$strings["Delete event"] = "Gebeurtenis verwijderen";
+App::$strings["Link to Source"] = "Originele locatie";
+App::$strings["calendar"] = "agenda";
+App::$strings["Edit Event"] = "Gebeurtenis bewerken";
+App::$strings["Create Event"] = "Gebeurtenis aanmaken";
+App::$strings["Previous"] = "Vorige";
+App::$strings["Next"] = "Volgende";
+App::$strings["Export"] = "Exporteren";
+App::$strings["View"] = "Weergeven";
+App::$strings["Month"] = "Maand";
+App::$strings["Week"] = "Week";
+App::$strings["Day"] = "Dag";
+App::$strings["Today"] = "Vandaag";
+App::$strings["Event removed"] = "Gebeurtenis verwijderd";
+App::$strings["Failed to remove event"] = "Verwijderen gebeurtenis mislukt";
+App::$strings["Bookmark added"] = "Bladwijzer toegevoegd";
+App::$strings["My Bookmarks"] = "Mijn bladwijzers";
+App::$strings["My Connections Bookmarks"] = "Bladwijzers van mijn connecties";
 App::$strings["Item not found"] = "Item niet gevonden";
-App::$strings["Title (optional)"] = "Titel (optioneel)";
-App::$strings["Edit Block"] = "Blok bewerken";
-App::$strings["No channel."] = "Geen kanaal.";
-App::$strings["Common connections"] = "Veel voorkomende connecties";
-App::$strings["No connections in common."] = "Geen gemeenschappelijke connecties.";
+App::$strings["Item is not editable"] = "Item is niet te bewerken";
+App::$strings["Edit post"] = "Bericht bewerken";
+App::$strings["Photos"] = "Foto's";
+App::$strings["Cancel"] = "Annuleren";
+App::$strings["Invalid item."] = "Ongeldig item.";
+App::$strings["Channel not found."] = "Kanaal niet gevonden.";
+App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
+App::$strings["Save to Folder:"] = "Bewaar in map: ";
+App::$strings["- select -"] = "- kies map -";
+App::$strings["Save"] = "Opslaan";
 App::$strings["Blocked"] = "Geblokkeerd";
 App::$strings["Ignored"] = "Genegeerd";
 App::$strings["Hidden"] = "Verborgen";
@@ -254,51 +317,38 @@ 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["Item is not editable"] = "Item is niet te bewerken";
-App::$strings["Edit post"] = "Bericht bewerken";
-App::$strings["Calendar entries imported."] = "Agenda-items geïmporteerd.";
-App::$strings["No calendar entries found."] = "Geen agenda-items gevonden.";
-App::$strings["Event can not end before it has started."] = "Gebeurtenis kan niet eindigen voordat het is begonnen";
-App::$strings["Unable to generate preview."] = "Niet in staat om voorvertoning te genereren";
-App::$strings["Event title and start time are required."] = "Titel en begintijd van gebeurtenis zijn vereist.";
-App::$strings["Event not found."] = "Gebeurtenis niet gevonden";
-App::$strings["event"] = "gebeurtenis";
-App::$strings["Edit event title"] = "Titel bewerken";
-App::$strings["Event title"] = "Titel";
-App::$strings["Required"] = "Vereist";
-App::$strings["Categories (comma-separated list)"] = "Categorieën (door komma's gescheiden lijst)";
-App::$strings["Edit Category"] = "Categorie";
-App::$strings["Category"] = "Categorie";
-App::$strings["Edit start date and time"] = "Begindatum en -tijd bewerken";
-App::$strings["Start date and time"] = "Begindatum en -tijd";
-App::$strings["Finish date and time are not known or not relevant"] = "Einddatum en -tijd zijn niet bekend of niet van toepassing";
-App::$strings["Edit finish date and time"] = "Einddatum en -tijd bewerken";
-App::$strings["Finish date and time"] = "Einddatum en -tijd";
-App::$strings["Adjust for viewer timezone"] = "Aanpassen aan de tijdzone van wie deze gebeurtenis bekijkt";
-App::$strings["Important for events that happen in a particular place. Not practical for global holidays."] = "Belangrijk voor gebeurtenissen die op een bepaalde locatie plaatsvinden. Niet praktisch voor wereldwijde feestdagen.";
-App::$strings["Edit Description"] = "Omschrijving bewerken";
-App::$strings["Description"] = "Omschrijving";
-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";
-App::$strings["calendar"] = "agenda";
-App::$strings["Event removed"] = "Gebeurtenis verwijderd";
-App::$strings["Failed to remove event"] = "Verwijderen gebeurtenis mislukt";
-App::$strings["Photos"] = "Foto's";
-App::$strings["Cancel"] = "Annuleren";
+App::$strings["webpage"] = "Webpagina";
+App::$strings["block"] = "blok";
+App::$strings["layout"] = "lay-out";
+App::$strings["menu"] = "menu";
+App::$strings["%s element installed"] = "%s onderdeel geïnstalleerd";
+App::$strings["%s element installation failed"] = "Installatie %s-element mislukt";
+App::$strings["Permissions denied."] = "Permissies niet toegestaan";
+App::$strings["Import"] = "Importeren";
 App::$strings["This site is not a directory server"] = "Deze hub is geen kanalengidshub (directoryserver)";
 App::$strings["This directory server requires an access token"] = "Deze kanalengidshub (directoryserver) heeft een toegangs-token nodig";
-App::$strings["Save to Folder:"] = "Bewaar in map: ";
-App::$strings["- select -"] = "- kies map -";
-App::$strings["Save"] = "Opslaan";
+App::$strings["You must be logged in to see this page."] = "Je moet zijn ingelogd om deze pagina te kunnen bekijken.";
+App::$strings["Room not found"] = "Chatkanaal niet gevonden";
+App::$strings["Leave Room"] = "Chatkanaal verlaten";
+App::$strings["Delete Room"] = "Chatkanaal verwijderen";
+App::$strings["I am away right now"] = "Ik ben momenteel afwezig";
+App::$strings["I am online"] = "Ik ben online";
+App::$strings["Bookmark this room"] = "Chatkanaal aan bladwijzers toevoegen";
+App::$strings["Please enter a link URL:"] = "Vul een URL in:";
+App::$strings["Encrypt text"] = "Tekst versleutelen";
+App::$strings["Insert web link"] = "Weblink invoegen";
+App::$strings["Feature disabled."] = "Functie uitgeschakeld.";
+App::$strings["New Chatroom"] = "Nieuw chatkanaal";
+App::$strings["Chatroom name"] = "Naam chatkanaal";
+App::$strings["Expiration of chats (minutes)"] = "Aantal minuten voordat chatberichten worden verwijderd";
+App::$strings["Permissions"] = "Permissies";
+App::$strings["%1\$s's Chatrooms"] = "Chatkanalen van %1\$s";
+App::$strings["No chatrooms available"] = "Geen chatkanalen beschikbaar";
+App::$strings["Create New"] = "Nieuwe aanmaken";
+App::$strings["Expiration"] = "Verloopt na";
+App::$strings["min"] = "min";
 App::$strings["Invalid message"] = "Ongeldig bericht";
 App::$strings["no results"] = "geen resultaten";
-App::$strings["Delivery report for %1\$s"] = "Afleveringsrapport voor %1\$s";
 App::$strings["channel sync processed"] = "kanaalsync verwerkt";
 App::$strings["queued"] = "in wachtrij";
 App::$strings["posted"] = "verstuurd";
@@ -310,14 +360,14 @@ App::$strings["recipient not found"] = "ontvanger niet gevonden";
 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["Delivery report for %1\$s"] = "Afleveringsrapport voor %1\$s";
+App::$strings["Options"] = "Opties";
+App::$strings["Redeliver"] = "Opnieuw afleveren";
 App::$strings["Layout Name"] = "Naam lay-out";
 App::$strings["Layout Description (Optional)"] = "Lay-out-omschrijving (optioneel)";
 App::$strings["Edit Layout"] = "Lay-out bewerken";
 App::$strings["Page link"] = "Paginalink";
 App::$strings["Edit Webpage"] = "Webpagina bewerken";
-App::$strings["Channel added."] = "Kanaal toegevoegd.";
-App::$strings["network"] = "netwerk";
-App::$strings["RSS"] = "RSS";
 App::$strings["Privacy group created."] = "Privacygroep aangemaakt";
 App::$strings["Could not create privacy group."] = "Kon privacygroep niet aanmaken";
 App::$strings["Privacy group not found."] = "Privacygroep niet gevonden";
@@ -331,16 +381,33 @@ App::$strings["Privacy group editor"] = "Privacygroep bewerken";
 App::$strings["Members"] = "Kanalen";
 App::$strings["All Connected Channels"] = "Alle kanaalconnecties";
 App::$strings["Click on a channel to add or remove."] = "Klik op een kanaal om deze toe te voegen of te verwijderen.";
-App::$strings["Share content from Firefox to \$Projectname"] = "Deel webpagina's vanuit Firefox met ";
-App::$strings["Activate the Firefox \$Projectname provider"] = "Activeer de \$Projectname-service in Firefox";
-App::$strings["Authorize application connection"] = "Geef toestemming voor applicatiekoppeling";
-App::$strings["Return to your app and insert this Securty Code:"] = "Ga terug naar je app en voeg deze beveiligingscode in:";
-App::$strings["Please login to continue."] = "Inloggen om verder te kunnen gaan.";
-App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?";
+App::$strings["App installed."] = "App geïnstalleerd";
+App::$strings["Malformed app."] = "Misvormde app.";
+App::$strings["Embed code"] = "Insluitcode";
+App::$strings["Edit App"] = "App bewerken";
+App::$strings["Create App"] = "App maken";
+App::$strings["Name of app"] = "Naam van app";
+App::$strings["Location (URL) of app"] = "Locatie (URL) van app";
+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";
 App::$strings["Documentation Search"] = "Zoek documentatie";
 App::$strings["Help:"] = "Hulp:";
 App::$strings["Help"] = "Hulp";
 App::$strings["\$Projectname Documentation"] = "\$Projectname-documentatie";
+App::$strings["Item not available."] = "Item is niet aanwezig.";
+App::$strings["Layout updated."] = "Lay-out bijgewerkt.";
+App::$strings["Edit System Page Description"] = "Systeempagina's bewerken";
+App::$strings["Layout not found."] = "Lay-out niet gevonden.";
+App::$strings["Module Name:"] = "Modulenaam:";
+App::$strings["Layout Help"] = "Lay-out-hulp";
+App::$strings["Share content from Firefox to \$Projectname"] = "Deel webpagina's vanuit Firefox met ";
+App::$strings["Activate the Firefox \$Projectname provider"] = "Activeer de \$Projectname-service in Firefox";
+App::$strings["network"] = "netwerk";
+App::$strings["RSS"] = "RSS";
 App::$strings["Permission Denied."] = "Toegang geweigerd";
 App::$strings["File not found."] = "Bestand niet gevonden.";
 App::$strings["Edit file permissions"] = "Bestandsrechten bewerken";
@@ -352,70 +419,13 @@ App::$strings["Copy/paste this URL to link file from a web page"] = "Kopieer/pla
 App::$strings["Share this file"] = "Dit bestand delen";
 App::$strings["Show URL to this file"] = "Toon URL van dit bestand";
 App::$strings["Notify your contacts about this file"] = "Jouw connecties over dit bestand berichten";
-App::$strings["Apps"] = "Apps";
-App::$strings["Item not available."] = "Item is niet aanwezig.";
-App::$strings["Your service plan only allows %d channels."] = "Jouw abonnement staat maar %d kanalen toe.";
-App::$strings["Nothing to import."] = "Niets gevonden om te importeren";
-App::$strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden";
-App::$strings["Imported file is empty."] = "Geïmporteerde bestand is leeg";
-App::$strings["Warning: Database versions differ by %1\$d updates."] = "Waarschuwing: database-versies lopen %1\$d updates achter.";
-App::$strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt.";
-App::$strings["No channel. Import failed."] = "Geen kanaal. Importeren mislukt.";
-App::$strings["Import completed."] = "Import voltooid.";
-App::$strings["You must be logged in to use this feature."] = "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken.";
-App::$strings["Import Channel"] = "Kanaal importeren";
-App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken.";
-App::$strings["File to Upload"] = "Bestand om te uploaden";
-App::$strings["Or provide the old server/hub details"] = "Of vul de gegevens van de oude hub in";
-App::$strings["Your old identity address (xyz@example.com)"] = "Jouw oude kanaaladres (xyz@example.com)";
-App::$strings["Your old login email address"] = "Het e-mailadres van je oude account";
-App::$strings["Your old login password"] = "Wachtwoord van jouw oude account";
-App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen.";
-App::$strings["Make this hub my primary location"] = "Stel deze hub als mijn primaire locatie in";
-App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van beschikbaar servergeheugen)";
-App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid.";
-App::$strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. ";
-App::$strings["Empty post discarded."] = "Leeg bericht geannuleerd";
-App::$strings["Executable content type not permitted to this channel."] = "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal.";
-App::$strings["Duplicate post suppressed."] = "Dubbel bericht tegengehouden.";
-App::$strings["System error. Post not saved."] = "Systeemfout. Bericht niet opgeslagen.";
-App::$strings["Unable to obtain post information from database."] = "Niet in staat om informatie over dit bericht uit de database te verkrijgen.";
-App::$strings["You have reached your limit of %1$.0f top level posts."] = "Je hebt jouw limiet van %1$.0f berichten bereikt.";
-App::$strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw limiet van %1$.0f webpagina's bereikt.";
 App::$strings["Layouts"] = "Lay-outs";
 App::$strings["Comanche page description language help"] = "Hulp met de paginabeschrijvingstaal Comanche";
 App::$strings["Layout Description"] = "Lay-out-omschrijving";
+App::$strings["Created"] = "Aangemaakt";
+App::$strings["Edited"] = "Bewerkt";
+App::$strings["Share"] = "Delen";
 App::$strings["Download PDL file"] = "Download PDL-bestand";
-App::$strings["\$Projectname"] = "\$Projectname";
-App::$strings["Welcome to %s"] = "Welkom op %s";
-App::$strings["First Name"] = "Voornaam";
-App::$strings["Last Name"] = "Achternaam";
-App::$strings["Nickname"] = "Bijnaam";
-App::$strings["Full Name"] = "Volledige naam";
-App::$strings["Email"] = "E-mail";
-App::$strings["Profile Photo"] = "Profielfoto";
-App::$strings["Profile Photo 16px"] = "Profielfoto 16px";
-App::$strings["Profile Photo 32px"] = "Profielfoto 32px";
-App::$strings["Profile Photo 48px"] = "Profielfoto 48px";
-App::$strings["Profile Photo 64px"] = "Profielfoto 64px";
-App::$strings["Profile Photo 80px"] = "Profielfoto 80px";
-App::$strings["Profile Photo 128px"] = "Profielfoto 128px";
-App::$strings["Timezone"] = "Tijdzone";
-App::$strings["Homepage URL"] = "URL homepagina";
-App::$strings["Language"] = "Taal";
-App::$strings["Birth Year"] = "Geboortejaar";
-App::$strings["Birth Month"] = "Geboortemaand";
-App::$strings["Birth Day"] = "Geboortedag";
-App::$strings["Birthdate"] = "Geboortedatum";
-App::$strings["Gender"] = "Geslacht";
-App::$strings["Male"] = "Man";
-App::$strings["Female"] = "Vrouw";
-App::$strings["webpage"] = "Webpagina";
-App::$strings["block"] = "blok";
-App::$strings["layout"] = "lay-out";
-App::$strings["menu"] = "menu";
-App::$strings["%s element installed"] = "%s onderdeel geïnstalleerd";
-App::$strings["%s element installation failed"] = "Installatie %s-element mislukt";
 App::$strings["Like/Dislike"] = "Leuk/niet leuk";
 App::$strings["This action is restricted to members."] = "Deze actie kan alleen door \$Projectname-leden worden uitgevoerd.";
 App::$strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = "Je dient <a href=\"rmagic\">in te loggen met je \$Projectname-account</a> of <a href=\"register\">een nieuw \$Projectname-account aan te maken</a> om verder te kunnen gaan.";
@@ -436,175 +446,103 @@ App::$strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s is niet aanwezig
 App::$strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s is mogelijk aanwezig op %2\$s's %3\$s";
 App::$strings["Action completed."] = "Actie voltooid";
 App::$strings["Thank you."] = "Bedankt";
-App::$strings["Import completed"] = "Importeren voltooid";
-App::$strings["Import Items"] = "Importeer items";
-App::$strings["Use this form to import existing posts and content from an export file."] = "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren.";
-App::$strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden.";
-App::$strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres.";
-App::$strings["Please join us on \$Projectname"] = "Uitnodiging voor \$Projectname";
-App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder.";
-App::$strings["%s : Message delivery failed."] = "%s: Aflevering bericht mislukt.";
-App::$strings["%d message sent."] = array(
-	0 => "%d bericht verzonden.",
-	1 => "%d berichten verzonden.",
-);
-App::$strings["You have no more invitations available"] = "Je hebt geen uitnodigingen meer beschikbaar";
-App::$strings["Send invitations"] = "Uitnodigingen verzenden";
-App::$strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:";
-App::$strings["Your message:"] = "Jouw bericht:";
-App::$strings["Please join my community on \$Projectname."] = "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op \$Projectname te vergezellen. Lees meer over \$Projectname  op http://hubzilla.org";
-App::$strings["You will need to supply this invitation code:"] = "Je moet deze uitnodigingscode opgeven:";
-App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registreer je op een willekeurige \$Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):";
-App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn \$Projectname-kanaaladres in het zoekveld invullen:";
-App::$strings["or visit"] = "of bezoek";
-App::$strings["3. Click [Connect]"] = "3. Klik op [+ Verbinden]";
-App::$strings["Remote privacy information not available."] = "Privacy-informatie op afstand niet beschikbaar.";
-App::$strings["Visible to:"] = "Zichtbaar voor:";
-App::$strings["Location not found."] = "Locatie niet gevonden.";
-App::$strings["Location lookup failed."] = "Opzoeken locatie mislukt";
-App::$strings["Please select another location to become primary before removing the primary location."] = "Kies eerst een andere primaire locatie alvorens de huidige primaire locatie te verwijderen.";
-App::$strings["Syncing locations"] = "Locaties synchronizeren";
-App::$strings["No locations found."] = "Geen locaties gevonden.";
-App::$strings["Manage Channel Locations"] = "Kanaallocaties beheren";
+App::$strings["Profile not found."] = "Profiel niet gevonden.";
+App::$strings["Profile deleted."] = "Profiel verwijderd.";
+App::$strings["Profile-"] = "Profiel-";
+App::$strings["New profile created."] = "Nieuw profiel aangemaakt.";
+App::$strings["Profile unavailable to clone."] = "Profiel niet beschikbaar om te klonen";
+App::$strings["Profile unavailable to export."] = "Geen profiel beschikbaar om te exporteren";
+App::$strings["Profile Name is required."] = "Profielnaam is vereist";
+App::$strings["Marital Status"] = "Huwelijke status";
+App::$strings["Romantic Partner"] = "Romantische partner";
+App::$strings["Likes"] = "Houdt van";
+App::$strings["Dislikes"] = "Houdt niet van";
+App::$strings["Work/Employment"] = "Werk/arbeid";
+App::$strings["Religion"] = "Religie";
+App::$strings["Political Views"] = "Politieke overtuigingen";
+App::$strings["Sexual Preference"] = "Seksuele voorkeur";
+App::$strings["Homepage"] = "Homepage";
+App::$strings["Interests"] = "Interesses";
 App::$strings["Address"] = "Kanaaladres";
-App::$strings["Primary"] = "Primair";
-App::$strings["Drop"] = "Verwijderen";
-App::$strings["Sync Now"] = "Nu synchroniseren";
-App::$strings["Please wait several minutes between consecutive operations."] = "Wacht enkele minuten tussen opeenvolgende handelingen.";
-App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen.";
-App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is.";
-App::$strings["Hub not found."] = "Hub niet gevonden.";
-App::$strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
-App::$strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
-App::$strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren";
-App::$strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt.";
-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";
-App::$strings["Message has been recalled."] = "Bericht is ingetrokken.";
-App::$strings["Delete Conversation"] = "Verwijder conversatie";
-App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender.";
-App::$strings["Send Reply"] = "Antwoord versturen";
-App::$strings["Your message for %s (%s):"] = "Jouw privébericht aan %s (%s):";
-App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt.";
-App::$strings["Create a new channel"] = "Nieuw kanaal aanmaken";
-App::$strings["Channel Manager"] = "Kanaalbeheer";
-App::$strings["Current Channel"] = "Huidig kanaal";
-App::$strings["Switch to one of your channels by selecting it."] = "Activeer een van jouw andere kanalen door er op te klikken.";
-App::$strings["Default Channel"] = "Standaardkanaal";
-App::$strings["Make Default"] = "Als standaard instellen";
-App::$strings["%d new messages"] = "%d nieuwe berichten";
-App::$strings["%d new introductions"] = "%d nieuwe connectieverzoeken";
-App::$strings["Delegated Channel"] = "Uitbesteed kanaal";
-App::$strings["No valid account found."] = "Geen geldige account gevonden.";
-App::$strings["Password reset request issued. Check your email."] = "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail.";
-App::$strings["Site Member (%s)"] = "Lid van hub (%s)";
-App::$strings["Password reset requested at %s"] = "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend";
-App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt.";
-App::$strings["Password Reset"] = "Wachtwoord vergeten?";
-App::$strings["Your password has been reset as requested."] = "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht.";
-App::$strings["Your new password is"] = "Jouw nieuwe wachtwoord is";
-App::$strings["Save or copy your new password - and then"] = "Kopieer of sla je nieuwe wachtwoord op - en";
-App::$strings["click here to login"] = "klik dan hier om in te loggen";
-App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Jouw wachtwoord kan worden veranderd onder <em>instellingen</em>, nadat je succesvol bent ingelogd.";
-App::$strings["Your password has changed at %s"] = "Jouw wachtwoord op %s is veranderd";
-App::$strings["Forgot your Password?"] = "Wachtwoord vergeten?";
-App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies.";
-App::$strings["Email Address"] = "E-mailadres";
-App::$strings["Reset"] = "Opnieuw instellen";
-App::$strings["Unable to update menu."] = "Niet in staat om menu aan te passen";
-App::$strings["Unable to create menu."] = "Niet in staat om menu aan te maken.";
-App::$strings["Menu Name"] = "Menunaam";
-App::$strings["Unique name (not visible on webpage) - required"] = "Unieke naam vereist (niet zichtbaar op webpagina)";
-App::$strings["Menu Title"] = "Menutitel";
-App::$strings["Visible on webpage - leave empty for no title"] = "Zichtbaar op webpagina (leeg laten voor geen titel)";
-App::$strings["Allow Bookmarks"] = "Bladwijzers toestaan";
-App::$strings["Menu may be used to store saved bookmarks"] = "Menu kan gebruikt worden om bladwijzers in op te slaan";
-App::$strings["Submit and proceed"] = "Opslaan en doorgaan";
-App::$strings["Menus"] = "Menu's";
-App::$strings["Bookmarks allowed"] = "Bladwijzers toegestaan";
-App::$strings["Delete this menu"] = "Menu verwijderen";
-App::$strings["Edit menu contents"] = "Bewerk de inhoud van het menu";
-App::$strings["Edit this menu"] = "Dit menu bewerken";
-App::$strings["Menu could not be deleted."] = "Menu kon niet verwijderd worden.";
-App::$strings["Menu not found."] = "Menu niet gevonden.";
-App::$strings["Edit Menu"] = "Menu bewerken";
-App::$strings["Add or remove entries to this menu"] = "Items aan dit menu toevoegen of verwijder";
-App::$strings["Menu name"] = "Naam van menu";
-App::$strings["Must be unique, only seen by you"] = "Moet uniek zijn en is alleen zichtbaar voor jou.";
-App::$strings["Menu title"] = "Titel van menu";
-App::$strings["Menu title as seen by others"] = "Titel van menu zoals anderen dat zien.";
-App::$strings["Allow bookmarks"] = "Bladwijzers toestaan";
-App::$strings["Not found."] = "Niet gevonden.";
-App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s is %2\$s";
-App::$strings["Mood"] = "Stemming";
-App::$strings["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties";
-App::$strings["Profile Match"] = "Profielovereenkomst";
-App::$strings["No keywords to match. Please add keywords to your default profile."] = "Je hebt geen trefwoorden waarmee overeenkomsten gevonden kunnen worden. Voeg enkele trefwoorden aan je standaardprofiel toe.";
-App::$strings["is interested in:"] = "is geïnteresseerd in:";
-App::$strings["No matches"] = "Geen overeenkomsten";
-App::$strings["No such group"] = "Collectie niet gevonden";
-App::$strings["No such channel"] = "Niet zo'n kanaal";
-App::$strings["forum"] = "forum";
-App::$strings["Search Results For:"] = "Zoekresultaten voor:";
-App::$strings["Privacy group is empty"] = "Privacygroep is leeg";
-App::$strings["Privacy group: "] = "Privacygroep: ";
-App::$strings["Invalid connection."] = "Ongeldige connectie.";
-App::$strings["No more system notifications."] = "Geen systeemnotificaties meer.";
-App::$strings["System Notifications"] = "Systeemnotificaties";
-App::$strings["Unable to create element."] = "Niet in staat om onderdeel aan te maken.";
-App::$strings["Unable to update menu element."] = "Menu-onderdeel kan niet worden geüpdatet.";
-App::$strings["Unable to add menu element."] = "Menu-onderdeel kan niet worden toegevoegd.";
-App::$strings["Menu Item Permissions"] = "Permissies menu-item";
-App::$strings["(click to open/close)"] = "(klik om te openen/sluiten)";
-App::$strings["Link Name"] = "Linknaam";
-App::$strings["Link or Submenu Target"] = "Linkdoel of submenu-doel";
-App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Geef de URL van de link of kies een menunaam om een submenu aan te maken";
-App::$strings["Use magic-auth if available"] = "Gebruik magic-auth wanneer beschikbaar";
-App::$strings["Open link in new window"] = "Open link in nieuw venster";
-App::$strings["Order in list"] = "Volgorde in lijst";
-App::$strings["Higher numbers will sink to bottom of listing"] = "Hogere nummers komen onderaan de lijst terecht";
-App::$strings["Submit and finish"] = "Opslaan en afsluiten";
-App::$strings["Submit and continue"] = "Opslaan en doorgaan";
-App::$strings["Menu:"] = "Menu:";
-App::$strings["Link Target"] = "Linkdoel";
-App::$strings["Edit menu"] = "Menu bewerken";
-App::$strings["Edit element"] = "Onderdeel bewerken";
-App::$strings["Drop element"] = "Onderdeel verwijderen";
-App::$strings["New element"] = "Nieuw element";
-App::$strings["Edit this menu container"] = "Deze menu-container bewerken";
-App::$strings["Add menu element"] = "Menu-element toevoegen";
-App::$strings["Delete this menu item"] = "Dit menu-item verwijderen";
-App::$strings["Edit this menu item"] = "Dit menu-item bewerken";
-App::$strings["Menu item not found."] = "Menu-item niet gevonden.";
-App::$strings["Menu item deleted."] = "Menu-item verwijderd.";
-App::$strings["Menu item could not be deleted."] = "Menu-item kon niet worden verwijderd.";
-App::$strings["Edit Menu Element"] = "Menu-element bewerken";
-App::$strings["Link text"] = "Linktekst";
-App::$strings["Name or caption"] = "Naam";
-App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Voorbeelden: \"Jan Pietersen\", \"Willems weblog\", \"Computerforum\"";
-App::$strings["Choose a short nickname"] = "Korte bijnaam";
-App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Deze bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres van jouw kanaal aan te maken, die je dan met anderen kunt delen. Bijvoorbeeld: bijnaam%s";
-App::$strings["Channel role and privacy"] = "Kanaaltype en privacy";
-App::$strings["Select a channel role with your privacy requirements."] = "Kies een kanaaltype met het door jou gewenste privacyniveau.";
-App::$strings["Read more about roles"] = "Lees meer over kanaaltypes";
-App::$strings["Create Channel"] = "Kanaal aanmaken";
-App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Een kanaal is jouw identiteit in dit netwerk. Het kan bijvoorbeeld een persoon, een blog of een forum vertegenwoordigen. Door met elkaar te verbinden kunnen kanalen, met behulp van uitgebreide permissies, informatie uitwisselen.";
-App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "Of <a href=\"import\">importeer een bestaand kanaal</a> vanaf een andere locatie";
-App::$strings["Invalid request identifier."] = "Ongeldige verzoek identificator (request identifier)";
-App::$strings["Discard"] = "Annuleren";
-App::$strings["Mark all system notifications seen"] = "Markeer alle systeemnotificaties als bekeken";
+App::$strings["Profile updated."] = "Profiel bijgewerkt";
+App::$strings["Hide your connections list from viewers of this profile"] = "Laat de lijst met connecties niet aan bezoekers van dit profiel zien.";
+App::$strings["Edit Profile Details"] = "Profiel bewerken";
+App::$strings["View this profile"] = "Profiel weergeven";
+App::$strings["Edit visibility"] = "Zichtbaarheid bewerken";
+App::$strings["Profile Tools"] = "Hulpmiddelen";
+App::$strings["Change cover photo"] = "Omslagfoto wijzigen";
+App::$strings["Change profile photo"] = "Profielfoto veranderen";
+App::$strings["Create a new profile using these settings"] = "Een nieuw profiel aanmaken met dit profiel als basis";
+App::$strings["Clone this profile"] = "Dit profiel klonen";
+App::$strings["Delete this profile"] = "Dit profiel verwijderen";
+App::$strings["Add profile things"] = "Dingen aan je profiel toevoegen";
+App::$strings["Personal"] = "Persoonlijk";
+App::$strings["Relation"] = "Relatie";
+App::$strings["Miscellaneous"] = "Diversen";
+App::$strings["Import profile from file"] = "Profiel vanuit bestand importeren";
+App::$strings["Export profile to file"] = "Profiel naar bestand exporteren";
+App::$strings["Your gender"] = "Jouw geslacht";
+App::$strings["Marital status"] = "Burgerlijke staat";
+App::$strings["Sexual preference"] = "Seksuele voorkeur";
+App::$strings["Profile name"] = "Profielnaam";
+App::$strings["This is your default profile."] = "Dit is jouw standaardprofiel";
+App::$strings["Your full name"] = "Jouw volledige naam";
+App::$strings["Title/Description"] = "Titel/omschrijving";
+App::$strings["Street address"] = "Straat en huisnummer";
+App::$strings["Locality/City"] = "Woonplaats";
+App::$strings["Region/State"] = "Provincie/gewest/deelstaat";
+App::$strings["Postal/Zip code"] = "Postcode";
+App::$strings["Country"] = "Land";
+App::$strings["Who (if applicable)"] = "Wie (wanneer van toepassing)";
+App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl";
+App::$strings["Since (date)"] = "Sinds (datum)";
+App::$strings["Tell us about yourself"] = "Vertel ons iets over jezelf";
+App::$strings["Hometown"] = "Oorspronkelijk uit";
+App::$strings["Political views"] = "Politieke overtuigingen";
+App::$strings["Religious views"] = "Religieuze overtuigingen";
+App::$strings["Keywords used in directory listings"] = "Trefwoorden voor in de kanalengids";
+App::$strings["Example: fishing photography software"] = "Voorbeeld: muziek, fotografie, software";
+App::$strings["Musical interests"] = "Muzikale interesses";
+App::$strings["Books, literature"] = "Boeken/literatuur";
+App::$strings["Television"] = "Televisie";
+App::$strings["Film/Dance/Culture/Entertainment"] = "Film/dans/cultuur/entertainment";
+App::$strings["Hobbies/Interests"] = "Hobby's/interesses";
+App::$strings["Love/Romance"] = "Liefde/romantiek";
+App::$strings["School/Education"] = "School/opleiding";
+App::$strings["Contact information and social networks"] = "Contactinformatie en sociale netwerken";
+App::$strings["My other channels"] = "Mijn andere kanalen";
+App::$strings["Profile Image"] = "Profielfoto";
+App::$strings["Edit Profiles"] = "Bewerk profielen";
+App::$strings["Your service plan only allows %d channels."] = "Jouw abonnement staat maar %d kanalen toe.";
+App::$strings["Nothing to import."] = "Niets gevonden om te importeren";
+App::$strings["Unable to download data from old server"] = "Niet in staat om gegevens van de oude hub te downloaden";
+App::$strings["Imported file is empty."] = "Geïmporteerde bestand is leeg";
+App::$strings["Warning: Database versions differ by %1\$d updates."] = "Waarschuwing: database-versies lopen %1\$d updates achter.";
+App::$strings["Cloned channel not found. Import failed."] = "Gekloond kanaal niet gevonden. Importeren mislukt.";
+App::$strings["No channel. Import failed."] = "Geen kanaal. Importeren mislukt.";
+App::$strings["Import completed."] = "Import voltooid.";
+App::$strings["You must be logged in to use this feature."] = "Je moet ingelogd zijn om dit onderdeel te kunnen gebruiken.";
+App::$strings["Import Channel"] = "Kanaal importeren";
+App::$strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file."] = "Gebruik dit formulier om een bestaand kanaal te importeren van een andere hub. Je kan de kanaal-identiteit van de oude hub via het netwerk ontvangen of een exportbestand verstrekken.";
+App::$strings["File to Upload"] = "Bestand om te uploaden";
+App::$strings["Or provide the old server/hub details"] = "Of vul de gegevens van de oude hub in";
+App::$strings["Your old identity address (xyz@example.com)"] = "Jouw oude kanaaladres (xyz@example.com)";
+App::$strings["Your old login email address"] = "Het e-mailadres van je oude account";
+App::$strings["Your old login password"] = "Wachtwoord van jouw oude account";
+App::$strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = "Voor elke optie geldt dat je moet kiezen of je jouw primaire kanaaladres op deze hub wil instellen of dat jouw oude hub deze rol blijft vervullen.";
+App::$strings["Make this hub my primary location"] = "Stel deze hub als mijn primaire locatie in";
+App::$strings["Import existing posts if possible (experimental - limited by available memory"] = "Importeer bestaande berichten wanneer mogelijk (experimenteel - afhankelijk van beschikbaar servergeheugen)";
+App::$strings["This process may take several minutes to complete. Please submit the form only once and leave this page open until finished."] = "Dit proces kan enkele minuten in beslag nemen. Klik maar één keer op opslaan en verlaat deze pagina niet alvorens het proces is voltooid.";
+App::$strings["\$Projectname"] = "\$Projectname";
+App::$strings["Welcome to %s"] = "Welkom op %s";
+App::$strings["Unable to locate original post."] = "Niet in staat om de originele locatie van het bericht te vinden. ";
+App::$strings["Empty post discarded."] = "Leeg bericht geannuleerd";
+App::$strings["Executable content type not permitted to this channel."] = "Uitvoerbare bestanden zijn niet toegestaan op dit kanaal.";
+App::$strings["Duplicate post suppressed."] = "Dubbel bericht tegengehouden.";
+App::$strings["System error. Post not saved."] = "Systeemfout. Bericht niet opgeslagen.";
+App::$strings["Unable to obtain post information from database."] = "Niet in staat om informatie over dit bericht uit de database te verkrijgen.";
+App::$strings["You have reached your limit of %1$.0f top level posts."] = "Je hebt jouw limiet van %1$.0f berichten bereikt.";
+App::$strings["You have reached your limit of %1$.0f webpages."] = "Je hebt jouw limiet van %1$.0f webpagina's bereikt.";
 App::$strings["Page owner information could not be retrieved."] = "Informatie over de pagina-eigenaar werd niet ontvangen.";
 App::$strings["Profile Photos"] = "Profielfoto's";
 App::$strings["Album not found."] = "Album niet gevonden.";
@@ -673,122 +611,164 @@ App::$strings["__ctx:noun__ Dislikes"] = "vinden dit niet leuk";
 App::$strings["Close"] = "Sluiten";
 App::$strings["View Album"] = "Album weergeven";
 App::$strings["Recent Photos"] = "Recente foto's";
-App::$strings["sent you a private message"] = "stuurde jou een privébericht";
-App::$strings["added your channel"] = "voegde jouw kanaal toe";
-App::$strings["g A l F d"] = "G:i, l d F";
-App::$strings["[today]"] = "[vandaag]";
-App::$strings["posted an event"] = "plaatste een gebeurtenis";
-App::$strings["Unable to find your hub."] = "Niet in staat om je hub te vinden";
-App::$strings["Post successful."] = "Verzenden bericht geslaagd.";
-App::$strings["OpenID protocol error. No ID returned."] = "OpenID-protocolfout. Geen ID terugontvangen.";
-App::$strings["Login failed."] = "Inloggen mislukt.";
-App::$strings["Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."] = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
-App::$strings["This setting requires special processing and editing has been blocked."] = "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd.";
-App::$strings["Configuration Editor"] = "Configuratiebewerker";
-App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. ";
-App::$strings["Layout updated."] = "Lay-out bijgewerkt.";
-App::$strings["Edit System Page Description"] = "Systeempagina's bewerken";
-App::$strings["Layout not found."] = "Lay-out niet gevonden.";
-App::$strings["Module Name:"] = "Modulenaam:";
-App::$strings["Layout Help"] = "Lay-out-hulp";
-App::$strings["Poke"] = "Aanstoten";
-App::$strings["Poke somebody"] = "Iemand aanstoten";
-App::$strings["Poke/Prod"] = "Aanstoten/porren";
-App::$strings["Poke, prod or do other things to somebody"] = "Iemand bijvoorbeeld aanstoten of poren";
-App::$strings["Recipient"] = "Ontvanger";
-App::$strings["Choose what you wish to do to recipient"] = "Kies wat je met de ontvanger wil doen";
-App::$strings["Make this post private"] = "Maak dit bericht privé";
-App::$strings["Fetching URL returns error: %1\$s"] = "Ophalen URL gaf een foutmelding terug: %1\$s";
-App::$strings["Profile not found."] = "Profiel niet gevonden.";
-App::$strings["Profile deleted."] = "Profiel verwijderd.";
-App::$strings["Profile-"] = "Profiel-";
-App::$strings["New profile created."] = "Nieuw profiel aangemaakt.";
-App::$strings["Profile unavailable to clone."] = "Profiel niet beschikbaar om te klonen";
-App::$strings["Profile unavailable to export."] = "Geen profiel beschikbaar om te exporteren";
-App::$strings["Profile Name is required."] = "Profielnaam is vereist";
-App::$strings["Marital Status"] = "Huwelijke status";
-App::$strings["Romantic Partner"] = "Romantische partner";
-App::$strings["Likes"] = "Houdt van";
-App::$strings["Dislikes"] = "Houdt niet van";
-App::$strings["Work/Employment"] = "Werk/arbeid";
-App::$strings["Religion"] = "Religie";
-App::$strings["Political Views"] = "Politieke overtuigingen";
-App::$strings["Sexual Preference"] = "Seksuele voorkeur";
-App::$strings["Homepage"] = "Homepage";
-App::$strings["Interests"] = "Interesses";
-App::$strings["Profile updated."] = "Profiel bijgewerkt";
-App::$strings["Hide your connections list from viewers of this profile"] = "Laat de lijst met connecties niet aan bezoekers van dit profiel zien.";
-App::$strings["Edit Profile Details"] = "Profiel bewerken";
-App::$strings["View this profile"] = "Profiel weergeven";
-App::$strings["Edit visibility"] = "Zichtbaarheid bewerken";
-App::$strings["Profile Tools"] = "Hulpmiddelen";
-App::$strings["Change cover photo"] = "Omslagfoto wijzigen";
-App::$strings["Change profile photo"] = "Profielfoto veranderen";
-App::$strings["Create a new profile using these settings"] = "Een nieuw profiel aanmaken met dit profiel als basis";
-App::$strings["Clone this profile"] = "Dit profiel klonen";
-App::$strings["Delete this profile"] = "Dit profiel verwijderen";
-App::$strings["Add profile things"] = "Dingen aan je profiel toevoegen";
-App::$strings["Personal"] = "Persoonlijk";
-App::$strings["Relation"] = "Relatie";
-App::$strings["Miscellaneous"] = "Diversen";
-App::$strings["Import profile from file"] = "Profiel vanuit bestand importeren";
-App::$strings["Export profile to file"] = "Profiel naar bestand exporteren";
-App::$strings["Your gender"] = "Jouw geslacht";
-App::$strings["Marital status"] = "Burgerlijke staat";
-App::$strings["Sexual preference"] = "Seksuele voorkeur";
-App::$strings["Profile name"] = "Profielnaam";
-App::$strings["This is your default profile."] = "Dit is jouw standaardprofiel";
-App::$strings["Your full name"] = "Jouw volledige naam";
-App::$strings["Title/Description"] = "Titel/omschrijving";
-App::$strings["Street address"] = "Straat en huisnummer";
-App::$strings["Locality/City"] = "Woonplaats";
-App::$strings["Region/State"] = "Provincie/gewest/deelstaat";
-App::$strings["Postal/Zip code"] = "Postcode";
-App::$strings["Country"] = "Land";
-App::$strings["Who (if applicable)"] = "Wie (wanneer van toepassing)";
-App::$strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Voorbeelden: petra123, Petra Jansen, petra@voorbeeld.nl";
-App::$strings["Since (date)"] = "Sinds (datum)";
-App::$strings["Tell us about yourself"] = "Vertel ons iets over jezelf";
-App::$strings["Hometown"] = "Oorspronkelijk uit";
-App::$strings["Political views"] = "Politieke overtuigingen";
-App::$strings["Religious views"] = "Religieuze overtuigingen";
-App::$strings["Keywords used in directory listings"] = "Trefwoorden voor in de kanalengids";
-App::$strings["Example: fishing photography software"] = "Voorbeeld: muziek, fotografie, software";
-App::$strings["Musical interests"] = "Muzikale interesses";
-App::$strings["Books, literature"] = "Boeken/literatuur";
-App::$strings["Television"] = "Televisie";
-App::$strings["Film/Dance/Culture/Entertainment"] = "Film/dans/cultuur/entertainment";
-App::$strings["Hobbies/Interests"] = "Hobby's/interesses";
-App::$strings["Love/Romance"] = "Liefde/romantiek";
-App::$strings["School/Education"] = "School/opleiding";
-App::$strings["Contact information and social networks"] = "Contactinformatie en sociale netwerken";
-App::$strings["My other channels"] = "Mijn andere kanalen";
-App::$strings["Profile Image"] = "Profielfoto";
-App::$strings["Edit Profiles"] = "Bewerk profielen";
-App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven.";
-App::$strings["Upload Profile Photo"] = "Profielfoto uploaden";
-App::$strings["Invalid profile identifier."] = "Ongeldige profiel-identificator";
-App::$strings["Profile Visibility Editor"] = "Zichtbaarheid profiel ";
-App::$strings["Profile"] = "Profiel";
-App::$strings["Click on a contact to add or remove."] = "Klik op een connectie om deze toe te voegen of te verwijderen";
-App::$strings["Visible To"] = "Zichtbaar voor";
-App::$strings["Public Hubs"] = "Openbare hubs";
-App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Op de hier weergegeven hubs kan iedereen zich voor het \$Projectname-netwerk aanmelden. Alle hubs in het netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen een financiële tegemoetkoming voor bepaalde uitbreidingen. <strong>Mogelijk</strong> wordt hierover op de hub zelf meer informatie gegeven.";
-App::$strings["Hub URL"] = "Hub-URL";
-App::$strings["Access Type"] = "Toegangs-<br/>&nbsp;type";
-App::$strings["Registration Policy"] = "Registratie-<br/>&nbsp;beleid";
-App::$strings["Stats"] = "Stats";
-App::$strings["Software"] = "Software";
-App::$strings["Ratings"] = "Beoordelingen";
-App::$strings["Rate"] = "Beoordeel";
-App::$strings["Website:"] = "Website:";
-App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Kanaal op afstand [%s] (nog niet op deze hub bekend)";
-App::$strings["Rating (this information is public)"] = "Beoordeling (deze informatie is openbaar)";
-App::$strings["Optionally explain your rating (this information is public)"] = "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)";
-App::$strings["No ratings"] = "Geen beoordelingen";
-App::$strings["Rating: "] = "Beoordeling: ";
-App::$strings["Website: "] = "Website: ";
-App::$strings["Description: "] = "Omschrijving: ";
+App::$strings["Remote privacy information not available."] = "Privacy-informatie op afstand niet beschikbaar.";
+App::$strings["Visible to:"] = "Zichtbaar voor:";
+App::$strings["Import completed"] = "Importeren voltooid";
+App::$strings["Import Items"] = "Importeer items";
+App::$strings["Use this form to import existing posts and content from an export file."] = "Gebruik dit formulier om bestaande berichten en andere inhoud vanuit een exportbestand te importeren.";
+App::$strings["Total invitation limit exceeded."] = "Limiet voor aantal uitnodigingen overschreden.";
+App::$strings["%s : Not a valid email address."] = "%s : Geen geldig e-mailadres.";
+App::$strings["Please join us on \$Projectname"] = "Uitnodiging voor \$Projectname";
+App::$strings["Invitation limit exceeded. Please contact your site administrator."] = "Limiet voor aantal uitnodigingen overschreden. Neem contact op met je hub-beheerder.";
+App::$strings["%s : Message delivery failed."] = "%s: Aflevering bericht mislukt.";
+App::$strings["%d message sent."] = array(
+	0 => "%d bericht verzonden.",
+	1 => "%d berichten verzonden.",
+);
+App::$strings["You have no more invitations available"] = "Je hebt geen uitnodigingen meer beschikbaar";
+App::$strings["Send invitations"] = "Uitnodigingen verzenden";
+App::$strings["Enter email addresses, one per line:"] = "Voer e-mailadressen in, één per regel:";
+App::$strings["Your message:"] = "Jouw bericht:";
+App::$strings["Please join my community on \$Projectname."] = "Hierbij nodig ik je uit om mij, en andere vrienden en kennissen, op \$Projectname te vergezellen. Lees meer over \$Projectname  op http://hubzilla.org";
+App::$strings["You will need to supply this invitation code:"] = "Je moet deze uitnodigingscode opgeven:";
+App::$strings["1. Register at any \$Projectname location (they are all inter-connected)"] = "1. Registreer je op een willekeurige \$Projectname-hub (ze zijn allemaal onderling met elkaar verbonden):";
+App::$strings["2. Enter my \$Projectname network address into the site searchbar."] = "2. Nadat je bent ingelogd en een kanaal hebt aangemaakt kan je mijn \$Projectname-kanaaladres in het zoekveld invullen:";
+App::$strings["or visit"] = "of bezoek";
+App::$strings["3. Click [Connect]"] = "3. Klik op [+ Verbinden]";
+App::$strings["Location not found."] = "Locatie niet gevonden.";
+App::$strings["Location lookup failed."] = "Opzoeken locatie mislukt";
+App::$strings["Please select another location to become primary before removing the primary location."] = "Kies eerst een andere primaire locatie alvorens de huidige primaire locatie te verwijderen.";
+App::$strings["Syncing locations"] = "Locaties synchronizeren";
+App::$strings["No locations found."] = "Geen locaties gevonden.";
+App::$strings["Manage Channel Locations"] = "Kanaallocaties beheren";
+App::$strings["Primary"] = "Primair";
+App::$strings["Drop"] = "Verwijderen";
+App::$strings["Sync Now"] = "Nu synchroniseren";
+App::$strings["Please wait several minutes between consecutive operations."] = "Wacht enkele minuten tussen opeenvolgende handelingen.";
+App::$strings["When possible, drop a location by logging into that website/hub and removing your channel."] = "Wij adviseren, wanneer dit (nog) mogelijk is, de locatie te verwijderen door op de hub van de kloon in te loggen en het kanaal daar te verwijderen.";
+App::$strings["Use this form to drop the location if the hub is no longer operating."] = "Gebruik dit formulier om de locatie te verwijderen wanneer de hub van de kloon niet meer operationeel is.";
+App::$strings["Hub not found."] = "Hub niet gevonden.";
+App::$strings["Unable to lookup recipient."] = "Niet in staat om ontvanger op te zoeken.";
+App::$strings["Unable to communicate with requested channel."] = "Niet in staat om met het aangevraagde kanaal te communiceren.";
+App::$strings["Cannot verify requested channel."] = "Kan opgevraagd kanaal niet verifieren";
+App::$strings["Selected channel has private message restrictions. Send failed."] = "Gekozen kanaal heeft restricties voor privéberichten. Verzenden mislukt.";
+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";
+App::$strings["Message has been recalled."] = "Bericht is ingetrokken.";
+App::$strings["Delete Conversation"] = "Verwijder conversatie";
+App::$strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = "Geen veilige communicatie beschikbaar. <strong>Mogelijk</strong> kan je reageren op de kanaalpagina van de afzender.";
+App::$strings["Send Reply"] = "Antwoord versturen";
+App::$strings["Your message for %s (%s):"] = "Jouw privébericht aan %s (%s):";
+App::$strings["You have created %1$.0f of %2$.0f allowed channels."] = "Je hebt %1$.0f van totaal %2$.0f toegestane kanalen aangemaakt.";
+App::$strings["Create a new channel"] = "Nieuw kanaal aanmaken";
+App::$strings["Channel Manager"] = "Kanaalbeheer";
+App::$strings["Current Channel"] = "Huidig kanaal";
+App::$strings["Switch to one of your channels by selecting it."] = "Activeer een van jouw andere kanalen door er op te klikken.";
+App::$strings["Default Channel"] = "Standaardkanaal";
+App::$strings["Make Default"] = "Als standaard instellen";
+App::$strings["%d new messages"] = "%d nieuwe berichten";
+App::$strings["%d new introductions"] = "%d nieuwe connectieverzoeken";
+App::$strings["Delegated Channel"] = "Uitbesteed kanaal";
+App::$strings["Unable to update menu."] = "Niet in staat om menu aan te passen";
+App::$strings["Unable to create menu."] = "Niet in staat om menu aan te maken.";
+App::$strings["Menu Name"] = "Menunaam";
+App::$strings["Unique name (not visible on webpage) - required"] = "Unieke naam vereist (niet zichtbaar op webpagina)";
+App::$strings["Menu Title"] = "Menutitel";
+App::$strings["Visible on webpage - leave empty for no title"] = "Zichtbaar op webpagina (leeg laten voor geen titel)";
+App::$strings["Allow Bookmarks"] = "Bladwijzers toestaan";
+App::$strings["Menu may be used to store saved bookmarks"] = "Menu kan gebruikt worden om bladwijzers in op te slaan";
+App::$strings["Submit and proceed"] = "Opslaan en doorgaan";
+App::$strings["Menus"] = "Menu's";
+App::$strings["Bookmarks allowed"] = "Bladwijzers toegestaan";
+App::$strings["Delete this menu"] = "Menu verwijderen";
+App::$strings["Edit menu contents"] = "Bewerk de inhoud van het menu";
+App::$strings["Edit this menu"] = "Dit menu bewerken";
+App::$strings["Menu could not be deleted."] = "Menu kon niet verwijderd worden.";
+App::$strings["Menu not found."] = "Menu niet gevonden.";
+App::$strings["Edit Menu"] = "Menu bewerken";
+App::$strings["Add or remove entries to this menu"] = "Items aan dit menu toevoegen of verwijder";
+App::$strings["Menu name"] = "Naam van menu";
+App::$strings["Must be unique, only seen by you"] = "Moet uniek zijn en is alleen zichtbaar voor jou.";
+App::$strings["Menu title"] = "Titel van menu";
+App::$strings["Menu title as seen by others"] = "Titel van menu zoals anderen dat zien.";
+App::$strings["Allow bookmarks"] = "Bladwijzers toestaan";
+App::$strings["Not found."] = "Niet gevonden.";
+App::$strings["No valid account found."] = "Geen geldige account gevonden.";
+App::$strings["Password reset request issued. Check your email."] = "Het verzoek om je wachtwoord opnieuw in te stellen is behandeld. Controleer je e-mail.";
+App::$strings["Site Member (%s)"] = "Lid van hub (%s)";
+App::$strings["Password reset requested at %s"] = "Verzoek tot het opnieuw instellen van een wachtwoord op %s is ingediend";
+App::$strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = "Het verzoek kon niet worden geverifieerd. (Mogelijk heb je al eerder een verzoek ingediend.) Opnieuw instellen van wachtwoord is mislukt.";
+App::$strings["Password Reset"] = "Wachtwoord vergeten?";
+App::$strings["Your password has been reset as requested."] = "Jouw wachtwoord is opnieuw ingesteld zoals je had verzocht.";
+App::$strings["Your new password is"] = "Jouw nieuwe wachtwoord is";
+App::$strings["Save or copy your new password - and then"] = "Kopieer of sla je nieuwe wachtwoord op - en";
+App::$strings["click here to login"] = "klik dan hier om in te loggen";
+App::$strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Jouw wachtwoord kan worden veranderd onder <em>instellingen</em>, nadat je succesvol bent ingelogd.";
+App::$strings["Your password has changed at %s"] = "Jouw wachtwoord op %s is veranderd";
+App::$strings["Forgot your Password?"] = "Wachtwoord vergeten?";
+App::$strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Voer je e-mailadres in en verstuur deze om je wachtwoord opnieuw in te stellen. Controleer hierna hier je e-mail voor verdere instructies.";
+App::$strings["Email Address"] = "E-mailadres";
+App::$strings["Reset"] = "Opnieuw instellen";
+App::$strings["__ctx:mood__ %1\$s is %2\$s"] = "%1\$s is %2\$s";
+App::$strings["Mood"] = "Stemming";
+App::$strings["Set your current mood and tell your friends"] = "Noteer je huidige stemming en toon het aan je connecties";
+App::$strings["No such group"] = "Collectie niet gevonden";
+App::$strings["No such channel"] = "Niet zo'n kanaal";
+App::$strings["forum"] = "forum";
+App::$strings["Search Results For:"] = "Zoekresultaten voor:";
+App::$strings["Privacy group is empty"] = "Privacygroep is leeg";
+App::$strings["Privacy group: "] = "Privacygroep: ";
+App::$strings["Invalid connection."] = "Ongeldige connectie.";
+App::$strings["No more system notifications."] = "Geen systeemnotificaties meer.";
+App::$strings["System Notifications"] = "Systeemnotificaties";
+App::$strings["Profile Match"] = "Profielovereenkomst";
+App::$strings["No keywords to match. Please add keywords to your default profile."] = "Je hebt geen trefwoorden waarmee overeenkomsten gevonden kunnen worden. Voeg enkele trefwoorden aan je standaardprofiel toe.";
+App::$strings["is interested in:"] = "is geïnteresseerd in:";
+App::$strings["No matches"] = "Geen overeenkomsten";
+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["Unable to create element."] = "Niet in staat om onderdeel aan te maken.";
+App::$strings["Unable to update menu element."] = "Menu-onderdeel kan niet worden geüpdatet.";
+App::$strings["Unable to add menu element."] = "Menu-onderdeel kan niet worden toegevoegd.";
+App::$strings["Menu Item Permissions"] = "Permissies menu-item";
+App::$strings["(click to open/close)"] = "(klik om te openen/sluiten)";
+App::$strings["Link Name"] = "Linknaam";
+App::$strings["Link or Submenu Target"] = "Linkdoel of submenu-doel";
+App::$strings["Enter URL of the link or select a menu name to create a submenu"] = "Geef de URL van de link of kies een menunaam om een submenu aan te maken";
+App::$strings["Use magic-auth if available"] = "Gebruik magic-auth wanneer beschikbaar";
+App::$strings["Open link in new window"] = "Open link in nieuw venster";
+App::$strings["Order in list"] = "Volgorde in lijst";
+App::$strings["Higher numbers will sink to bottom of listing"] = "Hogere nummers komen onderaan de lijst terecht";
+App::$strings["Submit and finish"] = "Opslaan en afsluiten";
+App::$strings["Submit and continue"] = "Opslaan en doorgaan";
+App::$strings["Menu:"] = "Menu:";
+App::$strings["Link Target"] = "Linkdoel";
+App::$strings["Edit menu"] = "Menu bewerken";
+App::$strings["Edit element"] = "Onderdeel bewerken";
+App::$strings["Drop element"] = "Onderdeel verwijderen";
+App::$strings["New element"] = "Nieuw element";
+App::$strings["Edit this menu container"] = "Deze menu-container bewerken";
+App::$strings["Add menu element"] = "Menu-element toevoegen";
+App::$strings["Delete this menu item"] = "Dit menu-item verwijderen";
+App::$strings["Edit this menu item"] = "Dit menu-item bewerken";
+App::$strings["Menu item not found."] = "Menu-item niet gevonden.";
+App::$strings["Menu item deleted."] = "Menu-item verwijderd.";
+App::$strings["Menu item could not be deleted."] = "Menu-item kon niet worden verwijderd.";
+App::$strings["Edit Menu Element"] = "Menu-element bewerken";
+App::$strings["Link text"] = "Linktekst";
 App::$strings["Theme settings updated."] = "Thema-instellingen bijgewerkt.";
 App::$strings["# Accounts"] = "# accounts";
 App::$strings["# blocked accounts"] = "# geblokkeerde accounts";
@@ -1031,19 +1011,91 @@ App::$strings["(In addition to basic fields)"] = "(als toevoeging op de standaar
 App::$strings["All available fields"] = "Alle beschikbare velden";
 App::$strings["Custom Fields"] = "Extra (handmatig toegevoegde) velden";
 App::$strings["Create Custom Field"] = "Extra velden aanmaken";
-App::$strings["App installed."] = "App geïnstalleerd";
-App::$strings["Malformed app."] = "Misvormde app.";
-App::$strings["Embed code"] = "Insluitcode";
-App::$strings["Edit App"] = "App bewerken";
-App::$strings["Create App"] = "App maken";
-App::$strings["Name of app"] = "Naam van app";
-App::$strings["Location (URL) of app"] = "Locatie (URL) van app";
-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";
+App::$strings["Name or caption"] = "Naam";
+App::$strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\""] = "Voorbeelden: \"Jan Pietersen\", \"Willems weblog\", \"Computerforum\"";
+App::$strings["Choose a short nickname"] = "Korte bijnaam";
+App::$strings["Your nickname will be used to create an easy to remember channel address e.g. nickname%s"] = "Deze bijnaam wordt gebruikt om een makkelijk te onthouden kanaaladres van jouw kanaal aan te maken, die je dan met anderen kunt delen. Bijvoorbeeld: bijnaam%s";
+App::$strings["Channel role and privacy"] = "Kanaaltype en privacy";
+App::$strings["Select a channel role with your privacy requirements."] = "Kies een kanaaltype met het door jou gewenste privacyniveau.";
+App::$strings["Read more about roles"] = "Lees meer over kanaaltypes";
+App::$strings["Create Channel"] = "Kanaal aanmaken";
+App::$strings["A channel is your identity on this network. It can represent a person, a blog, or a forum to name a few. Channels can make connections with other channels to share information with highly detailed permissions."] = "Een kanaal is jouw identiteit in dit netwerk. Het kan bijvoorbeeld een persoon, een blog of een forum vertegenwoordigen. Door met elkaar te verbinden kunnen kanalen, met behulp van uitgebreide permissies, informatie uitwisselen.";
+App::$strings["or <a href=\"import\">import an existing channel</a> from another location."] = "Of <a href=\"import\">importeer een bestaand kanaal</a> vanaf een andere locatie";
+App::$strings["sent you a private message"] = "stuurde jou een privébericht";
+App::$strings["added your channel"] = "voegde jouw kanaal toe";
+App::$strings["g A l F d"] = "G:i, l d F";
+App::$strings["[today]"] = "[vandaag]";
+App::$strings["posted an event"] = "plaatste een gebeurtenis";
+App::$strings["Invalid request identifier."] = "Ongeldige verzoek identificator (request identifier)";
+App::$strings["Discard"] = "Annuleren";
+App::$strings["Mark all system notifications seen"] = "Markeer alle systeemnotificaties als bekeken";
+App::$strings["Poke"] = "Aanstoten";
+App::$strings["Poke somebody"] = "Iemand aanstoten";
+App::$strings["Poke/Prod"] = "Aanstoten/porren";
+App::$strings["Poke, prod or do other things to somebody"] = "Iemand bijvoorbeeld aanstoten of poren";
+App::$strings["Recipient"] = "Ontvanger";
+App::$strings["Choose what you wish to do to recipient"] = "Kies wat je met de ontvanger wil doen";
+App::$strings["Make this post private"] = "Maak dit bericht privé";
+App::$strings["Unable to find your hub."] = "Niet in staat om je hub te vinden";
+App::$strings["Post successful."] = "Verzenden bericht geslaagd.";
+App::$strings["OpenID protocol error. No ID returned."] = "OpenID-protocolfout. Geen ID terugontvangen.";
+App::$strings["Login failed."] = "Inloggen mislukt.";
+App::$strings["Invalid profile identifier."] = "Ongeldige profiel-identificator";
+App::$strings["Profile Visibility Editor"] = "Zichtbaarheid profiel ";
+App::$strings["Profile"] = "Profiel";
+App::$strings["Click on a contact to add or remove."] = "Klik op een connectie om deze toe te voegen of te verwijderen";
+App::$strings["Visible To"] = "Zichtbaar voor";
+App::$strings["This setting requires special processing and editing has been blocked."] = "Deze instelling vereist een speciaal proces  en bewerken is geblokkeerd.";
+App::$strings["Configuration Editor"] = "Configuratiebewerker";
+App::$strings["Warning: Changing some settings could render your channel inoperable. Please leave this page unless you are comfortable with and knowledgeable about how to correctly use this feature."] = "Waarschuwing: het veranderen van sommige instellingen kunnen jouw kanaal onklaar maken. Verlaat deze pagina, tenzij je weet waar je mee bezig bent en voldoende kennis bezit over hoe je deze functies moet gebruiken. ";
+App::$strings["Fetching URL returns error: %1\$s"] = "Ophalen URL gaf een foutmelding terug: %1\$s";
+App::$strings["Version %s"] = "Versie %s";
+App::$strings["Installed plugins/addons/apps:"] = "Ingeschakelde plugins en apps:";
+App::$strings["No installed plugins/addons/apps"] = "Geen ingeschakelde plugins en apps";
+App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Dit is een \$Projectname-hub - \$Projectname is een wereldwijd coöperatief netwerk van gedecentraliseerde websites (hubs) met verbeterde privacy.";
+App::$strings["Tag: "] = "Tag: ";
+App::$strings["Last background fetch: "] = "Meest recente achtergrond-fetch:";
+App::$strings["Current load average: "] = "Gemiddelde systeembelasting is nu:";
+App::$strings["Running at web location"] = "Draaiend op weblocatie";
+App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Bezoek <a href=\"http://hubzilla.org\">hubzilla.org</a> ";
+App::$strings["Bug reports and issues: please visit"] = "Bugrapporten en andere kwesties: bezoek";
+App::$strings["\$projectname issues"] = "\$projectname-issues";
+App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Voorstellen, lofbetuigingen, enz. - e-mail  \"redmatrix\" at librelist - dot com";
+App::$strings["Site Administrators"] = "Hubbeheerders: ";
+App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten.";
+App::$strings["The error message was:"] = "Het foutbericht was:";
+App::$strings["Authentication failed."] = "Authenticatie mislukt.";
+App::$strings["Remote Authentication"] = "Authenticatie op afstand";
+App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Vul jouw kanaaladres in (bijv. channel@example.com)";
+App::$strings["Authenticate"] = "Authenticeren";
+App::$strings["Public Hubs"] = "Openbare hubs";
+App::$strings["The listed hubs allow public registration for the \$Projectname network. All hubs in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some hubs may require subscription or provide tiered service plans. The hub itself <strong>may</strong> provide additional details."] = "Op de hier weergegeven hubs kan iedereen zich voor het \$Projectname-netwerk aanmelden. Alle hubs in het netwerk zijn met elkaar verbonden, dus maakt het qua lidmaatschap niet uit waar je je aanmeldt. Op sommige hubs heb je eerst goedkeuring nodig en sommige hubs vereisen een financiële tegemoetkoming voor bepaalde uitbreidingen. <strong>Mogelijk</strong> wordt hierover op de hub zelf meer informatie gegeven.";
+App::$strings["Hub URL"] = "Hub-URL";
+App::$strings["Access Type"] = "Toegangs-<br/>&nbsp;type";
+App::$strings["Registration Policy"] = "Registratie-<br/>&nbsp;beleid";
+App::$strings["Stats"] = "Stats";
+App::$strings["Software"] = "Software";
+App::$strings["Ratings"] = "Beoordelingen";
+App::$strings["Rate"] = "Beoordeel";
+App::$strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Vernieuw de pagina met shift+R of shift+F5, of leeg je browserbuffer, wanneer de nieuwe foto niet meteen wordt weergegeven.";
+App::$strings["Upload Profile Photo"] = "Profielfoto uploaden";
+App::$strings["Block Name"] = "Bloknaam";
+App::$strings["Blocks"] = "Blokken";
+App::$strings["Block Title"] = "Bloktitel";
+App::$strings["Website:"] = "Website:";
+App::$strings["Remote Channel [%s] (not yet known on this site)"] = "Kanaal op afstand [%s] (nog niet op deze hub bekend)";
+App::$strings["Rating (this information is public)"] = "Beoordeling (deze informatie is openbaar)";
+App::$strings["Optionally explain your rating (this information is public)"] = "Verklaar jouw beoordeling (niet verplicht, deze informatie is openbaar)";
+App::$strings["No ratings"] = "Geen beoordelingen";
+App::$strings["Rating: "] = "Beoordeling: ";
+App::$strings["Website: "] = "Website: ";
+App::$strings["Description: "] = "Omschrijving: ";
+App::$strings["Apps"] = "Apps";
+App::$strings["Title (optional)"] = "Titel (optioneel)";
+App::$strings["Edit Block"] = "Blok bewerken";
+App::$strings["No channel."] = "Geen kanaal.";
+App::$strings["Common connections"] = "Veel voorkomende connecties";
+App::$strings["No connections in common."] = "Geen gemeenschappelijke connecties.";
 App::$strings["Select a bookmark folder"] = "Kies een bladwijzermap";
 App::$strings["Save Bookmark"] = "Bladwijzer opslaan";
 App::$strings["URL of bookmark"] = "URL van bladwijzer";
@@ -1069,7 +1121,7 @@ App::$strings["no"] = "Nee";
 App::$strings["yes"] = "Ja";
 App::$strings["Membership on this site is by invitation only."] = "Registreren op deze \$Projectname-hub kan alleen op uitnodiging.";
 App::$strings["Register"] = "Registreren";
-App::$strings["Proceed to create your first channel"] = "Volgende stap: aanmaken van jouw eerste kanaal";
+App::$strings["This site may require email verification after submitting this form. If you are returned to a login page, please check your email for instructions."] = "Mogelijk moet op deze hub eerst jouw e-mail geverifieerd worden. Wanneer je na het indienen van dit formulier op de inlogpagina terecht komt, dan dien je jouw e-mail te controleren voor instructies. Controleer eventueel ook jouw spamfolder.";
 App::$strings["Please login."] = "Inloggen.";
 App::$strings["Account removals are not allowed within 48 hours of changing the account password."] = "Het verwijderen van een account is niet toegestaan binnen 48 uur nadat het wachtwoord is veranderd.";
 App::$strings["Remove This Account"] = "Verwijder dit account";
@@ -1086,17 +1138,23 @@ App::$strings["This channel will be completely removed from the network. "] = "D
 App::$strings["Remove this channel and all its clones from the network"] = "Dit kanaal en alle klonen hiervan uit het \$Projectname-netwerk verwijderen";
 App::$strings["By default only the instance of the channel located on this hub will be removed from the network"] = "Standaard wordt alleen het kanaal dat zich op deze hub bevindt uit het \$Projectname-netwerk verwijderd";
 App::$strings["Remove Channel"] = "Kanaal verwijderen";
-App::$strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "We hebben een probleem ontdekt tijdens het inloggen met de OpenID die je hebt verstrekt. Controleer de ID op typefouten.";
-App::$strings["The error message was:"] = "Het foutbericht was:";
-App::$strings["Authentication failed."] = "Authenticatie mislukt.";
-App::$strings["Remote Authentication"] = "Authenticatie op afstand";
-App::$strings["Enter your channel address (e.g. channel@example.com)"] = "Vul jouw kanaaladres in (bijv. channel@example.com)";
-App::$strings["Authenticate"] = "Authenticeren";
+App::$strings["Export Channel"] = "Kanaal exporteren";
+App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exporteer de basisinformatie van jouw kanaal naar een bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal.";
+App::$strings["Export Content"] = "Inhoud exporteren";
+App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exporteer informatie en recente inhoud van jouw kanaal naar een JSON-back-up, wat kan worden gebruikt om jouw kanaal te herstellen of te importeren op een andere hub. Dit slaat al jouw connecties, permissies, profielgegevens en enkele maanden aan inhoud van jouw kanaal op. Dit bestand kan ZEER groot worden. Wees geduldig - het kan enkele minuten duren voordat de download begint.";
+App::$strings["Export your posts from a given year."] = "Exporteer jouw berichten uit een bepaald jaar.";
+App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Je kan ook berichten en conversaties uit een bepaald jaar of van een bepaalde maand exporteren. Verander de datum in de adresbalk van jouw webbrowser om andere jaren en maanden te selecteren. Wanneer het exporteren mislukt (waarschijnlijk door een gebrek aan beschikbaar servergeheugen), probeer het dan nogmaals met een beperkter tijdvak.";
+App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Bezoek <a href=\"%1\$s\">%2\$s</a> om alle berichten van bijvoorbeeld dit jaar te selecteren. ";
+App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Bezoek  <a href=\"%1\$s\">%2\$s</a> om alle berichten van bijvoorbeeld januari dit jaar te selecteren.";
+App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Deze back-up-bestanden kunnen geïmporteerd of hersteld worden door op jouw hub en met jouw kanaal <a href=\"%1\$s\">%2\$s</a> te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen.";
 App::$strings["Items tagged with: %s"] = "Items getagd met %s";
 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["This channel is limited to %d tokens"] = "Dit kanaal heeft een limiet van %d tokens";
+App::$strings["Name and Password are required."] = "Naam en wachtwoord zijn vereist";
+App::$strings["Token saved."] = "Token opgeslagen.";
 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.";
@@ -1129,6 +1187,12 @@ App::$strings["Confirm New Password"] = "Nieuw wachtwoord bevestigen";
 App::$strings["Leave password fields blank unless changing"] = "Laat de wachtwoordvelden leeg, behalve wanneer je deze wil veranderen";
 App::$strings["Email Address:"] = "E-mailadres:";
 App::$strings["Remove this account including all its channels"] = "Dit account en al zijn kanalen verwijderen";
+App::$strings["Use this form to create temporary access identifiers to share things with non-members. These identities may be used in Access Control Lists and visitors may login using these credentials to access the private content."] = "Gebruik dit formulier om tijdelijke identiteiten aan te maken, waarmee je bepaalde informatie met niet-leden kan delen. Deze identiteiten kunnen onder Permissies (handmatige selectie) worden gebruikt. Gasten kunnen inloggen met onderstaande gegevens om zo toegang te krijgen tot de privéinhoud.";
+App::$strings["You may also provide <em>dropbox</em> style access links to friends and associates by adding the Login Password to any specific site URL as shown. Examples:"] = "Je kan ook <em>dropbox</em>-achtige links aan mensen geven door bovenstaand wachtwoord op onderstaande manier aan een hub-URL toe te voegen. Voorbeelden:";
+App::$strings["Guest Access Tokens"] = "Gasttoegang";
+App::$strings["Login Name"] = "Inlognaam";
+App::$strings["Login Password"] = "Wachtwoord:";
+App::$strings["Expires (yyyy-mm-dd)"] = "Geldig t/m (yyyy-mm-dd)";
 App::$strings["Additional Features"] = "Extra functies";
 App::$strings["Connector Settings"] = "Instellingen externe koppelingen";
 App::$strings["No special theme for mobile devices"] = "Geen speciaal thema voor mobiele apparaten";
@@ -1291,7 +1355,6 @@ App::$strings["GD graphics PHP module"] = "GD graphics PHP module";
 App::$strings["OpenSSL PHP module"] = "OpenSSL PHP module";
 App::$strings["mysqli or postgres PHP module"] = "mysqli or postgres PHP module";
 App::$strings["mb_string PHP module"] = "mb_string PHP module";
-App::$strings["mcrypt PHP module"] = "mcrypt PHP module";
 App::$strings["xml PHP module"] = "xml PHP module";
 App::$strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
 App::$strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Error: Apache webserver mod-rewrite module is required but not installed.";
@@ -1302,7 +1365,6 @@ App::$strings["Error: GD graphics PHP module with JPEG support required but not
 App::$strings["Error: openssl PHP module required but not installed."] = "Error: openssl PHP module required but not installed.";
 App::$strings["Error: mysqli or postgres PHP module required but neither are installed."] = "Error: mysqli or postgres PHP module required but neither are installed.";
 App::$strings["Error: mb_string PHP module required but not installed."] = "Error: mb_string PHP module required but not installed.";
-App::$strings["Error: mcrypt PHP module required but not installed."] = "Error: mcrypt PHP module required but not installed.";
 App::$strings["Error: xml PHP module required for DAV but not installed."] = "Error: xml PHP module required for DAV but not installed.";
 App::$strings["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."] = "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.";
 App::$strings["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."] = "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.";
@@ -1314,7 +1376,7 @@ App::$strings["In order to store these compiled templates, the web server needs
 App::$strings["Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder."] = "Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.";
 App::$strings["Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains."] = "Note: as a security measure, you should give the web server write access to %s only--not the template files (.tpl) that it contains.";
 App::$strings["%s is writable"] = "%s is writable";
-App::$strings["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"] = "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";
+App::$strings["This software 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"] = "This software 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";
 App::$strings["store is writable"] = "store is writable";
 App::$strings["SSL certificate cannot be validated. Fix certificate or disable https access to this site."] = "SSL certificate cannot be validated. Fix certificate or disable https access to this hub.";
 App::$strings["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!"] = "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!";
@@ -1322,6 +1384,7 @@ App::$strings["This restriction is incorporated because public posts from you ma
 App::$strings["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."] = "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.";
 App::$strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = "This can cause usability issues elsewhere (not just on your own hub) so we must insist on this requirement.";
 App::$strings["Providers are available that issue free certificates which are browser-valid."] = "Providers are available that issue free certificates which are browser-valid.";
+App::$strings["If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications."] = "If you are confident that the certificate is valid and signed by a trusted authority, check to see if you have failed to install an intermediate cert. These are not normally required by browsers, but are required for server-to-server communications.";
 App::$strings["SSL certificate validation"] = "SSL certificate validation";
 App::$strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = "Url rewrite in .htaccess is not working. Check your server configuration.Test: ";
 App::$strings["Url rewrite is working"] = "Url rewrite is working";
@@ -1333,19 +1396,20 @@ App::$strings["Files: shared with me"] = "Bestanden: met mij gedeeld";
 App::$strings["NEW"] = "NIEUW";
 App::$strings["Remove all files"] = "Verwijder alle bestanden";
 App::$strings["Remove this file"] = "Verwijder dit bestand";
-App::$strings["Version %s"] = "Versie %s";
-App::$strings["Installed plugins/addons/apps:"] = "Ingeschakelde plugins en apps:";
-App::$strings["No installed plugins/addons/apps"] = "Geen ingeschakelde plugins en apps";
-App::$strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = "Dit is een \$Projectname-hub - \$Projectname is een wereldwijd coöperatief netwerk van gedecentraliseerde websites (hubs) met verbeterde privacy.";
-App::$strings["Tag: "] = "Tag: ";
-App::$strings["Last background fetch: "] = "Meest recente achtergrond-fetch:";
-App::$strings["Current load average: "] = "Gemiddelde systeembelasting is nu:";
-App::$strings["Running at web location"] = "Draaiend op weblocatie";
-App::$strings["Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more about \$Projectname."] = "Bezoek <a href=\"http://hubzilla.org\">hubzilla.org</a> ";
-App::$strings["Bug reports and issues: please visit"] = "Bugrapporten en andere kwesties: bezoek";
-App::$strings["\$projectname issues"] = "\$projectname-issues";
-App::$strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Voorstellen, lofbetuigingen, enz. - e-mail  \"redmatrix\" at librelist - dot com";
-App::$strings["Site Administrators"] = "Hubbeheerders: ";
+App::$strings["Thing updated"] = "Ding bijgewerkt";
+App::$strings["Object store: failed"] = "Opslaan van ding mislukt";
+App::$strings["Thing added"] = "Ding toegevoegd";
+App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
+App::$strings["Show Thing"] = "Ding weergeven";
+App::$strings["item not found."] = "Item niet gevonden";
+App::$strings["Edit Thing"] = "Ding bewerken";
+App::$strings["Select a profile"] = "Kies een profiel";
+App::$strings["Post an activity"] = "Plaats een bericht";
+App::$strings["Only sends to viewers of the applicable profile"] = "Toont dit alleen aan diegene die het gekozen profiel mogen zien.";
+App::$strings["Name of thing e.g. something"] = "Naam van ding";
+App::$strings["URL of thing (optional)"] = "URL van ding (optioneel)";
+App::$strings["URL for photo of thing (optional)"] = "URL voor foto van ding (optioneel)";
+App::$strings["Add Thing to your Profile"] = "Ding aan je profiel toevoegen";
 App::$strings["Failed to create source. No channel selected."] = "Aanmaken bron mislukt. Geen kanaal geselecteerd.";
 App::$strings["Source created."] = "Bron aangemaakt.";
 App::$strings["Source updated."] = "Bron aangemaakt.";
@@ -1373,60 +1437,38 @@ App::$strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s heeft het %3\$s
 App::$strings["Tag removed"] = "Tag verwijderd";
 App::$strings["Remove Item Tag"] = "Verwijder item-tag";
 App::$strings["Select a tag to remove: "] = "Kies een tag om te verwijderen";
-App::$strings["Thing updated"] = "Ding bijgewerkt";
-App::$strings["Object store: failed"] = "Opslaan van ding mislukt";
-App::$strings["Thing added"] = "Ding toegevoegd";
-App::$strings["OBJ: %1\$s %2\$s %3\$s"] = "OBJ: %1\$s %2\$s %3\$s";
-App::$strings["Show Thing"] = "Ding weergeven";
-App::$strings["item not found."] = "Item niet gevonden";
-App::$strings["Edit Thing"] = "Ding bewerken";
-App::$strings["Select a profile"] = "Kies een profiel";
-App::$strings["Post an activity"] = "Plaats een bericht";
-App::$strings["Only sends to viewers of the applicable profile"] = "Toont dit alleen aan diegene die het gekozen profiel mogen zien.";
-App::$strings["Name of thing e.g. something"] = "Naam van ding";
-App::$strings["URL of thing (optional)"] = "URL van ding (optioneel)";
-App::$strings["URL for photo of thing (optional)"] = "URL voor foto van ding (optioneel)";
-App::$strings["Add Thing to your Profile"] = "Ding aan je profiel toevoegen";
-App::$strings["Export Channel"] = "Kanaal exporteren";
-App::$strings["Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content."] = "Exporteer de basisinformatie van jouw kanaal naar een bestand. Dit fungeert als een back-up van jouw connecties, permissies, profiel en basisgegevens, die gebruikt kan worden om op een nieuwe hub jouw gegevens te importeren. Deze back-up bevat echter niet de inhoud van jouw kanaal.";
-App::$strings["Export Content"] = "Inhoud exporteren";
-App::$strings["Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin."] = "Exporteer informatie en recente inhoud van jouw kanaal naar een JSON-back-up, wat kan worden gebruikt om jouw kanaal te herstellen of te importeren op een andere hub. Dit slaat al jouw connecties, permissies, profielgegevens en enkele maanden aan inhoud van jouw kanaal op. Dit bestand kan ZEER groot worden. Wees geduldig - het kan enkele minuten duren voordat de download begint.";
-App::$strings["Export your posts from a given year."] = "Exporteer jouw berichten uit een bepaald jaar.";
-App::$strings["You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range."] = "Je kan ook berichten en conversaties uit een bepaald jaar of van een bepaalde maand exporteren. Verander de datum in de adresbalk van jouw webbrowser om andere jaren en maanden te selecteren. Wanneer het exporteren mislukt (waarschijnlijk door een gebrek aan beschikbaar servergeheugen), probeer het dan nogmaals met een beperkter tijdvak.";
-App::$strings["To select all posts for a given year, such as this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Bezoek <a href=\"%1\$s\">%2\$s</a> om alle berichten van bijvoorbeeld dit jaar te selecteren. ";
-App::$strings["To select all posts for a given month, such as January of this year, visit <a href=\"%1\$s\">%2\$s</a>"] = "Bezoek  <a href=\"%1\$s\">%2\$s</a> om alle berichten van bijvoorbeeld januari dit jaar te selecteren.";
-App::$strings["These content files may be imported or restored by visiting <a href=\"%1\$s\">%2\$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first)."] = "Deze back-up-bestanden kunnen geïmporteerd of hersteld worden door op jouw hub en met jouw kanaal <a href=\"%1\$s\">%2\$s</a> te bezoeken. Voor het beste resultaat kan je de bestanden in chronologische volgorde importeren of herstellen.";
-App::$strings["No connections."] = "Geen connecties.";
-App::$strings["Visit %s's profile [%s]"] = "Bezoek het profiel van %s [%s]";
-App::$strings["View Connections"] = "Connecties weergeven";
-App::$strings["Source of Item"] = "Bron van item";
 App::$strings["Webpages"] = "Webpagina's";
 App::$strings["Actions"] = "Acties";
 App::$strings["Page Link"] = "Paginalink";
 App::$strings["Page Title"] = "Paginatitel";
+App::$strings["Not found"] = "Niet gevonden";
+App::$strings["Wiki"] = "Wiki";
+App::$strings["Sandbox"] = "Zandbak";
+App::$strings["\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be saved*.\""] = "\"# Wiki Sandbox\\n\\nWat er hier onder **edit** en **preview** staat *wordt niet opgeslagen*.\"";
+App::$strings["Revision Comparison"] = "Revisies vergelijken";
+App::$strings["Revert"] = "Ongedaan maken";
+App::$strings["Enter the name of your new wiki:"] = "Vul de naam in van jouw nieuwe wiki:";
+App::$strings["Enter the name of the new page:"] = "Vul de naam in van de nieuwe pagina:";
+App::$strings["Enter the new name:"] = "Vul de nieuwe naam in:";
+App::$strings["Embed image from photo albums"] = "Afbeelding uit een fotoalbum invoegen";
+App::$strings["Embed an image from your albums"] = "Afbeelding uit jouw albums invoegen";
+App::$strings["OK"] = "OK";
+App::$strings["Choose images to embed"] = "Kies afbeeldingen om in te voegen";
+App::$strings["Choose an album"] = "Kies een album";
+App::$strings["Choose a different album..."] = "Kies een ander album...";
+App::$strings["Error getting album list"] = "Fout met ophalen albumlijst";
+App::$strings["Error getting photo link"] = "Fout met ophalen fotolink";
+App::$strings["Error getting album"] = "Fout met ophalen album";
+App::$strings["No connections."] = "Geen connecties.";
+App::$strings["Visit %s's profile [%s]"] = "Bezoek het profiel van %s [%s]";
+App::$strings["View Connections"] = "Connecties weergeven";
+App::$strings["Source of Item"] = "Bron van item";
+App::$strings["Authorize application connection"] = "Geef toestemming voor applicatiekoppeling";
+App::$strings["Return to your app and insert this Securty Code:"] = "Ga terug naar je app en voeg deze beveiligingscode in:";
+App::$strings["Please login to continue."] = "Inloggen om verder te kunnen gaan.";
+App::$strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Wil je deze applicatie toestemming geven om jouw berichten en connecties te zien, en/of nieuwe berichten voor jou te plaatsen?";
 App::$strings["Xchan Lookup"] = "Xchan opzoeken";
 App::$strings["Lookup xchan beginning with (or webbie): "] = "Zoek een xchan (of webbie) die begint met:";
-App::$strings["Site Admin"] = "Hubbeheerder";
-App::$strings["Bug Report"] = "Bugrapport";
-App::$strings["View Bookmarks"] = "Bladwijzers bekijken";
-App::$strings["My Chatrooms"] = "Mijn chatkanalen";
-App::$strings["Firefox Share"] = "Firefox Share";
-App::$strings["Remote Diagnostics"] = "Diagnose op afstand";
-App::$strings["Suggest Channels"] = "Kanalen voorstellen";
-App::$strings["Login"] = "Inloggen";
-App::$strings["Grid"] = "Grid";
-App::$strings["Channel Home"] = "Jouw kanaal";
-App::$strings["Events"] = "Agenda";
-App::$strings["Directory"] = "Kanalengids";
-App::$strings["Mail"] = "Privéberichten";
-App::$strings["Chat"] = "Chatten";
-App::$strings["Probe"] = "Onderzoeken";
-App::$strings["Suggest"] = "Voorstellen";
-App::$strings["Random Channel"] = "Willekeurig kanaal";
-App::$strings["Invite"] = "Uitnodigen ";
-App::$strings["Features"] = "Extra functies";
-App::$strings["Post"] = "Bericht";
-App::$strings["Purchase"] = "Aanschaffen";
 App::$strings["Missing room name"] = "Naam chatkanaal ontbreekt";
 App::$strings["Duplicate room name"] = "Naam chatkanaal bestaat al";
 App::$strings["Invalid room specifier."] = "Ongeldige omschrijving chatkanaal";
@@ -1474,6 +1516,27 @@ App::$strings["Please visit %s to approve or reject the suggestion."] = "Bezoek
 App::$strings["[Hubzilla:Notify]"] = "[Hubzilla:Notificatie]";
 App::$strings["created a new post"] = "maakte een nieuw bericht aan";
 App::$strings["commented on %s's post"] = "gaf een reactie op een bericht van %s";
+App::$strings["Site Admin"] = "Hubbeheerder";
+App::$strings["Bug Report"] = "Bugrapport";
+App::$strings["View Bookmarks"] = "Bladwijzers bekijken";
+App::$strings["My Chatrooms"] = "Mijn chatkanalen";
+App::$strings["Firefox Share"] = "Firefox Share";
+App::$strings["Remote Diagnostics"] = "Diagnose op afstand";
+App::$strings["Suggest Channels"] = "Kanalen voorstellen";
+App::$strings["Login"] = "Inloggen";
+App::$strings["Grid"] = "Grid";
+App::$strings["Channel Home"] = "Jouw kanaal";
+App::$strings["Events"] = "Agenda";
+App::$strings["Directory"] = "Kanalengids";
+App::$strings["Mail"] = "Privéberichten";
+App::$strings["Chat"] = "Chatten";
+App::$strings["Probe"] = "Onderzoeken";
+App::$strings["Suggest"] = "Voorstellen";
+App::$strings["Random Channel"] = "Willekeurig kanaal";
+App::$strings["Invite"] = "Uitnodigen ";
+App::$strings["Features"] = "Extra functies";
+App::$strings["Post"] = "Bericht";
+App::$strings["Purchase"] = "Aanschaffen";
 App::$strings["Private Message"] = "Niet voor iedereen zichtbaar";
 App::$strings["Select"] = "Kies";
 App::$strings["Save to Folder"] = "In map opslaan";
@@ -1510,7 +1573,7 @@ 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["%s show all"] = "%s alle";
 App::$strings["Bold"] = "Vet";
 App::$strings["Italic"] = "Cursief";
 App::$strings["Underline"] = "Onderstrepen";
@@ -1519,9 +1582,93 @@ App::$strings["Code"] = "Broncode";
 App::$strings["Image"] = "Afbeelding";
 App::$strings["Insert Link"] = "Link invoegen";
 App::$strings["Video"] = "Video";
+App::$strings["Visible to your default audience"] = "Voor iedereen zichtbaar, mits niet anders ingesteld";
+App::$strings["Only me"] = "Alleen ik";
+App::$strings["Public"] = "Openbaar";
+App::$strings["Anybody in the \$Projectname network"] = "Iedereen in het \$Projectname-netwerk";
+App::$strings["Any account on %s"] = "Iedereen op %s";
+App::$strings["Any of my connections"] = "Al mijn geaccepteerde connecties";
+App::$strings["Only connections I specifically allow"] = "Alleen connecties die uitdrukkelijk door jou zijn toegestaan";
+App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Geauthenticeerde leden  (kan bezoekers van andere netwerken bevatten)";
+App::$strings["Any connections including those who haven't yet been approved"] = "Al mijn geaccepteerde en nog niet geaccepteerde connecties";
+App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Dit is de standaard privacy-instelling voor wie jouw berichten kan bekijken";
+App::$strings["This is your default setting for who can view your default channel profile"] = "Dit is de standaard privacy-instelling voor wie jouw standaardprofiel kan bekijken";
+App::$strings["This is your default setting for who can view your connections"] = "Dit is de standaard privacy-instelling voor wie een lijst met jouw connecties kan bekijken";
+App::$strings["This is your default setting for who can view your file storage and photos"] = "Dit is de standaard privacy-instelling voor wie jouw bestanden en foto's kan bekijken";
+App::$strings["This is your default setting for the audience of your webpages"] = "Dit is de standaard privacy-instelling voor wie jouw webpagina's kan bekijken";
 App::$strings["No username found in import file."] = "Geen gebruikersnaam in het importbestand gevonden.";
 App::$strings["Unable to create a unique channel address. Import failed."] = "Niet in staat om een uniek kanaaladres aan te maken. Importeren is mislukt.";
 App::$strings["Cannot locate DNS info for database server '%s'"] = "Kan DNS-informatie voor databaseserver '%s' niet vinden";
+App::$strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
+App::$strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
+App::$strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
+App::$strings["a new photo"] = "een nieuwe foto";
+App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s plaatste %2\$s op %3\$s";
+App::$strings["Photo Albums"] = "Fotoalbums";
+App::$strings["Upload New Photos"] = "Nieuwe foto's uploaden";
+App::$strings["Logout"] = "Uitloggen";
+App::$strings["End this session"] = "Beëindig deze sessie";
+App::$strings["Home"] = "Home";
+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 Profile"] = "Profiel bewerken";
+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["Bookmarks"] = "Bladwijzers";
+App::$strings["Your bookmarks"] = "Jouw bladwijzers";
+App::$strings["Your webpages"] = "Jouw webpagina's";
+App::$strings["Your wiki"] = "Jouw wiki";
+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["Inbox"] = "Postvak IN";
+App::$strings["Outbox"] = "Postvak UIT";
+App::$strings["New Message"] = "Nieuw bericht";
+App::$strings["Event Calendar"] = "Agenda";
+App::$strings["See all events"] = "Alle gebeurtenissen weergeven";
+App::$strings["Mark all events seen"] = "Markeer alle gebeurtenissen als bekeken";
+App::$strings["Manage Your Channels"] = "Beheer je kanalen";
+App::$strings["Account/Channel Settings"] = "Account-/kanaal-instellingen";
+App::$strings["Admin"] = "Beheer";
+App::$strings["Site Setup and Configuration"] = "Hub instellen en beheren";
+App::$strings["Loading..."] = "Aan het laden...";
+App::$strings["@name, #tag, ?doc, content"] = "@kanaal, #tag, inhoud, ?hulp";
+App::$strings["Please wait..."] = "Wachten aub...";
+App::$strings["view full size"] = "volledige grootte tonen";
+App::$strings["Administrator"] = "Beheerder";
+App::$strings["No Subject"] = "Geen onderwerp";
+App::$strings["Friendica"] = "Friendica";
+App::$strings["OStatus"] = "OStatus";
+App::$strings["GNU-Social"] = "GNU social";
+App::$strings["RSS/Atom"] = "RSS/Atom";
+App::$strings["Diaspora"] = "Diaspora";
+App::$strings["Facebook"] = "Facebook";
+App::$strings["Zot"] = "Zot";
+App::$strings["LinkedIn"] = "LinkedIn";
+App::$strings["XMPP/IM"] = "XMPP/IM";
+App::$strings["MySpace"] = "MySpace";
+App::$strings["New Page"] = "Nieuwe pagina";
+App::$strings["Title"] = "Titel";
 App::$strings["Categories"] = "Categorieën";
 App::$strings["Tags"] = "Tags";
 App::$strings["Keywords"] = "Trefwoorden";
@@ -1531,34 +1678,196 @@ App::$strings["want"] = "wil";
 App::$strings["wants"] = "wil";
 App::$strings["likes"] = "vindt dit leuk";
 App::$strings["dislikes"] = "vindt dit niet leuk";
-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["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen";
+App::$strings["Empty name"] = "Ontbrekende naam";
+App::$strings["Name too long"] = "Naam te lang";
+App::$strings["No account identifier"] = "Geen account-identificator";
+App::$strings["Nickname is required."] = "Bijnaam is verplicht";
+App::$strings["Reserved nickname. Please choose another."] = "Deze naam is gereserveerd. Kies een andere.";
+App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik.";
+App::$strings["Unable to retrieve created identity"] = "Niet in staat om aangemaakte identiteit te vinden";
+App::$strings["Default Profile"] = "Standaardprofiel";
+App::$strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar.";
+App::$strings["Create New Profile"] = "Nieuw profiel aanmaken";
+App::$strings["Visible to everybody"] = "Voor iedereen zichtbaar";
+App::$strings["Gender:"] = "Geslacht:";
+App::$strings["Status:"] = "Status:";
+App::$strings["Homepage:"] = "Homepagina:";
+App::$strings["Online Now"] = "Nu online";
+App::$strings["Like this channel"] = "Vind dit kanaal leuk";
+App::$strings["j F, Y"] = "F j Y";
+App::$strings["j F"] = "F j";
+App::$strings["Birthday:"] = "Geboortedatum:";
+App::$strings["for %1\$d %2\$s"] = "voor %1\$d %2\$s";
+App::$strings["Sexual Preference:"] = "Seksuele voorkeur:";
+App::$strings["Tags:"] = "Tags:";
+App::$strings["Political Views:"] = "Politieke overtuigingen:";
+App::$strings["Religion:"] = "Religie:";
+App::$strings["Hobbies/Interests:"] = "Hobby's/interesses:";
+App::$strings["Likes:"] = "Houdt van:";
+App::$strings["Dislikes:"] = "Houdt niet van:";
+App::$strings["Contact information and Social Networks:"] = "Contactinformatie en sociale netwerken:";
+App::$strings["My other channels:"] = "Mijn andere kanalen";
+App::$strings["Musical interests:"] = "Muzikale interesses:";
+App::$strings["Books, literature:"] = "Boeken, literatuur:";
+App::$strings["Television:"] = "Televisie:";
+App::$strings["Film/dance/culture/entertainment:"] = "Films/dansen/cultuur/vermaak:";
+App::$strings["Love/Romance:"] = "Liefde/romantiek:";
+App::$strings["Work/employment:"] = "Werk/beroep:";
+App::$strings["School/education:"] = "School/opleiding:";
+App::$strings["Like this thing"] = "Vind dit ding leuk";
+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["%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["Discover"] = "Ontdekken";
+App::$strings["Imported public streams"] = "Openbare streams importeren";
+App::$strings["Commented Order"] = "Nieuwe reacties bovenaan";
+App::$strings["Sort by Comment Date"] = "Berichten met nieuwe reacties bovenaan";
+App::$strings["Posted Order"] = "Nieuwe berichten bovenaan";
+App::$strings["Sort by Post Date"] = "Nieuwe berichten bovenaan";
+App::$strings["Posts that mention or involve you"] = "Alleen berichten die jou vermelden of waar je op een andere manier bij betrokken bent";
+App::$strings["Activity Stream - by date"] = "Activiteitenstroom - volgens datum";
+App::$strings["Starred"] = "Met ster";
+App::$strings["Favourite Posts"] = "Favoriete berichten";
+App::$strings["Spam"] = "Spam";
+App::$strings["Posts flagged as SPAM"] = "Berichten gemarkeerd als SPAM";
+App::$strings["Status Messages and Posts"] = "Berichten in dit kanaal";
+App::$strings["About"] = "Over";
+App::$strings["Profile Details"] = "Profiel";
+App::$strings["Files and Storage"] = "Bestanden en opslagruimte";
+App::$strings["Chatrooms"] = "Chatkanalen";
+App::$strings["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["Cannot create a duplicate channel identifier on this system. Import failed."] = "Kan geen dubbele kanaal-identificator op deze hub aanmaken. Importeren mislukt.";
 App::$strings["Channel clone failed. Import failed."] = "Het klonen van het kanaal is mislukt. Importeren mislukt.";
-App::$strings["(Unknown)"] = "(Onbekend)";
-App::$strings["Visible to anybody on the internet."] = "Voor iedereen op het internet zichtbaar.";
-App::$strings["Visible to you only."] = "Alleen voor jou zichtbaar.";
-App::$strings["Visible to anybody in this network."] = "Voor iedereen in dit netwerk zichtbaar.";
-App::$strings["Visible to anybody authenticated."] = "Voor iedereen die geauthenticeerd is zichtbaar.";
-App::$strings["Visible to anybody on %s."] = "Voor iedereen op %s zichtbaar.";
-App::$strings["Visible to all connections."] = "Voor alle connecties zichtbaar.";
-App::$strings["Visible to approved connections."] = "Voor alle geaccepteerde connecties zichtbaar.";
-App::$strings["Visible to specific connections."] = "Voor specifieke connecties zichtbaar.";
-App::$strings["Privacy group is empty."] = "Privacygroep is leeg";
-App::$strings["Privacy group: %s"] = "Privacygroep: %s";
-App::$strings["Connection not found."] = "Connectie niet gevonden.";
-App::$strings["profile photo"] = "profielfoto";
-App::$strings["No recipient provided."] = "Geen ontvanger opgegeven.";
-App::$strings["[no subject]"] = "[geen onderwerp]";
-App::$strings["Unable to determine sender."] = "Afzender kan niet bepaald worden.";
-App::$strings["Stored post could not be verified."] = "Opgeslagen bericht kon niet worden geverifieerd.";
+App::$strings["Frequently"] = "Regelmatig";
+App::$strings["Hourly"] = "Elk uur";
+App::$strings["Twice daily"] = "Twee keer per dag";
+App::$strings["Daily"] = "Dagelijks";
+App::$strings["Weekly"] = "Wekelijks";
+App::$strings["Monthly"] = "Maandelijks";
+App::$strings["Currently Male"] = "Momenteel man";
+App::$strings["Currently Female"] = "Momenteel vrouw";
+App::$strings["Mostly Male"] = "Voornamelijk man";
+App::$strings["Mostly Female"] = "Voornamelijk vrouw";
+App::$strings["Transgender"] = "Transgender";
+App::$strings["Intersex"] = "Interseksueel";
+App::$strings["Transsexual"] = "Transseksueel";
+App::$strings["Hermaphrodite"] = "Hermafrodiet";
+App::$strings["Neuter"] = "Genderneutraal";
+App::$strings["Non-specific"] = "Niet gespecificeerd";
+App::$strings["Undecided"] = "Nog niet beslist";
+App::$strings["Males"] = "Mannen";
+App::$strings["Females"] = "Vrouwen";
+App::$strings["Gay"] = "Homoseksueel";
+App::$strings["Lesbian"] = "Lesbisch";
+App::$strings["No Preference"] = "Geen voorkeur";
+App::$strings["Bisexual"] = "Biseksueel";
+App::$strings["Autosexual"] = "Autoseksueel";
+App::$strings["Abstinent"] = "Seksuele onthouding";
+App::$strings["Virgin"] = "Maagd";
+App::$strings["Deviant"] = "Afwijkend";
+App::$strings["Fetish"] = "Fetisj";
+App::$strings["Oodles"] = "Veel";
+App::$strings["Nonsexual"] = "Aseksueel";
+App::$strings["Single"] = "Alleen";
+App::$strings["Lonely"] = "Eenzaam";
+App::$strings["Available"] = "Beschikbaar";
+App::$strings["Unavailable"] = "Niet beschikbaar";
+App::$strings["Has crush"] = "Heeft een oogje op iemand";
+App::$strings["Infatuated"] = "Smoorverliefd";
+App::$strings["Dating"] = "Aan het daten";
+App::$strings["Unfaithful"] = "Ontrouw";
+App::$strings["Sex Addict"] = "Seksverslaafd";
+App::$strings["Friends/Benefits"] = "Vriendschap plus";
+App::$strings["Casual"] = "Ongebonden/vluchtig";
+App::$strings["Engaged"] = "Verloofd";
+App::$strings["Married"] = "Getrouwd";
+App::$strings["Imaginarily married"] = "Denkbeeldig getrouwd";
+App::$strings["Partners"] = "Partners";
+App::$strings["Cohabiting"] = "Samenwonend";
+App::$strings["Common law"] = "Common-law-huwelijk";
+App::$strings["Happy"] = "Gelukkig";
+App::$strings["Not looking"] = "Niet op zoek";
+App::$strings["Swinger"] = "Swinger";
+App::$strings["Betrayed"] = "Verraden";
+App::$strings["Separated"] = "Uit elkaar";
+App::$strings["Unstable"] = "Onstabiel";
+App::$strings["Divorced"] = "Gescheiden";
+App::$strings["Imaginarily divorced"] = "Denkbeeldig gescheiden";
+App::$strings["Widowed"] = "Weduwnaar/weduwe";
+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["%1\$s's bookmarks"] = "Bladwijzers van %1\$s";
+App::$strings["guest:"] = "gast:";
+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["prev"] = "vorige";
 App::$strings["first"] = "eerste";
 App::$strings["last"] = "laatste";
@@ -1568,7 +1877,6 @@ 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";
@@ -1631,385 +1939,21 @@ 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["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["Saved Folders"] = "Bewaarde mappen";
-App::$strings["Everything"] = "Alles";
-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["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["Channel is blocked on this site."] = "Kanaal is op deze hub geblokkeerd.";
-App::$strings["Channel location missing."] = "Ontbrekende kanaallocatie.";
-App::$strings["Response from remote channel was incomplete."] = "Antwoord van het kanaal op afstand was niet volledig.";
-App::$strings["Channel was deleted and no longer exists."] = "Kanaal is verwijderd en bestaat niet meer.";
-App::$strings["Protocol disabled."] = "Protocol uitgeschakeld.";
-App::$strings["Channel discovery failed."] = "Kanaal ontdekken mislukt.";
-App::$strings["Cannot connect to yourself."] = "Kan niet met jezelf verbinden";
-App::$strings["%1\$s's bookmarks"] = "Bladwijzers van %1\$s";
-App::$strings["Public Timeline"] = "Openbare tijdlijn";
-App::$strings["Image/photo"] = "Afbeelding/foto";
-App::$strings["Encrypted content"] = "Versleutelde inhoud";
-App::$strings["Install %s element: "] = "Installeer %s-element: ";
-App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren.";
-App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s";
-App::$strings["Click to open/close"] = "Klik om te openen of te sluiten";
-App::$strings["spoiler"] = "spoiler";
-App::$strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven.";
-App::$strings["$1 wrote:"] = "$1 schreef:";
-App::$strings["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["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["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 Profile"] = "Profiel bewerken";
-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["Bookmarks"] = "Bladwijzers";
-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["Loading..."] = "Aan het laden...";
-App::$strings["@name, #tag, ?doc, content"] = "@kanaal, #tag, inhoud, ?hulp";
-App::$strings["Please wait..."] = "Wachten aub...";
-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["%d invitation available"] = array(
-	0 => "%d uitnodiging beschikbaar",
-	1 => "%d uitnodigingen beschikbaar",
-);
-App::$strings["Find Channels"] = "Kanalen vinden";
-App::$strings["Enter name or interest"] = "Vul naam of interesse in";
-App::$strings["Connect/Follow"] = "Verbinden/volgen";
-App::$strings["Examples: Robert Morgenstein, Fishing"] = "Voorbeeld: Robert Morgenstein, vissen";
-App::$strings["Random Profile"] = "Willekeurig profiel";
-App::$strings["Invite Friends"] = "Vrienden uitnodigen";
-App::$strings["Advanced example: name=fred and country=iceland"] = "Geavanceerd voorbeeld (Engels): name=jan en country=nederland";
-App::$strings["%d connection in common"] = array(
-	0 => "%d gemeenschappelijke connectie",
-	1 => "%d gemeenschappelijke connecties",
-);
-App::$strings["show more"] = "meer connecties weergeven";
-App::$strings["%1\$s is now connected with %2\$s"] = "%1\$s is nu met %2\$s verbonden";
-App::$strings["%1\$s poked %2\$s"] = "%1\$s heeft %2\$s aangestoten";
-App::$strings["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["Photo Albums"] = "Fotoalbums";
-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["Frequently"] = "Regelmatig";
-App::$strings["Hourly"] = "Elk uur";
-App::$strings["Twice daily"] = "Twee keer per dag";
-App::$strings["Daily"] = "Dagelijks";
-App::$strings["Weekly"] = "Wekelijks";
-App::$strings["Monthly"] = "Maandelijks";
-App::$strings["Currently Male"] = "Momenteel man";
-App::$strings["Currently Female"] = "Momenteel vrouw";
-App::$strings["Mostly Male"] = "Voornamelijk man";
-App::$strings["Mostly Female"] = "Voornamelijk vrouw";
-App::$strings["Transgender"] = "Transgender";
-App::$strings["Intersex"] = "Interseksueel";
-App::$strings["Transsexual"] = "Transseksueel";
-App::$strings["Hermaphrodite"] = "Hermafrodiet";
-App::$strings["Neuter"] = "Genderneutraal";
-App::$strings["Non-specific"] = "Niet gespecificeerd";
-App::$strings["Other"] = "Anders";
-App::$strings["Undecided"] = "Nog niet beslist";
-App::$strings["Males"] = "Mannen";
-App::$strings["Females"] = "Vrouwen";
-App::$strings["Gay"] = "Homoseksueel";
-App::$strings["Lesbian"] = "Lesbisch";
-App::$strings["No Preference"] = "Geen voorkeur";
-App::$strings["Bisexual"] = "Biseksueel";
-App::$strings["Autosexual"] = "Autoseksueel";
-App::$strings["Abstinent"] = "Seksuele onthouding";
-App::$strings["Virgin"] = "Maagd";
-App::$strings["Deviant"] = "Afwijkend";
-App::$strings["Fetish"] = "Fetisj";
-App::$strings["Oodles"] = "Veel";
-App::$strings["Nonsexual"] = "Aseksueel";
-App::$strings["Single"] = "Alleen";
-App::$strings["Lonely"] = "Eenzaam";
-App::$strings["Available"] = "Beschikbaar";
-App::$strings["Unavailable"] = "Niet beschikbaar";
-App::$strings["Has crush"] = "Heeft een oogje op iemand";
-App::$strings["Infatuated"] = "Smoorverliefd";
-App::$strings["Dating"] = "Aan het daten";
-App::$strings["Unfaithful"] = "Ontrouw";
-App::$strings["Sex Addict"] = "Seksverslaafd";
-App::$strings["Friends/Benefits"] = "Vriendschap plus";
-App::$strings["Casual"] = "Ongebonden/vluchtig";
-App::$strings["Engaged"] = "Verloofd";
-App::$strings["Married"] = "Getrouwd";
-App::$strings["Imaginarily married"] = "Denkbeeldig getrouwd";
-App::$strings["Partners"] = "Partners";
-App::$strings["Cohabiting"] = "Samenwonend";
-App::$strings["Common law"] = "Common-law-huwelijk";
-App::$strings["Happy"] = "Gelukkig";
-App::$strings["Not looking"] = "Niet op zoek";
-App::$strings["Swinger"] = "Swinger";
-App::$strings["Betrayed"] = "Verraden";
-App::$strings["Separated"] = "Uit elkaar";
-App::$strings["Unstable"] = "Onstabiel";
-App::$strings["Divorced"] = "Gescheiden";
-App::$strings["Imaginarily divorced"] = "Denkbeeldig gescheiden";
-App::$strings["Widowed"] = "Weduwnaar/weduwe";
-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["Only me"] = "Alleen ik";
-App::$strings["Public"] = "Openbaar";
-App::$strings["Anybody in the \$Projectname network"] = "Iedereen in het \$Projectname-netwerk";
-App::$strings["Any account on %s"] = "Iedereen op %s";
-App::$strings["Any of my connections"] = "Al mijn geaccepteerde connecties";
-App::$strings["Only connections I specifically allow"] = "Alleen connecties die uitdrukkelijk door jou zijn toegestaan";
-App::$strings["Anybody authenticated (could include visitors from other networks)"] = "Geauthenticeerde leden  (kan bezoekers van andere netwerken bevatten)";
-App::$strings["Any connections including those who haven't yet been approved"] = "Al mijn geaccepteerde en nog niet geaccepteerde connecties";
-App::$strings["This is your default setting for the audience of your normal stream, and posts."] = "Dit is de standaard privacy-instelling voor wie jouw berichten kan bekijken";
-App::$strings["This is your default setting for who can view your default channel profile"] = "Dit is de standaard privacy-instelling voor wie jouw standaardprofiel kan bekijken";
-App::$strings["This is your default setting for who can view your connections"] = "Dit is de standaard privacy-instelling voor wie een lijst met jouw connecties kan bekijken";
-App::$strings["This is your default setting for who can view your file storage and photos"] = "Dit is de standaard privacy-instelling voor wie jouw bestanden en foto's kan bekijken";
-App::$strings["This is your default setting for the audience of your webpages"] = "Dit is de standaard privacy-instelling voor wie jouw webpagina's kan bekijken";
-App::$strings["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["Item was not found."] = "Item niet gevonden";
-App::$strings["No source file."] = "Geen bronbestand.";
-App::$strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden";
-App::$strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden";
-App::$strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d";
-App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt.";
-App::$strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken.";
-App::$strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt.";
-App::$strings["Path not available."] = "Pad niet beschikbaar.";
-App::$strings["Empty pathname"] = "Padnaam leeg";
-App::$strings["duplicate filename or path"] = "dubbele bestandsnaam of pad";
-App::$strings["Path not found."] = "Pad niet gevonden";
-App::$strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt.";
-App::$strings["database storage failed."] = "opslag in database mislukt.";
-App::$strings["Empty path"] = "Ontbrekend bestandspad";
-App::$strings["Unable to obtain identity information from database"] = "Niet in staat om identiteitsinformatie uit de database te verkrijgen";
-App::$strings["Empty name"] = "Ontbrekende naam";
-App::$strings["Name too long"] = "Naam te lang";
-App::$strings["No account identifier"] = "Geen account-identificator";
-App::$strings["Nickname is required."] = "Bijnaam is verplicht";
-App::$strings["Reserved nickname. Please choose another."] = "Deze naam is gereserveerd. Kies een andere.";
-App::$strings["Nickname has unsupported characters or is already being used on this site."] = "Deze naam heeft niet ondersteunde karakters of is al op deze hub in gebruik.";
-App::$strings["Unable to retrieve created identity"] = "Niet in staat om aangemaakte identiteit te vinden";
-App::$strings["Default Profile"] = "Standaardprofiel";
-App::$strings["Requested channel is not available."] = "Opgevraagd kanaal is niet beschikbaar.";
-App::$strings["Create New Profile"] = "Nieuw profiel aanmaken";
-App::$strings["Visible to everybody"] = "Voor iedereen zichtbaar";
-App::$strings["Gender:"] = "Geslacht:";
-App::$strings["Status:"] = "Status:";
-App::$strings["Homepage:"] = "Homepagina:";
-App::$strings["Online Now"] = "Nu online";
-App::$strings["Like this channel"] = "Vind dit kanaal leuk";
-App::$strings["j F, Y"] = "F j Y";
-App::$strings["j F"] = "F j";
-App::$strings["Birthday:"] = "Geboortedatum:";
-App::$strings["for %1\$d %2\$s"] = "voor %1\$d %2\$s";
-App::$strings["Sexual Preference:"] = "Seksuele voorkeur:";
-App::$strings["Tags:"] = "Tags:";
-App::$strings["Political Views:"] = "Politieke overtuigingen:";
-App::$strings["Religion:"] = "Religie:";
-App::$strings["Hobbies/Interests:"] = "Hobby's/interesses:";
-App::$strings["Likes:"] = "Houdt van:";
-App::$strings["Dislikes:"] = "Houdt niet van:";
-App::$strings["Contact information and Social Networks:"] = "Contactinformatie en sociale netwerken:";
-App::$strings["My other channels:"] = "Mijn andere kanalen";
-App::$strings["Musical interests:"] = "Muzikale interesses:";
-App::$strings["Books, literature:"] = "Boeken, literatuur:";
-App::$strings["Television:"] = "Televisie:";
-App::$strings["Film/dance/culture/entertainment:"] = "Films/dansen/cultuur/vermaak:";
-App::$strings["Love/Romance:"] = "Liefde/romantiek:";
-App::$strings["Work/employment:"] = "Werk/beroep:";
-App::$strings["School/education:"] = "School/opleiding:";
-App::$strings["Like this thing"] = "Vind dit ding leuk";
+App::$strings["Logged out."] = "Uitgelogd.";
+App::$strings["Failed authentication"] = "Mislukte authenticatie";
+App::$strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken";
+App::$strings["Can view my webpages"] = "Kan mijn pagina's bekijken";
+App::$strings["Can post on my channel page (\"wall\")"] = "Kan een bericht in mijn kanaal plaatsen";
+App::$strings["Can like/dislike stuff"] = "Kan dingen leuk of niet leuk vinden";
+App::$strings["Profiles and things other than posts/comments"] = "Profielen en dingen, buiten berichten en reacties";
+App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+";
+App::$strings["Advanced - useful for creating group forum channels"] = "Geavanceerd - nuttig voor groepforums";
+App::$strings["Can chat with me (when available)"] = "Kan met mij chatten (wanneer beschikbaar)";
+App::$strings["Can write to my file storage and photos"] = "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen";
+App::$strings["Can edit my webpages"] = "Kan mijn pagina's bewerken";
+App::$strings["Somewhat advanced - very useful in open communities"] = "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)";
+App::$strings["Can administer my channel resources"] = "Kan mijn kanaal beheren";
+App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet.";
 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";
@@ -2021,6 +1965,7 @@ App::$strings["Profile Import/Export"] = "Profiel importen/exporteren";
 App::$strings["Save and load profile details across sites/channels"] = "Profielgegevens opslaan en in andere hubs/kanalen gebruiken.";
 App::$strings["Web Pages"] = "Webpagina's";
 App::$strings["Provide managed web pages on your channel"] = "Sta beheerde webpagina's op jouw kanaal toe";
+App::$strings["Provide a wiki for your channel"] = "Voeg een wiki aan jouw kanaal toe";
 App::$strings["Hide Rating"] = "Beoordelingen verbergen";
 App::$strings["Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else."] = "Verbergt de beoordelingsknoppen op jouw kanaal- en profielpagina's. Let op: Mensen kunnen jou nog steeds ergens anders beoordelen. ";
 App::$strings["Private Notes"] = "Privé-aantekeningen";
@@ -2054,6 +1999,7 @@ 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";
@@ -2071,6 +2017,7 @@ App::$strings["Post Categories"] = "Categorieën berichten";
 App::$strings["Add categories to your posts"] = "Voeg categorieën toe aan je berichten";
 App::$strings["Emoji Reactions"] = "Emoji-reacties";
 App::$strings["Add emoji reaction ability to posts"] = "Emoji-reacties in berichten toestaan";
+App::$strings["Saved Folders"] = "Bewaarde mappen";
 App::$strings["Ability to file posts under folders"] = "Mogelijkheid om berichten in mappen op te slaan";
 App::$strings["Dislike Posts"] = "Vind berichten niet leuk";
 App::$strings["Ability to dislike posts/comments"] = "Mogelijkheid om berichten en reacties niet leuk te vinden";
@@ -2078,63 +2025,149 @@ App::$strings["Star Posts"] = "Geef berichten een ster";
 App::$strings["Ability to mark special posts with a star indicator"] = "Mogelijkheid om speciale berichten met een ster te markeren";
 App::$strings["Tag Cloud"] = "Tagwolk";
 App::$strings["Provide a personal tag cloud on your channel page"] = "Zorgt voor een persoonlijke wolk met tags op jouw kanaalpagina";
-App::$strings["Embedded content"] = "Ingesloten (embedded) inhoud";
-App::$strings["Embedding disabled"] = "Insluiten (embedding) uitgeschakeld";
-App::$strings["Who can see this?"] = "Wie kan dit zien?";
-App::$strings["Custom selection"] = "Handmatige selectie";
-App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Kies \"Tonen\" om weergave toe te staan.  Met \"Niet tonen\" kan je uitzonderingen maken op \"Tonen\".";
-App::$strings["Show"] = "Tonen";
-App::$strings["Don't show"] = "Niet tonen";
-App::$strings["Other networks and post services"] = "Andere netwerken en diensten";
-App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.</br />Met deze permissies bepaal je wie het bericht kan zien.";
-App::$strings["Logged out."] = "Uitgelogd.";
-App::$strings["Failed authentication"] = "Mislukte authenticatie";
-App::$strings["Birthday"] = "Verjaardag of geboortedatum";
-App::$strings["Age: "] = "Leeftijd:";
-App::$strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-DD of MM-DD";
-App::$strings["never"] = "nooit";
-App::$strings["less than a second ago"] = "minder dan een seconde geleden";
-App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s geleden";
-App::$strings["__ctx:relative_date__ year"] = array(
-	0 => "jaar",
-	1 => "jaren",
-);
-App::$strings["__ctx:relative_date__ month"] = array(
-	0 => "maand",
-	1 => "maanden",
-);
-App::$strings["__ctx:relative_date__ week"] = array(
-	0 => "week",
-	1 => "weken",
-);
-App::$strings["__ctx:relative_date__ day"] = array(
-	0 => "dag",
-	1 => "dagen",
-);
-App::$strings["__ctx:relative_date__ hour"] = array(
-	0 => "uur",
-	1 => "uren",
-);
-App::$strings["__ctx:relative_date__ minute"] = array(
-	0 => "minuut",
-	1 => "minuten",
-);
-App::$strings["__ctx:relative_date__ second"] = array(
-	0 => "seconde",
-	1 => "seconden",
-);
-App::$strings["%1\$s's birthday"] = "Verjaardag van %1\$s";
-App::$strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s";
 App::$strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Een verwijderde collectie met deze naam is gereactiveerd. Bestaande itemrechten  <strong>kunnen</strong> van toepassing zijn op deze collectie en toekomstige leden. Wanneer je dit niet zo bedoeld hebt, moet je een nieuwe collectie met een andere naam aanmaken.";
 App::$strings["Add new connections to this privacy group"] = "Voeg nieuwe connecties aan deze privacygroep toe";
 App::$strings["edit"] = "bewerken";
 App::$strings["Edit group"] = "Privacygroep bewerken";
 App::$strings["Add privacy group"] = "Privacygroep toevoegen";
 App::$strings["Channels not in any privacy group"] = "Kanalen die zich in geen enkele privacygroep bevinden";
+App::$strings["add"] = "toevoegen";
+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["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["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["Channel is blocked on this site."] = "Kanaal is op deze hub geblokkeerd.";
+App::$strings["Channel location missing."] = "Ontbrekende kanaallocatie.";
+App::$strings["Response from remote channel was incomplete."] = "Antwoord van het kanaal op afstand was niet volledig.";
+App::$strings["Channel was deleted and no longer exists."] = "Kanaal is verwijderd en bestaat niet meer.";
+App::$strings["Protocol disabled."] = "Protocol uitgeschakeld.";
+App::$strings["Channel discovery failed."] = "Kanaal ontdekken mislukt.";
+App::$strings["Cannot connect to yourself."] = "Kan niet met jezelf verbinden";
+App::$strings["Item was not found."] = "Item niet gevonden";
+App::$strings["No source file."] = "Geen bronbestand.";
+App::$strings["Cannot locate file to replace"] = "Kan het te vervangen bestand niet vinden";
+App::$strings["Cannot locate file to revise/update"] = "Kan het bestand wat aangepast moet worden niet vinden";
+App::$strings["File exceeds size limit of %d"] = "Bestand is groter dan de toegelaten %d";
+App::$strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = "Je hebt jouw limiet van %1$.0f MB opslagruimte voor bijlagen bereikt.";
+App::$strings["File upload failed. Possible system limit or action terminated."] = "Uploaden van bestand mislukt. Mogelijk systeemlimiet bereikt of actie afgebroken.";
+App::$strings["Stored file could not be verified. Upload failed."] = "Opgeslagen bestand kon niet worden geverifieerd. Uploaden mislukt.";
+App::$strings["Path not available."] = "Pad niet beschikbaar.";
+App::$strings["Empty pathname"] = "Padnaam leeg";
+App::$strings["duplicate filename or path"] = "dubbele bestandsnaam of pad";
+App::$strings["Path not found."] = "Pad niet gevonden";
+App::$strings["mkdir failed."] = "directory aanmaken (mkdir) mislukt.";
+App::$strings["database storage failed."] = "opslag in database mislukt.";
+App::$strings["Empty path"] = "Ontbrekend bestandspad";
+App::$strings["Image/photo"] = "Afbeelding/foto";
+App::$strings["Encrypted content"] = "Versleutelde inhoud";
+App::$strings["Install %s element: "] = "Installeer %s-element: ";
+App::$strings["This post contains an installable %s element, however you lack permissions to install it on this site."] = "Dit bericht heeft een te installeren %s-element, maar je hebt geen permissies om het op deze hub te installeren.";
+App::$strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s schreef het volgende %2\$s %3\$s";
+App::$strings["Click to open/close"] = "Klik om te openen of te sluiten";
+App::$strings["spoiler"] = "spoiler";
+App::$strings["Different viewers will see this text differently"] = "Deze tekst wordt per persoon anders weergeven.";
+App::$strings["$1 wrote:"] = "$1 schreef:";
+App::$strings["(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["Embedded content"] = "Ingesloten (embedded) inhoud";
+App::$strings["Embedding disabled"] = "Insluiten (embedding) uitgeschakeld";
+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["Everything"] = "Alles";
+App::$strings["Archives"] = "Archieven";
+App::$strings["Refresh"] = "Vernieuwen";
+App::$strings["Account settings"] = "Account";
+App::$strings["Channel settings"] = "Kanaal";
+App::$strings["Additional features"] = "Extra functies";
+App::$strings["Feature/Addon settings"] = "Plugin-instellingen";
+App::$strings["Display settings"] = "Weergave";
+App::$strings["Manage locations"] = "Locaties beheren";
+App::$strings["Export channel"] = "Kanaal exporteren";
+App::$strings["Connected apps"] = "Verbonden applicaties";
+App::$strings["Premium Channel Settings"] = "Instellingen premiumkanaal";
+App::$strings["Private Mail Menu"] = "Privéberichten";
+App::$strings["Combined View"] = "Gecombineerd postvak";
+App::$strings["Conversations"] = "Conversaties";
+App::$strings["Received Messages"] = "Ontvangen berichten";
+App::$strings["Sent Messages"] = "Verzonden berichten";
+App::$strings["No messages."] = "Geen berichten";
+App::$strings["Delete conversation"] = "Verwijder conversatie";
+App::$strings["Events Tools"] = "Agenda-hulpmiddelen";
+App::$strings["Export Calendar"] = "Exporteren";
+App::$strings["Import Calendar"] = "Importeren";
+App::$strings["Overview"] = "Overzicht";
+App::$strings["Chat Members"] = "Chatleden";
+App::$strings["Wiki List"] = "Wiki's";
+App::$strings["Wiki Pages"] = "Wikipagina's";
+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["Member registrations waiting for confirmation"] = "Accounts die op goedkeuring wachten";
+App::$strings["Inspect queue"] = "Inspecteer berichtenwachtrij";
+App::$strings["DB updates"] = "Database-updates";
+App::$strings["Plugin Features"] = "Plugin-opties";
+App::$strings[" 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["Attachments:"] = "Bijlagen:";
+App::$strings["\$Projectname event notification:"] = "Notificatie \$Projectname-gebeurtenis:";
 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["%s show less"] = "%s minder reacties weergeven";
+App::$strings["%s expand"] = "%s uitklappen";
+App::$strings["%s collapse"] = "%s inklappen";
 App::$strings["Password too short"] = "Wachtwoord te kort";
 App::$strings["Passwords do not match"] = "Wachtwoorden komen niet overeen";
 App::$strings["everybody"] = "iedereen";
@@ -2189,72 +2222,78 @@ App::$strings["__ctx:calendar__ month"] = "maand";
 App::$strings["__ctx:calendar__ week"] = "week";
 App::$strings["__ctx:calendar__ day"] = "dag";
 App::$strings["__ctx:calendar__ All day"] = "hele dag";
-App::$strings["view full size"] = "volledige grootte tonen";
-App::$strings["No Subject"] = "Geen onderwerp";
-App::$strings["Friendica"] = "Friendica";
-App::$strings["OStatus"] = "OStatus";
-App::$strings["GNU-Social"] = "GNU social";
-App::$strings["RSS/Atom"] = "RSS/Atom";
-App::$strings["Diaspora"] = "Diaspora";
-App::$strings["Facebook"] = "Facebook";
-App::$strings["Zot"] = "Zot";
-App::$strings["LinkedIn"] = "LinkedIn";
-App::$strings["XMPP/IM"] = "XMPP/IM";
-App::$strings["MySpace"] = "MySpace";
-App::$strings["Image exceeds website size limit of %lu bytes"] = "Afbeelding is groter dan op deze hub toegestane limiet van %lu bytes";
-App::$strings["Image file is empty."] = "Afbeeldingsbestand is leeg";
-App::$strings["Photo storage failed."] = "Foto kan niet worden opgeslagen";
-App::$strings["a new photo"] = "een nieuwe foto";
-App::$strings["__ctx:photo_upload__ %1\$s posted %2\$s to %3\$s"] = "%1\$s plaatste %2\$s op %3\$s";
-App::$strings["Upload New Photos"] = "Nieuwe foto's uploaden";
+App::$strings["%d invitation available"] = array(
+	0 => "%d uitnodiging beschikbaar",
+	1 => "%d uitnodigingen beschikbaar",
+);
+App::$strings["Find Channels"] = "Kanalen vinden";
+App::$strings["Enter name or interest"] = "Vul naam of interesse in";
+App::$strings["Connect/Follow"] = "Verbinden/volgen";
+App::$strings["Examples: Robert Morgenstein, Fishing"] = "Voorbeeld: Robert Morgenstein, vissen";
+App::$strings["Random Profile"] = "Willekeurig profiel";
+App::$strings["Invite Friends"] = "Vrienden uitnodigen";
+App::$strings["Advanced example: name=fred and country=iceland"] = "Geavanceerd voorbeeld (Engels): name=jan en country=nederland";
+App::$strings["%d connection in common"] = array(
+	0 => "%d gemeenschappelijke connectie",
+	1 => "%d gemeenschappelijke connecties",
+);
+App::$strings["show more"] = "meer connecties weergeven";
+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["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["Who can see this?"] = "Wie kan dit zien?";
+App::$strings["Custom selection"] = "Handmatige selectie";
+App::$strings["Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit the scope of \"Show\"."] = "Kies \"Tonen\" om weergave toe te staan.  Met \"Niet tonen\" kan je uitzonderingen maken op \"Tonen\".";
+App::$strings["Show"] = "Tonen";
+App::$strings["Don't show"] = "Niet tonen";
+App::$strings["Other networks and post services"] = "Andere netwerken en diensten";
+App::$strings["Post permissions %s cannot be changed %s after a post is shared.</br />These permissions set who is allowed to view the post."] = "Permissies van berichten %s zijn niet meer te veranderen %s nadat een bericht is gedeeld.</br />Met deze permissies bepaal je wie het bericht kan zien.";
+App::$strings["Birthday"] = "Verjaardag of geboortedatum";
+App::$strings["Age: "] = "Leeftijd:";
+App::$strings["YYYY-MM-DD or MM-DD"] = "JJJJ-MM-DD of MM-DD";
+App::$strings["never"] = "nooit";
+App::$strings["less than a second ago"] = "minder dan een seconde geleden";
+App::$strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = "%1\$d %2\$s geleden";
+App::$strings["__ctx:relative_date__ year"] = array(
+	0 => "jaar",
+	1 => "jaren",
+);
+App::$strings["__ctx:relative_date__ month"] = array(
+	0 => "maand",
+	1 => "maanden",
+);
+App::$strings["__ctx:relative_date__ week"] = array(
+	0 => "week",
+	1 => "weken",
+);
+App::$strings["__ctx:relative_date__ day"] = array(
+	0 => "dag",
+	1 => "dagen",
+);
+App::$strings["__ctx:relative_date__ hour"] = array(
+	0 => "uur",
+	1 => "uren",
+);
+App::$strings["__ctx:relative_date__ minute"] = array(
+	0 => "minuut",
+	1 => "minuten",
+);
+App::$strings["__ctx:relative_date__ second"] = array(
+	0 => "seconde",
+	1 => "seconden",
+);
+App::$strings["%1\$s's birthday"] = "Verjaardag van %1\$s";
+App::$strings["Happy Birthday %1\$s"] = "Gefeliciteerd met je verjaardag %1\$s";
+App::$strings["Public Timeline"] = "Openbare tijdlijn";
 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["New Page"] = "Nieuwe pagina";
-App::$strings["Title"] = "Titel";
-App::$strings["Can view my normal stream and posts"] = "Kan mijn normale kanaalstream en berichten bekijken";
-App::$strings["Can view my default channel profile"] = "Kan mijn standaard kanaalprofiel bekijken";
-App::$strings["Can view my connections"] = "Kan een lijst met mijn connecties bekijken";
-App::$strings["Can view my file storage and photos"] = "Kan mijn foto's en andere bestanden bekijken";
-App::$strings["Can view my webpages"] = "Kan mijn pagina's bekijken";
-App::$strings["Can send me their channel stream and posts"] = "Kan mij de inhoud van hun kanaal en berichten sturen";
-App::$strings["Can post on my channel page (\"wall\")"] = "Kan een bericht in mijn kanaal plaatsen";
-App::$strings["Can comment on or like my posts"] = "Kan op mijn berichten reageren of deze (niet) leuk vinden";
-App::$strings["Can send me private mail messages"] = "Kan mij privéberichten sturen";
-App::$strings["Can like/dislike stuff"] = "Kan dingen leuk of niet leuk vinden";
-App::$strings["Profiles and things other than posts/comments"] = "Profielen en dingen, buiten berichten en reacties";
-App::$strings["Can forward to all my channel contacts via post @mentions"] = "Kan naar al mijn kanaalconnecties berichten doorsturen met behulp van @vermeldingen+";
-App::$strings["Advanced - useful for creating group forum channels"] = "Geavanceerd - nuttig voor groepforums";
-App::$strings["Can chat with me (when available)"] = "Kan met mij chatten (wanneer beschikbaar)";
-App::$strings["Can write to my file storage and photos"] = "Kan foto's en andere bestanden aan mijn bestandsopslag toevoegen";
-App::$strings["Can edit my webpages"] = "Kan mijn pagina's bewerken";
-App::$strings["Can source my public posts in derived channels"] = "Kan mijn openbare berichten als bron voor andere kanalen gebruiken";
-App::$strings["Somewhat advanced - very useful in open communities"] = "Enigszins geavanceerd (erg nuttig voor kanalen van forums/groepen)";
-App::$strings["Can administer my channel resources"] = "Kan mijn kanaal beheren";
-App::$strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Zeer geavanceerd. Laat dit met rust, behalve als je weet wat je doet.";
-App::$strings["Social Networking"] = "Sociaal netwerk";
-App::$strings["Social - Mostly Public"] = "Sociaal - Vrijwel alles openbaar";
-App::$strings["Social - Restricted"] = "Sociaal - Beperkt zichtbaar";
-App::$strings["Social - Private"] = "Sociaal - Verborgen kanaal";
-App::$strings["Community Forum"] = "Groepsforum";
-App::$strings["Forum - Mostly Public"] = "Forum - Vrijwel alles openbaar";
-App::$strings["Forum - Restricted"] = "Forum - Beperkt zichtbaar";
-App::$strings["Forum - Private"] = "Forum - Verborgen kanaal";
-App::$strings["Feed Republish"] = "Feed herpubliceren";
-App::$strings["Feed - Mostly Public"] = "Feed - Vrijwel alles openbaar";
-App::$strings["Feed - Restricted"] = "Feed - Beperkt zichtbaar";
-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[" 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["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";
@@ -2294,6 +2333,7 @@ App::$strings["__ctx:opensearch__ \$Projectname"] = "\$Projectname";
 App::$strings["Update %s failed. See error logs."] = "Update %s mislukt. Zie foutenlogboek.";
 App::$strings["Update Error at %s"] = "Update-fout op %s";
 App::$strings["Create an account to access services and applications within the Hubzilla"] = "Maak een account aan om toegang te krijgen tot diensten en toepassingen van Hubzilla";
+App::$strings["Login/Email"] = "E-mailadres of inlognaam";
 App::$strings["Password"] = "Wachtwoord";
 App::$strings["Remember me"] = "Aangemeld blijven";
 App::$strings["Forgot your password?"] = "Wachtwoord vergeten?";
diff --git a/view/pdl/mod_events.pdl b/view/pdl/mod_events.pdl
index a3bc0c019..8347d4c59 100644
--- a/view/pdl/mod_events.pdl
+++ b/view/pdl/mod_events.pdl
@@ -1,5 +1,4 @@
 [region=aside]
-[widget=eventsmenu][/widget]
 [widget=eventstools][/widget]
 [widget=tasklist][/widget]
 [/region]
diff --git a/view/php/default.php b/view/php/default.php
index ad6b7a3d1..f5be4fa35 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -5,7 +5,7 @@
   <script>var baseurl="<?php echo z_root() ?>";</script>
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
-<body>
+<body <?php if($page['direction']) echo 'dir="rtl"' ?> >
 	<?php if(x($page,'banner')) echo $page['banner']; ?>
 	<header><?php if(x($page,'header')) echo $page['header']; ?></header>
 	<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 648b144b3..46aadaa7d 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -10,9 +10,10 @@ head_add_css('view/css/conversation.css');
 head_add_css('view/css/widgets.css');
 head_add_css('view/css/colorbox.css');
 head_add_css('library/justifiedGallery/justifiedGallery.min.css');
+head_add_css('library/Text_Highlighter/sample.css');	
 
 head_add_js('jquery.js');
-//head_add_js('jquery-migrate-1.1.1.js');
+//head_add_js('jquery.migrate-3.0.0.js');
 head_add_js('library/justifiedGallery/jquery.justifiedGallery.min.js');
 head_add_js('library/sprintf.js/dist/sprintf.min.js');
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 30b0cebb4..6cc3e2f10 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1136,18 +1136,31 @@ margin-right: 50px;
 	list-style-type: none;
 }
 
+.generic-icons {
+	font-size: 1.2em;
+	color: $toolicon_colour;
+	margin-right: 7px;
+}
+
+.generic-icons:hover {
+	color: $toolicon_colour;
+}
+
 .admin-icons {
 	font-size: 1.2em;
 	color: $toolicon_colour;
-	margin-right: 10px;
+	margin-right: 7px;
 }
 
+.drop-icons,
 a .drop-icons {
 	color: $toolicon_colour;
 	font-size: 1.2em;
 	text-decoration: none;
+	cursor: pointer;
 }
- 
+
+.drop-icons:hover,
 a .drop-icons:hover {
 	color: #FF0000;
 }
@@ -1403,9 +1416,6 @@ img.mail-conv-sender-photo {
 	display: block;
 	border-top: 1px dashed #ccc;
 	text-align: center;
-	font-size: $body_font_size;
-	color: $link_colour;
-	cursor: pointer;	
 }
 
 .divgrow-showmore:hover {
@@ -1645,6 +1655,7 @@ main.fullscreen .section-content-wrapper-np {
 	display: none;
 }
 
+.atoken-index-row:hover td,
 .chatroom-index-row:hover td,
 .locs-index-row:hover td,
 [id^="cloud-index-"]:hover td,
@@ -2020,3 +2031,13 @@ dl.bb-dl > dd > li {
 .help-searchlist a {
 	font-size: 130%;
 }
+
+.embed-photo-selected-photo {
+    border-color: blue;
+    border-style: solid;
+    border-width: 5px;
+}
+
+#wiki-preview img {
+    max-width: 100%;
+}
\ No newline at end of file
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 58c2a9ceb..999b46268 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -56,13 +56,14 @@ $(document).ready(function() {
 function makeFullScreen(full) {
 	if(typeof full=='undefined' || full == true) {
 		$('main').css({'transition': 'none'}).addClass('fullscreen');
-		$('#fullscreen-btn, header, nav, aside').css({'display': 'none'});
+		$('header, nav, aside, #fullscreen-btn').hide();
+		$('#tabs-collapse-1').css({'visibility': 'hidden'});
 		$('#inline-btn').show();
-
 	}
 	else {
 		$('main').removeClass('fullscreen');
-		$('#fullscreen-btn, header, nav, aside').css({'display': ''});
+		$('header, nav, aside, #fullscreen-btn').show();
+		$('#tabs-collapse-1').css({'visibility': ''});
 		$('#inline-btn').hide();
 		$('main').css({'transition': ''});
 	}
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 83c35935a..2db0d4c44 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -153,6 +153,18 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 
 	$x = file_get_contents('view/theme/redbasic/css/style.css');
 
+	if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
+		$x .= file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
+	}
+
+	if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) {
+		$x .= file_get_contents('view/theme/redbasic/css/align_left.css');
+	}
+
+	if($schemecss) {
+		$x .= $schemecss;
+	}
+
 	$aside_width = 287;
 
 	// left aside and right aside are 285px + converse width
@@ -204,18 +216,6 @@ if(file_exists('view/theme/redbasic/css/style.css')) {
 
 }
 
-if($narrow_navbar && file_exists('view/theme/redbasic/css/narrow_navbar.css')) {
-	echo file_get_contents('view/theme/redbasic/css/narrow_navbar.css');
-} 
-
-if($align_left && file_exists('view/theme/redbasic/css/align_left.css')) {
-	echo file_get_contents('view/theme/redbasic/css/align_left.css');
-}
-
-if($schemecss) {
-	echo $schemecss;
-}
-
 // Set the schema to the default schema in derived themes. See the documentation for creating derived themes how to override this. 
 
 if(local_channel() && App::$channel && App::$channel['channel_theme'] != 'redbasic')
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl
index 341ff7649..31be4136f 100644
--- a/view/tpl/chat.tpl
+++ b/view/tpl/chat.tpl
@@ -1,8 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
 			{{if $is_owner}}
 			<form id="chat-destroy" method="post" action="chat">
 				<input type="hidden" name="room_name" value="{{$room_name}}" />
@@ -10,6 +8,8 @@
 				<button class="btn btn-danger btn-xs" type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i>&nbsp;{{$drop}}</button>
 			</form>
 			{{/if}}
+			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false); adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
 		</div>
 		<h2>{{$room_name}}</h2>
 		<div class="clear"></div>
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
index a32437212..6a29abaef 100755
--- a/view/tpl/contact_block.tpl
+++ b/view/tpl/contact_block.tpl
@@ -11,4 +11,3 @@
 		</div>
 {{/if}}
 </div>
-<div class="clear"></div>
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 817a03028..903a23eed 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -4,7 +4,7 @@
 </div>
 <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
 {{/if}}
-	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}">
+	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper h-entry {{else}} u-comment h-cite {{/if}}">
 		<a name="{{$item.id}}" ></a>
 		<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 			<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
@@ -20,8 +20,8 @@
 				{{/if}}
 				<div class="wall-item-head">
 					<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
-						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
-							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
+						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
+							<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
 						</div>
 						<div class="wall-item-photo-end" style="clear:both"></div>
 					</div>
@@ -39,14 +39,14 @@
 						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
 					</div>
 					<div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">
-						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
+						{{if $item.verified}}<i class="fa fa-check item-verified" title="{{$item.verified}}"></i>&nbsp;{{elseif $item.forged}}<i class="fa fa-exclamation item-forged" title="{{$item.forged}}"></i>&nbsp;{{/if}}{{if $item.location}}<span class="wall-item-location p-location" id="wall-item-location-{{$item.id}}">{{$item.location}},&nbsp;</span>{{/if}}<span class="autotime" title="{{$item.isotime}}"><time class="dt-published" datetime="{{$item.isotime}}">{{$item.localtime}}</time>{{if $item.editedtime}}&nbsp;{{$item.editedtime}}{{/if}}{{if $item.expiretime}}&nbsp;{{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}}&nbsp;<i class="fa fa-pencil"></i>{{/if}}&nbsp;{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}
 					</div>
 					<div class="clear"></div>
 				</div>
 
 				{{if $item.body}}
 				<div class="wall-item-content" id="wall-item-content-{{$item.id}}">
-					<div class="wall-item-body" id="wall-item-body-{{$item.id}}" >
+					<div class="wall-item-body e-content" id="wall-item-body-{{$item.id}}" >
 						{{$item.body}}
 					</div>
 					<div class="clear"></div>
@@ -66,7 +66,7 @@
 					{{/if}}
 					{{if $item.categories}}
 					<div class="body-tags" id="item-categories">
-						<span class="tag">{{$item.categories}}</span>
+						<span class="tag p-category">{{$item.categories}}</span>
 					</div>
 					{{/if}}
 					{{if $item.folders}}
@@ -133,7 +133,7 @@
 								<li role="presentation"><a role="menuitem" href="#" onclick="jotShare({{$item.id}}); return false"><i class="fa fa-retweet" title="{{$item.share.0}}"></i> {{$item.share.0}}</a></li>
 								{{/if}}
 								{{if $item.plink}}
-								<li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" ><i class="fa fa-external-link"></i> {{$item.plink.title}}</a></li>
+								<li role="presentation"><a role="menuitem" href="{{$item.plink.href}}" title="{{$item.plink.title}}" class="u-url"><i class="fa fa-external-link"></i> {{$item.plink.title}}</a></li>
 								{{/if}}
 								{{if $item.edpost}}
 								<li role="presentation"><a role="menuitem" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="editpost fa fa-pencil"></i> {{$item.edpost.1}}</a></li>
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 8254fc87d..4e210a300 100755
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -1,8 +1,17 @@
 <script>
+	var aside_padding_top;
+	var section_padding_top;
+
 	$(document).ready(function() {
+
+		aside_padding_top = parseInt($('aside').css('padding-top'));
+		section_padding_top = parseInt($('section').css('padding-top'));
+
 		if($('#cover-photo').length && $(window).width() > 755) {
 			$('.navbar-fixed-top').css('position', 'relative');
-			$('aside, section').css('padding-top', 0 + 'px');
+			$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+			$('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px');
+			$('section').css('padding-top', section_padding_top  - $('nav').outerHeight() + 'px');
 			$('main').css('opacity', 0);
 			$('header').hide();
 		}
@@ -15,9 +24,11 @@
 		if($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() >= $('#cover-photo').height()) {
 			$('header').fadeIn();
 			$('main').css('opacity', 1);
-			$('aside, section').css('padding-top', $('nav').outerHeight(true) + 'px');
+			$('aside').css('padding-top', aside_padding_top + 'px');
+			$('section').css('padding-top', section_padding_top + 'px');
 			$(window).scrollTop($(window).scrollTop() - $('#cover-photo').height())
 			$('.navbar-fixed-top').css('position', 'fixed');
+			$('main').css('margin-top', '');
 			$('#cover-photo').remove();
 		}
 		if($('#cover-photo').length) {
@@ -28,7 +39,8 @@
 	$(window).resize(function () {
 		if($('#cover-photo').length && $(window).width() < 755) {
 			$('main').css('opacity', 1);
-			$('aside, section').css('padding-top', $('nav').outerHeight(true) + 'px');
+			$('aside').css('padding-top', aside_padding_top + 'px');
+			$('section').css('padding-top', section_padding_top + 'px');
 			$('.navbar-fixed-top').css('position', 'fixed');
 			$('#cover-photo').remove();
 		}
@@ -36,7 +48,7 @@
 	});
 
 	function slideUpCover() {
-		$('html, body').animate({scrollTop: $('#cover-photo').height() + 'px'});
+		$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' });
 	}
 </script>
 
diff --git a/view/tpl/cropcover.tpl b/view/tpl/cropcover.tpl
index 68c948889..04b96a603 100755
--- a/view/tpl/cropcover.tpl
+++ b/view/tpl/cropcover.tpl
@@ -28,7 +28,7 @@
 			minWidth: 240,
 			minHeight: 87,
 			maxWidth: 320,
-			maxHeight: 320,
+			maxHeight: 116,
 			ratioDim: { x: 100, y:36 },
 			displayOnInit: true,
 			onEndCrop: onEndCrop
diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
index f9dac9306..3812823da 100644
--- a/view/tpl/diaspora_vcard.tpl
+++ b/view/tpl/diaspora_vcard.tpl
@@ -1,51 +1,57 @@
 <div style="display:none;">
+	<dl class="entity_uid">
+ 		<dt>Uid</dt>
+ 		<dd>
+			<span class="uid p-uid">{{$diaspora.guid}}</span>
+ 		</dd>
+	</dl>
 	<dl class='entity_nickname'>
 		<dt>Nickname</dt>
 		<dd>		
-			<a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.fullname}}</a>
+			<a class="nickname p-nickname">{{$diaspora.nickname}}</a>
 		</dd>
 	</dl>
-	<dl class='entity_fn'>
+	<dl class='entity_full_name'>
 		<dt>Full name</dt>
 		<dd>
-			<span class='fn'>{{$diaspora.fullname}}</span>
+			<span class='fn p-name'>{{$diaspora.fullname}}</span>
 		</dd>
 	</dl>
 
-	<dl class='entity_given_name'>
+	<dl class='entity_first_name'>
 		<dt>First name</dt>
 		<dd>
-		<span class='given_name'>{{$diaspora.firstname}}</span>
+		<span class='given_name p-given-name'>{{$diaspora.firstname}}</span>
 		</dd>
 	</dl>
 	<dl class='entity_family_name'>
 		<dt>Family name</dt>
 		<dd>
-		<span class='family_name'>{{$diaspora.lastname}}</span>
+		<span class='family_name p-family-name'>{{$diaspora.lastname}}</span>
 		</dd>
 	</dl>
 	<dl class="entity_url">
 		<dt>URL</dt>
 		<dd>
-			<a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a>
+			<a href="{{$diaspora.podloc}}/" id="pod_location" >{{$diaspora.podloc}}/</a>
 		</dd>
 	</dl>
 	<dl class="entity_photo">
 		<dt>Photo</dt>
 		<dd>
-			<img class="photo avatar" height="300" width="300" src="{{$diaspora.photo300}}">
+			<img class="photo u-photo avatar" height="300" width="300" src="{{$diaspora.photo300}}">
 		</dd>
 	</dl>
 	<dl class="entity_photo_medium">
 		<dt>Photo</dt>
 		<dd> 
-			<img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}">
+			<img class="photo u-photo avatar" height="100" width="100" src="{{$diaspora.photo100}}">
 		</dd>
 	</dl>
 	<dl class="entity_photo_small">
 		<dt>Photo</dt>
 		<dd>
-			<img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
+			<img class="photo u-photo avatar" height="50" width="50" src="{{$diaspora.photo50}}">
 		</dd>
 	</dl>
 	<dl class="entity_searchable">
diff --git a/view/tpl/dreport.tpl b/view/tpl/dreport.tpl
new file mode 100644
index 000000000..8aa5e2cd1
--- /dev/null
+++ b/view/tpl/dreport.tpl
@@ -0,0 +1,28 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $table == 'item'}}
+		<div class="dropdown pull-right">
+			<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$options}}">
+				<i class="fa fa-sort-desc"></i>
+			</button>
+			<ul class="dropdown-menu">
+				<li><a href="dreport/push/{{$mid}}">{{$push}}</a></li>
+			</ul>
+		</div>
+		{{/if}}
+		<h2>{{$title}}</h2>
+	</div>
+
+	<div>
+	<table>
+	{{if $entries}}
+	{{foreach $entries as $e}}
+	<tr>
+		<td width="40%">{{$e.name}}</td>
+		<td width="20%">{{$e.result}}</td>
+		<td width="20%">{{$e.time}}</td>
+	</tr>
+	{{/foreach}}
+	{{/if}}
+	</table>
+</div>
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 5083c5835..fee4f17a3 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -30,6 +30,18 @@
 	function changeView(action, viewName) {
 		$('#events-calendar').fullCalendar(action, viewName);
 		var view = $('#events-calendar').fullCalendar('getView');
+
+		if(view.type !== 'month' && !$('main').hasClass('fullscreen')) {
+			$('#events-calendar').fullCalendar('option', 'height', 'auto');
+		}
+		else {
+			$('#events-calendar').fullCalendar('option', 'height', '');
+		}
+
+		if($('main').hasClass('fullscreen')) {
+			$('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
+		}
+
 		$('#title').text(view.title);
 	}
 
@@ -42,7 +54,6 @@
 			firstDay: {{$first_day}},
 
 			eventLimit: 3,
-			height: 'auto',
 
 			monthNames: aStr['monthNames'],
 			monthNamesShort: aStr['monthNamesShort'],
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 7d5258ecd..6299242ce 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,13 +1,21 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-			<button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button>
-			<div class="btn-group">
-				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-				<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
-				<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+			<div class="dropdown">
+				<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><i class="fa fa-caret-down"></i>&nbsp;{{$view_label}}</button>
+				<ul class="dropdown-menu">
+					<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
+					<li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
+					<li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
+				</ul>
+				<button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button>
+				<div class="btn-group">
+					<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+					<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+					<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+				</div>
+				<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+				<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 			</div>
 		</div>
 		<h2 id="title"></h2>
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
index 121c06cb5..b7836cfab 100755
--- a/view/tpl/events_cal-js.tpl
+++ b/view/tpl/events_cal-js.tpl
@@ -2,13 +2,13 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 			<div class="btn-group">
 				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
 				<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
 				<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
 			</div>
+			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 		</div>
 		<h2 id="title"></h2>
 		<div class="clear"></div>
diff --git a/view/tpl/force_image_reload.tpl b/view/tpl/force_image_reload.tpl
new file mode 100644
index 000000000..839bd22b5
--- /dev/null
+++ b/view/tpl/force_image_reload.tpl
@@ -0,0 +1,72 @@
+{{* 
+Force the browser to reload an image from the server instead of the cache.
+based on an answer from http://stackoverflow.com/a/22429796/3343347
+
+Usage: Set $imgUrl to the src url you want to be re-fetched from the server
+
+*}}
+
+<script>
+  $(document).ready(
+    function() {
+      forceImgReload("{{$imgUrl}}");
+    }
+  );
+
+  {{* 
+    * find and return any existing img tags with a matching src url, and set them to an intermediate 
+    * src url so they can later be reverted back once the cached version has been updated.
+    *}}
+  function prepareImagesForReload(srcUrl) {
+
+    var result = $("img[src='" + srcUrl + "']").get();
+
+    for (i = 0; i < result.length; i++) {
+      {{* 
+        * Set the image to a reloading image, in this case an animated "reloading" svg 
+        * Ideally this wont be displayed long enough to matter.
+        *}}
+      result[i].src = "data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100' preserveAspectRatio='xMidYMid' class='uil-reload'%3E%3Cpath fill='none' class='bk' d='M0 0h100v100H0z'/%3E%3Cg%3E%3Cpath d='M50 15a35 35 0 1 0 24.787 10.213' fill='none' stroke='%23777' stroke-width='12'/%3E%3Cpath d='M50 0v30l16-15L50 0' fill='%23777'/%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 50 50' to='360 50 50' dur='1s' repeatCount='indefinite'/%3E%3C/g%3E%3C/svg%3E";
+    }
+
+    return result;
+  }
+
+  function restoreImages(srcUrl, imgList) {
+
+    for (i = 0; i < imgList.length; i++) {
+      imgList[i].src = srcUrl;
+    }
+  }
+
+  function forceImgReload(srcUrl) {
+    var imgList;
+    var step = 0; 
+    var iframe = window.document.createElement("iframe");   // Hidden iframe, in which to perform the load+reload.
+  
+    {{* Callback function, called after iframe load+reload completes (or fails).
+        Will be called TWICE unless twostage-mode process is cancelled. (Once after load, once after reload). *}}
+    var iframeLoadCallback = function(e) { 
+
+      if (step === 0) { 
+        // initial load just completed.  Note that it doesn't actually matter if this load succeeded or not.
+      
+        step = 1; 
+        imgList = prepareImagesForReload(srcUrl); 
+        iframe.contentWindow.location.reload(true); // initiate forced-reload!
+      
+      } else if (step === 1) {
+        // forced re-load is done 
+
+        restoreImages(srcUrl, imgList);
+        if (iframe.parentNode) iframe.parentNode.removeChild(iframe);
+      }
+    }
+
+    iframe.style.display = "none";
+    window.parent.document.body.appendChild(iframe); {{* NOTE: if this is done AFTER setting src, Firefox MAY fail to fire the load event! *}}
+    iframe.addEventListener("load",  iframeLoadCallback, false);
+    iframe.addEventListener("error", iframeLoadCallback, false);
+    iframe.src = srcUrl;  
+  }
+</script>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 43df2e175..9953875ef 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -7,6 +7,7 @@ var pretext = '{{$pretext}}';
 function initEditor(cb){
 	if (editor==false){
 		$("#profile-jot-text-loading").spin('small').show();
+		{{$geotag}}
 		if(plaintext == 'none') {
 			$("#profile-jot-text-loading").spin(false).hide();
 			$("#profile-jot-text").css({ 'height': 200, 'color': '#000', 'line-height': 'inherit' });
@@ -362,8 +363,90 @@ function enableOnUser(){
 		$('#profile-nolocation-wrapper').attr('disabled', true);
 	}
 
-	{{$geotag}}
 
+    var initializeEmbedPhotoDialog = function () {
+        $('.embed-photo-selected-photo').each(function (index) {
+            $(this).removeClass('embed-photo-selected-photo');
+        });
+        getPhotoAlbumList();
+        $('#embedPhotoModalBodyAlbumDialog').off('click');
+        $('#embedPhotoModal').modal();
+    };
+
+    var choosePhotoFromAlbum = function (album) {
+        $.post("embedphotos/album", {name: album},
+            function(data) {
+                if (data['status']) {
+                    $('#embedPhotoModalLabel').html('{{$modalchooseimages}}');
+                    $('#embedPhotoModalBodyAlbumDialog').html('\
+                            <div><ul class="nav">\n\
+                                <li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+                                    <i class="fa fa-chevron-left"></i>&nbsp\n\
+                                    {{$modaldiffalbum}}\n\
+                                    </a>\n\
+                                </li>\n\
+                            </ul><br></div>')
+                    $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+                    $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+                        evt.preventDefault();
+                        var image = document.getElementById(evt.target.id);
+                        if (typeof($(image).parent()[0]) !== 'undefined') {
+                            var imageparent = document.getElementById($(image).parent()[0].id);
+                            $(imageparent).toggleClass('embed-photo-selected-photo');
+                        }
+                    });
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('hide');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('hide');
+                    $('#embed-photo-OKButton').click(function () {
+                        $('.embed-photo-selected-photo').each(function (index) {
+                            var href = $(this).attr('href');
+                            $.post("embedphotos/photolink", {href: href},
+                                function(ddata) {
+                                    if (ddata['status']) {
+                                        addeditortext(ddata['photolink']);
+                                    } else {
+                                        window.console.log('{{$modalerrorlink}}' + ':' + ddata['errormsg']);
+                                    }
+                                    return false;
+                                },
+                            'json');
+                        });
+                        $('#embedPhotoModalBodyAlbumDialog').html('');
+                        $('#embedPhotoModalBodyAlbumDialog').off('click');
+                        $('#embedPhotoModal').modal('hide');
+                    });
+                } else {
+                    window.console.log('{{$modalerroralbum}} ' + JSON.stringify(album) + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+
+    var getPhotoAlbumList = function () {
+        $.post("embedphotos/albumlist", {},
+            function(data) {
+                if (data['status']) {
+                    var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+                    $('#embedPhotoModalLabel').html('{{$modalchoosealbum}}');
+                    $('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>');
+                    for(var i=0; i<albums.length; i++) {
+                        var albumName = albums[i].text;
+                        var albumLink = '<li>';
+                        albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + albumName + '\');return false;">' + albumName + '</a>';
+                        albumLink += '</li>';
+                        $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+                    }
+                    $('#embedPhotoModalBodyAlbumDialog').addClass('hide');
+                    $('#embedPhotoModalBodyAlbumListDialog').removeClass('hide');
+                } else {
+                    window.console.log('{{$modalerrorlist}}' + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+    
 </script>
 
 <script>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 685706026..490349a04 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -79,6 +79,11 @@
 						<i id="profile-link" class="fa fa-link jot-icons"></i>
 					</button>
 					{{/if}}
+					{{if $embedPhotos}}
+                    <button id="embed-photo-wrapper" class="btn btn-default btn-sm" title="{{$embedPhotos}}" onclick="initializeEmbedPhotoDialog();return false;">
+                        <i id="embed-photo" class="fa fa-file-image-o jot-icons"></i>
+                    </button>
+                    {{/if}}
 				</div>
 				<div class="btn-group hidden-xs hidden-sm">
 					{{if $setloc}}
@@ -225,6 +230,30 @@
 </div><!-- /.modal -->
 {{/if}}
 
+{{if $embedPhotos}}
+<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
+      </div>
+     <div class="modal-body" id="embedPhotoModalBody" >
+         <div id="embedPhotoModalBodyAlbumListDialog" class="hide">
+            <div id="embedPhotoModalBodyAlbumList"></div>
+         </div>
+         <div id="embedPhotoModalBodyAlbumDialog" class="hide">
+         </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
+        <button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+{{/if}}
+
 {{if $content || $attachment || $expanded}}
 <script>initEditor();</script>
 {{/if}}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 5c8c097da..c0e17d6b5 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -17,7 +17,7 @@
 			</button>
 			{{/if}}
 			{{if $userinfo}}
-				<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span>
+				<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret dropdown-toggle fakelink" data-toggle="dropdown" id="usermenu-caret"></span>
 				{{if $localuser}}
 					<ul class="dropdown-menu" role="menu" aria-labelledby="avatar">
 						{{foreach $nav.usermenu as $usermenu}}
diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl
index 3e1f5a3fc..cef93d324 100644
--- a/view/tpl/pdledit.tpl
+++ b/view/tpl/pdledit.tpl
@@ -4,7 +4,7 @@
 <h2>{{$mname}} {{$module}}</h2>
 
 <br />
-<a href="help/Comanche" target="hubzilla-help">{{$help}}</a>
+<a href="help/comanche" target="hubzilla-help">{{$help}}</a>
 <br />
 <br />
 
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index e6cb61637..f097646e4 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,8 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 			{{if $order}}
 			<a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="fa fa-sort"></i></a>
 			{{/if}}
@@ -14,6 +12,10 @@
 				<button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
 				{{/if}}
 			</div>
+			{{if !$no_fullscreen_btn}}
+			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+			{{/if}}
 		</div>
 		<h2>{{$album}}</h2>
 		<div class="clear"></div>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index c40dda145..139f27a23 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -1,11 +1,11 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 			{{if $can_post}}
 			<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="fa fa-arrow-circle-o-up"></i>&nbsp;{{$upload.0}}</button>
 			{{/if}}
+			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
 		</div>
 		<h2>{{$title}}</h2>
 		<div class="clear"></div>
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index a4c98b1d0..d0c9621f9 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -282,7 +282,7 @@
 		<ul class="profile-thing-list">
 		{{foreach $items as $item}}
 		<li>{{if $item.img}}<a href="{{$item.url}}" ><img src="{{$item.img}}" class="profile-thing-img" width="100" height="100" alt="{{$item.term}}" /></a>{{/if}}
-		<a href="{{$item.url}}" >{{$item.term}}</a>
+		<a href="{{$item.editurl}}" >{{$item.term}}</a>
 		{{if $profile.canlike}}<br />
 		<button type="button" class="btn btn-default btn-sm" onclick="doprofilelike('thing/' + '{{$item.term_hash}}','like'); return false;" title="{{$likethis}}" >
 		<i class="fa fa-thumbs-o-up" title="{{$likethis}}"></i>
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 7d7d2019a..5e9d192a1 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -1,6 +1,6 @@
-<div class="vcard">
+<div class="vcard h-card">
 	{{if ! $zcard}}
-	<div id="profile-photo-wrapper"><img class="photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}"></div>
+	<div id="profile-photo-wrapper"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.fullname}}"></div>
 	{{/if}}
 	{{if $connect}}
 	<div class="connect-btn-wrapper"><a href="{{$connect_url}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
@@ -25,29 +25,29 @@
 	{{/if}}
 
 	{{if ! $zcard}}
-	<div class="fn">{{$profile.fullname}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
-	{{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}}		
+	<div class="fn p-name">{{$profile.fullname}}{{if $profile.online}} <i class="fa fa-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
+	{{if $reddress}}<div class="reddress">{{$profile.reddress}}</div>{{/if}}		
 	{{/if}}
 	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 	{{if $location}}
 		<dl class="location"><dt class="location-label">{{$location}}</dt> 
-		<dd class="adr">
-			{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+		<dd class="adr h-adr">
+			{{if $profile.address}}<div class="street-address p-street-address">{{$profile.address}}</div>{{/if}}
 			<span class="city-state-zip">
-				<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
-				<span class="region">{{$profile.region}}</span>
-				<span class="postal-code">{{$profile.postal_code}}</span>
+				<span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+				<span class="region p-region">{{$profile.region}}</span>
+				<span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
 			</span>
-			{{if $profile.country_name}}<span class="country-name">{{$profile.country_name}}</span>{{/if}}
+			{{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
 		</dd>
 		</dl>
 	{{/if}}
 
-	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+	{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="p-gender">{{$profile.gender}}</dd></dl>{{/if}}
 
 	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart"><i class="fa fa-heart"></i>&nbsp;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
 
-	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url">{{$profile.homepage}}</dd></dl>{{/if}}
+	{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url u-url">{{$profile.homepage}}</dd></dl>{{/if}}
 
 	{{if $diaspora}}
 	{{include file="diaspora_vcard.tpl"}}
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index 4a827ca16..c84934626 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -54,5 +54,8 @@
 			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
 			<div id="register-submit-end" class="register-field-end"></div>
 		</form>
+			<br />
+			<div class="descriptive-text">{{$verify_note}}</div>
+
 	</div>
 </div>
diff --git a/view/tpl/settings_tokens.tpl b/view/tpl/settings_tokens.tpl
new file mode 100644
index 000000000..22af381e9
--- /dev/null
+++ b/view/tpl/settings_tokens.tpl
@@ -0,0 +1,40 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}</h2>
+		<div class="clear"></div>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<div class="section-content-info-wrapper">
+			{{$desc}}
+		</div>
+
+		<form action="settings/tokens" id="settings-account-form" method="post" autocomplete="off" >
+			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+			{{if $atoken}}<input type="hidden" name="atoken_id" value="{{$atoken.atoken_id}}" />{{/if}}
+			{{include file="field_input.tpl" field=$name}}
+			{{include file="field_input.tpl" field=$token}}
+			{{include file="field_input.tpl" field=$expires}}
+			<div class="settings-submit-wrapper form-group">
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+		</form>
+		<div class="descriptive-text">{{$desc2}}</div>
+		<ul>
+			<li>{{$url1}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
+			<li>{{$url2}}<span class="zat-example">?f=&zat=<span class="token-mirror"></span></span></li>
+		</ul>
+	</div>
+	{{if $tokens}}
+	<div class="section-content-wrapper-np">
+		<table id="atoken-index">
+			{{foreach $tokens as $t}}
+			<tr id="atoken-index-{{$t.atoken_id}}" class="atoken-index-row">
+				<td width="99%"><a href="settings/tokens/{{$t.atoken_id}}">{{$t.atoken_name}}</a></td>
+				<td width="1%" class="atoken-index-tool"><i class="fa fa-trash-o drop-icons" onClick="dropItem('/settings/tokens/{{$t.atoken_id}}/drop', '#atoken-index-{{$t.atoken_id}}')"></i></td>
+			</tr>
+			{{/foreach}}
+		</table>
+
+	</div>
+	{{/if}}
+</div>
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 1312f8518..d9a4f8be3 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -25,15 +25,27 @@
       <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);
           adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button>
     </div>
-    <h2>{{$wikiheader}}</h2>
+    <h2><span id="wiki-header-name">{{$wikiheaderName}}</span>: <span id="wiki-header-page">{{$wikiheaderPage}}</span></h2>
     <div class="clear"></div>
   </div>
 	<div id="new-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
       <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" >
         <div class="clear"></div>
         {{include file="field_input.tpl" field=$wikiName}}
+        
+        <div id="post-visible-container" class="form-group field checkbox"> 
+          <span style="font-size:1.2em;" class="pull-left">Send notification post?</span>                            
+          <div style="margin-left:20px" class="pull-left">
+              <input name="postVisible" id="postVisible" value="0" type="checkbox">
+              <label class="switchlabel" for="postVisible"> 
+                  <span class="onoffswitch-inner" data-on="Post" data-off="None"></span>
+                  <span class="onoffswitch-switch"></span>
+              </label>
+          </div>
+        </div>
+        
         <div class="btn-group pull-right">
-            <div id="profile-jot-submit-right" class="btn-group">
+            <div id="profile-jot-submit-right" class="btn-group" style="margin-right: 20px;">
                 <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
                     <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons">{{$bang}}</i>
                 </button>
@@ -57,6 +69,17 @@
       <hr>
     </div>
   
+    <div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
+      <form id="rename-page-form" action="wiki/rename/page" method="post" >
+        <div class="clear"></div>
+        {{include file="field_input.tpl" field=$pageRename}}
+        <div class="btn-group pull-right">
+            <button id="rename-page-submit" class="btn btn-warning" type="submit" name="submit" >Rename Page</button>
+        </div>
+      </form>        <div class="clear"></div>
+      <hr>
+    </div>
+
   <div id="wiki-content-container" class="section-content-wrapper" {{if $hideEditor}}style="display: none;"{{/if}}>
     <ul class="nav nav-tabs" id="wiki-nav-tabs">
       <li><a data-toggle="tab" href="#edit-pane">Edit</a></li>
@@ -67,7 +90,11 @@
         <a data-toggle="dropdown" class="dropdown-toggle" href="#">Page <b class="caret"></b></a>
         <ul class="dropdown-menu">
           <li><a id="save-page" data-toggle="tab" href="#">Save</a></li>
+          <li><a id="rename-page" data-toggle="tab" href="#">Rename</a></li>
           <li><a id="delete-page" data-toggle="tab" href="#">Delete</a></li>
+          <li class="divider"></li>
+          <li><a id="embed-image" data-toggle="tab" href="#">Embed image</a></li>
+          
         </ul>
       </li>
       {{/if}}
@@ -84,17 +111,6 @@
       </div>
       <div id="page-history-pane" class="tab-pane fade" {{if $hidePageHistory}}style="display: none;"{{/if}}>
         <div id="page-history-list" class="section-content-wrapper">
-          <table class="table-striped table-responsive table-hover" style="width: 100%;">
-          {{foreach $pageHistory as $commit}}
-            <tr><td>
-            <table>
-              <tr><td>Date</td><td>{{$commit.date}}</td></tr>
-              <tr><td>Name</td><td>{{$commit.name}}</td></tr>
-              <tr><td>Message</td><td>{{$commit.title}}</td></tr>
-            </table>
-            </td></tr>
-          {{/foreach}}          
-          </table>
         </div>
       </div>     
 
@@ -108,16 +124,73 @@
   {{/if}}
 </div>
 
+{{$wikiModal}}
+
+
+<div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
+      </div>
+     <div class="modal-body" id="embedPhotoModalBody" >
+         <div id="embedPhotoModalBodyAlbumListDialog" class="hide">
+            <div id="embedPhotoModalBodyAlbumList"></div>
+         </div>
+         <div id="embedPhotoModalBodyAlbumDialog" class="hide">
+         </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{$embedPhotosModalCancel}}</button>
+        <button id="embed-photo-OKButton" type="button" class="btn btn-primary">{{$embedPhotosModalOK}}</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
 <script>
   window.wiki_resource_id = '{{$resource_id}}';
   window.wiki_page_name = '{{$page}}';
   window.wiki_page_content = {{$content}};
+  window.wiki_page_commit = '{{$commit}}';
   
   if (window.wiki_page_name === 'Home') {
     $('#delete-page').hide();
+    $('#rename-page').hide();
   }
+  
+  $("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
+  $("#generic-modal-ok-{{$wikiModalID}}").addClass('btn-danger');
+  
+  $('#rename-page').click(function (ev) {
+    $('#rename-page-form-wrapper').show();
+  });
+  
+  $( "#rename-page-form" ).submit(function( event ) {
+    $.post("wiki/{{$channel}}/rename/page", 
+      {
+        oldName: window.wiki_page_name, 
+        newName: $('#id_pageRename').val(), 
+        resource_id: window.wiki_resource_id
+      }, 
+      function (data) {
+      if (data.success) {
+        $('#rename-page-form-wrapper').hide();
+        window.console.log('data: ' + JSON.stringify(data));
+        window.wiki_page_name = data.name.urlName;
+        $('#wiki-header-page').html(data.name.htmlName);
+        wiki_refresh_page_list();
+      } else {
+        window.console.log('Error renaming page.');
+      }
+      }, 'json');    
+    event.preventDefault();
+  });
+  
   $(document).ready(function () {
     wiki_refresh_page_list();
+    $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
     // Show Edit tab first. Otherwise the Ace editor does not load.
     $("#wiki-nav-tabs li:eq(1) a").tab('show');
   });
@@ -128,9 +201,10 @@
   editor.getSession().setValue(window.wiki_page_content);
 
   $('#wiki-get-preview').click(function (ev) {
-    $.post("wiki/{{$channel}}/preview", {content: editor.getValue()}, function (data) {
+    $.post("wiki/{{$channel}}/preview", {content: editor.getValue(), resource_id: window.wiki_resource_id}, function (data) {
       if (data.success) {
         $('#wiki-preview').html(data.html);
+        $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
       } else {
         window.console.log('Error previewing page.');
       }
@@ -222,6 +296,7 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
           window.console.log('Page saved successfully.');
           window.wiki_page_content = currentContent;
           $('#id_commitMsg').val(''); // Clear the commit message box
+          $('#wiki-get-history').click();
         } else {
           alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups 
           window.console.log('Error saving page.');
@@ -236,6 +311,9 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
       ev.preventDefault();
       return false;
     }
+    if(!confirm('Are you sure you want to delete the page: ' + window.wiki_page_name)) {
+      return;
+    }
     $.post("wiki/{{$channel}}/delete/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
       function (data) {
         if (data.success) {
@@ -267,6 +345,7 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
           $('#revert-'+commitHash).removeClass('btn-danger');
           $('#revert-'+commitHash).addClass('btn-success');
           $('#revert-'+commitHash).html('Page reverted<br>but not saved');
+          window.wiki_page_commit = commitHash;
           // put contents in editor
           editor.getSession().setValue(data.content);
         } else {
@@ -274,4 +353,124 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) {
         }
       }, 'json');
   }
+  
+  function wiki_compare_page(compareCommit) {
+    if (window.wiki_resource_id === '' || window.wiki_page_name === '' || window.wiki_page_commit === '') {
+      window.console.log('You must have a wiki page open in order to revert pages.');
+      return false;
+    }
+    $.post("wiki/{{$channel}}/compare/page", 
+      {
+        compareCommit: compareCommit, 
+        currentCommit: window.wiki_page_commit, 
+        name: window.wiki_page_name, 
+        resource_id: window.wiki_resource_id
+      }, 
+      function (data) {
+        if (data.success) {
+          var modalBody = $('#generic-modal-body-{{$wikiModalID}}');
+          modalBody.html('<div class="descriptive-text">'+data.diff+'</div>');
+          $('.modal-dialog').width('80%');
+          $("#generic-modal-ok-{{$wikiModalID}}").off('click');
+          $("#generic-modal-ok-{{$wikiModalID}}").click(function () {
+            wiki_revert_page(compareCommit);
+            $('#generic-modal-{{$wikiModalID}}').modal('hide');
+          });
+          $('#generic-modal-{{$wikiModalID}}').modal();
+        } else {
+          window.console.log('Error comparing page.');
+        }
+      }, 'json');
+  }
+  
+  $('#embed-image').click(function (ev) {
+    initializeEmbedPhotoDialog();
+    ev.preventDefault();
+  });
+
+
+    var initializeEmbedPhotoDialog = function () {
+        $('.embed-photo-selected-photo').each(function (index) {
+            $(this).removeClass('embed-photo-selected-photo');
+        });
+        getPhotoAlbumList();
+        $('#embedPhotoModalBodyAlbumDialog').off('click');
+        $('#embedPhotoModal').modal();
+    };
+
+    var choosePhotoFromAlbum = function (album) {
+        $.post("embedphotos/album", {name: album},
+            function(data) {
+                if (data['status']) {
+                    $('#embedPhotoModalLabel').html('{{$modalchooseimages}}');
+                    $('#embedPhotoModalBodyAlbumDialog').html('\
+                            <div><ul class="nav">\n\
+                                <li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+                                    <i class="fa fa-chevron-left"></i>&nbsp\n\
+                                    {{$modaldiffalbum}}\n\
+                                    </a>\n\
+                                </li>\n\
+                            </ul><br></div>')
+                    $('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+                    $('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+                        evt.preventDefault();
+                        var image = document.getElementById(evt.target.id);
+                        if (typeof($(image).parent()[0]) !== 'undefined') {
+                            var imageparent = document.getElementById($(image).parent()[0].id);
+                            $(imageparent).toggleClass('embed-photo-selected-photo');
+                        }
+                    });
+                    $('#embedPhotoModalBodyAlbumListDialog').addClass('hide');
+                    $('#embedPhotoModalBodyAlbumDialog').removeClass('hide');
+                    $('#embed-photo-OKButton').click(function () {
+                        $('.embed-photo-selected-photo').each(function (index) {
+                            var href = $(this).attr('href');
+                            $.post("embedphotos/photolink", {href: href},
+                                function(ddata) {
+                                    if (ddata['status']) {
+                                      var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
+                                      editor.getSession().insert(editor.getCursorPosition(), imgURL)
+                                    } else {
+                                      window.console.log('{{$modalerrorlink}}' + ':' + ddata['errormsg']);
+                                    }
+                                    return false;
+                                },
+                            'json');
+                        });
+                        $('#embedPhotoModalBodyAlbumDialog').html('');
+                        $('#embedPhotoModalBodyAlbumDialog').off('click');
+                        $('#embedPhotoModal').modal('hide');
+                    });
+                } else {
+                    window.console.log('{{$modalerroralbum}} ' + JSON.stringify(album) + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+
+    var getPhotoAlbumList = function () {
+        $.post("embedphotos/albumlist", {},
+            function(data) {
+                if (data['status']) {
+                    var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+                    $('#embedPhotoModalLabel').html('{{$modalchoosealbum}}');
+                    $('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>');
+                    for(var i=0; i<albums.length; i++) {
+                        var albumName = albums[i].text;
+                        var albumLink = '<li>';
+                        albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + albumName + '\');return false;">' + albumName + '</a>';
+                        albumLink += '</li>';
+                        $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+                    }
+                    $('#embedPhotoModalBodyAlbumDialog').addClass('hide');
+                    $('#embedPhotoModalBodyAlbumListDialog').removeClass('hide');
+                } else {
+                    window.console.log('{{$modalerrorlist}}' + ':' + data['errormsg']);
+                }
+                return false;
+            },
+        'json');
+    };
+    
 </script>
diff --git a/view/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl
index 6ce3ce204..fef5d93a5 100644
--- a/view/tpl/wiki_page_history.tpl
+++ b/view/tpl/wiki_page_history.tpl
@@ -1,12 +1,52 @@
+<style>
+  .diff td{
+    padding:0 0.667em;
+    vertical-align:top;
+    white-space:pre;
+    white-space:pre-wrap;
+    font-family:Consolas,'Courier New',Courier,monospace;
+    font-size:1.0em;
+    line-height:1.333;
+  }
+
+  .diff span{
+    display:block;
+    min-height:1.333em;
+    margin-top:-1px;
+    padding:0 3px;
+  }
+
+  * html .diff span{
+    height:1.333em;
+  }
+
+  .diff span:first-child{
+    margin-top:0;
+  }
+
+  .diffDeleted span{
+    border:1px solid rgb(255,192,192);
+    background:rgb(255,224,224);
+  }
+
+  .diffInserted span{
+    border:1px solid rgb(192,255,192);
+    background:rgb(224,255,224);
+  }
+</style>
 <table class="table-striped table-responsive table-hover" style="width: 100%;">
   {{foreach $pageHistory as $commit}}
   <tr><td>
       <table id="rev-{{$commit.hash}}" onclick="$('#details-{{$commit.hash}}').show()" width="100%">
-        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td><td rowspan="3" width="20%" align="right">
-            <button id="revert-{{$commit.hash}}" class="btn btn-danger btn-xs" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button></td></tr>
+        <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td>
+            <td rowspan="3" width="20%" align="right">
+              <button id="revert-{{$commit.hash}}" class="btn btn-danger btn-xs" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button>
+              <br><br>
+              <button id="compare-{{$commit.hash}}" class="btn btn-warning btn-xs" onclick="wiki_compare_page('{{$commit.hash}}')">Compare</button>
+            </td></tr>
         <tr><td>Name</td><td>{{$commit.name}} &lt;{{$commit.email}}&gt;</td></tr>
         <tr><td>Message</td><td>{{$commit.title}}</td></tr>
       </table>
     </td></tr>
   {{/foreach}}          
-</table>
\ No newline at end of file
+</table>
diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl
index 9a1e23beb..ac796cd47 100755
--- a/view/tpl/xchan_vcard.tpl
+++ b/view/tpl/xchan_vcard.tpl
@@ -1,9 +1,9 @@
-<div id="vcard" class="vcard">
-<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
+<div id="vcard" class="vcard h-card">
+<div id="profile-photo-wrapper"><a href="{{$link}}"><img class="vcard-photo photo u-photo" src="{{$photo}}" alt="{{$name}}" /></a></div>
 {{if $connect}}
 <div class="connect-btn-wrapper"><a href="follow?f=&url={{$follow}}" class="btn btn-block btn-success btn-sm"><i class="fa fa-plus"></i> {{$connect}}</a></div>
 {{/if}}
-<div class="fn">{{$name}}</div>
+<div class="fn p-name">{{$name}}</div>
 </div>