Merge branch 'master' into tres

Conflicts:
	include/notifier.php

26 files changed, 1210 insertions, 1122 deletions

diff --git a/doc/features.bb b/doc/features.bb
index 9a9de0c59..e2ca648bd 100644
--- a/doc/features.bb
+++ b/doc/features.bb
@@ -8,7 +8,7 @@ Redmatrix provides distributed web publishing and social communications with [b]
 

 So what exactly are "decentralised permissions"? They give me the ability to share something on my website (photos, media, files, webpages, etc.) with specific people on completely different websites - but not necessarily [i]everybody[/i] on those websites; and they do not need a password on my website and do not need to login to my website to view the things I've shared with them. They have one password on their own website and "magic authentication" between affiliated websites in the network. Also, as it is decentralised, there is no third party which has the ability to bypass permissions and see everything in the network.

 

-Redmatrix combines many features of traditional blogs, social networking and media, content management systems, and personal cloud storage into an easy to use framework. Each node in the matrix can operate standalone or link with other nodes to create a super-network; but leaving privacy in the control of the original publisher. 

+Redmatrix combines many features of traditional blogs, social networking and media, content management systems, and personal cloud storage into an easy to use framework. Each node in the matrix can operate standalone or link with other nodes to create a super-network; leaving privacy under the control of the original publisher. 

 

 Redmatrix is an open source webserver application written originally in PHP/MySQL and is easily installable by those with basic website administration skills. It is also easily extended via plugins and themes and other third-party tools. 

 

