From ebfa1a12b9cc3d939ed49a7f66e5687267a409d3 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 25 Feb 2016 00:36:35 -0800
Subject: [PATCH 01/13] 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

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: [PATCH 02/13] 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">

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: [PATCH 03/13] 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>

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: [PATCH 04/13] 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]') ;

From 7972de13caf21647c8cc2e82c499a344f7191a22 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 25 Feb 2016 14:34:30 -0800
Subject: [PATCH 05/13] 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);
 				}
 			}
 		}

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: [PATCH 06/13] 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())
 	);
 

From ba2ede0a8f82be98994f129655dbb78d5c024e47 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 25 Feb 2016 15:41:52 -0800
Subject: [PATCH 07/13] 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]') ;

From dc8c7a2d2e8060d295c46637e2f1caac76aca6fa Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 25 Feb 2016 16:21:38 -0800
Subject: [PATCH 08/13] 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;

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: [PATCH 09/13] 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(

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: [PATCH 10/13] 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;

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: [PATCH 11/13] 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>
-
+		{{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>
 

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: [PATCH 12/13] 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);
 

From 459166116d926df23c73a839f3c87c2cfd2ba4ab Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 26 Feb 2016 12:45:44 -0800
Subject: [PATCH 13/13] 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    | 2157 +++++++++++++++++++++---------------------
 version.inc          |    2 +-
 5 files changed, 1075 insertions(+), 1088 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,706 +777,6 @@ 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"
-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"
-msgstr ""
-
-#: ../../include/conversation.php:126 ../../mod/like.php:113
-msgid "channel"
-msgstr ""
-
-#: ../../include/conversation.php:148 ../../include/text.php:1954
-#: ../../mod/like.php:361 ../../mod/subthread.php:83
-msgid "status"
-msgstr ""
-
-#: ../../include/conversation.php:150 ../../include/text.php:1956
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr ""
-
-#: ../../include/conversation.php:164 ../../mod/like.php:410
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: ../../include/conversation.php:167 ../../mod/like.php:412
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
-msgstr ""
-
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:243 ../../include/text.php:973
-#: ../../include/text.php:978
-msgid "poked"
-msgstr ""
-
-#: ../../include/conversation.php:260 ../../mod/mood.php:63
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:574 ../../mod/photos.php:1074
-msgctxt "title"
-msgid "Likes"
-msgstr ""
-
-#: ../../include/conversation.php:574 ../../mod/photos.php:1074
-msgctxt "title"
-msgid "Dislikes"
-msgstr ""
-
-#: ../../include/conversation.php:575 ../../mod/photos.php:1075
-msgctxt "title"
-msgid "Agree"
-msgstr ""
-
-#: ../../include/conversation.php:575 ../../mod/photos.php:1075
-msgctxt "title"
-msgid "Disagree"
-msgstr ""
-
-#: ../../include/conversation.php:575 ../../mod/photos.php:1075
-msgctxt "title"
-msgid "Abstain"
-msgstr ""
-
-#: ../../include/conversation.php:576 ../../mod/photos.php:1076
-msgctxt "title"
-msgid "Attending"
-msgstr ""
-
-#: ../../include/conversation.php:576 ../../mod/photos.php:1076
-msgctxt "title"
-msgid "Not attending"
-msgstr ""
-
-#: ../../include/conversation.php:576 ../../mod/photos.php:1076
-msgctxt "title"
-msgid "Might attend"
-msgstr ""
-
-#: ../../include/conversation.php:656 ../../include/ItemObject.php:126
-msgid "Select"
-msgstr ""
-
-#: ../../include/conversation.php:664 ../../include/ItemObject.php:89
-msgid "Private Message"
-msgstr ""
-
-#: ../../include/conversation.php:671 ../../include/ItemObject.php:227
-msgid "Message signature validated"
-msgstr ""
-
-#: ../../include/conversation.php:672 ../../include/ItemObject.php:228
-msgid "Message signature incorrect"
-msgstr ""
-
-#: ../../include/conversation.php:691
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr ""
-
-#: ../../include/conversation.php:710
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/conversation.php:711
-msgid "Filed under:"
-msgstr ""
-
-#: ../../include/conversation.php:719 ../../include/ItemObject.php:334
-#, php-format
-msgid "from %s"
-msgstr ""
-
-#: ../../include/conversation.php:722 ../../include/ItemObject.php:337
-#, php-format
-msgid "last edited: %s"
-msgstr ""
-
-#: ../../include/conversation.php:723 ../../include/ItemObject.php:338
-#, php-format
-msgid "Expires: %s"
-msgstr ""
-
-#: ../../include/conversation.php:738
-msgid "View in context"
-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"
-msgstr ""
-
-#: ../../include/conversation.php:850
-msgid "remove"
-msgstr ""
-
-#: ../../include/conversation.php:854 ../../include/nav.php:244
-msgid "Loading..."
-msgstr ""
-
-#: ../../include/conversation.php:855
-msgid "Delete Selected Items"
-msgstr ""
-
-#: ../../include/conversation.php:953
-msgid "View Source"
-msgstr ""
-
-#: ../../include/conversation.php:954
-msgid "Follow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:955
-msgid "Unfollow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:959 ../../include/nav.php:86
-#: ../../mod/connedit.php:509
-msgid "View Profile"
-msgstr ""
-
-#: ../../include/conversation.php:960
-msgid "Activity/Posts"
-msgstr ""
-
-#: ../../include/conversation.php:962
-msgid "Edit Connection"
-msgstr ""
-
-#: ../../include/conversation.php:963
-msgid "Message"
-msgstr ""
-
-#: ../../include/conversation.php:964 ../../mod/ratings.php:99
-msgid "Ratings"
-msgstr ""
-
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s likes this."
-msgstr ""
-
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1084
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1086
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1092
-msgid "and"
-msgstr ""
-
-#: ../../include/conversation.php:1095
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: ../../include/conversation.php:1096
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1164
-msgid "Visible to <strong>everybody</strong>"
-msgstr ""
-
-#: ../../include/conversation.php:1165 ../../mod/mail.php:202
-#: ../../mod/mail.php:316
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1166
-msgid "Please enter a video link/URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1167
-msgid "Please enter an audio link/URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1168
-msgid "Tag term:"
-msgstr ""
-
-#: ../../include/conversation.php:1169 ../../mod/filer.php:48
-msgid "Save to Folder:"
-msgstr ""
-
-#: ../../include/conversation.php:1170
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../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/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"
-msgstr ""
-
-#: ../../include/conversation.php:1202 ../../mod/blocks.php:154
-#: ../../mod/layouts.php:184 ../../mod/photos.php:1039
-#: ../../mod/webpages.php:182
-msgid "Share"
-msgstr ""
-
-#: ../../include/conversation.php:1204
-msgid "Page link name"
-msgstr ""
-
-#: ../../include/conversation.php:1207
-msgid "Post as"
-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"
-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"
-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"
-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"
-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"
-msgstr ""
-
-#: ../../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/conversation.php:1215
-msgid "upload photo"
-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"
-msgstr ""
-
-#: ../../include/conversation.php:1217
-msgid "attach file"
-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"
-msgstr ""
-
-#: ../../include/conversation.php:1219
-msgid "web link"
-msgstr ""
-
-#: ../../include/conversation.php:1220
-msgid "Insert video link"
-msgstr ""
-
-#: ../../include/conversation.php:1221
-msgid "video link"
-msgstr ""
-
-#: ../../include/conversation.php:1222
-msgid "Insert audio link"
-msgstr ""
-
-#: ../../include/conversation.php:1223
-msgid "audio link"
-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"
-msgstr ""
-
-#: ../../include/conversation.php:1225
-msgid "set location"
-msgstr ""
-
-#: ../../include/conversation.php:1226 ../../mod/editpost.php:126
-msgid "Toggle voting"
-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"
-msgstr ""
-
-#: ../../include/conversation.php:1230
-msgid "clear location"
-msgstr ""
-
-#: ../../include/conversation.php:1232 ../../mod/editblock.php:162
-#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
-msgid "Title (optional)"
-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)"
-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"
-msgstr ""
-
-#: ../../include/conversation.php:1239
-msgid "permissions"
-msgstr ""
-
-#: ../../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/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/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/conversation.php:1265
-msgid "Set publish date"
-msgstr ""
-
-#: ../../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/conversation.php:1269 ../../mod/editpost.php:159
-msgid "OK"
-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"
-msgstr ""
-
-#: ../../include/conversation.php:1513
-msgid "Discover"
-msgstr ""
-
-#: ../../include/conversation.php:1516
-msgid "Imported public streams"
-msgstr ""
-
-#: ../../include/conversation.php:1521
-msgid "Commented Order"
-msgstr ""
-
-#: ../../include/conversation.php:1524
-msgid "Sort by Comment Date"
-msgstr ""
-
-#: ../../include/conversation.php:1528
-msgid "Posted Order"
-msgstr ""
-
-#: ../../include/conversation.php:1531
-msgid "Sort by Post Date"
-msgstr ""
-
-#: ../../include/conversation.php:1536 ../../include/widgets.php:105
-msgid "Personal"
-msgstr ""
-
-#: ../../include/conversation.php:1539
-msgid "Posts that mention or involve you"
-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"
-msgstr ""
-
-#: ../../include/datetime.php:269
-msgid "less than a second ago"
-msgstr ""
-
-#: ../../include/datetime.php:287
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr ""
-
-#: ../../include/datetime.php:298
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../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/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'"
@@ -1493,26 +793,26 @@ 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/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:1548
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1547
 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/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:1548
+#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1547
 msgid "Yes"
 msgstr ""
 
@@ -1524,27 +824,33 @@ msgstr ""
 msgid "This Website Only"
 msgstr ""
 
-#: ../../include/event.php:768
+#: ../../include/event.php:779
 msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/event.php:967
+#: ../../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/event.php:978
 msgid "Not specified"
 msgstr ""
 
-#: ../../include/event.php:968
+#: ../../include/event.php:979
 msgid "Needs Action"
 msgstr ""
 
-#: ../../include/event.php:969
+#: ../../include/event.php:980
 msgid "Completed"
 msgstr ""
 
-#: ../../include/event.php:970
+#: ../../include/event.php:981
 msgid "In Process"
 msgstr ""
 
-#: ../../include/event.php:971
+#: ../../include/event.php:982
 msgid "Cancelled"
 msgstr ""
 
@@ -1580,45 +886,6 @@ msgstr ""
 msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/group.php:26
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr ""
-
-#: ../../include/group.php:232
-msgid "Add new connections to this privacy group"
-msgstr ""
-
-#: ../../include/group.php:251 ../../mod/admin.php:998
-msgid "All Channels"
-msgstr ""
-
-#: ../../include/group.php:273
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:295 ../../include/features.php:82
-msgid "Privacy Groups"
-msgstr ""
-
-#: ../../include/group.php:296
-msgid "Edit group"
-msgstr ""
-
-#: ../../include/group.php:297
-msgid "Add privacy group"
-msgstr ""
-
-#: ../../include/group.php:298
-msgid "Channels not in any privacy group"
-msgstr ""
-
-#: ../../include/group.php:300 ../../include/widgets.php:285
-msgid "add"
-msgstr ""
-
 #: ../../include/import.php:23
 msgid ""
 "Cannot create a duplicate channel identifier on this system. Import failed."
@@ -1666,6 +933,7 @@ msgid "Passwords do not match"
 msgstr ""
 
 #: ../../include/js_strings.php:13 ../../mod/photos.php:41
+#: ../../mod/cal.php:37
 msgid "everybody"
 msgstr ""
 
@@ -1706,7 +974,7 @@ msgstr ""
 #: ../../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/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
@@ -1722,7 +990,7 @@ msgstr ""
 #: ../../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/thing.php:358 ../../mod/xchan.php:11 ../../mod/cal.php:332
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr ""
@@ -1735,8 +1003,8 @@ msgstr ""
 msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr ""
 
-#: ../../include/js_strings.php:25 ../../mod/events.php:452
-#: ../../mod/profiles.php:464 ../../mod/pubsites.php:28
+#: ../../include/js_strings.php:25 ../../mod/events.php:459
+#: ../../mod/profiles.php:464 ../../mod/pubsites.php:36
 msgid "Location"
 msgstr ""
 
@@ -2008,7 +1276,7 @@ msgstr ""
 msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1543
+#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1542
 msgid "Logout"
 msgstr ""
 
@@ -2024,6 +1292,11 @@ msgstr ""
 msgid "Your posts and conversations"
 msgstr ""
 
+#: ../../include/nav.php:86 ../../include/conversation.php:959
+#: ../../mod/connedit.php:509
+msgid "View Profile"
+msgstr ""
+
 #: ../../include/nav.php:86
 msgid "Your profile page"
 msgstr ""
@@ -2085,7 +1358,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:150 ../../mod/register.php:266 ../../boot.php:1526
+#: ../../include/nav.php:150 ../../mod/register.php:258 ../../boot.php:1525
 msgid "Register"
 msgstr ""
 
@@ -2203,6 +1476,10 @@ msgstr ""
 msgid "Site Setup and Configuration"
 msgstr ""
 
+#: ../../include/nav.php:244 ../../include/conversation.php:854
+msgid "Loading..."
+msgstr ""
+
 #: ../../include/nav.php:249
 msgid "@name, #tag, ?doc, content"
 msgstr ""
@@ -2225,15 +1502,24 @@ msgid "New Page"
 msgstr ""
 
 #: ../../include/page_widgets.php:39 ../../mod/blocks.php:159
-#: ../../mod/layouts.php:188 ../../mod/webpages.php:187
+#: ../../mod/layouts.php:188 ../../mod/pubsites.php:42
+#: ../../mod/webpages.php:189
 msgid "View"
 msgstr ""
 
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
+#: ../../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/page_widgets.php:41 ../../mod/webpages.php:191
 msgid "Actions"
 msgstr ""
 
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:192
 msgid "Page Link"
 msgstr ""
 
@@ -2242,12 +1528,12 @@ msgid "Title"
 msgstr ""
 
 #: ../../include/page_widgets.php:44 ../../mod/blocks.php:150
-#: ../../mod/layouts.php:181 ../../mod/menu.php:110 ../../mod/webpages.php:192
+#: ../../mod/layouts.php:181 ../../mod/menu.php:110 ../../mod/webpages.php:194
 msgid "Created"
 msgstr ""
 
 #: ../../include/page_widgets.php:45 ../../mod/blocks.php:151
-#: ../../mod/layouts.php:182 ../../mod/menu.php:111 ../../mod/webpages.php:193
+#: ../../mod/layouts.php:182 ../../mod/menu.php:111 ../../mod/webpages.php:195
 msgid "Edited"
 msgstr ""
 
@@ -2257,38 +1543,6 @@ msgstr ""
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../include/photos.php:112
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr ""
-
-#: ../../include/photos.php:119
-msgid "Image file is empty."
-msgstr ""
-
-#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
-#: ../../mod/cover_photo.php:164
-msgid "Unable to process image"
-msgstr ""
-
-#: ../../include/photos.php:257
-msgid "Photo storage failed."
-msgstr ""
-
-#: ../../include/photos.php:297
-msgid "a new photo"
-msgstr ""
-
-#: ../../include/photos.php:301
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-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"
@@ -2541,7 +1795,7 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/security.php:384
+#: ../../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."
@@ -2587,6 +1841,101 @@ msgstr ""
 msgid "dislikes"
 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/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:444 ../../mod/events.php:449
+msgid "Required"
+msgstr ""
+
+#: ../../include/datetime.php:263 ../../boot.php:2374
+msgid "never"
+msgstr ""
+
+#: ../../include/datetime.php:269
+msgid "less than a second ago"
+msgstr ""
+
+#: ../../include/datetime.php:287
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
+msgstr ""
+
+#: ../../include/datetime.php:298
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../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/datetime.php:554
+#, php-format
+msgid "Happy Birthday %1$s"
+msgstr ""
+
 #: ../../include/zot.php:675
 msgid "Invalid data packet"
 msgstr ""
@@ -2642,7 +1991,7 @@ 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
+#: ../../boot.php:1545
 msgid "Email"
 msgstr ""
 
@@ -2695,6 +2044,42 @@ msgstr ""
 msgid "No Subject"
 msgstr ""
 
+#: ../../include/photos.php:112
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr ""
+
+#: ../../include/photos.php:119
+msgid "Image file is empty."
+msgstr ""
+
+#: ../../include/photos.php:146 ../../mod/profile_photo.php:225
+#: ../../mod/cover_photo.php:164
+msgid "Unable to process image"
+msgstr ""
+
+#: ../../include/photos.php:257
+msgid "Photo storage failed."
+msgstr ""
+
+#: ../../include/photos.php:297
+msgid "a new photo"
+msgstr ""
+
+#: ../../include/photos.php:301
+#, php-format
+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/features.php:48
 msgid "General Features"
 msgstr ""
@@ -2869,6 +2254,10 @@ msgstr ""
 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 ""
@@ -2969,110 +2358,14 @@ msgstr ""
 msgid "Provide a personal tag cloud on your channel page"
 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"
-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: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."
-msgstr ""
-
-#: ../../include/items.php:4969 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Privacy group not found."
-msgstr ""
-
-#: ../../include/items.php:4985
-msgid "Privacy group is empty."
-msgstr ""
-
-#: ../../include/items.php:4992
-#, php-format
-msgid "Privacy group: %s"
-msgstr ""
-
-#: ../../include/items.php:5002 ../../mod/connedit.php:694
-#, php-format
-msgid "Connection: %s"
-msgstr ""
-
-#: ../../include/items.php:5004
-msgid "Connection not found."
-msgstr ""
-
-#: ../../include/items.php:5430 ../../mod/cover_photo.php:229
-msgid "female"
-msgstr ""
-
-#: ../../include/items.php:5431 ../../mod/cover_photo.php:230
-#, php-format
-msgid "%1$s updated her %2$s"
-msgstr ""
-
-#: ../../include/items.php:5432 ../../mod/cover_photo.php:231
-msgid "male"
-msgstr ""
-
-#: ../../include/items.php:5433 ../../mod/cover_photo.php:232
-#, php-format
-msgid "%1$s updated his %2$s"
-msgstr ""
-
-#: ../../include/items.php:5435 ../../mod/cover_photo.php:234
-#, php-format
-msgid "%1$s updated their %2$s"
-msgstr ""
-
-#: ../../include/items.php:5437
-msgid "profile photo"
-msgstr ""
-
 #: ../../include/widgets.php:103
 msgid "System"
 msgstr ""
 
+#: ../../include/widgets.php:105 ../../include/conversation.php:1536
+msgid "Personal"
+msgstr ""
+
 #: ../../include/widgets.php:106
 msgid "Create Personal App"
 msgstr ""
@@ -3124,6 +2417,10 @@ msgstr ""
 msgid "Remove term"
 msgstr ""
 
+#: ../../include/widgets.php:285 ../../include/group.php:300
+msgid "add"
+msgstr ""
+
 #: ../../include/widgets.php:359
 msgid "Archives"
 msgstr ""
@@ -3229,11 +2526,13 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: ../../include/widgets.php:700 ../../mod/events.php:654
+#: ../../include/widgets.php:700 ../../mod/events.php:661
+#: ../../mod/cal.php:328
 msgid "Export"
 msgstr ""
 
-#: ../../include/widgets.php:701 ../../mod/events.php:657
+#: ../../include/widgets.php:701 ../../mod/events.php:664
+#: ../../mod/cal.php:331
 msgid "Import"
 msgstr ""
 
@@ -3277,7 +2576,7 @@ msgstr ""
 msgid "View Ratings"
 msgstr ""
 
-#: ../../include/widgets.php:1176
+#: ../../include/widgets.php:1176 ../../mod/pubsites.php:18
 msgid "Public Hubs"
 msgstr ""
 
@@ -3406,6 +2705,11 @@ msgstr ""
 msgid "poke"
 msgstr ""
 
+#: ../../include/text.php:973 ../../include/text.php:978
+#: ../../include/conversation.php:243
+msgid "poked"
+msgstr ""
+
 #: ../../include/text.php:979
 msgid "ping"
 msgstr ""
@@ -3554,7 +2858,7 @@ msgstr ""
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1724 ../../mod/events.php:623
+#: ../../include/text.php:1724 ../../mod/events.php:630 ../../mod/cal.php:302
 msgid "Link to Source"
 msgstr ""
 
@@ -3578,6 +2882,21 @@ msgstr ""
 msgid "Select an alternate language"
 msgstr ""
 
+#: ../../include/text.php:1948 ../../include/conversation.php:120
+#: ../../mod/like.php:361 ../../mod/subthread.php:83 ../../mod/tagger.php:43
+msgid "photo"
+msgstr ""
+
+#: ../../include/text.php:1954 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:83
+msgid "status"
+msgstr ""
+
+#: ../../include/text.php:1956 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr ""
+
 #: ../../include/text.php:1961
 msgid "activity"
 msgstr ""
@@ -3602,6 +2921,37 @@ msgstr ""
 msgid "Pages"
 msgstr ""
 
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr ""
+
+#: ../../include/group.php:232
+msgid "Add new connections to this privacy group"
+msgstr ""
+
+#: ../../include/group.php:251 ../../mod/admin.php:998
+msgid "All Channels"
+msgstr ""
+
+#: ../../include/group.php:273
+msgid "edit"
+msgstr ""
+
+#: ../../include/group.php:296
+msgid "Edit group"
+msgstr ""
+
+#: ../../include/group.php:297
+msgid "Add privacy group"
+msgstr ""
+
+#: ../../include/group.php:298
+msgid "Channels not in any privacy group"
+msgstr ""
+
 #: ../../include/enotify.php:96
 #, php-format
 msgid "%s <!item_type!>"
@@ -3858,15 +3208,15 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:1009 ../../include/identity.php:1252
+#: ../../include/identity.php:1009 ../../include/identity.php:1248
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:1010 ../../include/identity.php:1296
+#: ../../include/identity.php:1010 ../../include/identity.php:1292
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:1011 ../../include/identity.php:1307
+#: ../../include/identity.php:1011 ../../include/identity.php:1303
 msgid "Homepage:"
 msgstr ""
 
@@ -3908,105 +3258,105 @@ msgstr ""
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1250 ../../mod/settings.php:1047
+#: ../../include/identity.php:1246 ../../mod/settings.php:1047
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:1257
+#: ../../include/identity.php:1253
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:1281
+#: ../../include/identity.php:1277
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:1282
+#: ../../include/identity.php:1278
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:1289
+#: ../../include/identity.php:1285
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:1293 ../../mod/directory.php:302
+#: ../../include/identity.php:1289 ../../mod/directory.php:302
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1302
+#: ../../include/identity.php:1298
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1305 ../../mod/profiles.php:699
+#: ../../include/identity.php:1301 ../../mod/profiles.php:699
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1309 ../../mod/directory.php:318
+#: ../../include/identity.php:1305 ../../mod/directory.php:318
 #: ../../mod/profiles.php:701
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1307
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1313 ../../mod/profiles.php:702
+#: ../../include/identity.php:1309 ../../mod/profiles.php:702
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1315
+#: ../../include/identity.php:1311
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1317 ../../mod/directory.php:320
+#: ../../include/identity.php:1313 ../../mod/directory.php:320
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1319
+#: ../../include/identity.php:1315
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1321 ../../mod/profiles.php:705
+#: ../../include/identity.php:1317 ../../mod/profiles.php:705
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1323 ../../mod/profiles.php:706
+#: ../../include/identity.php:1319 ../../mod/profiles.php:706
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1321
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1327
+#: ../../include/identity.php:1323
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1329
+#: ../../include/identity.php:1325
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1331
+#: ../../include/identity.php:1327
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1333
+#: ../../include/identity.php:1329
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1335
+#: ../../include/identity.php:1331
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1337
+#: ../../include/identity.php:1333
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1339
+#: ../../include/identity.php:1335
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1341
+#: ../../include/identity.php:1337
 msgid "School/education:"
 msgstr ""
 
@@ -4014,7 +3364,7 @@ msgstr ""
 msgid "Like this thing"
 msgstr ""
 
-#: ../../include/identity.php:1769 ../../mod/cover_photo.php:236
+#: ../../include/identity.php:1770 ../../mod/cover_photo.php:236
 msgid "cover photo"
 msgstr ""
 
@@ -4026,6 +3376,561 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
+#: ../../include/conversation.php:126 ../../mod/like.php:113
+msgid "channel"
+msgstr ""
+
+#: ../../include/conversation.php:164 ../../mod/like.php:410
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
+
+#: ../../include/conversation.php:167 ../../mod/like.php:412
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr ""
+
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:260 ../../mod/mood.php:63
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:574 ../../mod/photos.php:1074
+msgctxt "title"
+msgid "Likes"
+msgstr ""
+
+#: ../../include/conversation.php:574 ../../mod/photos.php:1074
+msgctxt "title"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../include/conversation.php:575 ../../mod/photos.php:1075
+msgctxt "title"
+msgid "Agree"
+msgstr ""
+
+#: ../../include/conversation.php:575 ../../mod/photos.php:1075
+msgctxt "title"
+msgid "Disagree"
+msgstr ""
+
+#: ../../include/conversation.php:575 ../../mod/photos.php:1075
+msgctxt "title"
+msgid "Abstain"
+msgstr ""
+
+#: ../../include/conversation.php:576 ../../mod/photos.php:1076
+msgctxt "title"
+msgid "Attending"
+msgstr ""
+
+#: ../../include/conversation.php:576 ../../mod/photos.php:1076
+msgctxt "title"
+msgid "Not attending"
+msgstr ""
+
+#: ../../include/conversation.php:576 ../../mod/photos.php:1076
+msgctxt "title"
+msgid "Might attend"
+msgstr ""
+
+#: ../../include/conversation.php:656 ../../include/ItemObject.php:126
+msgid "Select"
+msgstr ""
+
+#: ../../include/conversation.php:664 ../../include/ItemObject.php:89
+msgid "Private Message"
+msgstr ""
+
+#: ../../include/conversation.php:671 ../../include/ItemObject.php:227
+msgid "Message signature validated"
+msgstr ""
+
+#: ../../include/conversation.php:672 ../../include/ItemObject.php:228
+msgid "Message signature incorrect"
+msgstr ""
+
+#: ../../include/conversation.php:691
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: ../../include/conversation.php:710
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/conversation.php:711
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:719 ../../include/ItemObject.php:334
+#, php-format
+msgid "from %s"
+msgstr ""
+
+#: ../../include/conversation.php:722 ../../include/ItemObject.php:337
+#, php-format
+msgid "last edited: %s"
+msgstr ""
+
+#: ../../include/conversation.php:723 ../../include/ItemObject.php:338
+#, php-format
+msgid "Expires: %s"
+msgstr ""
+
+#: ../../include/conversation.php:738
+msgid "View in context"
+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"
+msgstr ""
+
+#: ../../include/conversation.php:850
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
+msgstr ""
+
+#: ../../include/conversation.php:953
+msgid "View Source"
+msgstr ""
+
+#: ../../include/conversation.php:954
+msgid "Follow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:955
+msgid "Unfollow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:960
+msgid "Activity/Posts"
+msgstr ""
+
+#: ../../include/conversation.php:962
+msgid "Edit Connection"
+msgstr ""
+
+#: ../../include/conversation.php:963
+msgid "Message"
+msgstr ""
+
+#: ../../include/conversation.php:964 ../../mod/pubsites.php:27
+#: ../../mod/ratings.php:99
+msgid "Ratings"
+msgstr ""
+
+#: ../../include/conversation.php:1080
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../include/conversation.php:1080
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1084
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1086
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1092
+msgid "and"
+msgstr ""
+
+#: ../../include/conversation.php:1095
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1096
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:1096
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1164
+msgid "Visible to <strong>everybody</strong>"
+msgstr ""
+
+#: ../../include/conversation.php:1165 ../../mod/mail.php:202
+#: ../../mod/mail.php:316
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1166
+msgid "Please enter a video link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1167
+msgid "Please enter an audio link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1168
+msgid "Tag term:"
+msgstr ""
+
+#: ../../include/conversation.php:1169 ../../mod/filer.php:48
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../include/conversation.php:1170
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../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/conversation.php:1202 ../../mod/blocks.php:154
+#: ../../mod/layouts.php:184 ../../mod/photos.php:1039
+#: ../../mod/webpages.php:184
+msgid "Share"
+msgstr ""
+
+#: ../../include/conversation.php:1204
+msgid "Page link name"
+msgstr ""
+
+#: ../../include/conversation.php:1207
+msgid "Post as"
+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"
+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"
+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"
+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"
+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"
+msgstr ""
+
+#: ../../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/conversation.php:1215
+msgid "upload photo"
+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"
+msgstr ""
+
+#: ../../include/conversation.php:1217
+msgid "attach file"
+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"
+msgstr ""
+
+#: ../../include/conversation.php:1219
+msgid "web link"
+msgstr ""
+
+#: ../../include/conversation.php:1220
+msgid "Insert video link"
+msgstr ""
+
+#: ../../include/conversation.php:1221
+msgid "video link"
+msgstr ""
+
+#: ../../include/conversation.php:1222
+msgid "Insert audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1223
+msgid "audio link"
+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"
+msgstr ""
+
+#: ../../include/conversation.php:1225
+msgid "set location"
+msgstr ""
+
+#: ../../include/conversation.php:1226 ../../mod/editpost.php:126
+msgid "Toggle voting"
+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"
+msgstr ""
+
+#: ../../include/conversation.php:1230
+msgid "clear location"
+msgstr ""
+
+#: ../../include/conversation.php:1232 ../../mod/editblock.php:162
+#: ../../mod/editpost.php:141 ../../mod/editwebpage.php:205
+msgid "Title (optional)"
+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)"
+msgstr ""
+
+#: ../../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/conversation.php:1239
+msgid "permissions"
+msgstr ""
+
+#: ../../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/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/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/conversation.php:1265
+msgid "Set publish date"
+msgstr ""
+
+#: ../../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/conversation.php:1269 ../../mod/editpost.php:159
+msgid "OK"
+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"
+msgstr ""
+
+#: ../../include/conversation.php:1513
+msgid "Discover"
+msgstr ""
+
+#: ../../include/conversation.php:1516
+msgid "Imported public streams"
+msgstr ""
+
+#: ../../include/conversation.php:1521
+msgid "Commented Order"
+msgstr ""
+
+#: ../../include/conversation.php:1524
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../include/conversation.php:1528
+msgid "Posted Order"
+msgstr ""
+
+#: ../../include/conversation.php:1531
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../include/conversation.php:1539
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../include/conversation.php: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:1620 ../../mod/admin.php:1157
+msgid "Channel"
+msgstr ""
+
+#: ../../include/conversation.php:1623
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1632
+msgid "About"
+msgstr ""
+
+#: ../../include/conversation.php:1635
+msgid "Profile Details"
+msgstr ""
+
+#: ../../include/conversation.php:1651
+msgid "Files and Storage"
+msgstr ""
+
+#: ../../include/conversation.php:1672 ../../include/conversation.php:1675
+msgid "Chatrooms"
+msgstr ""
+
+#: ../../include/conversation.php:1688
+msgid "Saved Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1698
+msgid "Manage Webpages"
+msgstr ""
+
+#: ../../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/conversation.php:1754 ../../include/ItemObject.php:184
+#: ../../mod/photos.php:1102
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1757
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1760
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1763
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../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"
 msgstr ""
