Merge branch 'dev' into gnusoc

15 files changed, 2996 insertions, 2809 deletions

diff --git a/Zotlabs/Module/Editpost.php b/Zotlabs/Module/Editpost.php
index 5c04653b8..d7612b165 100644
--- a/Zotlabs/Module/Editpost.php
+++ b/Zotlabs/Module/Editpost.php
@@ -78,6 +78,7 @@ class Editpost extends \Zotlabs\Web\Controller {
 
 		$x = array(
 			'nickname' => $channel['channel_address'],
+			'item' => $itm[0],
 			'editor_autocomplete'=> true,
 			'bbco_autocomplete'=> 'bbcode',
 			'return_path' => $_SESSION['return_url'],
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index b5258a28f..9c688af01 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -496,6 +496,11 @@ class Setup extends \Zotlabs\Web\Controller {
 	function check_funcs(&$checks) {
 		$ck_funcs = array();
 
+		$disabled = explode(',',ini_get('disable_functions'));
+		if($disabled)
+			array_walk($disabled,'array_trim');
+
+
 		// add check metadata, the real check is done bit later and return values set
 		$this->check_add($ck_funcs, t('libCurl PHP module'), true, true);
 		$this->check_add($ck_funcs, t('GD graphics PHP module'), true, true);
@@ -511,13 +516,13 @@ class Setup extends \Zotlabs\Web\Controller {
 				$this->check_add($ck_funcs, t('Apache mod_rewrite module'), true, true);
 			}
 		}
-		if((! function_exists('exec')) || strstr(ini_get('disable_functions'),'exec')) {
+		if((! function_exists('exec')) || in_array('exec',$disabled)) {
 			$this->check_add($ck_funcs, t('exec'), false, true, t('Error: exec is required but is either not installed or has been disabled in php.ini'));
 		}
 		else {
 			$this->check_add($ck_funcs, t('exec'), true, true);
 		}
-		if((! function_exists('shell_exec')) || strstr(ini_get('disable_functions'),'shell_exec')) {
+		if((! function_exists('shell_exec')) || in_array('shell_exec',$disabled)) {
 			$this->check_add($ck_funcs, t('shell_exec'), false, true, t('Error: shell_exec is required but is either not installed or has been disabled in php.ini'));
 		}
 		else {
diff --git a/include/conversation.php b/include/conversation.php
index 941b55159..0ff368e6e 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1396,11 +1396,11 @@ function status_editor($a, $x, $popup = false) {
 		'$setloc' => $setloc,
 		'$voting' => t('Toggle voting'),
 		'$feature_voting' => $feature_voting,
-		'$consensus' => 0,
+		'$consensus' => ((array_key_exists('item',$x)) ? $x['item']['item_consensus'] : 0),
 		'$nocommenttitle' => t('Disable comments'),
 		'$nocommenttitlesub' => t('Toggle comments'),
 		'$feature_nocomment' => $feature_nocomment,
-		'$nocomment' => 0,
+		'$nocomment' => ((array_key_exists('item',$x)) ? $x['item']['item_nocomment'] : 0),
 		'$clearloc' => $clearloc,
 		'$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''),
 		'$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')),
diff --git a/include/event.php b/include/event.php
index 8fb060a40..f3366fb69 100644
--- a/include/event.php
+++ b/include/event.php
@@ -127,12 +127,18 @@ function format_event_ical($ev) {
 		$o .= "\r\nDTSTART:" . datetime_convert('UTC','UTC', $ev['dtstart'],'Ymd\\THis' . (($ev['adjust']) ? '\\Z' : ''));
 	if($ev['dtend'] && ! $ev['nofinish']) 
 		$o .= "\r\nDTEND:" . datetime_convert('UTC','UTC', $ev['dtend'],'Ymd\\THis' . (($ev['adjust']) ? '\\Z' : ''));
-	if($ev['summary']) 
+	if($ev['summary']) {
 		$o .= "\r\nSUMMARY:" . format_ical_text($ev['summary']);
-	if($ev['location'])
+		$o .= "\r\nX-ZOT-SUMMARY:" . format_ical_sourcetext($ev['summary']);
+	}
+	if($ev['location']) {
 		$o .= "\r\nLOCATION:" . format_ical_text($ev['location']);
-	if($ev['description']) 
+		$o .= "\r\nX-ZOT-LOCATION:" . format_ical_sourcetext($ev['location']);
+	}
+	if($ev['description']) {
 		$o .= "\r\nDESCRIPTION:" . format_ical_text($ev['description']);
+		$o .= "\r\nX-ZOT-DESCRIPTION:" . format_ical_sourcetext($ev['description']);
+	}
 	if($ev['event_priority'])
 		$o .= "\r\nPRIORITY:" . intval($ev['event_priority']);
 	$o .= "\r\nUID:" . $ev['event_hash'] ;
@@ -154,8 +160,10 @@ function format_todo_ical($ev) {
 		$o .= "\r\nDTSTART:" . datetime_convert('UTC','UTC', $ev['dtstart'],'Ymd\\THis' . (($ev['adjust']) ? '\\Z' : ''));
 	if($ev['dtend'] && ! $ev['nofinish']) 
 		$o .= "\r\nDUE:" . datetime_convert('UTC','UTC', $ev['dtend'],'Ymd\\THis' . (($ev['adjust']) ? '\\Z' : ''));
-	if($ev['summary']) 
+	if($ev['summary']) {
 		$o .= "\r\nSUMMARY:" . format_ical_text($ev['summary']);
+		$o .= "\r\nX-ZOT-SUMMARY:" . format_ical_sourcetext($ev['summary']);
+	}
 	if($ev['event_status']) {
 		$o .= "\r\nSTATUS:" . $ev['event_status'];
 		if($ev['event_status'] === 'COMPLETED')
@@ -165,10 +173,14 @@ function format_todo_ical($ev) {
 		$o .= "\r\nPERCENT-COMPLETE:" . $ev['event_percent'];		
 	if(intval($ev['event_sequence'])) 
 		$o .= "\r\nSEQUENCE:" . $ev['event_sequence'];
-	if($ev['location'])
+	if($ev['location']) {
 		$o .= "\r\nLOCATION:" . format_ical_text($ev['location']);
-	if($ev['description']) 
+		$o .= "\r\nX-ZOT-LOCATION:" . format_ical_sourcetext($ev['location']);
+	}
+	if($ev['description']) {
 		$o .= "\r\nDESCRIPTION:" . format_ical_text($ev['description']);
+		$o .= "\r\nX-ZOT-DESCRIPTION:" . format_ical_sourcetext($ev['description']);
+	}
 	$o .= "\r\nUID:" . $ev['event_hash'] ;
 	if($ev['event_priority'])
 		$o .= "\r\nPRIORITY:" . intval($ev['event_priority']);
@@ -178,7 +190,6 @@ function format_todo_ical($ev) {
 }
 
 
-
 function format_ical_text($s) {
 	require_once('include/bbcode.php');
 	require_once('include/html2plain.php');
@@ -186,6 +197,12 @@ function format_ical_text($s) {
 	$s = html2plain(bbcode($s));
 	$s = str_replace(["\r\n","\n"],["",""],$s);
 	return(wordwrap(str_replace(['\\',',',';'],['\\\\','\\,','\\;'],$s),72,"\r\n ",true));
+
+}
+
+function format_ical_sourcetext($s) {
+	$s = base64_encode($s);
+	return(wordwrap(str_replace(['\\',',',';'],['\\\\','\\,','\\;'],$s),72,"\r\n ",true));
 }
 
 
@@ -623,12 +640,21 @@ function event_import_ical($ical, $uid) {
 		$ev['edited'] = datetime_convert('UTC','UTC',$edited->format(\DateTime::W3C));
 	}
 
-	if(isset($ical->LOCATION))
+	if(isset($ical->{'X-ZOT-LOCATION'}))
+		$ev['location'] = event_ical_get_sourcetext( (string) $ical->{'X-ZOT-LOCATION'});
+	elseif(isset($ical->LOCATION))
 		$ev['location'] = (string) $ical->LOCATION;
-	if(isset($ical->DESCRIPTION))
+
+	if(isset($ical->{'X-ZOT-DESCRIPTION'}))
+		$ev['description'] = event_ical_get_sourcetext( (string) $ical->{'X-ZOT-DESCRIPTION'});
+	elseif(isset($ical->DESCRIPTION))
 		$ev['description'] = (string) $ical->DESCRIPTION;
-	if(isset($ical->SUMMARY))
+
+	if(isset($ical->{'X-ZOT-SUMMARY'}))
+		$ev['summary'] = event_ical_get_sourcetext( (string) $ical->{'X-ZOT-SUMMARY'});
+	elseif(isset($ical->SUMMARY))
 		$ev['summary'] = (string) $ical->SUMMARY;
+
 	if(isset($ical->PRIORITY))
 		$ev['event_priority'] = intval((string) $ical->PRIORITY);
 
@@ -663,6 +689,10 @@ function event_import_ical($ical, $uid) {
 
 }
 
+function event_ical_get_sourcetext($s) {
+	return base64_decode($s);
+}
+
 function event_import_ical_task($ical, $uid) {
 
 	$c = q("select * from channel where channel_id = %d limit 1",
@@ -718,12 +748,21 @@ function event_import_ical_task($ical, $uid) {
 		$ev['edited'] = datetime_convert('UTC','UTC',$edited->format(\DateTime::W3C));
 	}
 
-	if(isset($ical->LOCATION))
+	if(isset($ical->{'X-ZOT-LOCATION'}))
+		$ev['location'] = event_ical_get_sourcetext( (string) $ical->{'X-ZOT-LOCATION'});
+	elseif(isset($ical->LOCATION))
 		$ev['location'] = (string) $ical->LOCATION;
-	if(isset($ical->DESCRIPTION))
+
+	if(isset($ical->{'X-ZOT-DESCRIPTION'}))
+		$ev['description'] = event_ical_get_sourcetext( (string) $ical->{'X-ZOT-DESCRIPTION'});
+	elseif(isset($ical->DESCRIPTION))
 		$ev['description'] = (string) $ical->DESCRIPTION;
-	if(isset($ical->SUMMARY))
+
+	if(isset($ical->{'X-ZOT-SUMMARY'}))
+		$ev['summary'] = event_ical_get_sourcetext( (string) $ical->{'X-ZOT-SUMMARY'});
+	elseif(isset($ical->SUMMARY))
 		$ev['summary'] = (string) $ical->SUMMARY;
+
 	if(isset($ical->PRIORITY))
 		$ev['event_priority'] = intval((string) $ical->PRIORITY);
 
diff --git a/include/text.php b/include/text.php
index c4fafd8ef..fbf6df49e 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3120,3 +3120,9 @@ function cleanup_bbcode($body) {
 	return $body;
 
 }
+
+// callback for array_walk
+
+function array_trim(&$v,$k) {
+	$v = trim($v);
+}
\ No newline at end of file
diff --git a/util/hmessages.po b/util/hmessages.po
index 8486a3e93..6f58c4244 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-23 00:05-0800\n"
+"POT-Creation-Date: 2017-01-06 00:05-0800\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"
@@ -93,11 +93,10 @@ msgstr ""
 #: ../../Zotlabs/Module/Settings/Channel.php:445
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1148
 #: ../../extend/addon/addon/cdav/cdav.php:277
-#: ../../extend/addon/addon/cdav/cdav.php:284
-#: ../../include/connections.php:863 ../../include/connections.php:870
-#: ../../include/selectors.php:49 ../../include/selectors.php:66
-#: ../../include/selectors.php:104 ../../include/selectors.php:140
-#: ../../include/permissions.php:949
+#: ../../extend/addon/addon/cdav/cdav.php:284 ../../include/selectors.php:49
+#: ../../include/selectors.php:66 ../../include/selectors.php:104
+#: ../../include/selectors.php:140 ../../include/connections.php:863
+#: ../../include/connections.php:870 ../../include/permissions.php:949
 msgid "Other"
 msgstr ""
 
@@ -211,7 +210,7 @@ msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:224 ../../Zotlabs/Module/Fbrowser.php:85
 #: ../../Zotlabs/Lib/Apps.php:219 ../../include/nav.php:96
-#: ../../include/conversation.php:1829
+#: ../../include/conversation.php:1843
 msgid "Files"
 msgstr ""
 
@@ -224,10 +223,10 @@ msgid "Shared"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:321
-#: ../../Zotlabs/Module/Connedit.php:859 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:859
 #: ../../Zotlabs/Module/New_channel.php:147
 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184
-#: ../../Zotlabs/Module/Webpages.php:239
+#: ../../Zotlabs/Module/Webpages.php:243
 #: ../../extend/addon/addon/cdav/include/widgets.php:127
 #: ../../extend/addon/addon/cdav/include/widgets.php:164
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151
@@ -271,28 +270,29 @@ msgstr ""
 msgid "Last Modified"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:238
+#: ../../Zotlabs/Storage/Browser.php:238 ../../Zotlabs/Module/Editpost.php:85
+#: ../../Zotlabs/Module/Editblock.php:109
 #: ../../Zotlabs/Module/Connections.php:300
 #: ../../Zotlabs/Module/Connections.php:320
 #: ../../Zotlabs/Module/Admin/Profs.php:154
 #: ../../Zotlabs/Module/Editlayout.php:114
 #: ../../Zotlabs/Module/Editwebpage.php:145 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Editblock.php:109 ../../Zotlabs/Module/Blocks.php:160
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Wiki.php:144
+#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:192
+#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Module/Wiki.php:144
 #: ../../Zotlabs/Module/Wiki.php:246
 #: ../../Zotlabs/Module/Settings/Oauth.php:149
 #: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:346
 #: ../../Zotlabs/Lib/ThreadItem.php:106
 #: ../../extend/addon/addon/cdav/include/widgets.php:125
 #: ../../extend/addon/addon/cdav/include/widgets.php:161
-#: ../../include/channel.php:961 ../../include/channel.php:965
-#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
-#: ../../include/menu.php:113
+#: ../../include/menu.php:113 ../../include/page_widgets.php:9
+#: ../../include/page_widgets.php:39 ../../include/channel.php:961
+#: ../../include/channel.php:965
 msgid "Edit"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Photos.php:1179
+#: ../../Zotlabs/Module/Editblock.php:134
 #: ../../Zotlabs/Module/Connections.php:271
 #: ../../Zotlabs/Module/Admin/Profs.php:155
 #: ../../Zotlabs/Module/Admin/Accounts.php:173
@@ -300,8 +300,8 @@ msgstr ""
 #: ../../Zotlabs/Module/Editlayout.php:137
 #: ../../Zotlabs/Module/Editwebpage.php:170
 #: ../../Zotlabs/Module/Connedit.php:641 ../../Zotlabs/Module/Connedit.php:861
-#: ../../Zotlabs/Module/Editblock.php:134 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Webpages.php:242
+#: ../../Zotlabs/Module/Group.php:177 ../../Zotlabs/Module/Blocks.php:162
+#: ../../Zotlabs/Module/Webpages.php:246
 #: ../../Zotlabs/Module/Settings/Oauth.php:150
 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/Apps.php:347
 #: ../../Zotlabs/Lib/ThreadItem.php:126
@@ -338,10 +338,10 @@ msgid "Drop files here to immediately upload"
 msgstr ""
 
 #: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Like.php:283
-#: ../../Zotlabs/Module/Profperm.php:28
-#: ../../Zotlabs/Module/Import_items.php:114 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68
-#: ../../Zotlabs/Module/Subthread.php:62
+#: ../../Zotlabs/Module/Group.php:72 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:68
+#: ../../Zotlabs/Module/Import_items.php:114
+#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
 #: ../../extend/addon/addon/frphotos/frphotos.php:81
 #: ../../extend/addon/addon/redfiles/redfiles.php:109
 #: ../../extend/addon/addon/redphotos/redphotos.php:119
@@ -351,12 +351,11 @@ msgstr ""
 
 #: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:67
 #: ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Channel.php:107 ../../Zotlabs/Module/Channel.php:237
-#: ../../Zotlabs/Module/Channel.php:277 ../../Zotlabs/Module/Message.php:18
+#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Photos.php:73
+#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Authtest.php:16
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editblock.php:67
 #: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
-#: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
 #: ../../Zotlabs/Module/Cover_photo.php:290
 #: ../../Zotlabs/Module/Editlayout.php:67
@@ -364,44 +363,45 @@ msgstr ""
 #: ../../Zotlabs/Module/Editwebpage.php:68
 #: ../../Zotlabs/Module/Editwebpage.php:89
 #: ../../Zotlabs/Module/Editwebpage.php:104
-#: ../../Zotlabs/Module/Editwebpage.php:126
-#: ../../Zotlabs/Module/Connedit.php:403 ../../Zotlabs/Module/Network.php:15
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Connedit.php:403
 #: ../../Zotlabs/Module/Filestorage.php:23
 #: ../../Zotlabs/Module/Filestorage.php:78
 #: ../../Zotlabs/Module/Filestorage.php:93
 #: ../../Zotlabs/Module/Filestorage.php:120
-#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94
-#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Events.php:267
+#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13
 #: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
-#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230
-#: ../../Zotlabs/Module/Item.php:1064 ../../Zotlabs/Module/Mitem.php:115
-#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Mood.php:116
-#: ../../Zotlabs/Module/Group.php:13 ../../Zotlabs/Module/Setup.php:212
-#: ../../Zotlabs/Module/New_channel.php:77
-#: ../../Zotlabs/Module/New_channel.php:104
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Mitem.php:115
+#: ../../Zotlabs/Module/Appman.php:76 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Profiles.php:197 ../../Zotlabs/Module/Profiles.php:607
+#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Invite.php:17
+#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/New_channel.php:77
+#: ../../Zotlabs/Module/New_channel.php:104 ../../Zotlabs/Module/Setup.php:212
 #: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137
 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
-#: ../../Zotlabs/Module/Appman.php:76 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Layouts.php:71
-#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Mail.php:164
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Rate.php:113
 #: ../../Zotlabs/Module/Profile_photo.php:273
 #: ../../Zotlabs/Module/Profile_photo.php:286
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Profiles.php:197
-#: ../../Zotlabs/Module/Profiles.php:595 ../../Zotlabs/Module/Editpost.php:17
-#: ../../Zotlabs/Module/Regmod.php:21 ../../Zotlabs/Module/Pdledit.php:29
+#: ../../Zotlabs/Module/Events.php:271 ../../Zotlabs/Module/Common.php:39
+#: ../../Zotlabs/Module/Channel.php:107 ../../Zotlabs/Module/Channel.php:237
+#: ../../Zotlabs/Module/Channel.php:277 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Message.php:18
 #: ../../Zotlabs/Module/Service_limits.php:11
 #: ../../Zotlabs/Module/Webpages.php:116
 #: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Wiki.php:189
 #: ../../Zotlabs/Module/Wiki.php:286 ../../Zotlabs/Module/Sources.php:74
 #: ../../Zotlabs/Module/Suggest.php:30 ../../Zotlabs/Module/Thing.php:274
 #: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335
+#: ../../Zotlabs/Module/Mail.php:164
 #: ../../Zotlabs/Module/Viewconnections.php:28
 #: ../../Zotlabs/Module/Viewconnections.php:33
 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Chat.php:100
-#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Item.php:219
+#: ../../Zotlabs/Module/Item.php:229 ../../Zotlabs/Module/Item.php:1061
+#: ../../Zotlabs/Lib/Chatroom.php:137
 #: ../../extend/addon/addon/friendica/dfrn_confirm.php:55
 #: ../../extend/addon/addon/keepout/keepout.php:36
 #: ../../extend/addon/addon/pumpio/pumpio.php:40
@@ -413,7 +413,7 @@ msgstr ""
 #: ../../include/attach.php:355 ../../include/attach.php:362
 #: ../../include/attach.php:439 ../../include/attach.php:906
 #: ../../include/attach.php:977 ../../include/attach.php:1135
-#: ../../include/items.php:3422 ../../include/photos.php:27
+#: ../../include/photos.php:27 ../../include/items.php:3422
 msgid "Permission denied."
 msgstr ""
 
@@ -437,13 +437,13 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
 #: ../../Zotlabs/Module/Achievements.php:15
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
 #: ../../Zotlabs/Module/Editlayout.php:31
 #: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Filestorage.php:59
-#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12
 #: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
-#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Connect.php:17
-#: ../../Zotlabs/Module/Webpages.php:33 ../../include/channel.php:862
+#: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Webpages.php:33
+#: ../../include/channel.php:862
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -451,6 +451,22 @@ msgstr ""
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Photos.php:509
+#: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Ratings.php:83
+#: ../../Zotlabs/Module/Directory.php:64
+#: ../../Zotlabs/Module/Viewconnections.php:23
+#: ../../extend/addon/addon/friendica/dfrn_request.php:794
+msgid "Public access denied."
+msgstr ""
+
+#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Admin.php:60
+#: ../../Zotlabs/Module/Admin/Plugins.php:254
+#: ../../Zotlabs/Module/Admin/Themes.php:69
+#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3343
+msgid "Item not found."
+msgstr ""
+
 #: ../../Zotlabs/Module/Register.php:49
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
@@ -598,166 +614,6 @@ msgstr ""
 msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Photos.php:509
-#: ../../Zotlabs/Module/Directory.php:64 ../../Zotlabs/Module/Ratings.php:83
-#: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:23
-#: ../../extend/addon/addon/friendica/dfrn_request.php:794
-msgid "Public access denied."
-msgstr ""
-
-#: ../../Zotlabs/Module/Display.php:40
-#: ../../Zotlabs/Module/Admin/Plugins.php:254
-#: ../../Zotlabs/Module/Admin/Themes.php:69
-#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Admin.php:60
-#: ../../Zotlabs/Module/Thing.php:89 ../../Zotlabs/Module/Viewsrc.php:24
-#: ../../include/items.php:3343
-msgid "Item not found."
-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:143 ../../Zotlabs/Module/Profiles.php:772
-#: ../../Zotlabs/Module/Wiki.php:147 ../../Zotlabs/Module/Chat.php:255
-msgid "Create New"
-msgstr ""
-
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:216
-#: ../../include/nav.php:209
-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/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:224
-#: ../../include/nav.php:95 ../../include/conversation.php:1822
-msgid "Photos"
-msgstr ""
-
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin/Plugins.php:414
-#: ../../Zotlabs/Module/Connedit.php:862 ../../Zotlabs/Module/Wiki.php:238
-#: ../../Zotlabs/Module/Wiki.php:261
-#: ../../Zotlabs/Module/Settings/Oauth.php:88
-#: ../../Zotlabs/Module/Settings/Oauth.php:114
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../extend/addon/addon/friendica/dfrn_request.php:879
-#: ../../extend/addon/addon/js_upload/js_upload.php:46
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:866
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
-#: ../../include/conversation.php:1394 ../../include/conversation.php:1443
-msgid "Cancel"
-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/Channel.php:32 ../../Zotlabs/Module/Wiki.php:20
-#: ../../Zotlabs/Module/Chat.php:25
-#: ../../extend/addon/addon/chess/chess.php:400
-msgid "You must be logged in to see this page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:44
-msgid "Posts and comments"
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:45
-msgid "Only posts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Channel.php:104
-msgid "Insufficient permissions.  Request redirected to profile page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
-msgid "This site is not a directory server"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dirsearch.php:33
-msgid "This directory server requires an access token"
-msgstr ""
-
-#: ../../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/Chanview.php:96
-#: ../../Zotlabs/Module/Wall_upload.php:31
-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/Profs.php:74
-#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:1000
-#: ../../include/text.php:1012 ../../include/widgets.php:201
-msgid "Save"
-msgstr ""
-
 #: ../../Zotlabs/Module/Photos.php:82
 msgid "Page owner information could not be retrieved."
 msgstr ""
@@ -824,15 +680,15 @@ msgid "Create a status post for this upload"
 msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:653 ../../Zotlabs/Module/Admin/Site.php:218
-#: ../../Zotlabs/Module/Connedit.php:417 ../../Zotlabs/Module/Connedit.php:730
 #: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Zotlabs/Module/Connedit.php:417 ../../Zotlabs/Module/Connedit.php:730
 #: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
-#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
-#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Profiles.php:641
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Wiki.php:159
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:653
+#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Wiki.php:159
 #: ../../Zotlabs/Module/Settings/Channel.php:289
 #: ../../Zotlabs/Module/Settings/Display.php:103
 #: ../../extend/addon/addon/dwpost/dwpost.php:73
@@ -887,14 +743,15 @@ msgid "No"
 msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:653 ../../Zotlabs/Module/Admin/Site.php:220
-#: ../../Zotlabs/Module/Connedit.php:417 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
-#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
-#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Profiles.php:641
-#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Wiki.php:159
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Zotlabs/Module/Connedit.php:417
+#: ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
+#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:653
+#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Events.php:470
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63
+#: ../../Zotlabs/Module/Wiki.php:159
 #: ../../Zotlabs/Module/Settings/Channel.php:289
 #: ../../Zotlabs/Module/Settings/Display.php:103
 #: ../../extend/addon/addon/dwpost/dwpost.php:73
@@ -965,6 +822,7 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:668 ../../Zotlabs/Module/Photos.php:1058
 #: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1216
+#: ../../Zotlabs/Module/Connect.php:98
 #: ../../Zotlabs/Module/Admin/Features.php:66
 #: ../../Zotlabs/Module/Admin/Logs.php:84
 #: ../../Zotlabs/Module/Admin/Plugins.php:429
@@ -974,18 +832,17 @@ msgstr ""
 #: ../../Zotlabs/Module/Admin/Account_edit.php:74
 #: ../../Zotlabs/Module/Admin/Accounts.php:166
 #: ../../Zotlabs/Module/Admin/Channels.php:147
-#: ../../Zotlabs/Module/Admin/Site.php:260 ../../Zotlabs/Module/Import.php:543
-#: ../../Zotlabs/Module/Connedit.php:824 ../../Zotlabs/Module/Cal.php:342
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Events.php:484
-#: ../../Zotlabs/Module/Import_items.php:122
-#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Setup.php:309
-#: ../../Zotlabs/Module/Setup.php:357 ../../Zotlabs/Module/Poke.php:186
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Appman.php:127
-#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Mail.php:413
-#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Pdledit.php:74
-#: ../../Zotlabs/Module/Connect.php:98 ../../Zotlabs/Module/Wiki.php:148
+#: ../../Zotlabs/Module/Admin/Site.php:260 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Connedit.php:824
+#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Cal.php:342
+#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Import.php:543 ../../Zotlabs/Module/Mitem.php:243
+#: ../../Zotlabs/Module/Appman.php:127 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Invite.php:149
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357
+#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Events.php:493
+#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Wiki.php:148
 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
 #: ../../Zotlabs/Module/Settings/Features.php:47
 #: ../../Zotlabs/Module/Settings/Oauth.php:87
@@ -994,8 +851,9 @@ msgstr ""
 #: ../../Zotlabs/Module/Settings/Display.php:196
 #: ../../Zotlabs/Module/Settings/Tokens.php:167
 #: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:241
-#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:731
+#: ../../Zotlabs/Module/Mail.php:413 ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:241 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:731
 #: ../../extend/addon/addon/chords/Mod_Chords.php:60
 #: ../../extend/addon/addon/diaspora/diaspora.php:710
 #: ../../extend/addon/addon/dwpost/dwpost.php:89
@@ -1093,8 +951,8 @@ msgid "Private Photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:940 ../../Zotlabs/Module/Cal.php:336
-#: ../../Zotlabs/Module/Cal.php:343 ../../Zotlabs/Module/Events.php:680
-#: ../../Zotlabs/Module/Events.php:689
+#: ../../Zotlabs/Module/Cal.php:343 ../../Zotlabs/Module/Events.php:689
+#: ../../Zotlabs/Module/Events.php:698
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:846
 msgid "Previous"
 msgstr ""
@@ -1104,8 +962,8 @@ msgid "View Full Size"
 msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:949 ../../Zotlabs/Module/Cal.php:337
-#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Events.php:681
-#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Setup.php:264
+#: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Setup.php:264
+#: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:847
 msgid "Next"
 msgstr ""
@@ -1166,7 +1024,7 @@ msgid "I don't like this (toggle)"
 msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Module/Blocks.php:161
-#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Webpages.php:241
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Webpages.php:245
 #: ../../extend/addon/addon/cdav/include/widgets.php:123
 #: ../../include/conversation.php:1378
 msgid "Share"
@@ -1187,8 +1045,8 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Module/Events.php:471
-#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/ThreadItem.php:740
+#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Module/Events.php:478
+#: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/ThreadItem.php:740
 #: ../../include/page_widgets.php:43 ../../include/conversation.php:1347
 msgid "Preview"
 msgstr ""
@@ -1235,13 +1093,13 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
 #: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198
-#: ../../include/conversation.php:1913
+#: ../../include/conversation.php:1928
 msgid "View all"
 msgstr ""
 
 #: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/channel.php:1190 ../../include/conversation.php:1937
-#: ../../include/taxonomy.php:403
+#: ../../include/taxonomy.php:403 ../../include/channel.php:1190
+#: ../../include/conversation.php:1952
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
@@ -1249,7 +1107,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:195
-#: ../../include/conversation.php:1940
+#: ../../include/conversation.php:1955
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -1292,6 +1150,271 @@ msgstr ""
 msgid "Recent Photos"
 msgstr ""
 
+#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editblock.php:79
+#: ../../Zotlabs/Module/Editblock.php:95
+#: ../../Zotlabs/Module/Editlayout.php:79
+#: ../../Zotlabs/Module/Editwebpage.php:80
+msgid "Item not found"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:138
+msgid "Edit post"
+msgstr ""
+
+#: ../../Zotlabs/Module/Acl.php:313
+msgid "network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Acl.php:323
+msgid "RSS"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:23
+msgid "Documentation Search"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1827
+msgid "About"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:197
+msgid "Members"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:82
+msgid "Administrators"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:83
+msgid "Developers"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:84
+msgid "Tutorials"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:93
+msgid "$Projectname Documentation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Help.php:94
+msgid "Contents"
+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/Admin.php:94
+msgid "# Accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:95
+msgid "# blocked accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:96
+msgid "# expired accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:97
+msgid "# expiring accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:108
+msgid "# Channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:109
+msgid "# primary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:110
+msgid "# clones"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:116
+msgid "Message queues"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:133
+msgid "Your software should be updated"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:137 ../../Zotlabs/Module/Admin/Logs.php:82
+#: ../../Zotlabs/Module/Admin/Plugins.php:336
+#: ../../Zotlabs/Module/Admin/Plugins.php:427
+#: ../../Zotlabs/Module/Admin/Security.php:86
+#: ../../Zotlabs/Module/Admin/Themes.php:120
+#: ../../Zotlabs/Module/Admin/Themes.php:154
+#: ../../Zotlabs/Module/Admin/Accounts.php:164
+#: ../../Zotlabs/Module/Admin/Channels.php:145
+#: ../../Zotlabs/Module/Admin/Site.php:258
+msgid "Administration"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:138
+msgid "Summary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:141
+msgid "Registered accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:142
+msgid "Pending registrations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:143
+msgid "Registered channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:144
+msgid "Active plugins"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:145
+msgid "Version"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:146
+msgid "Repository version (master)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:147
+msgid "Repository version (dev)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97
+#: ../../Zotlabs/Module/Blocks.php:155
+msgid "Block Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:111
+#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:287
+#: ../../Zotlabs/Module/Mail.php:412 ../../Zotlabs/Module/Chat.php:207
+#: ../../include/conversation.php:1295
+msgid "Insert web link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1406
+msgid "Title (optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
+msgstr ""
+
+#: ../../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/Chanview.php:96
+#: ../../Zotlabs/Module/Wall_upload.php:31
+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/Profs.php:74
+#: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:1000
+#: ../../include/text.php:1012 ../../include/widgets.php:201
+msgid "Save"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:254
+msgid "sent you a private message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:302
+msgid "added your channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:312
+msgid "g A l F d"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:330
+msgid "[today]"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ping.php:339
+msgid "posted an event"
+msgstr ""
+
 #: ../../Zotlabs/Module/Connections.php:56
 #: ../../Zotlabs/Module/Connections.php:161
 #: ../../Zotlabs/Module/Connections.php:250
@@ -1421,14 +1544,14 @@ msgid "Recent activity"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Lib/Apps.php:211
-#: ../../include/text.php:929 ../../include/nav.php:189
+#: ../../include/nav.php:189 ../../include/text.php:929
 msgid "Connections"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Search.php:44
 #: ../../Zotlabs/Lib/Apps.php:232 ../../include/acl_selectors.php:203
-#: ../../include/text.php:999 ../../include/text.php:1011
-#: ../../include/nav.php:168 ../../include/widgets.php:315
+#: ../../include/nav.php:168 ../../include/text.php:999
+#: ../../include/text.php:1011 ../../include/widgets.php:315
 msgid "Search"
 msgstr ""
 
@@ -1441,8 +1564,8 @@ msgid "Connections search"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:319
-#: ../../Zotlabs/Module/Directory.php:391
-#: ../../Zotlabs/Module/Directory.php:396 ../../include/contact_widgets.php:23
+#: ../../Zotlabs/Module/Directory.php:392
+#: ../../Zotlabs/Module/Directory.php:397 ../../include/contact_widgets.php:23
 msgid "Find"
 msgstr ""
 
@@ -1580,18 +1703,6 @@ msgstr ""
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin/Logs.php:82
-#: ../../Zotlabs/Module/Admin/Plugins.php:336
-#: ../../Zotlabs/Module/Admin/Plugins.php:427
-#: ../../Zotlabs/Module/Admin/Security.php:86
-#: ../../Zotlabs/Module/Admin/Themes.php:120
-#: ../../Zotlabs/Module/Admin/Themes.php:154
-#: ../../Zotlabs/Module/Admin/Accounts.php:164
-#: ../../Zotlabs/Module/Admin/Channels.php:145
-#: ../../Zotlabs/Module/Admin/Site.php:258 ../../Zotlabs/Module/Admin.php:137
-msgid "Administration"
-msgstr ""
-
 #: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1588
 #: ../../include/widgets.php:1598
 msgid "Logs"
@@ -1718,6 +1829,21 @@ msgstr ""
 msgid "Install"
 msgstr ""
 
+#: ../../Zotlabs/Module/Admin/Plugins.php:414
+#: ../../Zotlabs/Module/Connedit.php:862 ../../Zotlabs/Module/Fbrowser.php:66
+#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Wiki.php:238
+#: ../../Zotlabs/Module/Wiki.php:261
+#: ../../Zotlabs/Module/Settings/Oauth.php:88
+#: ../../Zotlabs/Module/Settings/Oauth.php:114
+#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
+#: ../../extend/addon/addon/friendica/dfrn_request.php:879
+#: ../../extend/addon/addon/js_upload/js_upload.php:46
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:866
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154
+#: ../../include/conversation.php:1394 ../../include/conversation.php:1443
+msgid "Cancel"
+msgstr ""
+
 #: ../../Zotlabs/Module/Admin/Plugins.php:435
 msgid "Manage Repos"
 msgstr ""
@@ -2206,7 +2332,7 @@ msgid "Disallow Code"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Channels.php:154
-#: ../../include/conversation.php:1801
+#: ../../include/conversation.php:1815
 msgid "Channel"
 msgstr ""
 
@@ -2215,8 +2341,8 @@ msgid "UID"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin/Channels.php:160
-#: ../../Zotlabs/Module/Connedit.php:851 ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Profiles.php:464
+#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:851
+#: ../../Zotlabs/Module/Profiles.php:474
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143
 msgid "Address"
 msgstr ""
@@ -2643,11 +2769,14 @@ msgstr ""
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:80
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editpost.php:24
-msgid "Item not found"
+#: ../../Zotlabs/Module/Search.php:223
+#, php-format
+msgid "Items tagged with: %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Search.php:225
+#, php-format
+msgid "Search results for: %s"
 msgstr ""
 
 #: ../../Zotlabs/Module/Editlayout.php:127
@@ -2668,112 +2797,375 @@ msgstr ""
 msgid "Page link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editwebpage.php:146
-#: ../../Zotlabs/Module/Editblock.php:111 ../../Zotlabs/Module/Mail.php:287
-#: ../../Zotlabs/Module/Mail.php:412 ../../Zotlabs/Module/Chat.php:207
-#: ../../include/conversation.php:1295
-msgid "Insert web link"
-msgstr ""
-
 #: ../../Zotlabs/Module/Editwebpage.php:169
 msgid "Edit Webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:33
+#: ../../Zotlabs/Module/Like.php:19
+msgid "Like/Dislike"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:24
+msgid "This action is restricted to members."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:25
+msgid ""
+"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
+"\"register\">register as a new $Projectname member</a> to continue."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
+#: ../../Zotlabs/Module/Like.php:169
+msgid "Invalid request."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
+msgid "channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:146
+msgid "thing"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:192
+msgid "Channel unavailable."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:240
+msgid "Previous action reversed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47
+#: ../../extend/addon/addon/diaspora/inbound.php:1794
+#: ../../extend/addon/addon/redphotos/redphotohelper.php:74
+#: ../../include/text.php:1953 ../../include/conversation.php:120
+msgid "photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../extend/addon/addon/diaspora/inbound.php:1794
+#: ../../include/text.php:1959 ../../include/conversation.php:148
+msgid "status"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:1000
+#: ../../include/text.php:1956 ../../include/conversation.php:123
+msgid "event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:419
+#: ../../extend/addon/addon/diaspora/inbound.php:1823
+#: ../../include/conversation.php:164
 #, php-format
-msgid "Your service plan only allows %d channels."
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:83 ../../Zotlabs/Module/Import.php:98
-#: ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
+#: ../../Zotlabs/Module/Like.php:423
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:105
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
+#: ../../Zotlabs/Module/Like.php:425
+#, php-format
+msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:127
-#: ../../Zotlabs/Module/Import_items.php:88
+#: ../../Zotlabs/Module/Like.php:427
 #, php-format
-msgid "Warning: Database versions differ by %1$d updates."
+msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:157 ../../include/import.php:100
-msgid "Cloned channel not found. Import failed."
+#: ../../Zotlabs/Module/Like.php:429
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:167
-msgid "No channel. Import failed."
+#: ../../Zotlabs/Module/Like.php:431
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:503
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
+#: ../../Zotlabs/Module/Like.php:433
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:525
-msgid "You must be logged in to use this feature."
+#: ../../Zotlabs/Module/Like.php:538
+msgid "Action completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:530
-msgid "Import Channel"
+#: ../../Zotlabs/Module/Like.php:539
+msgid "Thank you."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:531
-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/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
+msgid "This site is not a directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:532
-#: ../../Zotlabs/Module/Import_items.php:121
-msgid "File to Upload"
+#: ../../Zotlabs/Module/Dirsearch.php:33
+msgid "This directory server requires an access token"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:533
-msgid "Or provide the old server/hub details"
+#: ../../Zotlabs/Module/Network.php:96
+msgid "No such group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:534
-msgid "Your old identity address (xyz@example.com)"
+#: ../../Zotlabs/Module/Network.php:136
+msgid "No such channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:535
-msgid "Your old login email address"
+#: ../../Zotlabs/Module/Network.php:141
+msgid "forum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:536
-msgid "Your old login password"
+#: ../../Zotlabs/Module/Network.php:153
+msgid "Search Results For:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:537
+#: ../../Zotlabs/Module/Network.php:221
+msgid "Privacy group is empty"
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:230
+msgid "Privacy group: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Network.php:256
+msgid "Invalid connection."
+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:2284
+msgid "Menus"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120
+msgid "Drop"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157
+#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Webpages.php:255
+#: ../../include/page_widgets.php:47
+msgid "Created"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Blocks.php:158
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:256
+#: ../../include/page_widgets.php:48
+msgid "Edited"
+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/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 ""
-"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."
+"Please select another location to become primary before removing the primary "
+"location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:538
-msgid "Make this hub my primary location"
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:539
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51
+#: ../../Zotlabs/Module/Profiles.php:481 ../../Zotlabs/Module/Profiles.php:704
+#: ../../Zotlabs/Module/Events.php:475
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839
+#: ../../include/js_strings.php:25
+msgid "Location"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
+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 ""
-"Import existing posts if possible (experimental - limited by available memory"
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:540
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1385
+msgid "Public Hubs"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:27
 msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
+"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:33
+msgid "Hub URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Access Type"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Registration Policy"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Stats"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Software"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
+#: ../../include/conversation.php:941 ../../include/conversation.php:1099
+msgid "Ratings"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:48
+msgid "Rate"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Events.php:694
+#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Wiki.php:146
+#: ../../include/page_widgets.php:42
+msgid "View"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ffsapi.php:12
+msgid "Share content from Firefox to $Projectname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Ffsapi.php:15
+msgid "Activate the Firefox $Projectname provider"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connedit.php:82
@@ -2912,9 +3304,10 @@ msgstr ""
 #: ../../Zotlabs/Module/Settings/Channel.php:65
 #: ../../Zotlabs/Module/Settings/Channel.php:66
 #: ../../Zotlabs/Module/Settings/Channel.php:69
-#: ../../Zotlabs/Module/Settings/Channel.php:80 ../../include/channel.php:402
+#: ../../Zotlabs/Module/Settings/Channel.php:80
+#: ../../include/selectors.php:123 ../../include/channel.php:402
 #: ../../include/channel.php:403 ../../include/channel.php:410
-#: ../../include/selectors.php:123 ../../include/widgets.php:531
+#: ../../include/widgets.php:531
 msgid "Friends"
 msgstr ""
 
@@ -3115,8 +3508,8 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Connedit.php:854
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146
-#: ../../extend/addon/addon/cdav/cdav.php:271
-#: ../../include/connections.php:857 ../../include/nav.php:88
+#: ../../extend/addon/addon/cdav/cdav.php:271 ../../include/nav.php:88
+#: ../../include/connections.php:857
 msgid "Home"
 msgstr ""
 
@@ -3168,996 +3561,938 @@ msgstr ""
 msgid "ZIP Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:869 ../../Zotlabs/Module/Profiles.php:715
+#: ../../Zotlabs/Module/Connedit.php:869 ../../Zotlabs/Module/Profiles.php:727
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161
 msgid "Country"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:96
-msgid "No such group"
+#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
+msgid "$Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:136
-msgid "No such channel"
+#: ../../Zotlabs/Module/Home.php:92
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:141
-msgid "forum"
+#: ../../Zotlabs/Module/Filestorage.php:87
+msgid "Permission Denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:153
-msgid "Search Results For:"
+#: ../../Zotlabs/Module/Filestorage.php:103
+msgid "File not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:221
-msgid "Privacy group is empty"
+#: ../../Zotlabs/Module/Filestorage.php:146
+msgid "Edit file permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:230
-msgid "Privacy group: "
+#: ../../Zotlabs/Module/Filestorage.php:159
+msgid "Set/edit permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:256
-msgid "Invalid connection."
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Include all files and sub folders"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
+#: ../../Zotlabs/Module/Filestorage.php:161
+msgid "Return to file list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Copy/paste this code to attach file to a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
+#: ../../Zotlabs/Module/Filestorage.php:166
+msgid "Share this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
+#: ../../Zotlabs/Module/Filestorage.php:167
+msgid "Show URL to this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
+#: ../../Zotlabs/Module/Filestorage.php:168
+msgid "Notify your contacts about this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
+#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:224
+#: ../../include/nav.php:95 ../../include/conversation.php:1836
+msgid "Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
+#: ../../Zotlabs/Module/Match.php:26
+msgid "Profile Match"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
+#: ../../Zotlabs/Module/Match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2284
-msgid "Menus"
+#: ../../Zotlabs/Module/Match.php:67
+msgid "is interested in:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120
-msgid "Drop"
+#: ../../Zotlabs/Module/Match.php:68 ../../Zotlabs/Module/Directory.php:329
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/connections.php:78
+#: ../../include/channel.php:1036 ../../include/widgets.php:147
+#: ../../include/widgets.php:184 ../../include/conversation.php:938
+#: ../../include/conversation.php:1069
+msgid "Connect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Webpages.php:251
-#: ../../include/page_widgets.php:47
-msgid "Created"
+#: ../../Zotlabs/Module/Match.php:74
+msgid "No matches"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Blocks.php:158
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:252
-#: ../../include/page_widgets.php:48
-msgid "Edited"
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
+#: ../../Zotlabs/Module/Cal.php:263 ../../Zotlabs/Module/Events.php:605
+msgid "l, F j"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
+#: ../../Zotlabs/Module/Cal.php:312 ../../Zotlabs/Module/Events.php:660
+#: ../../include/text.php:1761
+msgid "Link to Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
+#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
+msgid "Edit Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
+#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:688
+msgid "Create Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:136
-msgid "Menu could not be deleted."
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:691
+msgid "Export"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
-msgid "Menu not found."
+#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2307
+msgid "Import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
+#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:700
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
+msgid "Today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
+#: ../../Zotlabs/Module/Group.php:24
+msgid "Privacy group created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
+#: ../../Zotlabs/Module/Group.php:30
+msgid "Could not create privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../include/items.php:3876
+msgid "Privacy group not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
+#: ../../Zotlabs/Module/Group.php:58
+msgid "Privacy group updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title as seen by others"
+#: ../../Zotlabs/Module/Group.php:90
+msgid "Create a group of channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:157
-msgid "Allow bookmarks"
+#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+msgid "Privacy group name: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+msgid "Members are visible to other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
+#: ../../Zotlabs/Module/Group.php:111
+msgid "Privacy group removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:263 ../../Zotlabs/Module/Events.php:596
-msgid "l, F j"
+#: ../../Zotlabs/Module/Group.php:113
+msgid "Unable to remove privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:312 ../../Zotlabs/Module/Events.php:651
-#: ../../include/text.php:1761
-msgid "Link to Source"
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:679
-msgid "Edit Event"
+#: ../../Zotlabs/Module/Group.php:199
+msgid "All Connected Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:335 ../../Zotlabs/Module/Events.php:679
-msgid "Create Event"
+#: ../../Zotlabs/Module/Group.php:231
+msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:682
-msgid "Export"
+#: ../../Zotlabs/Module/Dreport.php:45
+msgid "Invalid message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:341 ../../include/text.php:2307
-msgid "Import"
+#: ../../Zotlabs/Module/Dreport.php:78
+msgid "no results"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:691
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848
-msgid "Today"
+#: ../../Zotlabs/Module/Dreport.php:93
+msgid "channel sync processed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rpost.php:138 ../../Zotlabs/Module/Editpost.php:107
-msgid "Edit post"
+#: ../../Zotlabs/Module/Dreport.php:97
+msgid "queued"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:19
-msgid "Like/Dislike"
+#: ../../Zotlabs/Module/Dreport.php:101
+msgid "posted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:24
-msgid "This action is restricted to members."
+#: ../../Zotlabs/Module/Dreport.php:105
+msgid "accepted for delivery"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:25
-msgid ""
-"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
-"\"register\">register as a new $Projectname member</a> to continue."
+#: ../../Zotlabs/Module/Dreport.php:109
+msgid "updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
-#: ../../Zotlabs/Module/Like.php:169
-msgid "Invalid request."
+#: ../../Zotlabs/Module/Dreport.php:112
+msgid "update ignored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
-msgid "channel"
+#: ../../Zotlabs/Module/Dreport.php:115
+msgid "permission denied"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:146
-msgid "thing"
+#: ../../Zotlabs/Module/Dreport.php:119
+msgid "recipient not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:192
-msgid "Channel unavailable."
+#: ../../Zotlabs/Module/Dreport.php:122
+msgid "mail recalled"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:240
-msgid "Previous action reversed."
+#: ../../Zotlabs/Module/Dreport.php:125
+msgid "duplicate mail received"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47
-#: ../../extend/addon/addon/diaspora/inbound.php:1794
-#: ../../extend/addon/addon/redphotos/redphotohelper.php:74
-#: ../../include/text.php:1953 ../../include/conversation.php:120
-msgid "photo"
+#: ../../Zotlabs/Module/Dreport.php:128
+msgid "mail delivered"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../extend/addon/addon/diaspora/inbound.php:1794
-#: ../../include/text.php:1959 ../../include/conversation.php:148
-msgid "status"
+#: ../../Zotlabs/Module/Dreport.php:148
+#, php-format
+msgid "Delivery report for %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:256
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:961
-#: ../../include/text.php:1956 ../../include/conversation.php:123
-msgid "event"
+#: ../../Zotlabs/Module/Dreport.php:151
+msgid "Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:419
-#: ../../extend/addon/addon/diaspora/inbound.php:1823
-#: ../../include/conversation.php:164
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../Zotlabs/Module/Dreport.php:152
+msgid "Redeliver"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
+msgid "webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:423
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
+msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:425
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
+msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:427
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
+msgid "menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:429
+#: ../../Zotlabs/Module/Impel.php:191
 #, php-format
-msgid "%1$s is attending %2$s's %3$s"
+msgid "%s element installed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:431
+#: ../../Zotlabs/Module/Impel.php:194
 #, php-format
-msgid "%1$s is not attending %2$s's %3$s"
+msgid "%s element installation failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:433
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
+#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:71
+msgid "Nothing to import."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:538
-msgid "Action completed."
+#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:83
+#: ../../Zotlabs/Module/Import.php:98
+msgid "Unable to download data from old server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:539
-msgid "Thank you."
+#: ../../Zotlabs/Module/Import_items.php:72
+#: ../../Zotlabs/Module/Import.php:105
+msgid "Imported file is empty."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
+#: ../../Zotlabs/Module/Import_items.php:88
+#: ../../Zotlabs/Module/Import.php:127
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1282
-msgid "Profile"
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid "Use this form to import existing posts and content from an export file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
+#: ../../Zotlabs/Module/Import_items.php:121
+#: ../../Zotlabs/Module/Import.php:532
+msgid "File to Upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
-msgid "Share content from Firefox to $Projectname"
+#: ../../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/Ffsapi.php:15
-msgid "Activate the Firefox $Projectname provider"
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create a new channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:117
-msgid "Away"
+#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:784
+#: ../../Zotlabs/Module/Wiki.php:147 ../../Zotlabs/Module/Chat.php:255
+msgid "Create New"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chatsvc.php:122
-msgid "Online"
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:216
+#: ../../include/nav.php:209
+msgid "Channel Manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82
-msgid "$Projectname"
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Home.php:92
-#, php-format
-msgid "Welcome to %s"
+#: ../../Zotlabs/Module/Manage.php:167
+msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:87
-msgid "Permission Denied."
+#: ../../Zotlabs/Module/Manage.php:168
+msgid "Default Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:103
-msgid "File not found."
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:146
-msgid "Edit file permissions"
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:159
-msgid "Set/edit permissions"
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:160
-msgid "Include all files and sub folders"
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Return to file list"
+#: ../../Zotlabs/Module/Import.php:33
+#, php-format
+msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Copy/paste this code to attach file to a post"
+#: ../../Zotlabs/Module/Import.php:157 ../../include/import.php:100
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Copy/paste this URL to link file from a web page"
+#: ../../Zotlabs/Module/Import.php:167
+msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:166
-msgid "Share this file"
+#: ../../Zotlabs/Module/Import.php:503
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:167
-msgid "Show URL to this file"
+#: ../../Zotlabs/Module/Import.php:525
+msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:168
-msgid "Notify your contacts about this file"
+#: ../../Zotlabs/Module/Import.php:530
+msgid "Import Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97
-#: ../../Zotlabs/Module/Blocks.php:155
-msgid "Block Name"
+#: ../../Zotlabs/Module/Import.php:531
+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/Editblock.php:124 ../../include/conversation.php:1406
-msgid "Title (optional)"
+#: ../../Zotlabs/Module/Import.php:533
+msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
+#: ../../Zotlabs/Module/Import.php:534
+msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
+#: ../../Zotlabs/Module/Import.php:535
+msgid "Your old login email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
+#: ../../Zotlabs/Module/Import.php:536
+msgid "Your old login password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:66
+#: ../../Zotlabs/Module/Import.php:537
 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"
+"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/Locs.php:117 ../../Zotlabs/Module/Events.php:468
-#: ../../Zotlabs/Module/Pubsites.php:51 ../../Zotlabs/Module/Profiles.php:471
-#: ../../Zotlabs/Module/Profiles.php:692
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839
-#: ../../include/js_strings.php:25
-msgid "Location"
+#: ../../Zotlabs/Module/Import.php:538
+msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
+#: ../../Zotlabs/Module/Import.php:539
+msgid ""
+"Import existing posts if possible (experimental - limited by available memory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
+#: ../../Zotlabs/Module/Import.php:540
+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/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
+#: ../../Zotlabs/Module/Lockview.php:75
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing "
-"your channel."
+#: ../../Zotlabs/Module/Lockview.php:96
+msgid "Visible to:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
+#: ../../Zotlabs/Module/Magic.php:71
+msgid "Hub not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
+#: ../../Zotlabs/Module/Mitem.php:52
+msgid "Unable to create element."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../Zotlabs/Module/Mitem.php:76
+msgid "Unable to update menu element."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:67
-msgid "Please join us on $Projectname"
+#: ../../Zotlabs/Module/Mitem.php:92
+msgid "Unable to add menu element."
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:77
-msgid "Invitation limit exceeded. Please contact your site administrator."
+#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
+msgid "Menu Item Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:82
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
+#: ../../Zotlabs/Module/Settings/Channel.php:489
+msgid "(click to open/close)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:86
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Invite.php:105
-msgid "You have no more invitations available"
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
+msgid "Link Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Send invitations"
+#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
+msgid "Link or Submenu Target"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:137
-msgid "Enter email addresses, one per line:"
+#: ../../Zotlabs/Module/Mitem.php:161
+msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
-msgid "Your message:"
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
+msgid "Use magic-auth if available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:139
-msgid "Please join my community on $Projectname."
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
+msgid "Open link in new window"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "You will need to supply this invitation code:"
+#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+msgid "Order in list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "1. Register at any $Projectname location (they are all inter-connected)"
+#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+msgid "Higher numbers will sink to bottom of listing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "2. Enter my $Projectname network address into the site searchbar."
+#: ../../Zotlabs/Module/Mitem.php:165
+msgid "Submit and finish"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:145
-msgid "or visit"
+#: ../../Zotlabs/Module/Mitem.php:166
+msgid "Submit and continue"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:147
-msgid "3. Click [Connect]"
+#: ../../Zotlabs/Module/Mitem.php:174
+msgid "Menu:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:313
-msgid "network"
+#: ../../Zotlabs/Module/Mitem.php:177
+msgid "Link Target"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:323
-msgid "RSS"
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Edit menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:25
-msgid "Calendar entries imported."
+#: ../../Zotlabs/Module/Mitem.php:183
+msgid "Edit element"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:27
-msgid "No calendar entries found."
+#: ../../Zotlabs/Module/Mitem.php:184
+msgid "Drop element"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:106
-msgid "Event can not end before it has started."
+#: ../../Zotlabs/Module/Mitem.php:185
+msgid "New element"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:108 ../../Zotlabs/Module/Events.php:117
-#: ../../Zotlabs/Module/Events.php:139
-msgid "Unable to generate preview."
+#: ../../Zotlabs/Module/Mitem.php:186
+msgid "Edit this menu container"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:115
-msgid "Event title and start time are required."
+#: ../../Zotlabs/Module/Mitem.php:187
+msgid "Add menu element"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:137 ../../Zotlabs/Module/Events.php:261
-msgid "Event not found."
+#: ../../Zotlabs/Module/Mitem.php:188
+msgid "Delete this menu item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:453
-msgid "Edit event title"
+#: ../../Zotlabs/Module/Mitem.php:189
+msgid "Edit this menu item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:453
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
-msgid "Event title"
+#: ../../Zotlabs/Module/Mitem.php:206
+msgid "Menu item not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:453 ../../Zotlabs/Module/Events.php:458
-#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Appman.php:117
-#: ../../Zotlabs/Module/Profiles.php:703 ../../Zotlabs/Module/Profiles.php:707
-#: ../../include/datetime.php:259
-msgid "Required"
+#: ../../Zotlabs/Module/Mitem.php:219
+msgid "Menu item deleted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Categories (comma-separated list)"
+#: ../../Zotlabs/Module/Mitem.php:221
+msgid "Menu item could not be deleted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:456
-msgid "Edit Category"
+#: ../../Zotlabs/Module/Mitem.php:228
+msgid "Edit Menu Element"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:456
-msgid "Category"
+#: ../../Zotlabs/Module/Mitem.php:238
+msgid "Link text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:459
-msgid "Edit start date and time"
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+msgid "App installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:459
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
-msgid "Start date and time"
+#: ../../Zotlabs/Module/Appman.php:46
+msgid "Malformed app."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:463
-msgid "Finish date and time are not known or not relevant"
+#: ../../Zotlabs/Module/Appman.php:105
+msgid "Embed code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Edit finish date and time"
+#: ../../Zotlabs/Module/Appman.php:111 ../../include/widgets.php:107
+msgid "Edit App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:462
-msgid "Finish date and time"
+#: ../../Zotlabs/Module/Appman.php:111
+msgid "Create App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Events.php:465
-msgid "Adjust for viewer timezone"
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Name of app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:464
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
+#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Appman.php:117
+#: ../../Zotlabs/Module/Profiles.php:715 ../../Zotlabs/Module/Profiles.php:719
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465
+#: ../../include/datetime.php:259
+msgid "Required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:466
-msgid "Edit Description"
+#: ../../Zotlabs/Module/Appman.php:117
+msgid "Location (URL) of app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Appman.php:118
+#: ../../Zotlabs/Module/Appman.php:118 ../../Zotlabs/Module/Events.php:473
 #: ../../Zotlabs/Module/Rbmark.php:101
 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:838
 #: ../../extend/addon/addon/rendezvous/rendezvous.php:165
 msgid "Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:468
-msgid "Edit Location"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:472 ../../include/conversation.php:1410
-msgid "Permission settings"
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "Photo icon URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:485
-msgid "Advanced Options"
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "80 x 80 pixels - optional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:624
-msgid "Edit event"
+#: ../../Zotlabs/Module/Appman.php:120
+msgid "Categories (optional, comma separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:626
-msgid "Delete event"
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Version ID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:660
-msgid "calendar"
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Price of app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:685 ../../Zotlabs/Module/Pubsites.php:59
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:197
-#: ../../Zotlabs/Module/Webpages.php:246 ../../Zotlabs/Module/Wiki.php:146
-#: ../../include/page_widgets.php:42
-msgid "View"
+#: ../../Zotlabs/Module/Appman.php:123
+msgid "Location (URL) to purchase app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:686
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
-msgid "Month"
+#: ../../Zotlabs/Module/Ratings.php:70
+msgid "No ratings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:687
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
-msgid "Week"
+#: ../../Zotlabs/Module/Ratings.php:98
+msgid "Rating: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:688
-#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
-msgid "Day"
+#: ../../Zotlabs/Module/Ratings.php:99
+msgid "Website: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:722
-msgid "Event removed"
+#: ../../Zotlabs/Module/Ratings.php:101
+msgid "Description: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:725
-msgid "Failed to remove event"
+#: ../../Zotlabs/Module/Attach.php:13
+msgid "Item not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:245
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
 #, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Directory.php:256
-msgid "Gender: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:258
-msgid "Status: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:260
-msgid "Homepage: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1215
-msgid "Age:"
+msgctxt "mood"
+msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:314 ../../include/event.php:52
-#: ../../include/event.php:84 ../../include/bb2diaspora.php:526
-#: ../../include/channel.php:1051
-msgid "Location:"
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:229
+msgid "Mood"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:320
-msgid "Description:"
+#: ../../Zotlabs/Module/Mood.php:136
+msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1231
-msgid "Hometown:"
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:35
+msgid "No more system notifications."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1239
-msgid "About:"
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "System Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/channel.php:1036
-#: ../../include/connections.php:78 ../../include/widgets.php:147
-#: ../../include/widgets.php:184 ../../include/conversation.php:938
-#: ../../include/conversation.php:1069
-msgid "Connect"
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:183
+#: ../../Zotlabs/Module/Profiles.php:240 ../../Zotlabs/Module/Profiles.php:631
+#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62
+msgid "Profile not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:329
-msgid "Public Forum:"
+#: ../../Zotlabs/Module/Profiles.php:44
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:332
-msgid "Keywords: "
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
+msgid "Profile-"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:335
-msgid "Don't suggest"
+#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:126
+msgid "New profile created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:337
-msgid "Common connections:"
+#: ../../Zotlabs/Module/Profiles.php:110
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Global Directory"
+#: ../../Zotlabs/Module/Profiles.php:145
+msgid "Profile unavailable to export."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:386
-msgid "Local Directory"
+#: ../../Zotlabs/Module/Profiles.php:251
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:392
-msgid "Finding:"
+#: ../../Zotlabs/Module/Profiles.php:431
+msgid "Marital Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:395 ../../Zotlabs/Module/Suggest.php:64
-#: ../../include/contact_widgets.php:24
-msgid "Channel Suggestions"
+#: ../../Zotlabs/Module/Profiles.php:435
+msgid "Romantic Partner"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "next page"
+#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:742
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "previous page"
+#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:743
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:398
-msgid "Sort options"
+#: ../../Zotlabs/Module/Profiles.php:447 ../../Zotlabs/Module/Profiles.php:750
+msgid "Work/Employment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:399
-msgid "Alphabetic"
+#: ../../Zotlabs/Module/Profiles.php:450
+msgid "Religion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:400
-msgid "Reverse Alphabetic"
+#: ../../Zotlabs/Module/Profiles.php:454
+msgid "Political Views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:401
-msgid "Newest to Oldest"
+#: ../../Zotlabs/Module/Profiles.php:458
+#: ../../extend/addon/addon/openid/MysqlProvider.php:74
+msgid "Gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:402
-msgid "Oldest to Newest"
+#: ../../Zotlabs/Module/Profiles.php:462
+msgid "Sexual Preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:419
-msgid "No entries (some entries may be hidden)."
+#: ../../Zotlabs/Module/Profiles.php:466
+msgid "Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203
-msgid "webpage"
+#: ../../Zotlabs/Module/Profiles.php:470
+msgid "Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209
-msgid "block"
+#: ../../Zotlabs/Module/Profiles.php:566
+msgid "Profile updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206
-msgid "layout"
+#: ../../Zotlabs/Module/Profiles.php:650
+msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212
-msgid "menu"
+#: ../../Zotlabs/Module/Profiles.php:692
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:191
-#, php-format
-msgid "%s element installed"
+#: ../../Zotlabs/Module/Profiles.php:694
+msgid "View this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:194
-#, php-format
-msgid "%s element installation failed"
+#: ../../Zotlabs/Module/Profiles.php:695 ../../Zotlabs/Module/Profiles.php:777
+#: ../../include/channel.php:983
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:104
-msgid "Import completed"
+#: ../../Zotlabs/Module/Profiles.php:696
+msgid "Profile Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "Import Items"
+#: ../../Zotlabs/Module/Profiles.php:697
+msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:120
-msgid "Use this form to import existing posts and content from an export file."
+#: ../../Zotlabs/Module/Profiles.php:698 ../../include/channel.php:954
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lockview.php:75
-msgid "Remote privacy information not available."
+#: ../../Zotlabs/Module/Profiles.php:699
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lockview.php:96
-msgid "Visible to:"
+#: ../../Zotlabs/Module/Profiles.php:700
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Follow.php:31
-msgid "Channel added."
+#: ../../Zotlabs/Module/Profiles.php:701
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:184
-msgid "Unable to locate original post."
+#: ../../Zotlabs/Module/Profiles.php:702
+msgid "Add profile things"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:447
-msgid "Empty post discarded."
+#: ../../Zotlabs/Module/Profiles.php:703 ../../include/widgets.php:105
+#: ../../include/conversation.php:1715
+msgid "Personal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:489
-msgid "Executable content type not permitted to this channel."
+#: ../../Zotlabs/Module/Profiles.php:705
+msgid "Relation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:837
-msgid "Duplicate post suppressed."
+#: ../../Zotlabs/Module/Profiles.php:706 ../../include/datetime.php:55
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:979
-msgid "System error. Post not saved."
+#: ../../Zotlabs/Module/Profiles.php:708
+msgid "Import profile from file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1111
-msgid "Unable to obtain post information from database."
+#: ../../Zotlabs/Module/Profiles.php:709
+msgid "Export profile to file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1118
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+#: ../../Zotlabs/Module/Profiles.php:710
+msgid "Your gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1125
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../Zotlabs/Module/Profiles.php:711
+msgid "Marital status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Magic.php:71
-msgid "Hub not found."
+#: ../../Zotlabs/Module/Profiles.php:712
+msgid "Sexual preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:52
-msgid "Unable to create element."
+#: ../../Zotlabs/Module/Profiles.php:715
+msgid "Profile name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:76
-msgid "Unable to update menu element."
+#: ../../Zotlabs/Module/Profiles.php:717
+msgid "This is your default profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:92
-msgid "Unable to add menu element."
+#: ../../Zotlabs/Module/Profiles.php:719
+msgid "Your full name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
-msgid "Menu Item Permissions"
+#: ../../Zotlabs/Module/Profiles.php:720
+msgid "Title/Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings/Channel.php:489
-msgid "(click to open/close)"
+#: ../../Zotlabs/Module/Profiles.php:723
+msgid "Street address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
-msgid "Link Name"
+#: ../../Zotlabs/Module/Profiles.php:724
+msgid "Locality/City"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
-msgid "Link or Submenu Target"
+#: ../../Zotlabs/Module/Profiles.php:725
+msgid "Region/State"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:161
-msgid "Enter URL of the link or select a menu name to create a submenu"
+#: ../../Zotlabs/Module/Profiles.php:726
+msgid "Postal/Zip code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
-msgid "Use magic-auth if available"
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Who (if applicable)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
-msgid "Open link in new window"
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
-msgid "Order in list"
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Since (date)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
-msgid "Higher numbers will sink to bottom of listing"
+#: ../../Zotlabs/Module/Profiles.php:736
+msgid "Tell us about yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:165
-msgid "Submit and finish"
+#: ../../Zotlabs/Module/Profiles.php:737
+#: ../../extend/addon/addon/openid/MysqlProvider.php:68
+msgid "Homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:166
-msgid "Submit and continue"
+#: ../../Zotlabs/Module/Profiles.php:738
+msgid "Hometown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:174
-msgid "Menu:"
+#: ../../Zotlabs/Module/Profiles.php:739
+msgid "Political views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:177
-msgid "Link Target"
+#: ../../Zotlabs/Module/Profiles.php:740
+msgid "Religious views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Edit menu"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Keywords used in directory listings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:183
-msgid "Edit element"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:184
-msgid "Drop element"
+#: ../../Zotlabs/Module/Profiles.php:744
+msgid "Musical interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:185
-msgid "New element"
+#: ../../Zotlabs/Module/Profiles.php:745
+msgid "Books, literature"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:186
-msgid "Edit this menu container"
+#: ../../Zotlabs/Module/Profiles.php:746
+msgid "Television"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:187
-msgid "Add menu element"
+#: ../../Zotlabs/Module/Profiles.php:747
+msgid "Film/Dance/Culture/Entertainment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:188
-msgid "Delete this menu item"
+#: ../../Zotlabs/Module/Profiles.php:748
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:189
-msgid "Edit this menu item"
+#: ../../Zotlabs/Module/Profiles.php:749
+msgid "Love/Romance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:206
-msgid "Menu item not found."
+#: ../../Zotlabs/Module/Profiles.php:751
+msgid "School/Education"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:219
-msgid "Menu item deleted."
+#: ../../Zotlabs/Module/Profiles.php:752
+msgid "Contact information and social networks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:221
-msgid "Menu item could not be deleted."
+#: ../../Zotlabs/Module/Profiles.php:753
+msgid "My other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:228
-msgid "Edit Menu Element"
+#: ../../Zotlabs/Module/Profiles.php:773 ../../include/channel.php:979
+msgid "Profile Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:238
-msgid "Link text"
+#: ../../Zotlabs/Module/Profiles.php:783 ../../include/nav.php:91
+#: ../../include/channel.php:961
+msgid "Edit Profiles"
 msgstr ""
 
 #: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93
@@ -4178,126 +4513,127 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:70
-msgid "No ratings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Ratings.php:97 ../../Zotlabs/Module/Pubsites.php:35
-#: ../../include/conversation.php:941 ../../include/conversation.php:1099
-msgid "Ratings"
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:98
-msgid "Rating: "
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:99
-msgid "Website: "
+#: ../../Zotlabs/Module/Invite.php:67
+msgid "Please join us on $Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:101
-msgid "Description: "
+#: ../../Zotlabs/Module/Invite.php:77
+msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: ../../Zotlabs/Module/Attach.php:13
-msgid "Item not available."
+#: ../../Zotlabs/Module/Invite.php:82
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#: ../../Zotlabs/Module/Invite.php:86
 #, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr ""
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:229
-msgid "Mood"
+#: ../../Zotlabs/Module/Invite.php:105
+msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Send invitations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:254
-msgid "sent you a private message"
+#: ../../Zotlabs/Module/Invite.php:137
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:302
-msgid "added your channel"
+#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284
+msgid "Your message:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:312
-msgid "g A l F d"
+#: ../../Zotlabs/Module/Invite.php:139
+msgid "Please join my community on $Projectname."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:330
-msgid "[today]"
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "You will need to supply this invitation code:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:339
-msgid "posted an event"
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:35
-msgid "No more system notifications."
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr ""
 
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "System Notifications"
+#: ../../Zotlabs/Module/Invite.php:145
+msgid "or visit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:24
-msgid "Privacy group created."
+#: ../../Zotlabs/Module/Invite.php:147
+msgid "3. Click [Connect]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:30
-msgid "Could not create privacy group."
+#: ../../Zotlabs/Module/Siteinfo.php:20
+msgid "About this site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3876
-msgid "Privacy group not found."
+#: ../../Zotlabs/Module/Siteinfo.php:21
+msgid "Site Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:58
-msgid "Privacy group updated."
+#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1962
+msgid "Administrator"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:90
-msgid "Create a group of channels."
+#: ../../Zotlabs/Module/Siteinfo.php:28
+msgid "Software and Project information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
-msgid "Privacy group name: "
+#: ../../Zotlabs/Module/Siteinfo.php:29
+msgid "This site is powered by $Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
-msgid "Members are visible to other channels"
+#: ../../Zotlabs/Module/Siteinfo.php:30
+msgid ""
+"Federated and decentralised networking and identity services provided by Zot"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:111
-msgid "Privacy group removed."
+#: ../../Zotlabs/Module/Siteinfo.php:32
+#, php-format
+msgid "Version %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:113
-msgid "Unable to remove privacy group."
+#: ../../Zotlabs/Module/Siteinfo.php:33
+msgid "Project homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group editor"
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Developer homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:197 ../../Zotlabs/Module/Help.php:81
-msgid "Members"
+#: ../../Zotlabs/Module/New_channel.php:140
+msgid "Create Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:199
-msgid "All Connected Channels"
+#: ../../Zotlabs/Module/New_channel.php:141
+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/Group.php:231
-msgid "Click on a channel to add or remove."
+#: ../../Zotlabs/Module/New_channel.php:142
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:176
@@ -4329,7 +4665,7 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263
-#: ../../Zotlabs/Module/Setup.php:745
+#: ../../Zotlabs/Module/Setup.php:750
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
@@ -4504,192 +4840,192 @@ msgstr ""
 msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:500
+#: ../../Zotlabs/Module/Setup.php:505
 msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:501
+#: ../../Zotlabs/Module/Setup.php:506
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:502
+#: ../../Zotlabs/Module/Setup.php:507
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:503
+#: ../../Zotlabs/Module/Setup.php:508
 msgid "PDO database PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:504
+#: ../../Zotlabs/Module/Setup.php:509
 msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:505
+#: ../../Zotlabs/Module/Setup.php:510
 msgid "xml PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:509 ../../Zotlabs/Module/Setup.php:511
+#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:516
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:509
+#: ../../Zotlabs/Module/Setup.php:514
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:515 ../../Zotlabs/Module/Setup.php:518
+#: ../../Zotlabs/Module/Setup.php:520 ../../Zotlabs/Module/Setup.php:523
 msgid "exec"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:515
+#: ../../Zotlabs/Module/Setup.php:520
 msgid ""
 "Error: exec is required but is either not installed or has been disabled in "
 "php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:521 ../../Zotlabs/Module/Setup.php:524
+#: ../../Zotlabs/Module/Setup.php:526 ../../Zotlabs/Module/Setup.php:529
 msgid "shell_exec"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:521
+#: ../../Zotlabs/Module/Setup.php:526
 msgid ""
 "Error: shell_exec is required but is either not installed or has been "
 "disabled in php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:529
+#: ../../Zotlabs/Module/Setup.php:534
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:533
+#: ../../Zotlabs/Module/Setup.php:538
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:537
+#: ../../Zotlabs/Module/Setup.php:542
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:541
+#: ../../Zotlabs/Module/Setup.php:546
 msgid "Error: PDO database PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:545
+#: ../../Zotlabs/Module/Setup.php:550
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:549
+#: ../../Zotlabs/Module/Setup.php:554
 msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:567
+#: ../../Zotlabs/Module/Setup.php:572
 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:568
+#: ../../Zotlabs/Module/Setup.php:573
 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:569
+#: ../../Zotlabs/Module/Setup.php:574
 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:570
+#: ../../Zotlabs/Module/Setup.php:575
 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:573
+#: ../../Zotlabs/Module/Setup.php:578
 msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:587
+#: ../../Zotlabs/Module/Setup.php:592
 msgid ""
 "This software uses the Smarty3 template engine to render its web views. "
 "Smarty3 compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:588
+#: ../../Zotlabs/Module/Setup.php:593
 #, 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:589 ../../Zotlabs/Module/Setup.php:610
+#: ../../Zotlabs/Module/Setup.php:594 ../../Zotlabs/Module/Setup.php:615
 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:590
+#: ../../Zotlabs/Module/Setup.php:595
 #, 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:593
+#: ../../Zotlabs/Module/Setup.php:598
 #, php-format
 msgid "%s is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:609
+#: ../../Zotlabs/Module/Setup.php:614
 msgid ""
 "This software uses the store directory to save uploaded files. The web "
 "server needs to have write access to the store directory under the top level "
 "web folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:613
+#: ../../Zotlabs/Module/Setup.php:618
 msgid "store is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:646
+#: ../../Zotlabs/Module/Setup.php:651
 msgid ""
 "SSL certificate cannot be validated. Fix certificate or disable https access "
 "to this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:647
+#: ../../Zotlabs/Module/Setup.php:652
 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:648
+#: ../../Zotlabs/Module/Setup.php:653
 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:649
+#: ../../Zotlabs/Module/Setup.php:654
 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:650
+#: ../../Zotlabs/Module/Setup.php:655
 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:651
+#: ../../Zotlabs/Module/Setup.php:656
 msgid ""
 "Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:653
+#: ../../Zotlabs/Module/Setup.php:658
 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. "
@@ -4697,68 +5033,42 @@ msgid ""
 "server communications."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:655
+#: ../../Zotlabs/Module/Setup.php:660
 msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:666
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:664
+#: ../../Zotlabs/Module/Setup.php:669
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:678
+#: ../../Zotlabs/Module/Setup.php:683
 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:702
+#: ../../Zotlabs/Module/Setup.php:707
 #: ../../extend/addon/addon/cdav/cdav.php:41
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:385
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:392
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:743
+#: ../../Zotlabs/Module/Setup.php:748
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:744
+#: ../../Zotlabs/Module/Setup.php:749
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:140
-msgid "Create Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/New_channel.php:141
-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:142
-msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
-msgstr ""
-
-#: ../../Zotlabs/Module/Search.php:223
-#, php-format
-msgid "Items tagged with: %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Search.php:225
-#, php-format
-msgid "Search results for: %s"
-msgstr ""
-
 #: ../../Zotlabs/Module/Notifications.php:40 ../../include/nav.php:194
 msgid "Mark all system notifications seen"
 msgstr ""
@@ -4792,43 +5102,6 @@ msgstr ""
 msgid "Make this post private"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1385
-msgid "Public Hubs"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:27
-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:33
-msgid "Hub URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Access Type"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Registration Policy"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Stats"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:33
-msgid "Software"
-msgstr ""
-
-#: ../../Zotlabs/Module/Pubsites.php:48
-msgid "Rate"
-msgstr ""
-
 #: ../../Zotlabs/Module/Oexchange.php:27
 msgid "Unable to find your hub."
 msgstr ""
@@ -4852,56 +5125,9 @@ msgid ""
 "to correctly use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
-msgid "App installed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:46
-msgid "Malformed app."
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:105
-msgid "Embed code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:111 ../../include/widgets.php:107
-msgid "Edit App"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:111
-msgid "Create App"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Name of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:117
-msgid "Location (URL) of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Photo icon URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "80 x 80 pixels - optional"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Categories (optional, comma separated list)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Version ID"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Price of app"
-msgstr ""
-
-#: ../../Zotlabs/Module/Appman.php:123
-msgid "Location (URL) to purchase app"
+#: ../../Zotlabs/Module/Apps.php:46 ../../include/nav.php:166
+#: ../../include/widgets.php:102
+msgid "Apps"
 msgstr ""
 
 #: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2283
@@ -4951,114 +5177,6 @@ msgstr ""
 msgid "Optionally explain your rating (this information is public)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:65
-msgid "Unable to lookup recipient."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:72
-msgid "Unable to communicate with requested channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:79
-msgid "Cannot verify requested channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:97
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:178
-msgid "Messages"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:213
-msgid "Message recalled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:226
-msgid "Conversation removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:240 ../../Zotlabs/Module/Mail.php:349
-#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1330
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:350
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:269
-msgid "Requested channel is not in this network"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:277
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:403
-msgid "To:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:405
-msgid "Subject:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:411
-#: ../../include/conversation.php:1390
-msgid "Attach file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:288
-msgid "Send"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:416
-#: ../../include/conversation.php:1435
-msgid "Set expiration date"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:293 ../../Zotlabs/Module/Mail.php:418
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:743
-#: ../../include/conversation.php:1440
-msgid "Encrypt text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:375
-msgid "Delete message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:376
-msgid "Delivery report"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:377
-msgid "Recall message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:379
-msgid "Message has been recalled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:396
-msgid "Delete Conversation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:398
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:402
-msgid "Send Reply"
-msgstr ""
-
-#: ../../Zotlabs/Module/Mail.php:407
-#, php-format
-msgid "Your message for %s (%s):"
-msgstr ""
-
 #: ../../Zotlabs/Module/Profile_photo.php:186
 #: ../../extend/addon/addon/openclipatar/openclipatar.php:293
 msgid ""
@@ -5080,467 +5198,190 @@ msgstr ""
 msgid "Use"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:45
-msgid "Invalid message"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "no results"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:93
-msgid "channel sync processed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "queued"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:101
-msgid "posted"
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:105
-msgid "accepted for delivery"
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:109
-msgid "updated"
+#: ../../Zotlabs/Module/Events.php:110
+msgid "Event can not end before it has started."
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:112
-msgid "update ignored"
+#: ../../Zotlabs/Module/Events.php:112 ../../Zotlabs/Module/Events.php:121
+#: ../../Zotlabs/Module/Events.php:143
+msgid "Unable to generate preview."
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:115
-msgid "permission denied"
+#: ../../Zotlabs/Module/Events.php:119
+msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:119
-msgid "recipient not found"
+#: ../../Zotlabs/Module/Events.php:141 ../../Zotlabs/Module/Events.php:265
+msgid "Event not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:122
-msgid "mail recalled"
+#: ../../Zotlabs/Module/Events.php:460
+msgid "Edit event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:125
-msgid "duplicate mail received"
+#: ../../Zotlabs/Module/Events.php:460
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835
+msgid "Event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:128
-msgid "mail delivered"
+#: ../../Zotlabs/Module/Events.php:462
+msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:148
-#, php-format
-msgid "Delivery report for %1$s"
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Edit Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:151
-msgid "Options"
+#: ../../Zotlabs/Module/Events.php:463
+msgid "Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:152
-msgid "Redeliver"
+#: ../../Zotlabs/Module/Events.php:466
+msgid "Edit start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:20
-msgid "About this site"
+#: ../../Zotlabs/Module/Events.php:466
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836
+msgid "Start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:21
-msgid "Site Name"
+#: ../../Zotlabs/Module/Events.php:467 ../../Zotlabs/Module/Events.php:470
+msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1962
-msgid "Administrator"
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Edit finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:28
-msgid "Software and Project information"
+#: ../../Zotlabs/Module/Events.php:469
+msgid "Finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:29
-msgid "This site is powered by $Projectname"
+#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Events.php:472
+msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:30
+#: ../../Zotlabs/Module/Events.php:471
 msgid ""
-"Federated and decentralised networking and identity services provided by Zot"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:32
-#, php-format
-msgid "Version %s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:33
-msgid "Project homepage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Developer homepage"
-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/Apps.php:46 ../../include/nav.php:166
-#: ../../include/widgets.php:102
-msgid "Apps"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:183
-#: ../../Zotlabs/Module/Profiles.php:240 ../../Zotlabs/Module/Profiles.php:619
-#: ../../extend/addon/addon/friendica/dfrn_confirm.php:62
-msgid "Profile not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:44
-msgid "Profile deleted."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
-msgid "Profile-"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:126
-msgid "New profile created."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:110
-msgid "Profile unavailable to clone."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:145
-msgid "Profile unavailable to export."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:250
-msgid "Profile Name is required."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:421
-msgid "Marital Status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:425
-msgid "Romantic Partner"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:429 ../../Zotlabs/Module/Profiles.php:730
-msgid "Likes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:433 ../../Zotlabs/Module/Profiles.php:731
-msgid "Dislikes"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:437 ../../Zotlabs/Module/Profiles.php:738
-msgid "Work/Employment"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:440
-msgid "Religion"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:444
-msgid "Political Views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:448
-#: ../../extend/addon/addon/openid/MysqlProvider.php:74
-msgid "Gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:452
-msgid "Sexual Preference"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:456
-msgid "Homepage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:460
-msgid "Interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:554
-msgid "Profile updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:638
-msgid "Hide your connections list from viewers of this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:680
-msgid "Edit Profile Details"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:682
-msgid "View this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:683 ../../Zotlabs/Module/Profiles.php:765
-#: ../../include/channel.php:983
-msgid "Edit visibility"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:684
-msgid "Profile Tools"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:685
-msgid "Change cover photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:686 ../../include/channel.php:954
-msgid "Change profile photo"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:687
-msgid "Create a new profile using these settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:688
-msgid "Clone this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:689
-msgid "Delete this profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:690
-msgid "Add profile things"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:691 ../../include/widgets.php:105
-#: ../../include/conversation.php:1715
-msgid "Personal"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:693
-msgid "Relation"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:694 ../../include/datetime.php:55
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:696
-msgid "Import profile from file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:697
-msgid "Export profile to file"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:698
-msgid "Your gender"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:699
-msgid "Marital status"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:700
-msgid "Sexual preference"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:703
-msgid "Profile name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:705
-msgid "This is your default profile."
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:707
-msgid "Your full name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:708
-msgid "Title/Description"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:711
-msgid "Street address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:712
-msgid "Locality/City"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:713
-msgid "Region/State"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:714
-msgid "Postal/Zip code"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:720
-msgid "Who (if applicable)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:720
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:721
-msgid "Since (date)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:724
-msgid "Tell us about yourself"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:725
-#: ../../extend/addon/addon/openid/MysqlProvider.php:68
-msgid "Homepage URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "Hometown"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:727
-msgid "Political views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:728
-msgid "Religious views"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Keywords used in directory listings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:729
-msgid "Example: fishing photography software"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Musical interests"
-msgstr ""
-
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Books, literature"
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Television"
+#: ../../Zotlabs/Module/Events.php:473
+msgid "Edit Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Film/Dance/Culture/Entertainment"
+#: ../../Zotlabs/Module/Events.php:475
+msgid "Edit Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:736
-msgid "Hobbies/Interests"
+#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1410
+msgid "Permission settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:737
-msgid "Love/Romance"
+#: ../../Zotlabs/Module/Events.php:489
+msgid "Timezone:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:739
-msgid "School/Education"
+#: ../../Zotlabs/Module/Events.php:494
+msgid "Advanced Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:740
-msgid "Contact information and social networks"
+#: ../../Zotlabs/Module/Events.php:633
+msgid "Edit event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "My other channels"
+#: ../../Zotlabs/Module/Events.php:635
+msgid "Delete event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:761 ../../include/channel.php:979
-msgid "Profile Image"
+#: ../../Zotlabs/Module/Events.php:669
+msgid "calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:771 ../../include/channel.php:961
-#: ../../include/nav.php:91
-msgid "Edit Profiles"
+#: ../../Zotlabs/Module/Events.php:695
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849
+msgid "Month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:94
-msgid "# Accounts"
+#: ../../Zotlabs/Module/Events.php:696
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850
+msgid "Week"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:95
-msgid "# blocked accounts"
+#: ../../Zotlabs/Module/Events.php:697
+#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851
+msgid "Day"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:96
-msgid "# expired accounts"
+#: ../../Zotlabs/Module/Events.php:731
+msgid "Event removed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:97
-msgid "# expiring accounts"
+#: ../../Zotlabs/Module/Events.php:734
+msgid "Failed to remove event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:108
-msgid "# Channels"
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:109
-msgid "# primary"
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:110
-msgid "# clones"
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:116
-msgid "Message queues"
+#: ../../Zotlabs/Module/Chanview.php:134
+msgid "toggle full screen mode"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:133
-msgid "Your software should be updated"
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:138
-msgid "Summary"
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:141
-msgid "Registered accounts"
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1282
+msgid "Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:142
-msgid "Pending registrations"
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:143
-msgid "Registered channels"
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:144
-msgid "Active plugins"
+#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Wiki.php:20
+#: ../../Zotlabs/Module/Chat.php:25
+#: ../../extend/addon/addon/chess/chess.php:400
+msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:145
-msgid "Version"
+#: ../../Zotlabs/Module/Channel.php:44
+msgid "Posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:146
-msgid "Repository version (master)"
+#: ../../Zotlabs/Module/Channel.php:45
+msgid "Only posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:147
-msgid "Repository version (dev)"
+#: ../../Zotlabs/Module/Channel.php:104
+msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
 #: ../../Zotlabs/Module/Lostpass.php:19
@@ -5632,8 +5473,8 @@ msgstr ""
 msgid "Or enter new bookmark folder name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
+#: ../../Zotlabs/Module/Follow.php:31
+msgid "Channel added."
 msgstr ""
 
 #: ../../Zotlabs/Module/Rmagic.php:35
@@ -5786,67 +5627,118 @@ msgid ""
 "or restore these in date order (oldest first)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
+#: ../../Zotlabs/Module/Directory.php:246
+#, php-format
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Directory.php:257
+msgid "Gender: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
+#: ../../Zotlabs/Module/Directory.php:259
+msgid "Status: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
+#: ../../Zotlabs/Module/Directory.php:261
+msgid "Homepage: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
+#: ../../Zotlabs/Module/Directory.php:310 ../../include/channel.php:1215
+msgid "Age:"
 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:"
+#: ../../Zotlabs/Module/Directory.php:315 ../../include/event.php:52
+#: ../../include/event.php:84 ../../include/bb2diaspora.php:526
+#: ../../include/channel.php:1051
+msgid "Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
+#: ../../Zotlabs/Module/Directory.php:321
+msgid "Description:"
 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."
+#: ../../Zotlabs/Module/Directory.php:326 ../../include/channel.php:1231
+msgid "Hometown:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
+#: ../../Zotlabs/Module/Directory.php:328 ../../include/channel.php:1239
+msgid "About:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
+#: ../../Zotlabs/Module/Directory.php:330
+msgid "Public Forum:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chanview.php:134
-msgid "toggle full screen mode"
+#: ../../Zotlabs/Module/Directory.php:333
+msgid "Keywords: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
+#: ../../Zotlabs/Module/Directory.php:336
+msgid "Don't suggest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../Zotlabs/Module/Directory.php:338
+msgid "Common connections:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:67
-msgid "is interested in:"
+#: ../../Zotlabs/Module/Directory.php:387
+msgid "Global Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
+#: ../../Zotlabs/Module/Directory.php:387
+msgid "Local Directory"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:393
+msgid "Finding:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:396 ../../Zotlabs/Module/Suggest.php:64
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "next page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "previous page"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:399
+msgid "Sort options"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:400
+msgid "Alphabetic"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:401
+msgid "Reverse Alphabetic"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:402
+msgid "Newest to Oldest"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:403
+msgid "Oldest to Newest"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:420
+msgid "No entries (some entries may be hidden)."
+msgstr ""
+
+#: ../../Zotlabs/Module/Chatsvc.php:131
+msgid "Away"
+msgstr ""
+
+#: ../../Zotlabs/Module/Chatsvc.php:136
+msgid "Online"
 msgstr ""
 
 #: ../../Zotlabs/Module/Service_limits.php:23
@@ -5869,40 +5761,40 @@ msgstr ""
 msgid "Export selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Lib/Apps.php:220
-#: ../../include/nav.php:109 ../../include/conversation.php:1875
+#: ../../Zotlabs/Module/Webpages.php:241 ../../Zotlabs/Lib/Apps.php:220
+#: ../../include/nav.php:109 ../../include/conversation.php:1889
 msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:248 ../../include/page_widgets.php:44
+#: ../../Zotlabs/Module/Webpages.php:252 ../../include/page_widgets.php:44
 msgid "Actions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:249 ../../include/page_widgets.php:45
+#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:45
 msgid "Page Link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:250
+#: ../../Zotlabs/Module/Webpages.php:254
 msgid "Page Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:280
+#: ../../Zotlabs/Module/Webpages.php:284
 msgid "Invalid file type."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:292
+#: ../../Zotlabs/Module/Webpages.php:296
 msgid "Error opening zip file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:303
+#: ../../Zotlabs/Module/Webpages.php:307
 msgid "Invalid folder path."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:330
+#: ../../Zotlabs/Module/Webpages.php:334
 msgid "No webpage elements detected."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:405
+#: ../../Zotlabs/Module/Webpages.php:409
 msgid "Import complete."
 msgstr ""
 
@@ -5972,7 +5864,7 @@ msgid "Error downloading wiki: "
 msgstr ""
 
 #: ../../Zotlabs/Module/Wiki.php:139 ../../include/nav.php:111
-#: ../../include/conversation.php:1885
+#: ../../include/conversation.php:1900
 msgid "Wikis"
 msgstr ""
 
@@ -6089,7 +5981,7 @@ msgstr ""
 msgid "*"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:195
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:204
 #: ../../include/widgets.php:672
 msgid "Channel Sources"
 msgstr ""
@@ -6940,6 +6832,114 @@ msgstr ""
 msgid "Add Thing to your Profile"
 msgstr ""
 
+#: ../../Zotlabs/Module/Mail.php:65
+msgid "Unable to lookup recipient."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:72
+msgid "Unable to communicate with requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:79
+msgid "Cannot verify requested channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:97
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:178
+msgid "Messages"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:213
+msgid "Message recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Conversation removed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:240 ../../Zotlabs/Module/Mail.php:349
+#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1330
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:350
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:269
+msgid "Requested channel is not in this network"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:277
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:403
+msgid "To:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:405
+msgid "Subject:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:411
+#: ../../include/conversation.php:1390
+msgid "Attach file"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:288
+msgid "Send"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:416
+#: ../../include/conversation.php:1435
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:293 ../../Zotlabs/Module/Mail.php:418
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:743
+#: ../../include/conversation.php:1440
+msgid "Encrypt text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:375
+msgid "Delete message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:376
+msgid "Delivery report"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:377
+msgid "Recall message"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:379
+msgid "Message has been recalled."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:396
+msgid "Delete Conversation"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:398
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:402
+msgid "Send Reply"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mail.php:407
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr ""
+
 #: ../../Zotlabs/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr ""
@@ -7018,32 +7018,38 @@ msgstr ""
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:23
-msgid "Documentation Search"
+#: ../../Zotlabs/Module/Item.php:183
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1813
-msgid "About"
+#: ../../Zotlabs/Module/Item.php:446
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:82
-msgid "Administrators"
+#: ../../Zotlabs/Module/Item.php:488
+msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:83
-msgid "Developers"
+#: ../../Zotlabs/Module/Item.php:836
+msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:84
-msgid "Tutorials"
+#: ../../Zotlabs/Module/Item.php:978
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:93
-msgid "$Projectname Documentation"
+#: ../../Zotlabs/Module/Item.php:1108
+msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:94
-msgid "Contents"
+#: ../../Zotlabs/Module/Item.php:1115
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr ""
+
+#: ../../Zotlabs/Module/Item.php:1122
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
 #: ../../Zotlabs/Lib/Chatroom.php:27
@@ -7070,10 +7076,10 @@ msgstr ""
 msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:61
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../extend/addon/addon/diaspora/p.php:46
 #: ../../extend/addon/addon/diaspora/util.php:218
 #: ../../extend/addon/addon/diaspora/util.php:231
-#: ../../extend/addon/addon/diaspora/p.php:46 ../../include/network.php:1915
+#: ../../include/network.php:1915
 msgid "$projectname"
 msgstr ""
 
@@ -7376,7 +7382,7 @@ msgstr ""
 msgid "Remote Diagnostics"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:214 ../../include/features.php:319
+#: ../../Zotlabs/Lib/Apps.php:214 ../../include/features.php:328
 msgid "Suggest Channels"
 msgstr ""
 
@@ -7390,7 +7396,7 @@ msgid "Grid"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:221 ../../include/features.php:99
-#: ../../include/conversation.php:1888
+#: ../../include/conversation.php:1903
 msgid "Wiki"
 msgstr ""
 
@@ -7399,7 +7405,7 @@ msgid "Channel Home"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:204
-#: ../../include/conversation.php:1839 ../../include/conversation.php:1842
+#: ../../include/conversation.php:1853 ../../include/conversation.php:1856
 msgid "Events"
 msgstr ""
 
@@ -8859,7 +8865,7 @@ msgid "Comma separated list of keywords to hide"
 msgstr ""
 
 #: ../../extend/addon/addon/nsfw/nsfw.php:88
-msgid "Use /expression/ to provide regular expressions"
+msgid "Word, /regular-expression/, lang=xx, lang!=xx"
 msgstr ""
 
 #: ../../extend/addon/addon/nsfw/nsfw.php:92
@@ -8913,7 +8919,7 @@ msgid "Page to load after image selection."
 msgstr ""
 
 #: ../../extend/addon/addon/openclipatar/openclipatar.php:57
-#: ../../include/channel.php:965 ../../include/nav.php:93
+#: ../../include/nav.php:93 ../../include/channel.php:965
 msgid "Edit Profile"
 msgstr ""
 
@@ -10428,14 +10434,36 @@ msgid ""
 msgstr ""
 
 #: ../../extend/addon/addon/rendezvous/rendezvous.php:172
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:177
 msgid "distance"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:183
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:173
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:175
+msgid "Marker proximity alert"
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:174
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:176
+msgid ""
+"A proximity alert will be issued when you are within a certain radius of the "
+"marker location.<br><br>Enter a radius in meters (0 to disable):"
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:178
+msgid "Reminder note"
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:179
+msgid ""
+"Enter a note to be displayed when you are within the specified proximity..."
+msgstr ""
+
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:190
 msgid "Add new rendezvous"
 msgstr ""
 
-#: ../../extend/addon/addon/rendezvous/rendezvous.php:184
+#: ../../extend/addon/addon/rendezvous/rendezvous.php:191
 msgid ""
 "Create a new rendezvous and share the access link with those you wish to "
 "invite to the group. Those who open the link become members of the "
@@ -10456,20 +10484,51 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/message.php:32
-msgid "Unable to determine sender."
+#: ../../include/language.php:367 ../../include/text.php:1783
+msgid "default"
 msgstr ""
 
-#: ../../include/message.php:69
-msgid "No recipient provided."
+#: ../../include/language.php:380
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/message.php:74
-msgid "[no subject]"
+#: ../../include/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:504
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/message.php:225
-msgid "Stored post could not be verified."
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:510
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:518
+msgid "Finishes:"
+msgstr ""
+
+#: ../../include/event.php:863
+msgid "This event has been added to your calendar."
+msgstr ""
+
+#: ../../include/event.php:1063
+msgid "Not specified"
+msgstr ""
+
+#: ../../include/event.php:1064
+msgid "Needs Action"
+msgstr ""
+
+#: ../../include/event.php:1065
+msgid "Completed"
+msgstr ""
+
+#: ../../include/event.php:1066
+msgid "In Process"
+msgstr ""
+
+#: ../../include/event.php:1067
+msgid "Cancelled"
 msgstr ""
 
 #: ../../include/account.php:35
@@ -10569,1010 +10628,913 @@ msgid ""
 "permissions set who is allowed to view the post."
 msgstr ""
 
-#: ../../include/attach.php:248 ../../include/attach.php:336
-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:668
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr ""
-
-#: ../../include/attach.php:682
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr ""
-
-#: ../../include/attach.php:852
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr ""
-
-#: ../../include/attach.php:865
-msgid "Stored file could not be verified. Upload failed."
+#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
+#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46
+#: ../../include/widgets.php:465
+msgid "Categories"
 msgstr ""
 
-#: ../../include/attach.php:920 ../../include/attach.php:936
-msgid "Path not available."
+#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
+msgid "Tags"
 msgstr ""
 
-#: ../../include/attach.php:982 ../../include/attach.php:1140
-msgid "Empty pathname"
+#: ../../include/taxonomy.php:293
+msgid "Keywords"
 msgstr ""
 
-#: ../../include/attach.php:1008
-msgid "duplicate filename or path"
+#: ../../include/taxonomy.php:314
+msgid "have"
 msgstr ""
 
-#: ../../include/attach.php:1030
-msgid "Path not found."
+#: ../../include/taxonomy.php:314
+msgid "has"
 msgstr ""
 
-#: ../../include/attach.php:1094
-msgid "mkdir failed."
+#: ../../include/taxonomy.php:315
+msgid "want"
 msgstr ""
 
-#: ../../include/attach.php:1098
-msgid "database storage failed."
+#: ../../include/taxonomy.php:315
+msgid "wants"
 msgstr ""
 
-#: ../../include/attach.php:1146
-msgid "Empty path"
+#: ../../include/taxonomy.php:316
+msgid "likes"
 msgstr ""
 
-#: ../../include/event.php:22 ../../include/event.php:69
-#: ../../include/bb2diaspora.php:504
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/taxonomy.php:317
+msgid "dislikes"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/event.php:73
-#: ../../include/bb2diaspora.php:510
-msgid "Starts:"
+#: ../../include/datetime.php:147
+msgid "Birthday"
 msgstr ""
 
-#: ../../include/event.php:40 ../../include/event.php:77
-#: ../../include/bb2diaspora.php:518
-msgid "Finishes:"
+#: ../../include/datetime.php:149
+msgid "Age: "
 msgstr ""
 
-#: ../../include/event.php:824
-msgid "This event has been added to your calendar."
+#: ../../include/datetime.php:151
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/event.php:1024
-msgid "Not specified"
+#: ../../include/datetime.php:286 ../../boot.php:2564
+msgid "never"
 msgstr ""
 
-#: ../../include/event.php:1025
-msgid "Needs Action"
+#: ../../include/datetime.php:292
+msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/event.php:1026
-msgid "Completed"
+#: ../../include/datetime.php:310
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/event.php:1027
-msgid "In Process"
-msgstr ""
+#: ../../include/datetime.php:321
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/event.php:1028
-msgid "Cancelled"
-msgstr ""
+#: ../../include/datetime.php:324
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/bb2diaspora.php:409
-msgid "Attachments:"
-msgstr ""
+#: ../../include/datetime.php:327
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/bb2diaspora.php:506
-msgid "$Projectname event notification:"
-msgstr ""
+#: ../../include/datetime.php:330
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/bbcode.php:134 ../../include/bbcode.php:962
-#: ../../include/bbcode.php:965 ../../include/bbcode.php:970
-#: ../../include/bbcode.php:973 ../../include/bbcode.php:976
-#: ../../include/bbcode.php:979 ../../include/bbcode.php:984
-#: ../../include/bbcode.php:987 ../../include/bbcode.php:992
-#: ../../include/bbcode.php:995 ../../include/bbcode.php:998
-#: ../../include/bbcode.php:1001
-msgid "Image/photo"
-msgstr ""
+#: ../../include/datetime.php:333
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/bbcode.php:173 ../../include/bbcode.php:1012
-msgid "Encrypted content"
-msgstr ""
+#: ../../include/datetime.php:336
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/bbcode.php:189
-#, php-format
-msgid "Install %s element: "
-msgstr ""
+#: ../../include/datetime.php:339
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/bbcode.php:193
+#: ../../include/datetime.php:576
 #, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
+msgid "%1$s's birthday"
 msgstr ""
 
-#: ../../include/bbcode.php:272
+#: ../../include/datetime.php:577
 #, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/bbcode.php:357
-msgid "spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:552 ../../include/bbcode.php:683
-#: ../../include/wiki.php:546
-msgid "Different viewers will see this text differently"
-msgstr ""
-
-#: ../../include/bbcode.php:950
-msgid "$1 wrote:"
-msgstr ""
-
-#: ../../include/channel.php:33
-msgid "Unable to obtain identity information from database"
-msgstr ""
-
-#: ../../include/channel.php:67
-msgid "Empty name"
-msgstr ""
-
-#: ../../include/channel.php:70
-msgid "Name too long"
-msgstr ""
-
-#: ../../include/channel.php:181
-msgid "No account identifier"
-msgstr ""
-
-#: ../../include/channel.php:193
-msgid "Nickname is required."
+msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/channel.php:207
-msgid "Reserved nickname. Please choose another."
+#: ../../include/security.php:117
+msgid "guest:"
 msgstr ""
 
-#: ../../include/channel.php:212
+#: ../../include/security.php:535
 msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr ""
-
-#: ../../include/channel.php:272
-msgid "Unable to retrieve created identity"
-msgstr ""
-
-#: ../../include/channel.php:341
-msgid "Default Profile"
-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:1174
-msgid "Gender:"
-msgstr ""
-
-#: ../../include/channel.php:1057 ../../include/channel.php:1229
-msgid "Homepage:"
-msgstr ""
-
-#: ../../include/channel.php:1058
-msgid "Online Now"
-msgstr ""
-
-#: ../../include/channel.php:1179
-msgid "Like this channel"
-msgstr ""
-
-#: ../../include/channel.php:1203
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/channel.php:1204
-msgid "j F"
+"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/channel.php:1211
-msgid "Birthday:"
+#: ../../include/selectors.php:30
+msgid "Frequently"
 msgstr ""
 
-#: ../../include/channel.php:1224
-#, php-format
-msgid "for %1$d %2$s"
+#: ../../include/selectors.php:31
+msgid "Hourly"
 msgstr ""
 
-#: ../../include/channel.php:1227
-msgid "Sexual Preference:"
+#: ../../include/selectors.php:32
+msgid "Twice daily"
 msgstr ""
 
-#: ../../include/channel.php:1233
-msgid "Tags:"
+#: ../../include/selectors.php:33
+msgid "Daily"
 msgstr ""
 
-#: ../../include/channel.php:1235
-msgid "Political Views:"
+#: ../../include/selectors.php:34
+msgid "Weekly"
 msgstr ""
 
-#: ../../include/channel.php:1237
-msgid "Religion:"
+#: ../../include/selectors.php:35
+msgid "Monthly"
 msgstr ""
 
-#: ../../include/channel.php:1241
-msgid "Hobbies/Interests:"
+#: ../../include/selectors.php:49
+msgid "Currently Male"
 msgstr ""
 
-#: ../../include/channel.php:1243
-msgid "Likes:"
+#: ../../include/selectors.php:49
+msgid "Currently Female"
 msgstr ""
 
-#: ../../include/channel.php:1245
-msgid "Dislikes:"
+#: ../../include/selectors.php:49
+msgid "Mostly Male"
 msgstr ""
 
-#: ../../include/channel.php:1247
-msgid "Contact information and Social Networks:"
+#: ../../include/selectors.php:49
+msgid "Mostly Female"
 msgstr ""
 
-#: ../../include/channel.php:1249
-msgid "My other channels:"
+#: ../../include/selectors.php:49
+msgid "Transgender"
 msgstr ""
 
-#: ../../include/channel.php:1251
-msgid "Musical interests:"
+#: ../../include/selectors.php:49
+msgid "Intersex"
 msgstr ""
 
-#: ../../include/channel.php:1253
-msgid "Books, literature:"
+#: ../../include/selectors.php:49
+msgid "Transsexual"
 msgstr ""
 
-#: ../../include/channel.php:1255
-msgid "Television:"
+#: ../../include/selectors.php:49
+msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../include/channel.php:1257
-msgid "Film/dance/culture/entertainment:"
+#: ../../include/selectors.php:49
+msgid "Neuter"
 msgstr ""
 
-#: ../../include/channel.php:1259
-msgid "Love/Romance:"
+#: ../../include/selectors.php:49
+msgid "Non-specific"
 msgstr ""
 
-#: ../../include/channel.php:1261
-msgid "Work/employment:"
+#: ../../include/selectors.php:49
+msgid "Undecided"
 msgstr ""
 
-#: ../../include/channel.php:1263
-msgid "School/education:"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Males"
 msgstr ""
 
-#: ../../include/channel.php:1284
-msgid "Like this thing"
+#: ../../include/selectors.php:85 ../../include/selectors.php:104
+msgid "Females"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid "General Features"
+#: ../../include/selectors.php:85
+msgid "Gay"
 msgstr ""
 
-#: ../../include/features.php:63
-msgid "Multiple Profiles"
+#: ../../include/selectors.php:85
+msgid "Lesbian"
 msgstr ""
 
-#: ../../include/features.php:64
-msgid "Ability to create multiple profiles"
+#: ../../include/selectors.php:85
+msgid "No Preference"
 msgstr ""
 
-#: ../../include/features.php:72
-msgid "Advanced Profiles"
+#: ../../include/selectors.php:85
+msgid "Bisexual"
 msgstr ""
 
-#: ../../include/features.php:73
-msgid "Additional profile sections and selections"
+#: ../../include/selectors.php:85
+msgid "Autosexual"
 msgstr ""
 
-#: ../../include/features.php:81
-msgid "Profile Import/Export"
+#: ../../include/selectors.php:85
+msgid "Abstinent"
 msgstr ""
 
-#: ../../include/features.php:82
-msgid "Save and load profile details across sites/channels"
+#: ../../include/selectors.php:85
+msgid "Virgin"
 msgstr ""
 
-#: ../../include/features.php:90
-msgid "Web Pages"
+#: ../../include/selectors.php:85
+msgid "Deviant"
 msgstr ""
 
-#: ../../include/features.php:91
-msgid "Provide managed web pages on your channel"
+#: ../../include/selectors.php:85
+msgid "Fetish"
 msgstr ""
 
-#: ../../include/features.php:100
-msgid "Provide a wiki for your channel"
+#: ../../include/selectors.php:85
+msgid "Oodles"
 msgstr ""
 
-#: ../../include/features.php:117
-msgid "Private Notes"
+#: ../../include/selectors.php:85
+msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/features.php:118
-msgid "Enables a tool to store notes and reminders (note: not encrypted)"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Single"
 msgstr ""
 
-#: ../../include/features.php:126
-msgid "Navigation Channel Select"
+#: ../../include/selectors.php:123
+msgid "Lonely"
 msgstr ""
 
-#: ../../include/features.php:127
-msgid "Change channels directly from within the navigation dropdown menu"
+#: ../../include/selectors.php:123
+msgid "Available"
 msgstr ""
 
-#: ../../include/features.php:135
-msgid "Photo Location"
+#: ../../include/selectors.php:123
+msgid "Unavailable"
 msgstr ""
 
-#: ../../include/features.php:136
-msgid "If location data is available on uploaded photos, link this to a map."
+#: ../../include/selectors.php:123
+msgid "Has crush"
 msgstr ""
 
-#: ../../include/features.php:144
-msgid "Access Controlled Chatrooms"
+#: ../../include/selectors.php:123
+msgid "Infatuated"
 msgstr ""
 
-#: ../../include/features.php:145
-msgid "Provide chatrooms and chat services with access control."
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Dating"
 msgstr ""
 
-#: ../../include/features.php:153
-msgid "Smart Birthdays"
+#: ../../include/selectors.php:123
+msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/features.php:154
-msgid ""
-"Make birthday events timezone aware in case your friends are scattered "
-"across the planet."
+#: ../../include/selectors.php:123
+msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/features.php:162
-msgid "Advanced Directory Search"
+#: ../../include/selectors.php:123
+msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/features.php:163
-msgid "Allows creation of complex directory search queries"
+#: ../../include/selectors.php:123
+msgid "Casual"
 msgstr ""
 
-#: ../../include/features.php:171
-msgid "Advanced Theme and Layout Settings"
+#: ../../include/selectors.php:123
+msgid "Engaged"
 msgstr ""
 
-#: ../../include/features.php:172
-msgid "Allows fine tuning of themes and page layouts"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Married"
 msgstr ""
 
-#: ../../include/features.php:182
-msgid "Post Composition Features"
+#: ../../include/selectors.php:123
+msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/features.php:186
-msgid "Large Photos"
+#: ../../include/selectors.php:123
+msgid "Partners"
 msgstr ""
 
-#: ../../include/features.php:187
-msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/features.php:196
-msgid "Automatically import channel content from other channels or feeds"
+#: ../../include/selectors.php:123
+msgid "Common law"
 msgstr ""
 
-#: ../../include/features.php:204
-msgid "Even More Encryption"
+#: ../../include/selectors.php:123
+msgid "Happy"
 msgstr ""
 
-#: ../../include/features.php:205
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
+#: ../../include/selectors.php:123
+msgid "Not looking"
 msgstr ""
 
-#: ../../include/features.php:213
-msgid "Enable Voting Tools"
+#: ../../include/selectors.php:123
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/features.php:214
-msgid "Provide a class of post which others can vote on"
+#: ../../include/selectors.php:123
+msgid "Betrayed"
 msgstr ""
 
-#: ../../include/features.php:222
-msgid "Disable Comments"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Separated"
 msgstr ""
 
-#: ../../include/features.php:223
-msgid "Provide the option to disable comments for a post"
+#: ../../include/selectors.php:123
+msgid "Unstable"
 msgstr ""
 
-#: ../../include/features.php:231
-msgid "Delayed Posting"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Divorced"
 msgstr ""
 
-#: ../../include/features.php:232
-msgid "Allow posts to be published at a later date"
+#: ../../include/selectors.php:123
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/features.php:240
-msgid "Content Expiration"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "Widowed"
 msgstr ""
 
-#: ../../include/features.php:241
-msgid "Remove posts/comments and/or private messages at a future time"
+#: ../../include/selectors.php:123
+msgid "Uncertain"
 msgstr ""
 
-#: ../../include/features.php:249
-msgid "Suppress Duplicate Posts/Comments"
+#: ../../include/selectors.php:123 ../../include/selectors.php:140
+msgid "It's complicated"
 msgstr ""
 
-#: ../../include/features.php:250
-msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
+#: ../../include/selectors.php:123
+msgid "Don't care"
 msgstr ""
 
-#: ../../include/features.php:261
-msgid "Network and Stream Filtering"
+#: ../../include/selectors.php:123
+msgid "Ask me"
 msgstr ""
 
-#: ../../include/features.php:265
-msgid "Search by Date"
+#: ../../include/zot.php:667
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/features.php:266
-msgid "Ability to select posts by date ranges"
+#: ../../include/zot.php:683
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/features.php:274 ../../include/group.php:311
-msgid "Privacy Groups"
+#: ../../include/zot.php:2334
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/features.php:275
-msgid "Enable management and selection of privacy groups"
+#: ../../include/zot.php:3732
+msgid "invalid target signature"
 msgstr ""
 
-#: ../../include/features.php:283 ../../include/widgets.php:283
-msgid "Saved Searches"
+#: ../../include/bookmarks.php:35
+#, php-format
+msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/features.php:284
-msgid "Save search terms for re-use"
+#: ../../include/nav.php:85 ../../include/nav.php:118 ../../boot.php:1719
+msgid "Logout"
 msgstr ""
 
-#: ../../include/features.php:292
-msgid "Network Personal Tab"
+#: ../../include/nav.php:85 ../../include/nav.php:118
+msgid "End this session"
 msgstr ""
 
-#: ../../include/features.php:293
-msgid "Enable tab to display only Network posts that you've interacted on"
+#: ../../include/nav.php:88
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/features.php:301
-msgid "Network New Tab"
+#: ../../include/nav.php:89
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/features.php:302
-msgid "Enable tab to display all new Network activity"
+#: ../../include/nav.php:91
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/features.php:310
-msgid "Affinity Tool"
+#: ../../include/nav.php:93
+msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/features.php:311
-msgid "Filter stream activity by depth of relationships"
+#: ../../include/nav.php:95
+msgid "Your photos"
 msgstr ""
 
-#: ../../include/features.php:320
-msgid "Show friend and connection suggestions"
+#: ../../include/nav.php:96
+msgid "Your files"
 msgstr ""
 
-#: ../../include/features.php:328
-msgid "Connection Filtering"
+#: ../../include/nav.php:99
+msgid "Your chatrooms"
 msgstr ""
 
-#: ../../include/features.php:329
-msgid "Filter incoming posts from connections based on keywords/content"
+#: ../../include/nav.php:105 ../../include/conversation.php:1879
+msgid "Bookmarks"
 msgstr ""
 
-#: ../../include/features.php:341
-msgid "Post/Comment Tools"
+#: ../../include/nav.php:105
+msgid "Your bookmarks"
 msgstr ""
 
-#: ../../include/features.php:345
-msgid "Community Tagging"
+#: ../../include/nav.php:109
+msgid "Your webpages"
 msgstr ""
 
-#: ../../include/features.php:346
-msgid "Ability to tag existing posts"
+#: ../../include/nav.php:111
+msgid "Your wikis"
 msgstr ""
 
-#: ../../include/features.php:354
-msgid "Post Categories"
+#: ../../include/nav.php:115
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/features.php:355
-msgid "Add categories to your posts"
+#: ../../include/nav.php:131
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/features.php:363
-msgid "Emoji Reactions"
+#: ../../include/nav.php:131
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/features.php:364
-msgid "Add emoji reaction ability to posts"
+#: ../../include/nav.php:143
+msgid "Get me home"
 msgstr ""
 
-#: ../../include/features.php:372 ../../include/contact_widgets.php:53
-#: ../../include/widgets.php:346
-msgid "Saved Folders"
+#: ../../include/nav.php:145
+msgid "Log me out of this site"
 msgstr ""
 
-#: ../../include/features.php:373
-msgid "Ability to file posts under folders"
+#: ../../include/nav.php:150
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/features.php:381
-msgid "Dislike Posts"
+#: ../../include/nav.php:162
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/features.php:382
-msgid "Ability to dislike posts/comments"
+#: ../../include/nav.php:166
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/features.php:390
-msgid "Star Posts"
+#: ../../include/nav.php:168
+msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/features.php:391
-msgid "Ability to mark special posts with a star indicator"
+#: ../../include/nav.php:170
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/features.php:399
-msgid "Tag Cloud"
+#: ../../include/nav.php:182
+msgid "Your grid"
 msgstr ""
 
-#: ../../include/features.php:400
-msgid "Provide a personal tag cloud on your channel page"
+#: ../../include/nav.php:183
+msgid "Mark all grid notifications seen"
 msgstr ""
 
-#: ../../include/features.php:412
-msgid "Premium Channel"
+#: ../../include/nav.php:185
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/features.php:413
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
+#: ../../include/nav.php:186
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/connections.php:95
-msgid "New window"
+#: ../../include/nav.php:192
+msgid "Notices"
 msgstr ""
 
-#: ../../include/connections.php:96
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/nav.php:192
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/connections.php:214
-#, php-format
-msgid "User '%s' deleted"
+#: ../../include/nav.php:193
+msgid "See all notifications"
 msgstr ""
 
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
+#: ../../include/nav.php:196
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/oembed.php:307
-msgid " by "
+#: ../../include/nav.php:197
+msgid "See all private messages"
 msgstr ""
 
-#: ../../include/oembed.php:308
-msgid " on "
+#: ../../include/nav.php:198
+msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/oembed.php:337
-msgid "Embedded content"
+#: ../../include/nav.php:199 ../../include/widgets.php:700
+msgid "Inbox"
 msgstr ""
 
-#: ../../include/oembed.php:346
-msgid "Embedding disabled"
+#: ../../include/nav.php:200 ../../include/widgets.php:705
+msgid "Outbox"
 msgstr ""
 
-#: ../../include/text.php:460
-msgid "prev"
+#: ../../include/nav.php:201 ../../include/widgets.php:710
+msgid "New Message"
 msgstr ""
 
-#: ../../include/text.php:462
-msgid "first"
+#: ../../include/nav.php:204
+msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/text.php:491
-msgid "last"
+#: ../../include/nav.php:205
+msgid "See all events"
 msgstr ""
 
-#: ../../include/text.php:494
-msgid "next"
+#: ../../include/nav.php:206
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/text.php:505
-msgid "older"
+#: ../../include/nav.php:209
+msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/text.php:507
-msgid "newer"
+#: ../../include/nav.php:211
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/text.php:917
-msgid "No connections"
+#: ../../include/nav.php:219 ../../include/widgets.php:1595
+msgid "Admin"
 msgstr ""
 
-#: ../../include/text.php:942
-#, php-format
-msgid "View all %s connections"
+#: ../../include/nav.php:219
+msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/text.php:1087 ../../include/text.php:1092
-msgid "poke"
+#: ../../include/nav.php:250 ../../include/conversation.php:836
+msgid "Loading..."
 msgstr ""
 
-#: ../../include/text.php:1087 ../../include/text.php:1092
-#: ../../include/conversation.php:243
-msgid "poked"
+#: ../../include/nav.php:255
+msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: ../../include/text.php:1093
-msgid "ping"
+#: ../../include/nav.php:256
+msgid "Please wait..."
 msgstr ""
 
-#: ../../include/text.php:1093
-msgid "pinged"
+#: ../../include/features.php:58
+msgid "General Features"
 msgstr ""
 
-#: ../../include/text.php:1094
-msgid "prod"
+#: ../../include/features.php:63
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/text.php:1094
-msgid "prodded"
+#: ../../include/features.php:64
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/text.php:1095
-msgid "slap"
+#: ../../include/features.php:72
+msgid "Advanced Profiles"
 msgstr ""
 
-#: ../../include/text.php:1095
-msgid "slapped"
+#: ../../include/features.php:73
+msgid "Additional profile sections and selections"
 msgstr ""
 
-#: ../../include/text.php:1096
-msgid "finger"
+#: ../../include/features.php:81
+msgid "Profile Import/Export"
 msgstr ""
 
-#: ../../include/text.php:1096
-msgid "fingered"
+#: ../../include/features.php:82
+msgid "Save and load profile details across sites/channels"
 msgstr ""
 
-#: ../../include/text.php:1097
-msgid "rebuff"
+#: ../../include/features.php:90
+msgid "Web Pages"
 msgstr ""
 
-#: ../../include/text.php:1097
-msgid "rebuffed"
+#: ../../include/features.php:91
+msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: ../../include/text.php:1109
-msgid "happy"
+#: ../../include/features.php:100
+msgid "Provide a wiki for your channel"
 msgstr ""
 
-#: ../../include/text.php:1110
-msgid "sad"
+#: ../../include/features.php:117
+msgid "Private Notes"
 msgstr ""
 
-#: ../../include/text.php:1111
-msgid "mellow"
+#: ../../include/features.php:118
+msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr ""
 
-#: ../../include/text.php:1112
-msgid "tired"
+#: ../../include/features.php:126
+msgid "Navigation Channel Select"
 msgstr ""
 
-#: ../../include/text.php:1113
-msgid "perky"
+#: ../../include/features.php:127
+msgid "Change channels directly from within the navigation dropdown menu"
 msgstr ""
 
-#: ../../include/text.php:1114
-msgid "angry"
+#: ../../include/features.php:135
+msgid "Photo Location"
 msgstr ""
 
-#: ../../include/text.php:1115
-msgid "stupefied"
+#: ../../include/features.php:136
+msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: ../../include/text.php:1116
-msgid "puzzled"
+#: ../../include/features.php:144
+msgid "Access Controlled Chatrooms"
 msgstr ""
 
-#: ../../include/text.php:1117
-msgid "interested"
+#: ../../include/features.php:145
+msgid "Provide chatrooms and chat services with access control."
 msgstr ""
 
-#: ../../include/text.php:1118
-msgid "bitter"
+#: ../../include/features.php:153
+msgid "Smart Birthdays"
 msgstr ""
 
-#: ../../include/text.php:1119
-msgid "cheerful"
+#: ../../include/features.php:154
+msgid ""
+"Make birthday events timezone aware in case your friends are scattered "
+"across the planet."
 msgstr ""
 
-#: ../../include/text.php:1120
-msgid "alive"
+#: ../../include/features.php:162
+msgid "Event Timezone Selection"
 msgstr ""
 
-#: ../../include/text.php:1121
-msgid "annoyed"
+#: ../../include/features.php:163
+msgid "Allow event creation in timezones other than your own."
 msgstr ""
 
-#: ../../include/text.php:1122
-msgid "anxious"
+#: ../../include/features.php:171
+msgid "Advanced Directory Search"
 msgstr ""
 
-#: ../../include/text.php:1123
-msgid "cranky"
+#: ../../include/features.php:172
+msgid "Allows creation of complex directory search queries"
 msgstr ""
 
-#: ../../include/text.php:1124
-msgid "disturbed"
+#: ../../include/features.php:180
+msgid "Advanced Theme and Layout Settings"
 msgstr ""
 
-#: ../../include/text.php:1125
-msgid "frustrated"
+#: ../../include/features.php:181
+msgid "Allows fine tuning of themes and page layouts"
 msgstr ""
 
-#: ../../include/text.php:1126
-msgid "depressed"
+#: ../../include/features.php:191
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/text.php:1127
-msgid "motivated"
+#: ../../include/features.php:195
+msgid "Large Photos"
 msgstr ""
 
-#: ../../include/text.php:1128
-msgid "relaxed"
+#: ../../include/features.php:196
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
 msgstr ""
 
-#: ../../include/text.php:1129
-msgid "surprised"
+#: ../../include/features.php:205
+msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/text.php:1316 ../../include/js_strings.php:70
-msgid "Monday"
+#: ../../include/features.php:213
+msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/text.php:1316 ../../include/js_strings.php:71
-msgid "Tuesday"
+#: ../../include/features.php:214
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/text.php:1316 ../../include/js_strings.php:72
-msgid "Wednesday"
+#: ../../include/features.php:222
+msgid "Enable Voting Tools"
 msgstr ""
 
-#: ../../include/text.php:1316 ../../include/js_strings.php:73
-msgid "Thursday"
+#: ../../include/features.php:223
+msgid "Provide a class of post which others can vote on"
 msgstr ""
 
-#: ../../include/text.php:1316 ../../include/js_strings.php:74
-msgid "Friday"
+#: ../../include/features.php:231
+msgid "Disable Comments"
 msgstr ""
 
-#: ../../include/text.php:1316 ../../include/js_strings.php:75
-msgid "Saturday"
+#: ../../include/features.php:232
+msgid "Provide the option to disable comments for a post"
 msgstr ""
 
-#: ../../include/text.php:1316 ../../include/js_strings.php:69
-msgid "Sunday"
+#: ../../include/features.php:240
+msgid "Delayed Posting"
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/js_strings.php:45
-msgid "January"
+#: ../../include/features.php:241
+msgid "Allow posts to be published at a later date"
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/js_strings.php:46
-msgid "February"
+#: ../../include/features.php:249
+msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/js_strings.php:47
-msgid "March"
+#: ../../include/features.php:250
+msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/js_strings.php:48
-msgid "April"
+#: ../../include/features.php:258
+msgid "Suppress Duplicate Posts/Comments"
 msgstr ""
 
-#: ../../include/text.php:1320
-msgid "May"
+#: ../../include/features.php:259
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/js_strings.php:50
-msgid "June"
+#: ../../include/features.php:270
+msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/js_strings.php:51
-msgid "July"
+#: ../../include/features.php:274
+msgid "Search by Date"
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/js_strings.php:52
-msgid "August"
+#: ../../include/features.php:275
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/js_strings.php:53
-msgid "September"
+#: ../../include/features.php:283 ../../include/group.php:311
+msgid "Privacy Groups"
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/js_strings.php:54
-msgid "October"
+#: ../../include/features.php:284
+msgid "Enable management and selection of privacy groups"
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/js_strings.php:55
-msgid "November"
+#: ../../include/features.php:292 ../../include/widgets.php:283
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/js_strings.php:56
-msgid "December"
+#: ../../include/features.php:293
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/text.php:1397 ../../include/text.php:1401
-msgid "Unknown Attachment"
+#: ../../include/features.php:301
+msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/text.php:1403
-msgid "unknown"
+#: ../../include/features.php:302
+msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/text.php:1439
-msgid "remove category"
+#: ../../include/features.php:310
+msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/text.php:1516
-msgid "remove from file"
+#: ../../include/features.php:311
+msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/text.php:1783 ../../include/language.php:367
-msgid "default"
+#: ../../include/features.php:319
+msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/text.php:1791
-msgid "Page layout"
+#: ../../include/features.php:320
+msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/text.php:1791
-msgid "You can create your own with the layouts tool"
+#: ../../include/features.php:329
+msgid "Show friend and connection suggestions"
 msgstr ""
 
-#: ../../include/text.php:1833
-msgid "Page content type"
+#: ../../include/features.php:337
+msgid "Connection Filtering"
 msgstr ""
 
-#: ../../include/text.php:1966
-msgid "activity"
+#: ../../include/features.php:338
+msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 
-#: ../../include/text.php:2280
-msgid "Design Tools"
+#: ../../include/features.php:350
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/text.php:2286
-msgid "Pages"
+#: ../../include/features.php:354
+msgid "Community Tagging"
 msgstr ""
 
-#: ../../include/text.php:2308
-msgid "Import website..."
+#: ../../include/features.php:355
+msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/text.php:2309
-msgid "Select folder to import"
+#: ../../include/features.php:363
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/text.php:2310
-msgid "Import from a zipped folder:"
+#: ../../include/features.php:364
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/text.php:2311
-msgid "Import from cloud files:"
+#: ../../include/features.php:372
+msgid "Emoji Reactions"
 msgstr ""
 
-#: ../../include/text.php:2312
-msgid "/cloud/channel/path/to/folder"
+#: ../../include/features.php:373
+msgid "Add emoji reaction ability to posts"
 msgstr ""
 
-#: ../../include/text.php:2313
-msgid "Enter path to website files"
+#: ../../include/features.php:381 ../../include/contact_widgets.php:53
+#: ../../include/widgets.php:346
+msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/text.php:2314
-msgid "Select folder"
+#: ../../include/features.php:382
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/text.php:2315
-msgid "Export website..."
+#: ../../include/features.php:390
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/text.php:2316
-msgid "Export to a zip file"
+#: ../../include/features.php:391
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/text.php:2317
-msgid "website.zip"
+#: ../../include/features.php:399
+msgid "Star Posts"
 msgstr ""
 
-#: ../../include/text.php:2318
-msgid "Enter a name for the zip file."
+#: ../../include/features.php:400
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/text.php:2319
-msgid "Export to cloud files"
+#: ../../include/features.php:408
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/text.php:2320
-msgid "/path/to/export/folder"
+#: ../../include/features.php:409
+msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/text.php:2321
-msgid "Enter a path to a cloud files destination."
+#: ../../include/features.php:421
+msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/text.php:2322
-msgid "Specify folder"
+#: ../../include/features.php:422
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
 msgstr ""
 
-#: ../../include/zot.php:667
-msgid "Invalid data packet"
+#: ../../include/page_widgets.php:7
+msgid "New Page"
 msgstr ""
 
-#: ../../include/zot.php:683
-msgid "Unable to verify channel signature"
+#: ../../include/message.php:32
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/zot.php:2325
-#, php-format
-msgid "Unable to verify site signature for %s"
+#: ../../include/message.php:69
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/zot.php:3723
-msgid "invalid target signature"
+#: ../../include/message.php:74
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/page_widgets.php:7
-msgid "New Page"
+#: ../../include/message.php:225
+msgid "Stored post could not be verified."
 msgstr ""
 
 #: ../../include/contact_widgets.php:11
@@ -11615,12 +11577,6 @@ msgstr ""
 msgid "Everything"
 msgstr ""
 
-#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46
-#: ../../include/widgets.php:465 ../../include/taxonomy.php:188
-#: ../../include/taxonomy.php:270
-msgid "Categories"
-msgstr ""
-
 #: ../../include/contact_widgets.php:122
 #, php-format
 msgid "%d connection in common"
@@ -11632,6 +11588,14 @@ msgstr[1] ""
 msgid "show more"
 msgstr ""
 
+#: ../../include/bb2diaspora.php:409
+msgid "Attachments:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:506
+msgid "$Projectname event notification:"
+msgstr ""
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr ""
@@ -11772,11 +11736,55 @@ msgstr ""
 msgid "timeago.numbers"
 msgstr ""
 
+#: ../../include/js_strings.php:45 ../../include/text.php:1320
+msgid "January"
+msgstr ""
+
+#: ../../include/js_strings.php:46 ../../include/text.php:1320
+msgid "February"
+msgstr ""
+
+#: ../../include/js_strings.php:47 ../../include/text.php:1320
+msgid "March"
+msgstr ""
+
+#: ../../include/js_strings.php:48 ../../include/text.php:1320
+msgid "April"
+msgstr ""
+
 #: ../../include/js_strings.php:49
 msgctxt "long"
 msgid "May"
 msgstr ""
 
+#: ../../include/js_strings.php:50 ../../include/text.php:1320
+msgid "June"
+msgstr ""
+
+#: ../../include/js_strings.php:51 ../../include/text.php:1320
+msgid "July"
+msgstr ""
+
+#: ../../include/js_strings.php:52 ../../include/text.php:1320
+msgid "August"
+msgstr ""
+
+#: ../../include/js_strings.php:53 ../../include/text.php:1320
+msgid "September"
+msgstr ""
+
+#: ../../include/js_strings.php:54 ../../include/text.php:1320
+msgid "October"
+msgstr ""
+
+#: ../../include/js_strings.php:55 ../../include/text.php:1320
+msgid "November"
+msgstr ""
+
+#: ../../include/js_strings.php:56 ../../include/text.php:1320
+msgid "December"
+msgstr ""
+
 #: ../../include/js_strings.php:57
 msgid "Jan"
 msgstr ""
@@ -11826,6 +11834,34 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
+#: ../../include/js_strings.php:69 ../../include/text.php:1316
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/js_strings.php:70 ../../include/text.php:1316
+msgid "Monday"
+msgstr ""
+
+#: ../../include/js_strings.php:71 ../../include/text.php:1316
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/js_strings.php:72 ../../include/text.php:1316
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/js_strings.php:73 ../../include/text.php:1316
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/js_strings.php:74 ../../include/text.php:1316
+msgid "Friday"
+msgstr ""
+
+#: ../../include/js_strings.php:75 ../../include/text.php:1316
+msgid "Saturday"
+msgstr ""
+
 #: ../../include/js_strings.php:76
 msgid "Sun"
 msgstr ""
@@ -11879,338 +11915,305 @@ msgctxt "calendar"
 msgid "All day"
 msgstr ""
 
-#: ../../include/follow.php:27
-msgid "Channel is blocked on this site."
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
 msgstr ""
 
-#: ../../include/follow.php:32
-msgid "Channel location missing."
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/follow.php:80
-msgid "Response from remote channel was incomplete."
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
 msgstr ""
 
-#: ../../include/follow.php:97
-msgid "Channel was deleted and no longer exists."
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
 msgstr ""
 
-#: ../../include/follow.php:147 ../../include/follow.php:183
-msgid "Protocol disabled."
+#: ../../include/bbcode.php:134 ../../include/bbcode.php:1003
+#: ../../include/bbcode.php:1006 ../../include/bbcode.php:1011
+#: ../../include/bbcode.php:1014 ../../include/bbcode.php:1017
+#: ../../include/bbcode.php:1020 ../../include/bbcode.php:1025
+#: ../../include/bbcode.php:1028 ../../include/bbcode.php:1033
+#: ../../include/bbcode.php:1036 ../../include/bbcode.php:1039
+#: ../../include/bbcode.php:1042
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/follow.php:171
-msgid "Channel discovery failed."
+#: ../../include/bbcode.php:173 ../../include/bbcode.php:1053
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/follow.php:210
-msgid "Cannot connect to yourself."
+#: ../../include/bbcode.php:189
+#, php-format
+msgid "Install %s element: "
 msgstr ""
 
-#: ../../include/group.php:26
+#: ../../include/bbcode.php:193
+#, php-format
 msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr ""
-
-#: ../../include/group.php:248
-msgid "Add new connections to this privacy group"
-msgstr ""
-
-#: ../../include/group.php:289
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:312
-msgid "Edit group"
-msgstr ""
-
-#: ../../include/group.php:313
-msgid "Add privacy group"
-msgstr ""
-
-#: ../../include/group.php:314
-msgid "Channels not in any privacy group"
-msgstr ""
-
-#: ../../include/group.php:316 ../../include/widgets.php:284
-msgid "add"
-msgstr ""
-
-#: ../../include/items.php:837 ../../include/items.php:882
-msgid "(Unknown)"
-msgstr ""
-
-#: ../../include/items.php:1080
-msgid "Visible to anybody on the internet."
-msgstr ""
-
-#: ../../include/items.php:1082
-msgid "Visible to you only."
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
 msgstr ""
 
-#: ../../include/items.php:1084
-msgid "Visible to anybody in this network."
+#: ../../include/bbcode.php:272
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/items.php:1086
-msgid "Visible to anybody authenticated."
+#: ../../include/bbcode.php:349 ../../include/bbcode.php:357
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/items.php:1088
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/bbcode.php:357
+msgid "spoiler"
 msgstr ""
 
-#: ../../include/items.php:1090
-msgid "Visible to all connections."
+#: ../../include/bbcode.php:576 ../../include/bbcode.php:719
+#: ../../include/wiki.php:572
+msgid "Different viewers will see this text differently"
 msgstr ""
 
-#: ../../include/items.php:1092
-msgid "Visible to approved connections."
+#: ../../include/bbcode.php:991
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/items.php:1094
-msgid "Visible to specific connections."
+#: ../../include/connections.php:95
+msgid "New window"
 msgstr ""
 
-#: ../../include/items.php:3892
-msgid "Privacy group is empty."
+#: ../../include/connections.php:96
+msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/items.php:3899
+#: ../../include/connections.php:214
 #, php-format
-msgid "Privacy group: %s"
-msgstr ""
-
-#: ../../include/items.php:3911
-msgid "Connection not found."
+msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../include/items.php:4260
-msgid "profile photo"
+#: ../../include/oembed.php:307
+msgid " by "
 msgstr ""
 
-#: ../../include/items.php:4456
-#, php-format
-msgid "[Edited %s]"
+#: ../../include/oembed.php:308
+msgid " on "
 msgstr ""
 
-#: ../../include/items.php:4456
-msgctxt "edit_activity"
-msgid "Post"
+#: ../../include/oembed.php:337
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/items.php:4456
-msgctxt "edit_activity"
-msgid "Comment"
+#: ../../include/oembed.php:346
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/language.php:380
-msgid "Select an alternate language"
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/nav.php:85 ../../include/nav.php:118 ../../boot.php:1719
-msgid "Logout"
+#: ../../include/channel.php:67
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/nav.php:85 ../../include/nav.php:118
-msgid "End this session"
+#: ../../include/channel.php:70
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/nav.php:88
-msgid "Your posts and conversations"
+#: ../../include/channel.php:181
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/nav.php:89
-msgid "Your profile page"
+#: ../../include/channel.php:193
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/nav.php:91
-msgid "Manage/Edit profiles"
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../include/nav.php:93
-msgid "Edit your profile"
+#: ../../include/channel.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/nav.php:95
-msgid "Your photos"
+#: ../../include/channel.php:272
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/nav.php:96
-msgid "Your files"
+#: ../../include/channel.php:341
+msgid "Default Profile"
 msgstr ""
 
-#: ../../include/nav.php:99
-msgid "Your chatrooms"
+#: ../../include/channel.php:962
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/nav.php:105 ../../include/conversation.php:1865
-msgid "Bookmarks"
+#: ../../include/channel.php:982
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/nav.php:105
-msgid "Your bookmarks"
+#: ../../include/channel.php:1055 ../../include/channel.php:1174
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/nav.php:109
-msgid "Your webpages"
+#: ../../include/channel.php:1057 ../../include/channel.php:1229
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/nav.php:111
-msgid "Your wikis"
+#: ../../include/channel.php:1058
+msgid "Online Now"
 msgstr ""
 
-#: ../../include/nav.php:115
-msgid "Sign in"
+#: ../../include/channel.php:1179
+msgid "Like this channel"
 msgstr ""
 
-#: ../../include/nav.php:131
-msgid "Remote authentication"
+#: ../../include/channel.php:1203
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/nav.php:131
-msgid "Click to authenticate to your home hub"
+#: ../../include/channel.php:1204
+msgid "j F"
 msgstr ""
 
-#: ../../include/nav.php:143
-msgid "Get me home"
+#: ../../include/channel.php:1211
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/nav.php:145
-msgid "Log me out of this site"
+#: ../../include/channel.php:1224
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/nav.php:150
-msgid "Create an account"
+#: ../../include/channel.php:1227
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/nav.php:162
-msgid "Help and documentation"
+#: ../../include/channel.php:1233
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/nav.php:166
-msgid "Applications, utilities, links, games"
+#: ../../include/channel.php:1235
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/nav.php:168
-msgid "Search site @name, #tag, ?docs, content"
+#: ../../include/channel.php:1237
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/nav.php:170
-msgid "Channel Directory"
+#: ../../include/channel.php:1241
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/nav.php:182
-msgid "Your grid"
+#: ../../include/channel.php:1243
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/nav.php:183
-msgid "Mark all grid notifications seen"
+#: ../../include/channel.php:1245
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/nav.php:185
-msgid "Channel home"
+#: ../../include/channel.php:1247
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/nav.php:186
-msgid "Mark all channel notifications seen"
+#: ../../include/channel.php:1249
+msgid "My other channels:"
 msgstr ""
 
-#: ../../include/nav.php:192
-msgid "Notices"
+#: ../../include/channel.php:1251
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/nav.php:192
-msgid "Notifications"
+#: ../../include/channel.php:1253
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/nav.php:193
-msgid "See all notifications"
+#: ../../include/channel.php:1255
+msgid "Television:"
 msgstr ""
 
-#: ../../include/nav.php:196
-msgid "Private mail"
+#: ../../include/channel.php:1257
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/nav.php:197
-msgid "See all private messages"
+#: ../../include/channel.php:1259
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/nav.php:198
-msgid "Mark all private messages seen"
+#: ../../include/channel.php:1261
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/nav.php:199 ../../include/widgets.php:700
-msgid "Inbox"
+#: ../../include/channel.php:1263
+msgid "School/education:"
 msgstr ""
 
-#: ../../include/nav.php:200 ../../include/widgets.php:705
-msgid "Outbox"
+#: ../../include/channel.php:1284
+msgid "Like this thing"
 msgstr ""
 
-#: ../../include/nav.php:201 ../../include/widgets.php:710
-msgid "New Message"
+#: ../../include/attach.php:248 ../../include/attach.php:336
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/nav.php:204
-msgid "Event Calendar"
+#: ../../include/attach.php:497
+msgid "No source file."
 msgstr ""
 
-#: ../../include/nav.php:205
-msgid "See all events"
+#: ../../include/attach.php:519
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/nav.php:206
-msgid "Mark all events seen"
+#: ../../include/attach.php:537
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/nav.php:209
-msgid "Manage Your Channels"
+#: ../../include/attach.php:668
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/nav.php:211
-msgid "Account/Channel Settings"
+#: ../../include/attach.php:682
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/nav.php:219 ../../include/widgets.php:1595
-msgid "Admin"
+#: ../../include/attach.php:852
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/nav.php:219
-msgid "Site Setup and Configuration"
+#: ../../include/attach.php:865
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/nav.php:250 ../../include/conversation.php:836
-msgid "Loading..."
+#: ../../include/attach.php:920 ../../include/attach.php:936
+msgid "Path not available."
 msgstr ""
 
-#: ../../include/nav.php:255
-msgid "@name, #tag, ?doc, content"
+#: ../../include/attach.php:982 ../../include/attach.php:1140
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/nav.php:256
-msgid "Please wait..."
+#: ../../include/attach.php:1008
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/security.php:117
-msgid "guest:"
+#: ../../include/attach.php:1030
+msgid "Path not found."
 msgstr ""
 
-#: ../../include/security.php:535
-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/attach.php:1094
+msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/help.php:31
-msgid "Help:"
+#: ../../include/attach.php:1098
+msgid "database storage failed."
 msgstr ""
 
-#: ../../include/help.php:63
-msgid "Not Found"
+#: ../../include/attach.php:1146
+msgid "Empty path"
 msgstr ""
 
 #: ../../include/auth.php:148
@@ -12244,105 +12247,80 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/datetime.php:147
-msgid "Birthday"
+#: ../../include/help.php:31
+msgid "Help:"
 msgstr ""
 
-#: ../../include/datetime.php:149
-msgid "Age: "
+#: ../../include/help.php:63
+msgid "Not Found"
 msgstr ""
 
-#: ../../include/datetime.php:151
-msgid "YYYY-MM-DD or MM-DD"
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/datetime.php:286 ../../boot.php:2564
-msgid "never"
+#: ../../include/follow.php:32
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/datetime.php:292
-msgid "less than a second ago"
+#: ../../include/follow.php:80
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/datetime.php:310
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
+#: ../../include/follow.php:97
+msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/datetime.php:321
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/follow.php:147 ../../include/follow.php:183
+msgid "Protocol disabled."
+msgstr ""
 
-#: ../../include/datetime.php:324
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/follow.php:171
+msgid "Channel discovery failed."
+msgstr ""
 
-#: ../../include/datetime.php:327
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/follow.php:210
+msgid "Cannot connect to yourself."
+msgstr ""
 
-#: ../../include/datetime.php:330
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/network.php:729
+msgid "view full size"
+msgstr ""
 
-#: ../../include/datetime.php:333
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/network.php:1978
+msgid "No Subject"
+msgstr ""
 
-#: ../../include/datetime.php:336
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/network.php:2234
+msgid "OStatus"
+msgstr ""
 
-#: ../../include/datetime.php:339
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/network.php:2235
+msgid "GNU-Social"
+msgstr ""
 
-#: ../../include/datetime.php:576
-#, php-format
-msgid "%1$s's birthday"
+#: ../../include/network.php:2236
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/datetime.php:577
-#, php-format
-msgid "Happy Birthday %1$s"
+#: ../../include/network.php:2239
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
+#: ../../include/network.php:2240
+msgid "Zot"
 msgstr ""
 
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
+#: ../../include/network.php:2241
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
+#: ../../include/network.php:2242
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
+#: ../../include/network.php:2243
+msgid "MySpace"
 msgstr ""
 
 #: ../../include/photos.php:115
@@ -12368,7 +12346,7 @@ msgctxt "photo_upload"
 msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../include/photos.php:507 ../../include/conversation.php:1825
+#: ../../include/photos.php:507 ../../include/conversation.php:1839
 msgid "Photo Albums"
 msgstr ""
 
@@ -12376,244 +12354,305 @@ msgstr ""
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/selectors.php:30
-msgid "Frequently"
+#: ../../include/text.php:460
+msgid "prev"
 msgstr ""
 
-#: ../../include/selectors.php:31
-msgid "Hourly"
+#: ../../include/text.php:462
+msgid "first"
 msgstr ""
 
-#: ../../include/selectors.php:32
-msgid "Twice daily"
+#: ../../include/text.php:491
+msgid "last"
 msgstr ""
 
-#: ../../include/selectors.php:33
-msgid "Daily"
+#: ../../include/text.php:494
+msgid "next"
 msgstr ""
 
-#: ../../include/selectors.php:34
-msgid "Weekly"
+#: ../../include/text.php:505
+msgid "older"
 msgstr ""
 
-#: ../../include/selectors.php:35
-msgid "Monthly"
+#: ../../include/text.php:507
+msgid "newer"
 msgstr ""
 
-#: ../../include/selectors.php:49
-msgid "Currently Male"
+#: ../../include/text.php:917
+msgid "No connections"
 msgstr ""
 
-#: ../../include/selectors.php:49
-msgid "Currently Female"
+#: ../../include/text.php:942
+#, php-format
+msgid "View all %s connections"
 msgstr ""
 
-#: ../../include/selectors.php:49
-msgid "Mostly Male"
+#: ../../include/text.php:1087 ../../include/text.php:1092
+msgid "poke"
 msgstr ""
 
-#: ../../include/selectors.php:49
-msgid "Mostly Female"
+#: ../../include/text.php:1087 ../../include/text.php:1092
+#: ../../include/conversation.php:243
+msgid "poked"
 msgstr ""
 
-#: ../../include/selectors.php:49
-msgid "Transgender"
+#: ../../include/text.php:1093
+msgid "ping"
 msgstr ""
 
-#: ../../include/selectors.php:49
-msgid "Intersex"
+#: ../../include/text.php:1093
+msgid "pinged"
 msgstr ""
 
-#: ../../include/selectors.php:49
-msgid "Transsexual"
+#: ../../include/text.php:1094
+msgid "prod"
 msgstr ""
 
-#: ../../include/selectors.php:49
-msgid "Hermaphrodite"
+#: ../../include/text.php:1094
+msgid "prodded"
 msgstr ""
 
-#: ../../include/selectors.php:49
-msgid "Neuter"
+#: ../../include/text.php:1095
+msgid "slap"
 msgstr ""
 
-#: ../../include/selectors.php:49
-msgid "Non-specific"
+#: ../../include/text.php:1095
+msgid "slapped"
 msgstr ""
 
-#: ../../include/selectors.php:49
-msgid "Undecided"
+#: ../../include/text.php:1096
+msgid "finger"
 msgstr ""
 
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
-msgid "Males"
+#: ../../include/text.php:1096
+msgid "fingered"
 msgstr ""
 
-#: ../../include/selectors.php:85 ../../include/selectors.php:104
-msgid "Females"
+#: ../../include/text.php:1097
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Gay"
+#: ../../include/text.php:1097
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Lesbian"
+#: ../../include/text.php:1109
+msgid "happy"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "No Preference"
+#: ../../include/text.php:1110
+msgid "sad"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Bisexual"
+#: ../../include/text.php:1111
+msgid "mellow"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Autosexual"
+#: ../../include/text.php:1112
+msgid "tired"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Abstinent"
+#: ../../include/text.php:1113
+msgid "perky"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Virgin"
+#: ../../include/text.php:1114
+msgid "angry"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Deviant"
+#: ../../include/text.php:1115
+msgid "stupefied"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Fetish"
+#: ../../include/text.php:1116
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Oodles"
+#: ../../include/text.php:1117
+msgid "interested"
 msgstr ""
 
-#: ../../include/selectors.php:85
-msgid "Nonsexual"
+#: ../../include/text.php:1118
+msgid "bitter"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Single"
+#: ../../include/text.php:1119
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Lonely"
+#: ../../include/text.php:1120
+msgid "alive"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Available"
+#: ../../include/text.php:1121
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Unavailable"
+#: ../../include/text.php:1122
+msgid "anxious"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Has crush"
+#: ../../include/text.php:1123
+msgid "cranky"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Infatuated"
+#: ../../include/text.php:1124
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Dating"
+#: ../../include/text.php:1125
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Unfaithful"
+#: ../../include/text.php:1126
+msgid "depressed"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Sex Addict"
+#: ../../include/text.php:1127
+msgid "motivated"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Friends/Benefits"
+#: ../../include/text.php:1128
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Casual"
+#: ../../include/text.php:1129
+msgid "surprised"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Engaged"
+#: ../../include/text.php:1320
+msgid "May"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Married"
+#: ../../include/text.php:1397 ../../include/text.php:1401
+msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Imaginarily married"
+#: ../../include/text.php:1403
+msgid "unknown"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Partners"
+#: ../../include/text.php:1439
+msgid "remove category"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Cohabiting"
+#: ../../include/text.php:1516
+msgid "remove from file"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Common law"
+#: ../../include/text.php:1791
+msgid "Page layout"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Happy"
+#: ../../include/text.php:1791
+msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Not looking"
+#: ../../include/text.php:1833
+msgid "Page content type"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Swinger"
+#: ../../include/text.php:1966
+msgid "activity"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Betrayed"
+#: ../../include/text.php:2280
+msgid "Design Tools"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Separated"
+#: ../../include/text.php:2286
+msgid "Pages"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Unstable"
+#: ../../include/text.php:2308
+msgid "Import website..."
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Divorced"
+#: ../../include/text.php:2309
+msgid "Select folder to import"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Imaginarily divorced"
+#: ../../include/text.php:2310
+msgid "Import from a zipped folder:"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "Widowed"
+#: ../../include/text.php:2311
+msgid "Import from cloud files:"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Uncertain"
+#: ../../include/text.php:2312
+msgid "/cloud/channel/path/to/folder"
 msgstr ""
 
-#: ../../include/selectors.php:123 ../../include/selectors.php:140
-msgid "It's complicated"
+#: ../../include/text.php:2313
+msgid "Enter path to website files"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Don't care"
+#: ../../include/text.php:2314
+msgid "Select folder"
 msgstr ""
 
-#: ../../include/selectors.php:123
-msgid "Ask me"
+#: ../../include/text.php:2315
+msgid "Export website..."
+msgstr ""
+
+#: ../../include/text.php:2316
+msgid "Export to a zip file"
+msgstr ""
+
+#: ../../include/text.php:2317
+msgid "website.zip"
+msgstr ""
+
+#: ../../include/text.php:2318
+msgid "Enter a name for the zip file."
+msgstr ""
+
+#: ../../include/text.php:2319
+msgid "Export to cloud files"
+msgstr ""
+
+#: ../../include/text.php:2320
+msgid "/path/to/export/folder"
+msgstr ""
+
+#: ../../include/text.php:2321
+msgid "Enter a path to a cloud files destination."
+msgstr ""
+
+#: ../../include/text.php:2322
+msgid "Specify folder"
+msgstr ""
+
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr ""
+
+#: ../../include/group.php:248
+msgid "Add new connections to this privacy group"
+msgstr ""
+
+#: ../../include/group.php:289
+msgid "edit"
+msgstr ""
+
+#: ../../include/group.php:312
+msgid "Edit group"
+msgstr ""
+
+#: ../../include/group.php:313
+msgid "Add privacy group"
+msgstr ""
+
+#: ../../include/group.php:314
+msgid "Channels not in any privacy group"
+msgstr ""
+
+#: ../../include/group.php:316 ../../include/widgets.php:284
+msgid "add"
 msgstr ""
 
 #: ../../include/widgets.php:103
@@ -12741,8 +12780,8 @@ msgstr ""
 msgid "Import Calendar"
 msgstr ""
 
-#: ../../include/widgets.php:883 ../../include/conversation.php:1852
-#: ../../include/conversation.php:1855
+#: ../../include/widgets.php:883 ../../include/conversation.php:1866
+#: ../../include/conversation.php:1869
 msgid "Chatrooms"
 msgstr ""
 
@@ -12822,6 +12861,140 @@ msgstr ""
 msgid "Plugin Features"
 msgstr ""
 
+#: ../../include/permissions.php:35
+msgid "Can view my normal stream and posts"
+msgstr ""
+
+#: ../../include/permissions.php:39
+msgid "Can view my webpages"
+msgstr ""
+
+#: ../../include/permissions.php:43
+msgid "Can post on my channel page (\"wall\")"
+msgstr ""
+
+#: ../../include/permissions.php:46
+msgid "Can like/dislike stuff"
+msgstr ""
+
+#: ../../include/permissions.php:46
+msgid "Profiles and things other than posts/comments"
+msgstr ""
+
+#: ../../include/permissions.php:48
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr ""
+
+#: ../../include/permissions.php:48
+msgid "Advanced - useful for creating group forum channels"
+msgstr ""
+
+#: ../../include/permissions.php:49
+msgid "Can chat with me (when available)"
+msgstr ""
+
+#: ../../include/permissions.php:50
+msgid "Can write to my file storage and photos"
+msgstr ""
+
+#: ../../include/permissions.php:51
+msgid "Can edit my webpages"
+msgstr ""
+
+#: ../../include/permissions.php:53
+msgid "Somewhat advanced - very useful in open communities"
+msgstr ""
+
+#: ../../include/permissions.php:55
+msgid "Can administer my channel resources"
+msgstr ""
+
+#: ../../include/permissions.php:55
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr ""
+
+#: ../../include/import.php:30
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
+msgstr ""
+
+#: ../../include/import.php:90
+msgid "Channel clone failed. Import failed."
+msgstr ""
+
+#: ../../include/import.php:1354
+msgid "Unable to import element \""
+msgstr ""
+
+#: ../../include/items.php:837 ../../include/items.php:882
+msgid "(Unknown)"
+msgstr ""
+
+#: ../../include/items.php:1080
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1082
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1084
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1086
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1088
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr ""
+
+#: ../../include/items.php:1090
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1092
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1094
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:3892
+msgid "Privacy group is empty."
+msgstr ""
+
+#: ../../include/items.php:3899
+#, php-format
+msgid "Privacy group: %s"
+msgstr ""
+
+#: ../../include/items.php:3911
+msgid "Connection not found."
+msgstr ""
+
+#: ../../include/items.php:4260
+msgid "profile photo"
+msgstr ""
+
+#: ../../include/items.php:4456
+#, php-format
+msgid "[Edited %s]"
+msgstr ""
+
+#: ../../include/items.php:4456
+msgctxt "edit_activity"
+msgid "Post"
+msgstr ""
+
+#: ../../include/items.php:4456
+msgctxt "edit_activity"
+msgid "Comment"
+msgstr ""
+
 #: ../../include/conversation.php:204
 #, php-format
 msgid "%1$s is now connected with %2$s"
@@ -13034,205 +13207,68 @@ msgstr ""
 msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/conversation.php:1804
+#: ../../include/conversation.php:1818
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/conversation.php:1816
+#: ../../include/conversation.php:1830
 msgid "Profile Details"
 msgstr ""
 
-#: ../../include/conversation.php:1832
+#: ../../include/conversation.php:1846
 msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/conversation.php:1868
+#: ../../include/conversation.php:1882
 msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:1878
-msgid "Manage Webpages"
+#: ../../include/conversation.php:1892
+msgid "View Webpages"
 msgstr ""
 
-#: ../../include/conversation.php:1943
+#: ../../include/conversation.php:1958
 msgctxt "noun"
 msgid "Attending"
 msgid_plural "Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1946
+#: ../../include/conversation.php:1961
 msgctxt "noun"
 msgid "Not Attending"
 msgid_plural "Not Attending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1949
+#: ../../include/conversation.php:1964
 msgctxt "noun"
 msgid "Undecided"
 msgid_plural "Undecided"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1952
+#: ../../include/conversation.php:1967
 msgctxt "noun"
 msgid "Agree"
 msgid_plural "Agrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1955
+#: ../../include/conversation.php:1970
 msgctxt "noun"
 msgid "Disagree"
 msgid_plural "Disagrees"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:1958
+#: ../../include/conversation.php:1973
 msgctxt "noun"
 msgid "Abstain"
 msgid_plural "Abstains"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/permissions.php:35
-msgid "Can view my normal stream and posts"
-msgstr ""
-
-#: ../../include/permissions.php:39
-msgid "Can view my webpages"
-msgstr ""
-
-#: ../../include/permissions.php:43
-msgid "Can post on my channel page (\"wall\")"
-msgstr ""
-
-#: ../../include/permissions.php:46
-msgid "Can like/dislike stuff"
-msgstr ""
-
-#: ../../include/permissions.php:46
-msgid "Profiles and things other than posts/comments"
-msgstr ""
-
-#: ../../include/permissions.php:48
-msgid "Can forward to all my channel contacts via post @mentions"
-msgstr ""
-
-#: ../../include/permissions.php:48
-msgid "Advanced - useful for creating group forum channels"
-msgstr ""
-
-#: ../../include/permissions.php:49
-msgid "Can chat with me (when available)"
-msgstr ""
-
-#: ../../include/permissions.php:50
-msgid "Can write to my file storage and photos"
-msgstr ""
-
-#: ../../include/permissions.php:51
-msgid "Can edit my webpages"
-msgstr ""
-
-#: ../../include/permissions.php:53
-msgid "Somewhat advanced - very useful in open communities"
-msgstr ""
-
-#: ../../include/permissions.php:55
-msgid "Can administer my channel resources"
-msgstr ""
-
-#: ../../include/permissions.php:55
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr ""
-
-#: ../../include/import.php:30
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr ""
-
-#: ../../include/import.php:90
-msgid "Channel clone failed. Import failed."
-msgstr ""
-
-#: ../../include/import.php:1354
-msgid "Unable to import element \""
-msgstr ""
-
-#: ../../include/network.php:729
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1978
-msgid "No Subject"
-msgstr ""
-
-#: ../../include/network.php:2234
-msgid "OStatus"
-msgstr ""
-
-#: ../../include/network.php:2235
-msgid "GNU-Social"
-msgstr ""
-
-#: ../../include/network.php:2236
-msgid "RSS/Atom"
-msgstr ""
-
-#: ../../include/network.php:2239
-msgid "Facebook"
-msgstr ""
-
-#: ../../include/network.php:2240
-msgid "Zot"
-msgstr ""
-
-#: ../../include/network.php:2241
-msgid "LinkedIn"
-msgstr ""
-
-#: ../../include/network.php:2242
-msgid "XMPP/IM"
-msgstr ""
-
-#: ../../include/network.php:2243
-msgid "MySpace"
-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 ""
-
 #: ../../util/nconfig.php:34
 msgid "Source channel not found."
 msgstr ""
diff --git a/view/css/widgets.css b/view/css/widgets.css
index abaf03038..9b97d8bf7 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -64,8 +64,9 @@ li:hover .widget-nav-pills-icons {
 #note-text {
 	padding: 5px;
 	width: 100%;
-	resize: vertical;
+	resize: none;
 	min-height: 250px;
+	overflow: hidden;
 }
 
 /* saved searches */
diff --git a/view/php/default.php b/view/php/default.php
index 839a36b5b..373fa2fd0 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -10,7 +10,7 @@
 	<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>
 	<main>
-		<aside id="region_1"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></aside>
+		<aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside>
 		<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
 					<div id="page-footer"></div>
 			<div id="pause"></div>
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e3ff6146b..ee106d50e 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1669,8 +1669,8 @@ nav .dropdown-menu {
 
 main.fullscreen {
 	left: 0px;
-	width: 100%;
-	height: 100%;
+	width: 100vw;
+	height: 100vh;
 	max-width: none;
 }
 
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 395385411..3ff0c43ae 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -18,7 +18,9 @@ $(document).ready(function() {
 
 	if($(window).width() > 767) {
 		$('#left_aside_wrapper').stick_in_parent({
-			offset_top: $('nav').outerHeight(true)
+			offset_top: $('nav').outerHeight(true),
+			parent: '#region_1',
+			spacer: '#left_aside_spacer'
 		});
 	}
 
@@ -30,6 +32,15 @@ $(document).ready(function() {
 		}
 	});
 
+	var left_aside_height = $('#left_aside_wrapper').height();
+
+	$('#left_aside_wrapper').on('click', function() {
+		if(left_aside_height != $('#left_aside_wrapper').height()) {
+			$(document.body).trigger("sticky_kit:recalc");
+			left_aside_height = $('#left_aside_wrapper').height();
+		}
+	});
+
 	if($('#left_aside_wrapper').length && $('#left_aside_wrapper').html().length === 0) {
 		$('#expand-aside').hide();
 	}
@@ -96,7 +107,9 @@ function toggleAside() {
 		$('main').addClass('region_1-on')
 		$('<div id="overlay"></div>').appendTo('section');
 		$('#left_aside_wrapper').stick_in_parent({
-			offset_top: $('nav').outerHeight(true)
+			offset_top: $('nav').outerHeight(true) - 10,
+			parent: '#region_1',
+			spacer: '#left_aside_spacer'
 		});
 	}
 }
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index ed2714dfc..f9114141d 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -433,3 +433,26 @@ pre {
 .contextual-help-tool i {
 	color: $link_colour;
 }
+
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #222;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #222;
+}
+
+
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index 7dd8125a4..f06fd3667 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -297,3 +297,24 @@ pre {
 	top: 50px;
 
 }
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #F5F5F5;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #F5F5F5;
+}
+
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index ca2e5b15a..c7bb99334 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -383,3 +383,23 @@ pre {
 .contextual-help-tool i {
 	color: $link_colour;
 }
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #143D12;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #143D12;
+}
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index a462c4d29..dabc26743 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -356,3 +356,24 @@ pre {
 .contextual-help-tool i {
 	color: $link_colour;
 }
+
+.profile-match-wrapper {
+	width: 150px;	
+	height: 120px;
+	border: none;
+}
+
+.profile-match-name {
+    	width: 144px;
+    	white-space: nowrap;
+    	text-overflow: ellipsis;
+}
+
+.widget-nav-pills-icons:hover + a {
+	background-color: #030303;
+}
+
+.widget-nav-pills-checkbox:hover + a {
+	background-color: #030303;
+}
+
diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl
index f9fed1feb..c4da3783b 100644
--- a/view/tpl/notes.tpl
+++ b/view/tpl/notes.tpl
@@ -5,9 +5,10 @@
 		var noteSaveTimer = null;
 		var noteText = $('#note-text');
 
-		$(document).ready(function(){
-			noteText.height(noteText[0].scrollHeight);
-		});
+		noteText.on('change keyup keydown paste cut', function () {
+			$(this).height(0).height(this.scrollHeight);
+			$(document.body).trigger("sticky_kit:recalc");
+		}).change();
 
 		$(document).on('focusout',"#note-text",function(e){
 			if(noteSaveTimer)