diff --git a/include/comanche.php b/include/comanche.php
index e0d3af985..c1a98ed6c 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -155,7 +155,7 @@ function comanche_block($s) {
 			dbesc($name)
 		);
 		if($r) {
-			$o .= (($var['wrap'] == 'none') ? '' : '<div class="bblock">');
+			$o .= (($var['wrap'] == 'none') ? '' : '<div class="bblock widget">');
 			if($r[0]['title'])
 				$o .= '<h3>' . $r[0]['title'] . '</h3>';
 
diff --git a/include/conversation.php b/include/conversation.php
index 0250ad8b9..fe48ed2f5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1086,6 +1086,8 @@ function status_editor($a, $x, $popup = false) {
 //		$plaintext = false;
 
 	$voting = feature_enabled(local_channel(), 'consensus_tools');
+	if(x($x, 'novoting'))
+		$voting = false;
 
 	$mimeselect = '';
 	if(array_key_exists('mimetype', $x) && $x['mimetype']) {
@@ -1190,7 +1192,8 @@ function status_editor($a, $x, $popup = false) {
 		'$noloc' => ((get_pconfig($x['profile_uid'], 'system', 'use_browser_location')) ? t('Clear browser location') : ''),
 		'$shortnoloc' => t('clear location'),
 		'$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''),
-		'$placeholdertitle' => t('Title (optional)'),
+		'$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')),
+		'$hidetitle' => ((x($x, 'hidetitle')) ? $x['hidetitle'] : false),
 		'$catsenabled' => ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''),
 		'$category' => "",
 		'$placeholdercategory' => t('Categories (optional, comma-separated list)'),
diff --git a/include/items.php b/include/items.php
index 1eb1a6446..98596cede 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4409,7 +4409,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
 	$limit = " LIMIT 100 ";
 
 	if($mindate != NULL_DATE) {
-		$sql_extra .= " and ( created > '$mindate' or edited > '$mindate' ) ";
+		$sql_extra .= " and ( created > '$mindate' or changed > '$mindate' ) ";
 	}
 
 	if($message_id) {
@@ -4427,7 +4427,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
 
 	if(is_sys_channel($uid)) {
 		require_once('include/security.php');
-		$r = q("SELECT parent, created from item
+		$r = q("SELECT parent, created, postopts from item
 			WHERE uid != %d
 			and uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ") AND item_restrict = 0 
 			AND item_wall = 1
@@ -4436,7 +4436,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
 		);
 	}
 	else {
-		$r = q("SELECT parent, created from item
+		$r = q("SELECT parent, created, postopts from item
 			WHERE uid = %d AND item_restrict = 0
 			AND item_wall = 1
 			$sql_extra GROUP BY parent ORDER BY created ASC $limit",
@@ -4445,6 +4445,12 @@ function zot_feed($uid,$observer_xchan,$arr) {
 	}
 
 	if($r) {
+		for($x = 0; $x < count($r); $x ++) {
+			if(strpos($r[$x]['postopts'],'nodeliver') !== false) {
+				unset($r[$x]);
+			}
+		}
+	
 		$parents_str = ids_to_querystr($r,'parent');
 		$sys_query = ((is_sys_channel($uid)) ? $sql_extra : '');
 
diff --git a/include/notifier.php b/include/notifier.php
index 4ea1ffe35..4833e980c 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -350,6 +350,11 @@ function notifier_run($argv, $argc){
 			return;
 		}
 
+		if(strpos($target_item['postopts'],'nodeliver') !== false) {
+			logger('notifier: target item is undeliverable', LOGGER_DEBUG);
+			return;
+		}
+
 		$s = q("select * from channel where channel_id = %d limit 1",
 			intval($target_item['uid'])
 		);
@@ -374,6 +379,12 @@ function notifier_run($argv, $argc){
 
 			if(! $r)
 				return;
+
+			if(strpos($r[0]['postopts'],'nodeliver') !== false) {
+				logger('notifier: target item is undeliverable', LOGGER_DEBUG);
+				return;
+			}
+
 			xchan_query($r);
 			$r = fetch_post_tags($r);
 		
@@ -585,16 +596,13 @@ function notifier_run($argv, $argc){
 
 	foreach($dhubs as $hub) {
 
-		if(defined('DIASPORA_RELIABILITY_EMULATION')) {
-			$cointoss = mt_rand(0,2);
-			if($cointoss == 2) {
+		if($hub['hubloc_network'] === 'diaspora' || $hub['hubloc_network'] === 'friendica-over-diaspora') {
+			if(! get_config('system','diaspora_enabled'))
 				continue;
-			}
-		}
 
+			// allow this to be set per message
 
-		if($hub['hubloc_network'] === 'diaspora' || $hub['hubloc_network'] === 'friendica-over-diaspora') {
-			if(! get_config('system','diaspora_enabled'))
+			if(strpos($target_item['postopts'],'nodspr') !== false)
 				continue;
 
 			require_once('include/diaspora.php');
diff --git a/include/socgraph.php b/include/socgraph.php
index d8e2e1958..3e8bcc19e 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -466,7 +466,7 @@ function poco($a,$extended = false) {
 		$sql_extra = " and abook_flags = 0 ";
 
 	if($cid)
-		$sql_extra = sprintf(" and abook_id = %d ",intval($cid));
+		$sql_extra = sprintf(" and abook_id = %d  and ( abook_flags & " . ABOOK_FLAG_HIDDEN . " ) = 0 ",intval($cid));
 
 	if($system_mode) {
 		$r = q("SELECT count(*) as `total` from abook where ( abook_flags & " . ABOOK_FLAG_SELF . 
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 58ec365cb..a00c3bca3 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -17,7 +17,7 @@ with your hosting provider prior to installation. (And preferably before
 entering into a long-term contract.)
 
 If you encounter installation issues, please let us know via the Github issue 
-tracker (https://github.com/friendica/red/issues). Please be as clear as you 
+tracker (https://github.com/redmatrix/redmatrix/issues). Please be as clear as you 
 can about your operating environment and provide as much detail as possible
 about any error messages you may see, so that we can prevent it from happening 
 in the future. Due to the large variety of operating systems and PHP platforms 
diff --git a/library/justifiedGallery/jquery.justifiedGallery.js b/library/justifiedGallery/jquery.justifiedGallery.js
index 21679c96d..213a7f286 100644
--- a/library/justifiedGallery/jquery.justifiedGallery.js
+++ b/library/justifiedGallery/jquery.justifiedGallery.js
@@ -45,8 +45,7 @@
       target : null, // rewrite the target of all links
       extension : /\.[^.\\/]+$/,
       refreshTime : 100,
-      randomize : false,
-      ignoreElement: null // a comma seperated list of div element selectors to be ignored e.g.: '.someClass, #someId'
+      randomize : false
     };
 
     function getSuffix(width, height, context) {
@@ -572,8 +571,6 @@
 
         var border = extendedSettings.border >= 0 ? extendedSettings.border : extendedSettings.margins;
 
-	var ignoreElement = extendedSettings.ignoreElement;
-	
         //Context init
         context = {
           settings : extendedSettings,
@@ -622,7 +619,7 @@
       
       checkSettings(context);
 
-      context.entries = $gallery.find('> a, > div:not(.spinner, ' + ignoreElement + ')').toArray();
+      context.entries = $gallery.find('> a, > div:not(.spinner, #page-end)').toArray();
       if (context.entries.length === 0) return;
 
       // Randomize
diff --git a/mod/blocks.php b/mod/blocks.php
index f609164e0..56da9caf7 100644
--- a/mod/blocks.php
+++ b/mod/blocks.php
@@ -95,6 +95,7 @@ function blocks_content(&$a) {
 		'ptlabel' => t('Block Name'),
 		'profile_uid' => intval($owner),
 		'expanded' => true,
+		'novoting' => true
 	);
 
 	if($_REQUEST['title'])
@@ -106,7 +107,7 @@ function blocks_content(&$a) {
 
 	$editor = status_editor($a,$x);
 
-	$r = q("select * from item_id left join item on item_id.iid = item.id
+	$r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id
 		where item_id.uid = %d and service = 'BUILDBLOCK' order by item.created desc",
 		intval($owner)
 	);
@@ -118,6 +119,7 @@ function blocks_content(&$a) {
 		foreach($r as $rr) {
 			$element_arr = array(
 				'type'      => 'block',
+				'title'	    => $rr['title'],
 				'body'      => $rr['body'],
 				'created'   => $rr['created'],
 				'edited'    => $rr['edited'],
@@ -127,7 +129,8 @@ function blocks_content(&$a) {
 			);
 			$pages[$rr['iid']][] = array(
 				'url' => $rr['iid'],
-				'title' => $rr['sid'],
+				'name' => $rr['sid'],
+				'title' => $rr['title'],
 				'created' => $rr['created'],
 				'edited' => $rr['edited'],
 				'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
@@ -142,6 +145,7 @@ function blocks_content(&$a) {
 		'$baseurl' => $url,
 		'$title' => t('Blocks'),
 		'$name' => t('Block Name'),
+		'$blocktitle' => t('Block Title'),
 		'$created' => t('Created'),
 		'$edited' => t('Edited'),
 		'$create' => t('Create'),
diff --git a/mod/branchtopic.php b/mod/branchtopic.php
new file mode 100644
index 000000000..609cb19ec
--- /dev/null
+++ b/mod/branchtopic.php
@@ -0,0 +1,42 @@
+<?php
+
+function branchtopic_init(&$a) {
+
+	if(! local_channel())
+		return;
+
+	$item_id = 0;
+
+	if(argc() > 1)
+		$item_id = intval(argv(1));	
+
+	if(! $item_id)
+		return;
+
+	$channel = $a->get_channel();
+
+	if(! $channel)
+		return;
+
+
+	$r = q("select * from item where id = %d and uid = %d and owner_xchan = '%s' and id != parent limit 1",
+		intval($item_id),
+		intval(local_channel()),
+		dbesc($channel['channel_hash'])
+	);
+
+	if(! $r)
+		return;
+
+	$p = q("select * from item where id = %d and uid = %d limit 1",
+		intval($r[0]['parent']),
+		intval(local_channel())
+	);
+
+	$x = q("update item set parent = id, route = '', item_flags = (item_flags | %d) where id = %d",
+		intval(ITEM_THREAD_TOP),
+		intval($item_id)
+	);
+
+	return;
+}
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 11bcc10eb..a3879a381 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -23,7 +23,6 @@ function editlayout_init(&$a) {
 
 function editlayout_content(&$a) {
 
-
 	if(! $a->profile) {
 		notice( t('Requested profile is not available.') . EOL );
 		$a->error = 404;
@@ -69,7 +68,6 @@ function editlayout_content(&$a) {
 
 	$o = '';
 
-
 	// Figure out which post we're editing
 	$post_id = ((argc() > 2) ? intval(argv(2)) : 0);
 
@@ -105,7 +103,9 @@ function editlayout_content(&$a) {
 	$plaintext = true;
 
 	$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
-		'$title' => t('Edit Layout')
+		'$title' => t('Edit Layout'),
+		'$delete' => ((($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash)) ? t('Delete') : false),
+		'$id' => $itm[0]['id']
 	));
 	
 	$a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array(
@@ -161,8 +161,9 @@ function editlayout_content(&$a) {
 		'$public'              => t('Public post'),
 		'$jotnets'             => $jotnets,
 		'$title'               => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
-		'$placeholdertitle'    => t('Title (optional)'),
+		'$placeholdertitle'    => t('Layout Description (Optional)'),
 		'$pagetitle'           => $layout_title,
+		'$placeholdpagetitle'  => t('Layout Name'),
 		'$category'            => '',
 		'$placeholdercategory' => t('Categories (optional, comma-separated list)'),
 		'$emtitle'             => t('Example: bob@example.com, mary@example.com'),
@@ -176,27 +177,6 @@ function editlayout_content(&$a) {
 		'$feature_expire'      => false,
 		'$expires'             => t('Set expiration date'),
 	));
-	
-
-	if(($itm[0]['author_xchan'] === $ob_hash) || ($itm[0]['owner_xchan'] === $ob_hash))
-		$o .= '<br /><br /><a class="layout-delete-link" href="item/drop/' . $itm[0]['id'] . '" >' . t('Delete Layout') . '</a><br />';
-
-
-	$x = array(
-		'type'      => 'layout',
-		'title'     => $itm[0]['title'],
-		'body'      => $itm[0]['body'],
-		'term'      => $itm[0]['term'],
-		'created'   => $itm[0]['created'],
-		'edited'    => $itm[0]['edited'],
-		'mimetype'  => $itm[0]['mimetype'],
-		'pagetitle' => $page_title,
-		'mid'       => $itm[0]['mid']
-	);
-
-	$o .= EOL . EOL . t('Share') . EOL . '<textarea onclick="this.select();" class="shareable_element_text" >[element]' . base64url_encode(json_encode($x)) . '[/element]</textarea>' . EOL . EOL; 
-
-
 
 	return $o;
 
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index fb0d87d4a..3b0b543a6 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -188,7 +188,7 @@ function editwebpage_content(&$a) {
 		'$video' => t('Insert Vorbis [.ogg] video'),
 		'$audio' => t('Insert Vorbis [.ogg] audio'),
 		'$setloc' => t('Set your location'),
-		'$noloc' => t('Clear browser location'),
+		'$noloc' => ((get_pconfig($uid, 'system', 'use_browser_location')) ? t('Clear browser location') : ''),
 		'$wait' => t('Please wait'),
 		'$permset' => t('Permission settings'),
 		'$ptyp' => $itm[0]['type'],
diff --git a/mod/impel.php b/mod/impel.php
index 4fb9e3ac0..930158589 100644
--- a/mod/impel.php
+++ b/mod/impel.php
@@ -118,4 +118,4 @@ function impel_init(&$a) {
 
 	json_return_and_die(true);
 
-}
\ No newline at end of file
+}
diff --git a/mod/layouts.php b/mod/layouts.php
index b2be39802..b42debe18 100644
--- a/mod/layouts.php
+++ b/mod/layouts.php
@@ -88,6 +88,9 @@ function layouts_content(&$a) {
 		return;
 	}
 
+	//This feature is not exposed in redbasic ui since it is not clear why one would want to
+	//download a json encoded pdl file - we dont have a possibility to import it.
+	//Use the buildin share/install feature instead.
 	if((argc() > 3) && (argv(2) === 'share') && (argv(3))) {
 		$r = q("select sid, service, mimetype, title, body  from item_id 
 			left join item on item.id = item_id.iid 
@@ -103,18 +106,6 @@ function layouts_content(&$a) {
 		}
 	}
 
-	$tabs = array(
-		array(
-		'label' => t('Layout Help'),
-		'url'   => 'help/Comanche',
-		'sel'   => '',
-		'title' => t('Help with this feature'),
-		'id'    => 'layout-help-tab',
-	));
-
-	//$o .= replace_macros(get_markup_template('common_tabs.tpl'),array('$tabs' => $tabs));
-
-
 	// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages
 	// Nickname is set to the observers xchan, and profile_uid to the owners.  
 	// This lets you post pages at other people's channels.
@@ -123,15 +114,15 @@ function layouts_content(&$a) {
 		'webpage'     => ITEM_TYPE_PDL,
 		'is_owner'    => true,
 		'nickname'    => $a->profile['channel_address'],
-		//do we need that at this place?
-		//'lockstate'   => (($channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'),
 		'bang'        => '',
 		'showacl'     => false,
 		'visitor'     => false,
 		'nopreview'   => 1,
 		'ptlabel'     => t('Layout Name'),
 		'profile_uid' => intval($owner),
-		'expanded'    => true
+		'expanded'    => true,
+		'placeholdertitle' => t('Layout Description (Optional)'),
+		'novoting' => true
 	);
 
 	if($_REQUEST['title'])
@@ -141,11 +132,10 @@ function layouts_content(&$a) {
 	if($_REQUEST['pagetitle'])
 		$x['pagetitle'] = $_REQUEST['pagetitle'];
 
-
 	$editor = status_editor($a,$x);
 
-	$r = q("select iid, sid, mid from item_id left join item on item.id = item_id.iid 
-		where item_id.uid = %d and service = 'PDL' order by sid asc",
+	$r = q("select iid, sid, mid, title, body, mimetype, created, edited from item_id left join item on item_id.iid = item.id
+		where item_id.uid = %d and service = 'PDL' order by item.created desc",
 		intval($owner)
 	);
 
@@ -154,10 +144,24 @@ function layouts_content(&$a) {
 	if($r) {
 		$pages = array();
 		foreach($r as $rr) {
+			$element_arr = array(
+				'type'      => 'layout',
+				'title'     => $rr['title'],
+				'body'      => $rr['body'],
+				'created'   => $rr['created'],
+				'edited'    => $rr['edited'],
+				'mimetype'  => $rr['mimetype'],
+				'pagetitle' => $rr['sid'],
+				'mid'       => $rr['mid']
+			);
 			$pages[$rr['iid']][] = array(
 				'url' => $rr['iid'],
-				'title' => $rr['sid'], 
-				'mid' => $rr['mid']
+				'title' => $rr['sid'],
+				'descr' => $rr['title'],
+				'mid' => $rr['mid'],
+				'created' => $rr['created'],
+				'edited' => $rr['edited'],
+				'bb_element' => '[element]' . base64url_encode(json_encode($element_arr)) . '[/element]'
 			);
 		}
 	}
@@ -171,8 +175,13 @@ function layouts_content(&$a) {
 		'$help'    => array('text' => t('Help'), 'url' => 'help/Comanche', 'title' => t('Comanche page description language help')),
 		'$editor'  => $editor,
 		'$baseurl' => $url,
+		'$name' => t('Layout Name'),
+		'$descr' => t('Layout Description'),
+		'$created' => t('Created'),
+		'$edited' => t('Edited'),
 		'$edit'    => t('Edit'),
 		'$share'   => t('Share'),
+		'$download'   => t('Download PDL file'),
 		'$pages'   => $pages,
 		'$channel' => $which,
 		'$view'    => t('View'),
diff --git a/mod/manage.php b/mod/manage.php
index aa356abad..bb6c010f6 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -148,14 +148,16 @@ function manage_content(&$a) {
 		intval(local_channel()),
 		intval(PERMS_A_DELEGATE)
 	);
-	if(! $delegates)
-		$delegates = null;
 
 	if($delegates) {
 		for($x = 0; $x < count($delegates); $x ++) {
-				$delegates[$x]['link'] = 'magic?f=&dest=' . urlencode($delegates[$x]['xchan_url']) . '&delegate=' . urlencode($delegates[$x]['xchan_addr']);
+			$delegates[$x]['link'] = 'magic?f=&dest=' . urlencode($delegates[$x]['xchan_url']) 
+			. '&delegate=' . urlencode($delegates[$x]['xchan_addr']);
 		}
 	}
+	else {
+		$delegates = null;
+	}
 
 
 
diff --git a/mod/webpages.php b/mod/webpages.php
index 7dead3371..e04cbdc11 100644
--- a/mod/webpages.php
+++ b/mod/webpages.php
@@ -113,7 +113,8 @@ function webpages_content(&$a) {
 		'profile_uid' => intval($owner),
 		'mimetype'    => $mimetype,
 		'layout'      => $layout,
-		'expanded'    => true
+		'expanded'    => true,
+		'novoting' => true
 	);
 	
 	if($_REQUEST['title'])
@@ -149,7 +150,6 @@ function webpages_content(&$a) {
 				'type'		=> 'webpage',
 				'title'		=> $rr['title'],
 				'body'		=> $rr['body'],
-				'term'		=> $rr['term'],
 				'created'	=> $rr['created'],
 				'edited'	=> $rr['edited'],
 				'mimetype'	=> $rr['mimetype'],
diff --git a/util/messages.po b/util/messages.po
index eba7c7bb6..883ef4a5f 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-04-17.1005\n"
+"Project-Id-Version: 2015-04-24.1012\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-17 00:03-0700\n"
+"POT-Creation-Date: 2015-04-24 00:03-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -258,34 +258,35 @@ msgstr ""
 
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
 #: ../../include/RedDAV/RedBrowser.php:269 ../../include/ItemObject.php:100
-#: ../../include/apps.php:254 ../../include/menu.php:42
-#: ../../mod/settings.php:644 ../../mod/blocks.php:129 ../../mod/thing.php:227
+#: ../../include/apps.php:254 ../../include/menu.php:43
+#: ../../mod/settings.php:644 ../../mod/thing.php:227
 #: ../../mod/connections.php:382 ../../mod/connections.php:395
 #: ../../mod/connections.php:414 ../../mod/editlayout.php:139
-#: ../../mod/editwebpage.php:176 ../../mod/editpost.php:113
-#: ../../mod/menu.php:86 ../../mod/webpages.php:174
-#: ../../mod/editblock.php:143 ../../mod/layouts.php:168
+#: ../../mod/editwebpage.php:178 ../../mod/editpost.php:113
+#: ../../mod/menu.php:100 ../../mod/webpages.php:179
+#: ../../mod/editblock.php:140 ../../mod/blocks.php:148
+#: ../../mod/layouts.php:174
 msgid "Edit"
 msgstr ""
 
-#: ../../include/page_widgets.php:39 ../../mod/blocks.php:132
-#: ../../mod/webpages.php:180 ../../mod/layouts.php:172
+#: ../../include/page_widgets.php:39 ../../mod/webpages.php:185
+#: ../../mod/blocks.php:154 ../../mod/layouts.php:178
 msgid "View"
 msgstr ""
 
-#: ../../include/page_widgets.php:40 ../../include/conversation.php:1153
-#: ../../include/ItemObject.php:677 ../../mod/events.php:653
-#: ../../mod/photos.php:970 ../../mod/editlayout.php:173
-#: ../../mod/editwebpage.php:212 ../../mod/editpost.php:149
-#: ../../mod/webpages.php:181 ../../mod/editblock.php:179
+#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
+#: ../../include/conversation.php:1153 ../../mod/events.php:653
+#: ../../mod/photos.php:970 ../../mod/editwebpage.php:214
+#: ../../mod/editpost.php:149 ../../mod/webpages.php:186
+#: ../../mod/editblock.php:176
 msgid "Preview"
 msgstr ""
 
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:182
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:187
 msgid "Actions"
 msgstr ""
 
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:183
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:188
 msgid "Page Link"
 msgstr ""
 
@@ -293,701 +294,58 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: ../../include/page_widgets.php:44 ../../mod/webpages.php:185
+#: ../../include/page_widgets.php:44 ../../mod/webpages.php:190
+#: ../../mod/blocks.php:145
 msgid "Created"
 msgstr ""
 
-#: ../../include/page_widgets.php:45 ../../mod/webpages.php:186
+#: ../../include/page_widgets.php:45 ../../mod/webpages.php:191
+#: ../../mod/blocks.php:146
 msgid "Edited"
 msgstr ""
 
-#: ../../include/conversation.php:120 ../../include/text.php:1803
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:43
-msgid "photo"
-msgstr ""
-
-#: ../../include/conversation.php:123 ../../include/text.php:1806
-#: ../../mod/like.php:348 ../../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:1809
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:51
-msgid "status"
-msgstr ""
-
-#: ../../include/conversation.php:150 ../../include/text.php:1811
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr ""
-
-#: ../../include/conversation.php:164 ../../include/diaspora.php:2110
-#: ../../mod/like.php:394
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
-
-#: ../../include/conversation.php:167 ../../mod/like.php:396
-#, 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:928
-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:572 ../../mod/photos.php:984
-msgctxt "title"
-msgid "Likes"
-msgstr ""
-
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
-msgctxt "title"
-msgid "Dislikes"
-msgstr ""
-
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
-msgctxt "title"
-msgid "Agree"
-msgstr ""
-
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
-msgctxt "title"
-msgid "Disagree"
-msgstr ""
-
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
-msgctxt "title"
-msgid "Abstain"
-msgstr ""
-
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
-msgctxt "title"
-msgid "Attending"
-msgstr ""
-
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
-msgctxt "title"
-msgid "Not attending"
-msgstr ""
-
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
-msgctxt "title"
-msgid "Might attend"
-msgstr ""
-
-#: ../../include/conversation.php:659 ../../include/ItemObject.php:126
-msgid "Select"
-msgstr ""
-
-#: ../../include/conversation.php:660 ../../include/RedDAV/RedBrowser.php:270
-#: ../../include/ItemObject.php:120 ../../include/apps.php:255
-#: ../../mod/settings.php:645 ../../mod/thing.php:228 ../../mod/group.php:176
-#: ../../mod/photos.php:1050 ../../mod/webpages.php:176
-#: ../../mod/admin.php:817 ../../mod/admin.php:948 ../../mod/connedit.php:543
-msgid "Delete"
-msgstr ""
-
-#: ../../include/conversation.php:667 ../../include/ItemObject.php:89
-msgid "Private Message"
-msgstr ""
-
-#: ../../include/conversation.php:674 ../../include/ItemObject.php:227
-msgid "Message signature validated"
-msgstr ""
-
-#: ../../include/conversation.php:675 ../../include/ItemObject.php:228
-msgid "Message signature incorrect"
-msgstr ""
-
-#: ../../include/conversation.php:692
-#, php-format
-msgid "View %s's profile @ %s"
-msgstr ""
-
-#: ../../include/conversation.php:707
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/conversation.php:708
-msgid "Filed under:"
-msgstr ""
-
-#: ../../include/conversation.php:716 ../../include/ItemObject.php:312
-#, php-format
-msgid "from %s"
-msgstr ""
-
-#: ../../include/conversation.php:719 ../../include/ItemObject.php:315
-#, php-format
-msgid "last edited: %s"
-msgstr ""
-
-#: ../../include/conversation.php:720 ../../include/ItemObject.php:316
-#, php-format
-msgid "Expires: %s"
-msgstr ""
-
-#: ../../include/conversation.php:735
-msgid "View in context"
-msgstr ""
-
-#: ../../include/conversation.php:737 ../../include/conversation.php:1206
-#: ../../include/ItemObject.php:364 ../../mod/photos.php:950
-#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:190
-#: ../../mod/editpost.php:130 ../../mod/editblock.php:158
-#: ../../mod/mail.php:241 ../../mod/mail.php:356
-msgid "Please wait"
-msgstr ""
-
-#: ../../include/conversation.php:846
-msgid "remove"
-msgstr ""
-
-#: ../../include/conversation.php:850 ../../include/nav.php:247
-msgid "Loading..."
-msgstr ""
-
-#: ../../include/conversation.php:851
-msgid "Delete Selected Items"
-msgstr ""
-
-#: ../../include/conversation.php:939
-msgid "View Source"
-msgstr ""
-
-#: ../../include/conversation.php:940
-msgid "Follow Thread"
-msgstr ""
-
-#: ../../include/conversation.php:941
-msgid "View Status"
-msgstr ""
-
-#: ../../include/conversation.php:942 ../../include/nav.php:91
-#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
-msgid "View Profile"
-msgstr ""
-
-#: ../../include/conversation.php:943
-msgid "View Photos"
-msgstr ""
-
-#: ../../include/conversation.php:944
-msgid "Matrix Activity"
-msgstr ""
-
-#: ../../include/conversation.php:945 ../../include/widgets.php:136
-#: ../../include/widgets.php:175 ../../include/Contact.php:107
-#: ../../include/identity.php:823 ../../mod/match.php:64
-#: ../../mod/directory.php:298 ../../mod/suggest.php:52
-msgid "Connect"
-msgstr ""
-
-#: ../../include/conversation.php:946
-msgid "Edit Contact"
-msgstr ""
-
-#: ../../include/conversation.php:947
-msgid "Send PM"
-msgstr ""
-
-#: ../../include/conversation.php:948 ../../include/apps.php:145
-msgid "Poke"
-msgstr ""
-
-#: ../../include/conversation.php:1019 ../../include/RedDAV/RedBrowser.php:164
-#: ../../include/apps.php:336 ../../include/apps.php:387
-#: ../../mod/photos.php:681 ../../mod/photos.php:1119
-msgid "Unknown"
-msgstr ""
-
-#: ../../include/conversation.php:1062
-#, php-format
-msgid "%s likes this."
-msgstr ""
-
-#: ../../include/conversation.php:1062
-#, php-format
-msgid "%s doesn't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1066
-#, 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:1068
-#, 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:1074
-msgid "and"
-msgstr ""
-
-#: ../../include/conversation.php:1077
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1078
-#, php-format
-msgid "%s like this."
-msgstr ""
-
-#: ../../include/conversation.php:1078
-#, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1138
-msgid "Visible to <strong>everybody</strong>"
-msgstr ""
-
-#: ../../include/conversation.php:1139 ../../mod/mail.php:174
-#: ../../mod/mail.php:289
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1140
-msgid "Please enter a video link/URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1141
-msgid "Please enter an audio link/URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1142
-msgid "Tag term:"
-msgstr ""
-
-#: ../../include/conversation.php:1143 ../../mod/filer.php:49
-msgid "Save to Folder:"
-msgstr ""
-
-#: ../../include/conversation.php:1144
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../include/conversation.php:1145 ../../mod/editpost.php:52
-#: ../../mod/mail.php:175 ../../mod/mail.php:290
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr ""
-
-#: ../../include/conversation.php:1172 ../../mod/photos.php:949
-#: ../../mod/editlayout.php:198 ../../mod/webpages.php:175
-#: ../../mod/editblock.php:204 ../../mod/layouts.php:169
-msgid "Share"
-msgstr ""
-
-#: ../../include/conversation.php:1174
-msgid "Page link name"
-msgstr ""
-
-#: ../../include/conversation.php:1177
-msgid "Post as"
-msgstr ""
-
-#: ../../include/conversation.php:1179 ../../include/ItemObject.php:669
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:177
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:144
-msgid "Bold"
-msgstr ""
-
-#: ../../include/conversation.php:1180 ../../include/ItemObject.php:670
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:178
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:145
-msgid "Italic"
-msgstr ""
-
-#: ../../include/conversation.php:1181 ../../include/ItemObject.php:671
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:179
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:146
-msgid "Underline"
-msgstr ""
-
-#: ../../include/conversation.php:1182 ../../include/ItemObject.php:672
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:180
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:147
-msgid "Quote"
-msgstr ""
-
-#: ../../include/conversation.php:1183 ../../include/ItemObject.php:673
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:181
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:148
-msgid "Code"
-msgstr ""
-
-#: ../../include/conversation.php:1184 ../../mod/editlayout.php:145
-#: ../../mod/editwebpage.php:182 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:150 ../../mod/mail.php:238 ../../mod/mail.php:352
-msgid "Upload photo"
-msgstr ""
-
-#: ../../include/conversation.php:1185
-msgid "upload photo"
-msgstr ""
-
-#: ../../include/conversation.php:1186 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:183 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:151 ../../mod/mail.php:239 ../../mod/mail.php:353
-msgid "Attach file"
-msgstr ""
-
-#: ../../include/conversation.php:1187
-msgid "attach file"
-msgstr ""
-
-#: ../../include/conversation.php:1188 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:184 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:152 ../../mod/mail.php:240 ../../mod/mail.php:354
-msgid "Insert web link"
-msgstr ""
-
-#: ../../include/conversation.php:1189
-msgid "web link"
-msgstr ""
-
-#: ../../include/conversation.php:1190
-msgid "Insert video link"
-msgstr ""
-
-#: ../../include/conversation.php:1191
-msgid "video link"
-msgstr ""
-
-#: ../../include/conversation.php:1192
-msgid "Insert audio link"
-msgstr ""
-
-#: ../../include/conversation.php:1193
-msgid "audio link"
-msgstr ""
-
-#: ../../include/conversation.php:1194 ../../mod/editlayout.php:151
-#: ../../mod/editwebpage.php:188 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:156
-msgid "Set your location"
-msgstr ""
-
-#: ../../include/conversation.php:1195
-msgid "set location"
-msgstr ""
-
-#: ../../include/conversation.php:1196 ../../mod/editpost.php:127
-msgid "Toggle voting"
-msgstr ""
-
-#: ../../include/conversation.php:1199 ../../mod/editlayout.php:152
-#: ../../mod/editwebpage.php:189 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:157
-msgid "Clear browser location"
-msgstr ""
-
-#: ../../include/conversation.php:1200
-msgid "clear location"
-msgstr ""
-
-#: ../../include/conversation.php:1202 ../../mod/editlayout.php:164
-#: ../../mod/editwebpage.php:205 ../../mod/editpost.php:141
-#: ../../mod/editblock.php:170
-msgid "Title (optional)"
-msgstr ""
-
-#: ../../include/conversation.php:1205 ../../mod/editlayout.php:167
-#: ../../mod/editwebpage.php:207 ../../mod/editpost.php:143
-#: ../../mod/editblock.php:173
-msgid "Categories (optional, comma-separated list)"
-msgstr ""
-
-#: ../../include/conversation.php:1207 ../../mod/editlayout.php:154
-#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:159
-msgid "Permission settings"
-msgstr ""
-
-#: ../../include/conversation.php:1208
-msgid "permissions"
-msgstr ""
-
-#: ../../include/conversation.php:1216 ../../mod/editlayout.php:161
-#: ../../mod/editwebpage.php:200 ../../mod/editpost.php:138
-#: ../../mod/editblock.php:167
-msgid "Public post"
-msgstr ""
-
-#: ../../include/conversation.php:1218 ../../mod/editlayout.php:168
-#: ../../mod/editwebpage.php:208 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:174
-msgid "Example: bob@example.com, mary@example.com"
-msgstr ""
-
-#: ../../include/conversation.php:1231 ../../mod/editlayout.php:178
-#: ../../mod/editwebpage.php:217 ../../mod/editpost.php:155
-#: ../../mod/editblock.php:184 ../../mod/mail.php:245 ../../mod/mail.php:359
-msgid "Set expiration date"
-msgstr ""
-
-#: ../../include/conversation.php:1233 ../../include/ItemObject.php:680
-#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:361
-msgid "Encrypt text"
-msgstr ""
-
-#: ../../include/conversation.php:1235 ../../mod/events.php:637
-#: ../../mod/editpost.php:159
-msgid "OK"
-msgstr ""
-
-#: ../../include/conversation.php:1236 ../../mod/settings.php:583
-#: ../../mod/settings.php:609 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-#: ../../mod/events.php:636 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
-msgid "Cancel"
-msgstr ""
-
-#: ../../include/conversation.php:1477
-msgid "Discover"
-msgstr ""
-
-#: ../../include/conversation.php:1480
-msgid "Imported public streams"
-msgstr ""
-
-#: ../../include/conversation.php:1485
-msgid "Commented Order"
-msgstr ""
-
-#: ../../include/conversation.php:1488
-msgid "Sort by Comment Date"
-msgstr ""
-
-#: ../../include/conversation.php:1492
-msgid "Posted Order"
-msgstr ""
-
-#: ../../include/conversation.php:1495
-msgid "Sort by Post Date"
-msgstr ""
-
-#: ../../include/conversation.php:1500 ../../include/widgets.php:94
-msgid "Personal"
-msgstr ""
-
-#: ../../include/conversation.php:1503
-msgid "Posts that mention or involve you"
-msgstr ""
-
-#: ../../include/conversation.php:1509 ../../mod/connections.php:212
-#: ../../mod/connections.php:225 ../../mod/menu.php:88
-msgid "New"
-msgstr ""
-
-#: ../../include/conversation.php:1512
-msgid "Activity Stream - by date"
-msgstr ""
-
-#: ../../include/conversation.php:1518
-msgid "Starred"
-msgstr ""
-
-#: ../../include/conversation.php:1521
-msgid "Favourite Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1528
-msgid "Spam"
-msgstr ""
-
-#: ../../include/conversation.php:1531
-msgid "Posts flagged as SPAM"
-msgstr ""
-
-#: ../../include/conversation.php:1575 ../../mod/admin.php:952
-msgid "Channel"
-msgstr ""
-
-#: ../../include/conversation.php:1578
-msgid "Status Messages and Posts"
-msgstr ""
-
-#: ../../include/conversation.php:1587
-msgid "About"
-msgstr ""
-
-#: ../../include/conversation.php:1590
-msgid "Profile Details"
-msgstr ""
-
-#: ../../include/conversation.php:1596 ../../include/nav.php:97
-#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
-msgid "Photos"
-msgstr ""
-
-#: ../../include/conversation.php:1599 ../../include/photos.php:359
-msgid "Photo Albums"
-msgstr ""
-
-#: ../../include/conversation.php:1605 ../../include/RedDAV/RedBrowser.php:251
-#: ../../include/nav.php:98 ../../include/apps.php:135
-#: ../../mod/fbrowser.php:114
-msgid "Files"
-msgstr ""
-
-#: ../../include/conversation.php:1608
-msgid "Files and Storage"
-msgstr ""
-
-#: ../../include/conversation.php:1618 ../../include/conversation.php:1621
-msgid "Chatrooms"
-msgstr ""
-
-#: ../../include/conversation.php:1631 ../../include/nav.php:109
-#: ../../include/apps.php:129
-msgid "Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1634
-msgid "Saved Bookmarks"
-msgstr ""
-
-#: ../../include/conversation.php:1641 ../../include/nav.php:113
-#: ../../include/apps.php:136 ../../mod/webpages.php:171
-msgid "Webpages"
-msgstr ""
-
-#: ../../include/conversation.php:1644
-msgid "Manage Webpages"
+#: ../../include/api.php:1158
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/conversation.php:1673 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1003
-#: ../../mod/photos.php:1015
-msgid "View all"
+#: ../../include/comanche.php:34 ../../mod/admin.php:386
+#: ../../view/theme/apw/php/config.php:185
+msgid "Default"
 msgstr ""
 
-#: ../../include/conversation.php:1697 ../../include/ItemObject.php:179
-#: ../../include/taxonomy.php:396 ../../include/identity.php:1133
-#: ../../mod/photos.php:1007
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1700 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1012
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1703
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1706
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1709
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1712
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1715
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1718
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/dir_fns.php:137
+#: ../../include/dir_fns.php:143
 msgid "Directory Options"
 msgstr ""
 
-#: ../../include/dir_fns.php:138
+#: ../../include/dir_fns.php:144
 msgid "Alphabetic"
 msgstr ""
 
-#: ../../include/dir_fns.php:139
+#: ../../include/dir_fns.php:145
 msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../include/dir_fns.php:140
+#: ../../include/dir_fns.php:146
 msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../include/dir_fns.php:141
+#: ../../include/dir_fns.php:147
 msgid "Oldest to Newest"
 msgstr ""
 
-#: ../../include/dir_fns.php:142
+#: ../../include/dir_fns.php:148
 msgid "Sort"
 msgstr ""
 
-#: ../../include/dir_fns.php:146
+#: ../../include/dir_fns.php:152
 msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/dir_fns.php:148
+#: ../../include/dir_fns.php:154
 msgid "Public Forums Only"
 msgstr ""
 
-#: ../../include/dir_fns.php:149
+#: ../../include/dir_fns.php:155
 msgid "This Website Only"
 msgstr ""
 
@@ -1005,7 +363,7 @@ msgstr ""
 
 #: ../../include/event.php:47 ../../include/bb2diaspora.php:473
 #: ../../include/identity.php:874 ../../mod/events.php:647
-#: ../../mod/directory.php:230
+#: ../../mod/directory.php:234
 msgid "Location:"
 msgstr ""
 
@@ -1095,13 +453,13 @@ msgstr ""
 #: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105
 #: ../../mod/sources.php:104 ../../mod/sources.php:138
 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108
-#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/admin.php:446
-#: ../../mod/admin.php:810 ../../mod/admin.php:946 ../../mod/admin.php:1077
-#: ../../mod/admin.php:1271 ../../mod/admin.php:1356 ../../mod/mood.php:134
-#: ../../mod/connedit.php:679 ../../mod/mail.php:355 ../../mod/appman.php:99
-#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
+#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/mitem.php:229
+#: ../../mod/admin.php:446 ../../mod/admin.php:810 ../../mod/admin.php:946
+#: ../../mod/admin.php:1077 ../../mod/admin.php:1271 ../../mod/admin.php:1356
+#: ../../mod/mood.php:134 ../../mod/connedit.php:679 ../../mod/mail.php:355
+#: ../../mod/appman.php:99 ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
 #: ../../view/theme/apw/php/config.php:256
-#: ../../view/theme/redbasic/php/config.php:97 ../../wppost/wppost.php:104
+#: ../../view/theme/redbasic/php/config.php:97
 msgid "Submit"
 msgstr ""
 
@@ -1109,76 +467,80 @@ msgstr ""
 msgid "Please enter a link URL"
 msgstr ""
 
-#: ../../include/js_strings.php:25
-msgid "timeago.prefixAgo"
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr ""
 
 #: ../../include/js_strings.php:26
-msgid "timeago.prefixFromNow"
+msgid "timeago.prefixAgo"
 msgstr ""
 
 #: ../../include/js_strings.php:27
-msgid "ago"
+msgid "timeago.prefixFromNow"
 msgstr ""
 
 #: ../../include/js_strings.php:28
-msgid "from now"
+msgid "ago"
 msgstr ""
 
 #: ../../include/js_strings.php:29
-msgid "less than a minute"
+msgid "from now"
 msgstr ""
 
 #: ../../include/js_strings.php:30
-msgid "about a minute"
+msgid "less than a minute"
 msgstr ""
 
 #: ../../include/js_strings.php:31
+msgid "about a minute"
+msgstr ""
+
+#: ../../include/js_strings.php:32
 #, php-format
 msgid "%d minutes"
 msgstr ""
 
-#: ../../include/js_strings.php:32
+#: ../../include/js_strings.php:33
 msgid "about an hour"
 msgstr ""
 
-#: ../../include/js_strings.php:33
+#: ../../include/js_strings.php:34
 #, php-format
 msgid "about %d hours"
 msgstr ""
 
-#: ../../include/js_strings.php:34
+#: ../../include/js_strings.php:35
 msgid "a day"
 msgstr ""
 
-#: ../../include/js_strings.php:35
+#: ../../include/js_strings.php:36
 #, php-format
 msgid "%d days"
 msgstr ""
 
-#: ../../include/js_strings.php:36
+#: ../../include/js_strings.php:37
 msgid "about a month"
 msgstr ""
 
-#: ../../include/js_strings.php:37
+#: ../../include/js_strings.php:38
 #, php-format
 msgid "%d months"
 msgstr ""
 
-#: ../../include/js_strings.php:38
+#: ../../include/js_strings.php:39
 msgid "about a year"
 msgstr ""
 
-#: ../../include/js_strings.php:39
+#: ../../include/js_strings.php:40
 #, php-format
 msgid "%d years"
 msgstr ""
 
-#: ../../include/js_strings.php:40
+#: ../../include/js_strings.php:41
 msgid " "
 msgstr ""
 
-#: ../../include/js_strings.php:41
+#: ../../include/js_strings.php:42
 msgid "timeago.numbers"
 msgstr ""
 
@@ -1187,7 +549,7 @@ msgstr ""
 msgid "parent"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2468
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2479
 msgid "Collection"
 msgstr ""
 
@@ -1211,6 +573,12 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019
+#: ../../include/apps.php:336 ../../include/apps.php:387
+#: ../../mod/photos.php:681 ../../mod/photos.php:1119
+msgid "Unknown"
+msgstr ""
+
 #: ../../include/RedDAV/RedBrowser.php:227
 #, php-format
 msgid "%1$s used"
@@ -1221,6 +589,12 @@ msgstr ""
 msgid "%1$s used of %2$s (%3$s&#37;)"
 msgstr ""
 
+#: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98
+#: ../../include/conversation.php:1606 ../../include/apps.php:135
+#: ../../mod/fbrowser.php:114
+msgid "Files"
+msgstr ""
+
 #: ../../include/RedDAV/RedBrowser.php:253
 msgid "Total"
 msgstr ""
@@ -1230,9 +604,9 @@ msgid "Shared"
 msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:256
-#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/menu.php:109
-#: ../../mod/webpages.php:173 ../../mod/mitem.php:169
-#: ../../mod/new_channel.php:121
+#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/menu.php:104
+#: ../../mod/webpages.php:178 ../../mod/blocks.php:147
+#: ../../mod/layouts.php:170 ../../mod/new_channel.php:121
 msgid "Create"
 msgstr ""
 
@@ -1260,6 +634,16 @@ msgstr ""
 msgid "Last Modified"
 msgstr ""
 
+#: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120
+#: ../../include/conversation.php:660 ../../include/apps.php:255
+#: ../../mod/settings.php:645 ../../mod/thing.php:228 ../../mod/group.php:176
+#: ../../mod/photos.php:1050 ../../mod/editwebpage.php:225
+#: ../../mod/webpages.php:181 ../../mod/admin.php:817 ../../mod/admin.php:948
+#: ../../mod/editblock.php:113 ../../mod/blocks.php:150
+#: ../../mod/connedit.php:543
+msgid "Delete"
+msgstr ""
+
 #: ../../include/RedDAV/RedBrowser.php:305
 msgid "Create new folder"
 msgstr ""
@@ -1538,6 +922,10 @@ msgstr ""
 msgid "System"
 msgstr ""
 
+#: ../../include/widgets.php:94 ../../include/conversation.php:1501
+msgid "Personal"
+msgstr ""
+
 #: ../../include/widgets.php:95
 msgid "Create Personal App"
 msgstr ""
@@ -1546,6 +934,13 @@ msgstr ""
 msgid "Edit Personal App"
 msgstr ""
 
+#: ../../include/widgets.php:136 ../../include/widgets.php:175
+#: ../../include/Contact.php:107 ../../include/conversation.php:945
+#: ../../include/identity.php:823 ../../mod/match.php:64
+#: ../../mod/directory.php:302 ../../mod/suggest.php:52
+msgid "Connect"
+msgstr ""
+
 #: ../../include/widgets.php:138 ../../mod/suggest.php:54
 msgid "Ignore/Hide"
 msgstr ""
@@ -2020,6 +1415,14 @@ msgstr ""
 msgid "Cannot connect to yourself."
 msgstr ""
 
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:667
+msgid "Private Message"
+msgstr ""
+
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:659
+msgid "Select"
+msgstr ""
+
 #: ../../include/ItemObject.php:130
 msgid "Save to Folder"
 msgstr ""
@@ -2048,6 +1451,29 @@ msgstr ""
 msgid "I abstain"
 msgstr ""
 
+#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
+#: ../../include/conversation.php:1674 ../../mod/photos.php:1003
+#: ../../mod/photos.php:1015
+msgid "View all"
+msgstr ""
+
+#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
+#: ../../include/conversation.php:1698 ../../include/identity.php:1133
+#: ../../mod/photos.php:1007
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1701
+#: ../../mod/photos.php:1012
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../../include/ItemObject.php:212
 msgid "Add Star"
 msgstr ""
@@ -2064,6 +1490,14 @@ msgstr ""
 msgid "starred"
 msgstr ""
 
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:674
+msgid "Message signature validated"
+msgstr ""
+
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:675
+msgid "Message signature incorrect"
+msgstr ""
+
 #: ../../include/ItemObject.php:236
 msgid "Add Tag"
 msgstr ""
@@ -2120,6 +1554,21 @@ msgstr ""
 msgid "via Wall-To-Wall:"
 msgstr ""
 
+#: ../../include/ItemObject.php:312 ../../include/conversation.php:716
+#, php-format
+msgid "from %s"
+msgstr ""
+
+#: ../../include/ItemObject.php:315 ../../include/conversation.php:719
+#, php-format
+msgid "last edited: %s"
+msgstr ""
+
+#: ../../include/ItemObject.php:316 ../../include/conversation.php:720
+#, php-format
+msgid "Expires: %s"
+msgstr ""
+
 #: ../../include/ItemObject.php:337
 msgid "Save Bookmarks"
 msgstr ""
@@ -2147,11 +1596,49 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: ../../include/ItemObject.php:364 ../../include/conversation.php:737
+#: ../../include/conversation.php:1206 ../../mod/photos.php:950
+#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192
+#: ../../mod/editpost.php:130 ../../mod/editblock.php:155
+#: ../../mod/mail.php:241 ../../mod/mail.php:356
+msgid "Please wait"
+msgstr ""
+
 #: ../../include/ItemObject.php:665 ../../mod/photos.php:966
 #: ../../mod/photos.php:1084
 msgid "This is you"
 msgstr ""
 
+#: ../../include/ItemObject.php:669 ../../include/conversation.php:1179
+#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179
+#: ../../mod/editpost.php:114 ../../mod/editblock.php:141
+msgid "Bold"
+msgstr ""
+
+#: ../../include/ItemObject.php:670 ../../include/conversation.php:1180
+#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180
+#: ../../mod/editpost.php:115 ../../mod/editblock.php:142
+msgid "Italic"
+msgstr ""
+
+#: ../../include/ItemObject.php:671 ../../include/conversation.php:1181
+#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181
+#: ../../mod/editpost.php:116 ../../mod/editblock.php:143
+msgid "Underline"
+msgstr ""
+
+#: ../../include/ItemObject.php:672 ../../include/conversation.php:1182
+#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182
+#: ../../mod/editpost.php:117 ../../mod/editblock.php:144
+msgid "Quote"
+msgstr ""
+
+#: ../../include/ItemObject.php:673 ../../include/conversation.php:1183
+#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183
+#: ../../mod/editpost.php:118 ../../mod/editblock.php:145
+msgid "Code"
+msgstr ""
+
 #: ../../include/ItemObject.php:674
 msgid "Image"
 msgstr ""
@@ -2164,6 +1651,11 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
+#: ../../include/ItemObject.php:680 ../../include/conversation.php:1233
+#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:361
+msgid "Encrypt text"
+msgstr ""
+
 #: ../../include/Contact.php:124
 msgid "New window"
 msgstr ""
@@ -2234,6 +1726,10 @@ msgstr ""
 msgid "poke"
 msgstr ""
 
+#: ../../include/text.php:928 ../../include/conversation.php:243
+msgid "poked"
+msgstr ""
+
 #: ../../include/text.php:929
 msgid "ping"
 msgstr ""
@@ -2434,72 +1930,96 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1225
+#: ../../include/text.php:1236
 msgid "unknown.???"
 msgstr ""
 
-#: ../../include/text.php:1226
+#: ../../include/text.php:1237
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:1262
+#: ../../include/text.php:1273
 msgid "remove category"
 msgstr ""
 
-#: ../../include/text.php:1337
+#: ../../include/text.php:1348
 msgid "remove from file"
 msgstr ""
 
-#: ../../include/text.php:1413 ../../include/text.php:1424
+#: ../../include/text.php:1424 ../../include/text.php:1435
 #: ../../mod/connedit.php:661
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1580 ../../mod/events.php:444
+#: ../../include/text.php:1591 ../../mod/events.php:444
 msgid "Link to Source"
 msgstr ""
 
-#: ../../include/text.php:1601 ../../include/text.php:1672
+#: ../../include/text.php:1612 ../../include/text.php:1683
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1609
+#: ../../include/text.php:1620
 msgid "Page layout"
 msgstr ""
 
-#: ../../include/text.php:1609
+#: ../../include/text.php:1620
 msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/text.php:1650
+#: ../../include/text.php:1661
 msgid "Page content type"
 msgstr ""
 
-#: ../../include/text.php:1684
+#: ../../include/text.php:1695
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1816
+#: ../../include/text.php:1814 ../../include/conversation.php:120
+#: ../../include/diaspora.php:2081 ../../mod/like.php:346
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:43
+msgid "photo"
+msgstr ""
+
+#: ../../include/text.php:1817 ../../include/conversation.php:123
+#: ../../mod/like.php:348 ../../mod/tagger.php:47
+msgid "event"
+msgstr ""
+
+#: ../../include/text.php:1820 ../../include/conversation.php:148
+#: ../../include/diaspora.php:2081 ../../mod/like.php:346
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:51
+msgid "status"
+msgstr ""
+
+#: ../../include/text.php:1822 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr ""
+
+#: ../../include/text.php:1827
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:2111
+#: ../../include/text.php:2122
 msgid "Design Tools"
 msgstr ""
 
-#: ../../include/text.php:2114
+#: ../../include/text.php:2125 ../../mod/blocks.php:143
 msgid "Blocks"
 msgstr ""
 
-#: ../../include/text.php:2115
+#: ../../include/text.php:2126 ../../mod/menu.php:95
 msgid "Menus"
 msgstr ""
 
-#: ../../include/text.php:2116
+#: ../../include/text.php:2127 ../../mod/layouts.php:169
 msgid "Layouts"
 msgstr ""
 
-#: ../../include/text.php:2117
+#: ../../include/text.php:2128
 msgid "Pages"
 msgstr ""
 
@@ -2519,6 +2039,11 @@ msgstr ""
 msgid "Your posts and conversations"
 msgstr ""
 
+#: ../../include/nav.php:91 ../../include/conversation.php:942
+#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
+msgid "View Profile"
+msgstr ""
+
 #: ../../include/nav.php:91
 msgid "Your profile page"
 msgstr ""
@@ -2539,6 +2064,11 @@ msgstr ""
 msgid "Edit your profile"
 msgstr ""
 
+#: ../../include/nav.php:97 ../../include/conversation.php:1597
+#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr ""
+
 #: ../../include/nav.php:97
 msgid "Your photos"
 msgstr ""
@@ -2555,10 +2085,20 @@ msgstr ""
 msgid "Your chatrooms"
 msgstr ""
 
+#: ../../include/nav.php:109 ../../include/conversation.php:1632
+#: ../../include/apps.php:129
+msgid "Bookmarks"
+msgstr ""
+
 #: ../../include/nav.php:109
 msgid "Your bookmarks"
 msgstr ""
 
+#: ../../include/nav.php:113 ../../include/conversation.php:1642
+#: ../../include/apps.php:136 ../../mod/webpages.php:176
+msgid "Webpages"
+msgstr ""
+
 #: ../../include/nav.php:113
 msgid "Your webpages"
 msgstr ""
@@ -2597,7 +2137,7 @@ msgid "Create an account"
 msgstr ""
 
 #: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:67
-#: ../../mod/help.php:72
+#: ../../mod/help.php:72 ../../mod/layouts.php:171
 msgid "Help"
 msgstr ""
 
@@ -2614,7 +2154,7 @@ msgid "Search site content"
 msgstr ""
 
 #: ../../include/nav.php:168 ../../include/apps.php:141
-#: ../../mod/directory.php:362
+#: ../../mod/directory.php:366
 msgid "Directory"
 msgstr ""
 
@@ -2708,7 +2248,7 @@ msgid "Mark all events seen"
 msgstr ""
 
 #: ../../include/nav.php:206 ../../include/apps.php:132
-#: ../../mod/manage.php:164
+#: ../../mod/manage.php:166
 msgid "Channel Manager"
 msgstr ""
 
@@ -2728,6 +2268,10 @@ msgstr ""
 msgid "Site Setup and Configuration"
 msgstr ""
 
+#: ../../include/nav.php:247 ../../include/conversation.php:850
+msgid "Loading..."
+msgstr ""
+
 #: ../../include/nav.php:252
 msgid "@name, #tag, content"
 msgstr ""
@@ -2893,8 +2437,7 @@ msgstr ""
 #: ../../mod/profile.php:64 ../../mod/profile.php:72
 #: ../../mod/achievements.php:30 ../../mod/manage.php:6
 #: ../../mod/settings.php:564 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/blocks.php:69 ../../mod/blocks.php:77 ../../mod/thing.php:241
-#: ../../mod/thing.php:256 ../../mod/thing.php:290
+#: ../../mod/thing.php:241 ../../mod/thing.php:256 ../../mod/thing.php:290
 #: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
 #: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
 #: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/setup.php:207
@@ -2902,51 +2445,51 @@ msgstr ""
 #: ../../mod/photos.php:68 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
 #: ../../mod/editlayout.php:64 ../../mod/editlayout.php:89
 #: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64
-#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:118
-#: ../../mod/rate.php:110 ../../mod/editpost.php:13 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
-#: ../../mod/menu.php:69 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
-#: ../../mod/poke.php:128 ../../mod/profiles.php:188
-#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14
-#: ../../mod/webpages.php:69 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/editblock.php:65
-#: ../../mod/register.php:72 ../../mod/item.php:206 ../../mod/item.php:214
-#: ../../mod/item.php:962 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/id.php:71 ../../mod/message.php:16
-#: ../../mod/mitem.php:106 ../../mod/mood.php:111 ../../mod/connedit.php:331
-#: ../../mod/mail.php:114 ../../mod/notifications.php:66
-#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/appman.php:66
-#: ../../mod/network.php:12 ../../mod/page.php:28 ../../mod/page.php:79
-#: ../../mod/bookmarks.php:46 ../../mod/channel.php:100
+#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101
+#: ../../mod/editwebpage.php:125 ../../mod/rate.php:110
+#: ../../mod/editpost.php:13 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/locs.php:77 ../../mod/sources.php:66 ../../mod/menu.php:69
+#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
+#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
+#: ../../mod/fsuggest.php:78 ../../mod/poke.php:128 ../../mod/webpages.php:69
+#: ../../mod/profiles.php:188 ../../mod/profiles.php:576
+#: ../../mod/viewsrc.php:14 ../../mod/mitem.php:115
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/editblock.php:65 ../../mod/register.php:72 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:962 ../../mod/blocks.php:69
+#: ../../mod/blocks.php:76 ../../mod/id.php:71 ../../mod/message.php:16
+#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
+#: ../../mod/mood.php:111 ../../mod/connedit.php:331 ../../mod/mail.php:114
+#: ../../mod/notifications.php:66 ../../mod/regmod.php:17
+#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
+#: ../../mod/appman.php:66 ../../mod/network.php:12 ../../mod/page.php:28
+#: ../../mod/page.php:79 ../../mod/bookmarks.php:46 ../../mod/channel.php:100
 #: ../../mod/channel.php:219 ../../mod/channel.php:262
 #: ../../mod/suggest.php:26 ../../mod/service_limits.php:7
 #: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393
 msgid "Permission denied."
 msgstr ""
 
-#: ../../include/items.php:4518 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4524 ../../mod/group.php:38 ../../mod/group.php:140
 #: ../../mod/bulksetclose.php:51
 msgid "Collection not found."
 msgstr ""
 
-#: ../../include/items.php:4534
+#: ../../include/items.php:4540
 msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/items.php:4541
+#: ../../include/items.php:4547
 #, php-format
 msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/items.php:4551
+#: ../../include/items.php:4557
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/items.php:4553
+#: ../../include/items.php:4559
 msgid "Connection not found."
 msgstr ""
 
@@ -3087,10 +2630,480 @@ msgstr ""
 msgid "Custom/Expert Mode"
 msgstr ""
 
-#: ../../include/api.php:1095
-msgid "Public Timeline"
+#: ../../include/conversation.php:126 ../../mod/like.php:113
+msgid "channel"
+msgstr ""
+
+#: ../../include/conversation.php:164 ../../include/diaspora.php:2110
+#: ../../mod/like.php:394
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
+
+#: ../../include/conversation.php:167 ../../mod/like.php:396
+#, 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:572 ../../mod/photos.php:984
+msgctxt "title"
+msgid "Likes"
+msgstr ""
+
+#: ../../include/conversation.php:572 ../../mod/photos.php:984
+msgctxt "title"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../include/conversation.php:573 ../../mod/photos.php:985
+msgctxt "title"
+msgid "Agree"
+msgstr ""
+
+#: ../../include/conversation.php:573 ../../mod/photos.php:985
+msgctxt "title"
+msgid "Disagree"
+msgstr ""
+
+#: ../../include/conversation.php:573 ../../mod/photos.php:985
+msgctxt "title"
+msgid "Abstain"
+msgstr ""
+
+#: ../../include/conversation.php:574 ../../mod/photos.php:986
+msgctxt "title"
+msgid "Attending"
+msgstr ""
+
+#: ../../include/conversation.php:574 ../../mod/photos.php:986
+msgctxt "title"
+msgid "Not attending"
+msgstr ""
+
+#: ../../include/conversation.php:574 ../../mod/photos.php:986
+msgctxt "title"
+msgid "Might attend"
+msgstr ""
+
+#: ../../include/conversation.php:692
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: ../../include/conversation.php:707
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/conversation.php:708
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:735
+msgid "View in context"
+msgstr ""
+
+#: ../../include/conversation.php:846
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:851
+msgid "Delete Selected Items"
+msgstr ""
+
+#: ../../include/conversation.php:939
+msgid "View Source"
+msgstr ""
+
+#: ../../include/conversation.php:940
+msgid "Follow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:941
+msgid "View Status"
+msgstr ""
+
+#: ../../include/conversation.php:943
+msgid "View Photos"
+msgstr ""
+
+#: ../../include/conversation.php:944
+msgid "Matrix Activity"
+msgstr ""
+
+#: ../../include/conversation.php:946
+msgid "Edit Contact"
+msgstr ""
+
+#: ../../include/conversation.php:947
+msgid "Send PM"
+msgstr ""
+
+#: ../../include/conversation.php:948 ../../include/apps.php:145
+msgid "Poke"
+msgstr ""
+
+#: ../../include/conversation.php:1062
+#, php-format
+msgid "%s likes this."
+msgstr ""
+
+#: ../../include/conversation.php:1062
+#, php-format
+msgid "%s doesn't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1066
+#, 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:1068
+#, 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:1074
+msgid "and"
+msgstr ""
+
+#: ../../include/conversation.php:1077
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1078
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:1078
+#, php-format
+msgid "%s don't like this."
+msgstr ""
+
+#: ../../include/conversation.php:1138
+msgid "Visible to <strong>everybody</strong>"
+msgstr ""
+
+#: ../../include/conversation.php:1139 ../../mod/mail.php:174
+#: ../../mod/mail.php:289
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1140
+msgid "Please enter a video link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1141
+msgid "Please enter an audio link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1142
+msgid "Tag term:"
+msgstr ""
+
+#: ../../include/conversation.php:1143 ../../mod/filer.php:49
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../include/conversation.php:1144
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:1145 ../../mod/editpost.php:52
+#: ../../mod/mail.php:175 ../../mod/mail.php:290
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../include/conversation.php:1172 ../../mod/photos.php:949
+#: ../../mod/editlayout.php:197 ../../mod/webpages.php:180
+#: ../../mod/blocks.php:149 ../../mod/layouts.php:175
+msgid "Share"
+msgstr ""
+
+#: ../../include/conversation.php:1174
+msgid "Page link name"
+msgstr ""
+
+#: ../../include/conversation.php:1177
+msgid "Post as"
+msgstr ""
+
+#: ../../include/conversation.php:1184 ../../mod/editlayout.php:145
+#: ../../mod/editwebpage.php:184 ../../mod/editpost.php:119
+#: ../../mod/editblock.php:147 ../../mod/mail.php:238 ../../mod/mail.php:352
+msgid "Upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1185
+msgid "upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1186 ../../mod/editlayout.php:146
+#: ../../mod/editwebpage.php:185 ../../mod/editpost.php:120
+#: ../../mod/editblock.php:148 ../../mod/mail.php:239 ../../mod/mail.php:353
+msgid "Attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1187
+msgid "attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1188 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:186 ../../mod/editpost.php:121
+#: ../../mod/editblock.php:149 ../../mod/mail.php:240 ../../mod/mail.php:354
+msgid "Insert web link"
+msgstr ""
+
+#: ../../include/conversation.php:1189
+msgid "web link"
+msgstr ""
+
+#: ../../include/conversation.php:1190
+msgid "Insert video link"
+msgstr ""
+
+#: ../../include/conversation.php:1191
+msgid "video link"
+msgstr ""
+
+#: ../../include/conversation.php:1192
+msgid "Insert audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1193
+msgid "audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1194 ../../mod/editlayout.php:151
+#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125
+#: ../../mod/editblock.php:153
+msgid "Set your location"
+msgstr ""
+
+#: ../../include/conversation.php:1195
+msgid "set location"
+msgstr ""
+
+#: ../../include/conversation.php:1196 ../../mod/editpost.php:127
+msgid "Toggle voting"
+msgstr ""
+
+#: ../../include/conversation.php:1199 ../../mod/editlayout.php:152
+#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126
+#: ../../mod/editblock.php:154
+msgid "Clear browser location"
+msgstr ""
+
+#: ../../include/conversation.php:1200
+msgid "clear location"
+msgstr ""
+
+#: ../../include/conversation.php:1202 ../../mod/editlayout.php:164
+#: ../../mod/editwebpage.php:207 ../../mod/editpost.php:141
+#: ../../mod/editblock.php:167
+msgid "Title (optional)"
+msgstr ""
+
+#: ../../include/conversation.php:1205 ../../mod/editlayout.php:167
+#: ../../mod/editwebpage.php:209 ../../mod/editpost.php:143
+#: ../../mod/editblock.php:170
+msgid "Categories (optional, comma-separated list)"
+msgstr ""
+
+#: ../../include/conversation.php:1207 ../../mod/editlayout.php:154
+#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131
+#: ../../mod/editblock.php:156
+msgid "Permission settings"
+msgstr ""
+
+#: ../../include/conversation.php:1208
+msgid "permissions"
+msgstr ""
+
+#: ../../include/conversation.php:1216 ../../mod/editlayout.php:161
+#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:138
+#: ../../mod/editblock.php:164
+msgid "Public post"
+msgstr ""
+
+#: ../../include/conversation.php:1218 ../../mod/editlayout.php:168
+#: ../../mod/editwebpage.php:210 ../../mod/editpost.php:144
+#: ../../mod/editblock.php:171
+msgid "Example: bob@example.com, mary@example.com"
+msgstr ""
+
+#: ../../include/conversation.php:1231 ../../mod/editlayout.php:177
+#: ../../mod/editwebpage.php:219 ../../mod/editpost.php:155
+#: ../../mod/editblock.php:181 ../../mod/mail.php:245 ../../mod/mail.php:359
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../include/conversation.php:1235 ../../mod/events.php:637
+#: ../../mod/editpost.php:159
+msgid "OK"
+msgstr ""
+
+#: ../../include/conversation.php:1236 ../../mod/settings.php:583
+#: ../../mod/settings.php:609 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../mod/events.php:636 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
+msgid "Cancel"
+msgstr ""
+
+#: ../../include/conversation.php:1478
+msgid "Discover"
+msgstr ""
+
+#: ../../include/conversation.php:1481
+msgid "Imported public streams"
+msgstr ""
+
+#: ../../include/conversation.php:1486
+msgid "Commented Order"
+msgstr ""
+
+#: ../../include/conversation.php:1489
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../include/conversation.php:1493
+msgid "Posted Order"
+msgstr ""
+
+#: ../../include/conversation.php:1496
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../include/conversation.php:1504
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../include/conversation.php:1510 ../../mod/connections.php:212
+#: ../../mod/connections.php:225 ../../mod/menu.php:102
+msgid "New"
+msgstr ""
+
+#: ../../include/conversation.php:1513
+msgid "Activity Stream - by date"
 msgstr ""
 
+#: ../../include/conversation.php:1519
+msgid "Starred"
+msgstr ""
+
+#: ../../include/conversation.php:1522
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1529
+msgid "Spam"
+msgstr ""
+
+#: ../../include/conversation.php:1532
+msgid "Posts flagged as SPAM"
+msgstr ""
+
+#: ../../include/conversation.php:1576 ../../mod/admin.php:952
+msgid "Channel"
+msgstr ""
+
+#: ../../include/conversation.php:1579
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1588
+msgid "About"
+msgstr ""
+
+#: ../../include/conversation.php:1591
+msgid "Profile Details"
+msgstr ""
+
+#: ../../include/conversation.php:1600 ../../include/photos.php:359
+msgid "Photo Albums"
+msgstr ""
+
+#: ../../include/conversation.php:1609
+msgid "Files and Storage"
+msgstr ""
+
+#: ../../include/conversation.php:1619 ../../include/conversation.php:1622
+msgid "Chatrooms"
+msgstr ""
+
+#: ../../include/conversation.php:1635
+msgid "Saved Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1645
+msgid "Manage Webpages"
+msgstr ""
+
+#: ../../include/conversation.php:1704
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1707
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1710
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1713
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1716
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1719
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../../include/photos.php:94
 #, php-format
 msgid "Image exceeds website size limit of %lu bytes"
@@ -3133,11 +3146,6 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/comanche.php:34 ../../mod/admin.php:386
-#: ../../view/theme/apw/php/config.php:185
-msgid "Default"
-msgstr ""
-
 #: ../../include/auth.php:131
 msgid "Logged out."
 msgstr ""
@@ -3178,11 +3186,11 @@ msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
 #: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
-#: ../../mod/directory.php:358 ../../mod/directory.php:363
+#: ../../mod/directory.php:362 ../../mod/directory.php:367
 msgid "Find"
 msgstr ""
 
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:362
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:366
 #: ../../mod/suggest.php:60
 msgid "Channel Suggestions"
 msgstr ""
@@ -3328,11 +3336,11 @@ msgid "Requested channel is not available."
 msgstr ""
 
 #: ../../include/identity.php:677 ../../mod/profile.php:16
-#: ../../mod/achievements.php:11 ../../mod/blocks.php:29
-#: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/editlayout.php:28
+#: ../../mod/achievements.php:11 ../../mod/connect.php:13
+#: ../../mod/hcard.php:8 ../../mod/editlayout.php:28
 #: ../../mod/editwebpage.php:28 ../../mod/filestorage.php:54
 #: ../../mod/webpages.php:29 ../../mod/editblock.php:29
-#: ../../mod/layouts.php:29
+#: ../../mod/blocks.php:29 ../../mod/layouts.php:29
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -3852,33 +3860,33 @@ msgstr ""
 msgid "Create a new channel"
 msgstr ""
 
-#: ../../mod/manage.php:165
+#: ../../mod/manage.php:167
 msgid "Current Channel"
 msgstr ""
 
-#: ../../mod/manage.php:167
+#: ../../mod/manage.php:169
 msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: ../../mod/manage.php:168
+#: ../../mod/manage.php:170
 msgid "Default Channel"
 msgstr ""
 
-#: ../../mod/manage.php:169
+#: ../../mod/manage.php:171
 msgid "Make Default"
 msgstr ""
 
-#: ../../mod/manage.php:172
+#: ../../mod/manage.php:174
 #, php-format
 msgid "%d new messages"
 msgstr ""
 
-#: ../../mod/manage.php:173
+#: ../../mod/manage.php:175
 #, php-format
 msgid "%d new introductions"
 msgstr ""
 
-#: ../../mod/manage.php:175
+#: ../../mod/manage.php:177
 msgid "Delegated Channels"
 msgstr ""
 
@@ -3927,22 +3935,18 @@ msgid "Settings updated."
 msgstr ""
 
 #: ../../mod/settings.php:573 ../../mod/api.php:106 ../../mod/photos.php:556
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/admin.php:424 ../../mod/removeme.php:60
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:424
+#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
 #: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1544
-#: ../../wppost/wppost.php:80 ../../wppost/wppost.php:96
-#: ../../wppost/wppost.php:100
 msgid "No"
 msgstr ""
 
 #: ../../mod/settings.php:573 ../../mod/api.php:105 ../../mod/photos.php:556
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/admin.php:426 ../../mod/removeme.php:60
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:426
+#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
 #: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1544
-#: ../../wppost/wppost.php:80 ../../wppost/wppost.php:96
-#: ../../wppost/wppost.php:100
 msgid "Yes"
 msgstr ""
 
@@ -4307,7 +4311,7 @@ msgstr ""
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1072 ../../mod/mitem.php:161 ../../mod/mitem.php:204
+#: ../../mod/settings.php:1072 ../../mod/mitem.php:152 ../../mod/mitem.php:221
 msgid "(click to open/close)"
 msgstr ""
 
@@ -4487,7 +4491,7 @@ msgstr ""
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../mod/xchan.php:37 ../../mod/menu.php:147 ../../mod/mitem.php:111
+#: ../../mod/xchan.php:37 ../../mod/menu.php:149 ../../mod/mitem.php:120
 msgid "Not found."
 msgstr ""
 
@@ -4509,10 +4513,6 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/blocks.php:96
-msgid "Block Name"
-msgstr ""
-
 #: ../../mod/follow.php:25
 msgid "Channel added."
 msgstr ""
@@ -4952,7 +4952,7 @@ msgstr ""
 msgid "View ratings"
 msgstr ""
 
-#: ../../mod/rpost.php:105 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:131 ../../mod/editpost.php:42
 msgid "Edit post"
 msgstr ""
 
@@ -5908,8 +5908,8 @@ msgid "Import existing posts if possible"
 msgstr ""
 
 #: ../../mod/editlayout.php:78 ../../mod/editwebpage.php:77
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:79
-#: ../../mod/editblock.php:95
+#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
+#: ../../mod/editblock.php:94
 msgid "Item not found"
 msgstr ""
 
@@ -5921,22 +5921,22 @@ msgstr ""
 msgid "Delete layout?"
 msgstr ""
 
-#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:185
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:153
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:187
+#: ../../mod/editpost.php:122 ../../mod/editblock.php:150
 msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:186
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:154
+#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:188
+#: ../../mod/editpost.php:123 ../../mod/editblock.php:151
 msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:187
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:155
+#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:189
+#: ../../mod/editpost.php:124 ../../mod/editblock.php:152
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editlayout.php:183
+#: ../../mod/editlayout.php:182
 msgid "Delete Layout"
 msgstr ""
 
@@ -5981,20 +5981,16 @@ msgstr ""
 msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: ../../mod/editwebpage.php:140
-msgid "Edit Webpage"
-msgstr ""
-
-#: ../../mod/editwebpage.php:150
+#: ../../mod/editwebpage.php:152
 msgid "Delete webpage?"
 msgstr ""
 
-#: ../../mod/editwebpage.php:171
+#: ../../mod/editwebpage.php:173
 msgid "Page link title"
 msgstr ""
 
-#: ../../mod/editwebpage.php:222
-msgid "Delete Webpage"
+#: ../../mod/editwebpage.php:224
+msgid "Edit Webpage"
 msgstr ""
 
 #: ../../mod/dirsearch.php:29
@@ -6259,99 +6255,99 @@ msgstr ""
 msgid "Unable to remove source."
 msgstr ""
 
-#: ../../mod/menu.php:40
-msgid "Menu updated."
-msgstr ""
-
 #: ../../mod/menu.php:44
 msgid "Unable to update menu."
 msgstr ""
 
-#: ../../mod/menu.php:49
-msgid "Menu created."
-msgstr ""
-
 #: ../../mod/menu.php:53
 msgid "Unable to create menu."
 msgstr ""
 
-#: ../../mod/menu.php:84
-msgid "Manage Menus"
+#: ../../mod/menu.php:86 ../../mod/menu.php:98
+msgid "Menu Name"
+msgstr ""
+
+#: ../../mod/menu.php:86
+msgid "Unique name (not visible on webpage) - required"
+msgstr ""
+
+#: ../../mod/menu.php:87 ../../mod/menu.php:99
+msgid "Menu Title"
 msgstr ""
 
 #: ../../mod/menu.php:87
-msgid "Drop"
+msgid "Visible on webpage - leave empty for no title"
 msgstr ""
 
-#: ../../mod/menu.php:89
-msgid "Bookmarks allowed"
+#: ../../mod/menu.php:88
+msgid "Allow Bookmarks"
 msgstr ""
 
-#: ../../mod/menu.php:90
-msgid "Create a new menu"
+#: ../../mod/menu.php:88 ../../mod/menu.php:140
+msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: ../../mod/menu.php:91
-msgid "Delete this menu"
+#: ../../mod/menu.php:89
+msgid "Submit and proceed"
 msgstr ""
 
-#: ../../mod/menu.php:92 ../../mod/menu.php:136
-msgid "Edit menu contents"
+#: ../../mod/menu.php:101
+msgid "Drop"
 msgstr ""
 
-#: ../../mod/menu.php:93
-msgid "Edit this menu"
+#: ../../mod/menu.php:103
+msgid "Bookmarks allowed"
 msgstr ""
 
 #: ../../mod/menu.php:105
-msgid "New Menu"
+msgid "Delete this menu"
 msgstr ""
 
 #: ../../mod/menu.php:106 ../../mod/menu.php:137
-msgid "Menu name"
+msgid "Edit menu contents"
 msgstr ""
 
-#: ../../mod/menu.php:106 ../../mod/menu.php:137
-msgid "Must be unique, only seen by you"
+#: ../../mod/menu.php:107
+msgid "Edit this menu"
 msgstr ""
 
-#: ../../mod/menu.php:107 ../../mod/menu.php:138
-msgid "Menu title"
+#: ../../mod/menu.php:121
+msgid "Menu could not be deleted."
 msgstr ""
 
-#: ../../mod/menu.php:107 ../../mod/menu.php:138
-msgid "Menu title as seen by others"
+#: ../../mod/menu.php:129 ../../mod/mitem.php:24
+msgid "Menu not found."
 msgstr ""
 
-#: ../../mod/menu.php:108 ../../mod/menu.php:139
-msgid "Allow bookmarks"
+#: ../../mod/menu.php:134
+msgid "Edit Menu"
 msgstr ""
 
-#: ../../mod/menu.php:108 ../../mod/menu.php:139
-msgid "Menu may be used to store saved bookmarks"
+#: ../../mod/menu.php:136
+msgid "Add or remove entries to this menu"
 msgstr ""
 
-#: ../../mod/menu.php:119 ../../mod/mitem.php:24
-msgid "Menu not found."
+#: ../../mod/menu.php:138
+msgid "Menu name"
 msgstr ""
 
-#: ../../mod/menu.php:125
-msgid "Menu deleted."
+#: ../../mod/menu.php:138
+msgid "Must be unique, only seen by you"
 msgstr ""
 
-#: ../../mod/menu.php:127
-msgid "Menu could not be deleted."
+#: ../../mod/menu.php:139
+msgid "Menu title"
 msgstr ""
 
-#: ../../mod/menu.php:133
-msgid "Edit Menu"
+#: ../../mod/menu.php:139
+msgid "Menu title as seen by others"
 msgstr ""
 
-#: ../../mod/menu.php:135
-msgid "Add or remove entries to this menu"
+#: ../../mod/menu.php:140
+msgid "Allow bookmarks"
 msgstr ""
 
-#: ../../mod/menu.php:141 ../../mod/mitem.php:213
+#: ../../mod/menu.php:142
 msgid "Modify"
 msgstr ""
 
@@ -6456,12 +6452,8 @@ msgstr ""
 msgid "Visible To"
 msgstr ""
 
-#: ../../mod/lockview.php:31
-msgid "Remote privacy information not available."
-msgstr ""
-
-#: ../../mod/lockview.php:52
-msgid "Visible to:"
+#: ../../mod/webpages.php:189
+msgid "Page Title"
 msgstr ""
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:174
@@ -6705,7 +6697,7 @@ msgstr ""
 msgid "This is your default profile."
 msgstr ""
 
-#: ../../mod/profiles.php:728 ../../mod/directory.php:214
+#: ../../mod/profiles.php:728 ../../mod/directory.php:218
 msgid "Age: "
 msgstr ""
 
@@ -6745,8 +6737,112 @@ msgstr ""
 msgid "Source of Item"
 msgstr ""
 
-#: ../../mod/webpages.php:184
-msgid "Page Title"
+#: ../../mod/mitem.php:51
+msgid "Unable to create element."
+msgstr ""
+
+#: ../../mod/mitem.php:74
+msgid "Unable to update menu element."
+msgstr ""
+
+#: ../../mod/mitem.php:89
+msgid "Unable to add menu element."
+msgstr ""
+
+#: ../../mod/mitem.php:151 ../../mod/mitem.php:220
+msgid "Menu Item Permissions"
+msgstr ""
+
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:168
+msgid "Link Name"
+msgstr ""
+
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:169
+msgid "Link Target"
+msgstr ""
+
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:226
+msgid "Use RedMatrix magic-auth if available"
+msgstr ""
+
+#: ../../mod/mitem.php:157 ../../mod/mitem.php:227
+msgid "Open link in new window"
+msgstr ""
+
+#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
+msgid "Order in list"
+msgstr ""
+
+#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
+msgid "Higher numbers will sink to bottom of listing"
+msgstr ""
+
+#: ../../mod/mitem.php:159
+msgid "Submit and finish"
+msgstr ""
+
+#: ../../mod/mitem.php:160
+msgid "Submit and continue"
+msgstr ""
+
+#: ../../mod/mitem.php:166
+msgid "Menu:"
+msgstr ""
+
+#: ../../mod/mitem.php:172
+msgid "Edit menu"
+msgstr ""
+
+#: ../../mod/mitem.php:175
+msgid "Edit element"
+msgstr ""
+
+#: ../../mod/mitem.php:176
+msgid "Drop element"
+msgstr ""
+
+#: ../../mod/mitem.php:177
+msgid "New element"
+msgstr ""
+
+#: ../../mod/mitem.php:178
+msgid "Edit this menu container"
+msgstr ""
+
+#: ../../mod/mitem.php:179
+msgid "Add menu element"
+msgstr ""
+
+#: ../../mod/mitem.php:180
+msgid "Delete this menu item"
+msgstr ""
+
+#: ../../mod/mitem.php:181
+msgid "Edit this menu item"
+msgstr ""
+
+#: ../../mod/mitem.php:198
+msgid "Menu item not found."
+msgstr ""
+
+#: ../../mod/mitem.php:209
+msgid "Menu item deleted."
+msgstr ""
+
+#: ../../mod/mitem.php:211
+msgid "Menu item could not be deleted."
+msgstr ""
+
+#: ../../mod/mitem.php:218
+msgid "Edit Menu Element"
+msgstr ""
+
+#: ../../mod/mitem.php:224
+msgid "Link text"
+msgstr ""
+
+#: ../../mod/mitem.php:225
+msgid "URL of link"
 msgstr ""
 
 #: ../../mod/openid.php:26
@@ -6758,59 +6854,59 @@ msgstr ""
 msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
-#: ../../mod/directory.php:220
+#: ../../mod/directory.php:224
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/directory.php:232
+#: ../../mod/directory.php:236
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:234
+#: ../../mod/directory.php:238
 msgid "Status: "
 msgstr ""
 
-#: ../../mod/directory.php:236
+#: ../../mod/directory.php:240
 msgid "Homepage: "
 msgstr ""
 
-#: ../../mod/directory.php:239
+#: ../../mod/directory.php:243
 msgid "Hometown: "
 msgstr ""
 
-#: ../../mod/directory.php:241
+#: ../../mod/directory.php:245
 msgid "About: "
 msgstr ""
 
-#: ../../mod/directory.php:299
+#: ../../mod/directory.php:303
 msgid "Public Forum:"
 msgstr ""
 
-#: ../../mod/directory.php:302
+#: ../../mod/directory.php:306
 msgid "Keywords: "
 msgstr ""
 
-#: ../../mod/directory.php:307
+#: ../../mod/directory.php:311
 #, php-format
 msgid "Common connections: %s"
 msgstr ""
 
-#: ../../mod/directory.php:359
+#: ../../mod/directory.php:363
 msgid "Finding:"
 msgstr ""
 
-#: ../../mod/directory.php:364
+#: ../../mod/directory.php:368
 msgid "next page"
 msgstr ""
 
-#: ../../mod/directory.php:364
+#: ../../mod/directory.php:368
 msgid "previous page"
 msgstr ""
 
-#: ../../mod/directory.php:381
+#: ../../mod/directory.php:385
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -7596,18 +7692,14 @@ msgstr ""
 msgid "Post successful."
 msgstr ""
 
-#: ../../mod/editblock.php:115
+#: ../../mod/editblock.php:112
 msgid "Edit Block"
 msgstr ""
 
-#: ../../mod/editblock.php:125
+#: ../../mod/editblock.php:123
 msgid "Delete block?"
 msgstr ""
 
-#: ../../mod/editblock.php:189
-msgid "Delete Block"
-msgstr ""
-
 #: ../../mod/register.php:44
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
@@ -7758,12 +7850,16 @@ msgstr ""
 msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: ../../mod/layouts.php:111
-msgid "Help with this feature"
+#: ../../mod/lockview.php:37
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/layouts.php:131
-msgid "Layout Name"
+#: ../../mod/lockview.php:58
+msgid "Visible to:"
+msgstr ""
+
+#: ../../mod/blocks.php:95 ../../mod/blocks.php:144
+msgid "Block Name"
 msgstr ""
 
 #: ../../mod/id.php:11
@@ -7846,104 +7942,16 @@ msgstr ""
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/mitem.php:67
-msgid "Menu element updated."
-msgstr ""
-
-#: ../../mod/mitem.php:71
-msgid "Unable to update menu element."
-msgstr ""
-
-#: ../../mod/mitem.php:77
-msgid "Menu element added."
-msgstr ""
-
-#: ../../mod/mitem.php:81
-msgid "Unable to add menu element."
-msgstr ""
-
-#: ../../mod/mitem.php:127
-msgid "Manage Menu Elements"
-msgstr ""
-
-#: ../../mod/mitem.php:130
-msgid "Edit menu"
-msgstr ""
-
-#: ../../mod/mitem.php:133
-msgid "Edit element"
-msgstr ""
-
-#: ../../mod/mitem.php:134
-msgid "Drop element"
-msgstr ""
-
-#: ../../mod/mitem.php:135
-msgid "New element"
-msgstr ""
-
-#: ../../mod/mitem.php:136
-msgid "Edit this menu container"
-msgstr ""
-
-#: ../../mod/mitem.php:137
-msgid "Add menu element"
-msgstr ""
-
-#: ../../mod/mitem.php:138
-msgid "Delete this menu item"
-msgstr ""
-
-#: ../../mod/mitem.php:139
-msgid "Edit this menu item"
-msgstr ""
-
-#: ../../mod/mitem.php:158
-msgid "New Menu Element"
-msgstr ""
-
-#: ../../mod/mitem.php:160 ../../mod/mitem.php:203
-msgid "Menu Item Permissions"
-msgstr ""
-
-#: ../../mod/mitem.php:163 ../../mod/mitem.php:207
-msgid "Link text"
-msgstr ""
-
-#: ../../mod/mitem.php:164 ../../mod/mitem.php:208
-msgid "URL of link"
-msgstr ""
-
-#: ../../mod/mitem.php:165 ../../mod/mitem.php:209
-msgid "Use RedMatrix magic-auth if available"
-msgstr ""
-
-#: ../../mod/mitem.php:166 ../../mod/mitem.php:210
-msgid "Open link in new window"
-msgstr ""
-
-#: ../../mod/mitem.php:168 ../../mod/mitem.php:212
-msgid "Order in list"
-msgstr ""
-
-#: ../../mod/mitem.php:168 ../../mod/mitem.php:212
-msgid "Higher numbers will sink to bottom of listing"
-msgstr ""
-
-#: ../../mod/mitem.php:181
-msgid "Menu item not found."
-msgstr ""
-
-#: ../../mod/mitem.php:190
-msgid "Menu item deleted."
+#: ../../mod/layouts.php:111
+msgid "Help with this feature"
 msgstr ""
 
-#: ../../mod/mitem.php:192
-msgid "Menu item could not be deleted."
+#: ../../mod/layouts.php:132
+msgid "Layout Name"
 msgstr ""
 
-#: ../../mod/mitem.php:201
-msgid "Edit Menu Element"
+#: ../../mod/layouts.php:171
+msgid "Comanche page description language help"
 msgstr ""
 
 #: ../../mod/mood.php:131
@@ -8864,22 +8872,6 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../randpost/randpost.php:96
-msgid "You're welcome."
-msgstr ""
-
-#: ../../randpost/randpost.php:97
-msgid "Ah shucks..."
-msgstr ""
-
-#: ../../randpost/randpost.php:98
-msgid "Don't mention it."
-msgstr ""
-
-#: ../../randpost/randpost.php:99
-msgid "&lt;blush&gt;"
-msgstr ""
-
 #: ../../boot.php:1345
 #, php-format
 msgid "Update %s failed. See error logs."
@@ -8928,39 +8920,3 @@ msgstr ""
 #, php-format
 msgid "[red] Cron tasks not running on %s"
 msgstr ""
-
-#: ../../wppost/wppost.php:43
-msgid "Post to WordPress"
-msgstr ""
-
-#: ../../wppost/wppost.php:80
-msgid "Enable WordPress Post Plugin"
-msgstr ""
-
-#: ../../wppost/wppost.php:84
-msgid "WordPress username"
-msgstr ""
-
-#: ../../wppost/wppost.php:88
-msgid "WordPress password"
-msgstr ""
-
-#: ../../wppost/wppost.php:92
-msgid "WordPress API URL"
-msgstr ""
-
-#: ../../wppost/wppost.php:96
-msgid "Post to WordPress by default"
-msgstr ""
-
-#: ../../wppost/wppost.php:100
-msgid "Forward comments (requires post_to_red plugin)"
-msgstr ""
-
-#: ../../wppost/wppost.php:104
-msgid "WordPress Post Settings"
-msgstr ""
-
-#: ../../wppost/wppost.php:119
-msgid "Wordpress Settings saved."
-msgstr ""
diff --git a/version.inc b/version.inc
index 9f9bd7ea6..787afe073 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-04-22.1010
+2015-04-28.1016
diff --git a/view/css/mod_blocks.css b/view/css/mod_blocks.css
index c930f5dc8..36a12e1d1 100644
--- a/view/css/mod_blocks.css
+++ b/view/css/mod_blocks.css
@@ -15,14 +15,18 @@
 	padding: 7px 3px 7px 10px;
 }
 
-#block-list-table th:nth-child(5),
-#block-list-table td:nth-child(5){
-	padding: 7px 3px;
+#block-list-table th:nth-child(2){
 	white-space: nowrap;
 }
 
 #block-list-table th:nth-child(6),
 #block-list-table td:nth-child(6){
+	padding: 7px 3px;
+	white-space: nowrap;
+}
+
+#block-list-table th:nth-child(7),
+#block-list-table td:nth-child(7){
 	padding: 7px 10px 7px 7px;
 	white-space: nowrap;
 }
diff --git a/view/css/mod_layouts.css b/view/css/mod_layouts.css
index 7f65713e7..8e0a945bf 100644
--- a/view/css/mod_layouts.css
+++ b/view/css/mod_layouts.css
@@ -1,3 +1,36 @@
 #layout-editor {
 	display: none;
 }
+
+#layout-list-table {
+	width: 100%;
+}
+
+#layout-list-table th:nth-child(1){
+	padding: 7px 3px 7px 10px;
+	white-space: nowrap;
+}
+
+#layout-list-table td:nth-child(1){
+	padding: 7px 3px 7px 10px;
+}
+
+#layout-list-table th:nth-child(2){
+	white-space: nowrap;
+}
+
+#layout-list-table th:nth-child(6),
+#layout-list-table td:nth-child(6){
+	padding: 7px 3px;
+	white-space: nowrap;
+}
+
+#layout-list-table th:nth-child(7),
+#layout-list-table td:nth-child(7){
+	padding: 7px 10px 7px 7px;
+	white-space: nowrap;
+}
+
+.webpage-list-tool {
+	padding: 7px 10px;
+}
diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css
index d88657c69..1c6ec4aea 100644
--- a/view/css/mod_webpages.css
+++ b/view/css/mod_webpages.css
@@ -15,6 +15,10 @@
 	padding: 7px 3px 7px 10px;
 }
 
+#webpage-list-table th:nth-child(2){
+	white-space: nowrap;
+}
+
 #webpage-list-table th:nth-child(7),
 #webpage-list-table td:nth-child(7){
 	padding: 7px 3px;
diff --git a/view/js/main.js b/view/js/main.js
index d1e61dc24..35944e13f 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -743,7 +743,6 @@ function justifyPhotos() {
 	$('#photo-album-contents').justifiedGallery({
 		margins: 3,
 		border: 0,
-		ignoreElement: '#page-end',
 		sizeRangeSuffixes: {
 			'lt100': '-2',
 			'lt240': '-2',
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 28d443c74..a5e5dffdb 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1938,6 +1938,7 @@ nav .dropdown-menu {
 
 [id^="webpage-list-item-"]:hover td,
 [id^="block-list-item-"]:hover td,
+[id^="layout-list-item-"]:hover td,
 [id^="menu-list-item-"]:hover td,
 [id^="mitem-list-item-"]:hover td {
 	background-color: $item_colour;
diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl
index f599aade7..85e4865ea 100644
--- a/view/tpl/blocklist.tpl
+++ b/view/tpl/blocklist.tpl
@@ -16,7 +16,8 @@
 <div id="pagelist-content-wrapper" class="section-content-wrapper-np">
 	<table id="block-list-table">
 		<tr>
-			<th width="97%">{{$name}}</th>
+			<th width="1%">{{$name}}</th>
+			<th width="94%">{{$blocktitle}}</th>
 			<th width="1%"></th>
 			<th width="1%"></th>
 			<th width="1%"></th>
@@ -28,11 +29,14 @@
 		<tr id="block-list-item-{{$item.url}}">
 			<td>
 				{{if $view}}
-				<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
+				<a href="block/{{$channel}}/{{$item.name}}" title="{{$view}}">{{$item.name}}</a>
 				{{else}}
-				{{$item.title}}
+				{{$item.name}}
 				{{/if}}
 			</td>
+			<td>
+				{{$item.title}}
+			</td>
 			<td class="webpage-list-tool">
 				{{if $edit}}
 				<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl
index cd146377d..ab7408eae 100644
--- a/view/tpl/layoutlist.tpl
+++ b/view/tpl/layoutlist.tpl
@@ -15,19 +15,55 @@
 {{/if}}
 
 {{if $pages}}
-	   <div id="pagelist-content-wrapper" class="generic-content-wrapper">
+<div id="pagelist-content-wrapper" class="section-content-wrapper-np">
+	<table id="layout-list-table">
+		<tr>
+			<th width="1%">{{$name}}</th>
+			<th width="94%">{{$descr}}</th>
+			<th width="1%"></th>
+			<th width="1%"></th>
+			<th width="1%"></th>
+			<th width="1%" class="hidden-xs">{{$created}}</th>
+			<th width="1%" class="hidden-xs">{{$edited}}</th>
+		</tr>
 		{{foreach $pages as $key => $items}} 
-				{{foreach $items as $item}}
-					<div class="page-list-item">
-					{{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon btn btn-default"></i></a> {{/if}}
-					{{if $view}}<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon btn btn-default"></i></a> {{/if}}
-					{{if $share}}<a href="layouts/{{$channel}}/share/{{$item.mid}}" title="{{$share}}"><i class="icon-share design-icons btn btn-default"></i></a> {{/if}}
-					{{*if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if*}}
-					{{$item.title}}
-					</div>
-				{{/foreach}}
+		{{foreach $items as $item}}
+		<tr id="layout-list-item-{{$item.url}}">
+			<td>
+				{{if $view}}
+				<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}">{{$item.title}}</a>
+				{{else}}
+				{{$item.title}}
+				{{/if}}
+			</td>
+			<td>
+				{{$item.descr}}
+			</td>
+			<td class="webpage-list-tool">
+				{{if $edit}}
+				<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil"></i></a>
+				{{/if}}
+			</td>
+			<td class="webpage-list-tool">
+				{{if $item.bb_element}}
+				<a href="rpost?attachment={{$item.bb_element}}" title="{{$share}}"><i class="icon-share"></i></a>
+				{{/if}}
+			</td>
+			<td class="webpage-list-tool">
+				{{if $edit}}
+				<a href="#" title="{{$delete}}" onclick="dropItem('item/drop/{{$item.url}}', '#layout-list-item-{{$item.url}}'); return false;"><i class="icon-trash drop-icons"></i></a>
+				{{/if}}
+			</td>
+			<td class="hidden-xs">
+				{{$item.created}}
+			</td>
+			<td class="hidden-xs">
+				{{$item.edited}}
+			</td>
+		</tr>
 		{{/foreach}}
-	   </div>
-	
-	   <div class="clear"></div>
+		{{/foreach}}
+	</table>
+</div>
+<div class="clear"></div>
 {{/if}}
diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl
index 632aab2b3..705cb6c75 100755
--- a/view/tpl/photosajax.tpl
+++ b/view/tpl/photosajax.tpl
@@ -1,4 +1,4 @@
 {{foreach $photos as $photo}}
-	{{include file="photo_top.tpl"}}
+{{include file="photo_top.tpl"}}
 {{/foreach}}
 <script>justifyPhotosAjax()</script>