@@ -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"
+msgid "Hub URL"
 msgstr ""
 
-#: ../../mod/pubsites.php:28
-msgid "Site 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,46 +7834,38 @@ 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"
-msgstr ""
-
-#: ../../mod/register.php:248
-msgid "Enter your name"
-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."
-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"
-msgstr ""
-
-#: ../../mod/register.php:254
-msgid "Channel Type"
-msgstr ""
-
-#: ../../mod/register.php:258
+#: ../../mod/register.php:223
 msgid "Your email address"
 msgstr ""
 
-#: ../../mod/register.php:259
+#: ../../mod/register.php:224
 msgid "Choose a password"
 msgstr ""
 
-#: ../../mod/register.php:260
+#: ../../mod/register.php:225
 msgid "Please re-enter your password"
 msgstr ""
 
+#: ../../mod/register.php:226
+msgid "Please enter your invitation code"
+msgstr ""
+
+#: ../../mod/register.php:232
+msgid "no"
+msgstr ""
+
+#: ../../mod/register.php:232
+msgid "yes"
+msgstr ""
+
+#: ../../mod/register.php:246
+msgid "Membership on this site is by invitation only."
+msgstr ""
+
+#: ../../mod/register.php:258
+msgid "Proceed to create your first channel"
+msgstr ""
+
 #: ../../mod/regmod.php:11
 msgid "Please login."
 msgstr ""
@@ -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