Merge remote branch 'friendica/master' into bid-prov

boot.php

@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1414' );
+define ( 'FRIENDICA_VERSION',      '3.0.1444' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1154      );
 
@@ -253,6 +253,7 @@ define ( 'ACTIVITY_TAG',         NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
 define ( 'ACTIVITY_FAVORITE',    NAMESPACE_ACTIVITY_SCHEMA . 'favorite' );
 
 define ( 'ACTIVITY_POKE',        NAMESPACE_ZOT . '/activity/poke' );
+define ( 'ACTIVITY_MOOD',        NAMESPACE_ZOT . '/activity/mood' );
 
 define ( 'ACTIVITY_OBJ_COMMENT', NAMESPACE_ACTIVITY_SCHEMA . 'comment' );
 define ( 'ACTIVITY_OBJ_NOTE',    NAMESPACE_ACTIVITY_SCHEMA . 'note' );
@@ -354,6 +355,19 @@ if(! class_exists('App')) {
 
 		public $category;
 
+		// Allow themes to control internal parameters
+		// by changing App values in theme.php
+		//
+		// Possibly should make these part of the plugin
+		// system, but it seems like overkill to invoke
+		// all the plugin machinery just to change a couple
+		// of values
+		public	$sourcename = '';
+		public	$videowidth = 425;
+		public	$videoheight = 350;
+		public	$force_max_items = 0;
+		public	$theme_thread_allow = true;
+
 		private $scheme;
 		private $hostname;
 		private $baseurl;
@@ -564,6 +578,13 @@ if(! class_exists('App')) {
 			));
 		}
 
+		function init_page_end() {
+			$tpl = get_markup_template('end.tpl');
+			$this->page['end'] = replace_macros($tpl,array(
+				'$baseurl' => $this->get_baseurl() // FIXME for z_path!!!!
+			));
+		}
+
 		function set_curl_code($code) {
 			$this->curl_code = $code;
 		}
@@ -706,9 +727,13 @@ if(! function_exists('check_config')) {
 		// than the currently visited url, store the current value accordingly.
 		// "Radically different" ignores common variations such as http vs https
 		// and www.example.com vs example.com.
+		// We will only change the url to an ip address if there is no existing setting
 
-		if((! x($url)) || (! link_compare($url,$a->get_baseurl())))
+		if(! x($url))
 			$url = set_config('system','url',$a->get_baseurl());
+		if((! link_compare($url,$a->get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
+			$url = set_config('system','url',$a->get_baseurl());
+
 
 		if($build != DB_UPDATE_VERSION) {
 			$stored = intval($build);
@@ -871,6 +896,10 @@ if(! function_exists('login')) {
 			$tpl = get_markup_template("logout.tpl");
 		}
 		else {
+			$a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array(
+				'$baseurl'		=> $a->get_baseurl(true)
+			));
+
 			$tpl = get_markup_template("login.tpl");
 			$_SESSION['return_url'] = $a->query_string;
 		}
@@ -1235,6 +1264,12 @@ if(! function_exists('get_birthdays')) {
 		if(! local_user())
 			return $o;
 
+		$mobile_detect = new Mobile_Detect();
+		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+
+		if($is_mobile)
+			return $o;
+
 		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
 		$bd_short = t('F d');
 
@@ -1314,6 +1349,13 @@ if(! function_exists('get_events')) {
 		if(! local_user())
 			return $o;
 
+
+		$mobile_detect = new Mobile_Detect();
+		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
+
+		if($is_mobile)
+			return $o;
+
 		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
 		$bd_short = t('F d');
 
@@ -1425,6 +1467,9 @@ if(! function_exists('proc_run')) {
 			$args[$x] = escapeshellarg($args[$x]);
 
 		$cmdline = implode($args," ");
+		if(get_config('system','proc_windows'))
+			proc_close(proc_open('start /b ' . $cmdline,array(),$foo));
+		else
 			proc_close(proc_open($cmdline." &",array(),$foo));
 	}
 }

database.sql

@@ -570,6 +570,9 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `moderated` (`moderated`),
   KEY `spam` (`spam`),
   KEY `author-name` (`author-name`),
+  KEY `uid_commented` (`uid`, `commented`),
+  KEY `uid_created` (`uid`, `created`),
+  KEY `uid_unseen` (`uid`, `unseen`),
   FULLTEXT KEY `title` (`title`),
   FULLTEXT KEY `body` (`body`),
   FULLTEXT KEY `allow_cid` (`allow_cid`),
@@ -603,7 +606,7 @@ CREATE TABLE IF NOT EXISTS `item_id` (
 -- Table structure for table `locks`
 --
 
-CREATE TABLE `locks` (
+CREATE TABLE IF NOT EXISTS `locks` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `name` char(128) NOT NULL,
   `locked` tinyint(1) NOT NULL DEFAULT '0',

doc/network.md

@@ -2,7 +2,7 @@ This is your Network Tab.  If you get lost, you can <a href="help/network">click
 
 This is a bit like the Newsfeed at Facebook or the Stream at Diaspora.  It's where all the posts from your contacts, groups, and feeds will appear.  If you're new, you won't see anything in this page, unless you posted your status in the last step.  If you've already added a few friends, you'll be able to see their posts.  Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall.
 
-Now we need to fill it up, the first step, is to <a href="help/peopleyouknow"> add people you already know from Facebook</a>.
+Now we need to fill it up, the first step, is to <a href="help/makingnewfriends"> make some new friends</a>.
 
 <iframe src="network" width="950" height="600"></iframe>
 

doc/peopleyouknow.md

@@ -1,13 +0,0 @@
-This is your connector settings page.  If you get lost, you can <a href="help/network">click this link</a> to bring yourself back here.
-
-This is the bit that makes Friendica unique.  You can connect to <i>anybody on the internet</i> from your Friendica account using this page!  The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook.  Note that not all servers have the Facebook connector installed.  If you can't find it in the list below, don't worry, we'll look at ways of connecting to more people in the following pages.  
-
-The biggest of all social networks is Facebook.  Fortunately, this connector is really easy.  Scroll down the page, and click Facebook Connector Settings.  Enter your Facebook user name and password and let the application (the connector) do everything the options suggest.  You can <a href="https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector" target="_blank">fine tune this</a> or experiment with the other connectors too.  If you need help, you can always ask at <a href="http://helpers.pyxis.uberspace.de/profile/helpers" target="_blank">Friendica Support</a> or <a href="help/Connectors" target="_blank">see the instructions here</a>.
-
-When you're ready, we can move on to <a href="help/makingnewfriends">making new friends</a>.
-
-
-
-<iframe src="settings/connectors" width="950" height="600"></iframe>
-
-

include/Photo.php

@@ -247,7 +247,7 @@ class Photo {
         if($this->is_imagick()) {
             $this->image->setFirstIterator();
             do {
-                $this->image->rotateImage(new ImagickPixel(), $degrees);
+                $this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate()
             } while ($this->image->nextImage());
             return;
         }

include/Scrape.php

@@ -394,7 +394,10 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 				}
 				if($link['@attributes']['rel'] === 'diaspora-public-key') {
 					$diaspora_key = base64_decode(unamp($link['@attributes']['href']));
+					if(strstr($diaspora_key,'RSA '))
 						$pubkey = rsatopem($diaspora_key);
+					else
+						$pubkey = $diaspora_key;
 					$diaspora = true;
 				}
 			}

include/api.php

@@ -755,6 +755,15 @@
 
 		$ret = api_format_items($r,$user_info);
 
+		// We aren't going to try to figure out at the item, group, and page
+		// level which items you've seen and which you haven't. If you're looking
+		// at the network timeline just mark everything seen. 
+	
+		$r = q("UPDATE `item` SET `unseen` = 0 
+			WHERE `unseen` = 1 AND `uid` = %d",
+			intval($user_info['uid'])
+		);
+
 
 		$data = array('$statuses' => $ret);
 		switch($type){

include/bb2diaspora.php

@@ -196,15 +196,23 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
 	// The bbcode parser now handles youtube-links (and the other stuff) correctly.
 	// Additionally the html code is now fixed so that lists are now working.
 
+	/**
+	 * Transform #tags, strip off the [url] and replace spaces with underscore
+	 */
+	$Text = preg_replace_callback('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', create_function('$match',
+		'return \'#\'. str_replace(\' \', \'_\', $match[2]);'
+	), $Text);
+
+
 	// Converting images with size parameters to simple images. Markdown doesn't know it.
 	$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
 
 	// the following was added on 10-January-2012 due to an inability of Diaspora's
 	// new javascript markdown processor to handle links with images as the link "text"
 	// It is not optimal and may be removed if this ability is restored in the future
-	if ($fordiaspora)
+	//if ($fordiaspora)
-		$Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
+	//	$Text = preg_replace("/\[url\=([^\[\]]*)\]\s*\[img\](.*?)\[\/img\]\s*\[\/url\]/ism",
-					"[url]$1[/url]\n[img]$2[/img]", $Text);
+	//				"[url]$1[/url]\n[img]$2[/img]", $Text);
 
 	// Convert it to HTML - don't try oembed
 	$Text = bbcode($Text, $preserve_nl, false);

include/bbcode.php

@@ -224,6 +224,12 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	// Check for list text
 	$Text = str_replace("[*]", "<li>", $Text);
 
+	// Check for style sheet commands
+	$Text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism","<span style=\"$1;\">$2</span>",$Text);
+
+	// Check for CSS classes
+	$Text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism","<span class=\"$1\">$2</span>",$Text);
+
  	// handle nested lists
 	$endlessloop = 0;
 
@@ -317,9 +323,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	$Text = preg_replace("/\[img\](.*?)\[\/img\]/ism", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text);
 
 
+
+	$Text = preg_replace("/\[crypt\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . t('Encrypted content') . '" /><br />', $Text);
+	$Text = preg_replace("/\[crypt=(.*?)\](.*?)\[\/crypt\]/ism",'<br/><img src="' .$a->get_baseurl() . '/images/lock_icon.gif" alt="' . t('Encrypted content') . '" title="' . '$1' . ' ' . t('Encrypted content') . '" /><br />', $Text);
+
+
 	// Try to Oembed
 	if ($tryoembed) {
-		$Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text);
+		$Text = preg_replace("/\[video\](.*?\.(ogg|ogv|oga|ogm|webm|mp4))\[\/video\]/ism", '<video src="$1" controls="controls" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="$1">$1</a></video>', $Text);
 		$Text = preg_replace("/\[audio\](.*?\.(ogg|ogv|oga|ogm|webm|mp4|mp3))\[\/audio\]/ism", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text);
 
 		$Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text);
@@ -333,7 +344,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
 
 	if ($tryoembed)
-		$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text);
+		$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<iframe src="$1" width="' . $a->videowidth . '" height="' . $a->videoheight . '"><a href="$1">$1</a></iframe>', $Text);
 	else
 		$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/ism", '<a href="$1">$1</a>', $Text);
 
@@ -349,7 +360,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	$Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'[youtube]$1[/youtube]',$Text);
 
 	if ($tryoembed)
-		$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="425" height="350" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text);
+		$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", '<iframe width="' . $a->videowidth . '" height="' . $a->videoheight . '" src="http://www.youtube.com/embed/$1" frameborder="0" ></iframe>', $Text);
 	else
 		$Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", "http://www.youtube.com/watch?v=$1", $Text);
 
@@ -363,7 +374,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 	$Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'[vimeo]$1[/vimeo]',$Text);
 
 	if ($tryoembed)
-		$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="425" height="350" src="http://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $Text);
+		$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", '<iframe width="' . $a->videowidth . '" height="' . $a->videoheight . '" src="http://player.vimeo.com/video/$1" frameborder="0" ></iframe>', $Text);
 	else
 		$Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", "http://vimeo.com/$1", $Text);
 
@@ -401,6 +412,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 
 
 	$Text = preg_replace('/\[\&amp\;([#a-z0-9]+)\;\]/','&$1;',$Text);
+	$Text = preg_replace('/\&\#039\;/','\'',$Text);
+	$Text = preg_replace('/\&quot\;/','"',$Text);
 
 	// fix any escaped ampersands that may have been converted into links
 	$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);

include/conversation.php

@@ -205,6 +205,20 @@ function localize_item(&$item){
 		$item['body'] = sprintf($txt, $A, $B). "\n\n\n" . $Bphoto;
 
 	}
