From ebfa1a12b9cc3d939ed49a7f66e5687267a409d3 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 25 Feb 2016 00:36:35 -0800
Subject: when creating an event from a post in our stream, if the original
 post was private, set the event permissions to "just me". If it was a public
 event, set the event permissions to the channel default permissions.

---
 include/event.php   | 11 +++++++++++
 include/session.php |  4 ++--
 mod/cal.php         |  2 +-
 mod/events.php      |  2 +-
 version.inc         |  2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/include/event.php b/include/event.php
index 73033a1c3..2969f4f61 100644
--- a/include/event.php
+++ b/include/event.php
@@ -440,6 +440,17 @@ function event_addtocal($item_id, $uid) {
 			$ev['event_hash'] = $item['resource_id'];
 		}
 
+		if($ev->private)
+			$ev['allow_cid'] = '<' . $channel['channel_hash'] . '>'; 
+		else {
+			$acl = new Zotlabs\Access\AccessList($channel);
+			$x = $acl->get();
+			$ev['allow_cid'] = $x['allow_cid'];
+			$ev['allow_gid'] = $x['allow_gid'];
+			$ev['deny_cid']  = $x['deny_cid'];
+			$ev['deny_gid']  = $x['deny_gid'];
+		}
+
 		$event = event_store_event($ev);
 		if($event) {
 			$r = q("update item set resource_id = '%s', resource_type = 'event' where id = %d and uid = %d",
diff --git a/include/session.php b/include/session.php
index 182805980..43bba528b 100644
--- a/include/session.php
+++ b/include/session.php
@@ -124,12 +124,12 @@ session_set_save_handler(
 
    // Force cookies to be secure (https only) if this site is SSL enabled. Must be done before session_start().
 
-    if(intval($a->config['system']['ssl_cookie_protection'])) {
+    if(intval(get_app()->config['system']['ssl_cookie_protection'])) {
         $arr = session_get_cookie_params();
         session_set_cookie_params(
             ((isset($arr['lifetime']))  ? $arr['lifetime'] : 0),
             ((isset($arr['path']))      ? $arr['path']     : '/'),
-            ((isset($arr['domain']))    ? $arr['domain']   : $a->get_hostname()),
+            ((isset($arr['domain']))    ? $arr['domain']   : get_app()->get_hostname()),
             ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
             ((isset($arr['httponly']))  ? $arr['httponly'] : true));
     }
\ No newline at end of file
diff --git a/mod/cal.php b/mod/cal.php
index 9899b33b0..1e2405cd0 100755
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -85,7 +85,7 @@ function cal_content(&$a) {
 	$m = 0;
 	$ignored = ((x($_REQUEST,'ignored')) ? " and ignored = " . intval($_REQUEST['ignored']) . " "  : '');
 
-logger('args: ' . print_r($a->argv,true));
+	// logger('args: ' . print_r($a->argv,true));
 
 	if(argc() > 3 && intval(argv(2)) && intval(argv(3))) {
 		$mode = 'view';
diff --git a/mod/events.php b/mod/events.php
index be39902aa..8e3b3e06b 100755
--- a/mod/events.php
+++ b/mod/events.php
@@ -299,7 +299,7 @@ function events_content(&$a) {
 	$ignored = ((x($_REQUEST,'ignored')) ? " and ignored = " . intval($_REQUEST['ignored']) . " "  : '');
 
 
-logger('args: ' . print_r($a->argv,true));
+	// logger('args: ' . print_r($a->argv,true));
 
 
 
diff --git a/version.inc b/version.inc
index 2d59eb514..c612b6ed2 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-02-24.1317H
+2016-02-25.1318H
-- 
cgit v1.2.3


From be27fb56440c6687add239e10c5e46ee7f3018f1 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 25 Feb 2016 13:40:15 +0100
Subject: we have got a button for events in the nav. no need for it in the
 tabs if we are local.

---
 include/conversation.php   | 4 ++--
 mod/cal.php                | 3 +++
 view/tpl/events_cal-js.tpl | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index e2dfccac9..39119b2bb 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1599,7 +1599,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){
 	$uid = (($a->profile['profile_uid']) ? $a->profile['profile_uid'] : local_channel());
 
 	if($uid == local_channel()) {
-		$cal_link = '/events';
+		$cal_link = '';
 	}
 	else {
 		$cal_link = '/cal/' . $nickname;
@@ -1653,7 +1653,7 @@ function profile_tabs($a, $is_owner = false, $nickname = null){
 		);
 	}
 
-	if($p['view_stream']) {
+	if($p['view_stream'] && $cal_link) {
 		$tabs[] = array(
 			'label' => t('Events'),
 			'url'   => $a->get_baseurl() . $cal_link,
diff --git a/mod/cal.php b/mod/cal.php
index 1e2405cd0..453f46f69 100755
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -80,6 +80,8 @@ function cal_content(&$a) {
 
 	$o = '';
 
+	$tabs = profile_tabs($a, True, $channel['channel_address']);
+
 	$mode = 'view';
 	$y = 0;
 	$m = 0;
@@ -333,6 +335,7 @@ function cal_content(&$a) {
 			'$today'	=> t('Today'),
 			'$form'		=> $form,
 			'$expandform'	=> ((x($_GET,'expandform')) ? true : false),
+			'$tabs'		=> $tabs
 		));
 		
 		if (x($_GET,'id')){ echo $o; killme(); }
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
index b3c7ff03b..bc8a3aa31 100755
--- a/view/tpl/events_cal-js.tpl
+++ b/view/tpl/events_cal-js.tpl
@@ -1,3 +1,4 @@
+{{$tabs}}
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-- 
cgit v1.2.3


From b2474334a7b7f009442883a08d544280231b29fc Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 25 Feb 2016 22:50:16 +0100
Subject: provide an edit button for the profile page

---
 include/identity.php          | 9 +++++----
 view/tpl/profile_advanced.tpl | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index a389a613e..0a88ed208 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1237,10 +1237,6 @@ function advanced_profile(&$a) {
 	if(! perm_is_allowed($a->profile['profile_uid'],get_observer_hash(),'view_profile'))
 		return '';
 
-	$o = '';
-
-	$o .= '<h2>' . t('Profile') . '</h2>';
-
 	if($a->profile['name']) {
 
 		$tpl = get_markup_template('profile_advanced.tpl');
@@ -1351,6 +1347,10 @@ function advanced_profile(&$a) {
 			$profile['extra_fields'] = $a->profile['extra_fields'];
 		}
 
+
+		$is_owner = (($a->profile['profile_uid'] == local_channel()) ? true : false);
+		$edit = (($is_owner) ? array('link' => $a->get_baseurl() . '/profiles/' . $a->profile['profile_uid'], 'label' => t('Edit')) : '');
+
 		$things = get_things($a->profile['profile_guid'],$a->profile['profile_uid']);
 
 //		logger('mod_profile: things: ' . print_r($things,true), LOGGER_DATA); 
@@ -1360,6 +1360,7 @@ function advanced_profile(&$a) {
 			'$canlike' => (($profile['canlike'])? true : false),
 			'$likethis' => t('Like this thing'),
 			'$profile' => $profile,
+			'$edit' => $edit,
 			'$things' => $things
 		));
 	}
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index a027a7c2e..780626cf9 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -12,6 +12,9 @@
 				<i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i>
 			</button>
 			{{/if}}
+			{{if $edit}}
+			<a href="{{$edit.link}}" class="btn btn-primary btn-xs"><i class="icon-pencil"></i>&nbsp;{{$edit.label}}</a>
+			{{/if}}
 		</div>
 		<h2>{{$title}}</h2>
 		<div class="clear"></div>
-- 
cgit v1.2.3


From ea54987ca4c36623bbbb4923cf1e19e9650431ed Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 25 Feb 2016 23:03:38 +0100
Subject: in update_birthdays() we should probably set adjust to 0 instead of 1
 since a birthday is more a kind of a global holiday

---
 include/datetime.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/datetime.php b/include/datetime.php
index bfd806f32..2f2727ae5 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -549,7 +549,7 @@ function update_birthdays() {
 			$ev['event_xchan'] = $rr['xchan_hash'];
 			$ev['start'] = datetime_convert('UTC', 'UTC', $rr['abook_dob']);
 			$ev['finish'] = datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day ');
-			$ev['adjust'] = 1;
+			$ev['adjust'] = 0;
 			$ev['summary'] = sprintf( t('%1$s\'s birthday'), $rr['xchan_name']);
 			$ev['description'] = sprintf( t('Happy Birthday %1$s'), 
 				'[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]') ;
-- 
cgit v1.2.3


From 7972de13caf21647c8cc2e82c499a344f7191a22 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 25 Feb 2016 14:34:30 -0800
Subject: backtrace openssl_verify errors so that we can find bad keys - as
 there is very little relevant context available at this level.

---
 Zotlabs/Zot/Receiver.php |  7 ++++---
 include/crypto.php       | 15 +++++++++++++++
 include/queue_fn.php     |  4 ++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Zotlabs/Zot/Receiver.php b/Zotlabs/Zot/Receiver.php
index 238de1332..71d57eb35 100644
--- a/Zotlabs/Zot/Receiver.php
+++ b/Zotlabs/Zot/Receiver.php
@@ -41,9 +41,10 @@ class Receiver {
 		if(! $this->messagetype)
 			$this->error = true;
 
-		$this->sender     = ((array_key_exists('sender',$this->data)) ? $this->data['sender'] : null);
-		$this->recipients = ((array_key_exists('recipients',$this->data)) ? $this->data['recipients'] : null);
-
+		if($this->data) {
+			$this->sender     = ((array_key_exists('sender',$this->data)) ? $this->data['sender'] : null);
+			$this->recipients = ((array_key_exists('recipients',$this->data)) ? $this->data['recipients'] : null);
+		}
 
 		if($this->sender)
 			$this->ValidateSender();
diff --git a/include/crypto.php b/include/crypto.php
index 494a2a5b9..50ec2a3a6 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -21,6 +21,21 @@ function rsa_verify($data,$sig,$key,$alg = 'sha256') {
 	if(intval(OPENSSL_ALGO_SHA256) && $alg === 'sha256')
 		$alg = OPENSSL_ALGO_SHA256;
 	$verify = openssl_verify($data,$sig,$key,$alg);
+
+	if(! $verify) {
+		logger('openssl_verify: ' . openssl_error_string(),LOGGER_NORMAL,LOG_ERR);
+		logger('openssl_verify: key: ' . $key, LOGGER_DEBUG, LOG_ERR); 
+		// provide a backtrace so that we can debug key issues
+		if(version_compare(PHP_VERSION, '5.4.0') >= 0) {
+        	$stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+			if($stack) {
+				foreach($stack as $s) {
+					logger('stack: ' . basename($s['file']) . ':' . $s['line'] . ':' . $s['function'] . '()',LOGGER_DEBUG,LOG_ERR);
+			    }
+			}
+		}
+	}
+
 	return $verify;
 }
 
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 3112a832b..676620e2f 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -126,7 +126,7 @@ function queue_deliver($outq, $immediate = false) {
 			remove_queue_item($outq['outq_hash']);
 
 			// server is responding - see if anything else is going to this destination and is piled up 
-			// and try to send some more. We're relying on the fact that delivery_loop() results in an 
+			// and try to send some more. We're relying on the fact that do_delivery() results in an 
 			// immediate delivery otherwise we could get into a queue loop. 
 
 			if(! $immediate) {
@@ -141,7 +141,7 @@ function queue_deliver($outq, $immediate = false) {
 					}
 				}
 				if($piled_up) {
-					delivery_loop($piled_up);
+					do_delivery($piled_up);
 				}
 			}
 		}
-- 
cgit v1.2.3


From 5ad9b48f1d916425e41f475319c7237293d055b9 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 25 Feb 2016 23:59:57 +0100
Subject: revert f62ec4132ed571288737423de386054a4cc8b0d5 - allow one self to
 be added to a privacy group.

---
 include/group.php | 2 +-
 mod/group.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/group.php b/include/group.php
index bef008afd..22f221059 100644
--- a/include/group.php
+++ b/include/group.php
@@ -200,7 +200,7 @@ function group_get_members($gid) {
 	if(intval($gid)) {
 		$r = q("SELECT * FROM `group_member` 
 			LEFT JOIN abook ON abook_xchan = `group_member`.`xchan` left join xchan on xchan_hash = abook_xchan
-			WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and xchan_deleted = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC ",
+			WHERE `gid` = %d AND abook_channel = %d and `group_member`.`uid` = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 ORDER BY xchan_name ASC ",
 			intval($gid),
 			intval(local_channel()),
 			intval(local_channel())
diff --git a/mod/group.php b/mod/group.php
index 7eaad771f..c63ccfa9b 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -117,7 +117,7 @@ function group_content(&$a) {
 
 		check_form_security_token_ForbiddenOnErr('group_member_change', 't');
 
-		$r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_blocked = 0 and abook_pending = 0 limit 1",
+		$r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 limit 1",
 			dbesc(base64url_decode(argv(2))),
 			intval(local_channel())
 		);
@@ -208,7 +208,7 @@ function group_content(&$a) {
 			group_rmv_member(local_channel(),$group['name'],$member['xchan_hash']);
 	}
 
-	$r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND  abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc",
+	$r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND abook_self = 0 and abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc",
 		intval(local_channel())
 	);
 
-- 
cgit v1.2.3


From ba2ede0a8f82be98994f129655dbb78d5c024e47 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 25 Feb 2016 15:41:52 -0800
Subject: this reverts ea54987ca4c36

---
 include/datetime.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/datetime.php b/include/datetime.php
index 2f2727ae5..bfd806f32 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -549,7 +549,7 @@ function update_birthdays() {
 			$ev['event_xchan'] = $rr['xchan_hash'];
 			$ev['start'] = datetime_convert('UTC', 'UTC', $rr['abook_dob']);
 			$ev['finish'] = datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day ');
-			$ev['adjust'] = 0;
+			$ev['adjust'] = 1;
 			$ev['summary'] = sprintf( t('%1$s\'s birthday'), $rr['xchan_name']);
 			$ev['description'] = sprintf( t('Happy Birthday %1$s'), 
 				'[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]') ;
-- 
cgit v1.2.3


From dc8c7a2d2e8060d295c46637e2f1caac76aca6fa Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 25 Feb 2016 16:21:38 -0800
Subject: small improvements to profile like activity

---
 include/identity.php |  3 +--
 mod/like.php         | 11 +++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index 0a88ed208..caf2de710 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -1832,8 +1832,7 @@ function get_zcard($channel,$observer_hash = '',$args = array()) {
 		$cover['href'] = z_root() . '/photo/' . $r[0]['resource_id'] . '-' . $r[0]['scale'];
 	}		
 	else {
-		// @fixme remove this when we have a fallback cover photo and use that instead.
-		return;
+		$cover = $pphoto;
 	}
 	
 	$o .= replace_macros(get_markup_template('zcard.tpl'),array(
diff --git a/mod/like.php b/mod/like.php
index ce8bc3063..26c39bf3b 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -107,13 +107,13 @@ function like_content(&$a) {
 				// to them.
 				$allow_cid = $allow_gid = $deny_cid = $deny_gid = '';
 				foreach($d as $dd) {
-					$allow_gid .= '<' . $dd['abook_xchan'] . '>';
+					$allow_cid .= '<' . $dd['abook_xchan'] . '>';
 				}
 			}
 			$post_type = t('channel');
 			$objtype = ACTIVITY_OBJ_PROFILE;
 
-
+			$profile = $r[0];
 		}
 		elseif($obj_type == 'thing') {
 
@@ -462,6 +462,13 @@ function like_content(&$a) {
 	if($obj_type === 'thing' && $r[0]['imgurl']) {
 		$arr['body'] .= "\n\n[zmg=80x80]" . $r[0]['imgurl'] . '[/zmg]';
 	}	
+	if($obj_type === 'profile') {
+		if($public) {
+			$arr['body'] .= "\n\n" . '[embed]' . z_root() . '/profile/' . $ch[0]['channel_address'] . '[/embed]';	
+		}
+		else
+			$arr['body'] .= "\n\n[zmg=80x80]" . $profile['thumb'] . '[/zmg]';
+	}	
 
 
 	$arr['verb']          = $activity;
-- 
cgit v1.2.3


From d19dfc87a6c00ebb0434a46664621f0b0585c97b Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 26 Feb 2016 09:20:44 +0100
Subject: get rid of duplicate function

---
 include/attach.php | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/include/attach.php b/include/attach.php
index 8595d5d86..29daa26ac 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1705,7 +1705,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
 
 	//turn allow_gid into allow_cid's
 	foreach($arr_allow_gid as $gid) {
-		$in_group = in_group($gid);
+		$in_group = group_get_members($gid);
 		$arr_allow_cid = array_unique(array_merge($arr_allow_cid, $in_group));
 	}
 
@@ -1727,7 +1727,7 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
 			 * */
 			if($parent_arr['allow_gid']) {
 				foreach($parent_arr['allow_gid'][$count] as $gid) {
-					$in_group = in_group($gid);
+					$in_group = group_get_members($gid);
 					$parent_arr['allow_cid'][$count] = array_unique(array_merge($parent_arr['allow_cid'][$count], $in_group));
 				}
 			}
@@ -1808,31 +1808,6 @@ function recursive_activity_recipients($arr_allow_cid, $arr_allow_gid, $arr_deny
 	return $ret;
 }
 
-/**
- * @brief Returns members of a group.
- *
- * @param int $group_id id of the group to look up
- */
-function in_group($group_id) {
-	$group_members = array();
-
-	/** @TODO make these two queries one with a join. */
-	$x = q("SELECT id FROM groups WHERE hash = '%s'",
-		dbesc($group_id)
-	);
-
-	$r = q("SELECT xchan FROM group_member WHERE gid = %d",
-		intval($x[0]['id'])
-	);
-
-	foreach($r as $ig) {
-		$group_members[] = $ig['xchan'];
-	}
-
-	return $group_members;
-}
-
-
 function filepath_macro($s) {
 
 	return str_replace(
-- 
cgit v1.2.3


From 5a563b8e76bbb8e4c8747831fccf8975083db16d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 26 Feb 2016 11:17:21 +0100
Subject: some improvement for file activity

---
 include/attach.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/include/attach.php b/include/attach.php
index 29daa26ac..10ff9f13f 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -1313,7 +1313,7 @@ function attach_delete($channel_id, $resource, $is_photo = 0) {
 		intval($channel_id)
 	);
 
-	file_activity($channel_id, $object, $object['allow_cid'], $object['allow_gid'], $object['deny_cid'], $object['deny_gid'], 'update', $notify=0);
+	file_activity($channel_id, $object, $object['allow_cid'], $object['allow_gid'], $object['deny_cid'], $object['deny_gid'], 'update', $notify=1);
 }
 
 /**
@@ -1557,6 +1557,8 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 		$u_arr_deny_cid = array_unique(array_merge($arr_deny_cid, expand_acl($object['deny_cid'])));
 		$u_arr_deny_gid = array_unique(array_merge($arr_deny_gid, expand_acl($object['deny_gid'])));
 
+		$private = (($u_arr_allow_cid[0] || $u_arr_allow_gid[0] || $u_arr_deny_cid[0] || $u_arr_deny_gid[0]) ? 1 : 0);
+
 		$u_mid = item_message_id();
 
 		$arr['aid']           = get_account_id();
@@ -1566,13 +1568,12 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid,
 		$arr['author_xchan']  = $poster['xchan_hash'];
 		$arr['owner_xchan']   = $poster['xchan_hash'];
 		$arr['title']         = '';
-		//updates should be visible to everybody -> perms may have changed
-		$arr['allow_cid']     = '';
-		$arr['allow_gid']     = '';
-		$arr['deny_cid']      = '';
-		$arr['deny_gid']      = '';
+		$arr['allow_cid']     = perms2str($u_arr_allow_cid);
+		$arr['allow_gid']     = perms2str($u_arr_allow_gid);
+		$arr['deny_cid']      = perms2str($u_arr_deny_cid);
+		$arr['deny_gid']      = perms2str($u_arr_deny_gid);
 		$arr['item_hidden']   = 1;
-		$arr['item_private']  = 0;
+		$arr['item_private']  = $private;
 		$arr['verb']          = ACTIVITY_UPDATE;
 		$arr['obj_type']      = $objtype;
 		$arr['object']        = $u_jsonobject;
-- 
cgit v1.2.3


From df57c90d2d93fef1d021bee4b91a50b1b34ee938 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 26 Feb 2016 14:25:18 +0100
Subject: several photo item template fixes

---
 mod/update_display.php  |  2 +-
 view/tpl/photo_drop.tpl |  3 +--
 view/tpl/photo_item.tpl | 39 +++++++++++++++++++++++----------------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/mod/update_display.php b/mod/update_display.php
index b448c76ee..52903bb8c 100644
--- a/mod/update_display.php
+++ b/mod/update_display.php
@@ -39,4 +39,4 @@ function update_display_content(&$a) {
 //	logger('update_display: ' . $text);
 	killme();
 
-}
\ No newline at end of file
+}
diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
index 31b654374..24aff0209 100755
--- a/view/tpl/photo_drop.tpl
+++ b/view/tpl/photo_drop.tpl
@@ -1,4 +1,3 @@
 <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
-	<a href="item/drop/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></a>
+	<a class="btn btn-default btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="icon-trash"></i></a>
 </div>
-<div class="wall-item-delete-end"></div>
diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
index 2ea7aa9f3..ec643c4a9 100755
--- a/view/tpl/photo_item.tpl
+++ b/view/tpl/photo_item.tpl
@@ -1,27 +1,34 @@
-<div class="wall-item-outside-wrapper {{$indent}}" id="wall-item-outside-wrapper-{{$id}}" >
-	<div class="wall-item-content-wrapper {{$indent}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;">
-		<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
-				<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
-				<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
+<div class="wall-item-outside-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-outside-wrapper-{{$id}}" >
+	<div class="wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;">
+		<div class="wall-item-head">
+			<div class="wall-item-info" id="wall-item-info-{{$id}}" >
+				<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
+					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
+					<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
+				</div>
 			</div>
-		</div>
-		<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
-			<div class="wall-item-author">
-				<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
+				<div class="wall-item-author">
+					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
+				</div>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
 			</div>
-			<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
 		</div>
 		<div class="wall-item-content" id="wall-item-content-{{$id}}" >
 			<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
 			<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
-		</div>
-		{{$drop}}
-		<div class="wall-item-wrapper-end"></div>
 
+		</div>
+		{{if $drop}}
+		<div class="wall-item-tools" id="wall-item-tools-{{$id}}" >
+			<div class="wall-item-tools-right pull-right">
+				{{$drop}}
+			</div>
+			<div class="clear"></div>
+		</div>
+		{{/if}}
+		<div class="clear"></div>
 		{{$comment}}
-
-	<div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
 	</div>
 </div>
 
-- 
cgit v1.2.3


From 776bc51172f5c21348c674a8bb6bf5037bde6815 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 26 Feb 2016 15:21:14 +0100
Subject: fix link to photo album and make sure that small photos are not
 overwritten by body text.

---
 include/photos.php | 2 +-
 include/text.php   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/photos.php b/include/photos.php
index 1a57ce76f..be18600de 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -296,7 +296,7 @@ function photo_upload($channel, $observer, $args) {
 
 	$photo_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' . t('a new photo') . '[/zrl]';
 
-	$album_link = '[zrl=' . z_root() . '/photos/album/' . bin2hex($album) . ']' . $album . '[/zrl]';
+	$album_link = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/album/' . bin2hex($album) . ']' . $album . '[/zrl]';
 
 	$activity_format = sprintf(t('%1$s posted %2$s to %3$s','photo_upload'), $author_link, $photo_link, $album_link);
 
diff --git a/include/text.php b/include/text.php
index 6b074d390..621f4cf93 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1444,7 +1444,7 @@ function prepare_body(&$item,$attach = false) {
 
 	call_hooks('prepare_body_init', $item); 
 
-
+	$s = '';
 	$photo = '';
 	$is_photo = ((($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO)) ? true : false);
 
@@ -1454,7 +1454,7 @@ function prepare_body(&$item,$attach = false) {
 
 		// if original photo width is <= 640px prepend it to item body
 		if($object['link'][0]['width'] && $object['link'][0]['width'] <= 640) {
-			$s = '<div class="inline-photo-item-wrapper"><a href="' . zid(rawurldecode($object['id'])) . '" target="_blank"><img class="inline-photo-item" style="max-width:' . $object['link'][0]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][0]['href'])) . '"></a></div>' . $s;
+			$s .= '<div class="inline-photo-item-wrapper"><a href="' . zid(rawurldecode($object['id'])) . '" target="_blank"><img class="inline-photo-item" style="max-width:' . $object['link'][0]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][0]['href'])) . '"></a></div>' . $s;
 		}
 
 		// if original photo width is > 640px make it a cover photo
@@ -1464,7 +1464,7 @@ function prepare_body(&$item,$attach = false) {
 		}
 	}
 
-	$s = prepare_text($item['body'],$item['mimetype'], false);
+	$s .= prepare_text($item['body'],$item['mimetype'], false);
 
 	$event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event($item['object']) : false);
 
-- 
cgit v1.2.3


From 459166116d926df23c73a839f3c87c2cfd2ba4ab Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 26 Feb 2016 12:45:44 -0800
Subject: turn timezone aware birthdays into a feature for those who want an
 uncluttered calendar - at the expense of possibly sending somebody's birthday
 greeting on the wrong day if they are in a different timezone.

---
 doc/to_do_code.bb    |    1 -
 include/datetime.php |    2 +-
 include/features.php |    1 +
 util/hmessages.po    | 3977 +++++++++++++++++++++++++-------------------------
 version.inc          |    2 +-
 5 files changed, 1985 insertions(+), 1998 deletions(-)

diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb
index 85c5997cb..a7c3c94b4 100644
--- a/doc/to_do_code.bb
+++ b/doc/to_do_code.bb
@@ -17,7 +17,6 @@ We need much more than this, but here are areas where developers can help. Pleas
 [li]Integrate the &quot;open site&quot; list with the register page[/li]
 [li]Support comments and member notes on documentation pages (to achieve an effect similar to php.net)[/li]
 [li]Support comments on webpages[/li]
-[li]implement oembed provider interface[/li]
 [li]refactor the oembed client interface so that we can safely sandbox remote content[/li]
 [li]Write more webpage layouts[/li]
 [li]Write more webpage widgets[/li]
diff --git a/include/datetime.php b/include/datetime.php
index bfd806f32..ace1ad14f 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -549,7 +549,7 @@ function update_birthdays() {
 			$ev['event_xchan'] = $rr['xchan_hash'];
 			$ev['start'] = datetime_convert('UTC', 'UTC', $rr['abook_dob']);
 			$ev['finish'] = datetime_convert('UTC', 'UTC', $rr['abook_dob'] . ' + 1 day ');
-			$ev['adjust'] = 1;
+			$ev['adjust'] = intval(feature_enabled($rr['abook_channel'],'smart_birthdays'));
 			$ev['summary'] = sprintf( t('%1$s\'s birthday'), $rr['xchan_name']);
 			$ev['description'] = sprintf( t('Happy Birthday %1$s'), 
 				'[zrl=' . $rr['xchan_url'] . ']' . $rr['xchan_name'] . '[/zrl]') ;
diff --git a/include/features.php b/include/features.php
index 9c925bc35..1ef070b00 100644
--- a/include/features.php
+++ b/include/features.php
@@ -57,6 +57,7 @@ function get_features($filtered = true) {
 			array('nav_channel_select',  t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')),
 			array('photo_location',       t('Photo Location'),          t('If location data is available on uploaded photos, link this to a map.'),false,get_config('feature_lock','photo_location')),
 
+			array('smart_birthdays',       t('Smart Birthdays'),          t('Make birthday events timezone aware in case your friends are scattered across the planet.'),true,get_config('feature_lock','smart_birthdays')),
 			array('expert',       t('Expert Mode'),                 t('Enable Expert Mode to provide advanced configuration options'),false,get_config('feature_lock','expert')),
 			array('premium_channel', t('Premium Channel'), t('Allows you to set restrictions and terms on those that connect with your channel'),false,get_config('feature_lock','premium_channel')),
 		),
diff --git a/util/hmessages.po b/util/hmessages.po
index 3170e2aa6..53a7f0e98 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2016-02-17.1312H\n"
+"Project-Id-Version: 2016-02-26.1319H\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-19 19:12-0800\n"
+"POT-Creation-Date: 2016-02-26 00:03-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"
@@ -58,14 +58,14 @@ msgid "Schedule Outbox"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:164 ../../include/apps.php:360
-#: ../../include/apps.php:415 ../../include/conversation.php:1037
-#: ../../include/widgets.php:1410 ../../mod/photos.php:766
+#: ../../include/apps.php:415 ../../include/widgets.php:1410
+#: ../../include/conversation.php:1037 ../../mod/photos.php:766
 #: ../../mod/photos.php:1209
 msgid "Unknown"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../include/apps.php:135
-#: ../../include/conversation.php:1639 ../../include/nav.php:93
+#: ../../include/nav.php:93 ../../include/conversation.php:1648
 #: ../../mod/fbrowser.php:109
 msgid "Files"
 msgstr ""
@@ -80,8 +80,7 @@ msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:303
 #: ../../mod/blocks.php:152 ../../mod/layouts.php:175 ../../mod/menu.php:114
-#: ../../mod/new_channel.php:146 ../../mod/register.php:257
-#: ../../mod/webpages.php:180
+#: ../../mod/new_channel.php:138 ../../mod/webpages.php:182
 msgid "Create"
 msgstr ""
 
@@ -93,8 +92,8 @@ msgid "Upload"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:235 ../../mod/admin.php:1158
-#: ../../mod/register.php:247 ../../mod/settings.php:599
-#: ../../mod/settings.php:625 ../../mod/sharedwithme.php:95
+#: ../../mod/settings.php:599 ../../mod/settings.php:625
+#: ../../mod/sharedwithme.php:95
 msgid "Name"
 msgstr ""
 
@@ -112,14 +111,14 @@ msgid "Last Modified"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:240 ../../include/apps.php:259
-#: ../../include/menu.php:108 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36 ../../include/ItemObject.php:100
-#: ../../mod/blocks.php:153 ../../mod/connections.php:286
-#: ../../mod/connections.php:306 ../../mod/editblock.php:135
-#: ../../mod/editlayout.php:134 ../../mod/editpost.php:112
-#: ../../mod/editwebpage.php:176 ../../mod/layouts.php:183
-#: ../../mod/menu.php:108 ../../mod/settings.php:659 ../../mod/thing.php:256
-#: ../../mod/webpages.php:181
+#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
+#: ../../include/menu.php:108 ../../include/identity.php:1352
+#: ../../include/ItemObject.php:100 ../../mod/blocks.php:153
+#: ../../mod/connections.php:286 ../../mod/connections.php:306
+#: ../../mod/editblock.php:135 ../../mod/editlayout.php:134
+#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:176
+#: ../../mod/layouts.php:183 ../../mod/menu.php:108 ../../mod/settings.php:659
+#: ../../mod/thing.php:256 ../../mod/webpages.php:183
 msgid "Edit"
 msgstr ""
 
@@ -130,7 +129,7 @@ msgstr ""
 #: ../../mod/editlayout.php:179 ../../mod/editwebpage.php:223
 #: ../../mod/group.php:173 ../../mod/photos.php:1140 ../../mod/admin.php:993
 #: ../../mod/admin.php:1152 ../../mod/settings.php:660 ../../mod/thing.php:257
-#: ../../mod/webpages.php:183
+#: ../../mod/webpages.php:185
 msgid "Delete"
 msgstr ""
 
@@ -163,8 +162,8 @@ msgstr ""
 #: ../../include/attach.php:358 ../../include/attach.php:436
 #: ../../include/attach.php:888 ../../include/attach.php:959
 #: ../../include/attach.php:1111 ../../include/chat.php:133
-#: ../../include/photos.php:29 ../../include/items.php:4512
-#: ../../index.php:194 ../../mod/achievements.php:30 ../../mod/api.php:26
+#: ../../include/photos.php:29 ../../include/items.php:4575
+#: ../../index.php:180 ../../mod/achievements.php:30 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/appman.php:66 ../../mod/authtest.php:13
 #: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/blocks.php:69
 #: ../../mod/blocks.php:76 ../../mod/bookmarks.php:48
@@ -185,7 +184,7 @@ msgstr ""
 #: ../../mod/locs.php:83 ../../mod/mail.php:126 ../../mod/manage.php:6
 #: ../../mod/menu.php:74 ../../mod/message.php:16 ../../mod/mitem.php:111
 #: ../../mod/mood.php:112 ../../mod/network.php:12
-#: ../../mod/new_channel.php:75 ../../mod/new_channel.php:108
+#: ../../mod/new_channel.php:73 ../../mod/new_channel.php:100
 #: ../../mod/notifications.php:66 ../../mod/page.php:31 ../../mod/page.php:86
 #: ../../mod/pdledit.php:22 ../../mod/photos.php:70 ../../mod/poke.php:133
 #: ../../mod/profile.php:64 ../../mod/profile.php:72
@@ -211,9 +210,9 @@ msgstr ""
 msgid "Page not found."
 msgstr ""
 
-#: ../../include/Contact.php:101 ../../include/conversation.php:961
-#: ../../include/widgets.php:147 ../../include/widgets.php:185
-#: ../../include/identity.php:954 ../../mod/directory.php:321
+#: ../../include/Contact.php:101 ../../include/widgets.php:147
+#: ../../include/widgets.php:185 ../../include/identity.php:954
+#: ../../include/conversation.php:961 ../../mod/directory.php:321
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr ""
@@ -378,8 +377,8 @@ msgstr ""
 msgid "Site Admin"
 msgstr ""
 
-#: ../../include/apps.php:129 ../../include/conversation.php:1665
-#: ../../include/nav.php:104
+#: ../../include/apps.php:129 ../../include/nav.php:104
+#: ../../include/conversation.php:1685
 msgid "Bookmarks"
 msgstr ""
 
@@ -387,7 +386,7 @@ msgstr ""
 msgid "Address Book"
 msgstr ""
 
-#: ../../include/apps.php:131 ../../include/nav.php:112 ../../boot.php:1544
+#: ../../include/apps.php:131 ../../include/nav.php:112 ../../boot.php:1543
 msgid "Login"
 msgstr ""
 
@@ -406,8 +405,8 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: ../../include/apps.php:136 ../../include/conversation.php:1675
-#: ../../include/nav.php:108 ../../mod/webpages.php:178
+#: ../../include/apps.php:136 ../../include/nav.php:108
+#: ../../include/conversation.php:1695 ../../mod/webpages.php:180
 msgid "Webpages"
 msgstr ""
 
@@ -415,17 +414,18 @@ msgstr ""
 msgid "Channel Home"
 msgstr ""
 
-#: ../../include/apps.php:138 ../../include/identity.php:1242
-#: ../../include/identity.php:1359 ../../mod/profperm.php:112
+#: ../../include/apps.php:138 ../../include/identity.php:1359
+#: ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
-#: ../../include/apps.php:139 ../../include/conversation.php:1632
-#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
+#: ../../include/apps.php:139 ../../include/nav.php:92
+#: ../../include/conversation.php:1641 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr ""
 
 #: ../../include/apps.php:140 ../../include/nav.php:198
+#: ../../include/conversation.php:1658 ../../include/conversation.php:1661
 msgid "Events"
 msgstr ""
 
@@ -777,1484 +777,1271 @@ msgstr[1] ""
 msgid "show more"
 msgstr ""
 
-#: ../../include/conversation.php:120 ../../include/text.php:1948
-#: ../../mod/like.php:361 ../../mod/subthread.php:83 ../../mod/tagger.php:43
-msgid "photo"
+#: ../../include/dba/dba_driver.php:141
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/conversation.php:123 ../../include/event.php:904
-#: ../../include/text.php:1951 ../../mod/events.php:249 ../../mod/like.php:363
-#: ../../mod/tagger.php:47
-msgid "event"
+#: ../../include/dir_fns.php:139
+msgid "Directory Options"
 msgstr ""
 
-#: ../../include/conversation.php:126 ../../mod/like.php:113
-msgid "channel"
+#: ../../include/dir_fns.php:141
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/conversation.php:148 ../../include/text.php:1954
-#: ../../mod/like.php:361 ../../mod/subthread.php:83
-msgid "status"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/api.php:102
+#: ../../mod/connedit.php:368 ../../mod/connedit.php:646
+#: ../../mod/events.php:454 ../../mod/events.php:455 ../../mod/events.php:464
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../mod/photos.php:634 ../../mod/admin.php:425 ../../mod/removeme.php:60
+#: ../../mod/settings.php:588 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1547
+msgid "No"
 msgstr ""
 
-#: ../../include/conversation.php:150 ../../include/text.php:1956
-#: ../../mod/tagger.php:53
-msgid "comment"
+#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:143 ../../mod/api.php:101
+#: ../../mod/connedit.php:368 ../../mod/events.php:454
+#: ../../mod/events.php:455 ../../mod/events.php:464
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
+#: ../../mod/photos.php:634 ../../mod/admin.php:427 ../../mod/removeme.php:60
+#: ../../mod/settings.php:588 ../../view/theme/redbasic/php/config.php:104
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1547
+msgid "Yes"
 msgstr ""
 
-#: ../../include/conversation.php:164 ../../mod/like.php:410
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../include/dir_fns.php:142
+msgid "Public Forums Only"
 msgstr ""
 
-#: ../../include/conversation.php:167 ../../mod/like.php:412
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../include/dir_fns.php:143
+msgid "This Website Only"
 msgstr ""
 
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../include/event.php:779
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../include/event.php:915 ../../include/text.php:1951
+#: ../../include/conversation.php:123 ../../mod/events.php:249
+#: ../../mod/like.php:363 ../../mod/tagger.php:47
+msgid "event"
 msgstr ""
 
-#: ../../include/conversation.php:243 ../../include/text.php:973
-#: ../../include/text.php:978
-msgid "poked"
+#: ../../include/event.php:978
+msgid "Not specified"
 msgstr ""
 
-#: ../../include/conversation.php:260 ../../mod/mood.php:63
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
+#: ../../include/event.php:979
+msgid "Needs Action"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1074
-msgctxt "title"
-msgid "Likes"
+#: ../../include/event.php:980
+msgid "Completed"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1074
-msgctxt "title"
-msgid "Dislikes"
+#: ../../include/event.php:981
+msgid "In Process"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1075
-msgctxt "title"
-msgid "Agree"
+#: ../../include/event.php:982
+msgid "Cancelled"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1075
-msgctxt "title"
-msgid "Disagree"
+#: ../../include/follow.php:28
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1075
-msgctxt "title"
-msgid "Abstain"
+#: ../../include/follow.php:33
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1076
-msgctxt "title"
-msgid "Attending"
+#: ../../include/follow.php:82
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1076
-msgctxt "title"
-msgid "Not attending"
+#: ../../include/follow.php:99
+msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1076
-msgctxt "title"
-msgid "Might attend"
+#: ../../include/follow.php:153 ../../include/follow.php:183
+msgid "Protocol disabled."
 msgstr ""
 
-#: ../../include/conversation.php:656 ../../include/ItemObject.php:126
-msgid "Select"
+#: ../../include/follow.php:173
+msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/conversation.php:664 ../../include/ItemObject.php:89
-msgid "Private Message"
+#: ../../include/follow.php:199
+msgid "local account not found."
 msgstr ""
 
-#: ../../include/conversation.php:671 ../../include/ItemObject.php:227
-msgid "Message signature validated"
+#: ../../include/follow.php:224
+msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/conversation.php:672 ../../include/ItemObject.php:228
-msgid "Message signature incorrect"
+#: ../../include/import.php:23
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/conversation.php:691
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../include/import.php:70
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../include/conversation.php:710
-msgid "Categories:"
+#: ../../include/import.php:80 ../../mod/import.php:148
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../include/conversation.php:711
-msgid "Filed under:"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
 msgstr ""
 
-#: ../../include/conversation.php:719 ../../include/ItemObject.php:334
-#, php-format
-msgid "from %s"
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:702
+#: ../../mod/photos.php:1058 ../../mod/photos.php:1176
+msgid "Comment"
 msgstr ""
 
-#: ../../include/conversation.php:722 ../../include/ItemObject.php:337
-#, php-format
-msgid "last edited: %s"
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:413
+msgid "[+] show all"
 msgstr ""
 
-#: ../../include/conversation.php:723 ../../include/ItemObject.php:338
-#, php-format
-msgid "Expires: %s"
+#: ../../include/js_strings.php:8
+msgid "[-] show less"
 msgstr ""
 
-#: ../../include/conversation.php:738
-msgid "View in context"
+#: ../../include/js_strings.php:9
+msgid "[+] expand"
 msgstr ""
 
-#: ../../include/conversation.php:740 ../../include/conversation.php:1237
-#: ../../include/ItemObject.php:389 ../../mod/editblock.php:150
-#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129
-#: ../../mod/editwebpage.php:190 ../../mod/photos.php:1040
-msgid "Please wait"
+#: ../../include/js_strings.php:10
+msgid "[-] collapse"
 msgstr ""
 
-#: ../../include/conversation.php:850
-msgid "remove"
+#: ../../include/js_strings.php:11
+msgid "Password too short"
 msgstr ""
 
-#: ../../include/conversation.php:854 ../../include/nav.php:244
-msgid "Loading..."
+#: ../../include/js_strings.php:12
+msgid "Passwords do not match"
 msgstr ""
 
-#: ../../include/conversation.php:855
-msgid "Delete Selected Items"
+#: ../../include/js_strings.php:13 ../../mod/photos.php:41
+#: ../../mod/cal.php:37
+msgid "everybody"
 msgstr ""
 
-#: ../../include/conversation.php:953
-msgid "View Source"
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
 msgstr ""
 
-#: ../../include/conversation.php:954
-msgid "Follow Thread"
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
 msgstr ""
 
-#: ../../include/conversation.php:955
-msgid "Unfollow Thread"
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
 msgstr ""
 
-#: ../../include/conversation.php:959 ../../include/nav.php:86
-#: ../../mod/connedit.php:509
-msgid "View Profile"
+#: ../../include/js_strings.php:17
+msgid "close all"
 msgstr ""
 
-#: ../../include/conversation.php:960
-msgid "Activity/Posts"
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
 msgstr ""
 
-#: ../../include/conversation.php:962
-msgid "Edit Connection"
+#: ../../include/js_strings.php:19
+msgid "Rate This Channel (this is public)"
 msgstr ""
 
-#: ../../include/conversation.php:963
-msgid "Message"
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:705
+#: ../../mod/rate.php:157
+msgid "Rating"
 msgstr ""
 
-#: ../../include/conversation.php:964 ../../mod/ratings.php:99
-msgid "Ratings"
+#: ../../include/js_strings.php:21
+msgid "Describe (optional)"
 msgstr ""
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s likes this."
+#: ../../include/js_strings.php:22 ../../include/widgets.php:702
+#: ../../include/widgets.php:714 ../../include/ItemObject.php:703
+#: ../../mod/appman.php:99 ../../mod/chat.php:184 ../../mod/chat.php:213
+#: ../../mod/connect.php:93 ../../mod/connedit.php:722
+#: ../../mod/events.php:468 ../../mod/events.php:665
+#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
+#: ../../mod/group.php:81 ../../mod/import.php:536
+#: ../../mod/import_items.php:116 ../../mod/invite.php:142
+#: ../../mod/locs.php:116 ../../mod/mail.php:380 ../../mod/mitem.php:231
+#: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:62
+#: ../../mod/photos.php:645 ../../mod/photos.php:1019
+#: ../../mod/photos.php:1059 ../../mod/photos.php:1177 ../../mod/admin.php:457
+#: ../../mod/admin.php:646 ../../mod/admin.php:721 ../../mod/admin.php:986
+#: ../../mod/admin.php:1150 ../../mod/admin.php:1326 ../../mod/admin.php:1521
+#: ../../mod/admin.php:1606 ../../mod/poke.php:182 ../../mod/profiles.php:675
+#: ../../mod/rate.php:168 ../../mod/settings.php:597
+#: ../../mod/settings.php:710 ../../mod/settings.php:738
+#: ../../mod/settings.php:761 ../../mod/settings.php:849
+#: ../../mod/settings.php:1041 ../../mod/setup.php:333 ../../mod/setup.php:374
+#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/thing.php:312
+#: ../../mod/thing.php:358 ../../mod/xchan.php:11 ../../mod/cal.php:332
+#: ../../view/theme/redbasic/php/config.php:99
+msgid "Submit"
 msgstr ""
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
 msgstr ""
 
-#: ../../include/conversation.php:1084
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1086
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1092
-msgid "and"
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr ""
 
-#: ../../include/conversation.php:1095
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/js_strings.php:25 ../../mod/events.php:459
+#: ../../mod/profiles.php:464 ../../mod/pubsites.php:36
+msgid "Location"
+msgstr ""
 
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s like this."
+#: ../../include/js_strings.php:27
+msgid "timeago.prefixAgo"
 msgstr ""
 
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s don't like this."
+#: ../../include/js_strings.php:28
+msgid "timeago.prefixFromNow"
 msgstr ""
 
-#: ../../include/conversation.php:1164
-msgid "Visible to <strong>everybody</strong>"
+#: ../../include/js_strings.php:29
+msgid "ago"
 msgstr ""
 
-#: ../../include/conversation.php:1165 ../../mod/mail.php:202
-#: ../../mod/mail.php:316
-msgid "Please enter a link URL:"
+#: ../../include/js_strings.php:30
+msgid "from now"
 msgstr ""
 
-#: ../../include/conversation.php:1166
-msgid "Please enter a video link/URL:"
+#: ../../include/js_strings.php:31
+msgid "less than a minute"
 msgstr ""
 
-#: ../../include/conversation.php:1167
-msgid "Please enter an audio link/URL:"
+#: ../../include/js_strings.php:32
+msgid "about a minute"
 msgstr ""
 
-#: ../../include/conversation.php:1168
-msgid "Tag term:"
+#: ../../include/js_strings.php:33
+#, php-format
+msgid "%d minutes"
 msgstr ""
 
-#: ../../include/conversation.php:1169 ../../mod/filer.php:48
-msgid "Save to Folder:"
+#: ../../include/js_strings.php:34
+msgid "about an hour"
 msgstr ""
 
-#: ../../include/conversation.php:1170
-msgid "Where are you right now?"
+#: ../../include/js_strings.php:35
+#, php-format
+msgid "about %d hours"
 msgstr ""
 
-#: ../../include/conversation.php:1171 ../../mod/editpost.php:56
-#: ../../mod/mail.php:203 ../../mod/mail.php:317
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../include/js_strings.php:36
+msgid "a day"
 msgstr ""
 
-#: ../../include/conversation.php:1179 ../../include/page_widgets.php:40
-#: ../../include/ItemObject.php:712 ../../mod/editblock.php:171
-#: ../../mod/editpost.php:149 ../../mod/editwebpage.php:212
-#: ../../mod/events.php:458 ../../mod/photos.php:1060
-#: ../../mod/webpages.php:188
-msgid "Preview"
+#: ../../include/js_strings.php:37
+#, php-format
+msgid "%d days"
 msgstr ""
 
-#: ../../include/conversation.php:1202 ../../mod/blocks.php:154
-#: ../../mod/layouts.php:184 ../../mod/photos.php:1039
-#: ../../mod/webpages.php:182
-msgid "Share"
+#: ../../include/js_strings.php:38
+msgid "about a month"
 msgstr ""
 
-#: ../../include/conversation.php:1204
-msgid "Page link name"
+#: ../../include/js_strings.php:39
+#, php-format
+msgid "%d months"
 msgstr ""
 
-#: ../../include/conversation.php:1207
-msgid "Post as"
+#: ../../include/js_strings.php:40
+msgid "about a year"
 msgstr ""
 
-#: ../../include/conversation.php:1209 ../../include/ItemObject.php:704
-#: ../../mod/editblock.php:136 ../../mod/editlayout.php:135
-#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:177
-msgid "Bold"
+#: ../../include/js_strings.php:41
+#, php-format
+msgid "%d years"
 msgstr ""
 
-#: ../../include/conversation.php:1210 ../../include/ItemObject.php:705
-#: ../../mod/editblock.php:137 ../../mod/editlayout.php:136
-#: ../../mod/editpost.php:114 ../../mod/editwebpage.php:178
-msgid "Italic"
+#: ../../include/js_strings.php:42
+msgid " "
 msgstr ""
 
-#: ../../include/conversation.php:1211 ../../include/ItemObject.php:706
-#: ../../mod/editblock.php:138 ../../mod/editlayout.php:137
-#: ../../mod/editpost.php:115 ../../mod/editwebpage.php:179
-msgid "Underline"
+#: ../../include/js_strings.php:43
+msgid "timeago.numbers"
 msgstr ""
 
-#: ../../include/conversation.php:1212 ../../include/ItemObject.php:707
-#: ../../mod/editblock.php:139 ../../mod/editlayout.php:138
-#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:180
-msgid "Quote"
+#: ../../include/js_strings.php:45 ../../include/text.php:1191
+msgid "January"
 msgstr ""
 
-#: ../../include/conversation.php:1213 ../../include/ItemObject.php:708
-#: ../../mod/editblock.php:140 ../../mod/editlayout.php:139
-#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:181
-msgid "Code"
+#: ../../include/js_strings.php:46 ../../include/text.php:1191
+msgid "February"
 msgstr ""
 
-#: ../../include/conversation.php:1214 ../../mod/editblock.php:142
-#: ../../mod/editlayout.php:140 ../../mod/editpost.php:118
-#: ../../mod/editwebpage.php:182
-msgid "Upload photo"
+#: ../../include/js_strings.php:47 ../../include/text.php:1191
+msgid "March"
 msgstr ""
 
-#: ../../include/conversation.php:1215
-msgid "upload photo"
+#: ../../include/js_strings.php:48 ../../include/text.php:1191
+msgid "April"
 msgstr ""
 
-#: ../../include/conversation.php:1216 ../../mod/editblock.php:143
-#: ../../mod/editlayout.php:141 ../../mod/editpost.php:119
-#: ../../mod/editwebpage.php:183 ../../mod/mail.php:248 ../../mod/mail.php:378
-msgid "Attach file"
+#: ../../include/js_strings.php:49
+msgctxt "long"
+msgid "May"
 msgstr ""
 
-#: ../../include/conversation.php:1217
-msgid "attach file"
+#: ../../include/js_strings.php:50 ../../include/text.php:1191
+msgid "June"
 msgstr ""
 
-#: ../../include/conversation.php:1218 ../../mod/editblock.php:144
-#: ../../mod/editlayout.php:142 ../../mod/editpost.php:120
-#: ../../mod/editwebpage.php:184 ../../mod/mail.php:249 ../../mod/mail.php:379
-msgid "Insert web link"
+#: ../../include/js_strings.php:51 ../../include/text.php:1191
+msgid "July"
 msgstr ""
 
-#: ../../include/conversation.php:1219
-msgid "web link"
+#: ../../include/js_strings.php:52 ../../include/text.php:1191
+msgid "August"
 msgstr ""
 
-#: ../../include/conversation.php:1220
-msgid "Insert video link"
+#: ../../include/js_strings.php:53 ../../include/text.php:1191
+msgid "September"
 msgstr ""
 
-#: ../../include/conversation.php:1221
-msgid "video link"
+#: ../../include/js_strings.php:54 ../../include/text.php:1191
+msgid "October"
 msgstr ""
 
-#: ../../include/conversation.php:1222
-msgid "Insert audio link"
+#: ../../include/js_strings.php:55 ../../include/text.php:1191
+msgid "November"
 msgstr ""
 
-#: ../../include/conversation.php:1223
-msgid "audio link"
+#: ../../include/js_strings.php:56 ../../include/text.php:1191
+msgid "December"
 msgstr ""
 
-#: ../../include/conversation.php:1224 ../../mod/editblock.php:148
-#: ../../mod/editlayout.php:146 ../../mod/editpost.php:124
-#: ../../mod/editwebpage.php:188
-msgid "Set your location"
+#: ../../include/js_strings.php:57
+msgid "Jan"
 msgstr ""
 
-#: ../../include/conversation.php:1225
-msgid "set location"
+#: ../../include/js_strings.php:58
+msgid "Feb"
 msgstr ""
 
-#: ../../include/conversation.php:1226 ../../mod/editpost.php:126
-msgid "Toggle voting"
+#: ../../include/js_strings.php:59
+msgid "Mar"
 msgstr ""
 
-#: ../../include/conversation.php:1229 ../../mod/editblock.php:149
-#: ../../mod/editlayout.php:147 ../../mod/editpost.php:125
-#: ../../mod/editwebpage.php:189
-msgid "Clear browser location"
+#: ../../include/js_strings.php:60
+msgid "Apr"
 msgstr ""
 
-#: ../../include/conversation.php:1230
-msgid "clear location"
+#: ../../include/js_strings.php:61
+msgctxt "short"
+msgid "May"
 msgstr ""
 
-#: ../../include/conversation.php:1232 ../../mod/editblock.php:162
-#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
-msgid "Title (optional)"
+#: ../../include/js_strings.php:62
+msgid "Jun"
 msgstr ""
 
-#: ../../include/conversation.php:1236 ../../mod/editblock.php:165
-#: ../../mod/editlayout.php:163 ../../mod/editpost.php:143
-#: ../../mod/editwebpage.php:207
-msgid "Categories (optional, comma-separated list)"
+#: ../../include/js_strings.php:63
+msgid "Jul"
 msgstr ""
 
-#: ../../include/conversation.php:1238 ../../mod/editblock.php:151
-#: ../../mod/editlayout.php:149 ../../mod/editpost.php:130
-#: ../../mod/editwebpage.php:191 ../../mod/events.php:459
-msgid "Permission settings"
+#: ../../include/js_strings.php:64
+msgid "Aug"
 msgstr ""
 
-#: ../../include/conversation.php:1239
-msgid "permissions"
+#: ../../include/js_strings.php:65
+msgid "Sep"
 msgstr ""
 
-#: ../../include/conversation.php:1247 ../../mod/editblock.php:159
-#: ../../mod/editlayout.php:156 ../../mod/editpost.php:138
-#: ../../mod/editwebpage.php:200
-msgid "Public post"
+#: ../../include/js_strings.php:66
+msgid "Oct"
 msgstr ""
 
-#: ../../include/conversation.php:1249 ../../mod/editblock.php:166
-#: ../../mod/editlayout.php:164 ../../mod/editpost.php:144
-#: ../../mod/editwebpage.php:208
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../include/js_strings.php:67
+msgid "Nov"
 msgstr ""
 
-#: ../../include/conversation.php:1262 ../../mod/editblock.php:176
-#: ../../mod/editlayout.php:173 ../../mod/editpost.php:155
-#: ../../mod/editwebpage.php:217 ../../mod/mail.php:253 ../../mod/mail.php:383
-msgid "Set expiration date"
+#: ../../include/js_strings.php:68
+msgid "Dec"
 msgstr ""
 
-#: ../../include/conversation.php:1265
-msgid "Set publish date"
+#: ../../include/js_strings.php:69 ../../include/text.php:1187
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/conversation.php:1267 ../../include/ItemObject.php:715
-#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
-msgid "Encrypt text"
+#: ../../include/js_strings.php:70 ../../include/text.php:1187
+msgid "Monday"
 msgstr ""
 
-#: ../../include/conversation.php:1269 ../../mod/editpost.php:159
-msgid "OK"
+#: ../../include/js_strings.php:71 ../../include/text.php:1187
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/conversation.php:1270 ../../mod/editpost.php:160
-#: ../../mod/fbrowser.php:77 ../../mod/fbrowser.php:112
-#: ../../mod/settings.php:598 ../../mod/settings.php:624
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-msgid "Cancel"
+#: ../../include/js_strings.php:72 ../../include/text.php:1187
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/conversation.php:1513
-msgid "Discover"
+#: ../../include/js_strings.php:73 ../../include/text.php:1187
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/conversation.php:1516
-msgid "Imported public streams"
+#: ../../include/js_strings.php:74 ../../include/text.php:1187
+msgid "Friday"
 msgstr ""
 
-#: ../../include/conversation.php:1521
-msgid "Commented Order"
+#: ../../include/js_strings.php:75 ../../include/text.php:1187
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/conversation.php:1524
-msgid "Sort by Comment Date"
+#: ../../include/js_strings.php:76
+msgid "Sun"
 msgstr ""
 
-#: ../../include/conversation.php:1528
-msgid "Posted Order"
+#: ../../include/js_strings.php:77
+msgid "Mon"
 msgstr ""
 
-#: ../../include/conversation.php:1531
-msgid "Sort by Post Date"
+#: ../../include/js_strings.php:78
+msgid "Tue"
 msgstr ""
 
-#: ../../include/conversation.php:1536 ../../include/widgets.php:105
-msgid "Personal"
+#: ../../include/js_strings.php:79
+msgid "Wed"
 msgstr ""
 
-#: ../../include/conversation.php:1539
-msgid "Posts that mention or involve you"
+#: ../../include/js_strings.php:80
+msgid "Thu"
 msgstr ""
 
-#: ../../include/conversation.php:1545 ../../mod/connections.php:72
-#: ../../mod/connections.php:82 ../../mod/menu.php:112
-msgid "New"
-msgstr ""
-
-#: ../../include/conversation.php:1548
-msgid "Activity Stream - by date"
-msgstr ""
-
-#: ../../include/conversation.php:1554
-msgid "Starred"
-msgstr ""
-
-#: ../../include/conversation.php:1557
-msgid "Favourite Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1564
-msgid "Spam"
-msgstr ""
-
-#: ../../include/conversation.php:1567
-msgid "Posts flagged as SPAM"
-msgstr ""
-
-#: ../../include/conversation.php:1611 ../../mod/admin.php:1157
-msgid "Channel"
-msgstr ""
-
-#: ../../include/conversation.php:1614
-msgid "Status Messages and Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1623
-msgid "About"
-msgstr ""
-
-#: ../../include/conversation.php:1626
-msgid "Profile Details"
-msgstr ""
-
-#: ../../include/conversation.php:1635 ../../include/photos.php:506
-msgid "Photo Albums"
-msgstr ""
-
-#: ../../include/conversation.php:1642
-msgid "Files and Storage"
-msgstr ""
-
-#: ../../include/conversation.php:1652 ../../include/conversation.php:1655
-msgid "Chatrooms"
-msgstr ""
-
-#: ../../include/conversation.php:1668
-msgid "Saved Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1678
-msgid "Manage Webpages"
-msgstr ""
-
-#: ../../include/conversation.php:1707 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1093
-#: ../../mod/photos.php:1105
-msgid "View all"
-msgstr ""
-
-#: ../../include/conversation.php:1731 ../../include/taxonomy.php:415
-#: ../../include/identity.php:1268 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1097
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1734 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1102
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1737
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1740
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1743
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1746
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1749
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1752
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:48
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../../include/datetime.php:132
-msgid "YYYY-MM-DD or MM-DD"
-msgstr ""
-
-#: ../../include/datetime.php:236 ../../mod/appman.php:91
-#: ../../mod/appman.php:92 ../../mod/events.php:437 ../../mod/events.php:442
-msgid "Required"
-msgstr ""
-
-#: ../../include/datetime.php:263 ../../boot.php:2375
-msgid "never"
+#: ../../include/js_strings.php:81
+msgid "Fri"
 msgstr ""
 
-#: ../../include/datetime.php:269
-msgid "less than a second ago"
+#: ../../include/js_strings.php:82
+msgid "Sat"
 msgstr ""
 
-#: ../../include/datetime.php:287
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
+#: ../../include/js_strings.php:83
+msgctxt "calendar"
+msgid "today"
 msgstr ""
 
-#: ../../include/datetime.php:298
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:301
-msgctxt "relative_date"
+#: ../../include/js_strings.php:84
+msgctxt "calendar"
 msgid "month"
-msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:304
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:307
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:310
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:313
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:316
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:553
-#, php-format
-msgid "%1$s's birthday"
-msgstr ""
-
-#: ../../include/datetime.php:554
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr ""
-
-#: ../../include/dba/dba_driver.php:141
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
-msgstr ""
-
-#: ../../include/dir_fns.php:139
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:141
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/api.php:102
-#: ../../mod/connedit.php:368 ../../mod/connedit.php:646
-#: ../../mod/events.php:447 ../../mod/events.php:448 ../../mod/events.php:457
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:634 ../../mod/admin.php:425 ../../mod/removeme.php:60
-#: ../../mod/settings.php:588 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1548
-msgid "No"
 msgstr ""
 
-#: ../../include/dir_fns.php:141 ../../include/dir_fns.php:142
-#: ../../include/dir_fns.php:143 ../../mod/api.php:101
-#: ../../mod/connedit.php:368 ../../mod/events.php:447
-#: ../../mod/events.php:448 ../../mod/events.php:457
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/menu.php:96 ../../mod/menu.php:153 ../../mod/mitem.php:154
-#: ../../mod/mitem.php:155 ../../mod/mitem.php:228 ../../mod/mitem.php:229
-#: ../../mod/photos.php:634 ../../mod/admin.php:427 ../../mod/removeme.php:60
-#: ../../mod/settings.php:588 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1548
-msgid "Yes"
+#: ../../include/js_strings.php:85
+msgctxt "calendar"
+msgid "week"
 msgstr ""
 
-#: ../../include/dir_fns.php:142
-msgid "Public Forums Only"
+#: ../../include/js_strings.php:86
+msgctxt "calendar"
+msgid "day"
 msgstr ""
 
-#: ../../include/dir_fns.php:143
-msgid "This Website Only"
+#: ../../include/js_strings.php:87
+msgctxt "calendar"
+msgid "All day"
 msgstr ""
 
-#: ../../include/event.php:768
-msgid "This event has been added to your calendar."
+#: ../../include/message.php:20
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/event.php:967
-msgid "Not specified"
+#: ../../include/message.php:25
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/event.php:968
-msgid "Needs Action"
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/event.php:969
-msgid "Completed"
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/event.php:970
-msgid "In Process"
+#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1542
+msgid "Logout"
 msgstr ""
 
-#: ../../include/event.php:971
-msgid "Cancelled"
+#: ../../include/nav.php:82 ../../include/nav.php:115
+msgid "End this session"
 msgstr ""
 
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
+#: ../../include/nav.php:85 ../../include/nav.php:146
+msgid "Home"
 msgstr ""
 
-#: ../../include/follow.php:33
-msgid "Channel location missing."
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/follow.php:82
-msgid "Response from remote channel was incomplete."
+#: ../../include/nav.php:86 ../../include/conversation.php:959
+#: ../../mod/connedit.php:509
+msgid "View Profile"
 msgstr ""
 
-#: ../../include/follow.php:99
-msgid "Channel was deleted and no longer exists."
+#: ../../include/nav.php:86
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/follow.php:153 ../../include/follow.php:183
-msgid "Protocol disabled."
+#: ../../include/nav.php:88
+msgid "Edit Profiles"
 msgstr ""
 
-#: ../../include/follow.php:173
-msgid "Channel discovery failed."
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/follow.php:199
-msgid "local account not found."
+#: ../../include/nav.php:90 ../../include/identity.php:977
+msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/follow.php:224
-msgid "Cannot connect to yourself."
+#: ../../include/nav.php:90
+msgid "Edit your profile"
 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."
+#: ../../include/nav.php:92
+msgid "Your photos"
 msgstr ""
 
-#: ../../include/group.php:232
-msgid "Add new connections to this privacy group"
+#: ../../include/nav.php:93
+msgid "Your files"
 msgstr ""
 
-#: ../../include/group.php:251 ../../mod/admin.php:998
-msgid "All Channels"
+#: ../../include/nav.php:98
+msgid "Your chatrooms"
 msgstr ""
 
-#: ../../include/group.php:273
-msgid "edit"
+#: ../../include/nav.php:104
+msgid "Your bookmarks"
 msgstr ""
 
-#: ../../include/group.php:295 ../../include/features.php:82
-msgid "Privacy Groups"
+#: ../../include/nav.php:108
+msgid "Your webpages"
 msgstr ""
 
-#: ../../include/group.php:296
-msgid "Edit group"
+#: ../../include/nav.php:112
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/group.php:297
-msgid "Add privacy group"
+#: ../../include/nav.php:129
+#, php-format
+msgid "%s - click to logout"
 msgstr ""
 
-#: ../../include/group.php:298
-msgid "Channels not in any privacy group"
+#: ../../include/nav.php:132
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/group.php:300 ../../include/widgets.php:285
-msgid "add"
+#: ../../include/nav.php:132
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../include/nav.php:146
+msgid "Home Page"
 msgstr ""
 
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
+#: ../../include/nav.php:150 ../../mod/register.php:258 ../../boot.php:1525
+msgid "Register"
 msgstr ""
 
-#: ../../include/import.php:80 ../../mod/import.php:148
-msgid "Cloned channel not found. Import failed."
+#: ../../include/nav.php:150
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
+#: ../../include/nav.php:155
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:702
-#: ../../mod/photos.php:1058 ../../mod/photos.php:1176
-msgid "Comment"
+#: ../../include/nav.php:159 ../../include/widgets.php:102
+#: ../../mod/apps.php:36
+msgid "Apps"
 msgstr ""
 
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:413
-msgid "[+] show all"
+#: ../../include/nav.php:159
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/js_strings.php:8
-msgid "[-] show less"
+#: ../../include/nav.php:161
+msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/js_strings.php:9
-msgid "[+] expand"
+#: ../../include/nav.php:164
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/js_strings.php:10
-msgid "[-] collapse"
+#: ../../include/nav.php:176
+msgid "Your grid"
 msgstr ""
 
-#: ../../include/js_strings.php:11
-msgid "Password too short"
+#: ../../include/nav.php:177
+msgid "Mark all grid notifications seen"
 msgstr ""
 
-#: ../../include/js_strings.php:12
-msgid "Passwords do not match"
+#: ../../include/nav.php:179
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/js_strings.php:13 ../../mod/photos.php:41
-msgid "everybody"
+#: ../../include/nav.php:180
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/js_strings.php:14
-msgid "Secret Passphrase"
+#: ../../include/nav.php:183 ../../include/text.php:815
+#: ../../mod/connections.php:298
+msgid "Connections"
 msgstr ""
 
-#: ../../include/js_strings.php:15
-msgid "Passphrase hint"
+#: ../../include/nav.php:186
+msgid "Notices"
 msgstr ""
 
-#: ../../include/js_strings.php:16
-msgid "Notice: Permissions have changed but have not yet been submitted."
+#: ../../include/nav.php:186
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/js_strings.php:17
-msgid "close all"
+#: ../../include/nav.php:187
+msgid "See all notifications"
 msgstr ""
 
-#: ../../include/js_strings.php:18
-msgid "Nothing new here"
+#: ../../include/nav.php:188 ../../mod/notifications.php:99
+msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../include/js_strings.php:19
-msgid "Rate This Channel (this is public)"
+#: ../../include/nav.php:190
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:705
-#: ../../mod/rate.php:157
-msgid "Rating"
+#: ../../include/nav.php:191
+msgid "See all private messages"
 msgstr ""
 
-#: ../../include/js_strings.php:21
-msgid "Describe (optional)"
+#: ../../include/nav.php:192
+msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/js_strings.php:22 ../../include/widgets.php:702
-#: ../../include/widgets.php:714 ../../include/ItemObject.php:703
-#: ../../mod/appman.php:99 ../../mod/chat.php:184 ../../mod/chat.php:213
-#: ../../mod/connect.php:93 ../../mod/connedit.php:722
-#: ../../mod/events.php:461 ../../mod/events.php:658
-#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
-#: ../../mod/group.php:81 ../../mod/import.php:536
-#: ../../mod/import_items.php:116 ../../mod/invite.php:142
-#: ../../mod/locs.php:116 ../../mod/mail.php:380 ../../mod/mitem.php:231
-#: ../../mod/mood.php:135 ../../mod/pconfig.php:108 ../../mod/pdledit.php:62
-#: ../../mod/photos.php:645 ../../mod/photos.php:1019
-#: ../../mod/photos.php:1059 ../../mod/photos.php:1177 ../../mod/admin.php:457
-#: ../../mod/admin.php:646 ../../mod/admin.php:721 ../../mod/admin.php:986
-#: ../../mod/admin.php:1150 ../../mod/admin.php:1326 ../../mod/admin.php:1521
-#: ../../mod/admin.php:1606 ../../mod/poke.php:182 ../../mod/profiles.php:675
-#: ../../mod/rate.php:168 ../../mod/settings.php:597
-#: ../../mod/settings.php:710 ../../mod/settings.php:738
-#: ../../mod/settings.php:761 ../../mod/settings.php:849
-#: ../../mod/settings.php:1041 ../../mod/setup.php:333 ../../mod/setup.php:374
-#: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/thing.php:312
-#: ../../mod/thing.php:358 ../../mod/xchan.php:11
-#: ../../view/theme/redbasic/php/config.php:99
-msgid "Submit"
+#: ../../include/nav.php:193 ../../include/widgets.php:601
+msgid "Inbox"
 msgstr ""
 
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
+#: ../../include/nav.php:194 ../../include/widgets.php:606
+msgid "Outbox"
 msgstr ""
 
-#: ../../include/js_strings.php:24
-msgid "Unsaved changes. Are you sure you wish to leave this page?"
+#: ../../include/nav.php:195 ../../include/widgets.php:611
+msgid "New Message"
 msgstr ""
 
-#: ../../include/js_strings.php:25 ../../mod/events.php:452
-#: ../../mod/profiles.php:464 ../../mod/pubsites.php:28
-msgid "Location"
+#: ../../include/nav.php:198
+msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/js_strings.php:27
-msgid "timeago.prefixAgo"
+#: ../../include/nav.php:199
+msgid "See all events"
 msgstr ""
 
-#: ../../include/js_strings.php:28
-msgid "timeago.prefixFromNow"
+#: ../../include/nav.php:200
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/js_strings.php:29
-msgid "ago"
+#: ../../include/nav.php:203
+msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/js_strings.php:30
-msgid "from now"
+#: ../../include/nav.php:205
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/js_strings.php:31
-msgid "less than a minute"
+#: ../../include/nav.php:213 ../../include/widgets.php:1323
+msgid "Admin"
 msgstr ""
 
-#: ../../include/js_strings.php:32
-msgid "about a minute"
+#: ../../include/nav.php:213
+msgid "Site Setup and Configuration"
 msgstr ""
-
-#: ../../include/js_strings.php:33
-#, php-format
-msgid "%d minutes"
+
+#: ../../include/nav.php:244 ../../include/conversation.php:854
+msgid "Loading..."
 msgstr ""
 
-#: ../../include/js_strings.php:34
-msgid "about an hour"
+#: ../../include/nav.php:249
+msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: ../../include/js_strings.php:35
-#, php-format
-msgid "about %d hours"
+#: ../../include/nav.php:250
+msgid "Please wait..."
 msgstr ""
 
-#: ../../include/js_strings.php:36
-msgid "a day"
+#: ../../include/notify.php:20
+msgid "created a new post"
 msgstr ""
 
-#: ../../include/js_strings.php:37
+#: ../../include/notify.php:21
 #, php-format
-msgid "%d days"
+msgid "commented on %s's post"
 msgstr ""
 
-#: ../../include/js_strings.php:38
-msgid "about a month"
+#: ../../include/page_widgets.php:6
+msgid "New Page"
 msgstr ""
 
-#: ../../include/js_strings.php:39
-#, php-format
-msgid "%d months"
+#: ../../include/page_widgets.php:39 ../../mod/blocks.php:159
+#: ../../mod/layouts.php:188 ../../mod/pubsites.php:42
+#: ../../mod/webpages.php:189
+msgid "View"
 msgstr ""
 
-#: ../../include/js_strings.php:40
-msgid "about a year"
+#: ../../include/page_widgets.php:40 ../../include/conversation.php:1179
+#: ../../include/ItemObject.php:712 ../../mod/editblock.php:171
+#: ../../mod/editpost.php:149 ../../mod/editwebpage.php:212
+#: ../../mod/events.php:465 ../../mod/photos.php:1060
+#: ../../mod/webpages.php:190
+msgid "Preview"
 msgstr ""
 
-#: ../../include/js_strings.php:41
-#, php-format
-msgid "%d years"
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:191
+msgid "Actions"
 msgstr ""
 
-#: ../../include/js_strings.php:42
-msgid " "
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:192
+msgid "Page Link"
 msgstr ""
 
-#: ../../include/js_strings.php:43
-msgid "timeago.numbers"
+#: ../../include/page_widgets.php:43
+msgid "Title"
 msgstr ""
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1191
-msgid "January"
+#: ../../include/page_widgets.php:44 ../../mod/blocks.php:150
+#: ../../mod/layouts.php:181 ../../mod/menu.php:110 ../../mod/webpages.php:194
+msgid "Created"
 msgstr ""
 
-#: ../../include/js_strings.php:46 ../../include/text.php:1191
-msgid "February"
+#: ../../include/page_widgets.php:45 ../../mod/blocks.php:151
+#: ../../mod/layouts.php:182 ../../mod/menu.php:111 ../../mod/webpages.php:195
+msgid "Edited"
 msgstr ""
 
-#: ../../include/js_strings.php:47 ../../include/text.php:1191
-msgid "March"
+#: ../../include/photo/photo_driver.php:722 ../../mod/photos.php:94
+#: ../../mod/photos.php:711 ../../mod/profile_photo.php:147
+#: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:327
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../include/js_strings.php:48 ../../include/text.php:1191
-msgid "April"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
+msgid "Male"
 msgstr ""
 
-#: ../../include/js_strings.php:49
-msgctxt "long"
-msgid "May"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
+msgid "Female"
 msgstr ""
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1191
-msgid "June"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
 msgstr ""
 
-#: ../../include/js_strings.php:51 ../../include/text.php:1191
-msgid "July"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
 msgstr ""
 
-#: ../../include/js_strings.php:52 ../../include/text.php:1191
-msgid "August"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
 msgstr ""
 
-#: ../../include/js_strings.php:53 ../../include/text.php:1191
-msgid "September"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
 msgstr ""
 
-#: ../../include/js_strings.php:54 ../../include/text.php:1191
-msgid "October"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
 msgstr ""
 
-#: ../../include/js_strings.php:55 ../../include/text.php:1191
-msgid "November"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
 msgstr ""
 
-#: ../../include/js_strings.php:56 ../../include/text.php:1191
-msgid "December"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
 msgstr ""
 
-#: ../../include/js_strings.php:57
-msgid "Jan"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../include/js_strings.php:58
-msgid "Feb"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
 msgstr ""
 
-#: ../../include/js_strings.php:59
-msgid "Mar"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
 msgstr ""
 
-#: ../../include/js_strings.php:60
-msgid "Apr"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+#: ../../include/profile_selectors.php:61
+#: ../../include/profile_selectors.php:97 ../../include/permissions.php:871
+msgid "Other"
 msgstr ""
 
-#: ../../include/js_strings.php:61
-msgctxt "short"
-msgid "May"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
 msgstr ""
 
-#: ../../include/js_strings.php:62
-msgid "Jun"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Males"
 msgstr ""
 
-#: ../../include/js_strings.php:63
-msgid "Jul"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Females"
 msgstr ""
 
-#: ../../include/js_strings.php:64
-msgid "Aug"
+#: ../../include/profile_selectors.php:42
+msgid "Gay"
 msgstr ""
 
-#: ../../include/js_strings.php:65
-msgid "Sep"
+#: ../../include/profile_selectors.php:42
+msgid "Lesbian"
 msgstr ""
 
-#: ../../include/js_strings.php:66
-msgid "Oct"
+#: ../../include/profile_selectors.php:42
+msgid "No Preference"
 msgstr ""
 
-#: ../../include/js_strings.php:67
-msgid "Nov"
+#: ../../include/profile_selectors.php:42
+msgid "Bisexual"
 msgstr ""
 
-#: ../../include/js_strings.php:68
-msgid "Dec"
+#: ../../include/profile_selectors.php:42
+msgid "Autosexual"
 msgstr ""
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1187
-msgid "Sunday"
+#: ../../include/profile_selectors.php:42
+msgid "Abstinent"
 msgstr ""
 
-#: ../../include/js_strings.php:70 ../../include/text.php:1187
-msgid "Monday"
+#: ../../include/profile_selectors.php:42
+msgid "Virgin"
 msgstr ""
 
-#: ../../include/js_strings.php:71 ../../include/text.php:1187
-msgid "Tuesday"
+#: ../../include/profile_selectors.php:42
+msgid "Deviant"
 msgstr ""
 
-#: ../../include/js_strings.php:72 ../../include/text.php:1187
-msgid "Wednesday"
+#: ../../include/profile_selectors.php:42
+msgid "Fetish"
 msgstr ""
 
-#: ../../include/js_strings.php:73 ../../include/text.php:1187
-msgid "Thursday"
+#: ../../include/profile_selectors.php:42
+msgid "Oodles"
 msgstr ""
 
-#: ../../include/js_strings.php:74 ../../include/text.php:1187
-msgid "Friday"
+#: ../../include/profile_selectors.php:42
+msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/js_strings.php:75 ../../include/text.php:1187
-msgid "Saturday"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Single"
 msgstr ""
 
-#: ../../include/js_strings.php:76
-msgid "Sun"
+#: ../../include/profile_selectors.php:80
+msgid "Lonely"
 msgstr ""
 
-#: ../../include/js_strings.php:77
-msgid "Mon"
+#: ../../include/profile_selectors.php:80
+msgid "Available"
 msgstr ""
 
-#: ../../include/js_strings.php:78
-msgid "Tue"
+#: ../../include/profile_selectors.php:80
+msgid "Unavailable"
 msgstr ""
 
-#: ../../include/js_strings.php:79
-msgid "Wed"
+#: ../../include/profile_selectors.php:80
+msgid "Has crush"
 msgstr ""
 
-#: ../../include/js_strings.php:80
-msgid "Thu"
+#: ../../include/profile_selectors.php:80
+msgid "Infatuated"
 msgstr ""
 
-#: ../../include/js_strings.php:81
-msgid "Fri"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Dating"
 msgstr ""
 
-#: ../../include/js_strings.php:82
-msgid "Sat"
+#: ../../include/profile_selectors.php:80
+msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/js_strings.php:83
-msgctxt "calendar"
-msgid "today"
+#: ../../include/profile_selectors.php:80
+msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/js_strings.php:84
-msgctxt "calendar"
-msgid "month"
+#: ../../include/profile_selectors.php:80 ../../include/widgets.php:451
+#: ../../include/identity.php:390 ../../include/identity.php:391
+#: ../../include/identity.php:398 ../../mod/connedit.php:584
+#: ../../mod/settings.php:349 ../../mod/settings.php:353
+#: ../../mod/settings.php:354 ../../mod/settings.php:357
+#: ../../mod/settings.php:368
+msgid "Friends"
 msgstr ""
 
-#: ../../include/js_strings.php:85
-msgctxt "calendar"
-msgid "week"
+#: ../../include/profile_selectors.php:80
+msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/js_strings.php:86
-msgctxt "calendar"
-msgid "day"
+#: ../../include/profile_selectors.php:80
+msgid "Casual"
 msgstr ""
 
-#: ../../include/js_strings.php:87
-msgctxt "calendar"
-msgid "All day"
+#: ../../include/profile_selectors.php:80
+msgid "Engaged"
 msgstr ""
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Married"
 msgstr ""
 
-#: ../../include/message.php:25
-msgid "[no subject]"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
+#: ../../include/profile_selectors.php:80
+msgid "Partners"
 msgstr ""
 
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1543
-msgid "Logout"
+#: ../../include/profile_selectors.php:80
+msgid "Common law"
 msgstr ""
 
-#: ../../include/nav.php:82 ../../include/nav.php:115
-msgid "End this session"
+#: ../../include/profile_selectors.php:80
+msgid "Happy"
 msgstr ""
 
-#: ../../include/nav.php:85 ../../include/nav.php:146
-msgid "Home"
+#: ../../include/profile_selectors.php:80
+msgid "Not looking"
 msgstr ""
 
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
+#: ../../include/profile_selectors.php:80
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/nav.php:86
-msgid "Your profile page"
+#: ../../include/profile_selectors.php:80
+msgid "Betrayed"
 msgstr ""
 
-#: ../../include/nav.php:88
-msgid "Edit Profiles"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Separated"
 msgstr ""
 
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
+#: ../../include/profile_selectors.php:80
+msgid "Unstable"
 msgstr ""
 
-#: ../../include/nav.php:90 ../../include/identity.php:977
-msgid "Edit Profile"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Divorced"
 msgstr ""
 
-#: ../../include/nav.php:90
-msgid "Edit your profile"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/nav.php:92
-msgid "Your photos"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Widowed"
 msgstr ""
 
-#: ../../include/nav.php:93
-msgid "Your files"
+#: ../../include/profile_selectors.php:80
+msgid "Uncertain"
 msgstr ""
 
-#: ../../include/nav.php:98
-msgid "Your chatrooms"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "It's complicated"
 msgstr ""
 
-#: ../../include/nav.php:104
-msgid "Your bookmarks"
+#: ../../include/profile_selectors.php:80
+msgid "Don't care"
 msgstr ""
 
-#: ../../include/nav.php:108
-msgid "Your webpages"
+#: ../../include/profile_selectors.php:80
+msgid "Ask me"
 msgstr ""
 
-#: ../../include/nav.php:112
-msgid "Sign in"
+#: ../../include/security.php:388
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/nav.php:129
-#, php-format
-msgid "%s - click to logout"
+#: ../../include/taxonomy.php:240 ../../include/taxonomy.php:261
+msgid "Tags"
 msgstr ""
 
-#: ../../include/nav.php:132
-msgid "Remote authentication"
+#: ../../include/taxonomy.php:305
+msgid "Keywords"
 msgstr ""
 
-#: ../../include/nav.php:132
-msgid "Click to authenticate to your home hub"
+#: ../../include/taxonomy.php:326
+msgid "have"
 msgstr ""
 
-#: ../../include/nav.php:146
-msgid "Home Page"
+#: ../../include/taxonomy.php:326
+msgid "has"
 msgstr ""
 
-#: ../../include/nav.php:150 ../../mod/register.php:266 ../../boot.php:1526
-msgid "Register"
+#: ../../include/taxonomy.php:327
+msgid "want"
 msgstr ""
 
-#: ../../include/nav.php:150
-msgid "Create an account"
+#: ../../include/taxonomy.php:327
+msgid "wants"
 msgstr ""
 
-#: ../../include/nav.php:155
-msgid "Help and documentation"
+#: ../../include/taxonomy.php:328 ../../include/ItemObject.php:254
+msgid "like"
 msgstr ""
 
-#: ../../include/nav.php:159 ../../include/widgets.php:102
-#: ../../mod/apps.php:36
-msgid "Apps"
+#: ../../include/taxonomy.php:328
+msgid "likes"
 msgstr ""
 
-#: ../../include/nav.php:159
-msgid "Applications, utilities, links, games"
+#: ../../include/taxonomy.php:329 ../../include/ItemObject.php:255
+msgid "dislike"
 msgstr ""
 
-#: ../../include/nav.php:161
-msgid "Search site @name, #tag, ?docs, content"
+#: ../../include/taxonomy.php:329
+msgid "dislikes"
 msgstr ""
 
-#: ../../include/nav.php:164
-msgid "Channel Directory"
-msgstr ""
+#: ../../include/taxonomy.php:415 ../../include/identity.php:1264
+#: ../../include/conversation.php:1751 ../../include/ItemObject.php:179
+#: ../../mod/photos.php:1097
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/nav.php:176
-msgid "Your grid"
+#: ../../include/datetime.php:48
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/nav.php:177
-msgid "Mark all grid notifications seen"
+#: ../../include/datetime.php:132
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/nav.php:179
-msgid "Channel home"
+#: ../../include/datetime.php:236 ../../mod/appman.php:91
+#: ../../mod/appman.php:92 ../../mod/events.php:444 ../../mod/events.php:449
+msgid "Required"
 msgstr ""
 
-#: ../../include/nav.php:180
-msgid "Mark all channel notifications seen"
+#: ../../include/datetime.php:263 ../../boot.php:2374
+msgid "never"
 msgstr ""
 
-#: ../../include/nav.php:183 ../../include/text.php:815
-#: ../../mod/connections.php:298
-msgid "Connections"
+#: ../../include/datetime.php:269
+msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/nav.php:186
-msgid "Notices"
+#: ../../include/datetime.php:287
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/nav.php:186
-msgid "Notifications"
-msgstr ""
+#: ../../include/datetime.php:298
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/nav.php:187
-msgid "See all notifications"
+#: ../../include/datetime.php:301
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:304
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:307
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:310
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:313
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:316
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:553
+#, php-format
+msgid "%1$s's birthday"
 msgstr ""
 
-#: ../../include/nav.php:188 ../../mod/notifications.php:99
-msgid "Mark all system notifications seen"
+#: ../../include/datetime.php:554
+#, php-format
+msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/nav.php:190
-msgid "Private mail"
+#: ../../include/zot.php:675
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/nav.php:191
-msgid "See all private messages"
+#: ../../include/zot.php:691
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/nav.php:192
-msgid "Mark all private messages seen"
+#: ../../include/zot.php:2267
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/nav.php:193 ../../include/widgets.php:601
-msgid "Inbox"
+#: ../../include/zot.php:3588
+msgid "invalid target signature"
 msgstr ""
 
-#: ../../include/nav.php:194 ../../include/widgets.php:606
-msgid "Outbox"
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
 msgstr ""
 
-#: ../../include/nav.php:195 ../../include/widgets.php:611
-msgid "New Message"
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
 msgstr ""
 
-#: ../../include/nav.php:198
-msgid "Event Calendar"
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
 msgstr ""
 
-#: ../../include/nav.php:199
-msgid "See all events"
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
 msgstr ""
 
-#: ../../include/nav.php:200
-msgid "Mark all events seen"
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
 msgstr ""
 
-#: ../../include/nav.php:203
-msgid "Manage Your Channels"
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
 msgstr ""
 
-#: ../../include/nav.php:205
-msgid "Account/Channel Settings"
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/nav.php:213 ../../include/widgets.php:1323
-msgid "Admin"
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/nav.php:213
-msgid "Site Setup and Configuration"
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
+msgstr ""
+
+#: ../../include/contact_selectors.php:79 ../../mod/id.php:15
+#: ../../mod/id.php:16 ../../mod/admin.php:989 ../../mod/admin.php:998
+#: ../../boot.php:1545
+msgid "Email"
 msgstr ""
 
-#: ../../include/nav.php:249
-msgid "@name, #tag, ?doc, content"
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
 msgstr ""
 
-#: ../../include/nav.php:250
-msgid "Please wait..."
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/notify.php:20
-msgid "created a new post"
+#: ../../include/contact_selectors.php:82
+msgid "Zot"
 msgstr ""
 
-#: ../../include/notify.php:21
-#, php-format
-msgid "commented on %s's post"
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/page_widgets.php:6
-msgid "New Page"
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/page_widgets.php:39 ../../mod/blocks.php:159
-#: ../../mod/layouts.php:188 ../../mod/webpages.php:187
-msgid "View"
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
 msgstr ""
 
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
-msgid "Actions"
+#: ../../include/network.php:630
+msgid "view full size"
 msgstr ""
 
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
-msgid "Page Link"
+#: ../../include/network.php:1612 ../../include/enotify.php:57
+msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../include/page_widgets.php:43
-msgid "Title"
+#: ../../include/network.php:1613 ../../include/enotify.php:58
+msgid "$projectname"
 msgstr ""
 
-#: ../../include/page_widgets.php:44 ../../mod/blocks.php:150
-#: ../../mod/layouts.php:181 ../../mod/menu.php:110 ../../mod/webpages.php:192
-msgid "Created"
+#: ../../include/network.php:1615 ../../include/enotify.php:60
+msgid "Thank You,"
 msgstr ""
 
-#: ../../include/page_widgets.php:45 ../../mod/blocks.php:151
-#: ../../mod/layouts.php:182 ../../mod/menu.php:111 ../../mod/webpages.php:193
-msgid "Edited"
+#: ../../include/network.php:1617 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/photo/photo_driver.php:722 ../../mod/photos.php:94
-#: ../../mod/photos.php:711 ../../mod/profile_photo.php:147
-#: ../../mod/profile_photo.php:239 ../../mod/profile_photo.php:327
-msgid "Profile Photos"
+#: ../../include/network.php:1674
+msgid "No Subject"
 msgstr ""
 
 #: ../../include/photos.php:112
@@ -2285,1746 +2072,1864 @@ msgctxt "photo_upload"
 msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
+#: ../../include/photos.php:506 ../../include/conversation.php:1644
+msgid "Photo Albums"
+msgstr ""
+
 #: ../../include/photos.php:510
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
-msgid "Male"
+#: ../../include/features.php:48
+msgid "General Features"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
-msgid "Female"
+#: ../../include/features.php:50
+msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
+#: ../../include/features.php:50
+msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
+#: ../../include/features.php:51
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
+#: ../../include/features.php:51
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
+#: ../../include/features.php:52
+msgid "Advanced Profiles"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
+#: ../../include/features.php:52
+msgid "Additional profile sections and selections"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
+#: ../../include/features.php:53
+msgid "Profile Import/Export"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
+#: ../../include/features.php:53
+msgid "Save and load profile details across sites/channels"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
+#: ../../include/features.php:54
+msgid "Web Pages"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
+#: ../../include/features.php:54
+msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
+#: ../../include/features.php:55
+msgid "Hide Rating"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97 ../../include/permissions.php:871
-msgid "Other"
+#: ../../include/features.php:55
+msgid ""
+"Hide the rating buttons on your channel and profile pages. Note: People can "
+"still rate you somewhere else."
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
+#: ../../include/features.php:56
+msgid "Private Notes"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
+#: ../../include/features.php:56
+msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
+#: ../../include/features.php:57
+msgid "Navigation Channel Select"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
+#: ../../include/features.php:57
+msgid "Change channels directly from within the navigation dropdown menu"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
+#: ../../include/features.php:58
+msgid "Photo Location"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
+#: ../../include/features.php:58
+msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
+#: ../../include/features.php:60
+msgid "Expert Mode"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
+#: ../../include/features.php:60
+msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
+#: ../../include/features.php:61
+msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
+#: ../../include/features.php:61
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
+#: ../../include/features.php:66
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
+#: ../../include/features.php:68
+msgid "Use Markdown"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
+#: ../../include/features.php:68
+msgid "Allow use of \"Markdown\" to format posts"
 msgstr ""
 
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
+#: ../../include/features.php:69
+msgid "Large Photos"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
+#: ../../include/features.php:69
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
+#: ../../include/features.php:70 ../../include/widgets.php:572
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Available"
+#: ../../include/features.php:70
+msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
+#: ../../include/features.php:71
+msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
+#: ../../include/features.php:71
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
+#: ../../include/features.php:72
+msgid "Enable Voting Tools"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
+#: ../../include/features.php:72
+msgid "Provide a class of post which others can vote on"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
+#: ../../include/features.php:73
+msgid "Delayed Posting"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
+#: ../../include/features.php:73
+msgid "Allow posts to be published at a later date"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80 ../../include/widgets.php:451
-#: ../../include/identity.php:390 ../../include/identity.php:391
-#: ../../include/identity.php:398 ../../mod/connedit.php:584
-#: ../../mod/settings.php:349 ../../mod/settings.php:353
-#: ../../mod/settings.php:354 ../../mod/settings.php:357
-#: ../../mod/settings.php:368
-msgid "Friends"
+#: ../../include/features.php:74
+msgid "Suppress Duplicate Posts/Comments"
+msgstr ""
+
+#: ../../include/features.php:74
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
+msgstr ""
+
+#: ../../include/features.php:80
+msgid "Network and Stream Filtering"
+msgstr ""
+
+#: ../../include/features.php:81
+msgid "Search by Date"
+msgstr ""
+
+#: ../../include/features.php:81
+msgid "Ability to select posts by date ranges"
+msgstr ""
+
+#: ../../include/features.php:82 ../../include/group.php:295
+msgid "Privacy Groups"
+msgstr ""
+
+#: ../../include/features.php:82
+msgid "Enable management and selection of privacy groups"
+msgstr ""
+
+#: ../../include/features.php:83 ../../include/widgets.php:284
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
+#: ../../include/features.php:83
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
+#: ../../include/features.php:84
+msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
+#: ../../include/features.php:84
+msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
+#: ../../include/features.php:85
+msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
+#: ../../include/features.php:85
+msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
+#: ../../include/features.php:86
+msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
+#: ../../include/features.php:86
+msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
+#: ../../include/features.php:87
+msgid "Connection Filtering"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
+#: ../../include/features.php:87
+msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
+#: ../../include/features.php:88
+msgid "Suggest Channels"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
+#: ../../include/features.php:88
+msgid "Show channel suggestions"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
+#: ../../include/features.php:93
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
+#: ../../include/features.php:94
+msgid "Community Tagging"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
+#: ../../include/features.php:94
+msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
+#: ../../include/features.php:95
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
+#: ../../include/features.php:95
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
+#: ../../include/features.php:96
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
+#: ../../include/features.php:97
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
+#: ../../include/features.php:97
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
+#: ../../include/features.php:98
+msgid "Star Posts"
 msgstr ""
 
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
+#: ../../include/features.php:98
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/security.php:384
-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/features.php:99
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/taxonomy.php:240 ../../include/taxonomy.php:261
-msgid "Tags"
+#: ../../include/features.php:99
+msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/taxonomy.php:305
-msgid "Keywords"
+#: ../../include/widgets.php:103
+msgid "System"
 msgstr ""
 
-#: ../../include/taxonomy.php:326
-msgid "have"
+#: ../../include/widgets.php:105 ../../include/conversation.php:1536
+msgid "Personal"
 msgstr ""
 
-#: ../../include/taxonomy.php:326
-msgid "has"
+#: ../../include/widgets.php:106
+msgid "Create Personal App"
 msgstr ""
 
-#: ../../include/taxonomy.php:327
-msgid "want"
+#: ../../include/widgets.php:107
+msgid "Edit Personal App"
 msgstr ""
 
-#: ../../include/taxonomy.php:327
-msgid "wants"
+#: ../../include/widgets.php:149 ../../mod/suggest.php:54
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../include/taxonomy.php:328 ../../include/ItemObject.php:254
-msgid "like"
+#: ../../include/widgets.php:154
+msgid "Suggestions"
 msgstr ""
 
-#: ../../include/taxonomy.php:328
-msgid "likes"
+#: ../../include/widgets.php:155
+msgid "See more..."
 msgstr ""
 
-#: ../../include/taxonomy.php:329 ../../include/ItemObject.php:255
-msgid "dislike"
+#: ../../include/widgets.php:176
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../include/taxonomy.php:329
-msgid "dislikes"
+#: ../../include/widgets.php:182
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../include/zot.php:675
-msgid "Invalid data packet"
+#: ../../include/widgets.php:183
+msgid "Enter channel address"
 msgstr ""
 
-#: ../../include/zot.php:691
-msgid "Unable to verify channel signature"
+#: ../../include/widgets.php:184
+msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr ""
 
-#: ../../include/zot.php:2267
-#, php-format
-msgid "Unable to verify site signature for %s"
+#: ../../include/widgets.php:200
+msgid "Notes"
 msgstr ""
 
-#: ../../include/zot.php:3588
-msgid "invalid target signature"
+#: ../../include/widgets.php:202 ../../include/text.php:886
+#: ../../include/text.php:898 ../../mod/filer.php:49 ../../mod/admin.php:1666
+#: ../../mod/admin.php:1686 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
+msgid "Save"
 msgstr ""
 
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
+#: ../../include/widgets.php:276
+msgid "Remove term"
 msgstr ""
 
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
+#: ../../include/widgets.php:285 ../../include/group.php:300
+msgid "add"
 msgstr ""
 
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
+#: ../../include/widgets.php:359
+msgid "Archives"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
+#: ../../include/widgets.php:449 ../../mod/connedit.php:582
+msgid "Me"
 msgstr ""
 
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
+#: ../../include/widgets.php:450 ../../mod/connedit.php:583
+msgid "Family"
 msgstr ""
 
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
+#: ../../include/widgets.php:452 ../../mod/connedit.php:585
+msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
+#: ../../include/widgets.php:453 ../../mod/connections.php:88
+#: ../../mod/connections.php:103 ../../mod/connedit.php:586
+msgid "All"
 msgstr ""
 
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
+#: ../../include/widgets.php:472
+msgid "Refresh"
 msgstr ""
 
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
+#: ../../include/widgets.php:506
+msgid "Account settings"
 msgstr ""
 
-#: ../../include/contact_selectors.php:79 ../../mod/id.php:15
-#: ../../mod/id.php:16 ../../mod/admin.php:989 ../../mod/admin.php:998
-#: ../../boot.php:1546
-msgid "Email"
+#: ../../include/widgets.php:512
+msgid "Channel settings"
 msgstr ""
 
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
+#: ../../include/widgets.php:521
+msgid "Additional features"
 msgstr ""
 
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
+#: ../../include/widgets.php:528
+msgid "Feature/Addon settings"
 msgstr ""
 
-#: ../../include/contact_selectors.php:82
-msgid "Zot"
+#: ../../include/widgets.php:534
+msgid "Display settings"
 msgstr ""
 
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
+#: ../../include/widgets.php:540
+msgid "Connected apps"
 msgstr ""
 
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
+#: ../../include/widgets.php:548
+msgid "Export channel"
 msgstr ""
 
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
+#: ../../include/widgets.php:556 ../../mod/connedit.php:694
+msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../include/network.php:630
-msgid "view full size"
+#: ../../include/widgets.php:564
+msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/network.php:1612 ../../include/enotify.php:57
-msgid "$Projectname Notification"
+#: ../../include/widgets.php:594
+msgid "Private Mail Menu"
 msgstr ""
 
-#: ../../include/network.php:1613 ../../include/enotify.php:58
-msgid "$projectname"
+#: ../../include/widgets.php:596
+msgid "Combined View"
 msgstr ""
 
-#: ../../include/network.php:1615 ../../include/enotify.php:60
-msgid "Thank You,"
+#: ../../include/widgets.php:630 ../../include/widgets.php:642
+msgid "Conversations"
 msgstr ""
 
-#: ../../include/network.php:1617 ../../include/enotify.php:62
-#, php-format
-msgid "%s Administrator"
+#: ../../include/widgets.php:634
+msgid "Received Messages"
 msgstr ""
 
-#: ../../include/network.php:1674
-msgid "No Subject"
+#: ../../include/widgets.php:638
+msgid "Sent Messages"
 msgstr ""
 
-#: ../../include/features.php:48
-msgid "General Features"
+#: ../../include/widgets.php:652
+msgid "No messages."
 msgstr ""
 
-#: ../../include/features.php:50
-msgid "Content Expiration"
+#: ../../include/widgets.php:670
+msgid "Delete conversation"
+msgstr ""
+
+#: ../../include/widgets.php:696
+msgid "Events Menu"
 msgstr ""
 
-#: ../../include/features.php:50
-msgid "Remove posts/comments and/or private messages at a future time"
+#: ../../include/widgets.php:697
+msgid "Day View"
 msgstr ""
 
-#: ../../include/features.php:51
-msgid "Multiple Profiles"
+#: ../../include/widgets.php:698
+msgid "Week View"
 msgstr ""
 
-#: ../../include/features.php:51
-msgid "Ability to create multiple profiles"
+#: ../../include/widgets.php:699
+msgid "Month View"
 msgstr ""
 
-#: ../../include/features.php:52
-msgid "Advanced Profiles"
+#: ../../include/widgets.php:700 ../../mod/events.php:661
+#: ../../mod/cal.php:328
+msgid "Export"
 msgstr ""
 
-#: ../../include/features.php:52
-msgid "Additional profile sections and selections"
+#: ../../include/widgets.php:701 ../../mod/events.php:664
+#: ../../mod/cal.php:331
+msgid "Import"
 msgstr ""
 
-#: ../../include/features.php:53
-msgid "Profile Import/Export"
+#: ../../include/widgets.php:711
+msgid "Events Tools"
 msgstr ""
 
-#: ../../include/features.php:53
-msgid "Save and load profile details across sites/channels"
+#: ../../include/widgets.php:712
+msgid "Export Calendar"
 msgstr ""
 
-#: ../../include/features.php:54
-msgid "Web Pages"
+#: ../../include/widgets.php:713
+msgid "Import Calendar"
 msgstr ""
 
-#: ../../include/features.php:54
-msgid "Provide managed web pages on your channel"
+#: ../../include/widgets.php:787
+msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/features.php:55
-msgid "Hide Rating"
+#: ../../include/widgets.php:807
+msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/features.php:55
-msgid ""
-"Hide the rating buttons on your channel and profile pages. Note: People can "
-"still rate you somewhere else."
+#: ../../include/widgets.php:827
+msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/features.php:56
-msgid "Private Notes"
+#: ../../include/widgets.php:972 ../../include/widgets.php:1062
+msgid "photo/image"
 msgstr ""
 
-#: ../../include/features.php:56
-msgid "Enables a tool to store notes and reminders (note: not encrypted)"
+#: ../../include/widgets.php:1156
+msgid "Rating Tools"
 msgstr ""
 
-#: ../../include/features.php:57
-msgid "Navigation Channel Select"
+#: ../../include/widgets.php:1160 ../../include/widgets.php:1162
+msgid "Rate Me"
 msgstr ""
 
-#: ../../include/features.php:57
-msgid "Change channels directly from within the navigation dropdown menu"
+#: ../../include/widgets.php:1165
+msgid "View Ratings"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid "Photo Location"
+#: ../../include/widgets.php:1176 ../../mod/pubsites.php:18
+msgid "Public Hubs"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid "If location data is available on uploaded photos, link this to a map."
+#: ../../include/widgets.php:1224
+msgid "Forums"
 msgstr ""
 
-#: ../../include/features.php:60
-msgid "Expert Mode"
+#: ../../include/widgets.php:1253
+msgid "Tasks"
 msgstr ""
 
-#: ../../include/features.php:60
-msgid "Enable Expert Mode to provide advanced configuration options"
+#: ../../include/widgets.php:1262
+msgid "Documentation"
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "Premium Channel"
+#: ../../include/widgets.php:1264
+msgid "Project/Site Information"
 msgstr ""
 
-#: ../../include/features.php:61
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
+#: ../../include/widgets.php:1265
+msgid "For Members"
 msgstr ""
 
-#: ../../include/features.php:66
-msgid "Post Composition Features"
+#: ../../include/widgets.php:1266
+msgid "For Administrators"
 msgstr ""
 
-#: ../../include/features.php:68
-msgid "Use Markdown"
+#: ../../include/widgets.php:1267
+msgid "For Developers"
 msgstr ""
 
-#: ../../include/features.php:68
-msgid "Allow use of \"Markdown\" to format posts"
+#: ../../include/widgets.php:1292 ../../mod/admin.php:456
+msgid "Site"
 msgstr ""
 
-#: ../../include/features.php:69
-msgid "Large Photos"
+#: ../../include/widgets.php:1293
+msgid "Accounts"
 msgstr ""
 
-#: ../../include/features.php:69
-msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
+#: ../../include/widgets.php:1294 ../../mod/admin.php:1149
+msgid "Channels"
 msgstr ""
 
-#: ../../include/features.php:70 ../../include/widgets.php:572
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
+#: ../../include/widgets.php:1295 ../../mod/admin.php:710
+msgid "Security"
 msgstr ""
 
-#: ../../include/features.php:70
-msgid "Automatically import channel content from other channels or feeds"
+#: ../../include/widgets.php:1297 ../../mod/admin.php:1264
+#: ../../mod/admin.php:1325
+msgid "Plugins"
 msgstr ""
 
-#: ../../include/features.php:71
-msgid "Even More Encryption"
+#: ../../include/widgets.php:1298 ../../mod/admin.php:1486
+#: ../../mod/admin.php:1520
+msgid "Themes"
 msgstr ""
 
-#: ../../include/features.php:71
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
+#: ../../include/widgets.php:1299
+msgid "Inspect queue"
 msgstr ""
 
-#: ../../include/features.php:72
-msgid "Enable Voting Tools"
+#: ../../include/widgets.php:1300
+msgid "Profile Config"
 msgstr ""
 
-#: ../../include/features.php:72
-msgid "Provide a class of post which others can vote on"
+#: ../../include/widgets.php:1301
+msgid "DB updates"
 msgstr ""
 
-#: ../../include/features.php:73
-msgid "Delayed Posting"
+#: ../../include/widgets.php:1319 ../../include/widgets.php:1325
+#: ../../mod/admin.php:1605
+msgid "Logs"
 msgstr ""
 
-#: ../../include/features.php:73
-msgid "Allow posts to be published at a later date"
+#: ../../include/widgets.php:1324
+msgid "Plugin Features"
 msgstr ""
 
-#: ../../include/features.php:74
-msgid "Suppress Duplicate Posts/Comments"
+#: ../../include/widgets.php:1326
+msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/features.php:74
-msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
+#: ../../include/widgets.php:1404 ../../mod/photos.php:760
+#: ../../mod/photos.php:1300
+msgid "View Photo"
 msgstr ""
 
-#: ../../include/features.php:80
-msgid "Network and Stream Filtering"
+#: ../../include/widgets.php:1421 ../../mod/photos.php:791
+msgid "Edit Album"
 msgstr ""
 
-#: ../../include/features.php:81
-msgid "Search by Date"
+#: ../../include/text.php:394
+msgid "prev"
 msgstr ""
 
-#: ../../include/features.php:81
-msgid "Ability to select posts by date ranges"
+#: ../../include/text.php:396
+msgid "first"
 msgstr ""
 
-#: ../../include/features.php:82
-msgid "Enable management and selection of privacy groups"
+#: ../../include/text.php:425
+msgid "last"
 msgstr ""
 
-#: ../../include/features.php:83 ../../include/widgets.php:284
-msgid "Saved Searches"
+#: ../../include/text.php:428
+msgid "next"
 msgstr ""
 
-#: ../../include/features.php:83
-msgid "Save search terms for re-use"
+#: ../../include/text.php:438
+msgid "older"
 msgstr ""
 
-#: ../../include/features.php:84
-msgid "Network Personal Tab"
+#: ../../include/text.php:440
+msgid "newer"
 msgstr ""
 
-#: ../../include/features.php:84
-msgid "Enable tab to display only Network posts that you've interacted on"
+#: ../../include/text.php:803
+msgid "No connections"
 msgstr ""
 
-#: ../../include/features.php:85
-msgid "Network New Tab"
+#: ../../include/text.php:828
+#, php-format
+msgid "View all %s connections"
 msgstr ""
 
-#: ../../include/features.php:85
-msgid "Enable tab to display all new Network activity"
+#: ../../include/text.php:973 ../../include/text.php:978
+msgid "poke"
 msgstr ""
 
-#: ../../include/features.php:86
-msgid "Affinity Tool"
+#: ../../include/text.php:973 ../../include/text.php:978
+#: ../../include/conversation.php:243
+msgid "poked"
 msgstr ""
 
-#: ../../include/features.php:86
-msgid "Filter stream activity by depth of relationships"
+#: ../../include/text.php:979
+msgid "ping"
 msgstr ""
 
-#: ../../include/features.php:87
-msgid "Connection Filtering"
+#: ../../include/text.php:979
+msgid "pinged"
 msgstr ""
 
-#: ../../include/features.php:87
-msgid "Filter incoming posts from connections based on keywords/content"
+#: ../../include/text.php:980
+msgid "prod"
 msgstr ""
 
-#: ../../include/features.php:88
-msgid "Suggest Channels"
+#: ../../include/text.php:980
+msgid "prodded"
 msgstr ""
 
-#: ../../include/features.php:88
-msgid "Show channel suggestions"
+#: ../../include/text.php:981
+msgid "slap"
 msgstr ""
 
-#: ../../include/features.php:93
-msgid "Post/Comment Tools"
+#: ../../include/text.php:981
+msgid "slapped"
 msgstr ""
 
-#: ../../include/features.php:94
-msgid "Community Tagging"
+#: ../../include/text.php:982
+msgid "finger"
 msgstr ""
 
-#: ../../include/features.php:94
-msgid "Ability to tag existing posts"
+#: ../../include/text.php:982
+msgid "fingered"
 msgstr ""
 
-#: ../../include/features.php:95
-msgid "Post Categories"
+#: ../../include/text.php:983
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/features.php:95
-msgid "Add categories to your posts"
+#: ../../include/text.php:983
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/features.php:96
-msgid "Ability to file posts under folders"
+#: ../../include/text.php:995
+msgid "happy"
 msgstr ""
 
-#: ../../include/features.php:97
-msgid "Dislike Posts"
+#: ../../include/text.php:996
+msgid "sad"
 msgstr ""
 
-#: ../../include/features.php:97
-msgid "Ability to dislike posts/comments"
+#: ../../include/text.php:997
+msgid "mellow"
 msgstr ""
 
-#: ../../include/features.php:98
-msgid "Star Posts"
+#: ../../include/text.php:998
+msgid "tired"
 msgstr ""
 
-#: ../../include/features.php:98
-msgid "Ability to mark special posts with a star indicator"
+#: ../../include/text.php:999
+msgid "perky"
 msgstr ""
 
-#: ../../include/features.php:99
-msgid "Tag Cloud"
+#: ../../include/text.php:1000
+msgid "angry"
 msgstr ""
 
-#: ../../include/features.php:99
-msgid "Provide a personal tag cloud on your channel page"
+#: ../../include/text.php:1001
+msgid "stupefied"
 msgstr ""
 
-#: ../../include/items.php:423 ../../index.php:193 ../../mod/dreport.php:6
-#: ../../mod/dreport.php:45 ../../mod/group.php:68
-#: ../../mod/import_items.php:108 ../../mod/like.php:280
-#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
-msgid "Permission denied"
+#: ../../include/text.php:1002
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/items.php:1138 ../../include/items.php:1184
-msgid "(Unknown)"
+#: ../../include/text.php:1003
+msgid "interested"
 msgstr ""
 
-#: ../../include/items.php:1384
-msgid "Visible to anybody on the internet."
+#: ../../include/text.php:1004
+msgid "bitter"
 msgstr ""
 
-#: ../../include/items.php:1386
-msgid "Visible to you only."
+#: ../../include/text.php:1005
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/items.php:1388
-msgid "Visible to anybody in this network."
+#: ../../include/text.php:1006
+msgid "alive"
 msgstr ""
 
-#: ../../include/items.php:1390
-msgid "Visible to anybody authenticated."
+#: ../../include/text.php:1007
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/items.php:1392
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/text.php:1008
+msgid "anxious"
 msgstr ""
 
-#: ../../include/items.php:1394
-msgid "Visible to all connections."
+#: ../../include/text.php:1009
+msgid "cranky"
 msgstr ""
 
-#: ../../include/items.php:1396
-msgid "Visible to approved connections."
+#: ../../include/text.php:1010
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/items.php:1398
-msgid "Visible to specific connections."
+#: ../../include/text.php:1011
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/items.php:4433 ../../mod/display.php:36
-#: ../../mod/filestorage.php:27 ../../mod/admin.php:141
-#: ../../mod/admin.php:1189 ../../mod/admin.php:1434 ../../mod/thing.php:85
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
+#: ../../include/text.php:1012
+msgid "depressed"
 msgstr ""
 
-#: ../../include/items.php:4969 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Privacy group not found."
+#: ../../include/text.php:1013
+msgid "motivated"
 msgstr ""
 
-#: ../../include/items.php:4985
-msgid "Privacy group is empty."
+#: ../../include/text.php:1014
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/items.php:4992
-#, php-format
-msgid "Privacy group: %s"
+#: ../../include/text.php:1015
+msgid "surprised"
 msgstr ""
 
-#: ../../include/items.php:5002 ../../mod/connedit.php:694
-#, php-format
-msgid "Connection: %s"
+#: ../../include/text.php:1191
+msgid "May"
 msgstr ""
 
-#: ../../include/items.php:5004
-msgid "Connection not found."
+#: ../../include/text.php:1268 ../../include/text.php:1272
+msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../include/items.php:5430 ../../mod/cover_photo.php:229
-msgid "female"
+#: ../../include/text.php:1274
+msgid "unknown"
 msgstr ""
 
-#: ../../include/items.php:5431 ../../mod/cover_photo.php:230
-#, php-format
-msgid "%1$s updated her %2$s"
+#: ../../include/text.php:1310
+msgid "remove category"
 msgstr ""
 
-#: ../../include/items.php:5432 ../../mod/cover_photo.php:231
-msgid "male"
+#: ../../include/text.php:1387
+msgid "remove from file"
 msgstr ""
 
-#: ../../include/items.php:5433 ../../mod/cover_photo.php:232
-#, php-format
-msgid "%1$s updated his %2$s"
+#: ../../include/text.php:1529 ../../include/text.php:1540
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/items.php:5435 ../../mod/cover_photo.php:234
-#, php-format
-msgid "%1$s updated their %2$s"
+#: ../../include/text.php:1724 ../../mod/events.php:630 ../../mod/cal.php:302
+msgid "Link to Source"
 msgstr ""
 
-#: ../../include/items.php:5437
-msgid "profile photo"
+#: ../../include/text.php:1745 ../../include/text.php:1817
+msgid "default"
 msgstr ""
 
-#: ../../include/widgets.php:103
-msgid "System"
+#: ../../include/text.php:1753
+msgid "Page layout"
 msgstr ""
 
-#: ../../include/widgets.php:106
-msgid "Create Personal App"
+#: ../../include/text.php:1753
+msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/widgets.php:107
-msgid "Edit Personal App"
+#: ../../include/text.php:1795
+msgid "Page content type"
 msgstr ""
 
-#: ../../include/widgets.php:149 ../../mod/suggest.php:54
-msgid "Ignore/Hide"
+#: ../../include/text.php:1829
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/widgets.php:154
-msgid "Suggestions"
+#: ../../include/text.php:1948 ../../include/conversation.php:120
+#: ../../mod/like.php:361 ../../mod/subthread.php:83 ../../mod/tagger.php:43
+msgid "photo"
 msgstr ""
 
-#: ../../include/widgets.php:155
-msgid "See more..."
+#: ../../include/text.php:1954 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "status"
 msgstr ""
 
-#: ../../include/widgets.php:176
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+#: ../../include/text.php:1956 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
 msgstr ""
 
-#: ../../include/widgets.php:182
-msgid "Add New Connection"
+#: ../../include/text.php:1961
+msgid "activity"
 msgstr ""
 
-#: ../../include/widgets.php:183
-msgid "Enter channel address"
+#: ../../include/text.php:2256
+msgid "Design Tools"
 msgstr ""
 
-#: ../../include/widgets.php:184
-msgid "Examples: bob@example.com, https://example.com/barbara"
+#: ../../include/text.php:2259 ../../mod/blocks.php:147
+msgid "Blocks"
 msgstr ""
 
-#: ../../include/widgets.php:200
-msgid "Notes"
+#: ../../include/text.php:2260 ../../mod/menu.php:103
+msgid "Menus"
 msgstr ""
 
-#: ../../include/widgets.php:202 ../../include/text.php:886
-#: ../../include/text.php:898 ../../mod/filer.php:49 ../../mod/admin.php:1666
-#: ../../mod/admin.php:1686 ../../mod/rbmark.php:28 ../../mod/rbmark.php:100
-msgid "Save"
+#: ../../include/text.php:2261 ../../mod/layouts.php:174
+msgid "Layouts"
 msgstr ""
 
-#: ../../include/widgets.php:276
-msgid "Remove term"
+#: ../../include/text.php:2262
+msgid "Pages"
 msgstr ""
 
-#: ../../include/widgets.php:359
-msgid "Archives"
+#: ../../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/widgets.php:449 ../../mod/connedit.php:582
-msgid "Me"
+#: ../../include/group.php:232
+msgid "Add new connections to this privacy group"
 msgstr ""
 
-#: ../../include/widgets.php:450 ../../mod/connedit.php:583
-msgid "Family"
+#: ../../include/group.php:251 ../../mod/admin.php:998
+msgid "All Channels"
 msgstr ""
 
-#: ../../include/widgets.php:452 ../../mod/connedit.php:585
-msgid "Acquaintances"
+#: ../../include/group.php:273
+msgid "edit"
 msgstr ""
 
-#: ../../include/widgets.php:453 ../../mod/connections.php:88
-#: ../../mod/connections.php:103 ../../mod/connedit.php:586
-msgid "All"
+#: ../../include/group.php:296
+msgid "Edit group"
 msgstr ""
 
-#: ../../include/widgets.php:472
-msgid "Refresh"
+#: ../../include/group.php:297
+msgid "Add privacy group"
 msgstr ""
 
-#: ../../include/widgets.php:506
-msgid "Account settings"
+#: ../../include/group.php:298
+msgid "Channels not in any privacy group"
 msgstr ""
 
-#: ../../include/widgets.php:512
-msgid "Channel settings"
+#: ../../include/enotify.php:96
+#, php-format
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../include/widgets.php:521
-msgid "Additional features"
+#: ../../include/enotify.php:100
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/widgets.php:528
-msgid "Feature/Addon settings"
+#: ../../include/enotify.php:102
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr ""
 
-#: ../../include/widgets.php:534
-msgid "Display settings"
+#: ../../include/enotify.php:103
+#, php-format
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../include/widgets.php:540
-msgid "Connected apps"
+#: ../../include/enotify.php:103
+msgid "a private message"
 msgstr ""
 
-#: ../../include/widgets.php:548
-msgid "Export channel"
+#: ../../include/enotify.php:104
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/widgets.php:556 ../../mod/connedit.php:694
-msgid "Connection Default Permissions"
+#: ../../include/enotify.php:160
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/widgets.php:564
-msgid "Premium Channel Settings"
+#: ../../include/enotify.php:168
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../include/widgets.php:594
-msgid "Private Mail Menu"
+#: ../../include/enotify.php:177
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/widgets.php:596
-msgid "Combined View"
+#: ../../include/enotify.php:188
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/widgets.php:630 ../../include/widgets.php:642
-msgid "Conversations"
+#: ../../include/enotify.php:189
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/widgets.php:634
-msgid "Received Messages"
+#: ../../include/enotify.php:192 ../../include/enotify.php:207
+#: ../../include/enotify.php:233 ../../include/enotify.php:251
+#: ../../include/enotify.php:265
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/widgets.php:638
-msgid "Sent Messages"
+#: ../../include/enotify.php:198
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/widgets.php:652
-msgid "No messages."
+#: ../../include/enotify.php:200
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../include/widgets.php:670
-msgid "Delete conversation"
+#: ../../include/enotify.php:202
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../include/widgets.php:696
-msgid "Events Menu"
+#: ../../include/enotify.php:226
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/widgets.php:697
-msgid "Day View"
+#: ../../include/enotify.php:227
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../include/widgets.php:698
-msgid "Week View"
+#: ../../include/enotify.php:228
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../include/widgets.php:699
-msgid "Month View"
+#: ../../include/enotify.php:240
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/widgets.php:700 ../../mod/events.php:654
-msgid "Export"
+#: ../../include/enotify.php:241
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
 msgstr ""
 
-#: ../../include/widgets.php:701 ../../mod/events.php:657
-msgid "Import"
+#: ../../include/enotify.php:242
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../include/widgets.php:711
-msgid "Events Tools"
+#: ../../include/enotify.php:258
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/widgets.php:712
-msgid "Export Calendar"
+#: ../../include/enotify.php:259
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr ""
 
-#: ../../include/widgets.php:713
-msgid "Import Calendar"
+#: ../../include/enotify.php:260
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
-#: ../../include/widgets.php:787
-msgid "Chat Rooms"
+#: ../../include/enotify.php:272
+msgid "[Hubzilla:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/widgets.php:807
-msgid "Bookmarked Chatrooms"
+#: ../../include/enotify.php:273
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/widgets.php:827
-msgid "Suggested Chatrooms"
+#: ../../include/enotify.php:274
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr ""
 
-#: ../../include/widgets.php:972 ../../include/widgets.php:1062
-msgid "photo/image"
+#: ../../include/enotify.php:278 ../../include/enotify.php:297
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/widgets.php:1156
-msgid "Rating Tools"
+#: ../../include/enotify.php:280
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: ../../include/widgets.php:1160 ../../include/widgets.php:1162
-msgid "Rate Me"
+#: ../../include/enotify.php:287
+msgid "[Hubzilla:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/widgets.php:1165
-msgid "View Ratings"
+#: ../../include/enotify.php:288
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/widgets.php:1176
-msgid "Public Hubs"
+#: ../../include/enotify.php:289
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
 msgstr ""
 
-#: ../../include/widgets.php:1224
-msgid "Forums"
+#: ../../include/enotify.php:295
+msgid "Name:"
 msgstr ""
 
-#: ../../include/widgets.php:1253
-msgid "Tasks"
+#: ../../include/enotify.php:296
+msgid "Photo:"
 msgstr ""
 
-#: ../../include/widgets.php:1262
-msgid "Documentation"
+#: ../../include/enotify.php:299
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/widgets.php:1264
-msgid "Project/Site Information"
+#: ../../include/enotify.php:514
+msgid "[Hubzilla:Notify]"
 msgstr ""
 
-#: ../../include/widgets.php:1265
-msgid "For Members"
+#: ../../include/identity.php:32
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/widgets.php:1266
-msgid "For Administrators"
+#: ../../include/identity.php:66
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/widgets.php:1267
-msgid "For Developers"
+#: ../../include/identity.php:69
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/widgets.php:1292 ../../mod/admin.php:456
-msgid "Site"
+#: ../../include/identity.php:181
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/widgets.php:1293
-msgid "Accounts"
+#: ../../include/identity.php:193
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/widgets.php:1294 ../../mod/admin.php:1149
-msgid "Channels"
+#: ../../include/identity.php:207
+msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../include/widgets.php:1295 ../../mod/admin.php:710
-msgid "Security"
+#: ../../include/identity.php:212
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/widgets.php:1297 ../../mod/admin.php:1264
-#: ../../mod/admin.php:1325
-msgid "Plugins"
+#: ../../include/identity.php:288
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/widgets.php:1298 ../../mod/admin.php:1486
-#: ../../mod/admin.php:1520
-msgid "Themes"
+#: ../../include/identity.php:346
+msgid "Default Profile"
 msgstr ""
 
-#: ../../include/widgets.php:1299
-msgid "Inspect queue"
+#: ../../include/identity.php:772
+msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/widgets.php:1300
-msgid "Profile Config"
+#: ../../include/identity.php:818 ../../mod/achievements.php:11
+#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
+#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
+#: ../../mod/profile.php:16 ../../mod/webpages.php:29
+msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/widgets.php:1301
-msgid "DB updates"
+#: ../../include/identity.php:967 ../../mod/profiles.php:782
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/widgets.php:1319 ../../include/widgets.php:1325
-#: ../../mod/admin.php:1605
-msgid "Logs"
+#: ../../include/identity.php:973
+msgid "Profiles"
 msgstr ""
 
-#: ../../include/widgets.php:1324
-msgid "Plugin Features"
+#: ../../include/identity.php:973
+msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/widgets.php:1326
-msgid "User registrations waiting for confirmation"
+#: ../../include/identity.php:974 ../../mod/profiles.php:783
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/widgets.php:1404 ../../mod/photos.php:760
-#: ../../mod/photos.php:1300
-msgid "View Photo"
+#: ../../include/identity.php:989 ../../mod/profiles.php:794
+msgid "Profile Image"
 msgstr ""
 
-#: ../../include/widgets.php:1421 ../../mod/photos.php:791
-msgid "Edit Album"
+#: ../../include/identity.php:992
+msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/text.php:394
-msgid "prev"
+#: ../../include/identity.php:993 ../../mod/profiles.php:677
+#: ../../mod/profiles.php:798
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/text.php:396
-msgid "first"
+#: ../../include/identity.php:1009 ../../include/identity.php:1248
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/text.php:425
-msgid "last"
+#: ../../include/identity.php:1010 ../../include/identity.php:1292
+msgid "Status:"
 msgstr ""
 
-#: ../../include/text.php:428
-msgid "next"
+#: ../../include/identity.php:1011 ../../include/identity.php:1303
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/text.php:438
-msgid "older"
+#: ../../include/identity.php:1012
+msgid "Online Now"
 msgstr ""
 
-#: ../../include/text.php:440
-msgid "newer"
+#: ../../include/identity.php:1099 ../../include/identity.php:1177
+#: ../../mod/ping.php:318
+msgid "g A l F d"
 msgstr ""
 
-#: ../../include/text.php:803
-msgid "No connections"
+#: ../../include/identity.php:1100 ../../include/identity.php:1178
+msgid "F d"
 msgstr ""
 
-#: ../../include/text.php:828
-#, php-format
-msgid "View all %s connections"
+#: ../../include/identity.php:1145 ../../include/identity.php:1217
+#: ../../mod/ping.php:341
+msgid "[today]"
 msgstr ""
 
-#: ../../include/text.php:973 ../../include/text.php:978
-msgid "poke"
+#: ../../include/identity.php:1156
+msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/text.php:979
-msgid "ping"
+#: ../../include/identity.php:1157
+msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/text.php:979
-msgid "pinged"
+#: ../../include/identity.php:1210
+msgid "[No description]"
 msgstr ""
 
-#: ../../include/text.php:980
-msgid "prod"
+#: ../../include/identity.php:1228
+msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/text.php:980
-msgid "prodded"
+#: ../../include/identity.php:1229
+msgid "Events this week:"
 msgstr ""
 
-#: ../../include/text.php:981
-msgid "slap"
+#: ../../include/identity.php:1246 ../../mod/settings.php:1047
+msgid "Full Name:"
 msgstr ""
 
-#: ../../include/text.php:981
-msgid "slapped"
+#: ../../include/identity.php:1253
+msgid "Like this channel"
 msgstr ""
 
-#: ../../include/text.php:982
-msgid "finger"
+#: ../../include/identity.php:1277
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/text.php:982
-msgid "fingered"
+#: ../../include/identity.php:1278
+msgid "j F"
 msgstr ""
 
-#: ../../include/text.php:983
-msgid "rebuff"
+#: ../../include/identity.php:1285
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/text.php:983
-msgid "rebuffed"
+#: ../../include/identity.php:1289 ../../mod/directory.php:302
+msgid "Age:"
 msgstr ""
-
-#: ../../include/text.php:995
-msgid "happy"
+
+#: ../../include/identity.php:1298
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/text.php:996
-msgid "sad"
+#: ../../include/identity.php:1301 ../../mod/profiles.php:699
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/text.php:997
-msgid "mellow"
+#: ../../include/identity.php:1305 ../../mod/directory.php:318
+#: ../../mod/profiles.php:701
+msgid "Hometown:"
 msgstr ""
 
-#: ../../include/text.php:998
-msgid "tired"
+#: ../../include/identity.php:1307
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/text.php:999
-msgid "perky"
+#: ../../include/identity.php:1309 ../../mod/profiles.php:702
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/text.php:1000
-msgid "angry"
+#: ../../include/identity.php:1311
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/text.php:1001
-msgid "stupefied"
+#: ../../include/identity.php:1313 ../../mod/directory.php:320
+msgid "About:"
 msgstr ""
 
-#: ../../include/text.php:1002
-msgid "puzzled"
+#: ../../include/identity.php:1315
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/text.php:1003
-msgid "interested"
+#: ../../include/identity.php:1317 ../../mod/profiles.php:705
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/text.php:1004
-msgid "bitter"
+#: ../../include/identity.php:1319 ../../mod/profiles.php:706
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/text.php:1005
-msgid "cheerful"
+#: ../../include/identity.php:1321
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/text.php:1006
-msgid "alive"
+#: ../../include/identity.php:1323
+msgid "My other channels:"
 msgstr ""
 
-#: ../../include/text.php:1007
-msgid "annoyed"
+#: ../../include/identity.php:1325
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/text.php:1008
-msgid "anxious"
+#: ../../include/identity.php:1327
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/text.php:1009
-msgid "cranky"
+#: ../../include/identity.php:1329
+msgid "Television:"
 msgstr ""
 
-#: ../../include/text.php:1010
-msgid "disturbed"
+#: ../../include/identity.php:1331
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/text.php:1011
-msgid "frustrated"
+#: ../../include/identity.php:1333
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/text.php:1012
-msgid "depressed"
+#: ../../include/identity.php:1335
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/text.php:1013
-msgid "motivated"
+#: ../../include/identity.php:1337
+msgid "School/education:"
 msgstr ""
 
-#: ../../include/text.php:1014
-msgid "relaxed"
+#: ../../include/identity.php:1361
+msgid "Like this thing"
 msgstr ""
 
-#: ../../include/text.php:1015
-msgid "surprised"
+#: ../../include/identity.php:1770 ../../mod/cover_photo.php:236
+msgid "cover photo"
 msgstr ""
 
-#: ../../include/text.php:1191
-msgid "May"
+#: ../../include/oembed.php:267
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/text.php:1268 ../../include/text.php:1272
-msgid "Unknown Attachment"
+#: ../../include/oembed.php:276
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/text.php:1274
-msgid "unknown"
+#: ../../include/conversation.php:126 ../../mod/like.php:113
+msgid "channel"
 msgstr ""
 
-#: ../../include/text.php:1310
-msgid "remove category"
+#: ../../include/conversation.php:164 ../../mod/like.php:410
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../include/text.php:1387
-msgid "remove from file"
+#: ../../include/conversation.php:167 ../../mod/like.php:412
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../include/text.php:1529 ../../include/text.php:1540
-msgid "Click to open/close"
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/text.php:1724 ../../mod/events.php:623
-msgid "Link to Source"
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/text.php:1745 ../../include/text.php:1817
-msgid "default"
+#: ../../include/conversation.php:260 ../../mod/mood.php:63
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../include/text.php:1753
-msgid "Page layout"
+#: ../../include/conversation.php:574 ../../mod/photos.php:1074
+msgctxt "title"
+msgid "Likes"
 msgstr ""
 
-#: ../../include/text.php:1753
-msgid "You can create your own with the layouts tool"
+#: ../../include/conversation.php:574 ../../mod/photos.php:1074
+msgctxt "title"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../include/text.php:1795
-msgid "Page content type"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1075
+msgctxt "title"
+msgid "Agree"
 msgstr ""
 
-#: ../../include/text.php:1829
-msgid "Select an alternate language"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1075
+msgctxt "title"
+msgid "Disagree"
 msgstr ""
 
-#: ../../include/text.php:1961
-msgid "activity"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1075
+msgctxt "title"
+msgid "Abstain"
 msgstr ""
 
-#: ../../include/text.php:2256
-msgid "Design Tools"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1076
+msgctxt "title"
+msgid "Attending"
 msgstr ""
 
-#: ../../include/text.php:2259 ../../mod/blocks.php:147
-msgid "Blocks"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1076
+msgctxt "title"
+msgid "Not attending"
 msgstr ""
 
-#: ../../include/text.php:2260 ../../mod/menu.php:103
-msgid "Menus"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1076
+msgctxt "title"
+msgid "Might attend"
 msgstr ""
 
-#: ../../include/text.php:2261 ../../mod/layouts.php:174
-msgid "Layouts"
+#: ../../include/conversation.php:656 ../../include/ItemObject.php:126
+msgid "Select"
 msgstr ""
 
-#: ../../include/text.php:2262
-msgid "Pages"
+#: ../../include/conversation.php:664 ../../include/ItemObject.php:89
+msgid "Private Message"
 msgstr ""
 
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../include/conversation.php:671 ../../include/ItemObject.php:227
+msgid "Message signature validated"
 msgstr ""
 
-#: ../../include/enotify.php:100
-#, php-format
-msgid "[Hubzilla:Notify] New mail received at %s"
+#: ../../include/conversation.php:672 ../../include/ItemObject.php:228
+msgid "Message signature incorrect"
 msgstr ""
 
-#: ../../include/enotify.php:102
+#: ../../include/conversation.php:691
 #, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../include/conversation.php:710
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/enotify.php:103
-msgid "a private message"
+#: ../../include/conversation.php:711
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/enotify.php:104
+#: ../../include/conversation.php:719 ../../include/ItemObject.php:334
 #, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+msgid "from %s"
 msgstr ""
 
-#: ../../include/enotify.php:160
+#: ../../include/conversation.php:722 ../../include/ItemObject.php:337
 #, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/enotify.php:168
+#: ../../include/conversation.php:723 ../../include/ItemObject.php:338
 #, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/enotify.php:177
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../include/conversation.php:738
+msgid "View in context"
 msgstr ""
 
-#: ../../include/enotify.php:188
-#, php-format
-msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../include/conversation.php:740 ../../include/conversation.php:1237
+#: ../../include/ItemObject.php:389 ../../mod/editblock.php:150
+#: ../../mod/editlayout.php:148 ../../mod/editpost.php:129
+#: ../../mod/editwebpage.php:190 ../../mod/photos.php:1040
+msgid "Please wait"
 msgstr ""
 
-#: ../../include/enotify.php:189
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../include/conversation.php:850
+msgid "remove"
 msgstr ""
 
-#: ../../include/enotify.php:192 ../../include/enotify.php:207
-#: ../../include/enotify.php:233 ../../include/enotify.php:251
-#: ../../include/enotify.php:265
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/enotify.php:198
-#, php-format
-msgid "[Hubzilla:Notify] %s posted to your profile wall"
+#: ../../include/conversation.php:953
+msgid "View Source"
 msgstr ""
 
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../include/conversation.php:954
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/enotify.php:202
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../include/conversation.php:955
+msgid "Unfollow Thread"
 msgstr ""
 
-#: ../../include/enotify.php:226
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged you"
+#: ../../include/conversation.php:960
+msgid "Activity/Posts"
 msgstr ""
 
-#: ../../include/enotify.php:227
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../include/conversation.php:962
+msgid "Edit Connection"
 msgstr ""
 
-#: ../../include/enotify.php:228
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+#: ../../include/conversation.php:963
+msgid "Message"
 msgstr ""
 
-#: ../../include/enotify.php:240
-#, php-format
-msgid "[Hubzilla:Notify] %1$s poked you"
+#: ../../include/conversation.php:964 ../../mod/pubsites.php:27
+#: ../../mod/ratings.php:99
+msgid "Ratings"
 msgstr ""
 
-#: ../../include/enotify.php:241
+#: ../../include/conversation.php:1080
 #, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/enotify.php:242
+#: ../../include/conversation.php:1080
 #, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/enotify.php:258
+#: ../../include/conversation.php:1084
 #, php-format
-msgid "[Hubzilla:Notify] %s tagged your post"
-msgstr ""
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/enotify.php:259
+#: ../../include/conversation.php:1086
 #, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1092
+msgid "and"
 msgstr ""
 
-#: ../../include/enotify.php:260
+#: ../../include/conversation.php:1095
 #, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr ""
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/enotify.php:272
-msgid "[Hubzilla:Notify] Introduction received"
+#: ../../include/conversation.php:1096
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/enotify.php:273
+#: ../../include/conversation.php:1096
 #, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/enotify.php:274
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+#: ../../include/conversation.php:1164
+msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/enotify.php:278 ../../include/enotify.php:297
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/conversation.php:1165 ../../mod/mail.php:202
+#: ../../mod/mail.php:316
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../include/enotify.php:280
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
+#: ../../include/conversation.php:1166
+msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/enotify.php:287
-msgid "[Hubzilla:Notify] Friend suggestion received"
+#: ../../include/conversation.php:1167
+msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/enotify.php:288
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+#: ../../include/conversation.php:1168
+msgid "Tag term:"
 msgstr ""
 
-#: ../../include/enotify.php:289
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+#: ../../include/conversation.php:1169 ../../mod/filer.php:48
+msgid "Save to Folder:"
 msgstr ""
 
-#: ../../include/enotify.php:295
-msgid "Name:"
+#: ../../include/conversation.php:1170
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/enotify.php:296
-msgid "Photo:"
+#: ../../include/conversation.php:1171 ../../mod/editpost.php:56
+#: ../../mod/mail.php:203 ../../mod/mail.php:317
+msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../include/enotify.php:299
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../include/conversation.php:1202 ../../mod/blocks.php:154
+#: ../../mod/layouts.php:184 ../../mod/photos.php:1039
+#: ../../mod/webpages.php:184
+msgid "Share"
 msgstr ""
 
-#: ../../include/enotify.php:514
-msgid "[Hubzilla:Notify]"
+#: ../../include/conversation.php:1204
+msgid "Page link name"
 msgstr ""
 
-#: ../../include/identity.php:32
-msgid "Unable to obtain identity information from database"
+#: ../../include/conversation.php:1207
+msgid "Post as"
 msgstr ""
 
-#: ../../include/identity.php:66
-msgid "Empty name"
+#: ../../include/conversation.php:1209 ../../include/ItemObject.php:704
+#: ../../mod/editblock.php:136 ../../mod/editlayout.php:135
+#: ../../mod/editpost.php:113 ../../mod/editwebpage.php:177
+msgid "Bold"
 msgstr ""
 
-#: ../../include/identity.php:69
-msgid "Name too long"
+#: ../../include/conversation.php:1210 ../../include/ItemObject.php:705
+#: ../../mod/editblock.php:137 ../../mod/editlayout.php:136
+#: ../../mod/editpost.php:114 ../../mod/editwebpage.php:178
+msgid "Italic"
 msgstr ""
 
-#: ../../include/identity.php:181
-msgid "No account identifier"
+#: ../../include/conversation.php:1211 ../../include/ItemObject.php:706
+#: ../../mod/editblock.php:138 ../../mod/editlayout.php:137
+#: ../../mod/editpost.php:115 ../../mod/editwebpage.php:179
+msgid "Underline"
 msgstr ""
 
-#: ../../include/identity.php:193
-msgid "Nickname is required."
+#: ../../include/conversation.php:1212 ../../include/ItemObject.php:707
+#: ../../mod/editblock.php:139 ../../mod/editlayout.php:138
+#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:180
+msgid "Quote"
 msgstr ""
 
-#: ../../include/identity.php:207
-msgid "Reserved nickname. Please choose another."
+#: ../../include/conversation.php:1213 ../../include/ItemObject.php:708
+#: ../../mod/editblock.php:140 ../../mod/editlayout.php:139
+#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:181
+msgid "Code"
 msgstr ""
 
-#: ../../include/identity.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+#: ../../include/conversation.php:1214 ../../mod/editblock.php:142
+#: ../../mod/editlayout.php:140 ../../mod/editpost.php:118
+#: ../../mod/editwebpage.php:182
+msgid "Upload photo"
 msgstr ""
 
-#: ../../include/identity.php:288
-msgid "Unable to retrieve created identity"
+#: ../../include/conversation.php:1215
+msgid "upload photo"
 msgstr ""
 
-#: ../../include/identity.php:346
-msgid "Default Profile"
+#: ../../include/conversation.php:1216 ../../mod/editblock.php:143
+#: ../../mod/editlayout.php:141 ../../mod/editpost.php:119
+#: ../../mod/editwebpage.php:183 ../../mod/mail.php:248 ../../mod/mail.php:378
+msgid "Attach file"
 msgstr ""
 
-#: ../../include/identity.php:772
-msgid "Requested channel is not available."
+#: ../../include/conversation.php:1217
+msgid "attach file"
 msgstr ""
 
-#: ../../include/identity.php:818 ../../mod/achievements.php:11
-#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/editblock.php:29
-#: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
-#: ../../mod/profile.php:16 ../../mod/webpages.php:29
-msgid "Requested profile is not available."
+#: ../../include/conversation.php:1218 ../../mod/editblock.php:144
+#: ../../mod/editlayout.php:142 ../../mod/editpost.php:120
+#: ../../mod/editwebpage.php:184 ../../mod/mail.php:249 ../../mod/mail.php:379
+msgid "Insert web link"
 msgstr ""
 
-#: ../../include/identity.php:967 ../../mod/profiles.php:782
-msgid "Change profile photo"
+#: ../../include/conversation.php:1219
+msgid "web link"
 msgstr ""
 
-#: ../../include/identity.php:973
-msgid "Profiles"
+#: ../../include/conversation.php:1220
+msgid "Insert video link"
 msgstr ""
 
-#: ../../include/identity.php:973
-msgid "Manage/edit profiles"
+#: ../../include/conversation.php:1221
+msgid "video link"
 msgstr ""
 
-#: ../../include/identity.php:974 ../../mod/profiles.php:783
-msgid "Create New Profile"
+#: ../../include/conversation.php:1222
+msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/identity.php:989 ../../mod/profiles.php:794
-msgid "Profile Image"
+#: ../../include/conversation.php:1223
+msgid "audio link"
 msgstr ""
 
-#: ../../include/identity.php:992
-msgid "visible to everybody"
+#: ../../include/conversation.php:1224 ../../mod/editblock.php:148
+#: ../../mod/editlayout.php:146 ../../mod/editpost.php:124
+#: ../../mod/editwebpage.php:188
+msgid "Set your location"
 msgstr ""
 
-#: ../../include/identity.php:993 ../../mod/profiles.php:677
-#: ../../mod/profiles.php:798
-msgid "Edit visibility"
+#: ../../include/conversation.php:1225
+msgid "set location"
 msgstr ""
 
-#: ../../include/identity.php:1009 ../../include/identity.php:1252
-msgid "Gender:"
+#: ../../include/conversation.php:1226 ../../mod/editpost.php:126
+msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/identity.php:1010 ../../include/identity.php:1296
-msgid "Status:"
+#: ../../include/conversation.php:1229 ../../mod/editblock.php:149
+#: ../../mod/editlayout.php:147 ../../mod/editpost.php:125
+#: ../../mod/editwebpage.php:189
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/identity.php:1011 ../../include/identity.php:1307
-msgid "Homepage:"
+#: ../../include/conversation.php:1230
+msgid "clear location"
 msgstr ""
 
-#: ../../include/identity.php:1012
-msgid "Online Now"
+#: ../../include/conversation.php:1232 ../../mod/editblock.php:162
+#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
+msgid "Title (optional)"
 msgstr ""
 
-#: ../../include/identity.php:1099 ../../include/identity.php:1177
-#: ../../mod/ping.php:318
-msgid "g A l F d"
+#: ../../include/conversation.php:1236 ../../mod/editblock.php:165
+#: ../../mod/editlayout.php:163 ../../mod/editpost.php:143
+#: ../../mod/editwebpage.php:207
+msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/identity.php:1100 ../../include/identity.php:1178
-msgid "F d"
+#: ../../include/conversation.php:1238 ../../mod/editblock.php:151
+#: ../../mod/editlayout.php:149 ../../mod/editpost.php:130
+#: ../../mod/editwebpage.php:191 ../../mod/events.php:466
+msgid "Permission settings"
 msgstr ""
 
-#: ../../include/identity.php:1145 ../../include/identity.php:1217
-#: ../../mod/ping.php:341
-msgid "[today]"
+#: ../../include/conversation.php:1239
+msgid "permissions"
 msgstr ""
 
-#: ../../include/identity.php:1156
-msgid "Birthday Reminders"
+#: ../../include/conversation.php:1247 ../../mod/editblock.php:159
+#: ../../mod/editlayout.php:156 ../../mod/editpost.php:138
+#: ../../mod/editwebpage.php:200
+msgid "Public post"
 msgstr ""
 
-#: ../../include/identity.php:1157
-msgid "Birthdays this week:"
+#: ../../include/conversation.php:1249 ../../mod/editblock.php:166
+#: ../../mod/editlayout.php:164 ../../mod/editpost.php:144
+#: ../../mod/editwebpage.php:208
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/identity.php:1210
-msgid "[No description]"
+#: ../../include/conversation.php:1262 ../../mod/editblock.php:176
+#: ../../mod/editlayout.php:173 ../../mod/editpost.php:155
+#: ../../mod/editwebpage.php:217 ../../mod/mail.php:253 ../../mod/mail.php:383
+msgid "Set expiration date"
 msgstr ""
 
-#: ../../include/identity.php:1228
-msgid "Event Reminders"
+#: ../../include/conversation.php:1265
+msgid "Set publish date"
 msgstr ""
 
-#: ../../include/identity.php:1229
-msgid "Events this week:"
+#: ../../include/conversation.php:1267 ../../include/ItemObject.php:715
+#: ../../mod/editpost.php:157 ../../mod/mail.php:255 ../../mod/mail.php:385
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../include/identity.php:1250 ../../mod/settings.php:1047
-msgid "Full Name:"
+#: ../../include/conversation.php:1269 ../../mod/editpost.php:159
+msgid "OK"
 msgstr ""
 
-#: ../../include/identity.php:1257
-msgid "Like this channel"
+#: ../../include/conversation.php:1270 ../../mod/editpost.php:160
+#: ../../mod/fbrowser.php:77 ../../mod/fbrowser.php:112
+#: ../../mod/settings.php:598 ../../mod/settings.php:624
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+msgid "Cancel"
 msgstr ""
 
-#: ../../include/identity.php:1281
-msgid "j F, Y"
+#: ../../include/conversation.php:1513
+msgid "Discover"
 msgstr ""
 
-#: ../../include/identity.php:1282
-msgid "j F"
+#: ../../include/conversation.php:1516
+msgid "Imported public streams"
 msgstr ""
 
-#: ../../include/identity.php:1289
-msgid "Birthday:"
+#: ../../include/conversation.php:1521
+msgid "Commented Order"
 msgstr ""
 
-#: ../../include/identity.php:1293 ../../mod/directory.php:302
-msgid "Age:"
+#: ../../include/conversation.php:1524
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/identity.php:1302
-#, php-format
-msgid "for %1$d %2$s"
+#: ../../include/conversation.php:1528
+msgid "Posted Order"
 msgstr ""
 
-#: ../../include/identity.php:1305 ../../mod/profiles.php:699
-msgid "Sexual Preference:"
+#: ../../include/conversation.php:1531
+msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/identity.php:1309 ../../mod/directory.php:318
-#: ../../mod/profiles.php:701
-msgid "Hometown:"
+#: ../../include/conversation.php:1539
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/identity.php:1311
-msgid "Tags:"
+#: ../../include/conversation.php:1545 ../../mod/connections.php:72
+#: ../../mod/connections.php:82 ../../mod/menu.php:112
+msgid "New"
 msgstr ""
 
-#: ../../include/identity.php:1313 ../../mod/profiles.php:702
-msgid "Political Views:"
+#: ../../include/conversation.php:1548
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/identity.php:1315
-msgid "Religion:"
+#: ../../include/conversation.php:1554
+msgid "Starred"
 msgstr ""
 
-#: ../../include/identity.php:1317 ../../mod/directory.php:320
-msgid "About:"
+#: ../../include/conversation.php:1557
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/identity.php:1319
-msgid "Hobbies/Interests:"
+#: ../../include/conversation.php:1564
+msgid "Spam"
 msgstr ""
 
-#: ../../include/identity.php:1321 ../../mod/profiles.php:705
-msgid "Likes:"
+#: ../../include/conversation.php:1567
+msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/identity.php:1323 ../../mod/profiles.php:706
-msgid "Dislikes:"
+#: ../../include/conversation.php:1620 ../../mod/admin.php:1157
+msgid "Channel"
 msgstr ""
 
-#: ../../include/identity.php:1325
-msgid "Contact information and Social Networks:"
+#: ../../include/conversation.php:1623
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/identity.php:1327
-msgid "My other channels:"
+#: ../../include/conversation.php:1632
+msgid "About"
 msgstr ""
 
-#: ../../include/identity.php:1329
-msgid "Musical interests:"
+#: ../../include/conversation.php:1635
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/identity.php:1331
-msgid "Books, literature:"
+#: ../../include/conversation.php:1651
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/identity.php:1333
-msgid "Television:"
+#: ../../include/conversation.php:1672 ../../include/conversation.php:1675
+msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/identity.php:1335
-msgid "Film/dance/culture/entertainment:"
+#: ../../include/conversation.php:1688
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/identity.php:1337
-msgid "Love/Romance:"
+#: ../../include/conversation.php:1698
+msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/identity.php:1339
-msgid "Work/employment:"
+#: ../../include/conversation.php:1727 ../../include/ItemObject.php:175
+#: ../../include/ItemObject.php:187 ../../mod/photos.php:1093
+#: ../../mod/photos.php:1105
+msgid "View all"
 msgstr ""
 
-#: ../../include/identity.php:1341
-msgid "School/education:"
-msgstr ""
+#: ../../include/conversation.php:1754 ../../include/ItemObject.php:184
+#: ../../mod/photos.php:1102
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/identity.php:1361
-msgid "Like this thing"
-msgstr ""
+#: ../../include/conversation.php:1757
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/identity.php:1769 ../../mod/cover_photo.php:236
-msgid "cover photo"
-msgstr ""
+#: ../../include/conversation.php:1760
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/oembed.php:267
-msgid "Embedded content"
-msgstr ""
+#: ../../include/conversation.php:1763
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/oembed.php:276
-msgid "Embedding disabled"
-msgstr ""
+#: ../../include/conversation.php:1766
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1769
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1772
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../../include/ItemObject.php:130
 msgid "Save to Folder"
@@ -4301,6 +4206,106 @@ msgstr ""
 msgid "Custom/Expert Mode"
 msgstr ""
 
+#: ../../include/items.php:423 ../../index.php:179 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/group.php:68
+#: ../../mod/import_items.php:108 ../../mod/like.php:280
+#: ../../mod/profperm.php:23 ../../mod/subthread.php:58
+msgid "Permission denied"
+msgstr ""
+
+#: ../../include/items.php:1138 ../../include/items.php:1184
+msgid "(Unknown)"
+msgstr ""
+
+#: ../../include/items.php:1384
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1386
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1388
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1390
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1392
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr ""
+
+#: ../../include/items.php:1394
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1396
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1398
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:4496 ../../mod/display.php:36
+#: ../../mod/filestorage.php:27 ../../mod/admin.php:141
+#: ../../mod/admin.php:1189 ../../mod/admin.php:1434 ../../mod/thing.php:85
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
+msgstr ""
+
+#: ../../include/items.php:5032 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Privacy group not found."
+msgstr ""
+
+#: ../../include/items.php:5048
+msgid "Privacy group is empty."
+msgstr ""
+
+#: ../../include/items.php:5055
+#, php-format
+msgid "Privacy group: %s"
+msgstr ""
+
+#: ../../include/items.php:5065 ../../mod/connedit.php:694
+#, php-format
+msgid "Connection: %s"
+msgstr ""
+
+#: ../../include/items.php:5067
+msgid "Connection not found."
+msgstr ""
+
+#: ../../include/items.php:5493 ../../mod/cover_photo.php:229
+msgid "female"
+msgstr ""
+
+#: ../../include/items.php:5494 ../../mod/cover_photo.php:230
+#, php-format
+msgid "%1$s updated her %2$s"
+msgstr ""
+
+#: ../../include/items.php:5495 ../../mod/cover_photo.php:231
+msgid "male"
+msgstr ""
+
+#: ../../include/items.php:5496 ../../mod/cover_photo.php:232
+#, php-format
+msgid "%1$s updated his %2$s"
+msgstr ""
+
+#: ../../include/items.php:5498 ../../mod/cover_photo.php:234
+#, php-format
+msgid "%1$s updated their %2$s"
+msgstr ""
+
+#: ../../include/items.php:5500
+msgid "profile photo"
+msgstr ""
+
 #: ../../mod/achievements.php:34
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
@@ -4359,7 +4364,7 @@ msgstr ""
 msgid "Location (URL) of app"
 msgstr ""
 
-#: ../../mod/appman.php:93 ../../mod/events.php:450 ../../mod/rbmark.php:97
+#: ../../mod/appman.php:93 ../../mod/events.php:457 ../../mod/rbmark.php:97
 msgid "Description"
 msgstr ""
 
@@ -4392,6 +4397,7 @@ msgid "Invalid item."
 msgstr ""
 
 #: ../../mod/block.php:39 ../../mod/page.php:52 ../../mod/wall_upload.php:29
+#: ../../mod/cal.php:56
 msgid "Channel not found."
 msgstr ""
 
@@ -5147,114 +5153,115 @@ msgstr ""
 msgid "Event not found."
 msgstr ""
 
-#: ../../mod/events.php:437
+#: ../../mod/events.php:444
 msgid "Edit event title"
 msgstr ""
 
-#: ../../mod/events.php:437
+#: ../../mod/events.php:444
 msgid "Event title"
 msgstr ""
 
-#: ../../mod/events.php:439
+#: ../../mod/events.php:446
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/events.php:440
+#: ../../mod/events.php:447
 msgid "Edit Category"
 msgstr ""
 
-#: ../../mod/events.php:440
+#: ../../mod/events.php:447
 msgid "Category"
 msgstr ""
 
-#: ../../mod/events.php:443
+#: ../../mod/events.php:450
 msgid "Edit start date and time"
 msgstr ""
 
-#: ../../mod/events.php:443
+#: ../../mod/events.php:450
 msgid "Start date and time"
 msgstr ""
 
-#: ../../mod/events.php:444 ../../mod/events.php:447
+#: ../../mod/events.php:451 ../../mod/events.php:454
 msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:446
+#: ../../mod/events.php:453
 msgid "Edit finish date and time"
 msgstr ""
 
-#: ../../mod/events.php:446
+#: ../../mod/events.php:453
 msgid "Finish date and time"
 msgstr ""
 
-#: ../../mod/events.php:448 ../../mod/events.php:449
+#: ../../mod/events.php:455 ../../mod/events.php:456
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:448
+#: ../../mod/events.php:455
 msgid ""
 "Important for events that happen in a particular place. Not practical for "
 "global holidays."
 msgstr ""
 
-#: ../../mod/events.php:450
+#: ../../mod/events.php:457
 msgid "Edit Description"
 msgstr ""
 
-#: ../../mod/events.php:452
+#: ../../mod/events.php:459
 msgid "Edit Location"
 msgstr ""
 
-#: ../../mod/events.php:455 ../../mod/events.php:457
+#: ../../mod/events.php:462 ../../mod/events.php:464
 msgid "Share this event"
 msgstr ""
 
-#: ../../mod/events.php:462
+#: ../../mod/events.php:469
 msgid "Advanced Options"
 msgstr ""
 
-#: ../../mod/events.php:574
+#: ../../mod/events.php:581 ../../mod/cal.php:253
 msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:596
+#: ../../mod/events.php:603
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:598
+#: ../../mod/events.php:605
 msgid "Delete event"
 msgstr ""
 
-#: ../../mod/events.php:632
+#: ../../mod/events.php:639
 msgid "calendar"
 msgstr ""
 
-#: ../../mod/events.php:651
+#: ../../mod/events.php:658 ../../mod/cal.php:325
 msgid "Edit Event"
 msgstr ""
 
-#: ../../mod/events.php:651
+#: ../../mod/events.php:658 ../../mod/cal.php:325
 msgid "Create Event"
 msgstr ""
 
-#: ../../mod/events.php:652 ../../mod/events.php:659 ../../mod/photos.php:916
+#: ../../mod/events.php:659 ../../mod/events.php:666 ../../mod/photos.php:916
+#: ../../mod/cal.php:326 ../../mod/cal.php:333
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:653 ../../mod/events.php:660 ../../mod/photos.php:925
-#: ../../mod/setup.php:288
+#: ../../mod/events.php:660 ../../mod/events.php:667 ../../mod/photos.php:925
+#: ../../mod/setup.php:288 ../../mod/cal.php:327 ../../mod/cal.php:334
 msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:661
+#: ../../mod/events.php:668 ../../mod/cal.php:335
 msgid "Today"
 msgstr ""
 
-#: ../../mod/events.php:692
+#: ../../mod/events.php:699
 msgid "Event removed"
 msgstr ""
 
-#: ../../mod/events.php:695
+#: ../../mod/events.php:702
 msgid "Failed to remove event"
 msgstr ""
 
@@ -5757,11 +5764,11 @@ msgstr ""
 msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/like.php:520
+#: ../../mod/like.php:527
 msgid "Action completed."
 msgstr ""
 
-#: ../../mod/like.php:521
+#: ../../mod/like.php:528
 msgid "Thank you."
 msgstr ""
 
@@ -5928,7 +5935,7 @@ msgstr ""
 msgid "Your message for %s (%s):"
 msgstr ""
 
-#: ../../mod/manage.php:130 ../../mod/new_channel.php:125
+#: ../../mod/manage.php:130 ../../mod/new_channel.php:117
 #, php-format
 msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
@@ -6227,53 +6234,53 @@ msgstr ""
 msgid "Invalid connection."
 msgstr ""
 
-#: ../../mod/new_channel.php:132
+#: ../../mod/new_channel.php:124 ../../mod/register.php:227
 msgid "Name or caption"
 msgstr ""
 
-#: ../../mod/new_channel.php:132
+#: ../../mod/new_channel.php:124 ../../mod/register.php:227
 msgid ""
 "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
 "Group\""
 msgstr ""
 
-#: ../../mod/new_channel.php:134 ../../mod/register.php:249
+#: ../../mod/new_channel.php:126 ../../mod/register.php:229
 msgid "Choose a short nickname"
 msgstr ""
 
-#: ../../mod/new_channel.php:134
+#: ../../mod/new_channel.php:126 ../../mod/register.php:229
 #, php-format
 msgid ""
 "Your nickname will be used to create an easy to remember channel address e."
 "g. nickname%s"
 msgstr ""
 
-#: ../../mod/new_channel.php:136
+#: ../../mod/new_channel.php:128 ../../mod/register.php:231
 msgid "Channel role and privacy"
 msgstr ""
 
-#: ../../mod/new_channel.php:136
+#: ../../mod/new_channel.php:128 ../../mod/register.php:231
 msgid "Select a channel role with your privacy requirements."
 msgstr ""
 
-#: ../../mod/new_channel.php:136 ../../mod/register.php:254
+#: ../../mod/new_channel.php:128 ../../mod/register.php:231
 msgid "Read more about roles"
 msgstr ""
 
-#: ../../mod/new_channel.php:139
-msgid "Create a Channel"
+#: ../../mod/new_channel.php:131
+msgid "Create Channel"
 msgstr ""
 
-#: ../../mod/new_channel.php:140
+#: ../../mod/new_channel.php:132
 msgid ""
-"A channel is your identity on the grid. 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."
+"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 ""
 
-#: ../../mod/new_channel.php:141
+#: ../../mod/new_channel.php:133
 msgid ""
-"Or <a href=\"import\">import an existing channel</a> from another location"
+"or <a href=\"import\">import an existing channel</a> from another location."
 msgstr ""
 
 #: ../../mod/notifications.php:26
@@ -6604,7 +6611,7 @@ msgstr ""
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../mod/admin.php:458 ../../mod/register.php:238
+#: ../../mod/admin.php:458 ../../mod/register.php:241
 msgid "Registration"
 msgstr ""
 
@@ -7248,6 +7255,10 @@ msgstr ""
 msgid "Minimum PHP version: "
 msgstr ""
 
+#: ../../mod/admin.php:1278
+msgid "Requires: "
+msgstr ""
+
 #: ../../mod/admin.php:1279 ../../mod/admin.php:1330
 msgid "Disabled - version incompatibility"
 msgstr ""
@@ -7691,49 +7702,29 @@ msgstr ""
 msgid "Visible To"
 msgstr ""
 
-#: ../../mod/pubsites.php:18
-msgid "Public Sites"
-msgstr ""
-
 #: ../../mod/pubsites.php:21
 msgid ""
-"The listed sites allow public registration for the $Projectname network. All "
-"sites in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some sites may require subscription or "
-"provide tiered service plans. The provider links <strong>may</strong> "
-"provide additional details."
+"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 ""
 
 #: ../../mod/pubsites.php:27
-msgid "Rate this hub"
-msgstr ""
-
-#: ../../mod/pubsites.php:28
-msgid "Site URL"
+msgid "Hub URL"
 msgstr ""
 
-#: ../../mod/pubsites.php:28
+#: ../../mod/pubsites.php:27
 msgid "Access Type"
 msgstr ""
 
-#: ../../mod/pubsites.php:28
+#: ../../mod/pubsites.php:27
 msgid "Registration Policy"
 msgstr ""
 
-#: ../../mod/pubsites.php:28
-msgid "Project"
-msgstr ""
-
-#: ../../mod/pubsites.php:28
-msgid "View hub ratings"
-msgstr ""
-
-#: ../../mod/pubsites.php:32
-msgid "Rate"
-msgstr ""
-
 #: ../../mod/pubsites.php:33
-msgid "View ratings"
+msgid "Rate"
 msgstr ""
 
 #: ../../mod/rate.php:158
@@ -7812,15 +7803,15 @@ msgid "Your registration can not be processed."
 msgstr ""
 
 #: ../../mod/register.php:180
-msgid "Registration on this site is disabled."
+msgid "Registration on this hub is disabled."
 msgstr ""
 
 #: ../../mod/register.php:189
-msgid "Registration on this site/hub is by approval only."
+msgid "Registration on this hub is by approval only."
 msgstr ""
 
 #: ../../mod/register.php:190
-msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
+msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>"
 msgstr ""
 
 #: ../../mod/register.php:200
@@ -7843,44 +7834,36 @@ msgstr ""
 msgid "I am over 13 years of age and accept the %s for this website"
 msgstr ""
 
-#: ../../mod/register.php:243
-msgid "Membership on this site is by invitation only."
-msgstr ""
-
-#: ../../mod/register.php:244
-msgid "Please enter your invitation code"
+#: ../../mod/register.php:223
+msgid "Your email address"
 msgstr ""
 
-#: ../../mod/register.php:248
-msgid "Enter your name"
+#: ../../mod/register.php:224
+msgid "Choose a password"
 msgstr ""
 
-#: ../../mod/register.php:251
-msgid ""
-"Your nickname will be used to create an easily remembered channel address "
-"(like an email address) which you can share with others."
+#: ../../mod/register.php:225
+msgid "Please re-enter your password"
 msgstr ""
 
-#: ../../mod/register.php:253
-msgid ""
-"Please choose a channel type (such as social networking or community forum) "
-"and privacy requirements so we can select the best permissions for you"
+#: ../../mod/register.php:226
+msgid "Please enter your invitation code"
 msgstr ""
 
-#: ../../mod/register.php:254
-msgid "Channel Type"
+#: ../../mod/register.php:232
+msgid "no"
 msgstr ""
 
-#: ../../mod/register.php:258
-msgid "Your email address"
+#: ../../mod/register.php:232
+msgid "yes"
 msgstr ""
 
-#: ../../mod/register.php:259
-msgid "Choose a password"
+#: ../../mod/register.php:246
+msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:260
-msgid "Please re-enter your password"
+#: ../../mod/register.php:258
+msgid "Proceed to create your first channel"
 msgstr ""
 
 #: ../../mod/regmod.php:11
@@ -9019,7 +9002,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1552
+#: ../../mod/lostpass.php:86 ../../boot.php:1551
 msgid "Password Reset"
 msgstr ""
 
@@ -9369,7 +9352,7 @@ msgstr ""
 msgid "Source of Item"
 msgstr ""
 
-#: ../../mod/webpages.php:191
+#: ../../mod/webpages.php:193
 msgid "Page Title"
 msgstr ""
 
@@ -9389,6 +9372,10 @@ msgstr ""
 msgid "Upload Cover Photo"
 msgstr ""
 
+#: ../../mod/cal.php:63
+msgid "Permissions denied."
+msgstr ""
+
 #: ../../view/theme/redbasic/php/config.php:82
 msgid "Focus (Hubzilla default)"
 msgstr ""
@@ -9525,51 +9512,51 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1352
+#: ../../boot.php:1351
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1355
+#: ../../boot.php:1354
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1525
+#: ../../boot.php:1524
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr ""
 
-#: ../../boot.php:1547
+#: ../../boot.php:1546
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1548
+#: ../../boot.php:1547
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1551
+#: ../../boot.php:1550
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2181
+#: ../../boot.php:2180
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2334
+#: ../../boot.php:2333
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2337
+#: ../../boot.php:2336
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2374
+#: ../../boot.php:2373
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2378
+#: ../../boot.php:2377
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/version.inc b/version.inc
index c612b6ed2..65b18f0bb 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2016-02-25.1318H
+2016-02-26.1319H
-- 
cgit v1.2.3