+	if (stristr($item['verb'],ACTIVITY_MOOD)) {
+		$verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1));
+		if(! $verb)
+			return;
+
+		$Aname = $item['author-name'];
+		$Alink = $item['author-link'];
+		$A = '[url=' . zrl($Alink) . ']' . $Aname . '[/url]';
+		
+		$txt = t('%1$s is currently %2$s');
+
+		$item['body'] = sprintf($txt, $A, t($verb));
+	}
+
     if ($item['verb']===ACTIVITY_TAG){
 		$r = q("SELECT * from `item`,`contact` WHERE 
 		`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
@@ -299,6 +313,359 @@ function localize_item(&$item){
 
 }
 
+/**
+ * Count the total of comments on this item and its desendants
+ */
+function count_descendants($item) {
+	$total = count($item['children']);
+
+	if($total > 0) {
+		foreach($item['children'] as $child) {
+			if($child['verb'] === ACTIVITY_LIKE || $child['verb'] === ACTIVITY_DISLIKE) {
+				$total --;
+			}
+			$total += count_descendants($child);
+		}
+	}
+
+	return $total;
+}
+
+/**
+ * Recursively prepare a thread for HTML
+ */
+
+function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, $thread_level=1) {
+	$result = array();
+
+	$wall_template = 'wall_thread.tpl';
+	$wallwall_template = 'wallwall_thread.tpl';
+	$items_seen = 0;
+	$nb_items = count($items);
+	
+	$total_children = $nb_items;
+	
+	foreach($items as $item) {
+		if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+			// Don't count it as a visible item
+			$nb_items--;
+			$total_children --;
+		}
+		if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
+			$nb_items --;
+			$total_children --;
+
+		}
+	}
+
+	foreach($items as $item) {
+		// prevent private email reply to public conversation from leaking.
+		if($item['network'] === NETWORK_MAIL && local_user() != $item['uid']) {
+			continue;
+		}
+
+		if($item['verb'] === ACTIVITY_LIKE || $item['verb'] === ACTIVITY_DISLIKE) {
+			continue;
+		}
+		
+		$items_seen++;
+		
+		$comment = '';
+		$template = $wall_template;
+		$commentww = '';
+		$sparkle = '';
+		$owner_url = $owner_photo = $owner_name = '';
+		$buttons = '';
+		$dropping = false;
+		$star = false;
+		$isstarred = "unstarred";
+		$photo = $item['photo'];
+		$thumb = $item['thumb'];
+		$indent = '';
+		$osparkle = '';
+		$lastcollapsed = false;
+		$firstcollapsed = false;
+		$total_children += count_descendants($item);
+
+		$toplevelpost = (($item['id'] == $item['parent']) ? true : false);
+		$item_writeable = (($item['writable'] || $item['self']) ? true : false);
+		$show_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
+		$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+			|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
+			? t('Private Message')
+			: false);
+		$redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
+		$shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false);
+		if(local_user() && link_compare($a->contact['url'],$item['author-link']))
+			$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
+		else
+			$edpost = false;
+		if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+			$dropping = true;
+
+		$drop = array(
+			'dropping' => $dropping,
+			'select' => t('Select'), 
+			'delete' => t('Delete'),
+		);
+		
+		$filer = (($profile_owner == local_user()) ? t("save to folder") : false);
+
+		$diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+		$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+		if($item['author-link'] && (! $item['author-name']))
+			$profile_name = $item['author-link'];
+
+		$sp = false;
+		$profile_link = best_link_url($item,$sp);
+		if($profile_link === 'mailbox')
+			$profile_link = '';
+		if($sp)
+			$sparkle = ' sparkle';
+		else
+			$profile_link = zrl($profile_link);					
+
+		$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
+		if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
+			$profile_avatar = $a->contacts[$normalised]['thumb'];
+		else
+			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
+
+		$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
+		call_hooks('render_location',$locate);
+		$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+
+		$tags=array();
+		foreach(explode(',',$item['tag']) as $tag){
+			$tag = trim($tag);
+			if ($tag!="") $tags[] = bbcode($tag);
+		}
+
+		$like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
+		$dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
+
+		if($toplevelpost) {
+			if((! $item['self']) && ($mode !== 'profile')) {
+				if($item['wall']) {
+
+					// On the network page, I am the owner. On the display page it will be the profile owner.
+					// This will have been stored in $a->page_contact by our calling page.
+					// Put this person as the wall owner of the wall-to-wall notice.
+
+					$owner_url = zrl($a->page_contact['url']);
+					$owner_photo = $a->page_contact['thumb'];
+					$owner_name = $a->page_contact['name'];
+					$template = $wallwall_template;
+					$commentww = 'ww';	
+				}
+				else if($item['owner-link']) {
+
+					$owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
+					$alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
+					$owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
+					if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
+
+						// The author url doesn't match the owner (typically the contact)
+						// and also doesn't match the contact alias. 
+						// The name match is a hack to catch several weird cases where URLs are 
+						// all over the park. It can be tricked, but this prevents you from
+						// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
+						// well that it's the same Bob Smith. 
+
+						// But it could be somebody else with the same name. It just isn't highly likely. 
+					
+
+						$owner_url = $item['owner-link'];
+						$owner_photo = $item['owner-avatar'];
+						$owner_name = $item['owner-name'];
+						$template = $wallwall_template;
+						$commentww = 'ww';
+						// If it is our contact, use a friendly redirect link
+						if((link_compare($item['owner-link'],$item['url'])) 
+							&& ($item['network'] === NETWORK_DFRN)) {
+							$owner_url = $redirect_url;
+							$osparkle = ' sparkle';
+						}
+						else
+							$owner_url = zrl($owner_url);
+					}
+				}
+			}
+			if($profile_owner == local_user()) {
+				$isstarred = (($item['starred']) ? "starred" : "unstarred");
+
+				$star = array(
+					'do' => t("add star"),
+					'undo' => t("remove star"),
+					'toggle' => t("toggle star status"),
+					'classdo' => (($item['starred']) ? "hidden" : ""),
+					'classundo' => (($item['starred']) ? "" : "hidden"),
+					'starred' =>  t('starred'),
+					'tagger' => t("add tag"),
+					'classtagger' => "",
+				);
+			}
+		} else {
+			$indent = 'comment';
+			// Collapse comments
+			if(($nb_items > 2) || ($thread_level > 2)) {
+				if($items_seen == 1) {
+					$firstcollapsed = true;
+				}
+				if($thread_level > 2) {
+					if($items_seen == $nb_items)
+						$lastcollapsed = true;
+				}
+				else if($items_seen == ($nb_items - 2)) {
+					$lastcollapsed = true;
+				}
+			}
+		}
+
+		if(intval(get_config('system','thread_allow')) && $a->theme_thread_allow) {
+			$comments_threaded = true;
+		}
+		else {
+			$comments_threaded = false;
+		}
+
+		if($page_writeable) {
+			$buttons = array(
+				'like' => array( t("I like this \x28toggle\x29"), t("like")),
+				'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
+			);
+			if ($shareable) $buttons['share'] = array( t('Share this'), t('share'));
+
+
+			if($show_comment_box) {
+				$qc = $qcomment =  null;
+
+				if(in_array('qcomment',$a->plugins)) {
+					$qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
+					$qcomment = (($qc) ? explode("\n",$qc) : null);
+				}
+				$comment = replace_macros($cmnt_tpl,array(
+					'$return_path' => '',
+					'$threaded' => $comments_threaded, 
+					'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
+					'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
+					'$id' => $item['item_id'],
+					'$parent' => $item['item_id'],
+					'$qcomment' => $qcomment,
+					'$profile_uid' =>  $profile_owner,
+					'$mylink' => $a->contact['url'],
+					'$mytitle' => t('This is you'),
+					'$myphoto' => $a->contact['thumb'],
+					'$comment' => t('Comment'),
+					'$submit' => t('Submit'),
+					'$edbold' => t('Bold'),
+					'$editalic' => t('Italic'),
+					'$eduline' => t('Underline'),
+					'$edquote' => t('Quote'),
+					'$edcode' => t('Code'),
+					'$edimg' => t('Image'),
+					'$edurl' => t('Link'),
+					'$edvideo' => t('Video'),
+					'$preview' => t('Preview'),
+					'$indent' => $indent,
+					'$sourceapp' => t($a->sourcename),
+					'$ww' => (($mode === 'network') ? $commentww : '')
+				));
+			}
+		}
+
+		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+			$indent .= ' shiny';
+
+		localize_item($item);
+
+		$body = prepare_body($item,true);
+
+		$tmp_item = array(
+			// collapse comments in template. I don't like this much...
+			'comment_firstcollapsed' => $firstcollapsed,
+			'comment_lastcollapsed' => $lastcollapsed,
+			// template to use to render item (wall, walltowall, search)
+			'template' => $template,
+			
+			'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
+			'tags' => $tags,
+			'body' => template_escape($body),
+			'text' => strip_tags(template_escape($body)),
+			'id' => $item['item_id'],
+			'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
+			'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+			'to' => t('to'),
+			'wall' => t('Wall-to-Wall'),
+			'vwall' => t('via Wall-To-Wall:'),
+			'profile_url' => $profile_link,
+			'item_photo_menu' => item_photo_menu($item),
+			'name' => template_escape($profile_name),
+			'thumb' => $profile_avatar,
+			'osparkle' => $osparkle,
+			'sparkle' => $sparkle,
+			'title' => template_escape($item['title']),
+			'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
+
+			'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
+			'lock' => $lock,
+			'location' => template_escape($location),
+			'indent' => $indent,
+			'owner_url' => $owner_url,
+			'owner_photo' => $owner_photo,
+			'owner_name' => template_escape($owner_name),
+			'plink' => get_plink($item),
+			'edpost' => $edpost,
+			'isstarred' => $isstarred,
+			'star' => $star,
+			'filer' => $filer,
+			'drop' => $drop,
+			'vote' => $buttons,
+			'like' => $like,
+			'dislike' => $dislike,
+			'comment' => $comment,
+			'previewing' => $previewing,
+			'wait' => t('Please wait'),
+			'thread_level' => $thread_level,
+		);
+
+		$arr = array('item' => $item, 'output' => $tmp_item);
+		call_hooks('display_item', $arr);
+
+		$item_result = $arr['output'];
+		if($firstcollapsed) {
+			$item_result['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
+			$item_result['hide_text'] = t('show more');
+		}
+
+		$item_result['children'] = array();
+		if(count($item['children'])) {
+			$item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, ($thread_level + 1));
+		}
+		$item_result['private'] = $item['private'];
+		$item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : '');
+
+		/*
+		 * I don't like this very much...
+		 */
+		if(get_config('system','thread_allow') && $a->theme_thread_allow) {
+			$item_result['flatten'] = false;
+			$item_result['threaded'] = true;
+		}
+		else {
+			$item_result['flatten'] = true;
+			$item_result['threaded'] = false;
+			if(!$toplevelpost) {
+				$item_result['comment'] = false;
+			}
+		}
+		
+		$result[] = $item_result;
+	}
+
+	return $result;
+}
+
 /**
  * "Render" a conversation or list of items for HTML display.
  * There are two major forms of display:
@@ -348,6 +715,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 		$page_writeable = false;
 	}
 
+	$page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false);
+
+
 	if($update)
 		$return_url = $_SESSION['return_url'];
 	else
@@ -373,6 +743,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	$threads = array();
 	$threadsid = -1;
 
+	$page_template = get_markup_template("conversation.tpl");
+		
 	if($items && count($items)) {
 
 		if($mode === 'network-new' || $mode === 'search' || $mode === 'community') {
@@ -467,6 +839,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'title' => template_escape($item['title']),
 					'body' => template_escape($body),
 					'text' => strip_tags(template_escape($body)),
+					'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
 					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
 					'location' => template_escape($location),
 					'indent' => '',
@@ -485,6 +858,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'conv' => (($preview) ? '' : array('href'=> $a->get_baseurl($ssl_state) . '/display/' . $nickname . '/' . $item['id'], 'title'=> t('View in context'))),
 					'previewing' => $previewing,
 					'wait' => t('Please wait'),
+					'thread_level' => 1,
 				);
 
 				$arr = array('item' => $item, 'output' => $tmp_item);
@@ -499,371 +873,33 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 		else
 		{
 			// Normal View
+			$page_template = get_markup_template("threaded_conversation.tpl");
 
+			// get all the topmost parents
+			// this shouldn't be needed, as we should have only them in ou array
+			// But for now, this array respects the old style, just in case
 
-			// Figure out how many comments each parent has
+			$threads = array();
-			// (Comments all have gravity of 6)
-			// Store the result in the $comments array
-
-			$comments = array();
 			foreach($items as $item) {
-				if((intval($item['gravity']) == 6) && ($item['id'] != $item['parent'])) {
-					if(! x($comments,$item['parent']))
-						$comments[$item['parent']] = 1;
-					else
-						$comments[$item['parent']] += 1;
-				} elseif(! x($comments,$item['parent'])) 
-					$comments[$item['parent']] = 0; // avoid notices later on
-			}
 
-			// map all the like/dislike activities for each parent item 
-			// Store these in the $alike and $dlike arrays
-
-			foreach($items as $item) {
 				like_puller($a,$item,$alike,'like');
 				like_puller($a,$item,$dlike,'dislike');
-			}
 
-			$comments_collapsed = false;
+				if($item['id'] == $item['parent']) {
-			$comments_seen = 0;
+					$threads[] = $item;
-			$comment_lastcollapsed = false;
-			$comment_firstcollapsed = false;
-			$blowhard = 0;
-			$blowhard_count = 0;
-
-
-			foreach($items as $item) {
-
-				$comment = '';
-				$template = $tpl;
-				$commentww = '';
-				$sparkle = '';
-				$owner_url = $owner_photo = $owner_name = '';
-
-				// We've already parsed out like/dislike for special treatment. We can ignore them now
-
-				if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
-					|| (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
-					&& ($item['id'] != $item['parent']))
-					continue;
-
-				$toplevelpost = (($item['id'] == $item['parent']) ? true : false);
-
-
-				// Take care of author collapsing and comment collapsing
-				// (author collapsing is currently disabled)
-				// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
-				// If there are more than two comments, squash all but the last 2.
-			
-				if($toplevelpost) {
-
-					$item_writeable = (($item['writable'] || $item['self']) ? true : false);
-
-					$comments_seen = 0;
-					$comments_collapsed = false;
-					$comment_lastcollapsed  = false;
-					$comment_firstcollapsed = false;
-					
-					$threadsid++;
-					$threads[$threadsid]['id'] = $item['item_id'];
-					$threads[$threadsid]['private'] = $item['private'];
-					$threads[$threadsid]['items'] = array();
-
-				}
-				else {
-
-					// prevent private email reply to public conversation from leaking.
-					if($item['network'] === NETWORK_MAIL && local_user() != $item['uid'])
-							continue;
-
-					$comments_seen ++;
-					$comment_lastcollapsed  = false;
-					$comment_firstcollapsed = false;
-				}	
-
-				$override_comment_box = ((($page_writeable) && ($item_writeable)) ? true : false);
-				$show_comment_box = ((($page_writeable) && ($item_writeable) && ($comments_seen == $comments[$item['parent']])) ? true : false);
-
-
-				if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
-
-					if (!$comments_collapsed){
-						$threads[$threadsid]['num_comments'] = sprintf( tt('%d comment','%d comments',$comments[$item['parent']]),$comments[$item['parent']] );
-						$threads[$threadsid]['hide_text'] = t('show more');
-						$comments_collapsed = true;
-						$comment_firstcollapsed = true;
-					}
-				}
-				if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
-
-					$comment_lastcollapsed = true;
-				}
-
-				$redirect_url = $a->get_baseurl($ssl_state) . '/redir/' . $item['cid'] ;
-
-				$lock = ((($item['private'] == 1) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-					|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-					? t('Private Message')
-					: false);
-
-
-				// Top-level wall post not written by the wall owner (wall-to-wall)
-				// First figure out who owns it. 
-
-				$osparkle = '';
-
-				if(($toplevelpost) && (! $item['self']) && ($mode !== 'profile')) {
-
-					if($item['wall']) {
-
-						// On the network page, I am the owner. On the display page it will be the profile owner.
-						// This will have been stored in $a->page_contact by our calling page.
-						// Put this person as the wall owner of the wall-to-wall notice.
-
-						$owner_url = zrl($a->page_contact['url']);
-						$owner_photo = $a->page_contact['thumb'];
-						$owner_name = $a->page_contact['name'];
-						$template = $wallwall;
-						$commentww = 'ww';	
-					}
-
-					if((! $item['wall']) && $item['owner-link']) {
-
-						$owner_linkmatch = (($item['owner-link']) && link_compare($item['owner-link'],$item['author-link']));
-						$alias_linkmatch = (($item['alias']) && link_compare($item['alias'],$item['author-link']));
-						$owner_namematch = (($item['owner-name']) && $item['owner-name'] == $item['author-name']);
-						if((! $owner_linkmatch) && (! $alias_linkmatch) && (! $owner_namematch)) {
-
-							// The author url doesn't match the owner (typically the contact)
-							// and also doesn't match the contact alias. 
-							// The name match is a hack to catch several weird cases where URLs are 
-							// all over the park. It can be tricked, but this prevents you from
-							// seeing "Bob Smith to Bob Smith via Wall-to-wall" and you know darn
-							// well that it's the same Bob Smith. 
-
-							// But it could be somebody else with the same name. It just isn't highly likely. 
-							
-
-							$owner_url = $item['owner-link'];
-							$owner_photo = $item['owner-avatar'];
-							$owner_name = $item['owner-name'];
-							$template = $wallwall;
-							$commentww = 'ww';
-							// If it is our contact, use a friendly redirect link
-							if((link_compare($item['owner-link'],$item['url'])) 
-								&& ($item['network'] === NETWORK_DFRN)) {
-								$owner_url = $redirect_url;
-								$osparkle = ' sparkle';
-							}
-							else
-								$owner_url = zrl($owner_url);
-						}
-					}
-				}
-
-				$likebuttons = '';
-				$shareable = ((($profile_owner == local_user()) && ($item['private'] != 1)) ? true : false); 
-
-				if($page_writeable) {
-/*					if($toplevelpost) {  */
-						$likebuttons = array(
-							'like' => array( t("I like this \x28toggle\x29"), t("like")),
-							'dislike' => array( t("I don't like this \x28toggle\x29"), t("dislike")),
-						);
-						if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
-/*					} */
-
-					$qc = $qcomment =  null;
-
-					if(in_array('qcomment',$a->plugins)) {
-						$qc = ((local_user()) ? get_pconfig(local_user(),'qcomment','words') : null);
-						$qcomment = (($qc) ? explode("\n",$qc) : null);
-					}
-
-					if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
-						$comment = replace_macros($cmnt_tpl,array(
-							'$return_path' => '', 
-							'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
-							'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
-							'$id' => $item['item_id'],
-							'$parent' => $item['parent'],
-							'$qcomment' => $qcomment,
-							'$profile_uid' =>  $profile_owner,
-							'$mylink' => $a->contact['url'],
-							'$mytitle' => t('This is you'),
-							'$myphoto' => $a->contact['thumb'],
-							'$comment' => t('Comment'),
-							'$submit' => t('Submit'),
-							'$edbold' => t('Bold'),
-							'$editalic' => t('Italic'),
-							'$eduline' => t('Underline'),
-							'$edquote' => t('Quote'),
-							'$edcode' => t('Code'),
-							'$edimg' => t('Image'),
-							'$edurl' => t('Link'),
-							'$edvideo' => t('Video'),
-							'$preview' => t('Preview'),
-							'$ww' => (($mode === 'network') ? $commentww : '')
-						));
 				}
 			}
 
-				if(local_user() && link_compare($a->contact['url'],$item['author-link']))
+			$threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode,  $profile_owner, $alike, $dlike);
-					$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
-				else
-					$edpost = false;
-
-				$drop = '';
-				$dropping = false;
-
-				if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-					$dropping = true;
-
-				$drop = array(
-					'dropping' => $dropping,
-					'select' => t('Select'), 
-					'delete' => t('Delete'),
-				);
-
-				$star = false;
-				$filer = false;
-
-				$isstarred = "unstarred";
-				if ($profile_owner == local_user()) {
-					if($toplevelpost) {
-						$isstarred = (($item['starred']) ? "starred" : "unstarred");
-
-						$star = array(
-							'do' => t("add star"),
-							'undo' => t("remove star"),
-							'toggle' => t("toggle star status"),
-							'classdo' => (($item['starred']) ? "hidden" : ""),
-							'classundo' => (($item['starred']) ? "" : "hidden"),
-							'starred' =>  t('starred'),
-							'tagger' => t("add tag"),
-							'classtagger' => "",
-						);
-					}
-					$filer = t("save to folder");
-				}
-
-
-				$photo = $item['photo'];
-				$thumb = $item['thumb'];
-
-				// Post was remotely authored.
-
-				$diff_author    = ((link_compare($item['url'],$item['author-link'])) ? false : true);
-
-				$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-
-				if($item['author-link'] && (! $item['author-name']))
-					$profile_name = $item['author-link'];
-
-				$sp = false;
-				$profile_link = best_link_url($item,$sp);
-				if($profile_link === 'mailbox')
-					$profile_link = '';
-				if($sp)
-					$sparkle = ' sparkle';
-				else
-					$profile_link = zrl($profile_link);					
-
-				$normalised = normalise_link((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
-				if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
-					$profile_avatar = $a->contacts[$normalised]['thumb'];
-				else
-					$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
-
-				$like    = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : '');
-				$dislike = ((x($dlike,$item['uri'])) ? format_like($dlike[$item['uri']],$dlike[$item['uri'] . '-l'],'dislike',$item['uri']) : '');
-
-				$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
-				call_hooks('render_location',$locate);
-
-				$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
-
-				$indent = (($toplevelpost) ? '' : ' comment');
-
-				if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-					$indent .= ' shiny'; 
-
-				// 
-				localize_item($item);
-
-
-				$tags=array();
-				foreach(explode(',',$item['tag']) as $tag){
-					$tag = trim($tag);
-					if ($tag!="") $tags[] = bbcode($tag);
-				}
-
-				// Build the HTML
-
-				$body = prepare_body($item,true);
-				//$tmp_item = replace_macros($template,
-				$tmp_item = array(
-					// collapse comments in template. I don't like this much...
-					'comment_firstcollapsed' => $comment_firstcollapsed,
-					'comment_lastcollapsed' => $comment_lastcollapsed,
-					// template to use to render item (wall, walltowall, search)
-					'template' => $template,
-					
-					'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
-					'tags' => $tags,
-					'body' => template_escape($body),
-					'text' => strip_tags(template_escape($body)),
-					'id' => $item['item_id'],
-					'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
-					'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner-name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
-					'to' => t('to'),
-					'wall' => t('Wall-to-Wall'),
-					'vwall' => t('via Wall-To-Wall:'),
-					'profile_url' => $profile_link,
-					'item_photo_menu' => item_photo_menu($item),
-					'name' => template_escape($profile_name),
-					'thumb' => $profile_avatar,
-					'osparkle' => $osparkle,
-					'sparkle' => $sparkle,
-					'title' => template_escape($item['title']),
-					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-					'lock' => $lock,
-					'location' => template_escape($location),
-					'indent' => $indent,
-					'owner_url' => $owner_url,
-					'owner_photo' => $owner_photo,
-					'owner_name' => template_escape($owner_name),
-					'plink' => get_plink($item),
-					'edpost' => $edpost,
-					'isstarred' => $isstarred,
-					'star' => $star,
-					'filer' => $filer,
-					'drop' => $drop,
-					'vote' => $likebuttons,
-					'like' => $like,
-					'dislike' => $dislike,
-					'comment' => $comment,
-					'previewing' => $previewing,
-					'wait' => t('Please wait'),
-
-				);
-
-
-				$arr = array('item' => $item, 'output' => $tmp_item);
-				call_hooks('display_item', $arr);
-
-				$threads[$threadsid]['items'][] = $arr['output'];
-			}
 		}
 	}
 		
-	$page_template = get_markup_template("conversation.tpl");
 	$o = replace_macros($page_template, array(
 		'$baseurl' => $a->get_baseurl($ssl_state),
 		'$mode' => $mode,
 		'$user' => $a->user,
 		'$threads' => $threads,
-		'$dropping' => ($dropping?t('Delete Selected Items'):False),
+		'$dropping' => ($page_dropping?t('Delete Selected Items'):False),
 	));
 
 	return $o;
@@ -1055,7 +1091,6 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		$plaintext = true;
 
 	$tpl = get_markup_template('jot-header.tpl');
-	
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$newpost' => 'true',
 		'$baseurl' => $a->get_baseurl(true),
@@ -1072,6 +1107,23 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 	));
 
 
+	$tpl = get_markup_template('jot-end.tpl');
+	$a->page['end'] .= replace_macros($tpl, array(
+		'$newpost' => 'true',
+		'$baseurl' => $a->get_baseurl(true),
+		'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$geotag' => $geotag,
+		'$nickname' => $x['nickname'],
+		'$ispublic' => t('Visible to <strong>everybody</strong>'),
+		'$linkurl' => t('Please enter a link URL:'),
+		'$vidurl' => t("Please enter a video link/URL:"),
+		'$audurl' => t("Please enter an audio link/URL:"),
+		'$term' => t('Tag term:'),
+		'$fileas' => t('Save to Folder:'),
+		'$whereareu' => t('Where are you right now?')
+	));
+
+
 	$tpl = get_markup_template("jot.tpl");
 		
 	$jotplugins = '';
@@ -1147,6 +1199,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$bang' => $x['bang'],
 		'$profile_uid' => $x['profile_uid'],
 		'$preview' => t('Preview'),
+		'$sourceapp' => t($a->sourcename),
 	));
 
 
@@ -1159,12 +1212,55 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 }
 
 
+function get_item_children($arr, $parent) {
+	$children = array();
+	foreach($arr as $item) {
+		if($item['id'] != $item['parent']) {
+			if(get_config('system','thread_allow')) {
+				// Fallback to parent-uri if thr-parent is not set
+				$thr_parent = $item['thr-parent'];
+				if($thr_parent == '')
+					$thr_parent = $item['parent-uri'];
+				
+				if($thr_parent == $parent['uri']) {
+					$item['children'] = get_item_children($arr, $item);
+					$children[] = $item;
+				}
+			}
+			else if($item['parent'] == $parent['id']) {
+				$children[] = $item;
+			}
+		}
+	}
+	return $children;
+}
+
+function sort_item_children($items) {
+	$result = $items;
+	usort($result,'sort_thr_created_rev');
+	foreach($result as $k => $i) {
+		if(count($result[$k]['children'])) {
+			$result[$k]['children'] = sort_item_children($result[$k]['children']);
+		}
+	}
+	return $result;
+}
+
+function add_children_to_list($children, &$arr) {
+	foreach($children as $y) {
+		$arr[] = $y;
+		if(count($y['children']))
+			add_children_to_list($y['children'], $arr);
+	}
+}
+
 function conv_sort($arr,$order) {
 
 	if((!(is_array($arr) && count($arr))))
 		return array();
 
 	$parents = array();
+	$children = array();
 
 	foreach($arr as $x)
 		if($x['id'] == $x['parent'])
@@ -1177,21 +1273,22 @@ function conv_sort($arr,$order) {
 
 	if(count($parents))
 		foreach($parents as $i=>$_x) 
-			$parents[$i]['children'] = array();
+			$parents[$i]['children'] = get_item_children($arr, $_x);
 
-	foreach($arr as $x) {
+	/*foreach($arr as $x) {
 		if($x['id'] != $x['parent']) {
 			$p = find_thread_parent_index($parents,$x);
 			if($p !== false)
 				$parents[$p]['children'][] = $x;
 		}
-	}
+	}*/
 	if(count($parents)) {
 		foreach($parents as $k => $v) {
 			if(count($parents[$k]['children'])) {
-				$y = $parents[$k]['children'];
+				$parents[$k]['children'] = sort_item_children($parents[$k]['children']);
+				/*$y = $parents[$k]['children'];
 				usort($y,'sort_thr_created_rev');
-				$parents[$k]['children'] = $y;
+				$parents[$k]['children'] = $y;*/
 			}
 		}	
 	}
@@ -1201,8 +1298,9 @@ function conv_sort($arr,$order) {
 		foreach($parents as $x) {
 			$ret[] = $x;
 			if(count($x['children']))
-				foreach($x['children'] as $y)
+				add_children_to_list($x['children'], $ret);
-					$ret[] = $y;
+				/*foreach($x['children'] as $y)
+					$ret[] = $y;*/
 		}
 	}
 

include/diaspora.php

@@ -102,6 +102,37 @@ function diaspora_dispatch($importer,$msg) {
 	return $ret;
 }
 
+function diaspora_handle_from_contact($contact_id) {
+	$handle = False;
+
+	logger("diaspora_handle_from_contact: contact id is " . $contact_id, LOGGER_DEBUG);
+
+	$r = q("SELECT network, addr, self, url, nick FROM contact WHERE id = %d",
+	       intval($contact_id)
+	);
+	if($r) {
+		$contact = $r[0];
+
+		logger("diaspora_handle_from_contact: contact 'self' = " . $contact['self'] . " 'url' = " . $contact['url'], LOGGER_DEBUG);
+
+		if($contact['network'] === NETWORK_DIASPORA) {
+			$handle = $contact['addr'];
+
+//			logger("diaspora_handle_from_contact: contact id is a Diaspora person, handle = " . $handle, LOGGER_DEBUG);
+		}
+		elseif(($contact['network'] === NETWORK_DFRN) || ($contact['self'] == 1)) {
+			$baseurl_start = strpos($contact['url'],'://') + 3;
+			$baseurl_length = strpos($contact['url'],'/profile') - $baseurl_start; // allows installations in a subdirectory--not sure how Diaspora will handle
+			$baseurl = substr($contact['url'], $baseurl_start, $baseurl_length);
+			$handle = $contact['nick'] . '@' . $baseurl;
+
+//			logger("diaspora_handle_from_contact: contact id is a DFRN person, handle = " . $handle, LOGGER_DEBUG);
+		}
+	}
+
+	return $handle;
+}
+
 function diaspora_get_contact_by_handle($uid,$handle) {
 	$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `addr` = '%s' LIMIT 1",
 		dbesc(NETWORK_DIASPORA),
@@ -1282,7 +1313,7 @@ function diaspora_comment($importer,$xml,$msg) {
 		// the existence of parent_author_signature means the parent_author or owner
 		// is already relaying.
 
-		proc_run('php','include/notifier.php','comment',$message_id);
+		proc_run('php','include/notifier.php','comment-import',$message_id);
 	}
 
 	$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ",
@@ -1319,7 +1350,7 @@ function diaspora_comment($importer,$xml,$msg) {
 				'verb'         => ACTIVITY_POST,
 				'otype'        => 'item',
 				'parent'       => $conv_parent,
-
+				'parent_uri'   => $parent_uri
 			));
 
 			// only send one notification
@@ -1867,7 +1898,7 @@ EOT;
 	// is already relaying. The parent_item['origin'] indicates the message was created on our system
 
 	if(($parent_item['origin']) && (! $parent_author_signature))
-		proc_run('php','include/notifier.php','comment',$message_id);
+		proc_run('php','include/notifier.php','comment-import',$message_id);
 
 	return;
 }
@@ -1993,7 +2024,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
 						// is already relaying.
 						logger('diaspora_signed_retraction: relaying relayable_retraction');
 
-						proc_run('php','include/notifier.php','relayable_retraction',$r[0]['id']);
+						proc_run('php','include/notifier.php','drop',$r[0]['id']);
 					}
 				}
 			}
@@ -2153,12 +2184,6 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
 		}
 	}
 */
-	/**
-	 * Transform #tags, strip off the [url] and replace spaces with underscore
-	 */
-	$body = preg_replace_callback('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', function($match) {
-		return '#'. str_replace(' ', '_', $match[2]);
-	}, $body);
 
 	//if(strlen($title))
 	//	$body = "[b]".html_entity_decode($title)."[/b]\n\n".$body;
@@ -2257,12 +2282,13 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
 	$myaddr = $owner['nickname'] . '@' .  substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3);
 //	$theiraddr = $contact['addr'];
 
-	if($item['thr-parent']) {
+	// Diaspora doesn't support threaded comments
+	/*if($item['thr-parent']) {
 		$p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
 		        dbesc($item['thr-parent'])
 		      );
 	}
-	else {
+	else {*/
 		// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
 		// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
 		// The only item with `parent` and `id` as the parent id is the parent item.
@@ -2270,7 +2296,7 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) {
 			intval($item['parent']),
 			intval($item['parent'])
 		);
-	}
+	//}
 	if(count($p))
 		$parent = $p[0];
 	else
@@ -2332,13 +2358,13 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 	$body = $item['body'];
 	$text = html_entity_decode(bb2diaspora($body));
 
-
+	// Diaspora doesn't support threaded comments
-	if($item['thr-parent']) {
+	/*if($item['thr-parent']) {
 		$p = q("select guid, type, uri, `parent-uri` from item where uri = '%s' limit 1",
 		        dbesc($item['thr-parent'])
 		      );
 	}
-	else {
+	else {*/
 		// The first item in the `item` table with the parent id is the parent. However, MySQL doesn't always
 		// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
 		// The only item with `parent` and `id` as the parent id is the parent item.
@@ -2346,7 +2372,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 		       intval($item['parent']),
 		       intval($item['parent'])
 		      );
-	}
+	//}
 	if(count($p))
 		$parent = $p[0];
 	else
@@ -2367,7 +2393,6 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 		$like = true;
 
 		$target_type = ( $parent['uri'] === $parent['parent-uri']  ? 'Post' : 'Comment');
-//		$target_type = (strpos($parent['type'], 'comment') ? 'Comment' : 'Post');
 //		$positive = (($item['deleted']) ? 'false' : 'true');
 		$positive = 'true';
 
@@ -2381,7 +2406,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 	// fetch the original signature	if the relayable was created by a Diaspora
 	// or DFRN user. Relayables for other networks are not supported.
 
-	$r = q("select * from sign where " . $sql_sign_id . " = %d limit 1",
+/*	$r = q("select * from sign where " . $sql_sign_id . " = %d limit 1",
 		intval($item['id'])
 	);
 	if(count($r)) { 
@@ -2397,7 +2422,25 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
 		// function is called
 		logger('diaspora_send_relay: original author signature not found, cannot send relayable');
 		return;
-	}
+	}*/
+
+	/* Since the author signature is only checked by the parent, not by the relay recipients,
+	 * I think it may not be necessary for us to do so much work to preserve all the original
+	 * signatures. The important thing that Diaspora DOES need is the original creator's handle.
+	 * Let's just generate that and forget about all the original author signature stuff.
+	 *
+	 * Note: this might be more of an problem if we want to support likes on comments for older
+	 * versions of Diaspora (diaspora-pistos), but since there are a number of problems with
+	 * doing that, let's ignore it for now.
+	 *
+	 * Currently, only DFRN contacts are supported. StatusNet shouldn't be hard, but it hasn't
+	 * been done yet
+	 */
+
+	$handle = diaspora_handle_from_contact($item['contact-id']);
+	if(! $handle)
+		return;
+
 
 	if($relay_retract)
 		$sender_signed_text = $item['guid'] . ';' . $target_type;

include/enotify.php

@@ -1,5 +1,7 @@
 <?php
 
+require_once('include/email.php');
+
 function notification($params) {
 
 	logger('notification: entry', LOGGER_DEBUG);
@@ -324,7 +326,7 @@ function notification($params) {
 		// If so, create the record of it and use a message-id smtp header.
 
 		if(!$r) {
-			logger("norify_id:" . intval($notify_id). ", parent: " . intval($params['parent']) . "uid: " . 
+			logger("notify_id:" . intval($notify_id). ", parent: " . intval($params['parent']) . "uid: " . 
 intval($params['uid']), LOGGER_DEBUG);
 			$r = q("insert into `notify-threads` (`notify-id`, `master-parent-item`, `receiver-uid`, `parent-item`)
 				values(%d,%d,%d,%d)",
@@ -495,6 +497,7 @@ class enotify {
 			$multipartMessageBody,	 						// message body
 			$messageHeader									// message headers
 		);
+		logger("notification: enotify::send header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG);
 		logger("notification: enotify::send returns " . $res, LOGGER_DEBUG);
 	}
 }

include/items.php

@@ -578,6 +578,7 @@ function get_atom_elements($feed,$item) {
 		$res['body'] = escape_tags($res['body']);
 	}
 
+
 	// this tag is obsolete but we keep it for really old sites
 
 	$allow = $item->get_item_tags(NAMESPACE_DFRN,'comment-allow');
@@ -924,6 +925,8 @@ function item_store($arr,$force_parent = false) {
 	$arr['origin']        = ((x($arr,'origin'))        ? intval($arr['origin'])              : 0 );
 	$arr['guid']          = ((x($arr,'guid'))          ? notags(trim($arr['guid']))          : get_guid());
 
+
+	$arr['thr-parent'] = $arr['parent-uri'];
 	if($arr['parent-uri'] === $arr['uri']) {
 		$parent_id = 0;
 		$parent_deleted = 0;
@@ -949,7 +952,6 @@ function item_store($arr,$force_parent = false) {
 			// and re-attach to the conversation parent.
 
 			if($r[0]['uri'] != $r[0]['parent-uri']) {
-				$arr['thr-parent'] = $arr['parent-uri'];
 				$arr['parent-uri'] = $r[0]['parent-uri'];
 				$z = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `parent-uri` = '%s' AND `uid` = %d 
 					ORDER BY `id` ASC LIMIT 1",
@@ -991,7 +993,6 @@ function item_store($arr,$force_parent = false) {
 			if($force_parent) {
 				logger('item_store: $force_parent=true, reply converted to top-level post.');
 				$parent_id = 0;
-				$arr['thr-parent'] = $arr['parent-uri'];
 				$arr['parent-uri'] = $arr['uri'];
 				$arr['gravity'] = 0;
 			}
@@ -2135,7 +2136,7 @@ function local_delivery($importer,$data) {
 		}
 	}
 
-	if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) {
+	if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) {
 		logger('local_delivery: Updating photo for ' . $importer['name']);
 		require_once("Photo.php");
 		$photo_failure = false;
@@ -2193,7 +2194,7 @@ function local_delivery($importer,$data) {
 		}
 	}
 
-	if((is_array($contact)) && ($name_updated) && (strlen($new_name)) && ($name_updated > $contact['name-date'])) {
+	if(($name_updated) && (strlen($new_name)) && ($name_updated > $importer['name-date'])) {
 		$r = q("select * from contact where uid = %d and id = %d limit 1",
 			intval($importer['importer_uid']),
 			intval($importer['id'])
@@ -2458,6 +2459,7 @@ function local_delivery($importer,$data) {
 
 					$is_a_remote_delete = false;
 
+					// POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used?
 					$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`, 
 						`contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item` 
 						LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` 
@@ -2776,12 +2778,14 @@ function local_delivery($importer,$data) {
 				$parent = 0;
 
 				if($posted_id) {
-					$r = q("SELECT `parent` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+					$r = q("SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 						intval($posted_id),
 						intval($importer['importer_uid'])
 					);
-					if(count($r))
+					if(count($r)) {
 						$parent = $r[0]['parent'];
+						$parent_uri = $r[0]['parent-uri'];
+					}
 			
 					if(! $is_like) {
 						$r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
@@ -2821,7 +2825,7 @@ function local_delivery($importer,$data) {
 								'verb'         => ACTIVITY_POST,
 								'otype'        => 'item',
 								'parent'       => $parent,
-
+								'parent_uri'   => $parent_uri,
 							));
 
 						}
@@ -2970,6 +2974,7 @@ function local_delivery($importer,$data) {
 									'verb'         => ACTIVITY_POST,
 									'otype'        => 'item',
 									'parent'       => $conv_parent,
+									'parent_uri'   => $parent_uri
 
 								));
 
@@ -3059,7 +3064,8 @@ function local_delivery($importer,$data) {
 			$datarray['uid'] = $importer['importer_uid'];
 			$datarray['contact-id'] = $importer['id'];
 
-			if(! link_compare($datarray['owner-link'],$contact['url'])) {
+
+			if(! link_compare($datarray['owner-link'],$importer['url'])) {
 				// The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery, 
 				// but otherwise there's a possible data mixup on the sender's system.
 				// the tgroup delivery code called from item_store will correct it if it's a forum,
@@ -3328,7 +3334,6 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 	else
 		$body = $item['body'];
 
-
 	$o = "\r\n\r\n<entry>\r\n";
 
 	if(is_array($author))
@@ -3338,7 +3343,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 	if(strlen($item['owner-name']))
 		$o .= atom_author('dfrn:owner',$item['owner-name'],$item['owner-link'],80,80,$item['owner-avatar']);
 
-	if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || ($item['thr-parent'])) {
+	if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
 		$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
 		$o .= '<thr:in-reply-to ref="' . xmlify($parent_item) . '" type="text/html" href="' .  xmlify($a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['parent']) . '" />' . "\r\n";
 	}
@@ -3699,8 +3704,9 @@ function drop_item($id,$interactive = true) {
 
 	// check if logged in user is either the author or owner of this item
 
-	if((local_user() == $item['uid']) || (remote_user() == $item['contact-id'])) {
+	if((local_user() == $item['uid']) || (remote_user() == $item['contact-id']) || (! $interactive)) {
 
+		logger('delete item: ' . $item['id'], LOGGER_DEBUG);
 		// delete the item
 
 		$r = q("UPDATE `item` SET `deleted` = 1, `title` = '', `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",

include/markdownify/markdownify.php

@@ -686,6 +686,10 @@ class Markdownify {
         #  [1]: mailto:mail@example.com Title
         $tag['href'] = 'mailto:'.$bufferDecoded;
       }
+
+      $this->out('['.$buffer.']('.$tag['href'].' "'.$tag['title'].'")', true);
+
+/*
       # [This link][id]
       foreach ($this->stack['a'] as $tag2) {
         if ($tag2['href'] == $tag['href'] && $tag2['title'] === $tag['title']) {
@@ -699,6 +703,7 @@ class Markdownify {
       }
 
       $this->out('['.$buffer.']['.$tag['linkID'].']', true);
+*/
     }
   }
   /**

include/network.php

@@ -802,7 +802,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 	$s = htmlspecialchars_decode($s);
 
 	$matches = null;
-	$c = preg_match_all('/\[img\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
+	$c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
 	if($c) {
 		require_once('include/Photo.php');
 		foreach($matches as $mtch) {
@@ -823,6 +823,12 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 				$scaled = $mtch[1];
 			$i = fetch_url($scaled);
 
+			$cache = get_config('system','itemcache');
+			if (($cache != '') and is_dir($cache)) {
+				$cachefile = $cache."/".hash("md5", $scaled);
+				file_put_contents($cachefile, $i);
+			}
+
 			// guess mimetype from headers or filename
 			$type = guess_image_type($mtch[1],true);
 			
@@ -848,6 +854,10 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
 			}
 		}
 	}
+
+	// replace the special char encoding
+
+	$s = htmlspecialchars($s,ENT_QUOTES,'UTF-8');
 	return $s;
 }
 

include/notifier.php

@@ -18,6 +18,31 @@ require_once('include/html2plain.php');
  * us by hosting providers. 
  */
 
+/*
+ * The notifier is typically called with:
+ *
+ *		proc_run('php', "include/notifier.php", COMMAND, ITEM_ID);
+ *
+ * where COMMAND is one of the following:
+ *
+ *		activity				(in diaspora.php, dfrn_confirm.php, profiles.php)
+ *		comment-import			(in diaspora.php, items.php)
+ *		comment-new				(in item.php)
+ *		drop					(in diaspora.php, items.php, photos.php)
+ *		edit_post				(in item.php)
+ *		event					(in events.php)
+ *		expire					(in items.php)
+ *		like					(in like.php, poke.php)
+ *		mail					(in message.php)
+ *		suggest					(in fsuggest.php)
+ *		tag						(in photos.php, poke.php, tagger.php)
+ *		tgroup					(in items.php)
+ *		wall-new				(in photos.php, item.php)
+ *
+ * and ITEM_ID is the id of the item in the database that needs to be sent to others.
+ */
+
+
 function notifier_run($argv, $argc){
 	global $a, $db;
 

include/oembed.php

@@ -12,7 +12,9 @@ function oembed_replacecb($matches){
 
 function oembed_fetch_url($embedurl){
 
-	$txt = Cache::get($embedurl);
+	$a = get_app();
+
+	$txt = Cache::get($a->videowidth . $embedurl);
 
 	// These media files should now be caught in bbcode.php
 	// left here as a fallback in case this is called from another source
@@ -38,7 +40,7 @@ function oembed_fetch_url($embedurl){
 					$entries = $xpath->query("//link[@type='application/json+oembed']");
 					foreach($entries as $e){
 						$href = $e->getAttributeNode("href")->nodeValue;
-						$txt = fetch_url($href . '&maxwidth=425');
+						$txt = fetch_url($href . '&maxwidth=' . $a->videowidth);
 						break;
 					}
 				}
@@ -47,7 +49,7 @@ function oembed_fetch_url($embedurl){
 		
 		if ($txt==false || $txt==""){
 			// try oohembed service
-			$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=425';  
+			$ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl).'&maxwidth=' . $a->videowidth;  
 			$txt = fetch_url($ourl);
 		}
 		
@@ -55,7 +57,7 @@ function oembed_fetch_url($embedurl){
 		if ($txt[0]!="{") $txt='{"type":"error"}';
 	
 		//save in cache
-		Cache::set($embedurl,$txt);
+		Cache::set($a->videowidth . $embedurl,$txt);
 
 	}
 	
@@ -114,7 +116,7 @@ function oembed_format_object($j){
 		if (isset($j->provider_name)) $ret.=" on ".$j->provider_name;
 	} else {
 		// add <a> for html2bbcode conversion
-		$ret .= "<a href='$embedurl' rel='oembed'/>";
+		$ret .= "<a href='$embedurl' rel='oembed'></a>";
 	}
 	$ret.="<br style='clear:left'></span>";
 	return  mb_convert_encoding($ret, 'HTML-ENTITIES', mb_detect_encoding($ret));

include/template_processor.php

@@ -63,7 +63,7 @@
 				if ($b[0]=="$") $b =  $this->_get_var($b);
 				$val = ($a == $b);
 			} else if (strpos($args[2],"!=")>0){
-				list($a,$b) = explode("!=",$args[2]);
+				list($a,$b) = array_map("trim", explode("!=",$args[2]));
 				$a = $this->_get_var($a);
 				if ($b[0]=="$") $b =  $this->_get_var($b);
 				$val = ($a != $b);
@@ -134,6 +134,26 @@
 			
 		}
 		
+		/**
+		 * DEBUG node
+		 * 
+		 * {{ debug $var [$var [$var [...]]] }}{{ enddebug }}
+		 * 
+		 * replace node with <pre>var_dump($var, $var, ...);</pre>
+		 */
+		private function _replcb_debug($args){
+			$vars = array_map('trim', explode(" ",$args[2]));
+			$vars[] = $args[1];
+
+			$ret = "<pre>";
+			foreach ($vars as $var){
+				$ret .= htmlspecialchars(var_export( $this->_get_var($var), true ));
+				$ret .= "\n";
+			}
+			$ret .= "</pre>";
+			return $ret;
+		}
+
 		private function _replcb_node($m) {
 			$node = $this->nodes[$m[1]];
 			if (method_exists($this, "_replcb_".$node[1])){

include/text.php

@@ -70,7 +70,7 @@ function notags($string) {
 if(! function_exists('escape_tags')) {
 function escape_tags($string) {
 
-	return(htmlspecialchars($string));
+	return(htmlspecialchars($string, ENT_COMPAT, 'UTF-8', false));
 }}
 
 
@@ -504,6 +504,10 @@ function get_tags($s) {
 
 	$s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s);
 
+	// ignore anything in a bbtag
+
+	$s = preg_replace('/\[(.*?)\]/sm','',$s);
+
 	// Match full names against @tags including the space between first and last
 	// We will look these up afterward to see if they are full names or not recognisable.
 
@@ -723,6 +727,39 @@ function get_poke_verbs() {
 	return $arr;
 }
 
+function get_mood_verbs() {
+	
+	// index is present tense verb
+	// value is array containing past tense verb, translation of present, translation of past
+
+	$arr = array(
+		'happy'      => t('happy'),
+		'sad'        => t('sad'),
+		'mellow'     => t('mellow'),
+		'tired'      => t('tired'),
+		'perky'      => t('perky'),
+		'angry'      => t('angry'),
+		'stupefied'  => t('stupified'),
+		'puzzled'    => t('puzzled'),
+		'interested' => t('interested'),
+		'bitter'     => t('bitter'),
+		'cheerful'   => t('cheerful'),
+		'alive'      => t('alive'),
+		'annoyed'    => t('annoyed'),
+		'anxious'    => t('anxious'),
+		'cranky'     => t('cranky'),
+		'disturbed'  => t('disturbed'),
+		'frustrated' => t('frustrated'),
+		'motivated'  => t('motivated'),
+		'relaxed'    => t('relaxed'),
+		'surprised'  => t('surprised'),
+	);
+
+	call_hooks('mood_verbs', $arr);
+	return $arr;
+}
+
+
 /**
  * 
  * Function: smilies
@@ -1578,7 +1615,7 @@ function undo_post_tagging($s) {
 
 function fix_mce_lf($s) {
 	$s = str_replace("\r\n","\n",$s);
-	$s = str_replace("\n\n","\n",$s);
+//	$s = str_replace("\n\n","\n",$s);
 	return $s;
 }
 

index.php

@@ -118,6 +118,12 @@ if(! x($_SESSION,'authenticated'))
 
 $a->init_pagehead();
 
+/**
+ * Build the page ending -- this is stuff that goes right before
+ * the closing </body> tag
+ */
+
+$a->init_page_end();
 
 
 if(! x($_SESSION,'sysmsg'))

js/acl.min.js

@@ -0,0 +1 @@
+function ACL(e,t){that=this,that.url=e,that.kp_timer=null,t==undefined&&(t=[]),that.allow_cid=t[0]||[],that.allow_gid=t[1]||[],that.deny_cid=t[2]||[],that.deny_gid=t[3]||[],that.group_uids=[],that.nw=4,that.list_content=$("#acl-list-content"),that.item_tpl=unescape($(".acl-list-item[rel=acl-template]").html()),that.showall=$("#acl-showall"),t.length==0&&that.showall.addClass("selected"),that.showall.click(that.on_showall),$(".acl-button-show").live("click",that.on_button_show),$(".acl-button-hide").live("click",that.on_button_hide),$("#acl-search").keypress(that.on_search),$("#acl-wrapper").parents("form").submit(that.on_submit),that.get(0,100)}ACL.prototype.on_submit=function(){aclfileds=$("#acl-fields").html(""),$(that.allow_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_allow[]' value='"+t+"'>")}),$(that.allow_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_allow[]' value='"+t+"'>")}),$(that.deny_gid).each(function(e,t){aclfileds.append("<input type='hidden' name='group_deny[]' value='"+t+"'>")}),$(that.deny_cid).each(function(e,t){aclfileds.append("<input type='hidden' name='contact_deny[]' value='"+t+"'>")})},ACL.prototype.search=function(){var e=$("#acl-search").val();that.list_content.html(""),that.get(0,100,e)},ACL.prototype.on_search=function(e){that.kp_timer&&clearTimeout(that.kp_timer),that.kp_timer=setTimeout(that.search,1e3)},ACL.prototype.on_showall=function(e){return e.preventDefault(),e.stopPropagation(),that.showall.hasClass("selected")?!1:(that.showall.addClass("selected"),that.allow_cid=[],that.allow_gid=[],that.deny_cid=[],that.deny_gid=[],that.update_view(),!1)},ACL.prototype.on_button_show=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_allow($(this).parent().attr("id")),!1},ACL.prototype.on_button_hide=function(e){return e.preventDefault(),e.stopImmediatePropagation(),e.stopPropagation(),that.set_deny($(this).parent().attr("id")),!1},ACL.prototype.set_allow=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.allow_gid.indexOf(id)<0?that.allow_gid.push(id):that.allow_gid.remove(id),that.deny_gid.indexOf(id)>=0&&that.deny_gid.remove(id);break;case"c":that.allow_cid.indexOf(id)<0?that.allow_cid.push(id):that.allow_cid.remove(id),that.deny_cid.indexOf(id)>=0&&that.deny_cid.remove(id)}that.update_view()},ACL.prototype.set_deny=function(e){type=e[0],id=parseInt(e.substr(1));switch(type){case"g":that.deny_gid.indexOf(id)<0?that.deny_gid.push(id):that.deny_gid.remove(id),that.allow_gid.indexOf(id)>=0&&that.allow_gid.remove(id);break;case"c":that.deny_cid.indexOf(id)<0?that.deny_cid.push(id):that.deny_cid.remove(id),that.allow_cid.indexOf(id)>=0&&that.allow_cid.remove(id)}that.update_view()},ACL.prototype.update_view=function(){that.allow_gid.length==0&&that.allow_cid.length==0&&that.deny_gid.length==0&&that.deny_cid.length==0?(that.showall.addClass("selected"),$("#jot-perms-icon").removeClass("lock").addClass("unlock"),$("#jot-public").show(),$(".profile-jot-net input").attr("disabled",!1),typeof editor!="undefined"&&editor!=0&&$("#profile-jot-desc").html(ispublic)):(that.showall.removeClass("selected"),$("#jot-perms-icon").removeClass("unlock").addClass("lock"),$("#jot-public").hide(),$(".profile-jot-net input").attr("disabled","disabled"),$("#profile-jot-desc").html("&nbsp;")),$("#acl-list-content .acl-list-item").each(function(){$(this).removeClass("groupshow grouphide")}),$("#acl-list-content .acl-list-item").each(function(){itemid=$(this).attr("id"),type=itemid[0],id=parseInt(itemid.substr(1)),btshow=$(this).children(".acl-button-show").removeClass("selected"),bthide=$(this).children(".acl-button-hide").removeClass("selected");switch(type){case"g":var e="";that.allow_gid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected"),e="groupshow"),that.deny_gid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"),e="grouphide"),$(that.group_uids[id]).each(function(t,n){e=="grouphide"&&$("#c"+n).removeClass("groupshow");if(e!=""){var r=$("#c"+n).attr("class");if(r==undefined)return!0;var i=r.indexOf("grouphide");i==-1&&$("#c"+n).addClass(e)}});break;case"c":that.allow_cid.indexOf(id)>=0&&(btshow.addClass("selected"),bthide.removeClass("selected")),that.deny_cid.indexOf(id)>=0&&(btshow.removeClass("selected"),bthide.addClass("selected"))}})},ACL.prototype.get=function(e,t,n){var r={start:e,count:t,search:n};$.ajax({type:"POST",url:that.url,data:r,dataType:"json",success:that.populate})},ACL.prototype.populate=function(e){var t=Math.ceil(e.tot/that.nw)*42;that.list_content.height(t),$(e.items).each(function(){html="<div class='acl-list-item {4} {5}' title='{6}' id='{2}{3}'>"+that.item_tpl+"</div>",html=html.format(this.photo,this.name,this.type,this.id,"",this.network,this.link),this.uids!=undefined&&(that.group_uids[this.id]=this.uids),that.list_content.append(html)}),that.update_view()};

js/country.js

@@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw
 aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina";
 aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western";
 aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands";
-aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste?|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Recolutionari.es|SPRACI|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
+aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|ErrLock|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hikado|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Optimistisch|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other";
 /* 
  * gArCountryInfo
  * (0) Country name

js/fk.autocomplete.min.js

@@ -0,0 +1,5 @@
+/**
+ * Friendica people autocomplete
+ *
+ * require jQuery, jquery.textareas
+ */function ACPopup(e,t){this.idsel=-1,this.element=e,this.searchText="",this.ready=!0,this.kp_timer=!1,this.url=t;var n=530,r=130;if(typeof e.editorId=="undefined")style=$(e).offset(),n=$(e).width(),r=$(e).height();else{var i=e.getContainer();typeof i!="undefined"&&(style=$(i).offset(),n=$(i).width(),r=$(i).height())}style.top=style.top+r,style.width=n,style.position="absolute",style.display="none",this.cont=$("<div class='acpopup'></div>"),this.cont.css(style),$("body").append(this.cont)}function ContactAutocomplete(e,t){this.pattern=/@([^ \n]+)$/,this.popup=null;var n=this;$(e).unbind("keydown"),$(e).unbind("keyup"),$(e).keydown(function(e){n.popup!==null&&n.popup.onkey(e)}),$(e).keyup(function(e){cpos=$(this).getSelection(),cpos.start==cpos.end&&(match=$(this).val().substring(0,cpos.start).match(n.pattern),match!==null?(n.popup===null&&(n.popup=new ACPopup(this,t)),n.popup.ready&&match[1]!==n.popup.searchText&&n.popup.search(match[1]),n.popup.ready||(n.popup=null)):n.popup!==null&&(n.popup.close(),n.popup=null))})}ACPopup.prototype.close=function(){$(this.cont).remove(),this.ready=!1},ACPopup.prototype.search=function(e){var t=this;this.searchText=e,this.kp_timer&&clearTimeout(this.kp_timer),this.kp_timer=setTimeout(function(){t._search()},500)},ACPopup.prototype._search=function(){console.log("_search");var e=this,t={start:0,count:100,search:this.searchText,type:"c"};$.ajax({type:"POST",url:this.url,data:t,dataType:"json",success:function(t){e.cont.html(""),t.tot>0?(e.cont.show(),$(t.items).each(function(){html="<img src='{0}' height='16px' width='16px'>{1} ({2})".format(this.photo,this.name,this.nick),e.add(html,this.nick.replace(" ","")+"+"+this.id+" - "+this.link)})):e.cont.hide()}})},ACPopup.prototype.add=function(e,n){var r=this,i=$("<div class='acpopupitem' title='"+n+"'>"+e+"</div>");i.click(function(e){t=$(this).attr("title").replace(new RegExp(" - .*"),""),typeof r.element.container=="undefined"?(el=$(r.element),sel=el.getSelection(),sel.start=sel.start-r.searchText.length,el.setSelection(sel.start,sel.end).replaceSelectedText(t+" ").collapseSelection(!1),r.close()):(txt=tinyMCE.activeEditor.getContent(),newtxt=txt.replace(r.searchText,t+" "),tinyMCE.activeEditor.setContent(newtxt),tinyMCE.activeEditor.focus(),r.close())}),$(this.cont).append(i)},ACPopup.prototype.onkey=function(e){e.keyCode=="13"&&(this.idsel>-1?(this.cont.children()[this.idsel].click(),e.preventDefault()):this.close()),e.keyCode=="38"&&(cmax=this.cont.children().size()-1,this.idsel--,this.idsel<0&&(this.idsel=cmax),e.preventDefault());if(e.keyCode=="40"||e.keyCode=="9")cmax=this.cont.children().size()-1,this.idsel++,this.idsel>cmax&&(this.idsel=0),e.preventDefault();if(e.keyCode=="38"||e.keyCode=="40"||e.keyCode=="9")this.cont.children().removeClass("selected"),$(this.cont.children()[this.idsel]).addClass("selected");e.keyCode=="27"&&this.close()},function(e){e.fn.contact_autocomplete=function(e){this.each(function(){new ContactAutocomplete(this,e)})}}(jQuery);

js/jquery.htmlstream.min.js

@@ -0,0 +1,6 @@
+/* jQuery ajax stream plugin
+* Version 0.1
+* Copyright (C) 2009 Chris Tarquini
+* Licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License (http://creativecommons.org/licenses/by-sa/3.0/)
+* Permissions beyond the scope of this license may be available by contacting petros000[at]hotmail.com.
+*/(function(e){var t=e.ajax,n=e.get,r=e.post,i=!0;e.ajaxSetup({stream:!1,pollInterval:500}),e.enableAjaxStream=function(a){typeof a=="undefined"&&(a=!i),a?(e.ajax=s,e.get=o,e.post=u,i=!0):(e.ajax=t,e.get=n,e.post=r,i=!1)};var s=e.ajax=function(n){n=jQuery.extend(!0,n,jQuery.extend(!0,{},jQuery.ajaxSettings,n));if(n.stream){var r=0,i=0,s=null,o=0,u=!1,a=function(e){s=e,l()},f=function(){c("stream")},l=function(){u||(r=setTimeout(f,n.pollInterval))},c=function(t){typeof t=="undefined"&&(t="stream");if(s.status<3)return;var r=s.responseText;if(t=="stream"){if(r.length<=o){l();return}lastlength=r.length;if(i==r.length){l();return}}var u=r.substr(i);i=r.length,e.isFunction(n.OnDataRecieved)&&n.OnDataRecieved(u,t,s.responseText,s),s.status!=4&&l()},h=function(e,t){clearTimeout(r),u=!0,c(t)};if(e.isFunction(n.success)){var p=n.success;n.success=function(e,t){h(e,t),p(e,t)}}else n.success=h;if(e.isFunction(n.beforeSend)){var d=n.beforeSend;n.beforeSend=function(e){d(e),a(e)}}else n.beforeSend=a}t(n)},o=e.get=function(t,n,r,i,s){if(e.isFunction(n)){var o=r;r=n,e.isFunction(o)&&(s=o),n=null}e.isFunction(i)&&(s=i,i=undefined);var u=e.isFunction(s);return jQuery.ajax({type:"GET",url:t,data:n,success:r,dataType:i,stream:u,OnDataRecieved:s})},u=e.post=function(t,n,r,i,s){if(e.isFunction(n)){var o=r;r=n}e.isFunction(i)&&(s=i,i=undefined);var u=e.isFunction(s);return jQuery.ajax({type:"POST",url:t,data:n,success:r,dataType:i,stream:u,OnDataRecieved:s})}})(jQuery);

js/main.js

@@ -280,8 +280,7 @@
 			//});
 
 			// add a new thread
-
+			$('.toplevel_item',data).each(function() {
-			$('.tread-wrapper',data).each(function() {
 				var ident = $(this).attr('id');
 
 				if($('#' + ident).length == 0 && profile_page == 1) {

js/webtoolkit.base64.min.js

@@ -0,0 +1,6 @@
+/**
+*
+*  Base64 encode / decode
+*  http://www.webtoolkit.info/
+*
+**/var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(e){var t="",n,r,i,s,o,u,a,f=0;e=Base64._utf8_encode(e);while(f<e.length)n=e.charCodeAt(f++),r=e.charCodeAt(f++),i=e.charCodeAt(f++),s=n>>2,o=(n&3)<<4|r>>4,u=(r&15)<<2|i>>6,a=i&63,isNaN(r)?u=a=64:isNaN(i)&&(a=64),t=t+this._keyStr.charAt(s)+this._keyStr.charAt(o)+this._keyStr.charAt(u)+this._keyStr.charAt(a);return t},decode:function(e){var t="",n,r,i,s,o,u,a,f=0;e=e.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(f<e.length)s=this._keyStr.indexOf(e.charAt(f++)),o=this._keyStr.indexOf(e.charAt(f++)),u=this._keyStr.indexOf(e.charAt(f++)),a=this._keyStr.indexOf(e.charAt(f++)),n=s<<2|o>>4,r=(o&15)<<4|u>>2,i=(u&3)<<6|a,t+=String.fromCharCode(n),u!=64&&(t+=String.fromCharCode(r)),a!=64&&(t+=String.fromCharCode(i));return t=Base64._utf8_decode(t),t},_utf8_encode:function(e){e=e.replace(/\r\n/g,"\n");var t="";for(var n=0;n<e.length;n++){var r=e.charCodeAt(n);r<128?t+=String.fromCharCode(r):r>127&&r<2048?(t+=String.fromCharCode(r>>6|192),t+=String.fromCharCode(r&63|128)):(t+=String.fromCharCode(r>>12|224),t+=String.fromCharCode(r>>6&63|128),t+=String.fromCharCode(r&63|128))}return t},_utf8_decode:function(e){var t="",n=0,r=c1=c2=0;while(n<e.length)r=e.charCodeAt(n),r<128?(t+=String.fromCharCode(r),n++):r>191&&r<224?(c2=e.charCodeAt(n+1),t+=String.fromCharCode((r&31)<<6|c2&63),n+=2):(c2=e.charCodeAt(n+1),c3=e.charCodeAt(n+2),t+=String.fromCharCode((r&15)<<12|(c2&63)<<6|c3&63),n+=3);return t}};

mod/admin.php

@@ -237,6 +237,7 @@ function admin_page_site_post(&$a){
 	$banner				=	((x($_POST,'banner'))      		? trim($_POST['banner'])					: false);
 	$language			=	((x($_POST,'language'))			? notags(trim($_POST['language']))			: '');
 	$theme				=	((x($_POST,'theme'))			? notags(trim($_POST['theme']))				: '');
+	$theme_mobile			=	((x($_POST,'theme_mobile'))		? notags(trim($_POST['theme_mobile']))			: '');
 	$maximagesize		=	((x($_POST,'maximagesize'))		? intval(trim($_POST['maximagesize']))		:  0);
 	
 	
@@ -250,6 +251,7 @@ function admin_page_site_post(&$a){
 	$block_public		=	((x($_POST,'block_public'))		? True	:	False);
 	$force_publish		=	((x($_POST,'publish_all'))		? True	:	False);
 	$global_directory	=	((x($_POST,'directory_submit_url'))	? notags(trim($_POST['directory_submit_url']))	: '');
+	$thread_allow		=	((x($_POST,'thread_allow'))		? True	:	False);
 	$no_multi_reg		=	((x($_POST,'no_multi_reg'))		? True	:	False);
 	$no_openid			=	!((x($_POST,'no_openid'))		? True	:	False);
 	$no_regfullname		=	!((x($_POST,'no_regfullname'))	? True	:	False);
@@ -324,6 +326,11 @@ function admin_page_site_post(&$a){
 	}
 	set_config('system','language', $language);
 	set_config('system','theme', $theme);
+        if ( $theme_mobile === '---' ) {
+            del_config('system','mobile-theme');
+        } else {
+    	    set_config('system','mobile-theme', $theme_mobile);
+        }
 	set_config('system','maximagesize', $maximagesize);
 	
 	set_config('config','register_policy', $register_policy);
@@ -342,6 +349,7 @@ function admin_page_site_post(&$a){
 	} else {
 		set_config('system','directory_submit_url', $global_directory);
 	}
+	set_config('system','thread_allow', $thread_allow);
 
 	set_config('system','block_extended_register', $no_multi_reg);
 	set_config('system','no_openid', $no_openid);
@@ -384,12 +392,17 @@ function admin_page_site(&$a) {
 	
 	/* Installed themes */
 	$theme_choices = array();
+	$theme_choices_mobile = array();
+        $theme_choices_mobile["---"] = t("Don't apply a special theme for mobile devices.");
 	$files = glob('view/theme/*');
 	if($files) {
 		foreach($files as $file) {
 			$f = basename($file);
 			$theme_name = ((file_exists($file . '/experimental')) ?  sprintf("%s - \x28Experimental\x29", $f) : $f);
                         $theme_choices[$f] = $theme_name;
+                        if (file_exists($file . '/mobile')) {
+                            $theme_choices_mobile[$f] = $theme_name;
+                        }
 		}
 	}
 	
@@ -431,6 +444,7 @@ function admin_page_site(&$a) {
 		'$banner'			=> array('banner', t("Banner/Logo"), $banner, ""),
 		'$language' 		=> array('language', t("System language"), get_config('system','language'), "", $lang_choices),
 		'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
+		'$theme_mobile' 			=> array('theme_mobile', t("Mobile system theme"), get_config('system','mobile-theme'), t("Theme for mobile devices"), $theme_choices_mobile),
 		'$ssl_policy'       => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
 		'$maximagesize'		=> array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
 
@@ -442,6 +456,7 @@ function admin_page_site(&$a) {
 		'$block_public'		=> array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
 		'$force_publish'	=> array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
 		'$global_directory'	=> array('directory_submit_url', t("Global directory update URL"), get_config('system','directory_submit_url'), t("URL to update the global directory. If this is not set, the global directory is completely unavailable to the application.")),
+		'$thread_allow'		=> array('thread_allow', t("Allow threaded items"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
 			
 		'$no_multi_reg'		=> array('no_multi_reg', t("Block multiple registrations"),  get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
 		'$no_openid'		=> array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),

mod/contacts.php

@@ -45,22 +45,16 @@ function contacts_init(&$a) {
 	$a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
 	$base = $a->get_baseurl();
 
-	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
+	$tpl = get_markup_template("contacts-head.tpl");
-	$a->page['htmlhead'] .= <<< EOT
+	$a->page['htmlhead'] .= replace_macros($tpl,array(
-
+		'$baseurl' => $a->get_baseurl(true),
-<script>$(document).ready(function() { 
+		'$base' => $base
-	var a; 
+	));
-	a = $("#contacts-search").autocomplete({ 
+	$tpl = get_markup_template("contacts-end.tpl");
-		serviceUrl: '$base/acl',
+	$a->page['end'] .= replace_macros($tpl,array(
-		minChars: 2,
+		'$baseurl' => $a->get_baseurl(true),
-		width: 350,
+		'$base' => $base
-	});
+	));
-	a.setOptions({ params: { type: 'a' }});
-
-}); 
-
-</script>
-EOT;
 
 
 }
@@ -247,6 +241,10 @@ function contacts_content(&$a) {
 			'$baseurl' => $a->get_baseurl(true),
 			'$editselect' => $editselect,
 		));
+		$a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => $editselect,
+		));
 
 		require_once('include/contact_selectors.php');
 

mod/content.php

@@ -698,6 +698,7 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 							'$edurl' => t('Link'),
 							'$edvideo' => t('Video'),
 							'$preview' => t('Preview'),
+							'$sourceapp' => t($a->sourcename),
 							'$ww' => (($mode === 'network') ? $commentww : '')
 						));
 					}

mod/display.php

@@ -16,15 +16,7 @@ function display_content(&$a) {
 
 	$o = '<div id="live-display"></div>' . "\r\n";
 
-	$a->page['htmlhead'] .= <<<EOT
+	$a->page['htmlhead'] .= get_markup_template('display-head.tpl');
-<script>
-$(document).ready(function() {
-	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
-});
-</script>
-EOT;
 
 
 	$nick = (($a->argc > 1) ? $a->argv[1] : '');
@@ -121,12 +113,13 @@ EOT;
 			);
 		}
 
+		$items = conv_sort($r,"`commented`");
 		
-		$o .= conversation($a,$r,'display', false);
+		$o .= conversation($a,$items,'display', false);
 
 	}
 	else {
-		$r = q("SELECT `id` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
+		$r = q("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
 			dbesc($item_id),
 			dbesc($item_id)
 		);

mod/editpost.php

@@ -36,7 +36,6 @@ function editpost_content(&$a) {
 	$o .= '<h2>' . t('Edit post') . '</h2>';
 
 	$tpl = get_markup_template('jot-header.tpl');
-	
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(),
 		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@@ -45,6 +44,15 @@ function editpost_content(&$a) {
 		'$nickname' => $a->user['nickname']
 	));
 
+	$tpl = get_markup_template('jot-end.tpl');
+	$a->page['end'] .= replace_macros($tpl, array(
+		'$baseurl' => $a->get_baseurl(),
+		'$editselect' =>  (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+		'$ispublic' => '&nbsp;', // t('Visible to <strong>everybody</strong>'),
+		'$geotag' => $geotag,
+		'$nickname' => $a->user['nickname']
+	));
+
 
 	$tpl = get_markup_template("jot.tpl");
 		
@@ -124,6 +132,7 @@ function editpost_content(&$a) {
 		'$profile_uid' => $_SESSION['uid'],
 		'$preview' => t('Preview'),
 		'$jotplugins' => $jotplugins,
+		'$sourceapp' => t($a->sourcename),
 	));
 
 	return $o;

mod/events.php

@@ -145,6 +145,9 @@ function events_content(&$a) {
 	$htpl = get_markup_template('event_head.tpl');
 	$a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
 
+	$etpl = get_markup_template('event_end.tpl');
+	$a->page['end'] .= replace_macros($etpl,array('$baseurl' => $a->get_baseurl()));
+
 	$o ="";
 	// tabs
 	$tabs = profile_tabs($a, True);	

mod/install.php

@@ -60,7 +60,7 @@ function install_post(&$a) {
 
 			return; 
 			break;
-		case 4;
+		case 4:
 			$urlpath = $a->get_path();
 			$dbhost = notags(trim($_POST['dbhost']));
 			$dbuser = notags(trim($_POST['dbuser']));
@@ -155,11 +155,11 @@ function install_content(&$a) {
 	}
 
 	if(x($a->data,'txt') && strlen($a->data['txt'])) {
-		$tpl = get_markup_template('install.tpl');
 		$db_return_text .= manual_config($a);
 	}
 	
 	if ($db_return_text!="") {
+		$tpl = get_markup_template('install.tpl');
 		return replace_macros($tpl, array(
 			'$title' => $install_title,
 			'$pass' => "",

mod/item.php

@@ -79,6 +79,7 @@ function item_post(&$a) {
 		// if this isn't the real parent of the conversation, find it
 		if($r !== false && count($r)) {
 			$parid = $r[0]['parent'];
+			$parent_uri = $r[0]['uri'];
 			if($r[0]['id'] != $r[0]['parent']) {
 				$r = q("SELECT * FROM `item` WHERE `id` = `parent` AND `parent` = %d LIMIT 1",
 					intval($parid)
@@ -96,7 +97,7 @@ function item_post(&$a) {
 		$parent = $r[0]['id'];
 
 		// multi-level threading - preserve the info but re-parent to our single level threading
-		if(($parid) && ($parid != $parent))
+		//if(($parid) && ($parid != $parent))
 			$thr_parent = $parent_uri;
 
 		if($parent_item['contact-id'] && $uid) {
@@ -438,6 +439,7 @@ function item_post(&$a) {
 
 	$body = bb_translate_video($body);
 
+
 	/**
 	 * Fold multi-line [code] sequences
 	 */
@@ -446,6 +448,8 @@ function item_post(&$a) {
 
 	$body = scale_external_images($body,false);
 
+
+
 	/**
 	 * Look for any tags and linkify them
 	 */
@@ -541,6 +545,10 @@ function item_post(&$a) {
 
 	$uri = item_new_uri($a->get_hostname(),$profile_uid);
 
+	// Fallback so that we alway have a thr-parent
+	if(!$thr_parent)
+		$thr_parent = $uri;
+
 	$datarray = array();
 	$datarray['uid']           = $profile_uid;
 	$datarray['type']          = $post_type;
@@ -600,7 +608,7 @@ function item_post(&$a) {
 
 	if($preview) {
 		require_once('include/conversation.php');
-		$o = conversation($a,array(array_merge($contact_record,$datarray)),'search',false,true);
+		$o = conversation($a,array(array_merge($contact_record,$datarray)),'search', false);
 		logger('preview: ' . $o);
 		echo json_encode(array('preview' => $o));
 		killme();
@@ -740,6 +748,7 @@ function item_post(&$a) {
 					'verb'         => ACTIVITY_POST,
 					'otype'        => 'item',
 					'parent'       => $parent,
+					'parent_uri'   => $parent_item['uri']
 				));
 			
 			}

mod/message.php

@@ -18,24 +18,17 @@ function message_init(&$a) {
 	));
 	$base = $a->get_baseurl();
 
-	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
+	$head_tpl = get_markup_template('message-head.tpl');
-	$a->page['htmlhead'] .= <<< EOT
+	$a->page['htmlhead'] .= replace_macros($head_tpl,array(
+		'$baseurl' => $a->get_baseurl(true),
+		'$base' => $base
+	));
 
-<script>$(document).ready(function() { 
+	$end_tpl = get_markup_template('message-end.tpl');
-	var a; 
+	$a->page['end'] .= replace_macros($end_tpl,array(
-	a = $("#recip").autocomplete({ 
+		'$baseurl' => $a->get_baseurl(true),
-		serviceUrl: '$base/acl',
+		'$base' => $base
-		minChars: 2,
+	));
-		width: 350,
-		onSelect: function(value,data) {
-			$("#recip-complete").val(data);
-		}			
-	});
-
-}); 
-
-</script>
-EOT;
 	
 }
 
@@ -242,7 +235,6 @@ function message_content(&$a) {
 
 
 		$tpl = get_markup_template('msg-header.tpl');
-
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$baseurl' => $a->get_baseurl(true),
 			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
@@ -250,6 +242,14 @@ function message_content(&$a) {
 			'$linkurl' => t('Please enter a link URL:')
 		));
 	
+		$tpl = get_markup_template('msg-end.tpl');
+		$a->page['end'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
+			'$nickname' => $a->user['nickname'],
+			'$linkurl' => t('Please enter a link URL:')
+		));
+	
 		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
 			
 
@@ -351,6 +351,7 @@ function message_content(&$a) {
 				'$body' => template_escape($rr['body']),
 				'$to_name' => template_escape($rr['name']),
 				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
+                                '$ago' => relative_date($rr['mailcreated']),
 				'$seen' => $rr['mailseen'],
 				'$count' => sprintf( tt('%d message', '%d messages', $rr['count']), $rr['count']),
 			));
@@ -399,12 +400,17 @@ function message_content(&$a) {
 		require_once("include/bbcode.php");
 
 		$tpl = get_markup_template('msg-header.tpl');
-	
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
 			'$nickname' => $a->user['nickname'],
 			'$baseurl' => $a->get_baseurl(true)
 		));
 
+		$tpl = get_markup_template('msg-end.tpl');
+		$a->page['end'] .= replace_macros($tpl, array(
+			'$nickname' => $a->user['nickname'],
+			'$baseurl' => $a->get_baseurl(true)
+		));
+
 
 		$mails = array();
 		$seen = 0;
@@ -438,6 +444,7 @@ function message_content(&$a) {
 				'delete' => t('Delete message'),
 				'to_name' => template_escape($message['name']),
 				'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
+                                'ago' => relative_date($message['created']),
 			);
 				
 			$seen = $message['seen'];

mod/mood.php

@@ -0,0 +1,142 @@
+<?php
+
+require_once('include/security.php');
+require_once('include/bbcode.php');
+require_once('include/items.php');
+
+
+function mood_init(&$a) {
+
+	if(! local_user())
+		return;
+
+	$uid = local_user();
+	$verb = notags(trim($_GET['verb']));
+	
+	if(! $verb) 
+		return;
+
+	$verbs = get_mood_verbs();
+
+	if(! in_array($verb,$verbs))
+		return;
+
+	$activity = ACTIVITY_MOOD . '#' . urlencode($verb);
+
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
+
+
+	logger('mood: verb ' . $verb, LOGGER_DEBUG);
+
+
+	if($parent) {
+		$r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid 
+			from item where id = %d and parent = %d and uid = %d limit 1",
+			intval($parent),
+			intval($parent),
+			intval($uid)
+		);
+		if(count($r)) {
+			$parent_uri = $r[0]['uri'];
+			$private    = $r[0]['private'];
+			$allow_cid  = $r[0]['allow_cid'];
+			$allow_gid  = $r[0]['allow_gid'];
+			$deny_cid   = $r[0]['deny_cid'];
+			$deny_gid   = $r[0]['deny_gid'];
+		}
+	}
+	else {
+
+		$private = 0;
+
+		$allow_cid     =  $a->user['allow_cid'];
+		$allow_gid     =  $a->user['allow_gid'];
+		$deny_cid      =  $a->user['deny_cid'];
+		$deny_gid      =  $a->user['deny_gid'];
+	}
+
+	$poster = $a->contact;
+
+	$uri = item_new_uri($a->get_hostname(),$uid);
+
+	$action = sprintf( t('%1$s is currently %2$s'), '[url=' . $poster['url'] . ']' . $poster['name'] . '[/url]' , $verbs[$verb]); 
+
+	$arr = array();
+
+	$arr['uid']           = $uid;
+	$arr['uri']           = $uri;
+	$arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
+	$arr['type']          = 'activity';
+	$arr['wall']          = 1;
+	$arr['contact-id']    = $poster['id'];
+	$arr['owner-name']    = $poster['name'];
+	$arr['owner-link']    = $poster['url'];
+	$arr['owner-avatar']  = $poster['thumb'];
+	$arr['author-name']   = $poster['name'];
+	$arr['author-link']   = $poster['url'];
+	$arr['author-avatar'] = $poster['thumb'];
+	$arr['title']         = '';
+	$arr['allow_cid']     = $allow_cid;
+	$arr['allow_gid']     = $allow_gid;
+	$arr['deny_cid']      = $deny_cid;
+	$arr['deny_gid']      = $deny_gid;
+	$arr['last-child']    = 1;
+	$arr['visible']       = 1;
+	$arr['verb']          = $activity;
+	$arr['private']       = $private;
+
+	$arr['origin']        = 1;
+	$arr['body']          = $action;
+
+	$item_id = item_store($arr);
+	if($item_id) {
+		q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1",
+			dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id),
+			intval($uid),
+			intval($item_id)
+		);
+		proc_run('php',"include/notifier.php","tag","$item_id");
+	}
+
+
+	call_hooks('post_local_end', $arr);
+
+	proc_run('php',"include/notifier.php","like","$post_id");
+
+	return;
+}
+
+
+
+function mood_content(&$a) {
+
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
+
+
+
+	$verbs = get_mood_verbs();
+
+	$shortlist = array();
+	foreach($verbs as $k => $v)
+		if($v !== 'NOTRANSLATION')
+			$shortlist[] = array($k,$v);
+
+
+	$tpl = get_markup_template('mood_content.tpl');
+
+	$o = replace_macros($tpl,array(
+		'$title' => t('Mood'),
+		'$desc' => t('Set your current mood and tell your friends'),
+		'$verbs' => $shortlist,
+		'$parent' => $parent,
+		'$submit' => t('Submit'),
+	));
+
+	return $o;
+
+}

mod/network.php

@@ -577,8 +577,13 @@ function network_content(&$a, $update = 0) {
 			        $a->set_pager_total($r[0]['total']);
 		        }
 		}
+
 		$itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
-                $a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
+		$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
+		if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network))
+			$itemspage_network = $a->force_max_items;
+
+		$a->set_pager_itemspage($itemspage_network);
 		$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
 	}
 

mod/newmember.php

@@ -13,7 +13,7 @@ function newmember_content(&$a) {
 
 	$o .= '<ul>';
 
-	$o .= '<li>' . '<a target="newmember" href="help/guide">' . t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join.') . '</a></li>' . EOL; 
+	$o .= '<li>' . '<a target="newmember" href="help/guide">' . t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</a></li>' . EOL; 
 
 	$o .= '<li>' . '<a target="newmember" href="settings">' . t('On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '</a></li>' . EOL; 
 

mod/notes.php

@@ -129,9 +129,13 @@ function notes_content(&$a,$update = false) {
 			intval(local_user()),
 			dbesc($parents_str)
 		);
-	}
 
-	$o .= conversation($a,$r,'notes',$update);
+		if(count($r)) {
+			$items = conv_sort($r,"`commented`");
+
+			$o .= conversation($a,$items,'notes',$update);
+		}
+	}
 
 
 	$o .= paginate($a);

mod/parse_url.php

@@ -176,6 +176,9 @@ function parseurl_getsiteinfo($url) {
                 }
         } else {
 		$src = completeurl($siteinfo["image"], $url);
+
+		unset($siteinfo["image"]);
+
 		$photodata = getimagesize($src);
 
 		if (($photodata[0] > 10) and ($photodata[1] > 10))
@@ -292,8 +295,7 @@ function parse_url_content(&$a) {
 	$siteinfo = parseurl_getsiteinfo($url);
 
 	if($siteinfo["title"] == "") {
-		echo print_r($siteinfo, true);
+		echo sprintf($template,$url,$url,'') . $str_tags;
-		//echo sprintf($template,$url,$url,'') . $str_tags;
 		killme();
 	} else {
 		$text = $siteinfo["text"];
@@ -302,7 +304,7 @@ function parse_url_content(&$a) {
 
 	$image = "";
 
-        if($siteinfo["image"] != ""){
+        if(sizeof($siteinfo["images"]) > 0){
             /*
               Execute below code only if image is present in siteinfo
              */

mod/photos.php

@@ -69,30 +69,11 @@ function photos_init(&$a) {
 		$a->page['aside'] .= $o;
 
 
-		$a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
+		$tpl = get_markup_template("photos_head.tpl");
+		$a->page['htmlhead'] .= replace_macros($tpl,array(
+			'$ispublic' => t('everybody')
+		));
 
-		$a->page['htmlhead'] .= <<< EOT
-
-		$(document).ready(function() {
-
-			$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-				var selstr;
-				$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-					selstr = $(this).text();
-					$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-					$('#jot-public').hide();
-				});
-				if(selstr == null) { 
-					$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-					$('#jot-public').show();
-				}
-
-			}).trigger('change');
-
-		});
-
-		</script>
-EOT;
 	}
 
 	return;
@@ -962,7 +943,7 @@ function photos_content(&$a) {
 		$selname = (($datum) ? hex2bin($datum) : '');
 
 
-		$albumselect = '<select id="photos-upload-album-select" name="album" size="4">';
+		$albumselect = '';
 
 		
 		$albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
@@ -977,8 +958,6 @@ function photos_content(&$a) {
 
 		$celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false);
 
-		$albumselect .= '</select>';
-
 		$uploader = '';
 
 		$ret = array('post_url' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'],
@@ -1195,15 +1174,12 @@ function photos_content(&$a) {
 			
 		}
 
-		if(! $cmd !== 'edit') {
+		if( $cmd === 'edit') {
-			$a->page['htmlhead'] .= '<script>
+			$tpl = get_markup_template('photo_edit_head.tpl');
-				$(document).keydown(function(event) {' . "\n";
+			$a->page['htmlhead'] .= replace_macros($tpl,array(
-
+				'$prevlink' => $prevlink,
-			if($prevlink)
+				'$nextlink' => $nextlink
-				$a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = \'' . $prevlink . '\'; }' . "\n";
+			));
-			if($nextlink)
-				$a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = \'' . $nextlink . '\'; }' . "\n";
-			$a->page['htmlhead'] .= '});</script>';
 		}
 
 		if($prevlink)
@@ -1348,6 +1324,7 @@ function photos_content(&$a) {
 							'$comment' => t('Comment'),
 							'$submit' => t('Submit'),
 							'$preview' => t('Preview'),
+							'$sourceapp' => t($a->sourcename),
 							'$ww' => ''
 						));
 					}
@@ -1387,6 +1364,7 @@ function photos_content(&$a) {
 							'$myphoto' => $contact['thumb'],
 							'$comment' => t('Comment'),
 							'$submit' => t('Submit'),
+							'$sourceapp' => t($a->sourcename),
 							'$ww' => ''
 						));
 					}
@@ -1418,6 +1396,7 @@ function photos_content(&$a) {
 								'$myphoto' => $contact['thumb'],
 								'$comment' => t('Comment'),
 								'$submit' => t('Submit'),
+								'$sourceapp' => t($a->sourcename),
 								'$ww' => ''
 							));
 						}

mod/poke.php

@@ -27,8 +27,8 @@ function poke_init(&$a) {
 	if(! $contact_id)
 		return;
 
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
 
-	$private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
 
 	logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
 
@@ -45,15 +45,41 @@ function poke_init(&$a) {
 
 	$target = $r[0];
 
+	if($parent) {
+		$r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid 
+			from item where id = %d and parent = %d and uid = %d limit 1",
+			intval($parent),
+			intval($parent),
+			intval($uid)
+		);
+		if(count($r)) {
+			$parent_uri = $r[0]['uri'];
+			$private    = $r[0]['private'];
+			$allow_cid  = $r[0]['allow_cid'];
+			$allow_gid  = $r[0]['allow_gid'];
+			$deny_cid   = $r[0]['deny_cid'];
+			$deny_gid   = $r[0]['deny_gid'];
+		}
+	}
+	else {
+
+		$private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
+
+		$allow_cid     = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
+		$allow_gid     = (($private) ? '' : $a->user['allow_gid']);
+		$deny_cid      = (($private) ? '' : $a->user['deny_cid']);
+		$deny_gid      = (($private) ? '' : $a->user['deny_gid']);
+	}
+
 	$poster = $a->contact;
 
-	$uri = item_new_uri($a->get_hostname(),$owner_uid);
+	$uri = item_new_uri($a->get_hostname(),$uid);
 
 	$arr = array();
 
 	$arr['uid']           = $uid;
 	$arr['uri']           = $uri;
-	$arr['parent-uri']    = $uri;
+	$arr['parent-uri']    = (($parent_uri) ? $parent_uri : $uri);
 	$arr['type']          = 'activity';
 	$arr['wall']          = 1;
 	$arr['contact-id']    = $poster['id'];
@@ -64,10 +90,10 @@ function poke_init(&$a) {
 	$arr['author-link']   = $poster['url'];
 	$arr['author-avatar'] = $poster['thumb'];
 	$arr['title']         = '';
-	$arr['allow_cid']     = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
+	$arr['allow_cid']     = $allow_cid;
-	$arr['allow_gid']     = (($private) ? '' : $a->user['allow_gid']);
+	$arr['allow_gid']     = $allow_gid;
-	$arr['deny_cid']      = (($private) ? '' : $a->user['deny_cid']);
+	$arr['deny_cid']      = $deny_cid;
-	$arr['deny_gid']      = (($private) ? '' : $a->user['deny_gid']);
+	$arr['deny_gid']      = $deny_gid;
 	$arr['last-child']    = 1;
 	$arr['visible']       = 1;
 	$arr['verb']          = $activity;
@@ -132,12 +158,12 @@ function poke_content(&$a) {
 
 <script>$(document).ready(function() { 
 	var a; 
-	a = $("#recip").autocomplete({ 
+	a = $("#poke-recip").autocomplete({ 
 		serviceUrl: '$base/acl',
 		minChars: 2,
 		width: 350,
 		onSelect: function(value,data) {
-			$("#recip-complete").val(data);
+			$("#poke-recip-complete").val(data);
 		}			
 	});
 	a.setOptions({ params: { type: 'a' }});
@@ -148,6 +174,9 @@ function poke_content(&$a) {
 </script>
 EOT;
 
+	$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
+
+
 
 	$verbs = get_poke_verbs();
 
@@ -165,6 +194,7 @@ EOT;
 		'$clabel' => t('Recipient'),
 		'$choice' => t('Choose what you wish to do to recipient'),
 		'$verbs' => $shortlist,
+		'$parent' => $parent,
 		'$prv_desc' => t('Make this post private'),
 		'$submit' => t('Submit'),
 		'$name' => $name,

mod/profile.php

@@ -1,9 +1,10 @@
 <?php
 
-function profile_init(&$a) {
-
 require_once('include/contact_widgets.php');
 
+
+function profile_init(&$a) {
+
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
 

mod/profile_photo.php

@@ -279,6 +279,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
 	$a->config['imagecrop_resolution'] = $smallest;
 	$a->config['imagecrop_ext'] = $ph->getExt();
 	$a->page['htmlhead'] .= get_markup_template("crophead.tpl");
+	$a->page['end'] .= get_markup_template("cropend.tpl");
 	return;
 }}
 

mod/profiles.php

@@ -48,10 +48,15 @@ function profiles_post(&$a) {
 			
 		$name = notags(trim($_POST['name']));
 
+		if(! strlen($name)) {
+			$name = '[No Name]';
+		}
+
 		if($orig[0]['name'] != $name)
 			$namechanged = true;
 
 
+
 		$pdesc = notags(trim($_POST['pdesc']));
 		$gender = notags(trim($_POST['gender']));
 		$address = notags(trim($_POST['address']));
@@ -546,6 +551,10 @@ function profiles_content(&$a) {
 			'$baseurl' => $a->get_baseurl(true),
 			'$editselect' => $editselect,
 		));
+		$a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => $editselect,
+		));
 
 
 		$opt_tpl = get_markup_template("profile-hide-friends.tpl");
@@ -557,9 +566,6 @@ function profiles_content(&$a) {
 			'$no_selected' => (($r[0]['hide-friends'] == 0) ? " checked=\"checked\" " : "")
 		));
 
-		$a->page['htmlhead'] .= "<script type=\"text/javascript\" src=\"js/country.js\" ></script>";
-
-
 
 
 

mod/settings.php

@@ -18,30 +18,10 @@ function settings_init(&$a) {
 
 	// These lines provide the javascript needed by the acl selector
 
-	$a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
+	$tpl = get_markup_template("settings-head.tpl");
-
+	$a->page['htmlhead'] .= replace_macros($tpl,array(
-	$a->page['htmlhead'] .= <<< EOT
+		'$ispublic' => t('everybody')
-
+	));
-	$(document).ready(function() {
-
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
-				$('#jot-public').hide();
-			});
-			if(selstr == null) { 
-				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
-				$('#jot-public').show();
-			}
-
-		}).trigger('change');
-
-	});
-
-	</script>
-EOT;
 
 
 
@@ -781,6 +761,11 @@ function settings_content(&$a) {
 			'$theme_config' => $theme_config,
 		));
 		
+		$tpl = get_markup_template("settings_display_end.tpl");
+		$a->page['end'] .= replace_macros($tpl, array(
+			'$theme'	=> array('theme', t('Display Theme:'), $theme_selected, '', $themes)
+		));
+
 		return $o;
 	}
 	

mod/wallmessage.php

@@ -116,7 +116,6 @@ function wallmessage_content(&$a) {
 
 
 	$tpl = get_markup_template('wallmsg-header.tpl');
-
 	$a->page['htmlhead'] .= replace_macros($tpl, array(
 		'$baseurl' => $a->get_baseurl(true),
 		'$editselect' => '/(profile-jot-text|prvmail-text)/',
@@ -124,6 +123,14 @@ function wallmessage_content(&$a) {
 		'$linkurl' => t('Please enter a link URL:')
 	));
 
+	$tpl = get_markup_template('wallmsg-end.tpl');
+	$a->page['end'] .= replace_macros($tpl, array(
+		'$baseurl' => $a->get_baseurl(true),
+		'$editselect' => '/(profile-jot-text|prvmail-text)/',
+		'$nickname' => $user['nickname'],
+		'$linkurl' => t('Please enter a link URL:')
+	));
+	
 
 	
 	$tpl = get_markup_template('wallmessage.tpl');

mods/readme.txt

@@ -0,0 +1,5 @@
+Site speed can be improved when the following indexes are set. They cannot be set through the update script because on large sites they will block the site for several minutes.
+
+CREATE INDEX `uid_commented` ON `item` (`uid`, `commented`);
+CREATE INDEX `uid_created` ON `item` (`uid`, `created`);
+CREATE INDEX `uid_unseen` ON `item` (`uid`, `unseen`);

update.php

@@ -1343,4 +1343,3 @@ function update_1153() {
 	if(!$r) return UPDATE_FAILED;
 	return UPDATE_SUCCESS;
 }
-

view/admin_aside.tpl

@@ -5,7 +5,7 @@
 		$("nav").bind('nav-update',  function(e,data){
 			var elm = $('#pending-update');
 			var register = $(data).find('register').text();
-			if (register=="0") { reigster=""; elm.hide();} else { elm.show(); }
+			if (register=="0") { register=""; elm.hide();} else { elm.show(); }
 			elm.html(register);
 		});
 	});

view/admin_site.tpl

@@ -6,6 +6,7 @@
 			autoDimensions: false,
 			onStart: function(){
 				var theme = $("#id_theme :selected").val();
+				var theme_mobile = $("#id_theme_mobile :selected").val();
 				$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
 			}, 
 			onComplete: function(){
@@ -44,6 +45,7 @@
 	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$language }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+	{{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
 	{{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
@@ -71,6 +73,7 @@
 	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	

view/birthdays_reminder.tpl

@@ -3,8 +3,8 @@
 <div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">$event_title</div>
 <div id="birthday-title-end"></div>
 {{ for $events as $event }}
-<div class="birthday-list" id="birthday-$event.id"></a> <a href="$event.link">$event.title</a> $event.date </div>
+<div class="birthday-list" id="birthday-$event.id"> <a href="$event.link">$event.title</a> $event.date </div>
 {{ endfor }}
-</div></div>
+</div>
 {{ endif }}
 

view/comment_item.tpl

@@ -1,5 +1,10 @@
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			{{ if $threaded }}
+			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
+			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			{{ else }}
+			<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			{{ endif }}
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />

view/contacts-head.tpl

@@ -0,0 +1,17 @@
+
+<script src="$baseurl/library/jquery_ac/friendica.complete.js" ></script>
+
+<script>
+$(document).ready(function() { 
+	var a; 
+	a = $("#contacts-search").autocomplete({ 
+		serviceUrl: '$base/acl',
+		minChars: 2,
+		width: 350,
+	});
+	a.setOptions({ params: { type: 'a' }});
+
+}); 
+
+</script>
+

view/de/strings.php

@@ -11,7 +11,7 @@ $a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren.
 $a->strings["Permission denied."] = "Zugriff verweigert.";
 $a->strings["Contact not found."] = "Kontakt nicht gefunden.";
 $a->strings["Repair Contact Settings"] = "Kontakteinstellungen reparieren";
-$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
+$a->strings["<strong>WARNING: This is highly advanced</strong> and if you enter incorrect information your communications with this contact may stop working."] = "<strong>ACHTUNG: Das sind Experten-Einstellungen!</strong> Wenn du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr.";
 $a->strings["Please use your browser 'Back' button <strong>now</strong> if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers <strong>jetzt</strong>, wenn du dir unsicher bist, was du tun willst.";
 $a->strings["Return to contact editor"] = "Zurück zum Kontakteditor";
 $a->strings["Name"] = "Name";
@@ -33,7 +33,7 @@ $a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen.";
 $a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet.";
 $a->strings["Suggest Friends"] = "Kontakte vorschlagen";
 $a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor";
-$a->strings["Event description and start time are required."] = "Ereignisbeschreibung und Startzeit sind erforderlich.";
+$a->strings["Event title and start time are required."] = "Der Veranstaltungstitel und die Anfangszeit müssen angegeben werden.";
 $a->strings["l, F j"] = "l, F j";
 $a->strings["Edit event"] = "Veranstaltung bearbeiten";
 $a->strings["link to source"] = "Link zum Originalbeitrag";
@@ -43,13 +43,15 @@ $a->strings["Previous"] = "Vorherige";
 $a->strings["Next"] = "Nächste";
 $a->strings["hour:minute"] = "Stunde:Minute";
 $a->strings["Event details"] = "Veranstaltungsdetails";
-$a->strings["Format is %s %s. Starting date and Description are required."] = "Format ist %s %s. Anfangsdatum und Beschreibung sind notwendig.";
+$a->strings["Format is %s %s. Starting date and Title are required."] = "Das Format ist %s %s. Beginnzeitpunkt und Titel werden benötigt.";
 $a->strings["Event Starts:"] = "Veranstaltungsbeginn:";
+$a->strings["Required"] = "Benötigt";
 $a->strings["Finish date/time is not known or not relevant"] = "Enddatum/-zeit ist nicht bekannt oder nicht relevant";
 $a->strings["Event Finishes:"] = "Veranstaltungsende:";
 $a->strings["Adjust for viewer timezone"] = "An Zeitzone des Betrachters anpassen";
 $a->strings["Description:"] = "Beschreibung";
 $a->strings["Location:"] = "Ort:";
+$a->strings["Title:"] = "Titel:";
 $a->strings["Share this event"] = "Veranstaltung teilen";
 $a->strings["Cancel"] = "Abbrechen";
 $a->strings["Tag removed"] = "Tag entfernt";
@@ -82,6 +84,8 @@ $a->strings["Image upload failed."] = "Hochladen des Bildes gescheitert.";
 $a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert.";
 $a->strings["No photos selected"] = "Keine Bilder ausgewählt";
 $a->strings["Access to this item is restricted."] = "Zugriff zu diesem Eintrag wurde eingeschränkt.";
+$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = "Du verwendest %1$.2f Mbyte von %2$.2f Mbyte des Foto-Speichers.";
+$a->strings["You have used %1$.2f Mbytes of photo storage."] = "Du verwendest %1$.2f Mbyte des Foto-Speichers.";
 $a->strings["Upload Photos"] = "Bilder hochladen";
 $a->strings["New album name: "] = "Name des neuen Albums: ";
 $a->strings["or existing album name: "] = "oder existierender Albumname: ";
@@ -98,7 +102,8 @@ $a->strings["Private Message"] = "Private Nachricht";
 $a->strings["View Full Size"] = "Betrachte Originalgröße";
 $a->strings["Tags: "] = "Tags: ";
 $a->strings["[Remove any tag]"] = "[Tag entfernen]";
-$a->strings["Rotate CW"] = "Im Uhrzeigersinn rotieren";
+$a->strings["Rotate CW (right)"] = "Drehen US (rechts)";
+$a->strings["Rotate CCW (left)"] = "Drehen EUS (links)";
 $a->strings["New album name"] = "Name des neuen Albums";
 $a->strings["Caption"] = "Bildunterschrift";
 $a->strings["Add a Tag"] = "Tag hinzufügen";
@@ -167,7 +172,7 @@ $a->strings["Failed to update contact record."] = "Aktualisierung der Kontaktdat
 $a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
 $a->strings["Please login to confirm introduction."] = "Bitte melde dich an, um die Kontaktanfrage zu bestätigen.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
-$a->strings["Hide this contact"] = "Verberge diese Kontakt";
+$a->strings["Hide this contact"] = "Verberge diesen Kontakt";
 $a->strings["Welcome home %s."] = "Willkommen zurück %s.";
 $a->strings["Please confirm your introduction/connection request to %s."] = "Bitte bestätige deine Kontaktanfrage bei %s.";
 $a->strings["Confirm"] = "Bestätigen";
@@ -189,7 +194,7 @@ $a->strings["Submit Request"] = "Anfrage abschicken";
 $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup";
 $a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert";
 $a->strings["Could not create table."] = "Konnte Tabelle nicht erstellen.";
-$a->strings["Your Friendica site database has been installed."] = "Die Datenbank deiner Friendica Seite wurde installiert.";
+$a->strings["Your Friendica site database has been installed."] = "Die Datenbank deiner Friendicaseite wurde installiert.";
 $a->strings["You may need to import the file \"database.sql\" manually using phpmyadmin or mysql."] = "Möglicherweise musst du die Datei \"database.sql\" manuell mit phpmyadmin oder mysql importieren.";
 $a->strings["Please see the file \"INSTALL.txt\"."] = "Lies bitte die \"INSTALL.txt\".";
 $a->strings["System check"] = "Systemtest";
@@ -209,7 +214,7 @@ $a->strings["Site settings"] = "Server-Einstellungen";
 $a->strings["Could not find a command line version of PHP in the web server PATH."] = "Konnte keine Kommandozeilenversion von PHP im PATH des Servers finden.";
 $a->strings["If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>"] = "Wenn du keine Kommandozeilen Version von PHP auf deinem Server installiert hast, kannst du keine Hintergrundprozesse via cron starten. Siehe <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>";
 $a->strings["PHP executable path"] = "Pfad zu PHP";
-$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst diesen Feld auch frei lassen und mit der Installation fortfahren.";
+$a->strings["Enter full path to php executable. You can leave this blank to continue the installation."] = "Gib den kompletten Pfad zur ausführbaren Datei von PHP an. Du kannst dieses Feld auch frei lassen und mit der Installation fortfahren.";
 $a->strings["Command line PHP"] = "Kommandozeilen-PHP";
 $a->strings["The command line version of PHP on your system does not have \"register_argc_argv\" enabled."] = "Die Kommandozeilenversion von PHP auf deinem System hat \"register_argc_argv\" nicht aktiviert.";
 $a->strings["This is required for message delivery to work."] = "Dies wird für die Auslieferung von Nachrichten benötigt.";
@@ -224,13 +229,13 @@ $a->strings["mysqli PHP module"] = "PHP: mysqli-Modul";
 $a->strings["mb_string PHP module"] = "PHP: mb_string-Modul";
 $a->strings["Apache mod_rewrite module"] = "Apache mod_rewrite module";
 $a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Fehler: Das Apache-Modul mod-rewrite wird benötigt, es ist allerdings nicht installiert.";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt ist aber nicht installiert.";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Fehler: Das libCURL PHP Modul wird benötigt, ist aber nicht installiert.";
 $a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Fehler: Das GD-Graphikmodul für PHP mit JPEG-Unterstützung ist nicht installiert.";
 $a->strings["Error: openssl PHP module required but not installed."] = "Fehler: Das openssl-Modul von PHP ist nicht installiert.";
 $a->strings["Error: mysqli PHP module required but not installed."] = "Fehler: Das mysqli-Modul von PHP ist nicht installiert.";
 $a->strings["Error: mb_string PHP module required but not installed."] = "Fehler: mb_string PHP Module wird benötigt ist aber nicht installiert.";
 $a->strings["The web installer needs to be able to create a file called \".htconfig.php\ in the top folder of your web server and it is unable to do so."] = "Der Installationswizard muss in der Lage sein, eine Datei im Stammverzeichnis deines Webservers anzulegen, ist allerdings derzeit nicht in der Lage, dies zu tun.";
-$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten, der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast.";
+$a->strings["This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can."] = "In den meisten Fällen ist dies ein Problem mit den Schreibrechten. Der Webserver könnte keine Schreiberlaubnis haben, selbst wenn du sie hast.";
 $a->strings["At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder."] = "Nachdem du alles ausgefüllt hast, erhältst du einen Text, den du in eine Datei namens .htconfig.php in deinem Friendica-Wurzelverzeichnis kopieren musst.";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Alternativ kannst du diesen Schritt aber auch überspringen und die Installation manuell durchführen. Eine Anleitung dazu (Englisch) findest du in der Datei INSTALL.txt.";
 $a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php";
@@ -247,6 +252,11 @@ $a->strings["UTC time: %s"] = "UTC Zeit: %s";
 $a->strings["Current timezone: %s"] = "Aktuelle Zeitzone: %s";
 $a->strings["Converted localtime: %s"] = "Umgerechnete lokale Zeit: %s";
 $a->strings["Please select your timezone:"] = "Bitte wähle deine Zeitzone.";
+$a->strings["Poke/Prod"] = "";
+$a->strings["poke, prod or do other things to somebody"] = "";
+$a->strings["Recipient"] = "Empfänger";
+$a->strings["Choose what you wish to do to recipient"] = "Was willst du mit dem Empfänger machen:";
+$a->strings["Make this post private"] = "Diesen Beitrag privat machen";
 $a->strings["Profile Match"] = "Profilübereinstimmungen";
 $a->strings["No keywords to match. Please add keywords to your default profile."] = "Keine Schlüsselwörter zum Abgleichen gefunden. Bitte füge einige Schlüsselwörter zu deinem Standardprofil hinzu.";
 $a->strings["is interested in:"] = "ist interessiert an:";
@@ -254,6 +264,39 @@ $a->strings["Connect"] = "Verbinden";
 $a->strings["No matches"] = "Keine Übereinstimmungen";
 $a->strings["Remote privacy information not available."] = "Entfernte Privatsphäreneinstellungen nicht verfügbar.";
 $a->strings["Visible to:"] = "Sichtbar für:";
+$a->strings["No such group"] = "Es gibt keine solche Gruppe";
+$a->strings["Group is empty"] = "Gruppe ist leer";
+$a->strings["Group: "] = "Gruppe: ";
+$a->strings["Select"] = "Auswählen";
+$a->strings["View %s's profile @ %s"] = "Das Profil von %s auf %s betrachten.";
+$a->strings["%s from %s"] = "%s von %s";
+$a->strings["View in context"] = "Im Zusammenhang betrachten";
+$a->strings["%d comment"] = array(
+	0 => "%d Kommentar",
+	1 => "%d Kommentare",
+);
+$a->strings["show more"] = "mehr anzeigen";
+$a->strings["like"] = "mag ich";
+$a->strings["dislike"] = "mag ich nicht";
+$a->strings["Share this"] = "Weitersagen";
+$a->strings["share"] = "Teilen";
+$a->strings["Bold"] = "Fett";
+$a->strings["Italic"] = "Kursiv";
+$a->strings["Underline"] = "Unterstrichen";
+$a->strings["Quote"] = "Zitat";
+$a->strings["Code"] = "Code";
+$a->strings["Image"] = "Bild";
+$a->strings["Link"] = "Verweis";
+$a->strings["Video"] = "Video";
+$a->strings["add star"] = "markieren";
+$a->strings["remove star"] = "Markierung entfernen";
+$a->strings["toggle star status"] = "Markierung umschalten";
+$a->strings["starred"] = "markiert";
+$a->strings["add tag"] = "Tag hinzufügen";
+$a->strings["save to folder"] = "In Ordner speichern";
+$a->strings["to"] = "zu";
+$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
+$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
 $a->strings["Welcome to %s"] = "Willkommen zu %s";
 $a->strings["Invalid request identifier."] = "Invalid request identifier.";
 $a->strings["Discard"] = "Verwerfen";
@@ -315,7 +358,7 @@ $a->strings["Never"] = "Niemals";
 $a->strings["(Update was successful)"] = "(Aktualisierung war erfolgreich)";
 $a->strings["(Update was not successful)"] = "(Aktualisierung war nicht erfolgreich)";
 $a->strings["Suggest friends"] = "Kontakte vorschlagen";
-$a->strings["Network type: %s"] = "Netzwerk Typ: %s";
+$a->strings["Network type: %s"] = "Netzwerktyp: %s";
 $a->strings["%d contact in common"] = array(
 	0 => "%d gemeinsamer Kontakt",
 	1 => "%d gemeinsame Kontakte",
@@ -326,7 +369,7 @@ $a->strings["Block"] = "Sperren";
 $a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten";
 $a->strings["Unignore"] = "Ignorieren aufheben";
 $a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten";
-$a->strings["Unarchive"] = "Unarchivieren";
+$a->strings["Unarchive"] = "Aus Archiv zurückholen";
 $a->strings["Archive"] = "Archivieren";
 $a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten";
 $a->strings["Repair"] = "Reparieren";
@@ -336,7 +379,7 @@ $a->strings["Contact Editor"] = "Kontakt Editor";
 $a->strings["Profile Visibility"] = "Profil-Sichtbarkeit";
 $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft.";
 $a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen";
-$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbiten";
+$a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbeiten";
 $a->strings["Visit %s's profile [%s]"] = "Besuche %ss Profil [%s]";
 $a->strings["Block/Unblock contact"] = "Kontakt blockieren/freischalten";
 $a->strings["Ignore contact"] = "Ignoriere den Kontakt";
@@ -384,8 +427,8 @@ $a->strings["Save or copy your new password - and then"] = "Speichere oder kopie
 $a->strings["click here to login"] = "hier klicken, um dich anzumelden";
 $a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = "Du kannst das Passwort in den <em>Einstellungen</em> ändern, sobald du dich erfolgreich angemeldet hast.";
 $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
-$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
+$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
-$a->strings["Nickname or Email: "] = "Spitzname oder Email:";
+$a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:";
 $a->strings["Reset"] = "Zurücksetzen";
 $a->strings["Account settings"] = "Kontoeinstellungen";
 $a->strings["Display settings"] = "Anzeige-Einstellungen";
@@ -398,7 +441,7 @@ $a->strings["Settings"] = "Einstellungen";
 $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!";
 $a->strings["Update"] = "Aktualisierungen";
 $a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich.";
-$a->strings["Email settings updated."] = "EMail Einstellungen bearbeitet.";
+$a->strings["Email settings updated."] = "E-Mail Einstellungen bearbeitet.";
 $a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.";
 $a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.";
 $a->strings["Password changed."] = "Passwort ändern.";
@@ -426,11 +469,11 @@ $a->strings["Built-in support for %s connectivity is %s"] = "Eingebaute Unterst
 $a->strings["enabled"] = "eingeschaltet";
 $a->strings["disabled"] = "ausgeschaltet";
 $a->strings["StatusNet"] = "StatusNet";
+$a->strings["Email access is disabled on this site."] = "Zugriff auf E-Mails für diese Seite deaktiviert.";
 $a->strings["Connector Settings"] = "Verbindungs-Einstellungen";
 $a->strings["Email/Mailbox Setup"] = "E-Mail/Postfach-Einstellungen";
 $a->strings["If you wish to communicate with email contacts using this service (optional), please specify how to connect to your mailbox."] = "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an.";
-$a->strings["Last successful email check:"] = "Letzter erfolgreicher Email Check";
+$a->strings["Last successful email check:"] = "Letzter erfolgreicher E-Mail Check";
-$a->strings["Email access is disabled on this site."] = "Zugriff auf E-Mails für diese Seite deaktiviert.";
 $a->strings["IMAP server name:"] = "IMAP-Server-Name:";
 $a->strings["IMAP port:"] = "IMAP-Port:";
 $a->strings["Security:"] = "Sicherheit:";
@@ -512,6 +555,7 @@ $a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommen
 $a->strings["You receive a private message"] = "– du eine private Nachricht erhältst";
 $a->strings["You receive a friend suggestion"] = "– du eine Empfehlung erhältst";
 $a->strings["You are tagged in a post"] = "– du in einem Beitrag erwähnt wirst";
+$a->strings["You are poked/prodded/etc. in a post"] = "";
 $a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen";
 $a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:";
 $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
@@ -525,7 +569,7 @@ $a->strings["Commented Order"] = "Neueste Kommentare";
 $a->strings["Sort by Comment Date"] = "Nach Kommentardatum sortieren";
 $a->strings["Posted Order"] = "Neueste Beiträge";
 $a->strings["Sort by Post Date"] = "Nach Beitragsdatum sortieren";
-$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um Dich geht";
+$a->strings["Posts that mention or involve you"] = "Beiträge, in denen es um dich geht";
 $a->strings["New"] = "Neue";
 $a->strings["Activity Stream - by date"] = "Aktivitäten-Stream - nach Datum";
 $a->strings["Starred"] = "Markierte";
@@ -537,9 +581,6 @@ $a->strings["Warning: This group contains %s member from an insecure network."]
 	1 => "Warnung: Diese Gruppe beinhaltet %s Personen aus unsicheren Netzwerken.",
 );
 $a->strings["Private messages to this group are at risk of public disclosure."] = "Private Nachrichten an diese Gruppe könnten an die Öffentlichkeit geraten.";
-$a->strings["No such group"] = "Es gibt keine solche Gruppe";
-$a->strings["Group is empty"] = "Gruppe ist leer";
-$a->strings["Group: "] = "Gruppe: ";
 $a->strings["Contact: "] = "Kontakt: ";
 $a->strings["Private messages to this person are at risk of public disclosure."] = "Private Nachrichten an diese Person könnten an die Öffentlichkeit gelangen.";
 $a->strings["Invalid contact."] = "Ungültiger Kontakt.";
@@ -560,10 +601,10 @@ $a->strings["Subject:"] = "Betreff:";
 $a->strings["Your message:"] = "Deine Nachricht:";
 $a->strings["Welcome to Friendica"] = "Willkommen bei Friendica";
 $a->strings["New Member Checklist"] = "Checkliste für neue Mitglieder";
-$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten Dir einige Tipps und Links anbieten, die Dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für Dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.";
+$a->strings["We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear."] = "Wir möchten dir einige Tipps und Links anbieten, die dir helfen könnten, den Einstieg angenehmer zu machen. Klicke auf ein Element, um die entsprechende Seite zu besuchen. Ein Link zu dieser Seite hier bleibt für dich an Deiner Pinnwand für zwei Wochen nach dem Registrierungsdatum sichtbar und wird dann verschwinden.";
-$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest, wie du alte Freunde von Facebook wieder findest und neue Kontakte knüpfst.";
+$a->strings["On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join."] = "Auf der <em>Quick Start</em> Seite findest du eine kurze Einleitung in die einzelnen Funktionen deines Profils und die Netzwerk-Reiter, wo du interessante Foren findest und neue Kontakte knüpfst.";
-$a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter <em>Einstellungen</em> Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen.";
+$a->strings["On your <em>Settings</em> page -  change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter <em>Einstellungen</em> dein Passwort. Außerdem merke dir deine Identifikationsadresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen.";
-$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können.";
+$a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn du deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können.";
 $a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust.";
 $a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook-Konto hast, und (optional) deine Facebook-Freunde und -Unterhaltungen importieren willst.";
 $a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Wenn</em> dies dein privater Server ist, könnte die Installation des Facebook Connectors deinen Umzug ins freie soziale Netz angenehmer gestalten.";
@@ -615,7 +656,7 @@ $a->strings["Your Email Address: "] = "Deine E-Mail-Adresse: ";
 $a->strings["Choose a profile nickname. This must begin with a text character. Your profile address on this site will then be '<strong>nickname@\$sitename</strong>'."] = "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@\$sitename</strong>' sein.";
 $a->strings["Choose a nickname: "] = "Spitznamen wählen: ";
 $a->strings["Register"] = "Registrieren";
-$a->strings["People Search"] = "Personen Suche";
+$a->strings["People Search"] = "Personensuche";
 $a->strings["status"] = "Status";
 $a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s";
 $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht";
@@ -659,7 +700,7 @@ $a->strings["Conversation removed."] = "Unterhaltung gelöscht.";
 $a->strings["No messages."] = "Keine Nachrichten.";
 $a->strings["Unknown sender - %s"] = "'Unbekannter Absender - %s";
 $a->strings["You and %s"] = "Du und %s";
-$a->strings["%s and You"] = "%s und Du";
+$a->strings["%s and You"] = "%s und du";
 $a->strings["Delete conversation"] = "Unterhaltung löschen";
 $a->strings["D, d M Y - g:i A"] = "D, d. M Y - g:i A";
 $a->strings["%d message"] = array(
@@ -686,6 +727,8 @@ $a->strings["Normal Account"] = "Normales Konto";
 $a->strings["Soapbox Account"] = "Marktschreier-Konto";
 $a->strings["Community/Celebrity Account"] = "Forum/Promi-Konto";
 $a->strings["Automatic Friend Account"] = "Automatisches Freundekonto";
+$a->strings["Blog Account"] = "Blog Account";
+$a->strings["Private Forum"] = "Privates Forum";
 $a->strings["Message queues"] = "Nachrichten-Warteschlangen";
 $a->strings["Administration"] = "Administration";
 $a->strings["Summary"] = "Zusammenfassung";
@@ -694,6 +737,7 @@ $a->strings["Pending registrations"] = "Anstehende Anmeldungen";
 $a->strings["Version"] = "Version";
 $a->strings["Active plugins"] = "Aktive Plugins";
 $a->strings["Site settings updated."] = "Seiteneinstellungen aktualisiert.";
+$a->strings["Don't apply a special theme for mobile devices."] = "Kein spezielles Theme für mobile Geräte verwenden.";
 $a->strings["Closed"] = "Geschlossen";
 $a->strings["Requires approval"] = "Bedarf der Zustimmung";
 $a->strings["Open"] = "Offen";
@@ -708,6 +752,8 @@ $a->strings["Banner/Logo"] = "Banner/Logo";
 $a->strings["System language"] = "Systemsprache";
 $a->strings["System theme"] = "Systemweites Thema";
 $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "Vorgabe für das System-Theme - kann von Benutzerprofilen überschrieben werden - <a href='#' id='cnftheme'>Theme-Einstellungen ändern</a>";
+$a->strings["Mobile system theme"] = "Systemweites mobiles Thema";
+$a->strings["Theme for mobile devices"] = "Thema für mobile Geräte";
 $a->strings["SSL link policy"] = "Regeln für SSL Links";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
 $a->strings["Maximum image size"] = "Maximale Größe von Bildern";
@@ -719,7 +765,7 @@ $a->strings["Accounts abandoned after x days"] = "Nutzerkonten gelten nach x Tag
 $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit.";
 $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
 $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
-$a->strings["Allowed email domains"] = "Erlaubte Domains für Emails";
+$a->strings["Allowed email domains"] = "Erlaubte Domains für E-Mails";
 $a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für E-Mail-Adressen bei der Registrierung erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
 $a->strings["Block public"] = "Öffentlichen Zugriff blockieren";
 $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Klicken, um öffentlichen Zugriff auf sonst öffentliche Profile zu blockieren, wenn man nicht eingeloggt ist.";
@@ -727,6 +773,8 @@ $a->strings["Force publish"] = "Erzwinge Veröffentlichung";
 $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Klicken, um Anzeige aller Profile dieses Servers im Verzeichnis zu erzwingen.";
 $a->strings["Global directory update URL"] = "URL für Updates beim weltweiten Verzeichnis";
 $a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar.";
+$a->strings["Allow threaded items"] = "Erlaube Threads in Diskussionen";
+$a->strings["Allow infinite level threading for items on this site."] = "Erlaube ein unendliches Level für Threads auf dieser Seite.";
 $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung";
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen.";
 $a->strings["OpenID support"] = "OpenID Unterstützung";
@@ -779,7 +827,7 @@ $a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt";
 $a->strings["select all"] = "Alle auswählen";
 $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf deine Bestätigung warten";
 $a->strings["Request date"] = "Anfragedatum";
-$a->strings["Email"] = "Email";
+$a->strings["Email"] = "E-Mail";
 $a->strings["No registrations."] = "Keine Neuanmeldungen.";
 $a->strings["Deny"] = "Verwehren";
 $a->strings["Register date"] = "Anmeldedatum";
@@ -830,6 +878,7 @@ $a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
 $a->strings["Contact added"] = "Kontakt hinzugefügt";
 $a->strings["Common Friends"] = "Gemeinsame Freunde";
 $a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte.";
+$a->strings["link"] = "Link";
 $a->strings["Item has been removed."] = "Eintrag wurde entfernt.";
 $a->strings["Applications"] = "Anwendungen";
 $a->strings["No installed applications."] = "Keine Applikationen installiert.";
@@ -838,6 +887,8 @@ $a->strings["Profile not found."] = "Profil nicht gefunden.";
 $a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
 $a->strings["Marital Status"] = "Familienstand";
 $a->strings["Romantic Partner"] = "Romanze";
+$a->strings["Likes"] = "Likes";
+$a->strings["Dislikes"] = "Dislikes";
 $a->strings["Work/Employment"] = "Arbeit / Beschäftigung";
 $a->strings["Religion"] = "Religion";
 $a->strings["Political Views"] = "Politische Ansichten";
@@ -884,6 +935,8 @@ $a->strings["Political Views:"] = "Politische Ansichten:";
 $a->strings["Religious Views:"] = "Religiöse Ansichten:";
 $a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:";
 $a->strings["Private Keywords:"] = "Private Schlüsselwörter:";
+$a->strings["Likes:"] = "Likes:";
+$a->strings["Dislikes:"] = "Dislikes:";
 $a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software";
 $a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)";
 $a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)";
@@ -916,6 +969,17 @@ $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die S
 $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte";
 $a->strings["Add"] = "Hinzufügen";
 $a->strings["No entries."] = "Keine Einträge";
+$a->strings["Source (bbcode) text:"] = "Quelle (bbcode) Text:";
+$a->strings["Source (Diaspora) text to convert to BBcode:"] = "Eingabe (Diaspora) Nach BBCode zu konvertierender Text:";
+$a->strings["Source input: "] = "";
+$a->strings["bb2html: "] = "bb2html: ";
+$a->strings["bb2html2bb: "] = "bb2html2bb: ";
+$a->strings["bb2md: "] = "bb2md: ";
+$a->strings["bb2md2html: "] = "bb2md2html: ";
+$a->strings["bb2dia2bb: "] = "bb2dia2bb: ";
+$a->strings["bb2md2html2bb: "] = "bb2md2html2bb: ";
+$a->strings["Source input (Diaspora format): "] = "Texteingabe (Diaspora Format): ";
+$a->strings["diaspora2bb: "] = "diaspora2bb: ";
 $a->strings["Friend Suggestions"] = "Kontaktvorschläge";
 $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Keine Vorschläge. Falls der Server frisch aufgesetzt wurde, versuche es bitte in 24 Stunden noch einmal.";
 $a->strings["Ignore/Hide"] = "Ignorieren/Verbergen";
@@ -923,9 +987,13 @@ $a->strings["Global Directory"] = "Weltweites Verzeichnis";
 $a->strings["Find on this site"] = "Auf diesem Server suchen";
 $a->strings["Site Directory"] = "Verzeichnis";
 $a->strings["Gender: "] = "Geschlecht:";
+$a->strings["Gender:"] = "Geschlecht:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Homepage:";
+$a->strings["About:"] = "Über:";
 $a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
 $a->strings["%s : Not a valid email address."] = "%s: Keine gültige Email Adresse.";
-$a->strings["Please join us on Friendica"] = "Bitte trete uns auf Friendica bei";
+$a->strings["Please join us on Friendica"] = "Bitte trete bei uns auf Friendica bei";
 $a->strings["%s : Message delivery failed."] = "%s: Zustellung der Nachricht fehlgeschlagen.";
 $a->strings["%d message sent."] = array(
 	0 => "%d Nachricht gesendet.",
@@ -935,7 +1003,7 @@ $a->strings["You have no more invitations available"] = "Du hast keine weiteren
 $a->strings["Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks."] = "Besuche %s für eine Liste der öffentlichen Server, denen du beitreten kannst. Friendica Mitglieder unterschiedlicher Server können sich sowohl alle miteinander verbinden, als auch mit Mitgliedern anderer Sozialer Netzwerke.";
 $a->strings["To accept this invitation, please visit and register at %s or any other public Friendica website."] = "Um diese Kontaktanfrage zu akzeptieren, besuche und registriere dich bitte bei %s oder einer anderen öffentlichen Friendica Website.";
 $a->strings["Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join."] = "Friendica Server verbinden sich alle untereinander, um ein großes datenschutzorientiertes Soziales Netzwerk zu bilden, das von seinen Mitgliedern betrieben und kontrolliert wird. Sie können sich auch mit vielen üblichen Sozialen Netzwerken verbinden. Besuche %s für eine Liste alternativer Friendica Server, denen du beitreten kannst.";
-$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns Leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen.";
+$a->strings["Our apologies. This system is not currently configured to connect with other public sites or invite members."] = "Es tut uns leid. Dieses System ist zurzeit nicht dafür konfiguriert, sich mit anderen öffentlichen Seiten zu verbinden oder Mitglieder einzuladen.";
 $a->strings["Send invitations"] = "Einladungen senden";
 $a->strings["Enter email addresses, one per line:"] = "E-Mail-Adressen eingeben, eine pro Zeile:";
 $a->strings["You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web."] = "Du bist herzlich dazu eingeladen, dich mir und anderen guten Freunden auf Friendica anzuschließen - und ein besseres Soziales Netz aufzubauen.";
@@ -952,7 +1020,7 @@ $a->strings["Introduction failed or was revoked."] = "Kontaktanfrage schlug fehl
 $a->strings["Unable to set contact photo."] = "Konnte das Bild des Kontakts nicht speichern.";
 $a->strings["%1\$s is now friends with %2\$s"] = "%1\$s ist nun mit %2\$s befreundet";
 $a->strings["No user record found for '%s' "] = "Für '%s' wurde kein Nutzer gefunden";
-$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend im Arsch.";
+$a->strings["Our site encryption key is apparently messed up."] = "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend nicht in Ordnung.";
 $a->strings["Empty site URL was provided or URL could not be decrypted by us."] = "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden.";
 $a->strings["Contact record was not found for you on our site."] = "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden.";
 $a->strings["Site public key not available in contact record for URL %s."] = "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server.";
@@ -961,23 +1029,27 @@ $a->strings["Unable to set your contact credentials on our system."] = "Deine Ko
 $a->strings["Unable to update your contact profile details on our system"] = "Die Updates für dein Profil konnten nicht gespeichert werden";
 $a->strings["Connection accepted at %s"] = "Auf %s wurde die Verbindung akzeptiert";
 $a->strings["%1\$s has joined %2\$s"] = "%1\$s ist %2\$s beigetreten";
+$a->strings["Google+ Import Settings"] = "Google+ Import Einstellungen";
+$a->strings["Enable Google+ Import"] = "Aktiviere Google+ Import";
+$a->strings["Google Account ID"] = "Google Account ID";
+$a->strings["Google+ Import Settings saved."] = "Google+ Import Einstellungen gespeichert.";
 $a->strings["Facebook disabled"] = "Facebook deaktiviert";
 $a->strings["Updating contacts"] = "Aktualisiere Kontakte";
 $a->strings["Facebook API key is missing."] = "Facebook-API-Schlüssel nicht gefunden";
 $a->strings["Facebook Connect"] = "Mit Facebook verbinden";
 $a->strings["Install Facebook connector for this account."] = "Facebook-Connector für dieses Konto installieren.";
 $a->strings["Remove Facebook connector"] = "Facebook-Connector entfernen";
-$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]";
+$a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn du dein Facebook-Passwort geändert hast.]";
 $a->strings["Post to Facebook by default"] = "Veröffentliche standardmäßig bei Facebook";
 $a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Die folgenden Einstellungen haben keinen Effekt.";
 $a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Wenn du es ausgeschaltet hast, kannst du es nicht wieder aktivieren.";
 $a->strings["Link all your Facebook friends and conversations on this website"] = "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren";
 $a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>.";
 $a->strings["On this website, your Facebook friend stream is only visible to you."] = "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen.";
-$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen.";
+$a->strings["The following settings determine the privacy of your Facebook profile wall on this website."] = "Mit den folgenden Einstellungen kannst du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen.";
 $a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen";
 $a->strings["Do not import your Facebook profile wall conversations"] = "Facebook-Pinnwand nicht importieren";
-$a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann.";
+$a->strings["If you choose to link conversations and leave both of these boxes unchecked, your Facebook profile wall will be merged with your profile wall on this website and your privacy settings on this website will be used to determine who may see the conversations."] = "Wenn du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann.";
 $a->strings["Comma separated applications to ignore"] = "Kommaseparierte Anwendungen, die ignoriert werden sollen";
 $a->strings["Problems with Facebook Real-Time Updates"] = "Probleme mit Facebook Echtzeit-Updates";
 $a->strings["Facebook"] = "Facebook";
@@ -986,7 +1058,7 @@ $a->strings["Facebook API Key"] = "Facebook API Schlüssel";
 $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>";
 $a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden).";
 $a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint korrekt zu funktionieren.";
-$a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange.";
+$a->strings["The correctness of the API Key could not be detected. Something strange's going on."] = "Die Richtigkeit des API Schlüssels konnte nicht gefunden werden. Irgendwas stimmt nicht.";
 $a->strings["App-ID / API-Key"] = "App-ID / API-Key";
 $a->strings["Application secret"] = "Anwendungs-Geheimnis";
 $a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Abfrageintervall in Minuten (min %1\$s Minuten)";
@@ -1007,6 +1079,9 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "StatusNet AutoFollow Einstellungen aktualisiert.";
 $a->strings["StatusNet AutoFollow Settings"] = "StatusNet AutoFollow Einstellungen";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "Automatisch allen StatusNet Followern/Erwähnungen folgen";
+$a->strings["Bg settings updated."] = "Bg Einstellungen sind aktualisiert.";
+$a->strings["Bg Settings"] = "Bg Einstellungen";
+$a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden";
 $a->strings["Lifetime of the cache (in hours)"] = "Lebenszeit des Caches (in Stunden)";
 $a->strings["Cache Statistics"] = "Cache Statistik";
 $a->strings["Number of items"] = "Anzahl der Einträge";
@@ -1014,7 +1089,7 @@ $a->strings["Size of the cache"] = "Größe des Caches";
 $a->strings["Delete the whole cache"] = "Cache leeren";
 $a->strings["%d person likes this"] = array(
 	0 => "%d Person mag das",
-	1 => "%d Leuten mögen das",
+	1 => "%d Leute mögen das",
 );
 $a->strings["%d person doesn't like this"] = array(
 	0 => " %d Person mag das nicht",
@@ -1025,6 +1100,43 @@ $a->strings["Generate new key"] = "Neuen Schlüssel erstellen";
 $a->strings["Widgets key"] = "Widgets Schlüssel";
 $a->strings["Widgets available"] = "Verfügbare Widgets";
 $a->strings["Connect on Friendica!"] = "In Friendica verbinden!";
+$a->strings["bitchslap"] = "";
+$a->strings["bitchslapped"] = "";
+$a->strings["shag"] = "";
+$a->strings["shagged"] = "";
+$a->strings["do something obscenely biological to"] = "";
+$a->strings["did something obscenely biological to"] = "";
+$a->strings["point out the new poke feature to"] = "";
+$a->strings["pointed out the new poke feature to"] = "";
+$a->strings["declare undying love for"] = "";
+$a->strings["declared undying love for"] = "";
+$a->strings["set fire to"] = "";
+$a->strings["patent"] = "";
+$a->strings["patented"] = "";
+$a->strings["stroke beard"] = "";
+$a->strings["stroked their beard at"] = "";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["hug"] = "";
+$a->strings["hugged"] = "";
+$a->strings["kiss"] = "";
+$a->strings["kissed"] = "";
+$a->strings["raise eyebrows at"] = "";
+$a->strings["raised their eyebrows at"] = "";
+$a->strings["insult"] = "";
+$a->strings["insulted"] = "";
+$a->strings["praise"] = "";
+$a->strings["praised"] = "";
+$a->strings["be dubious of"] = "";
+$a->strings["was dubious of"] = "";
+$a->strings["eat"] = "";
+$a->strings["ate"] = "";
+$a->strings["giggle and fawn at"] = "";
+$a->strings["giggled and fawned at"] = "";
+$a->strings["doubt"] = "anzeigen/verbergen";
+$a->strings["doubted"] = "";
+$a->strings["glare"] = "";
+$a->strings["glared at"] = "";
 $a->strings["YourLS Settings"] = "YourLS Einstellungen";
 $a->strings["URL: http://"] = "URL: http://";
 $a->strings["Username:"] = "Nutzername:";
@@ -1045,7 +1157,12 @@ $a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expr
 $a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert";
 $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken";
 $a->strings["Forums"] = "Foren";
-$a->strings["show more"] = "mehr anzeigen";
+$a->strings["Forums:"] = "Foren:";
+$a->strings["Page settings updated."] = "Seiteneinstellungen aktualisiert.";
+$a->strings["Page Settings"] = "Seiteneinstellungen";
+$a->strings["How many forums to display on sidebar without paging"] = "Wie viele Foren sollen in der Seitenleiste ohne Umblättern angezeigt werden";
+$a->strings["Randomise Page/Forum list"] = "Zufällige Seiten/Foren Liste";
+$a->strings["Show pages/forums on profile page"] = "Foren/Seiten auf der Profilseite anzeigen";
 $a->strings["Planets Settings"] = "Planeten Einstellungen";
 $a->strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin";
 $a->strings["Login"] = "Anmeldung";
@@ -1055,57 +1172,132 @@ $a->strings["Most active users"] = "Aktivste Nutzer";
 $a->strings["Latest photos"] = "Neueste Fotos";
 $a->strings["Latest likes"] = "Neueste Favoriten";
 $a->strings["event"] = "Veranstaltung";
+$a->strings["No access"] = "Kein Zugriff";
+$a->strings["Could not open component for editing"] = "";
+$a->strings["Go back to the calendar"] = "Zurück zum Kalender";
+$a->strings["Event data"] = "Veranstaltungsdetails";
+$a->strings["Calendar"] = "Kalender";
+$a->strings["Special color"] = "Spezielle Farbe";
+$a->strings["Subject"] = "Betreff:";
+$a->strings["Starts"] = "Beginnt";
+$a->strings["Ends"] = "Endet";
+$a->strings["Description"] = "Beschreibung";
+$a->strings["Recurrence"] = "Wiederholungen:";
+$a->strings["Frequency"] = "Frequenz";
+$a->strings["Daily"] = "Täglich";
+$a->strings["Weekly"] = "Wöchentlich";
+$a->strings["Monthly"] = "Monatlich";
+$a->strings["Yearly"] = "Jährlich";
+$a->strings["days"] = "Tage";
+$a->strings["weeks"] = "Wochen";
+$a->strings["months"] = "Monate";
+$a->strings["years"] = "Jahre";
+$a->strings["Interval"] = "Intervall";
+$a->strings["All %select% %time%"] = "Jeden %select% %time%";
+$a->strings["Days"] = "Tage";
+$a->strings["Sunday"] = "Sonntag";
+$a->strings["Monday"] = "Montag";
+$a->strings["Tuesday"] = "Dienstag";
+$a->strings["Wednesday"] = "Mittwoch";
+$a->strings["Thursday"] = "Donnerstag";
+$a->strings["Friday"] = "Freitag";
+$a->strings["Saturday"] = "Samstag";
+$a->strings["First day of week:"] = "Erster Tag der Woche";
+$a->strings["Day of month"] = "Tag des Monats";
+$a->strings["#num#th of each month"] = "#num#ten jedes Monats";
+$a->strings["#num#th-last of each month"] = "letzten #num#ten jedes Monats";
+$a->strings["#num#th #wkday# of each month"] = "";
+$a->strings["#num#th-last #wkday# of each month"] = "";
+$a->strings["Month"] = "Monat";
+$a->strings["#num#th of the given month"] = "#num#ten des Monats";
+$a->strings["#num#th-last of the given month"] = "letzten #num#ten des Monats";
+$a->strings["#num#th #wkday# of the given month"] = "";
+$a->strings["#num#th-last #wkday# of the given month"] = "";
+$a->strings["Repeat until"] = "Wiederholungen";
+$a->strings["Infinite"] = "unendlich";
+$a->strings["Until the following date"] = "bis zum folgenden Datum";
+$a->strings["Number of times"] = "Bestimmte Anzahl von Wiederholungen";
+$a->strings["Exceptions"] = "Ausnahmen";
+$a->strings["none"] = "keine";
+$a->strings["Notification"] = "Benachrichtigung";
+$a->strings["Notify by"] = "Benarchrichtigungsmethode";
+$a->strings["E-Mail"] = "E-Mail";
+$a->strings["On Friendica / Display"] = "Bei Friendica / Anzeige";
+$a->strings["Time"] = "Zeit";
+$a->strings["Hours"] = "Stunden";
+$a->strings["Minutes"] = "Minuten";
+$a->strings["Seconds"] = "Sekunden";
+$a->strings["Weeks"] = "Wochen";
+$a->strings["before the"] = "vor dem";
+$a->strings["start of the event"] = "Beginn des Termins";
+$a->strings["end of the event"] = "Ende des Termins";
+$a->strings["Add a notification"] = "Benachrichtigung hinzufügen";
+$a->strings["The event #name# will start at #date"] = "Der Termin #name# wird am #date anfangen";
+$a->strings["#name# is about to begin."] = "#name# beginnt demnächst.";
+$a->strings["Saved"] = "Gespeichert";
 $a->strings["U.S. Time Format (mm/dd/YYYY)"] = "U.S. Datumsformat (mm/dd/YYYY)";
 $a->strings["German Time Format (dd.mm.YYYY)"] = "Deutsches Datumsformat (dd.mm.YYYY)";
-$a->strings["Error"] = "Fehler";
+$a->strings["Private Events"] = "Privater Termin";
-$a->strings["No access"] = "Kein Zugriff";
+$a->strings["Private Addressbooks"] = "Private Adressbücher";
+$a->strings["Friendica-Native events"] = "Friendica Veranstaltungen";
+$a->strings["Friendica-Contacts"] = "Friendica-Kontakte";
+$a->strings["Your Friendica-Contacts"] = "Deine Friendica-Kontakte";
+$a->strings["Something went wrong when trying to import the file. Sorry. Maybe some events were imported anyway."] = "Entschuldigung. Bei dem Versuch die Datei zu importieren ist etwas schief gelaufen. Vielleicht wurden aber einige der Termine dennoch importiert.";
+$a->strings["Something went wrong when trying to import the file. Sorry."] = "Entschuldigung. Beim Importieren der Datei ist etwas schief gelaufen.";
+$a->strings["The ICS-File has been imported."] = "Die ICS-Datei wurde importoert.";
+$a->strings["No file was uploaded."] = "Es wurde keine Datei geladen.";
+$a->strings["Import a ICS-file"] = "Importiere eine ICS-Datei";
+$a->strings["ICS-File"] = "ICS-Datei";
+$a->strings["Overwrite all #num# existing events"] = "Überschreibe alle #num# existierenden Einträge";
 $a->strings["New event"] = "Neue Veranstaltung";
 $a->strings["Today"] = "Heute";
 $a->strings["Day"] = "Tag";
 $a->strings["Week"] = "Woche";
-$a->strings["Month"] = "Monat";
 $a->strings["Reload"] = "Neu Laden";
 $a->strings["Date"] = "Datum";
-$a->strings["Not found"] = "Nicht gefunden";
+$a->strings["Error"] = "Fehler";
-$a->strings["Go back to the calendar"] = "Zurück zum Kalender";
+$a->strings["The calendar has been updated."] = "Der Kalender wurde aktualisiert.";
-$a->strings["Starts"] = "Beginnt";
+$a->strings["The new calendar has been created."] = "Der neue Kalender wurde erstellt.";
-$a->strings["Ends"] = "Endet";
+$a->strings["The calendar has been deleted."] = "Der Kalender wurde gelöscht.";
-$a->strings["Description"] = "Beschreibung";
+$a->strings["Calendar Settings"] = "Kalendereinstellungen";
-$a->strings["Notification"] = "Benachrichtigung";
-$a->strings["Minutes"] = "Minuten";
-$a->strings["Hours"] = "Stunden";
-$a->strings["Days"] = "Tage";
-$a->strings["before"] = "vorher";
-$a->strings["Calendar Settings"] = "Kalender Einstellungen";
 $a->strings["Date format"] = "Datumsformat";
 $a->strings["Time zone"] = "Zeitzone";
+$a->strings["Calendars"] = "Kalender";
+$a->strings["Create a new calendar"] = "Neuen Kalender anlegen";
 $a->strings["Limitations"] = "Einschränkungen";
 $a->strings["Warning"] = "Warnung";
 $a->strings["Synchronization (iPhone, Thunderbird Lightning, Android, ...)"] = "Synchronisation (iPhone, Thunderbird Lightning, Android, ...)";
 $a->strings["Synchronizing this calendar with the iPhone"] = "Diesen Kalender mit dem iPhone synchronisieren";
 $a->strings["Synchronizing your Friendica-Contacts with the iPhone"] = "Friendica-Kontakte mit dem iPhone synchronisieren";
-$a->strings["Friendica-Contacts"] = "Friendica-Kontakte";
+$a->strings["The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this."] = "Die aktuelle Version dieses Plugins wurde nicht korrekt eingestellt. Bitte kontaktiere den System-Administrator deiner Friendica Installation um den Fehler zu beheben.";
-$a->strings["Your Friendica-Contacts"] = "Deine Friendica-Kontakte";
-$a->strings["Calendar"] = "Kalender";
 $a->strings["Extended calendar with CalDAV-support"] = "Erweiterter Kalender mit CalDAV Unterstützung.";
-$a->strings["The database tables have been installed."] = "Die Datenbank-Tabellen wurden installiert.";
+$a->strings["noreply"] = "noreply";
+$a->strings["Notification: "] = "Benachrichtigungen: ";
+$a->strings["The database tables have been installed."] = "Die Datenbanktabellen wurden installiert.";
 $a->strings["An error occurred during the installation."] = "Während der Installation trat ein Fehler auf.";
+$a->strings["The database tables have been updated."] = "Die Tabellen in der Datenbank wurden aktualisiert.";
+$a->strings["An error occurred during the update."] = "Während der Aktualisierung trat ein Fehler auf.";
 $a->strings["No system-wide settings yet."] = "Momentan keine systemweiten Einstellungen.";
-$a->strings["Database status"] = "Datenbank Status";
+$a->strings["Database status"] = "Datenbankstatus";
 $a->strings["Installed"] = "Installiert";
 $a->strings["Upgrade needed"] = "Upgrade erforderlich";
+$a->strings["Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button."] = "Bitte sichere alle Kalenderdaten (die Tabellen mit dav_* beginnend) bevor du mit dem Update fortfährst. Eigentliche <i>sollten</i> alle Kalendereinträge in die neue Datenbankstruktur übernommen werden, aber sicher ist sicher. Weiter unten kannst du die Datenbank-Anfragen ansehen, die im Verlauf des Updates gemacht werden.";
 $a->strings["Upgrade"] = "Upgrade";
 $a->strings["Not installed"] = "Nicht installiert";
 $a->strings["Install"] = "Installieren";
+$a->strings["Unknown"] = "Unbekannt";
+$a->strings["Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically."] = "Irgendetwas ging schief. Ich kann leider von diesem Zustand der Datenbank leider nicht automatisch fortfahren. Bitte mache ein Backup der Daten aus der Datenbank und lösche anschließend alle Tabellen deren Name mit 'dav_' anfangen. Anschließend sollte diese Installations-Routine in der Lage sein die nötigen Tabellen automatisch neu anzulegen.";
 $a->strings["Troubleshooting"] = "Problembehebung";
-$a->strings["Manual creation of the database tables:"] = "Manuelles anlegen der Datenbank Tabellen:";
+$a->strings["Manual creation of the database tables:"] = "Manuelles Anlegen der Datenbanktabellen:";
 $a->strings["Show SQL-statements"] = "SQL-Anweisungen anzeigen";
 $a->strings["Private Calendar"] = "Privater Kalender";
 $a->strings["Friendica Events: Mine"] = "Meine Friendica-Veranstaltungen";
 $a->strings["Friendica Events: Contacts"] = "Friendica Veranstaltungen meiner Kontakte";
-$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Ermöglicht dir, deine friendica id (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
+$a->strings["Private Addresses"] = "Private Adressen";
+$a->strings["Friendica Contacts"] = "Friendica Kontakte";
+$a->strings["Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"] = "Ermöglicht dir, deine Friendica ID (%s) mit externen unhosted-fähigen Speichern (z.B. ownCloud) zu verbinden. Siehe <a href=\"http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>";
 $a->strings["Template URL (with {category})"] = "Vorlagen URL (mit {Kategorie})";
-$a->strings["OAuth end-point"] = "OAuth end-point";
+$a->strings["OAuth end-point"] = "OAuth Endpunkt";
 $a->strings["Api"] = "Api";
 $a->strings["Member since:"] = "Mitglied seit:";
 $a->strings["Three Dimensional Tic-Tac-Toe"] = "Dreidimensionales Tic-Tac-Toe";
@@ -1157,6 +1349,12 @@ $a->strings["Upload was cancelled, or server error encountered"] = "Upload abgeb
 $a->strings["OEmbed settings updated"] = "OEmbed Einstellungen aktualisiert.";
 $a->strings["Use OEmbed for YouTube videos"] = "OEmbed für Youtube Videos verwenden";
 $a->strings["URL to embed:"] = "URL zum Einbetten:";
+$a->strings["show/hide"] = "anzeigen/verbergen";
+$a->strings["No forum subscriptions"] = "Keine Foren-Mitgliedschaften.";
+$a->strings["Forumlist settings updated."] = "Einstellungen zur Foren-Liste aktualisiert.";
+$a->strings["Forumlist Settings"] = "Foren-Liste Einstellungen";
+$a->strings["Randomise Forumlist/Forum list"] = "Zufällige Zusammenstellung der Foren-Liste";
+$a->strings["Show forumlists/forums on profile forumlist"] = "Liste der Foren deren Abonnement du bist in deinem Profil anzeigen:";
 $a->strings["Impressum"] = "Impressum";
 $a->strings["Site Owner"] = "Betreiber der Seite";
 $a->strings["Email Address"] = "Email Adresse";
@@ -1193,28 +1391,41 @@ $a->strings["Tile Server URL"] = "Tile Server URL";
 $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>";
 $a->strings["Default zoom"] = "Standard Zoom";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)";
+$a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert";
+$a->strings["Group Text"] = "";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Kann Libravatar NICHT erfolgreich installieren.<br>PHP >=5.3 wird benötigt";
+$a->strings["generic profile image"] = "allgemeines Profilbild";
+$a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster";
+$a->strings["monster face"] = "Monstergesicht";
+$a->strings["computer generated face"] = "Computergesicht";
+$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Deine PHP Version %s ist niedriger als die benötigte Version PHP >= 5.3.";
+$a->strings["This addon is not functional on your server."] = "Dieses Addon funktioniert auf deinem Server nicht.";
+$a->strings["Information"] = "Information";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Gravatar Addon ist installiert. Bitte schalte das Gravatar Addon aus.<br>Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden.";
+$a->strings["Default avatar image"] = "Standard Profilbild ";
+$a->strings["Select default avatar image if none was found. See README"] = "Das Standard Avatar Bild wurde nicht gefunden. Siehe README";
+$a->strings["Libravatar settings updated."] = "Libravatar Einstellungen sind aktualisiert.";
 $a->strings["Post to libertree"] = "bei libertree veröffentlichen";
 $a->strings["libertree Post Settings"] = "libertree Post Einstellungen";
 $a->strings["Enable Libertree Post Plugin"] = "Libertree Post Plugin aktivieren";
 $a->strings["Libertree API token"] = "Libertree API Token";
 $a->strings["Libertree site URL"] = "Libertree URL";
 $a->strings["Post to Libertree by default"] = "Standardmäßig bei libertree veröffentlichen";
+$a->strings["Altpager settings updated."] = "Altpager Einstellungen sind aktualisiert.";
+$a->strings["Alternate Pagination Setting"] = "Alternative Seitenumbruch Einstellung";
+$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Nutze Links zu \"neuer\" und \"älter\" Seiten, statt Seiten Nummern?";
 $a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert.";
 $a->strings["Use the MathJax renderer"] = "MathJax verwenden";
 $a->strings["MathJax Base URL"] = "MathJax Basis-URL";
 $a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen.";
-$a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert";
 $a->strings["Editplain Settings"] = "Editplain Einstellungen";
 $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren";
-$a->strings["generic profile image"] = "allgemeines Profilbild";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Libravatar Addon ist ebenfalls installiert. Bitte deaktiviere das Libravatar Addon oder dieses Gravatar Addon.<br>Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden.";
-$a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster";
-$a->strings["monster face"] = "Monstergesicht";
-$a->strings["computer generated face"] = "Computergesicht";
-$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht";
-$a->strings["Default avatar image"] = "Standard Profilbild ";
 $a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Wähle das Standardgesicht, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach.";
 $a->strings["Rating of images"] = "Bildbewertung";
-$a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch sonst im README nach.";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für deinen Server. Schaue auch sonst im README nach.";
 $a->strings["Gravatar settings updated."] = "Gravatar Einstellungen aktualisiert.";
 $a->strings["Your Friendica test account is about to expire."] = "Dein Friendica-Testkonto wird bald verfallen.";
 $a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hallo %1\$s,\n\ndein Testkonto auf %2\$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir einen normalen Friendica-Server für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Server findest du auf http://dir.friendica.com/siteinfo . Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica-Projektseite werfen: http://friendica.com";
@@ -1233,7 +1444,7 @@ $a->strings["We could not contact the StatusNet API with the Path you entered."]
 $a->strings["StatusNet settings updated."] = "StatusNet Einstellungen aktualisiert.";
 $a->strings["StatusNet Posting Settings"] = "StatusNet-Beitragseinstellungen";
 $a->strings["Globally Available StatusNet OAuthKeys"] = "Verfügbare OAuth Schlüssel für StatusNet";
-$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Für einige StatusNet Server sind voreingestellt OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stellen stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten).";
+$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Für einige StatusNet Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stelle stattdessen eine Verbindung zu irgend einem anderen StatusNet Server her (siehe unten).";
 $a->strings["Provide your own OAuth Credentials"] = "Eigene OAuth Schlüssel eintragen";
 $a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Kein Consumer-Schlüsselpaar für StatusNet gefunden. Registriere deinen Friendica-Account als Desktop-Client, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.<br />Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem StatusNet-Server existiert.";
 $a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
@@ -1262,7 +1473,6 @@ $a->strings["Tumblr password"] = "Tumblr Passwort";
 $a->strings["Post to Tumblr by default"] = "Standardmäßig bei Tumblr veröffentlichen";
 $a->strings["Numfriends settings updated."] = "Numfriends Einstellungen aktualisiert";
 $a->strings["Numfriends Settings"] = "Numfriends Einstellungen";
-$a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden";
 $a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert.";
 $a->strings["Gnot Settings"] = "Gnot Einstellungen";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff";
@@ -1275,14 +1485,14 @@ $a->strings["WordPress username"] = "WordPress-Benutzername";
 $a->strings["WordPress password"] = "WordPress-Passwort";
 $a->strings["WordPress API URL"] = "WordPress-API-URL";
 $a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen";
-$a->strings["Provide a backlink to the Friendica post"] = "Einen zurück zum Friendica-Beitrag hinzufügen";
+$a->strings["Provide a backlink to the Friendica post"] = "Einen Link zurück zum Friendica-Beitrag hinzufügen";
-$a->strings["Read the original post and comment stream on Friendica"] = "Den Original-Beitrag samt Kommentaren bei Friendica lesen";
+$a->strings["Read the original post and comment stream on Friendica"] = "Den Originalbeitrag samt Kommentaren bei Friendica lesen";
 $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
 $a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\"";
 $a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben";
 $a->strings["Show More Settings saved."] = "\"Mehr zeigen\" Einstellungen gesichert.";
 $a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Diese Website benutzt <a href='http://www.piwik.org'>Piwik</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe.";
-$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn Du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst Du <a href='%s'>ein Cookie setzen</a>. Dann wird Piwik Dich auf dieser Website nicht mehr verfolgen (opt-out).";
+$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn du nicht willst, dass deine Besuche auf diese Weise gespeichert werden, kannst du <a href='%s'>ein Cookie setzen</a>. Dann wird Piwik dich auf dieser Website nicht mehr verfolgen (opt-out).";
 $a->strings["Piwik Base URL"] = "Piwik Basis URL";
 $a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Absoluter Pfad zu deiner Piwik Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)";
 $a->strings["Site ID"] = "Seiten ID";
@@ -1364,17 +1574,13 @@ $a->strings["Alignment"] = "Ausrichtung";
 $a->strings["Left"] = "Links";
 $a->strings["Center"] = "Mitte";
 $a->strings["Set colour scheme"] = "Farbschema wählen";
-$a->strings["Gender:"] = "Geschlecht:";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
 $a->strings["Birthday:"] = "Geburtstag:";
 $a->strings["Age:"] = "Alter:";
-$a->strings["Status:"] = "Status:";
 $a->strings["for %1\$d %2\$s"] = "für %1\$d %2\$s";
-$a->strings["Homepage:"] = "Homepage:";
 $a->strings["Tags:"] = "Tags";
 $a->strings["Religion:"] = "Religion:";
-$a->strings["About:"] = "Über:";
 $a->strings["Hobbies/Interests:"] = "Hobbies/Interessen:";
 $a->strings["Contact information and Social Networks:"] = "Kontaktinformationen und Soziale Netzwerke:";
 $a->strings["Musical interests:"] = "Musikalische Interessen:";
@@ -1393,9 +1599,6 @@ $a->strings["Reputable, has my trust"] = "Seriös, hat mein Vertrauen";
 $a->strings["Frequently"] = "immer wieder";
 $a->strings["Hourly"] = "Stündlich";
 $a->strings["Twice daily"] = "Zweimal täglich";
-$a->strings["Daily"] = "Täglich";
-$a->strings["Weekly"] = "Wöchentlich";
-$a->strings["Monthly"] = "Monatlich";
 $a->strings["OStatus"] = "OStatus";
 $a->strings["RSS/Atom"] = "RSS/Atom";
 $a->strings["Zot!"] = "Zott";
@@ -1463,23 +1666,30 @@ $a->strings["Ask me"] = "Frag mich";
 $a->strings["Starts:"] = "Beginnt:";
 $a->strings["Finishes:"] = "Endet:";
 $a->strings["(no subject)"] = "(kein Betreff)";
-$a->strings["noreply"] = "noreply";
+$a->strings[" on Last.fm"] = " bei Last.fm";
 $a->strings["prev"] = "vorige";
 $a->strings["first"] = "erste";
 $a->strings["last"] = "letzte";
 $a->strings["next"] = "nächste";
+$a->strings["newer"] = "neuer";
+$a->strings["older"] = "älter";
 $a->strings["No contacts"] = "Keine Kontakte";
 $a->strings["%d Contact"] = array(
 	0 => "%d Kontakt",
 	1 => "%d Kontakte",
 );
-$a->strings["Monday"] = "Montag";
+$a->strings["poke"] = "";
-$a->strings["Tuesday"] = "Dienstag";
+$a->strings["poked"] = "";
-$a->strings["Wednesday"] = "Mittwoch";
+$a->strings["ping"] = "";
-$a->strings["Thursday"] = "Donnerstag";
+$a->strings["pinged"] = "";
-$a->strings["Friday"] = "Freitag";
+$a->strings["prod"] = "";
-$a->strings["Saturday"] = "Samstag";
+$a->strings["prodded"] = "";
-$a->strings["Sunday"] = "Sonntag";
+$a->strings["slap"] = "";
+$a->strings["slapped"] = "";
+$a->strings["finger"] = "";
+$a->strings["fingered"] = "";
+$a->strings["rebuff"] = "";
+$a->strings["rebuffed"] = "";
 $a->strings["January"] = "Januar";
 $a->strings["February"] = "Februar";
 $a->strings["March"] = "März";
@@ -1498,7 +1708,7 @@ $a->strings["[remove]"] = "[löschen]";
 $a->strings["Categories:"] = "Kategorien:";
 $a->strings["Filed under:"] = "Abgelegt unter:";
 $a->strings["Click to open/close"] = "Zum öffnen/schließen klicken";
-$a->strings["default"] = "standard";
+$a->strings["default"] = "Standard";
 $a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
 $a->strings["activity"] = "Aktivität";
 $a->strings["comment"] = "Kommentar";
@@ -1534,7 +1744,7 @@ $a->strings["Conversations from your friends"] = "Unterhaltungen deiner Kontakte
 $a->strings["Friend Requests"] = "Kontaktanfragen";
 $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen";
 $a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen";
-$a->strings["Private mail"] = "Private Email";
+$a->strings["Private mail"] = "Private E-Mail";
 $a->strings["Inbox"] = "Eingang";
 $a->strings["Outbox"] = "Ausgang";
 $a->strings["Manage"] = "Verwalten";
@@ -1570,11 +1780,7 @@ $a->strings["month"] = "Monat";
 $a->strings["day"] = "Tag";
 $a->strings["never"] = "nie";
 $a->strings["less than a second ago"] = "vor weniger als einer Sekunde";
-$a->strings["years"] = "Jahre";
-$a->strings["months"] = "Monate";
 $a->strings["week"] = "Woche";
-$a->strings["weeks"] = "Wochen";
-$a->strings["days"] = "Tage";
 $a->strings["hour"] = "Stunde";
 $a->strings["hours"] = "Stunden";
 $a->strings["minute"] = "Minute";
@@ -1582,10 +1788,13 @@ $a->strings["minutes"] = "Minuten";
 $a->strings["second"] = "Sekunde";
 $a->strings["seconds"] = "Sekunden";
 $a->strings["%1\$d %2\$s ago"] = "%1\$d %2\$s her";
+$a->strings["%s's birthday"] = "%ss Geburtstag";
+$a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s";
 $a->strings["From: "] = "Von: ";
-$a->strings["$1 wrote:"] = "$1 hat geschrieben:";
 $a->strings["Image/photo"] = "Bild/Foto";
-$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln.";
+$a->strings["$1 wrote:"] = "$1 hat geschrieben:";
+$a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
+$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln.";
 $a->strings["[no subject]"] = "[kein Betreff]";
 $a->strings["Visible to everybody"] = "Für jeden sichtbar";
 $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung";
@@ -1593,33 +1802,36 @@ $a->strings["Thank You,"] = "Danke,";
 $a->strings["%s Administrator"] = "der Administrator von %s";
 $a->strings["%s <!item_type!>"] = "%s <!item_type!>";
 $a->strings["[Friendica:Notify] New mail received at %s"] = "[Friendica Meldung] Neue Nachricht erhalten von %s";
-$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat Dir eine neues private Nachricht geschickt auf %2\$s.";
+$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s hat dir eine neue private Nachricht auf %2\$s geschickt.";
-$a->strings["%1\$s sent you %2\$s."] = "%1\$s schickte Dir %2\$s.";
+$a->strings["%1\$s sent you %2\$s."] = "%1\$s schickte dir %2\$s.";
 $a->strings["a private message"] = "eine private Nachricht";
 $a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten.";
 $a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$s's %4\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$ss %4\$s[/url]";
-$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]Deinen Beitrag %3\$s[/url]";
+$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen %3\$s[/url]";
 $a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica Meldung] Kommentar zum Beitrag #%1\$d von %2\$s";
 $a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem du folgst.";
 $a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
-$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben";
+$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica Meldung] %s hat auf deine Pinnwand geschrieben";
-$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s schrieb auf Deine Pinnwand auf %2\$s";
+$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s schrieb auf %2\$s auf deine Pinnwand";
-$a->strings["%1\$s posted to [url=%2s]your wall[/url]"] = "%1\$s schrieb auf [url=%2s]Deine Pinnwand[/url]";
+$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s hat etwas auf [url=%2\$s]deiner Pinnwand[/url] gepostet";
-$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica Meldung] %s hat Dich erwähnt";
+$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica Meldung] %s hat dich erwähnt";
-$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s erwähnte Dich auf %2\$s";
+$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s erwähnte dich auf %2\$s";
-$a->strings["%1\$s [url=%2s]tagged you[/url]."] = "%1\$s [url=%2s]erwähnte Dich[/url].";
+$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]erwähnte dich[/url].";
-$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte Deinen Beitrag";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "";
-$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s erwähnte Deinen Beitrag auf %2\$s";
+$a->strings["%1\$s poked you at %2\$s"] = "";
+$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "";
+$a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica Meldung] %s markierte deinen Beitrag";
+$a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s erwähnte deinen Beitrag auf %2\$s";
 $a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s erwähnte [url=%2\$s]Deinen Beitrag[/url]";
 $a->strings["[Friendica:Notify] Introduction received"] = "[Friendica Meldung] Kontaktanfrage erhalten";
-$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Du hast eine Kontaktanfrage erhalten von '%1\$s' auf %2\$s";
+$a->strings["You've received an introduction from '%1\$s' at %2\$s"] = "Du hast eine Kontaktanfrage von '%1\$s' auf %2\$s erhalten";
-$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Kontaktanfrage[/url] erhalten von %2\$s.";
+$a->strings["You've received [url=%1\$s]an introduction[/url] from %2\$s."] = "Du hast eine [url=%1\$s]Kontaktanfrage[/url] von %2\$s erhalten.";
 $a->strings["You may visit their profile at %s"] = "Hier kannst du das Profil betrachten: %s";
 $a->strings["Please visit %s to approve or reject the introduction."] = "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen.";
 $a->strings["[Friendica:Notify] Friend suggestion received"] = "[Friendica Meldung] Kontaktvorschlag erhalten";
-$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Du hast einen Freunde-Vorschlag erhalten von '%1\$s' auf %2\$s";
+$a->strings["You've received a friend suggestion from '%1\$s' at %2\$s"] = "Du hast einen Freunde-Vorschlag von '%1\$s' auf %2\$s erhalten";
-$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Du hast einen [url=%1\$s]Freunde-Vorschlag[/url] erhalten %2\$s von %3\$s.";
+$a->strings["You've received [url=%1\$s]a friend suggestion[/url] for %2\$s from %3\$s."] = "Du hast einen [url=%1\$s]Freunde-Vorschlag[/url] %2\$s von %3\$s erhalten.";
 $a->strings["Name:"] = "Name:";
 $a->strings["Photo:"] = "Foto:";
 $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen.";
@@ -1630,7 +1842,7 @@ $a->strings["The profile address specified does not provide adequate information
 $a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden.";
 $a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden.";
 $a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen.";
-$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse um eine Überprüfung der Email Adresse zu erzwingen.";
+$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse, um eine Überprüfung der E-Mail-Adresse zu erzwingen.";
 $a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde.";
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können.";
 $a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen.";
@@ -1638,8 +1850,6 @@ $a->strings["following"] = "folgen";
 $a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf ";
 $a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
 $a->strings["Archives"] = "Archiv";
-$a->strings["image/photo"] = "Bild/Foto";
-$a->strings["link"] = "Verweis";
 $a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
 $a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
 $a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
@@ -1654,50 +1864,23 @@ $a->strings["Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_
 $a->strings["Nickname is already registered. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
 $a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen.";
 $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden.";
-$a->strings["An error occurred during registration. Please try again."] = "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
+$a->strings["An error occurred during registration. Please try again."] = "Während der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
 $a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal.";
 $a->strings["Welcome "] = "Willkommen ";
 $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
 $a->strings["Welcome back "] = "Willkommen zurück ";
 $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
 $a->strings["stopped following"] = "wird nicht mehr gefolgt";
+$a->strings["Poke"] = "";
 $a->strings["View Status"] = "Pinnwand anschauen";
 $a->strings["View Profile"] = "Profil anschauen";
 $a->strings["View Photos"] = "Bilder anschauen";
 $a->strings["Network Posts"] = "Netzwerkbeiträge";
 $a->strings["Edit Contact"] = "Kontakt bearbeiten";
 $a->strings["Send PM"] = "Private Nachricht senden";
+$a->strings["%1\$s poked %2\$s"] = "";
 $a->strings["post/item"] = "Nachricht/Beitrag";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$s als Favorit markiert";
-$a->strings["Select"] = "Auswählen";
-$a->strings["View %s's profile @ %s"] = "Das Profil von %s auf %s betrachten.";
-$a->strings["%s from %s"] = "%s von %s";
-$a->strings["View in context"] = "Im Zusammenhang betrachten";
-$a->strings["%d comment"] = array(
-	0 => "%d Kommentar",
-	1 => "%d Kommentare",
-);
-$a->strings["like"] = "mag ich";
-$a->strings["dislike"] = "mag ich nicht";
-$a->strings["Share this"] = "Weitersagen";
-$a->strings["share"] = "Teilen";
-$a->strings["Bold"] = "Fett";
-$a->strings["Italic"] = "Kursiv";
-$a->strings["Underline"] = "Unterstrichen";
-$a->strings["Quote"] = "Zitat";
-$a->strings["Code"] = "Code";
-$a->strings["Image"] = "Bild";
-$a->strings["Link"] = "Verweis";
-$a->strings["Video"] = "Video";
-$a->strings["add star"] = "markieren";
-$a->strings["remove star"] = "Markierung entfernen";
-$a->strings["toggle star status"] = "Markierung umschalten";
-$a->strings["starred"] = "markiert";
-$a->strings["add tag"] = "Tag hinzufügen";
-$a->strings["save to folder"] = "In Ordner speichern";
-$a->strings["to"] = "zu";
-$a->strings["Wall-to-Wall"] = "Wall-to-Wall";
-$a->strings["via Wall-To-Wall:"] = "via Wall-To-Wall:";
 $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
 $a->strings["%s likes this."] = "%s mag das.";
 $a->strings["%s doesn't like this."] = "%s mag das nicht.";
@@ -1722,12 +1905,15 @@ $a->strings["audio link"] = "Audio-Link";
 $a->strings["set location"] = "Ort setzen";
 $a->strings["clear location"] = "Ort löschen";
 $a->strings["permissions"] = "Zugriffsrechte";
+$a->strings["Click here to upgrade."] = "Zum Upgraden hier klicken.";
+$a->strings["This action exceeds the limits set by your subscription plan."] = "Diese Aktion überschreitet die Obergrenze deines Abonnements.";
+$a->strings["This action is not available under your subscription plan."] = "Diese Aktion ist in deinem Abonnement nicht verfügbar.";
 $a->strings["Delete this item?"] = "Diesen Beitrag löschen?";
 $a->strings["show fewer"] = "weniger anzeigen";
 $a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen.";
 $a->strings["Update Error at %s"] = "Updatefehler bei %s";
 $a->strings["Create a New Account"] = "Neues Konto erstellen";
-$a->strings["Nickname or Email address: "] = "Spitzname oder Email-Adresse: ";
+$a->strings["Nickname or Email address: "] = "Spitzname oder E-Mail-Adresse: ";
 $a->strings["Password: "] = "Passwort: ";
 $a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an: ";
 $a->strings["Forgot your password?"] = "Passwort vergessen?";
@@ -1744,4 +1930,4 @@ $a->strings["Events this week:"] = "Veranstaltungen diese Woche";
 $a->strings["Status Messages and Posts"] = "Statusnachrichten und Beiträge";
 $a->strings["Profile Details"] = "Profildetails";
 $a->strings["Events and Calendar"] = "Ereignisse und Kalender";
-$a->strings["Only You Can See This"] = "Nur Du Kannst Das Sehen";
+$a->strings["Only You Can See This"] = "Nur du kannst das sehen";

view/display-head.tpl

@@ -0,0 +1,8 @@
+<script>
+$(document).ready(function() {
+	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+	// make auto-complete work in more places
+	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+});
+</script>
+

view/events_reminder.tpl

@@ -3,8 +3,8 @@
 <div id="event-wrapper" style="display: none;" ><div id="event-title">$event_title</div>
 <div id="event-title-end"></div>
 {{ for $events as $event }}
-<div class="event-list" id="event-$event.id"></a> <a href="events/$event.link">$event.title</a> $event.date </div>
+<div class="event-list" id="event-$event.id"> <a href="events/$event.link">$event.title</a> $event.date </div>
 {{ endfor }}
-</div></div>
+</div>
 {{ endif }}
 

view/head.tpl

@@ -39,7 +39,9 @@
 			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 			$("#mod-cmnt-wrap-" + id).show();
 			openMenu("comment-edit-submit-wrapper-" + id);
+			return true;
 		}
+		return false;
 	}
 	function commentClose(obj,id) {
 		if(obj.value == '') {
@@ -48,7 +50,9 @@
 			$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
 			$("#mod-cmnt-wrap-" + id).hide();
 			closeMenu("comment-edit-submit-wrapper-" + id);
+			return true;
 		}
+		return false;
 	}
 
 
@@ -96,6 +100,15 @@
 		}
 	}
 
+	function showHideCommentBox(id) {
+		if( $('#comment-edit-form-' + id).is(':visible')) {
+			$('#comment-edit-form-' + id).hide();
+		}
+		else {
+			$('#comment-edit-form-' + id).show();
+		}
+	}
+
 
 </script>
 

view/invite.tpl

@@ -23,4 +23,5 @@ $msg_text
 <input type="submit" name="submit" value="$submit" />
 </div>
 
+</div>
 </form>

view/message-head.tpl

@@ -0,0 +1,17 @@
+<script src="$baseurl/library/jquery_ac/friendica.complete.js" ></script>
+
+<script>$(document).ready(function() { 
+	var a; 
+	a = $("#recip").autocomplete({ 
+		serviceUrl: '$base/acl',
+		minChars: 2,
+		width: 350,
+		onSelect: function(value,data) {
+			$("#recip-complete").val(data);
+		}			
+	});
+
+}); 
+
+</script>
+

view/mood_content.tpl

@@ -0,0 +1,20 @@
+<h3>$title</h3>
+
+<div id="mood-desc">$desc</div>
+
+<form action="mood" method="get">
+<br />
+<br />
+
+<input id="mood-parent" type="hidden" value="$parent" name="parent" />
+
+<select name="verb" id="mood-verb-select" >
+{{ for $verbs as $v }}
+<option value="$v.0">$v.1</option>
+{{ endfor }}
+</select>
+<br />
+<br />
+<input type="submit" name="submit" value="$submit" />
+</form>
+

view/photo_edit_head.tpl

@@ -0,0 +1,11 @@
+
+<script>
+
+	$(document).keydown(function(event) {
+
+		if("$prevlink" != '') { if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = "$prevlink"; }}
+		if("$nextlink" != '') { if(event.ctrlKey && event.keyCode == 39) { event.preventDefault(); window.location.href = "$nextlink"; }}
+
+	});
+
+</script>

view/photos_head.tpl

@@ -0,0 +1,26 @@
+
+<script>
+
+	var ispublic = "$ispublic";
+
+
+	$(document).ready(function() {
+
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+

view/photos_upload.tpl

@@ -12,7 +12,9 @@
 	<div id="photos-upload-new-end"></div>
 	<div id="photos-upload-exist-wrapper">
 		<div id="photos-upload-existing-album-text">$existalbumtext</div>
+		<select id="photos-upload-album-select" name="album" size="4">
 		$albumselect
+		</select>
 	</div>
 	<div id="photos-upload-exist-end"></div>
 
@@ -26,6 +28,7 @@
 		<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
 		<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
 		</a>
+	</div>
 	<div id="photos-upload-perms-end"></div>
 
 	<div style="display: none;">

view/poke_content.tpl

@@ -8,9 +8,9 @@
 
 <div id="poke-recip-label">$clabel</div>
 <br />
-<input id="recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off">
+<input id="poke-recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off" />
-<input id="recip-complete" type="hidden" value="$id" name="cid">
+<input id="poke-recip-complete" type="hidden" value="$id" name="cid" />
-
+<input id="poke-parent" type="hidden" value="$parent" name="parent" />
 <br />
 <br />
 <div id="poke-action-label">$choice</div>
@@ -24,7 +24,7 @@
 <br />
 <br />
 <div id="poke-private-desc">$prv_desc</div>
-<input type="checkbox" name="private" value="1" />
+<input type="checkbox" name="private" {{ if $parent }}disabled="disabled"{{ endif }} value="1" />
 <br />
 <br />
 <input type="submit" name="submit" value="$submit" />

view/profed_head.tpl

@@ -1,3 +1,5 @@
+<script type="text/javascript" src="js/country.js" ></script>
+
 <script language="javascript" type="text/javascript"
           src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
           <script language="javascript" type="text/javascript">

view/search_item.tpl

@@ -23,7 +23,7 @@
 		</div>
 		<div class="wall-item-author">
 				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
-				<div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
+				<div class="wall-item-ago"  id="wall-item-ago-$item.id" title="$item.localtime">$item.ago</div>
 				
 		</div>			
 		<div class="wall-item-content" id="wall-item-content-$item.id" >

view/settings-head.tpl

@@ -0,0 +1,25 @@
+
+<script>
+	var ispublic = "$ispublic";
+
+
+	$(document).ready(function() {
+
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#jot-perms-icon').removeClass('unlock').addClass('lock');
+				$('#jot-public').hide();
+			});
+			if(selstr == null) { 
+				$('#jot-perms-icon').removeClass('lock').addClass('unlock');
+				$('#jot-public').show();
+			}
+
+		}).trigger('change');
+
+	});
+
+</script>
+

view/theme/darkzero-NS/style.css

@@ -49,7 +49,7 @@ background: #444;
 	color: #99CCFF;
 }
 
-.wall-item-photo-menu li a {
+.wall-item-photo-menu li a, .contact-photo-menu {
 	color: #CCCCCC; background-color: #333333;
 }
 

view/theme/darkzero/style.css

@@ -28,7 +28,8 @@ background: #444;
 
 }
 .wall-item-tools {	background-color: #444444;   background-image: none;}
-.comment-wwedit-wrapper{ background-color: #333333; }
+.comment-wwedit-wrapper{ background-color: #444444; }
+.toplevel_item > .wall-item-comment-wrapper > .comment-wwedit-wrapper{ background-color: #333333; }
 .comment-edit-preview{ color: #000000; }
 .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
 .photo-top-album-name{ background-color: #333333; }
@@ -49,7 +50,7 @@ background: #444;
 	color: #99CCFF;
 }
 
-.wall-item-photo-menu li a {
+.wall-item-photo-menu li a, .contact-photo-menu {
 	color: #CCCCCC; background-color: #333333;
 }
 

view/theme/diabook/admin_site.tpl

@@ -39,6 +39,7 @@
 	{{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

view/theme/diabook/style-profile.css

@@ -2550,3 +2550,8 @@ list-style-type: disc;
         float: left;
         width: 175px;
 }
+
+.item-image-preview {
+  float: left;
+  margin-right: 10px;
+}

view/theme/diabook/wall_thread.tpl

@@ -0,0 +1,125 @@
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+	</div>
+	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
+{{endif}}
+<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
+			<span class="wall-item-ago">-
+			{{ if $item.plink }}<a class="link$item.sparkle" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-actions-social">
+			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}	
+
+
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
+			{{ endif }}	
+			
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+			{{ endif }}				
+			
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			<div class="wall-item-location">$item.location&nbsp;</div>
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+{{ if $item.threaded }}
+{{ if $item.comment }}
+<div class="wall-item-comment-wrapper $item.indent" >
+	$item.comment
+</div>
+{{ endif }}
+{{ endif }}
+
+{{ if $item.flatten }}
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
+{{ endif }}
+
+
+{{ for $item.children as $item }}
+	{{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{endif}}

view/theme/diabook/wallwall_thread.tpl

@@ -0,0 +1,125 @@
+{{if $item.comment_firstcollapsed}}
+	<div class="hide-comments-outer">
+	<span id="hide-comments-total-$item.id" class="hide-comments-total">$item.num_comments</span> <span id="hide-comments-$item.id" class="hide-comments fakelink" onclick="showHideComments($item.id);">$item.hide_text</span>
+	</div>
+	<div id="collapsed-comments-$item.id" class="collapsed-comments" style="display: none;">
+{{endif}}
+<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
+{{ if $item.indent }}{{ else }}
+<div class="wall-item-decor">
+	<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+{{ endif }}
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
+				onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
+					<img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+				</a>
+				<a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+				<ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+				$item.item_photo_menu
+				</ul>
+				
+			</div>
+		</div>
+			<div class="wall-item-actions-author">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
+			<span class="wall-item-ago">-
+			{{ if $item.plink }}<a class="link$item.sparkle" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
+			{{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
+			</span>
+			</div>
+		<div class="wall-item-content">
+			{{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+			$item.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+			{{ for $item.tags as $tag }}
+				<span class='tag'>$tag</span>
+			{{ endfor }}
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+
+		</div>
+		<div class="wall-item-actions">
+
+			<div class="wall-item-actions-social">
+			
+			
+			{{ if $item.vote }}
+				<a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+				<a href="#" id="dislike-$item.id" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+			{{ endif }}
+						
+			{{ if $item.vote.share }}
+				<a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>
+			{{ endif }}	
+
+
+			{{ if $item.star }}
+				<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle">
+				<img src="images/star_dummy.png" class="icon star" alt="$item.star.do" /> </a>
+				<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>					  
+			{{ endif }}	
+			
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a>
+			{{ endif }}				
+			
+			{{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+			
+					
+					
+			</div>
+			
+			<div class="wall-item-actions-tools">
+
+				{{ if $item.drop.dropping }}
+					<input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+					<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drop" title="$item.drop.delete">$item.drop.delete</a>
+				{{ endif }}
+				{{ if $item.edpost }}
+					<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+				{{ endif }}
+			</div>
+			<div class="wall-item-location">$item.location&nbsp;</div>
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links"></div>
+		<div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+		<div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>	
+	</div>
+</div>
+
+{{ if $item.threaded }}
+{{ if $item.comment }}
+<div class="wall-item-comment-wrapper $item.indent" >
+	$item.comment
+</div>
+{{ endif }}
+{{ endif }}
+
+{{ if $item.flatten }}
+<div class="wall-item-comment-wrapper" >
+	$item.comment
+</div>
+{{ endif }}
+
+
+{{ for $item.children as $item }}
+	{{ inc $item.template }}{{ endinc }}
+{{ endfor }}
+
+</div>
+{{if $item.comment_lastcollapsed}}</div>{{endif}}

view/theme/dispy/dark/icons.svg

@@ -43,6 +43,58 @@
        is_visible="true"
        teeth="10"
        phi="10" />
+    <inkscape:path-effect
+       effect="gears"
+       id="path-effect4050-9"
+       is_visible="true"
+       teeth="10"
+       phi="10" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4064-8">
+      <feBlend
+         inkscape:collect="always"
+         mode="lighten"
+         in2="BackgroundImage"
+         id="feBlend4066-4" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4064-7">
+      <feBlend
+         inkscape:collect="always"
+         mode="lighten"
+         in2="BackgroundImage"
+         id="feBlend4066-9" />
+    </filter>
+    <inkscape:path-effect
+       effect="gears"
+       id="path-effect4050-9-1"
+       is_visible="true"
+       teeth="10"
+       phi="10" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4064-8-9">
+      <feBlend
+         inkscape:collect="always"
+         mode="lighten"
+         in2="BackgroundImage"
+         id="feBlend4066-4-4" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4064-7-3">
+      <feBlend
+         inkscape:collect="always"
+         mode="lighten"
+         in2="BackgroundImage"
+         id="feBlend4066-9-2" />
+    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -51,26 +103,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.9403009"
+     inkscape:zoom="2.7164213"
-     inkscape:cx="127.81563"
+     inkscape:cx="79.895323"
-     inkscape:cy="128.63003"
+     inkscape:cy="76.322411"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:snap-global="false"
-     inkscape:window-width="1065"
+     inkscape:window-width="1148"
-     inkscape:window-height="742"
+     inkscape:window-height="452"
-     inkscape:window-x="40"
+     inkscape:window-x="0"
-     inkscape:window-y="50"
+     inkscape:window-y="24"
      inkscape:window-maximized="0"
      width="0px"
      height="0px"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
-     fit-margin-bottom="0">
+     fit-margin-bottom="0"
+     inkscape:showpageshadow="false"
+     showborder="true">
     <inkscape:grid
        type="xygrid"
        id="grid4016"
@@ -107,7 +161,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -117,7 +171,7 @@
      id="layer1"
      transform="translate(0,-852.36218)">
     <rect
-       transform="matrix(1,0,0,0.84848485,44,217.14578)"
+       transform="matrix(2.5239206,0,0,0.84848485,21.386213,217.14578)"
        inkscape:export-ydpi="90"
        inkscape:export-xdpi="90"
        inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons.png"
@@ -2109,5 +2163,61 @@
          d="m -0.00914477,2.3011918 2.83893857,-2.12898488 11.8211932,0 0,14.04031008 L 13.73679,14.984131 13.640962,1.0093271 3.4856425,0.91349949 1.1272469,2.7572384 12,2.7572384 12,16 -0.00914477,16 z M 8.2958276,12.045759 c -1.8631354,-1.086398 0.045759,-2.6807932 0.045759,-3.6707932 0,-0.99 -0.6423808,-2.2112618 -2.2457592,-2.1833105 C 4.4924492,6.2196066 3.8500685,7.0875 3.8500685,8.4166667 c 0,1.3291666 2.1768916,1.6857063 -0.1958961,3.6876733 z"
          style="fill:#1a1a1a" />
     </g>
+    <g
+       id="g4021">
+      <rect
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect196-0"
+         style="fill:#1a1a1a;stroke:#d3d7cf;stroke-width:2.0535686;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064-7)"
+         transform="matrix(0.43114968,0,0,0.43114968,-113.62924,933.71148)" />
+      <path
+         transform="matrix(0.26322611,0,0,0.26322611,-27.639493,937.40175)"
+         inkscape:original-d="M 484.55417,49.762303 492.5,40.933609 504.27158,48.879434"
+         inkscape:path-effect="#path-effect4050-9"
+         inkscape:connector-curvature="0"
+         id="path4072-5"
+         d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
+         style="fill:none;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter4064-8)" />
+      <path
+         style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
+         id="path4208-6"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.55525134,-9.5997878e-4,-9.5997878e-4,0.55525134,88.473928,863.40819)"
+         sodipodi:nodetypes="cccccccccccccccccc" />
+    </g>
+    <g
+       id="g4016">
+      <rect
+         ry="6"
+         rx="6"
+         y="18.790752"
+         x="470.35715"
+         height="44.285713"
+         width="44.285713"
+         id="rect196-0-0"
+         style="fill:#2e2f2e;stroke:#d3d7cf;stroke-width:2.05356860000000019;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4064-7-3);fill-opacity:1"
+         transform="matrix(0.43114968,0,0,0.43114968,-91.3641,933.9484)" />
+      <path
+         transform="matrix(0.26322611,0,0,0.26322611,-5.37436,937.63865)"
+         inkscape:original-d="M 484.55417,49.762303 492.5,40.933609 504.27158,48.879434"
+         inkscape:path-effect="#path-effect4050-9-1"
+         inkscape:connector-curvature="0"
+         id="path4072-5-1"
+         d="m 484.90604,52.679071 c 0,0 -0.72327,1.028211 -2.88202,1.697409 -0.63474,-0.494653 -1.23439,-1.034334 -1.79294,-1.613646 0.43889,-2.217071 1.3855,-3.044283 1.3855,-3.044283 l 2.04237,-1.648571 c -0.73879,-0.915258 -1.3342,-1.946011 -1.75793,-3.043257 l -2.44847,0.945549 c 0,0 -1.18951,0.40671 -3.32932,-0.320779 -0.22277,-0.773276 -0.39067,-1.56235 -0.50204,-2.359331 1.65823,-1.535673 2.91028,-1.648499 2.91028,-1.648499 l 2.62132,-0.133248 c -0.0597,-1.174706 0.0645,-2.358577 0.36658,-3.495332 l -2.53663,-0.674208 c 0,0 -1.20139,-0.37014 -2.50493,-2.216441 0.2743,-0.756533 0.60227,-1.4936 0.98062,-2.20383 2.24419,-0.267701 3.32343,0.376954 3.32343,0.376954 l 2.19901,1.432971 c 0.64217,-0.985455 1.43848,-1.870246 2.35108,-2.612309 l -1.65589,-2.03644 c 0,0 -0.75438,-1.005609 -0.72373,-3.265497 0.66659,-0.45082 1.36515,-0.854347 2.08871,-1.206542 1.97294,1.102524 2.46715,2.258424 2.46715,2.258424 l 0.93675,2.451844 c 1.09876,-0.419794 2.26306,-0.667544 3.43754,-0.731472 l -0.14265,-2.620822 c 0,0 -0.0192,-1.25697 1.3339,-3.067245 0.80426,0.02709 1.6066,0.111239 2.39899,0.251604 0.94809,2.051624 0.66849,3.277254 0.66849,3.277254 l -0.6833,2.534196 c 1.13566,0.306213 2.22322,0.790136 3.21097,1.428761 l 1.42508,-2.204138 c 0,0 0.72327,-1.028211 2.88202,-1.697409 0.63474,0.494653 1.23439,1.034334 1.79294,1.613646 -0.43889,2.217071 -1.3855,3.044283 -1.3855,3.044283 l -2.04237,1.648571 c 0.73879,0.915258 1.3342,1.946011 1.75793,3.043257 l 2.44847,-0.945549 c 0,0 1.18951,-0.40671 3.32932,0.320779 0.22277,0.773276 0.39067,1.56235 0.50204,2.359331 -1.65823,1.535673 -2.91028,1.648499 -2.91028,1.648499 l -2.62132,0.133248 c 0.0597,1.174706 -0.0645,2.358577 -0.36658,3.495332 l 2.53663,0.674208 c 0,0 1.20139,0.37014 2.50493,2.216441 -0.2743,0.756533 -0.60227,1.4936 -0.98062,2.20383 -2.24419,0.267701 -3.32343,-0.376954 -3.32343,-0.376954 l -2.19901,-1.432971 c -0.64217,0.985455 -1.43848,1.870246 -2.35108,2.612309 l 1.65589,2.03644 c 0,0 0.75438,1.005609 0.72373,3.265497 -0.66659,0.45082 -1.36515,0.854347 -2.08871,1.206542 -1.97294,-1.102524 -2.46715,-2.258424 -2.46715,-2.258424 l -0.93675,-2.451844 c -1.09876,0.419794 -2.26306,0.667544 -3.43754,0.731472 l 0.14265,2.620822 c 0,0 0.0192,1.25697 -1.3339,3.067245 -0.80426,-0.02709 -1.6066,-0.111239 -2.39899,-0.251604 -0.94809,-2.051624 -0.66849,-3.277254 -0.66849,-3.277254 l 0.6833,-2.534196 c -1.13566,-0.306213 -2.22322,-0.790136 -3.21097,-1.428761 l -1.42508,2.204138"
+         style="fill:none;stroke:#d3d7cf;stroke-width:1.66475451;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter4064-8-9)" />
+      <path
+         style="fill:none;stroke:#f2f2f2;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         d="m 4.1190936,170.87651 1.316683,1.26576 1.7540206,0.003 5.5819788,-5.57043 3.523532,0.006 2.853557,-2.81689 0.0014,-1.68321 -1.169094,-1.16909 -2.365502,2.3822 -2.63185,-0.005 0.09078,-2.55314 2.365531,-2.36552 -1.277858,-1.27786 -1.648714,0.0359 -2.8505569,2.8535 0.00598,3.45613 -5.5530909,5.58201 z"
+         id="path4208-6-0"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.55525134,-9.5997878e-4,-9.5997878e-4,0.55525134,110.73906,863.64511)"
+         sodipodi:nodetypes="cccccccccccccccccc" />
+    </g>
   </g>
 </svg>

view/theme/dispy/dark/style.css

@@ -90,7 +90,7 @@ nav .nav-link{display:inline-block;width:22px;height:22px;overflow:hidden;margin
 #nav-home-link{background-position:-44px -132px;}#nav-home-link:hover{background-position:-66px -132px;}
 #nav-intro-link{background-position:0px -88px;}#nav-intro-link:hover{background-position:-22px -88px;}
 #nav-login-link,#nav-logout-link{background-position:0 -88px;}#nav-login-link:hover,#nav-logout-link:hover{background-position:-22px -88px;}
-#nav-manage-link{background-position:0px -22px;}#nav-manage-link:hover{background-position:-22px -22px;}
+#nav-manage-link{background-position:-88px -88px;}#nav-manage-link:hover{background-position:-110px -88px;}
 #nav-messages-link{background-position:-44px -88px;}#nav-messages-link:hover{background-position:-66px -88px;}
 #nav-notify-link,#nav-notifications-linkmenu{background-position:-44px -110px;}
 #nav-notify-link:hover{background-position:-66px -110px;}

view/theme/dispy/dark/style.less

@@ -542,9 +542,9 @@ nav .nav-link {
     }
 }
 #nav-manage-link {
-    background-position: 0px -22px;
+    background-position: -88px -88px;
     &:hover {
-        background-position: -22px -22px;
+        background-position: -110px -88px;
     }
 }
 #nav-messages-link {

view/theme/dispy/head.tpl

@@ -2,27 +2,30 @@
 <meta charset="UTF-8" />
 <base href="$baseurl/" />
 <meta name="generator" content="$generator" />
-<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
-<link rel="search" href="$baseurl/opensearch"
-	type="application/opensearchdescription+xml" title="Search in Friendica" />
 <link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
+<link rel="search"
+         href="$baseurl/opensearch" 
+         type="application/opensearchdescription+xml" 
+         title="Search in Friendica" />
+
 <!--[if IE]>
 <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
 <script type="text/javascript" src="$baseurl/js/jquery.js"></script>
-<script type="text/javascript" src="$baseurl/js/acl.js"></script>
-<script type="text/javascript" src="$baseurl/js/main.js"></script>
 <script type="text/javascript" src="$baseurl/js/jquery.textinputs.js"></script>
 <script type="text/javascript" src="$baseurl/js/fk.autocomplete.js"></script>
 <script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
 <script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
 <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
 <script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script type="text/javascript" src="$baseurl/js/acl.js"></script>
 <script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js"></script>
-<!-- in dispy-dark -->
+<script type="text/javascript" src="$baseurl/js/main.js"></script>
+<!-- in dispy -->
 <script>
 	var updateInterval = $update_interval;
 	var localUser = {{ if $local_user }}$local_user{{ else }}false{{ endif }};
@@ -47,6 +50,7 @@
 		}
 	}
 
+
 	function commentInsert(obj,id) {
 		var tmpStr = $("#comment-edit-text-" + id).val();
 		if(tmpStr == '$comment') {
@@ -90,4 +94,15 @@
 			$('#hide-comments-' + id).html('$showfewer');
 		}
 	}
+
+	function showHideCommentBox(id) {
+		if( $('#comment-edit-form-' + id).is(':visible')) {
+			$('#comment-edit-form-' + id).hide();
+		}
+		else {
+			$('#comment-edit-form-' + id).show();
+		}
+	}
+
+
 </script>

view/theme/dispy/jot.tpl

@@ -1,8 +1,6 @@
 <form id="profile-jot-form" action="$action" method="post">
 	<div id="jot">
 		<div id="profile-jot-desc" class="jothidden">&#160;</div>
-		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
-		<div id="character-counter" class="grey jothidden"></div>
 
 		<input type="hidden" name="type" value="$ptyp" />
 		<input type="hidden" name="profile_uid" value="$profile_uid" />
@@ -11,11 +9,13 @@
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" /></div>
+		<div id="character-counter" class="grey jothidden"></div>
 		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body">{{ if $content }}$content{{ else }}$share{{ endif }}
 		</textarea>
 
-
+<div id="profile-jot-submit-wrapper" class="jothidden">
 <div id="jot-tools" class="jothidden" style="display:none">
 	<div id="profile-jot-submit-wrapper" class="jothidden">
 
@@ -68,6 +68,9 @@
 			$jotnets
 		</div>
 	</div>
+</div>
 
+<div id="profile-jot-end"></div>
 </form>
+</div>
 		{{ if $content }}<script>initEditor();</script>{{ endif }}