Merge remote-tracking branch 'upstream/master'

2012-11-03 22:27:34 +01:00 · 2012-11-03 22:27:34 +01:00 · 2b6498b2a2
commit 2b6498b2a2
parent 28b085569a d3290f314f
143 changed files with 7833 additions and 5088 deletions
--- a/boot.php
+++ b/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.1500' );
+define ( 'FRIENDICA_VERSION',      '3.0.1514' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );

@ -1796,3 +1796,10 @@ function curPageURL() {
 	return $pageURL;
 }

+function random_digits($digits) {
+	$rn = '';
+	for($i = 0; $i < $digits; $i++) {
+		$rn .= rand(0,9);
+	}
+	return $rn;
+}
--- a/include/auth.php
+++ b/include/auth.php
@ -168,23 +168,4 @@ else {
 	}
 }

-// Returns an array of group id's this contact is a member of.
-// This array will only contain group id's related to the uid of this
-// DFRN contact. They are *not* neccessarily unique across the entire site. 
-
-
-if(! function_exists('init_groups_visitor')) {
-function init_groups_visitor($contact_id) {
-	$groups = array();
-	$r = q("SELECT `gid` FROM `group_member` 
-		WHERE `contact-id` = %d ",
-		intval($contact_id)
-	);
-	if(count($r)) {
-		foreach($r as $rr)
-			$groups[] = $rr['gid'];
-	}
-	return $groups;
-}}
-

--- a/include/conversation.php
+++ b/include/conversation.php
@ -413,6 +413,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {

 		if(!$update) {
 			$tab = notags(trim($_GET['tab']));
+			$tab = ( $tab ? $tab : 'posts' );
 			if($tab === 'posts') {
 				// This is ugly, but we can't pass the profile_uid through the session to the ajax updater,
 				// because browser prefetching might change it on us. We have to deliver it with the page.
@ -435,7 +436,11 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	else if($mode === 'display') {
 		$profile_owner = $a->profile['uid'];
 		$page_writeable = can_write_wall($a,$profile_owner);
-		$live_update_div = '<div id="live-display"></div>' . "\r\n";
+		if(!$update) {
+			$live_update_div = '<div id="live-display"></div>' . "\r\n"
+				. "<script> var profile_uid = " . $_SESSION['uid'] . ";"
+				. " var profile_page = 1; </script>";
+		}
 	}
 	else if($mode === 'community') {
 		$profile_owner = 0;
@ -895,7 +900,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$audurl' => t("Please enter an audio link/URL:"),
 		'$term' => t('Tag term:'),
 		'$fileas' => t('Save to Folder:'),
-		'$whereareu' => t('Where are you right now?')
+		'$whereareu' => t('Where are you right now?'),
+		'$delitems' => t('Delete item(s)?')
 	));


@ -992,7 +998,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$profile_uid' => $x['profile_uid'],
 		'$preview' => t('Preview'),
 		'$sourceapp' => t($a->sourcename),
-		'$cancel' => t('Cancel')
+		'$cancel' => t('Cancel'),
+		'$rand_num' => random_digits(12)
 	));


@ -1007,9 +1014,10 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {

 function get_item_children($arr, $parent) {
 	$children = array();
+	$a = get_app();
 	foreach($arr as $item) {
 		if($item['id'] != $item['parent']) {
-			if(get_config('system','thread_allow')) {
+			if(get_config('system','thread_allow') && $a->theme_thread_allow) {
 				// Fallback to parent-uri if thr-parent is not set
 				$thr_parent = $item['thr-parent'];
 				if($thr_parent == '')
--- a/include/items.php
+++ b/include/items.php
@ -76,6 +76,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 			killme();

 		$contact = $r[0];
+		require_once('include/security.php');
 		$groups = init_groups_visitor($contact['id']);

 		if(count($groups)) {
@ -3906,10 +3907,10 @@ function drop_item($id,$interactive = true) {

 		// send the notification upstream/downstream as the case may be

+		proc_run('php',"include/notifier.php","drop","$drop_id");
+
 		if(! $interactive)
 			return $owner;
-
-		proc_run('php',"include/notifier.php","drop","$drop_id");
 		goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
 		//NOTREACHED
 	}
--- a/include/onepoll.php
+++ b/include/onepoll.php
@ -292,7 +292,12 @@ function onepoll_run($argv, $argc){
 				logger("Mail: Parsing ".count($msgs)." mails for ".$mailconf[0]['user'], LOGGER_DEBUG);

 				$metas = email_msg_meta($mbox,implode(',',$msgs));
+				if(count($metas) != count($msgs)) {
+					logger("onepoll: for " . $mailconf[0]['user'] . " there are ". count($msgs) . " messages but received " . count($metas) . " metas", LOGGER_DEBUG);
+					break;
+				}
 				$msgs = array_combine($msgs, $metas);
+
 				foreach($msgs as $msg_uid => $meta) {
 					logger("Mail: Parsing mail ".$msg_uid, LOGGER_DATA);

@ -309,7 +314,7 @@ function onepoll_run($argv, $argc){
 					);

 					if(count($r)) {
-						logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user']);
+						logger("Mail: Seen before ".$msg_uid." for ".$mailconf[0]['user'],LOGGER_DEBUG);
 						if($meta->deleted && ! $r[0]['deleted']) {
 							q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `id` = %d LIMIT 1",
 								dbesc(datetime_convert()),
--- a/include/redir.php
+++ b/include/redir.php
@ -7,20 +7,37 @@ function auto_redir(&$a, $contact_nick) {

 	if(local_user()) {

-		$r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 ) AND nick = '%s' AND network = '%s' and self = 0 LIMIT 1",
+		// We need to find out if $contact_nick is a user on this hub, and if so, if I
+		// am a contact of that user. However, that user may have other contacts with the
+		// same nickname as me on other hubs or other networks. Exclude these by requiring
+		// that the contact have a local URL. I will be the only person with my nickname at
+		// this URL, so if a result is found, then I am a contact of the $contact_nick user.
+		//
+		// We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
+
+		$baseurl = $a->get_baseurl();
+		$domain_st = strpos($baseurl, "://");
+		if($domain_st === false)
+			return;
+		$baseurl = substr($baseurl, $domain_st + 3);
+
+		$r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 )
+		        AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' AND blocked = 0 AND pending = 0 LIMIT 1",
 			   dbesc($contact_nick),
 			   dbesc($a->user['nickname']),
-			   dbesc(NETWORK_DFRN)
+		       dbesc($baseurl)
 		);

 		if((!$r) || (! count($r)) || $r[0]['id'] == remote_user())
 			return;


-		$r = q("SELECT * FROM contact WHERE nick = '%s' AND network = '%s' AND uid = %d LIMIT 1",
+		$r = q("SELECT * FROM contact WHERE nick = '%s'
+		        AND network = '%s' AND uid = %d  AND url LIKE '%%%s%%' LIMIT 1",
 		       dbesc($contact_nick),
 		       dbesc(NETWORK_DFRN),
-		       intval(local_user())
+		       intval(local_user()),
+		       dbesc($baseurl)
 		);

 		if(! ($r && count($r)))
@ -52,7 +69,7 @@ function auto_redir(&$a, $contact_nick) {

 		$url = curPageURL();

-		logger('check_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
+		logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
 		$dest = (($url) ? '&destination_url=' . $url : '');
 		goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
 			. '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest );
--- a/include/security.php
+++ b/include/security.php
@ -371,3 +371,23 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f
 		killme();
 	}
 }
+
+// Returns an array of group id's this contact is a member of.
+// This array will only contain group id's related to the uid of this
+// DFRN contact. They are *not* neccessarily unique across the entire site. 
+
+
+if(! function_exists('init_groups_visitor')) {
+function init_groups_visitor($contact_id) {
+	$groups = array();
+	$r = q("SELECT `gid` FROM `group_member` 
+		WHERE `contact-id` = %d ",
+		intval($contact_id)
+	);
+	if(count($r)) {
+		foreach($r as $rr)
+			$groups[] = $rr['gid'];
+	}
+	return $groups;
+}}
+
--- a/js/country.js
+++ b/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|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|Pplsnet|Recolutionari.es|SilverLips|Sparkling Network|SPRACI|Styliztique|Sysfu Social Club|Trevena|theshi.re|Tumpambae|Uzmiac|Other";
+aStates[253]="|Self Hosted|Private Server|Architects Of Sleep|Chaos Friends|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|Pplsnet|Recolutionari.es|SPRACI|Styliztique|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other";
 /* 
 * gArCountryInfo
 * (0) Country name
--- a/js/main.js
+++ b/js/main.js
@ -250,12 +250,13 @@
 					if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
 					if($('#live-community').length) { src = 'community'; liveUpdate(); }
 					if($('#live-notes').length)     { src = 'notes'; liveUpdate(); }
-					if($('#live-display').length) {
+					if($('#live-display').length)     { src = 'display'; liveUpdate(); }
+/*					if($('#live-display').length) {
 						if(liking) {
 							liking = 0;
 							window.location.href=window.location.href 
 						}
-					}
+					}*/
 					if($('#live-photos').length) { 
 						if(liking) {
 							liking = 0;
@ -313,10 +314,26 @@
 					$('#' + prev).after($(this));
 				}
 				else {
+					// Find out if the hidden comments are open, so we can keep it that way
+					// if a new comment has been posted
+					var id = $('.hide-comments-total', this).attr('id');
+					if(typeof id != 'undefined') {
+						id = id.split('-')[3];
+						var commentsOpen = $("#collapsed-comments-" + id).is(":visible");
+					}
+
 					$('img',this).each(function() {
 						$(this).attr('src',$(this).attr('dst'));
 					});
+					//vScroll = $(document).scrollTop();
+					$('html').height($('html').height());
 					$('#' + ident).replaceWith($(this));
+
+					if(typeof id != 'undefined') {
+						if(commentsOpen) showHideComments(id);
+					}
+					$('html').height('auto');
+					//$(document).scrollTop(vScroll);
 				}
 				prev = ident;
 			});
@ -503,6 +520,19 @@



+	function showHideComments(id) {
+		if( $("#collapsed-comments-" + id).is(":visible")) {
+			$("#collapsed-comments-" + id).hide();
+			$("#hide-comments-" + id).html(window.showMore);
+		}
+		else {
+			$("#collapsed-comments-" + id).show();
+			$("#hide-comments-" + id).html(window.showFewer);
+		}
+	}
+
+
+
 	function preview_post() {
 		$("#jot-preview").val("1");
 		$("#jot-preview-content").show();
--- a/js/main.min.js
+++ b/js/main.min.js
--- a/mod/content.php
+++ b/mod/content.php
@ -701,7 +701,8 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 							'$edvideo' => t('Video'),
 							'$preview' => t('Preview'),
 							'$sourceapp' => t($a->sourcename),
-							'$ww' => (($mode === 'network') ? $commentww : '')
+							'$ww' => (($mode === 'network') ? $commentww : ''),
+							'$rand_num' => random_digits(12)
 						));
 					}
 				}
--- a/mod/display.php
+++ b/mod/display.php
@ -1,7 +1,7 @@
 <?php


-function display_content(&$a) {
+function display_content(&$a, $update = 0) {

 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
@ -19,10 +19,20 @@ function display_content(&$a) {
 	$a->page['htmlhead'] .= get_markup_template('display-head.tpl');


-	$nick = (($a->argc > 1) ? $a->argv[1] : '');
+	if($update) {
+		$nick = $_REQUEST['nick'];
+	}
+	else {
+		$nick = (($a->argc > 1) ? $a->argv[1] : '');
+	}
 	profile_load($a,$nick);

-	$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+	if($update) {
+		$item_id = $_REQUEST['item_id'];
+	}
+	else {
+		$item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+	}

 	if(! $item_id) {
 		$a->error = 404;
@ -97,6 +107,18 @@ function display_content(&$a) {

 	$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);

+	if($update) {
+		$r = q("SELECT id FROM item WHERE item.uid = %d
+		        AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
+		        $sql_extra AND unseen = 1",
+		        intval($a->profile['uid']),
+		        dbesc($item_id),
+		        dbesc($item_id) 
+		);
+		if(!$r)
+			return '';
+	}
+
 	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
 		`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
 		`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
@ -125,7 +147,9 @@ function display_content(&$a) {

 		$items = conv_sort($r,"`commented`");

-		$o .= conversation($a,$items,'display', false);
+		if(!$update)
+			$o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
+		$o .= conversation($a,$items,'display', $update);

 	}
 	else {
--- a/mod/editpost.php
+++ b/mod/editpost.php
@ -139,7 +139,8 @@ function editpost_content(&$a) {
 		'$preview' => t('Preview'),
 		'$jotplugins' => $jotplugins,
 		'$sourceapp' => t($a->sourcename),
-		'$cancel' => t('Cancel')
+		'$cancel' => t('Cancel'),
+		'$rand_num' => random_digits(12)
 	));

 	return $o;
--- a/mod/item.php
+++ b/mod/item.php
@ -46,6 +46,19 @@ function item_post(&$a) {
 	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
 	$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);

+
+	// Check for doubly-submitted posts, and reject duplicates
+	// Note that we have to ignore previews, otherwise nothing will post
+	// after it's been previewed
+	if(!$preview && x($_REQUEST['post_id_random'])) {
+		if(x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
+			logger("item post: duplicate post", LOGGER_DEBUG);
+			item_post_return($a->get_baseurl(), $api_source, $return_path);
+		}
+		else
+			$_SESSION['post-random'] = $_REQUEST['post_id_random'];
+	}
+
 	/**
 	 * Is this a reply to something?
 	 */
@ -98,7 +111,7 @@ function item_post(&$a) {

 		// multi-level threading - preserve the info but re-parent to our single level threading
 		//if(($parid) && ($parid != $parent))
-			$thr_parent = $parent_uri;
+		$thr_parent = $parent_uri;

 		if($parent_item['contact-id'] && $uid) {
 			$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@ -873,30 +886,32 @@ function item_post(&$a) {

 	logger('post_complete');

+	item_post_return($a->get_baseurl(), $api_source, $return_path);
+	// NOTREACHED
+}
+
+function item_post_return($baseurl, $api_source, $return_path) {
 	// figure out how to return, depending on from whence we came

 	if($api_source)
 		return;

 	if($return_path) {
-		goaway($a->get_baseurl() . "/" . $return_path);
+		goaway($baseurl . "/" . $return_path);
 	}

 	$json = array('success' => 1);
 	if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
-		$json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload'];
+		$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];

 	logger('post_json: ' . print_r($json,true), LOGGER_DEBUG);

 	echo json_encode($json);
 	killme();
-	// NOTREACHED
 }



-
-
 function item_content(&$a) {

 	if((! local_user()) && (! remote_user()))
--- a/mod/network.php
+++ b/mod/network.php
@ -767,15 +767,24 @@ function network_content(&$a, $update = 0) {
 	// level which items you've seen and which you haven't. If you're looking
 	// at the top level network page just mark everything seen. 
 	
-/*	if((! $group) && (! $cid) && (! $star)) {
+
+// The $update_unseen is a bit unreliable if you have stuff coming into your stream from a new contact - 
+// and other feeds that bring in stuff from the past. One can't find it all. 
+// I'm reviving this block to mark everything seen on page 1 of the network as a temporary measure.
+// The correct solution is to implement a network notifications box just like the system notifications popup
+// with the ability in the popup to "mark all seen".
+// Several people are complaining because there are unseen messages they can't find and as time goes
+// on they just get buried deeper. It has happened to me a couple of times also.
+
+	if((! $group) && (! $cid) && (! $star)) {
 		$r = q("UPDATE `item` SET `unseen` = 0 
 			WHERE `unseen` = 1 AND `uid` = %d",
 			intval(local_user())
 		);
-	}*/
+	}

-	if($update_unseen)
-		$r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");
+//	if($update_unseen)
+//		$r = q("UPDATE `item` SET `unseen` = 0 $update_unseen");

 	// Set this so that the conversation function can find out contact info for our wall-wall items
 	$a->page_contact = $a->contact;
--- a/mod/photos.php
+++ b/mod/photos.php
@ -27,6 +27,11 @@ function photos_init(&$a) {
 		if(! count($r))
 			return;

+		$o .= '<div class="vcard">';
+		$o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
+		$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>';
+		$o .= '</div>';
+
 		$a->data['user'] = $r[0];

 		$sql_extra = permissions_sql($a->data['user']['uid']);
@ -38,11 +43,6 @@ function photos_init(&$a) {
 		if(count($albums)) {
 			$a->data['albums'] = $albums;

-			$o .= '<div class="vcard">';
-			$o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
-			$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>';
-			$o .= '</div>';
-
 			$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);	

 			if($albums_visible) {
@ -1406,7 +1406,8 @@ function photos_content(&$a) {
 							'$submit' => t('Submit'),
 							'$preview' => t('Preview'),
 							'$sourceapp' => t($a->sourcename),
-							'$ww' => ''
+							'$ww' => '',
+							'$rand_num' => random_digits(12)
 						));
 					}
 				}
@ -1449,7 +1450,8 @@ function photos_content(&$a) {
 							'$submit' => t('Submit'),
 							'$preview' => t('Preview'),
 							'$sourceapp' => t($a->sourcename),
-							'$ww' => ''
+							'$ww' => '',
+							'$rand_num' => random_digits(12)
 						));
 					}
 				}
@ -1520,7 +1522,8 @@ function photos_content(&$a) {
 								'$submit' => t('Submit'),
 								'$preview' => t('Preview'),
 								'$sourceapp' => t($a->sourcename),
-								'$ww' => ''
+								'$ww' => '',
+								'$rand_num' => random_digits(12)
 							));
 						}
 					}
--- a/mod/poco.php
+++ b/mod/poco.php
@ -56,7 +56,7 @@ function poco_init(&$a) {
 			and uid in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = 1) ");
 	}
 	else {
-		$r = q("SELECT count(*) as `total` from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0
+		$r = q("SELECT count(*) as `total` from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 and archive = 0
 			$sql_extra ",
 			intval($user['uid'])
 		);
@ -81,7 +81,7 @@ function poco_init(&$a) {
 	}
 	else {

-		$r = q("SELECT * from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0
+		$r = q("SELECT * from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 and archive = 0
 			$sql_extra LIMIT %d, %d",
 			intval($user['uid']),
 			intval($startIndex),
--- a/mod/update_display.php
+++ b/mod/update_display.php
@ -0,0 +1,38 @@
+<?php
+
+// See update_profile.php for documentation
+
+require_once('mod/display.php');
+require_once('include/group.php');
+
+function update_display_content(&$a) {
+
+	$profile_uid = intval($_GET['p']);
+
+	header("Content-type: text/html");
+	echo "<!DOCTYPE html><html><body>\r\n";
+	echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
+
+
+	$text = display_content($a,$profile_uid);
+	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
+	$replace = "<img\${1} dst=\"\${2}\"";
+	$text = preg_replace($pattern, $replace, $text);
+
+	$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
+	$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
+	$text = preg_replace($pattern, $replace, $text);
+	$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
+	$text = preg_replace($pattern, $replace, $text);
+	$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
+	$text = preg_replace($pattern, $replace, $text);
+	$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
+	$text = preg_replace($pattern, $replace, $text);
+
+
+	echo str_replace("\t",'       ',$text);
+	echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
+	echo "</body></html>\r\n";
+	killme();
+
+}
--- a/mod/update_network.php
+++ b/mod/update_network.php
@ -14,23 +14,23 @@ function update_network_content(&$a) {
 	echo (($_GET['msie'] == 1) ? '<div>' : '<section>');


-        $text = network_content($a,$profile_uid);
-        $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
-        $replace = "<img\${1} dst=\"\${2}\"";
-        $text = preg_replace($pattern, $replace, $text);
+	$text = network_content($a,$profile_uid);
+	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
+	$replace = "<img\${1} dst=\"\${2}\"";
+	$text = preg_replace($pattern, $replace, $text);

-		$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
-        $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
-        $text = preg_replace($pattern, $replace, $text);
-        $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
-        $text = preg_replace($pattern, $replace, $text);
-        $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
-        $text = preg_replace($pattern, $replace, $text);
-        $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
-        $text = preg_replace($pattern, $replace, $text);
+	$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
+	$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
+	$text = preg_replace($pattern, $replace, $text);
+	$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
+	$text = preg_replace($pattern, $replace, $text);
+	$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
+	$text = preg_replace($pattern, $replace, $text);
+	$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
+	$text = preg_replace($pattern, $replace, $text);


-        echo str_replace("\t",'       ',$text);
+	echo str_replace("\t",'       ',$text);
 	echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
 	echo "</body></html>\r\n";
 	killme();
--- a/object/Item.php
+++ b/object/Item.php
@ -519,7 +519,8 @@ class Item extends BaseObject {
 	 *      _ false on failure
 	 */
 	private function get_comment_box($indent) {
-		if(!$this->is_toplevel() && !get_config('system','thread_allow')) {
+		$a = $this->get_app();
+		if(!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) {
 			return '';
 		}
 		
@ -531,7 +532,6 @@ class Item extends BaseObject {
 			$ww = 'ww';

 		if($conv->is_writable() && $this->is_writable()) {
-			$a = $this->get_app();
 			$qc = $qcomment =  null;

 			/*
@ -545,7 +545,8 @@ class Item extends BaseObject {
 			$comment_box = replace_macros($template,array(
 				'$return_path' => '',
 				'$threaded' => $this->is_threaded(),
-				'$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
+//				'$jsreload' => (($conv->get_mode() === 'display') ? $_SESSION['return_url'] : ''),
+				'$jsreload' => '',
 				'$type' => (($conv->get_mode() === 'profile') ? 'wall-comment' : 'net-comment'),
 				'$id' => $this->get_id(),
 				'$parent' => $this->get_id(),
@ -567,7 +568,8 @@ class Item extends BaseObject {
 				'$preview' => t('Preview'),
 				'$indent' => $indent,
 				'$sourceapp' => t($a->sourcename),
-				'$ww' => (($conv->get_mode() === 'network') ? $ww : '')
+				'$ww' => (($conv->get_mode() === 'network') ? $ww : ''),
+				'$rand_num' => random_digits(12)
 			));
 		}

--- a/util/messages.po
+++ b/util/messages.po
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1500\n"
+"Project-Id-Version: 3.0.1514\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-18 10:00-0700\n"
+"POT-Creation-Date: 2012-11-01 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -58,7 +58,7 @@ msgstr ""
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
 #: ../../addon/fbpost/fbpost.php:165
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3914
 #: ../../index.php:319 ../../addon.old/facebook/facebook.php:510
 #: ../../addon.old/facebook/facebook.php:516
 #: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
@ -178,7 +178,7 @@ msgstr ""
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/theme.php:599
 #: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
 #: ../../object/Item.php:558 ../../addon.old/fromgplus/fromgplus.php:40
@ -281,11 +281,11 @@ msgstr ""
 msgid "Edit event"
 msgstr ""

-#: ../../mod/events.php:323 ../../include/text.php:1187
+#: ../../mod/events.php:323 ../../include/text.php:1185
 msgid "link to source"
 msgstr ""

-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
+#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:90
 #: ../../include/nav.php:52 ../../boot.php:1701
 msgid "Events"
 msgstr ""
@ -359,7 +359,7 @@ msgstr ""
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:995
+#: ../../include/conversation.php:996
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
@ -437,7 +437,7 @@ msgstr ""
 #: ../../mod/photos.php:1095 ../../mod/photos.php:1110
 #: ../../mod/photos.php:1562 ../../mod/photos.php:1574
 #: ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:492
+#: ../../view/theme/diabook/theme.php:485
 #: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr ""
@ -460,7 +460,7 @@ msgstr ""
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
+#: ../../view/theme/diabook/theme.php:486 ../../include/user.php:324
 #: ../../include/user.php:331 ../../include/user.php:338
 #: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
@ -484,7 +484,7 @@ msgstr ""

 #: ../../mod/photos.php:606 ../../mod/like.php:145 ../../mod/subthread.php:87
 #: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1439
+#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1437
 #: ../../include/diaspora.php:1835 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 #: ../../addon.old/communityhome/communityhome.php:163
@ -645,15 +645,15 @@ msgstr ""
 msgid "I don't like this (toggle)"
 msgstr ""

-#: ../../mod/photos.php:1386 ../../include/conversation.php:956
+#: ../../mod/photos.php:1386 ../../include/conversation.php:957
 msgid "Share"
 msgstr ""

 #: ../../mod/photos.php:1387 ../../mod/editpost.php:118
 #: ../../mod/content.php:482 ../../mod/content.php:845
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:619
-#: ../../include/conversation.php:975 ../../object/Item.php:258
+#: ../../mod/message.php:481 ../../include/conversation.php:620
+#: ../../include/conversation.php:976 ../../object/Item.php:258
 msgid "Please wait"
 msgstr ""

@ -671,7 +671,7 @@ msgstr ""

 #: ../../mod/photos.php:1407 ../../mod/photos.php:1450
 #: ../../mod/photos.php:1521 ../../mod/editpost.php:139
-#: ../../mod/content.php:702 ../../include/conversation.php:993
+#: ../../mod/content.php:702 ../../include/conversation.php:994
 #: ../../object/Item.php:567
 msgid "Preview"
 msgstr ""
@ -679,7 +679,7 @@ msgstr ""
 #: ../../mod/photos.php:1489 ../../mod/content.php:439
 #: ../../mod/content.php:723 ../../mod/settings.php:606
 #: ../../mod/group.php:168 ../../mod/admin.php:696
-#: ../../include/conversation.php:564 ../../object/Item.php:117
+#: ../../include/conversation.php:565 ../../object/Item.php:117
 msgid "Delete"
 msgstr ""

@ -695,7 +695,7 @@ msgstr ""
 msgid "Not available."
 msgstr ""

-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:92
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
@ -745,7 +745,7 @@ msgstr ""
 msgid "Edit post"
 msgstr ""

-#: ../../mod/editpost.php:88 ../../include/conversation.php:942
+#: ../../mod/editpost.php:88 ../../include/conversation.php:943
 msgid "Post to Email"
 msgstr ""

@ -756,85 +756,85 @@ msgstr ""

 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:957
+#: ../../include/conversation.php:958
 msgid "Upload photo"
 msgstr ""

-#: ../../mod/editpost.php:105 ../../include/conversation.php:958
+#: ../../mod/editpost.php:105 ../../include/conversation.php:959
 msgid "upload photo"
 msgstr ""

-#: ../../mod/editpost.php:106 ../../include/conversation.php:959
+#: ../../mod/editpost.php:106 ../../include/conversation.php:960
 msgid "Attach file"
 msgstr ""

-#: ../../mod/editpost.php:107 ../../include/conversation.php:960
+#: ../../mod/editpost.php:107 ../../include/conversation.php:961
 msgid "attach file"
 msgstr ""

 #: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:961
+#: ../../include/conversation.php:962
 msgid "Insert web link"
 msgstr ""

-#: ../../mod/editpost.php:109 ../../include/conversation.php:962
+#: ../../mod/editpost.php:109 ../../include/conversation.php:963
 msgid "web link"
 msgstr ""

-#: ../../mod/editpost.php:110 ../../include/conversation.php:963
+#: ../../mod/editpost.php:110 ../../include/conversation.php:964
 msgid "Insert video link"
 msgstr ""

-#: ../../mod/editpost.php:111 ../../include/conversation.php:964
+#: ../../mod/editpost.php:111 ../../include/conversation.php:965
 msgid "video link"
 msgstr ""

-#: ../../mod/editpost.php:112 ../../include/conversation.php:965
+#: ../../mod/editpost.php:112 ../../include/conversation.php:966
 msgid "Insert audio link"
 msgstr ""

-#: ../../mod/editpost.php:113 ../../include/conversation.php:966
+#: ../../mod/editpost.php:113 ../../include/conversation.php:967
 msgid "audio link"
 msgstr ""

-#: ../../mod/editpost.php:114 ../../include/conversation.php:967
+#: ../../mod/editpost.php:114 ../../include/conversation.php:968
 msgid "Set your location"
 msgstr ""

-#: ../../mod/editpost.php:115 ../../include/conversation.php:968
+#: ../../mod/editpost.php:115 ../../include/conversation.php:969
 msgid "set location"
 msgstr ""

-#: ../../mod/editpost.php:116 ../../include/conversation.php:969
+#: ../../mod/editpost.php:116 ../../include/conversation.php:970
 msgid "Clear browser location"
 msgstr ""

-#: ../../mod/editpost.php:117 ../../include/conversation.php:970
+#: ../../mod/editpost.php:117 ../../include/conversation.php:971
 msgid "clear location"
 msgstr ""

-#: ../../mod/editpost.php:119 ../../include/conversation.php:976
+#: ../../mod/editpost.php:119 ../../include/conversation.php:977
 msgid "Permission settings"
 msgstr ""

-#: ../../mod/editpost.php:127 ../../include/conversation.php:985
+#: ../../mod/editpost.php:127 ../../include/conversation.php:986
 msgid "CC: email addresses"
 msgstr ""

-#: ../../mod/editpost.php:128 ../../include/conversation.php:986
+#: ../../mod/editpost.php:128 ../../include/conversation.php:987
 msgid "Public post"
 msgstr ""

-#: ../../mod/editpost.php:131 ../../include/conversation.php:972
+#: ../../mod/editpost.php:131 ../../include/conversation.php:973
 msgid "Set title"
 msgstr ""

-#: ../../mod/editpost.php:133 ../../include/conversation.php:974
+#: ../../mod/editpost.php:133 ../../include/conversation.php:975
 msgid "Categories (comma-separated list)"
 msgstr ""

-#: ../../mod/editpost.php:134 ../../include/conversation.php:988
+#: ../../mod/editpost.php:134 ../../include/conversation.php:989
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""

@ -955,7 +955,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""

-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3293
 msgid "[Name Withheld]"
 msgstr ""

@ -1291,7 +1291,7 @@ msgstr ""

 #: ../../mod/localtime.php:26
 msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
 msgstr ""

@ -1377,24 +1377,24 @@ msgid "Group: "
 msgstr ""

 #: ../../mod/content.php:438 ../../mod/content.php:722
-#: ../../include/conversation.php:563 ../../object/Item.php:116
+#: ../../include/conversation.php:564 ../../object/Item.php:116
 msgid "Select"
 msgstr ""

 #: ../../mod/content.php:455 ../../mod/content.php:815
-#: ../../mod/content.php:816 ../../include/conversation.php:582
+#: ../../mod/content.php:816 ../../include/conversation.php:583
 #: ../../object/Item.php:227 ../../object/Item.php:228
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""

 #: ../../mod/content.php:465 ../../mod/content.php:827
-#: ../../include/conversation.php:602 ../../object/Item.php:240
+#: ../../include/conversation.php:603 ../../object/Item.php:240
 #, php-format
 msgid "%s from %s"
 msgstr ""

-#: ../../mod/content.php:480 ../../include/conversation.php:617
+#: ../../mod/content.php:480 ../../include/conversation.php:618
 msgid "View in context"
 msgstr ""

@ -1405,7 +1405,7 @@ msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""

-#: ../../mod/content.php:588 ../../include/text.php:1443
+#: ../../mod/content.php:588 ../../include/text.php:1441
 #: ../../object/Item.php:279 ../../object/Item.php:292
 msgid "comment"
 msgid_plural "comments"
@ -1537,7 +1537,7 @@ msgstr ""
 msgid "Personal"
 msgstr ""

-#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:86
 #: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr ""
@ -1982,7 +1982,7 @@ msgstr ""
 msgid "Edit contact"
 msgstr ""

-#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89
+#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:88
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
@ -2019,7 +2019,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:702
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3302
 #: ../../boot.php:799 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
@ -2109,9 +2109,8 @@ msgstr ""
 #: ../../mod/settings.php:69 ../../mod/newmember.php:22
 #: ../../mod/admin.php:785 ../../mod/admin.php:990
 #: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137
-#: ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:614
+#: ../../include/nav.php:137 ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
 msgstr ""
@ -2774,7 +2773,7 @@ msgstr ""

 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:893 ../../include/conversation.php:910
+#: ../../include/conversation.php:894 ../../include/conversation.php:911
 msgid "Please enter a link URL:"
 msgstr ""

@ -2855,7 +2854,7 @@ msgid ""
 msgstr ""

 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
+#: ../../view/theme/diabook/theme.php:87 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
 #: ../../boot.php:1684
 msgid "Profile"
@ -3180,8 +3179,8 @@ msgstr ""
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:459
-#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835
+#: ../../view/theme/diabook/theme.php:452
+#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1835
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../addon.old/facebook/facebook.php:1598
@ -3192,7 +3191,7 @@ msgstr ""

 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851
+#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1851
 #: ../../include/conversation.php:136
 #: ../../addon.old/facebook/facebook.php:1602
 #: ../../addon.old/communityhome/communityhome.php:172
@ -3207,7 +3206,7 @@ msgstr ""

 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
-#: ../../mod/display.php:145 ../../include/items.php:3779
+#: ../../mod/display.php:145 ../../include/items.php:3780
 msgid "Item not found."
 msgstr ""

@ -3215,7 +3214,7 @@ msgstr ""
 msgid "Access denied."
 msgstr ""

-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:89
 #: ../../include/nav.php:51 ../../boot.php:1691
 msgid "Photos"
 msgstr ""
@ -4514,8 +4513,8 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""

-#: ../../mod/filer.php:29 ../../include/conversation.php:897
-#: ../../include/conversation.php:914
+#: ../../mod/filer.php:29 ../../include/conversation.php:898
+#: ../../include/conversation.php:915
 msgid "Save to Folder:"
 msgstr ""

@ -4607,7 +4606,7 @@ msgstr ""
 msgid "diaspora2bb: "
 msgstr ""

-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
@ -4622,7 +4621,7 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""

-#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518
+#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:511
 msgid "Global Directory"
 msgstr ""

@ -5560,7 +5559,7 @@ msgid "Latest likes"
 msgstr ""

 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1437
+#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1435
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 #: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
@ -5714,7 +5713,7 @@ msgstr ""
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270
@ -5725,7 +5724,7 @@ msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308
@ -5733,35 +5732,35 @@ msgid "Monday"
 msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr ""

 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:915
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
@ -7578,137 +7577,135 @@ msgstr ""
 msgid "Color scheme"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:86 ../../include/nav.php:49
 #: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:89
+#: ../../view/theme/diabook/theme.php:88
 msgid "Your contacts"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:94
-#: ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:632
+#: ../../view/theme/diabook/theme.php:93
 #: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:384
-#: ../../view/theme/diabook/theme.php:634
+#: ../../view/theme/diabook/theme.php:377
+#: ../../view/theme/diabook/theme.php:591
 #: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:405
-#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:398
+#: ../../view/theme/diabook/theme.php:596
 #: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:434
-#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/theme.php:427
+#: ../../view/theme/diabook/theme.php:598
 #: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:479
-#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/theme.php:472
+#: ../../view/theme/diabook/theme.php:597
 #: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:516
-#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/theme.php:509
+#: ../../view/theme/diabook/theme.php:594
 #: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:517
+#: ../../view/theme/diabook/theme.php:510
 msgid "Local Directory"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:572
-#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/theme.php:531
+#: ../../view/theme/diabook/theme.php:590
 #: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:577
+#: ../../view/theme/diabook/theme.php:536
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:578
+#: ../../view/theme/diabook/theme.php:537
 #: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:579
+#: ../../view/theme/diabook/theme.php:538
 #: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""

+#: ../../view/theme/diabook/theme.php:551
 #: ../../view/theme/diabook/theme.php:592
-#: ../../view/theme/diabook/theme.php:635
 #: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:599
-#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/theme.php:558
+#: ../../view/theme/diabook/theme.php:593
 #: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:606
-#: ../../view/theme/diabook/theme.php:638
+#: ../../view/theme/diabook/theme.php:565
+#: ../../view/theme/diabook/theme.php:595
 msgid "Last Tweets"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:609
+#: ../../view/theme/diabook/theme.php:568
 #: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/theme.php:587
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
 msgid "don't show"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/theme.php:587
 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
 msgid "show"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:630
+#: ../../view/theme/diabook/theme.php:588
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""

@ -8294,79 +8291,79 @@ msgstr ""
 msgid "surprised"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "January"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "February"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "March"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "April"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "May"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "June"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "July"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "August"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "September"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "October"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "November"
 msgstr ""

-#: ../../include/text.php:921
+#: ../../include/text.php:919
 msgid "December"
 msgstr ""

-#: ../../include/text.php:1007
+#: ../../include/text.php:1005
 msgid "bytes"
 msgstr ""

-#: ../../include/text.php:1034 ../../include/text.php:1046
+#: ../../include/text.php:1032 ../../include/text.php:1044
 msgid "Click to open/close"
 msgstr ""

-#: ../../include/text.php:1219 ../../include/user.php:236
+#: ../../include/text.php:1217 ../../include/user.php:236
 msgid "default"
 msgstr ""

-#: ../../include/text.php:1231
+#: ../../include/text.php:1229
 msgid "Select an alternate language"
 msgstr ""

-#: ../../include/text.php:1441
+#: ../../include/text.php:1439
 msgid "activity"
 msgstr ""

-#: ../../include/text.php:1444
+#: ../../include/text.php:1442
 msgid "post"
 msgstr ""

-#: ../../include/text.php:1599
+#: ../../include/text.php:1597
 msgid "Item filed"
 msgstr ""

@ -8659,17 +8656,17 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""

-#: ../../include/datetime.php:472 ../../include/items.php:1688
+#: ../../include/datetime.php:472 ../../include/items.php:1689
 #, php-format
 msgid "%s's birthday"
 msgstr ""

-#: ../../include/datetime.php:473 ../../include/items.php:1689
+#: ../../include/datetime.php:473 ../../include/items.php:1690
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""

-#: ../../include/onepoll.php:409
+#: ../../include/onepoll.php:414
 msgid "From: "
 msgstr ""

@ -8938,15 +8935,15 @@ msgstr ""
 msgid "following"
 msgstr ""

-#: ../../include/items.php:3299
+#: ../../include/items.php:3300
 msgid "A new person is sharing with you at "
 msgstr ""

-#: ../../include/items.php:3299
+#: ../../include/items.php:3300
 msgid "You have a new follower at "
 msgstr ""

-#: ../../include/items.php:3980
+#: ../../include/items.php:3981
 msgid "Archives"
 msgstr ""

@ -9040,34 +9037,34 @@ msgstr ""
 msgid "stopped following"
 msgstr ""

-#: ../../include/Contact.php:220 ../../include/conversation.php:790
+#: ../../include/Contact.php:220 ../../include/conversation.php:791
 msgid "Poke"
 msgstr ""

-#: ../../include/Contact.php:221 ../../include/conversation.php:784
+#: ../../include/Contact.php:221 ../../include/conversation.php:785
 msgid "View Status"
 msgstr ""

-#: ../../include/Contact.php:222 ../../include/conversation.php:785
+#: ../../include/Contact.php:222 ../../include/conversation.php:786
 msgid "View Profile"
 msgstr ""

-#: ../../include/Contact.php:223 ../../include/conversation.php:786
+#: ../../include/Contact.php:223 ../../include/conversation.php:787
 msgid "View Photos"
 msgstr ""

 #: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:787
+#: ../../include/conversation.php:788
 msgid "Network Posts"
 msgstr ""

 #: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:788
+#: ../../include/conversation.php:789
 msgid "Edit Contact"
 msgstr ""

 #: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:789
+#: ../../include/conversation.php:790
 msgid "Send PM"
 msgstr ""

@ -9085,86 +9082,86 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""

-#: ../../include/conversation.php:594 ../../object/Item.php:218
+#: ../../include/conversation.php:595 ../../object/Item.php:218
 msgid "Categories:"
 msgstr ""

-#: ../../include/conversation.php:595 ../../object/Item.php:219
+#: ../../include/conversation.php:596 ../../object/Item.php:219
 msgid "Filed under:"
 msgstr ""

-#: ../../include/conversation.php:680
+#: ../../include/conversation.php:681
 msgid "remove"
 msgstr ""

-#: ../../include/conversation.php:684
+#: ../../include/conversation.php:685
 msgid "Delete Selected Items"
 msgstr ""

-#: ../../include/conversation.php:783
+#: ../../include/conversation.php:784
 msgid "Follow Thread"
 msgstr ""

-#: ../../include/conversation.php:852
+#: ../../include/conversation.php:853
 #, php-format
 msgid "%s likes this."
 msgstr ""

-#: ../../include/conversation.php:852
+#: ../../include/conversation.php:853
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""

-#: ../../include/conversation.php:856
+#: ../../include/conversation.php:857
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""

-#: ../../include/conversation.php:858
+#: ../../include/conversation.php:859
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""

-#: ../../include/conversation.php:864
+#: ../../include/conversation.php:865
 msgid "and"
 msgstr ""

-#: ../../include/conversation.php:867
+#: ../../include/conversation.php:868
 #, php-format
 msgid ", and %d other people"
 msgstr ""

-#: ../../include/conversation.php:868
+#: ../../include/conversation.php:869
 #, php-format
 msgid "%s like this."
 msgstr ""

-#: ../../include/conversation.php:868
+#: ../../include/conversation.php:869
 #, php-format
 msgid "%s don't like this."
 msgstr ""

-#: ../../include/conversation.php:892 ../../include/conversation.php:909
+#: ../../include/conversation.php:893 ../../include/conversation.php:910
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""

-#: ../../include/conversation.php:894 ../../include/conversation.php:911
+#: ../../include/conversation.php:895 ../../include/conversation.php:912
 msgid "Please enter a video link/URL:"
 msgstr ""

-#: ../../include/conversation.php:895 ../../include/conversation.php:912
+#: ../../include/conversation.php:896 ../../include/conversation.php:913
 msgid "Please enter an audio link/URL:"
 msgstr ""

-#: ../../include/conversation.php:896 ../../include/conversation.php:913
+#: ../../include/conversation.php:897 ../../include/conversation.php:914
 msgid "Tag term:"
 msgstr ""

-#: ../../include/conversation.php:898 ../../include/conversation.php:915
+#: ../../include/conversation.php:899 ../../include/conversation.php:916
 msgid "Where are you right now?"
 msgstr ""

-#: ../../include/conversation.php:977
+#: ../../include/conversation.php:978
 msgid "permissions"
 msgstr ""

--- a/view/comment_item.tpl
+++ b/view/comment_item.tpl
@ -10,6 +10,7 @@
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+				<input type="hidden" name="post_id_random" value="$rand_num" />

 				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
@ -256,7 +256,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Co dál<h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "Webový instalátor musí být schopen vytvořit soubor s názvem \".htconfig.php\" v hlavním adresáři Vašeho webového serveru ale nyní mu to není umožněno.";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Time Conversion"] = "Časová konverze";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přátel v neznámých časových pásem.";
+$a->strings["Friendika provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendika poskytuje tuto službu pro sdílení událostí s ostatními sítěmi a přátel v neznámých časových pásem.";
 $a->strings["UTC time: %s"] = "UTC čas: %s";
 $a->strings["Current timezone: %s"] = "Aktuální časové pásmo: %s";
 $a->strings["Converted localtime: %s"] = "Převedený lokální čas : %s";
@ -633,7 +633,7 @@ $a->strings["Upload a profile photo if you have not done so already. Studies hav
 $a->strings["Edit Your Profile"] = "Editujte Váš profil";
 $a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Upravit <strong>výchozí</strong> profil podle vašich představ. Prověřte nastavení pro skrytí Vašeho  seznamu přátel a skrytí profilu před neznámými návštěvníky.";
 $a->strings["Profile Keywords"] = "Profilová klíčová slova";
-$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Nastavte si nějaká veřejné klíčová slova pro výchozí profil, která popisují Vaše zájmy. Friendica Vám může nalézt další lidi s podobnými zájmy a navrhnout přátelství.";
+$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Nastavte si nějaká veřejné klíčová slova pro výchozí profil, která popisují Vaše zájmy. Friendika Vám může nalézt další lidi s podobnými zájmy a navrhnout přátelství.";
 $a->strings["Connecting"] = "Probíhá pokus o připojení";
 $a->strings["Facebook"] = "Facebook";
 $a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Jestliže máte účet na Facebooku, povolte konektor na Facebook a bude možné (na přání) importovat všechny Vaš přátele na Facebooku a všechny Vaše konverzace.";
@ -653,7 +653,7 @@ $a->strings["Why Aren't My Posts Public?"] = "Proč nejsou mé příspěvky veř
 $a->strings["Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above."] = "Friendica respektuje Vaše soukromí. Defaultně  jsou Vaše příspěvky viditelné pouze lidem, které označíte jako Vaše přátelé. Více informací naleznete v nápovědě na výše uvedeném odkazu";
 $a->strings["Getting Help"] = "Získání nápovědy";
 $a->strings["Go to the Help Section"] = "Navštivte sekci nápovědy";
-$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendica ale také další zdroje informací.";
+$a->strings["Our <strong>help</strong> pages may be consulted for detail on other program features and resources."] = "Na stránkách <strong>Nápověda</strong> naleznete nejen další podrobnosti o všech funkcích Friendika ale také další zdroje informací.";
 $a->strings["Item not available."] = "Položka není k dispozici.";
 $a->strings["Item was not found."] = "Položka nebyla nalezena.";
 $a->strings["Group created."] = "Skupina vytvořena.";
@ -1129,9 +1129,6 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "Nastavení automatického následování na StatusNet  aktualizováno.";
 $a->strings["StatusNet AutoFollow Settings"] = "Nastavení StatusNet automatického následování (AutoFollow)";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "Automaticky následovat jakékoliv StatusNet následníky/přispivatele";
-$a->strings["Bg settings updated."] = "Nastavení Bg aktualizováno.";
-$a->strings["Bg Settings"] = "Nastavení Bg";
-$a->strings["How many contacts to display on profile sidebar"] = "Kolik kontaktů zobrazit na profilovém bočním menu";
 $a->strings["Lifetime of the cache (in hours)"] = "Životnost vyrovnávací paměti (v hodinách)";
 $a->strings["Cache Statistics"] = "Statistika vyrovnávací paměti";
 $a->strings["Number of items"] = "Počet položek";
@ -1161,8 +1158,8 @@ $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["do something obscenely biological to"] = "udělat něco obscéně biologického uživateli";
+$a->strings["did something obscenely biological to"] = "udělal něco obscéně biologického uživateli";
 $a->strings["point out the poke feature to"] = "upozornit na poke funkci uživatele";
 $a->strings["pointed out the poke feature to"] = "upozorněn na poke funkci ";
 $a->strings["declare undying love for"] = "vyjadřit nehynoucí lásku ke";
@ -1190,7 +1187,7 @@ $a->strings["ate"] = "snězen";
 $a->strings["giggle and fawn at"] = "hihňat se";
 $a->strings["giggled and fawned at"] = "hihňá se";
 $a->strings["doubt"] = "pochybovat";
-$a->strings["doubted"] = "";
+$a->strings["doubted"] = "pochybující";
 $a->strings["glare"] = "zabodáván pohledem";
 $a->strings["glared at"] = "zabodávat pohledem ";
 $a->strings["YourLS Settings"] = "YourLS nastavení";
@ -1376,16 +1373,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Povolit dreamwidth Plugin";
 $a->strings["dreamwidth username"] = "dreamwidth uživatelské jméno";
 $a->strings["dreamwidth password"] = "dreamwidth heslo";
 $a->strings["Post to dreamwidth by default"] = "Defaultně umístit na dreamwidth";
-$a->strings["Post to Drupal"] = "Zveřejnit na Drupal";
-$a->strings["Drupal Post Settings"] = "Nastavení příspěvků Drupal";
-$a->strings["Enable Drupal Post Plugin"] = "Aktivovat Drupal Plugin";
-$a->strings["Drupal username"] = "Drupal uživatelské jméno ";
-$a->strings["Drupal password"] = "Drupal heslo";
-$a->strings["Post Type - article,page,or blog"] = "Typ příspěvku - článek, stránka nebo blog";
-$a->strings["Drupal site URL"] = "Drupal adresa webu";
-$a->strings["Drupal site uses clean URLS"] = "Drupal server používá čisté URLS";
-$a->strings["Post to Drupal by default"] = "Defaultní umístění na Drupal ";
-$a->strings["Post from Friendica"] = "Příspěvek z Friendica";
+$a->strings["Remote Permissions Settings"] = "Nastavení Vzdálených oprávnění";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Umožnit příjemcům Vašich soukromých příspěvků vidět ostatní příjemce příspěvků";
+$a->strings["Remote Permissions settings updated."] = "Nastavení Vzdálených opravnění aktualizováno.";
+$a->strings["Visible to"] = "Viditelné pro";
+$a->strings["may only be a partial list"] = "pouze pro část seznamu";
+$a->strings["Global"] = "Globální";
+$a->strings["The posts of every user on this server show the post recipients"] = "Příspěvek každého uživatele na tomto serveru zobrazuje příjemce příspěvků";
+$a->strings["Individual"] = "Individuálové";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Každý uživatel si zvolí, zda-li jeho/její příspěvek zobrazí příjemce příspěvku.";
 $a->strings["Startpage Settings"] = "Nastavení úvodní stránky";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "Domácí stránka k načtení po přihlášení  - pro profilovou zeď ponechejte prázdné";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Příklady: \"síť\" nebo \"notifikace systému\"";
@ -1402,15 +1398,13 @@ $a->strings["No files were uploaded."] = "Žádné soubory nebyly nahrány.";
 $a->strings["Uploaded file is empty"] = "Nahraný soubor je prázdný";
 $a->strings["File has an invalid extension, it should be one of "] = "Soubor má neplatnou příponu, ta by měla být jednou z";
 $a->strings["Upload was cancelled, or server error encountered"] = "Nahrávání bylo zrušeno nebo došlo k chybě na serveru";
-$a->strings["OEmbed settings updated"] = "OEmbed nastavení aktualizováno";
-$a->strings["Use OEmbed for YouTube videos"] = "Použití OEmbed pro videa na YouTube";
-$a->strings["URL to embed:"] = "URL adresa k vložení:";
 $a->strings["show/hide"] = "zobrazit/skrýt";
 $a->strings["No forum subscriptions"] = "Žádné registrace k fórům";
 $a->strings["Forumlist settings updated."] = "Nastavení Forumlist aktualizováno.";
 $a->strings["Forumlist Settings"] = "Nastavení Forumlist";
 $a->strings["Randomise forum list"] = "Zamíchat list fór";
 $a->strings["Show forums on profile page"] = "Zobrazit fóra na profilové stránce";
+$a->strings["Show forums on network page"] = "Zobrazit fóra na stránce Síť";
 $a->strings["Impressum"] = "Impressum";
 $a->strings["Site Owner"] = "Vlastník webu";
 $a->strings["Email Address"] = "E-mailová adresa";
@ -1542,6 +1536,7 @@ $a->strings["Tumblr password"] = "Tumbir heslo";
 $a->strings["Post to Tumblr by default"] = "Standardně posílat příspěvky na Tumbir";
 $a->strings["Numfriends settings updated."] = "Numfriends nastavení aktualizováno";
 $a->strings["Numfriends Settings"] = "Nastavení Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Kolik kontaktů zobrazit na profilovém bočním menu";
 $a->strings["Gnot settings updated."] = "Nastavení Gnot aktualizováno.";
 $a->strings["Gnot Settings"] = "Nastavení Gnot";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Umožnit řetězení emailových komentářových notifikací na Gmailu a anonymizací řádky předmětu.";
@ -1555,6 +1550,7 @@ $a->strings["WordPress password"] = "WordPress heslo";
 $a->strings["WordPress API URL"] = "URL adresa API WordPress";
 $a->strings["Post to WordPress by default"] = "standardně posílat příspěvky na WordPress";
 $a->strings["Provide a backlink to the Friendica post"] = "Poskytuje zpětný link na Friendica příspěvek";
+$a->strings["Post from Friendica"] = "Příspěvek z Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "Přečíst si originální příspěvek a komentáře na Friendica";
 $a->strings["\"Show more\" Settings"] = "\"Show more\" nastavení";
 $a->strings["Enable Show More"] = "Povolit Show more";
@ -1754,8 +1750,8 @@ $a->strings["%d Contact"] = array(
 	1 => "%d kontaktů",
 	2 => "%d kontaktů",
 );
-$a->strings["poke"] = "";
-$a->strings["poked"] = "";
+$a->strings["poke"] = "šťouchnout";
+$a->strings["poked"] = "šťouchnut";
 $a->strings["ping"] = "cinknout";
 $a->strings["pinged"] = "cinkut";
 $a->strings["prod"] = "pobídnout";
@ -2018,4 +2014,18 @@ $a->strings["Status Messages and Posts"] = "Statusové zprávy a příspěvky ";
 $a->strings["Profile Details"] = "Detaily profilu";
 $a->strings["Events and Calendar"] = "Události a kalendář";
 $a->strings["Only You Can See This"] = "Toto můžete vidět jen Vy";
-$a->strings["toggle mobile"] = "";
+$a->strings["toggle mobile"] = "přepnout mobil";
+$a->strings["Bg settings updated."] = "Nastavení Bg aktualizováno.";
+$a->strings["Bg Settings"] = "Nastavení Bg";
+$a->strings["Post to Drupal"] = "Zveřejnit na Drupal";
+$a->strings["Drupal Post Settings"] = "Nastavení příspěvků Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Aktivovat Drupal Plugin";
+$a->strings["Drupal username"] = "Drupal uživatelské jméno ";
+$a->strings["Drupal password"] = "Drupal heslo";
+$a->strings["Post Type - article,page,or blog"] = "Typ příspěvku - článek, stránka nebo blog";
+$a->strings["Drupal site URL"] = "Drupal adresa webu";
+$a->strings["Drupal site uses clean URLS"] = "Drupal server používá čisté URLS";
+$a->strings["Post to Drupal by default"] = "Defaultní umístění na Drupal ";
+$a->strings["OEmbed settings updated"] = "OEmbed nastavení aktualizováno";
+$a->strings["Use OEmbed for YouTube videos"] = "Použití OEmbed pro videa na YouTube";
+$a->strings["URL to embed:"] = "URL adresa k vložení:";
--- a/view/de/messages.po
+++ b/view/de/messages.po
--- a/view/de/strings.php
+++ b/view/de/strings.php
@ -255,7 +255,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Wie geht es weiter?</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten.";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Time Conversion"] = "Zeitumrechnung";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit den Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica bietet diese Funktion an, um das Teilen von Events mit Kontakten zu vereinfachen, deren Zeitzone nicht ermittelt werden kann.";
 $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";
@ -1120,9 +1120,6 @@ $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";
@ -1365,16 +1362,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Dreamwidth Post Plugin aktiviere
 $a->strings["dreamwidth username"] = "Dreamwidth Benutzername";
 $a->strings["dreamwidth password"] = "Dreamwidth Passwort";
 $a->strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen";
-$a->strings["Post to Drupal"] = "Bei Drupal veröffentlichen";
-$a->strings["Drupal Post Settings"] = "Drupal-Beitragseinstellungen";
-$a->strings["Enable Drupal Post Plugin"] = "Veröffentlichung bei Drupal erlauben";
-$a->strings["Drupal username"] = "Drupal Nutzername";
-$a->strings["Drupal password"] = "Drupal Passwort";
-$a->strings["Post Type - article,page,or blog"] = "Beitragstyp - Artikel, Seite oder Blog";
-$a->strings["Drupal site URL"] = "URL der Drupal Seite";
-$a->strings["Drupal site uses clean URLS"] = "Drupal Seite verwendet bereinigte URLs";
-$a->strings["Post to Drupal by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal";
-$a->strings["Post from Friendica"] = "Beitrag via Friendica";
+$a->strings["Remote Permissions Settings"] = "Entfernte Privatsphäreneinstellungen";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Erlaube Empfängern von privaten Nachrichten zu sehen wer die anderen Empfänger sind";
+$a->strings["Remote Permissions settings updated."] = "Entfernte Privatsphäreneinstellungen aktualisiert.";
+$a->strings["Visible to"] = "Sichtbar für";
+$a->strings["may only be a partial list"] = "könnte nur ein Teil der Liste sein";
+$a->strings["Global"] = "Global";
+$a->strings["The posts of every user on this server show the post recipients"] = "Die Beiträge jedes Nutzers dieses Servers werden die Empfänger des Beitrags anzeigen";
+$a->strings["Individual"] = "Individuell";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Jede/r Nutzer/in kann wählen ob die Empfänger der Beiträge angezeigt werden sollen oder nicht";
 $a->strings["Startpage Settings"] = "Startseiten-Einstellungen";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "Seite, die nach dem Anmelden geladen werden soll. Leer = Pinnwand";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Beispiele: network, notifications/system";
@ -1391,9 +1387,6 @@ $a->strings["No files were uploaded."] = "Keine Dateien hochgeladen.";
 $a->strings["Uploaded file is empty"] = "Hochgeladene Datei ist leer";
 $a->strings["File has an invalid extension, it should be one of "] = "Die Dateierweiterung ist nicht erlaubt, sie muss eine der folgenden sein ";
 $a->strings["Upload was cancelled, or server error encountered"] = "Upload abgebrochen oder Serverfehler aufgetreten";
-$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.";
@ -1532,6 +1525,7 @@ $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";
@ -1545,6 +1539,7 @@ $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 Link zurück zum Friendica-Beitrag hinzufügen";
+$a->strings["Post from Friendica"] = "Beitrag via Friendica";
 $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\"";
@ -2007,3 +2002,17 @@ $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["toggle mobile"] = "auf/von Mobile Ansicht wechseln";
+$a->strings["Bg settings updated."] = "Bg Einstellungen sind aktualisiert.";
+$a->strings["Bg Settings"] = "Bg Einstellungen";
+$a->strings["Post to Drupal"] = "Bei Drupal veröffentlichen";
+$a->strings["Drupal Post Settings"] = "Drupal-Beitragseinstellungen";
+$a->strings["Enable Drupal Post Plugin"] = "Veröffentlichung bei Drupal erlauben";
+$a->strings["Drupal username"] = "Drupal Nutzername";
+$a->strings["Drupal password"] = "Drupal Passwort";
+$a->strings["Post Type - article,page,or blog"] = "Beitragstyp - Artikel, Seite oder Blog";
+$a->strings["Drupal site URL"] = "URL der Drupal Seite";
+$a->strings["Drupal site uses clean URLS"] = "Drupal Seite verwendet bereinigte URLs";
+$a->strings["Post to Drupal by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal";
+$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/view/es/messages.po
+++ b/view/es/messages.po
--- a/view/es/strings.php
+++ b/view/es/strings.php
@ -135,13 +135,19 @@ $a->strings["Edit post"] = "Editar publicación";
 $a->strings["Post to Email"] = "Publicar mediante correo electrónico";
 $a->strings["Edit"] = "Editar";
 $a->strings["Upload photo"] = "Subir foto";
+$a->strings["upload photo"] = "subir imagen";
 $a->strings["Attach file"] = "Adjuntar archivo";
+$a->strings["attach file"] = "adjuntar archivo";
 $a->strings["Insert web link"] = "Insertar enlace";
-$a->strings["Insert YouTube video"] = "Insertar vídeo de YouTube";
-$a->strings["Insert Vorbis [.ogg] video"] = "Insertar vídeo Vorbis [.ogg]";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Insertar audio Vorbis [.ogg]";
+$a->strings["web link"] = "enlace web";
+$a->strings["Insert video link"] = "Insertar enlace del vídeo";
+$a->strings["video link"] = "enlace de video";
+$a->strings["Insert audio link"] = "Insertar vínculo del audio";
+$a->strings["audio link"] = "enlace de audio";
 $a->strings["Set your location"] = "Configurar tu localización";
+$a->strings["set location"] = "establecer tu ubicación";
 $a->strings["Clear browser location"] = "Borrar la localización del navegador";
+$a->strings["clear location"] = "limpiar la localización";
 $a->strings["Permission settings"] = "Configuración de permisos";
 $a->strings["CC: email addresses"] = "CC: dirección de correo electrónico";
 $a->strings["Public post"] = "Publicación pública";
@ -249,7 +255,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>¿Ahora qué?</h1>";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Tendrás que configurar [manualmente] una tarea programada para el sondeo";
 $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A";
 $a->strings["Time Conversion"] = "Conversión horária";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica ofrece este servicio para compartir eventos con otras redes y amigos en zonas horarias desconocidas.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
 $a->strings["UTC time: %s"] = "Tiempo UTC: %s";
 $a->strings["Current timezone: %s"] = "Zona horaria actual: %s";
 $a->strings["Converted localtime: %s"] = "Zona horaria local convertida: %s";
@ -437,7 +443,7 @@ $a->strings["Enter your email address and submit to have your password reset. Th
 $a->strings["Nickname or Email: "] = "Apodo o Correo electrónico: ";
 $a->strings["Reset"] = "Restablecer";
 $a->strings["Account settings"] = "Configuración de tu cuenta";
-$a->strings["Display settings"] = "Mostrar configuración";
+$a->strings["Display settings"] = "Configuración Tema/Visualización";
 $a->strings["Connector settings"] = "Configuración del conector";
 $a->strings["Plugin settings"] = "Configuración de los módulos";
 $a->strings["Connected apps"] = "Aplicaciones conectadas";
@ -493,7 +499,7 @@ $a->strings["Mark as seen"] = "Marcar como leído";
 $a->strings["Move to folder"] = "Mover a un directorio";
 $a->strings["Move to folder:"] = "Mover al directorio:";
 $a->strings["No special theme for mobile devices"] = "No hay tema especial para dispositivos móviles";
-$a->strings["Display Settings"] = "Mostrar Configuración";
+$a->strings["Display Settings"] = "Configuración Tema/Visualización";
 $a->strings["Display Theme:"] = "Utilizar tema:";
 $a->strings["Mobile Theme:"] = "Tema móvil:";
 $a->strings["Update browser every xx seconds"] = "Actualizar navegador cada xx segundos";
@ -913,6 +919,7 @@ $a->strings["Login failed."] = "Accesso fallido.";
 $a->strings["Contact added"] = "Contacto añadido";
 $a->strings["Common Friends"] = "Amigos comunes";
 $a->strings["No contacts in common."] = "Sin contactos en común.";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "";
 $a->strings["link"] = "enlace";
 $a->strings["Item has been removed."] = "El elemento ha sido eliminado.";
 $a->strings["Applications"] = "Aplicaciones";
@ -1113,9 +1120,6 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "Configuración para seguir automáticamente en StatusNet actualizada.";
 $a->strings["StatusNet AutoFollow Settings"] = "Configuración para el seguimiento automático en StatusNet";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "Seguir automáticamente a cualquiera que me siga/mencione en StatusNet";
-$a->strings["Bg settings updated."] = "Ajustes de fondo actualizados.";
-$a->strings["Bg Settings"] = "Ajustes de fondo";
-$a->strings["How many contacts to display on profile sidebar"] = "¿Cuántos contactos quieres mostrar en la barra lateral de tu perfil?";
 $a->strings["Lifetime of the cache (in hours)"] = "Vida útil de la caché (en horas)";
 $a->strings["Cache Statistics"] = "Estadísticas de la caché";
 $a->strings["Number of items"] = "Número de ítems";
@ -1358,16 +1362,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Activar el módulo de publicaci
 $a->strings["dreamwidth username"] = "Nombre de usuario de Dreamwidth";
 $a->strings["dreamwidth password"] = "Contraseña de Dreamwidth";
 $a->strings["Post to dreamwidth by default"] = "Publicar en Dreamwidth por defecto";
-$a->strings["Post to Drupal"] = "Publicar en Drupal";
-$a->strings["Drupal Post Settings"] = "Configuración de las publicaciones en Drupal";
-$a->strings["Enable Drupal Post Plugin"] = "Activar el módulo de publicación en Drupal";
-$a->strings["Drupal username"] = "Nombre de usuario de Drupal";
-$a->strings["Drupal password"] = "Contraseña de Drupal";
-$a->strings["Post Type - article,page,or blog"] = "Tipo de publicación: artículo, página o blog";
-$a->strings["Drupal site URL"] = "Dirección de Drupal";
-$a->strings["Drupal site uses clean URLS"] = "El sitio de Drupal usa direcciones URL simples";
-$a->strings["Post to Drupal by default"] = "Publicar en Drupal por defecto";
-$a->strings["Post from Friendica"] = "Publicado desde Friendica";
+$a->strings["Remote Permissions Settings"] = "";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
+$a->strings["Remote Permissions settings updated."] = "";
+$a->strings["Visible to"] = "";
+$a->strings["may only be a partial list"] = "";
+$a->strings["Global"] = "";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
+$a->strings["Individual"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
 $a->strings["Startpage Settings"] = "Configuración de página inicial";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "Página por defecto, dejálo en blanco para cargar tu perfil";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Ejemplos: &quot;red&quot; o &quot;notificaciones/sistema&quot;";
@ -1384,15 +1387,13 @@ $a->strings["No files were uploaded."] = "No se han subido archivos aún.";
 $a->strings["Uploaded file is empty"] = "El archivo subido está vacío";
 $a->strings["File has an invalid extension, it should be one of "] = "El archivo tiene una extensión no válida, debería ser una de ";
 $a->strings["Upload was cancelled, or server error encountered"] = "La subida ha sido cancelada, o se encontró un error del servidor";
-$a->strings["OEmbed settings updated"] = "Actualizar la configuración de OEmbed";
-$a->strings["Use OEmbed for YouTube videos"] = "Usar OEmbed para los vídeos de YouTube";
-$a->strings["URL to embed:"] = "Dirección del recurso:";
 $a->strings["show/hide"] = "mostrar/ocultar";
 $a->strings["No forum subscriptions"] = "Foro sin suscrpciones";
 $a->strings["Forumlist settings updated."] = "Ajustes de lista de foros actualizados.";
 $a->strings["Forumlist Settings"] = "Ajustes de lista de foros";
-$a->strings["Randomise Forumlist/Forum list"] = "Aleatorizar lista de foros";
-$a->strings["Show forumlists/forums on profile forumlist"] = "Mostrar lista de foros en perfil forumlist";
+$a->strings["Randomise forum list"] = "";
+$a->strings["Show forums on profile page"] = "";
+$a->strings["Show forums on network page"] = "";
 $a->strings["Impressum"] = "Términos y Política del sitio";
 $a->strings["Site Owner"] = "Propietario";
 $a->strings["Email Address"] = "Dirección de correo";
@ -1524,6 +1525,7 @@ $a->strings["Tumblr password"] = "Tumblr - contraseña";
 $a->strings["Post to Tumblr by default"] = "Publicar en Tumblr por defecto";
 $a->strings["Numfriends settings updated."] = "Configuración del Contador de contactos actualizada";
 $a->strings["Numfriends Settings"] = "Configuración del Contador de contactos";
+$a->strings["How many contacts to display on profile sidebar"] = "¿Cuántos contactos quieres mostrar en la barra lateral de tu perfil?";
 $a->strings["Gnot settings updated."] = "Configuración de Gnot actualizada.";
 $a->strings["Gnot Settings"] = "Configuración de Gnot";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permitir el enhebrado en las notificaciones de comentarios de correo en Gmail y hacer anónima la línea de \"Asunto\".";
@ -1537,6 +1539,7 @@ $a->strings["WordPress password"] = "WordPress - contraseña";
 $a->strings["WordPress API URL"] = "WordPress - dirección API";
 $a->strings["Post to WordPress by default"] = "Publicar a WordPress por defecto";
 $a->strings["Provide a backlink to the Friendica post"] = "Añade un enlace de vuelta a la publicación de Friendica";
+$a->strings["Post from Friendica"] = "Publicado desde Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "Leer la publicación original y los comentarios en Friendica";
 $a->strings["\"Show more\" Settings"] = "Configuración de \"Muéstrame más\"";
 $a->strings["Enable Show More"] = "Activar Muéstrame más";
@ -1628,6 +1631,8 @@ $a->strings["Last tweets"] = "Últimos tweets";
 $a->strings["Alignment"] = "Alineación";
 $a->strings["Left"] = "Izquierda";
 $a->strings["Center"] = "Centrado";
+$a->strings["Posts font size"] = "";
+$a->strings["Textareas font size"] = "";
 $a->strings["Set colour scheme"] = "Configurar esquema de color";
 $a->strings["j F, Y"] = "j F, Y";
 $a->strings["j F"] = "j F";
@ -1954,6 +1959,7 @@ $a->strings["Categories:"] = "";
 $a->strings["Filed under:"] = "";
 $a->strings["remove"] = "eliminar";
 $a->strings["Delete Selected Items"] = "Eliminar el elemento seleccionado";
+$a->strings["Follow Thread"] = "";
 $a->strings["%s likes this."] = "A %s le gusta esto.";
 $a->strings["%s doesn't like this."] = "A %s no le gusta esto.";
 $a->strings["<span  %1\$s>%2\$d people</span> like this."] = "Le gusta a <span %1\$s>%2\$d personas</span>.";
@ -1967,15 +1973,6 @@ $a->strings["Please enter a video link/URL:"] = "Por favor, introduce la URL/enl
 $a->strings["Please enter an audio link/URL:"] = "Por favor, introduce la URL/enlace del audio:";
 $a->strings["Tag term:"] = "Etiquetar:";
 $a->strings["Where are you right now?"] = "¿Dónde estás ahora?";
-$a->strings["upload photo"] = "subir imagen";
-$a->strings["attach file"] = "adjuntar archivo";
-$a->strings["web link"] = "enlace web";
-$a->strings["Insert video link"] = "Insertar enlace del vídeo";
-$a->strings["video link"] = "enlace de video";
-$a->strings["Insert audio link"] = "Insertar vínculo del audio";
-$a->strings["audio link"] = "enlace de audio";
-$a->strings["set location"] = "establecer tu ubicación";
-$a->strings["clear location"] = "limpiar la localización";
 $a->strings["permissions"] = "permisos";
 $a->strings["Click here to upgrade."] = "Pulsa aquí para actualizar.";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "Esta acción excede los límites permitidos por tu subscripción.";
@ -2004,3 +2001,18 @@ $a->strings["Status Messages and Posts"] = "Mensajes de Estado y Publicaciones";
 $a->strings["Profile Details"] = "Detalles del Perfil";
 $a->strings["Events and Calendar"] = "Eventos y Calendario";
 $a->strings["Only You Can See This"] = "Únicamente tú puedes ver esto";
+$a->strings["toggle mobile"] = "";
+$a->strings["Bg settings updated."] = "Ajustes de fondo actualizados.";
+$a->strings["Bg Settings"] = "Ajustes de fondo";
+$a->strings["Post to Drupal"] = "Publicar en Drupal";
+$a->strings["Drupal Post Settings"] = "Configuración de las publicaciones en Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Activar el módulo de publicación en Drupal";
+$a->strings["Drupal username"] = "Nombre de usuario de Drupal";
+$a->strings["Drupal password"] = "Contraseña de Drupal";
+$a->strings["Post Type - article,page,or blog"] = "Tipo de publicación: artículo, página o blog";
+$a->strings["Drupal site URL"] = "Dirección de Drupal";
+$a->strings["Drupal site uses clean URLS"] = "El sitio de Drupal usa direcciones URL simples";
+$a->strings["Post to Drupal by default"] = "Publicar en Drupal por defecto";
+$a->strings["OEmbed settings updated"] = "Actualizar la configuración de OEmbed";
+$a->strings["Use OEmbed for YouTube videos"] = "Usar OEmbed para los vídeos de YouTube";
+$a->strings["URL to embed:"] = "Dirección del recurso:";
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@ -316,7 +316,7 @@ $a->strings["Ignore"] = "Ignorer";
 $a->strings["System"] = "Système";
 $a->strings["Network"] = "Réseau";
 $a->strings["Personal"] = "Personnel";
-$a->strings["Home"] = "Accueil";
+$a->strings["Home"] = "Profil";
 $a->strings["Introductions"] = "Introductions";
 $a->strings["Messages"] = "Messages";
 $a->strings["Show Ignored Requests"] = "Voir les demandes ignorées";
@ -618,7 +618,7 @@ $a->strings["New Member Checklist"] = "Checklist du nouvel utilisateur";
 $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."] = "Nous souhaiterions vous donner quelques astuces et ressources pour rendre votre expérience la plus agréable possible. Cliquez sur n'importe lequel de ces éléments pour visiter la page correspondante. Un lien vers cette page restera visible sur votre page d'accueil pendant les deux semaines qui suivent votre inscription initiale, puis disparaîtra silencieusement.";
 $a->strings["Getting Started"] = "Bien démarrer";
 $a->strings["Friendica Walk-Through"] = "Friendica pas-à-pas";
-$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."] = "";
+$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."] = "Sur votre page d'accueil, dans <em>Conseils aux nouveaux venus</em> - vous trouverez une rapide introduction aux onglets Profil et Réseau, pourrez vous connecter à Facebook, établir de nouvelles relations, et choisir des groupes à rejoindre.";
 $a->strings["Go to Your Settings"] = "Éditer vos Réglages";
 $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."] = "Sur la page des <em>Réglages</em> -     changez votre mot de passe initial. Notez bien votre Identité. Elle ressemble à une adresse de courriel - et vous sera utile pour vous faire des amis dans le web social libre.";
 $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."] = "Vérifiez les autres réglages, tout particulièrement ceux liés à la vie privée. Un profil non listé, c'est un peu comme un numéro sur liste rouge. En général, vous devriez probablement publier votre profil - à moins que tous vos amis (potentiels) sachent déjà comment vous trouver.";
@ -629,11 +629,11 @@ $a->strings["Edit Your Profile"] = "Éditer votre Profil";
 $a->strings["Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Éditez votre profil <strong>par défaut</strong> à votre convenance. Vérifiez les réglages concernant la visibilité de votre liste d'amis par les visiteurs inconnus.";
 $a->strings["Profile Keywords"] = "Mots-clés du profil";
 $a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Choisissez quelques mots-clé publics pour votre profil par défaut. Ils pourront ainsi décrire vos centres d'intérêt, et nous pourrons vous proposer des contacts qui les partagent.";
-$a->strings["Connecting"] = "";
+$a->strings["Connecting"] = "Connexions";
 $a->strings["Facebook"] = "Facebook";
 $a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Activez et paramétrez le connecteur Facebook si vous avez un compte Facebook et nous pourrons (de manière facultative) importer tous vos amis et conversations Facebook.";
 $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>Si</em> ceci est votre propre serveur, installer le connecteur Facebook peut adoucir votre transition vers le web social libre.";
-$a->strings["Importing Emails"] = "";
+$a->strings["Importing Emails"] = "Importer courriels";
 $a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Entrez vos paramètres de courriel dans les Réglages des connecteurs si vous souhaitez importer et interagir avec des amis ou des listes venant de votre Boîte de Réception.";
 $a->strings["Go to Your Contacts Page"] = "Consulter vos Contacts";
 $a->strings["Your Contacts page is your gateway to managing friendships and connecting with friends on other networks. Typically you enter their address or site URL in the <em>Add New Contact</em> dialog."] = "Votre page Contacts est le point d'entrée vers la gestion de vos amitiés/relations et la connexion à des amis venant d'autres réseaux. Typiquement, vous pourrez y rentrer leur adresse d'Identité ou l'URL de leur site dans le formulaire <em>Ajouter un nouveau contact</em>.";
@ -1120,19 +1120,16 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "Réglages de suivi automatique sur StatusNet mis à jour.";
 $a->strings["StatusNet AutoFollow Settings"] = "Réglages de suivi automatique sur StatusNet";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "Suivre automatiquement les personnes qui vous suivent ou vous mentionnent sur Statusnet";
-$a->strings["Bg settings updated."] = "Réglages d'arrière-plan mis à jour.";
-$a->strings["Bg Settings"] = "Réglages d'arrière-plan";
-$a->strings["How many contacts to display on profile sidebar"] = "Nombre de contacts à montrer sur le panneau latéral du profil";
 $a->strings["Lifetime of the cache (in hours)"] = "Durée de vie du cache (en heures)";
 $a->strings["Cache Statistics"] = "Statistiques du cache";
 $a->strings["Number of items"] = "Nombre d'éléments";
 $a->strings["Size of the cache"] = "Taille du cache";
 $a->strings["Delete the whole cache"] = "Vider le cache";
-$a->strings["Facebook Post disabled"] = "";
-$a->strings["Facebook Post"] = "";
-$a->strings["Install Facebook Post connector for this account."] = "";
-$a->strings["Remove Facebook Post connector"] = "";
-$a->strings["Facebook Post Settings"] = "";
+$a->strings["Facebook Post disabled"] = "Publications Facebook désactivées";
+$a->strings["Facebook Post"] = "Publications Facebook";
+$a->strings["Install Facebook Post connector for this account."] = "Installer le connecteur Facebook pour ce compte.";
+$a->strings["Remove Facebook Post connector"] = "Retirer le connecteur Facebook";
+$a->strings["Facebook Post Settings"] = "Réglages Facebook";
 $a->strings["%d person likes this"] = array(
 	0 => "%d personne aime ça",
 	1 => "%d personnes aiment ça",
@ -1146,42 +1143,42 @@ $a->strings["Generate new key"] = "Générer une nouvelle clé";
 $a->strings["Widgets key"] = "Clé des widgets";
 $a->strings["Widgets available"] = "Widgets disponibles";
 $a->strings["Connect on Friendica!"] = "Se connecter sur Friendica!";
-$a->strings["bitchslap"] = "";
-$a->strings["bitchslapped"] = "";
-$a->strings["shag"] = "";
-$a->strings["shagged"] = "";
+$a->strings["bitchslap"] = "faire un coup de pute";
+$a->strings["bitchslapped"] = "a fait un coup de pute à";
+$a->strings["shag"] = "niquer";
+$a->strings["shagged"] = "a niqué";
 $a->strings["do something obscenely biological to"] = "";
 $a->strings["did something obscenely biological to"] = "";
-$a->strings["point out the poke feature to"] = "";
-$a->strings["pointed out the poke feature to"] = "";
-$a->strings["declare undying love for"] = "";
-$a->strings["declared undying love for"] = "";
-$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"] = "";
-$a->strings["doubted"] = "";
-$a->strings["glare"] = "";
-$a->strings["glared at"] = "";
+$a->strings["point out the poke feature to"] = "indiquer les sollicitations";
+$a->strings["pointed out the poke feature to"] = "a indiqué les sollicitations à";
+$a->strings["declare undying love for"] = "déclarer sa flamme";
+$a->strings["declared undying love for"] = "a déclaré sa flamme à";
+$a->strings["patent"] = "faire breveter";
+$a->strings["patented"] = "a fait breveter";
+$a->strings["stroke beard"] = "frotter sa barbe";
+$a->strings["stroked their beard at"] = "a frotté sa barbe sur";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "se lamenter sur les valeurs qui se perdent";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "s'est lamenté du lent déclin des valeurs auprès de";
+$a->strings["hug"] = "faire un calin";
+$a->strings["hugged"] = "a fait un câlin à";
+$a->strings["kiss"] = "embrasser";
+$a->strings["kissed"] = "a embrassé";
+$a->strings["raise eyebrows at"] = "hausser le sourcil";
+$a->strings["raised their eyebrows at"] = "a haussé le sourcil à ";
+$a->strings["insult"] = "insulter";
+$a->strings["insulted"] = "a insulté";
+$a->strings["praise"] = "louer";
+$a->strings["praised"] = "a loué";
+$a->strings["be dubious of"] = "trouver douteux";
+$a->strings["was dubious of"] = "a trouvé douteux ";
+$a->strings["eat"] = "manger";
+$a->strings["ate"] = "a mangé ";
+$a->strings["giggle and fawn at"] = "se payer la tête";
+$a->strings["giggled and fawned at"] = "s'est payé la tête de";
+$a->strings["doubt"] = "mettre en doute";
+$a->strings["doubted"] = "a mis en doute ";
+$a->strings["glare"] = "fixer";
+$a->strings["glared at"] = "a fixé";
 $a->strings["YourLS Settings"] = "Réglages de YourLS";
 $a->strings["URL: http://"] = "URL: http://";
 $a->strings["Username:"] = "Nom d'utilisateur";
@ -1218,7 +1215,7 @@ $a->strings["Latest photos"] = "Dernières photos";
 $a->strings["Latest likes"] = "Dernières approbations";
 $a->strings["event"] = "évènement";
 $a->strings["No access"] = "Pas d'accès";
-$a->strings["Could not open component for editing"] = "";
+$a->strings["Could not open component for editing"] = "Échec d'ouverture de l'élément pour édition";
 $a->strings["Go back to the calendar"] = "Revenir au calendrier";
 $a->strings["Event data"] = "Données de l'évènement";
 $a->strings["Calendar"] = "Calendrier";
@ -1365,16 +1362,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Activer \"Poster vers Dreamwidth
 $a->strings["dreamwidth username"] = "Nom d'utilisateur Dreamwidth";
 $a->strings["dreamwidth password"] = "Mot de passe";
 $a->strings["Post to dreamwidth by default"] = "Poster vers Dreamwidth par défaut";
-$a->strings["Post to Drupal"] = "Poster vers Drupal";
-$a->strings["Drupal Post Settings"] = "Réglages Drupal";
-$a->strings["Enable Drupal Post Plugin"] = "Activer \"Poster vers Drupal\"";
-$a->strings["Drupal username"] = "Nom d'utilisateur Drupal";
-$a->strings["Drupal password"] = "Mot de passe Drupal";
-$a->strings["Post Type - article,page,or blog"] = "Type de publication - article, page ou blog";
-$a->strings["Drupal site URL"] = "URL du site Drupal";
-$a->strings["Drupal site uses clean URLS"] = "Ce site utilise des URLs propres";
-$a->strings["Post to Drupal by default"] = "Poster vers Drupal par défaut";
-$a->strings["Post from Friendica"] = "Publier depuis Friendica";
+$a->strings["Remote Permissions Settings"] = "Permissions distantes";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Autoriser les destinataires de vos messages privés a voir les autres destinataires du message";
+$a->strings["Remote Permissions settings updated."] = "Permissions distantes mises-à-jour.";
+$a->strings["Visible to"] = "Visibilité";
+$a->strings["may only be a partial list"] = "peut être une liste partielle";
+$a->strings["Global"] = "Global";
+$a->strings["The posts of every user on this server show the post recipients"] = "Les publications de tous les utilisateurs de ce serveur afficheront leurs destinataires";
+$a->strings["Individual"] = "Individuel";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Chaque utilisateur du serveur pourra choisir si ses publications affichent leurs destinataires";
 $a->strings["Startpage Settings"] = "Paramètres de la page d'accueil";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "Page d'accueil à charger après authentification - laisser ce champ vide pour charger votre mur";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Exemples : &quot;network&quot; ou &quot;notifications/system&quot;";
@ -1391,9 +1387,6 @@ $a->strings["No files were uploaded."] = "Aucun fichier n'a été téléversé."
 $a->strings["Uploaded file is empty"] = "Le fichier téléversé est vide";
 $a->strings["File has an invalid extension, it should be one of "] = "Le fichier a une extension invalide, elle devrait être parmi ";
 $a->strings["Upload was cancelled, or server error encountered"] = "Téléversement annulé, ou erreur de serveur";
-$a->strings["OEmbed settings updated"] = "Réglage OEmbed mis-à-jour";
-$a->strings["Use OEmbed for YouTube videos"] = "Utiliser OEmbed pour les vidéos Youtube";
-$a->strings["URL to embed:"] = "URL à incorporer:";
 $a->strings["show/hide"] = "Montrer/cacher";
 $a->strings["No forum subscriptions"] = "Pas d'abonnement au forum";
 $a->strings["Forumlist settings updated."] = "Paramètres de la liste des forums mis à jour.";
@ -1438,8 +1431,8 @@ $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target
 $a->strings["Default zoom"] = "Zoom par défaut";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "Le niveau de zoom affiché par défaut. (1: monde entier, 18: détail maximum)";
 $a->strings["Editplain settings updated."] = "Réglages editplain sauvés.";
-$a->strings["Group Text"] = "";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
+$a->strings["Group Text"] = "Affichage textuel des groupes";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Utilisez un sélecteur de groupe purement textuel (sans image) dans le menu d'édition des groupes";
 $a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Libravatar n'a PAS pu être installé. <br>Il nécessite PHP >= 5.3";
 $a->strings["generic profile image"] = "image de profil générique";
 $a->strings["random geometric pattern"] = "motif géométrique aléatoire";
@ -1532,6 +1525,7 @@ $a->strings["Tumblr password"] = "Mot de passe Tumblr";
 $a->strings["Post to Tumblr by default"] = "Publier sur Tumblr par défaut";
 $a->strings["Numfriends settings updated."] = "Réglages numfriends sauvés.";
 $a->strings["Numfriends Settings"] = "Réglages de numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Nombre de contacts à montrer sur le panneau latéral du profil";
 $a->strings["Gnot settings updated."] = "Réglages Gnot sauvés.";
 $a->strings["Gnot Settings"] = "Réglages Gnot";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Autorise l'arborescence des notifications de commentaires sur GMail, et rend la ligne 'Sujet' anonyme.";
@ -1545,6 +1539,7 @@ $a->strings["WordPress password"] = "Mot de passe WordPress";
 $a->strings["WordPress API URL"] = "URL de l'API WordPress";
 $a->strings["Post to WordPress by default"] = "Publier sur WordPress par défaut";
 $a->strings["Provide a backlink to the Friendica post"] = "Fournir un rétrolien vers le message sur Friendica";
+$a->strings["Post from Friendica"] = "Publier depuis Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "Lire le message d'origine et le flux des commentaires sur Friendica";
 $a->strings["\"Show more\" Settings"] = "Réglages de \"Show more\"";
 $a->strings["Enable Show More"] = "Activer \"Show more\"";
@ -1636,7 +1631,7 @@ $a->strings["Last tweets"] = "Derniers tweets";
 $a->strings["Alignment"] = "Alignement";
 $a->strings["Left"] = "Gauche";
 $a->strings["Center"] = "Centre";
-$a->strings["Posts font size"] = "";
+$a->strings["Posts font size"] = "Taille de texte des messages";
 $a->strings["Textareas font size"] = "";
 $a->strings["Set colour scheme"] = "Choisir le schéma de couleurs";
 $a->strings["j F, Y"] = "j F, Y";
@ -1743,18 +1738,18 @@ $a->strings["%d Contact"] = array(
 	0 => "%d contact",
 	1 => "%d contacts",
 );
-$a->strings["poke"] = "titille";
+$a->strings["poke"] = "titiller";
 $a->strings["poked"] = "a titillé";
-$a->strings["ping"] = "";
-$a->strings["pinged"] = "";
-$a->strings["prod"] = "";
-$a->strings["prodded"] = "";
-$a->strings["slap"] = "";
-$a->strings["slapped"] = "";
-$a->strings["finger"] = "";
-$a->strings["fingered"] = "";
-$a->strings["rebuff"] = "";
-$a->strings["rebuffed"] = "";
+$a->strings["ping"] = "attirer l'attention";
+$a->strings["pinged"] = "a attiré l'attention de";
+$a->strings["prod"] = "aiguillonner";
+$a->strings["prodded"] = "a aiguillonné";
+$a->strings["slap"] = "gifler";
+$a->strings["slapped"] = "a giflé";
+$a->strings["finger"] = "tripoter";
+$a->strings["fingered"] = "a tripoté";
+$a->strings["rebuff"] = "rabrouer";
+$a->strings["rebuffed"] = "a rabroué";
 $a->strings["happy"] = "heureuse";
 $a->strings["sad"] = "triste";
 $a->strings["mellow"] = "suave";
@ -1897,9 +1892,9 @@ $a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s a posté sur
 $a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Notification] %s vous a repéré";
 $a->strings["%1\$s tagged you at %2\$s"] = "%1\$s vous parle sur %2\$s";
 $a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]vous a taggé[/url].";
-$a->strings["[Friendica:Notify] %1\$s poked you"] = "";
-$a->strings["%1\$s poked you at %2\$s"] = "";
-$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "";
+$a->strings["[Friendica:Notify] %1\$s poked you"] = "[Friendica:Notify] %1\$s vous a sollicité";
+$a->strings["%1\$s poked you at %2\$s"] = "%1\$s vous a sollicité via %2\$s";
+$a->strings["%1\$s [url=%2\$s]poked you[/url]."] = "%1\$s vous a [url=%2\$s]sollicité[/url].";
 $a->strings["[Friendica:Notify] %s tagged your post"] = "[Friendica:Notification] %s a repéré votre publication";
 $a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s a tagué votre contenu sur %2\$s";
 $a->strings["%1\$s tagged [url=%2\$s]your post[/url]"] = "%1\$s a tagué [url=%2\$s]votre contenu[/url]";
@ -1950,14 +1945,14 @@ $a->strings["Please upload a profile photo."] = "Merci d'illustrer votre profil
 $a->strings["Welcome back "] = "Bienvenue à nouveau, ";
 $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."] = "Le jeton de sécurité du formulaire n'est pas correct. Ceci veut probablement dire que le formulaire est resté ouvert trop longtemps (plus de 3 heures) avant d'être validé.";
 $a->strings["stopped following"] = "retiré de la liste de suivi";
-$a->strings["Poke"] = "";
+$a->strings["Poke"] = "Sollicitations (pokes)";
 $a->strings["View Status"] = "Voir les statuts";
 $a->strings["View Profile"] = "Voir le profil";
 $a->strings["View Photos"] = "Voir les photos";
 $a->strings["Network Posts"] = "Posts du Réseau";
 $a->strings["Edit Contact"] = "Éditer le contact";
 $a->strings["Send PM"] = "Message privé";
-$a->strings["%1\$s poked %2\$s"] = "";
+$a->strings["%1\$s poked %2\$s"] = "%1\$s a sollicité %2\$s";
 $a->strings["post/item"] = "publication/élément";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s a marqué le %3\$s de %2\$s comme favori";
 $a->strings["Categories:"] = "Catégories:";
@ -2006,4 +2001,18 @@ $a->strings["Status Messages and Posts"] = "Messages d'état et publications";
 $a->strings["Profile Details"] = "Détails du profil";
 $a->strings["Events and Calendar"] = "Événements et agenda";
 $a->strings["Only You Can See This"] = "Vous seul pouvez voir ça";
-$a->strings["toggle mobile"] = "";
+$a->strings["toggle mobile"] = "activ. mobile";
+$a->strings["Bg settings updated."] = "Réglages d'arrière-plan mis à jour.";
+$a->strings["Bg Settings"] = "Réglages d'arrière-plan";
+$a->strings["Post to Drupal"] = "Poster vers Drupal";
+$a->strings["Drupal Post Settings"] = "Réglages Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Activer \"Poster vers Drupal\"";
+$a->strings["Drupal username"] = "Nom d'utilisateur Drupal";
+$a->strings["Drupal password"] = "Mot de passe Drupal";
+$a->strings["Post Type - article,page,or blog"] = "Type de publication - article, page ou blog";
+$a->strings["Drupal site URL"] = "URL du site Drupal";
+$a->strings["Drupal site uses clean URLS"] = "Ce site utilise des URLs propres";
+$a->strings["Post to Drupal by default"] = "Poster vers Drupal par défaut";
+$a->strings["OEmbed settings updated"] = "Réglage OEmbed mis-à-jour";
+$a->strings["Use OEmbed for YouTube videos"] = "Utiliser OEmbed pour les vidéos Youtube";
+$a->strings["URL to embed:"] = "URL à incorporer:";
--- a/view/head.tpl
+++ b/view/head.tpl
@ -89,16 +89,8 @@
 		$(obj).val('');
 	}

-	function showHideComments(id) {
-		if( $('#collapsed-comments-' + id).is(':visible')) {
-			$('#collapsed-comments-' + id).hide();
-			$('#hide-comments-' + id).html('$showmore');
-		}
-		else {
-			$('#collapsed-comments-' + id).show();
-			$('#hide-comments-' + id).html('$showfewer');
-		}
-	}
+	window.showMore = "$showmore";
+	window.showFewer = "$showfewer";

 	function showHideCommentBox(id) {
 		if( $('#comment-edit-form-' + id).is(':visible')) {
--- a/view/it/messages.po
+++ b/view/it/messages.po
--- a/view/it/strings.php
+++ b/view/it/strings.php
@ -124,7 +124,7 @@ $a->strings["Not available."] = "Non disponibile.";
 $a->strings["Community"] = "Comunità";
 $a->strings["No results."] = "Nessun risultato.";
 $a->strings["This is Friendica, version"] = "Questo è Friendica, versione";
-$a->strings["running at web location"] = "in esecuzione sull'indirizzo web";
+$a->strings["running at web location"] = "in esecuzione all'indirizzo web";
 $a->strings["Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn more about the Friendica project."] = "Visita <a href=\"http://friendica.com\">Friendica.com</a> per saperne di più sul progetto Friendica.";
 $a->strings["Bug reports and issues: please visit"] = "Segnalazioni di bug e problemi: visita";
 $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Suggerimenti, lodi, donazioni, ecc -  e-mail a  \"Info\" at Friendica punto com";
@ -135,13 +135,19 @@ $a->strings["Edit post"] = "Modifica messaggio";
 $a->strings["Post to Email"] = "Invia a email";
 $a->strings["Edit"] = "Modifica";
 $a->strings["Upload photo"] = "Carica foto";
+$a->strings["upload photo"] = "carica foto";
 $a->strings["Attach file"] = "Allega file";
+$a->strings["attach file"] = "allega file";
 $a->strings["Insert web link"] = "Inserisci link";
-$a->strings["Insert YouTube video"] = "Inserisci video da YouTube";
-$a->strings["Insert Vorbis [.ogg] video"] = "Inserisci video Vorbis [.ogg]";
-$a->strings["Insert Vorbis [.ogg] audio"] = "Inserisci audio Vorbis [.ogg]";
+$a->strings["web link"] = "link web";
+$a->strings["Insert video link"] = "Inserire collegamento video";
+$a->strings["video link"] = "link video";
+$a->strings["Insert audio link"] = "Inserisci collegamento audio";
+$a->strings["audio link"] = "link audio";
 $a->strings["Set your location"] = "La tua posizione";
+$a->strings["set location"] = "posizione";
 $a->strings["Clear browser location"] = "Rimuovi la localizzazione data dal browser";
+$a->strings["clear location"] = "canc. pos.";
 $a->strings["Permission settings"] = "Impostazioni permessi";
 $a->strings["CC: email addresses"] = "CC: indirizzi email";
 $a->strings["Public post"] = "Messaggio pubblico";
@ -222,7 +228,7 @@ $a->strings["The command line version of PHP on your system does not have \"regi
 $a->strings["This is required for message delivery to work."] = "E' obbligatorio per far funzionare la consegna dei messaggi.";
 $a->strings["PHP register_argc_argv"] = "PHP register_argc_argv";
 $a->strings["Error: the \"openssl_pkey_new\" function on this system is not able to generate encryption keys"] = "Errore: la funzione \"openssl_pkey_new\" in questo sistema non è in grado di generare le chiavi di criptazione";
-$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Se stai eseguendo friendica su windows, guarda \"http://www.php.net/manual/en/openssl.installation.php\".";
+$a->strings["If running under Windows, please see \"http://www.php.net/manual/en/openssl.installation.php\"."] = "Se stai eseguendo friendika su windows, guarda \"http://www.php.net/manual/en/openssl.installation.php\".";
 $a->strings["Generate encryption keys"] = "Genera chiavi di criptazione";
 $a->strings["libCurl PHP module"] = "modulo PHP libCurl";
 $a->strings["GD graphics PHP module"] = "modulo PHP GD graphics";
@ -230,26 +236,26 @@ $a->strings["OpenSSL PHP module"] = "modulo PHP OpenSSL";
 $a->strings["mysqli PHP module"] = "modulo PHP mysqli";
 $a->strings["mb_string PHP module"] = "modulo PHP mb_string";
 $a->strings["Apache mod_rewrite module"] = "";
-$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Errore: il modulo mod-rewrite di Apache è richiesto ma non installato";
-$a->strings["Error: libCURL PHP module required but not installed."] = "Errore: il modulo libCURL di PHP è richiesto ma non installato.";
-$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Errore: Il modulo GD graphics di PHP con supporto a JPEG è richiesto ma non installato.";
-$a->strings["Error: openssl PHP module required but not installed."] = "Errore: il modulo openssl di PHP è richiesto ma non installato.";
-$a->strings["Error: mysqli PHP module required but not installed."] = "Errore: il modulo mysqli di PHP è richiesto ma non installato";
-$a->strings["Error: mb_string PHP module required but not installed."] = "Errore: il modulo PHP mb_string è richiesto ma non installato.";
+$a->strings["Error: Apache webserver mod-rewrite module is required but not installed."] = "Errore: E' il modulo mod-rewrite di Apache è richiesto, ma non risulta installato";
+$a->strings["Error: libCURL PHP module required but not installed."] = "Errore: il modulo libCURL di PHP è richiesto, ma non risulta installato.";
+$a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = "Errore: Il modulo GD graphics di PHP con supporto a JPEG è richiesto, ma non risulta installato.";
+$a->strings["Error: openssl PHP module required but not installed."] = "Errore: il modulo openssl di PHP è richiesto, ma non risulta installato.";
+$a->strings["Error: mysqli PHP module required but not installed."] = "Errore: il modulo mysqli di PHP è richiesto, ma non risulta installato";
+$a->strings["Error: mb_string PHP module required but not installed."] = "Errore: il modulo PHP mb_string è richiesto, ma non risulta installato.";
 $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."] = "L'installazione web deve poter creare un file chiamato \".htconfig.php\" nella cartella principale del tuo web server ma non è in grado di farlo.";
-$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."] = "Ciò è dovuto spesso a impostazioni di permessi, dato che il web server puo' scrivere il file nella tua cartella, anche se tu puoi.";
+$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."] = "Ciò è dovuto spesso a impostazioni di permessi, dato che il web server può non essere in grado di scrivere il file nella tua cartella, anche se tu puoi.";
 $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."] = "";
 $a->strings["You can alternatively skip this procedure and perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "";
 $a->strings[".htconfig.php is writable"] = ".htconfig.php è scrivibile";
 $a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = "";
 $a->strings["Url rewrite is working"] = "";
-$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Il file di configurazione del database \".htconfig.php\" non puo' essere scritto. Usa il testo qui di seguito per creare un file di configurazione nella cartella principale del tuo sito.";
+$a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = "Il file di configurazione del database \".htconfig.php\" non può essere scritto. Usa il testo qui di seguito per creare un file di configurazione nella cartella principale del tuo sito.";
 $a->strings["Errors encountered creating database tables."] = "La creazione delle tabelle del database ha generato errori.";
 $a->strings["<h1>What next</h1>"] = "";
 $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Devi impostare [manualmente] la pianificazione del poller.";
 $a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i";
 $a->strings["Time Conversion"] = "Conversione Ora";
-$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "Friendica fornisce questo servizio per la condivisione di eventi con altre reti e contatti in fusi orari sconosciuti.";
+$a->strings["Friendica provides this service for sharing events with other networks and friends in unknown timezones."] = "";
 $a->strings["UTC time: %s"] = "Ora UTC: %s";
 $a->strings["Current timezone: %s"] = "Fuso orario corrente: %s";
 $a->strings["Converted localtime: %s"] = "Ora locale convertita: %s";
@ -635,7 +641,7 @@ $a->strings["Go to Your Site's Directory"] = "";
 $a->strings["The Directory page lets you find other people in this network or other federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on their profile page. Provide your own Identity Address if requested."] = "La pagina Elenco ti permette di trovare altre persone in questa rete o in altri siti. Cerca un link <em>Connetti</em> o <em>Segui</em> nella loro pagina del profilo. Inserisci il tuo Indirizzo Identità, se richiesto.";
 $a->strings["Finding New People"] = "";
 $a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Nel pannello laterale nella pagina \"Contatti\", ci sono diversi strumenti per trovare nuovi amici. Possiamo confrontare le persone per interessi, cercare le persone per nome e fornire suggerimenti basati sui tuoi contatti esistenti. Su un sito nuovo, i suggerimenti sono di solito presenti dopo 24 ore.";
-$a->strings["Groups"] = "Grouppi";
+$a->strings["Groups"] = "Gruppi";
 $a->strings["Group Your Contacts"] = "";
 $a->strings["Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page."] = "Quando avrai alcuni amici, organizzali in gruppi di conversazioni private dalla barra laterale della tua pagina Contatti. Potrai interagire privatamente con ogni gruppo nella tua pagina Rete";
 $a->strings["Why Aren't My Posts Public?"] = "";
@ -870,7 +876,7 @@ $a->strings["Last login"] = "Ultimo accesso";
 $a->strings["Last item"] = "Ultimo elemento";
 $a->strings["Account"] = "Account";
 $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Gli utenti selezionati saranno cancellati!\\n\\nTutto quello che gli utenti hanno inviato su questo sito sarà permanentemente canellato!\\n\\nSei sicuro?";
-$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'utente {0} sarà cancellato!\\n\\nTutto quello che ha inviato su questo sito sarà permanentemente canellato!\\n\\nSei sicuro?";
+$a->strings["The user {0} will be deleted!\\n\\nEverything this user has posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "L'utente {0} sarà cancellato!\\n\\nTutto quello che ha inviato su questo sito sarà permanentemente cancellato!\\n\\nSei sicuro?";
 $a->strings["Plugin %s disabled."] = "Plugin %s disabilitato.";
 $a->strings["Plugin %s enabled."] = "Plugin %s abilitato.";
 $a->strings["Disable"] = "Disabilita";
@ -913,6 +919,7 @@ $a->strings["Login failed."] = "Accesso fallito.";
 $a->strings["Contact added"] = "";
 $a->strings["Common Friends"] = "Amici in comune";
 $a->strings["No contacts in common."] = "";
+$a->strings["%1\$s is following %2\$s's %3\$s"] = "";
 $a->strings["link"] = "";
 $a->strings["Item has been removed."] = "L'oggetto è stato rimosso.";
 $a->strings["Applications"] = "Applicazioni";
@ -1113,9 +1120,6 @@ $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Face
 $a->strings["StatusNet AutoFollow settings updated."] = "";
 $a->strings["StatusNet AutoFollow Settings"] = "";
 $a->strings["Automatically follow any StatusNet followers/mentioners"] = "";
-$a->strings["Bg settings updated."] = "";
-$a->strings["Bg Settings"] = "";
-$a->strings["How many contacts to display on profile sidebar"] = "Quanti contatti visualizzare nella barra laterale del profilo";
 $a->strings["Lifetime of the cache (in hours)"] = "";
 $a->strings["Cache Statistics"] = "";
 $a->strings["Number of items"] = "";
@ -1358,16 +1362,15 @@ $a->strings["Enable dreamwidth Post Plugin"] = "Abilita il plugin dreamwidth";
 $a->strings["dreamwidth username"] = "dreamwidth username";
 $a->strings["dreamwidth password"] = "Password dreamwidth";
 $a->strings["Post to dreamwidth by default"] = "Invia a dreamwidth per impostazione predefinita";
-$a->strings["Post to Drupal"] = "Invia a Drupal";
-$a->strings["Drupal Post Settings"] = "Impostazioni invio a Drupal";
-$a->strings["Enable Drupal Post Plugin"] = "Abilita il plugin di invio a Drupal";
-$a->strings["Drupal username"] = "Drupal username";
-$a->strings["Drupal password"] = "Drupal password";
-$a->strings["Post Type - article,page,or blog"] = "Tipo di post - article,page o blog";
-$a->strings["Drupal site URL"] = "Indirizzo del sito Drupal";
-$a->strings["Drupal site uses clean URLS"] = "Il sito Drupal usa URL puliti";
-$a->strings["Post to Drupal by default"] = "Invia a Drupal per impostazione predefinita";
-$a->strings["Post from Friendica"] = "Messaggio da Friendica";
+$a->strings["Remote Permissions Settings"] = "";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
+$a->strings["Remote Permissions settings updated."] = "";
+$a->strings["Visible to"] = "";
+$a->strings["may only be a partial list"] = "";
+$a->strings["Global"] = "";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
+$a->strings["Individual"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
 $a->strings["Startpage Settings"] = "";
 $a->strings["Home page to load after login  - leave blank for profile wall"] = "";
 $a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
@ -1384,15 +1387,13 @@ $a->strings["No files were uploaded."] = "Nessun file è stato caricato.";
 $a->strings["Uploaded file is empty"] = "Il file caricato è vuoto";
 $a->strings["File has an invalid extension, it should be one of "] = "Il file ha un'estensione non valida, dovrebbe essere una tra ";
 $a->strings["Upload was cancelled, or server error encountered"] = "Il caricamento è stato cancellato, o si è verificato un errore sul server";
-$a->strings["OEmbed settings updated"] = "Impostazioni OEmbed aggiornate";
-$a->strings["Use OEmbed for YouTube videos"] = "Usa OEmbed per i video di YouTube";
-$a->strings["URL to embed:"] = "URL da incorporare:";
 $a->strings["show/hide"] = "";
 $a->strings["No forum subscriptions"] = "";
 $a->strings["Forumlist settings updated."] = "";
 $a->strings["Forumlist Settings"] = "";
 $a->strings["Randomise forum list"] = "";
 $a->strings["Show forums on profile page"] = "";
+$a->strings["Show forums on network page"] = "";
 $a->strings["Impressum"] = "Impressum";
 $a->strings["Site Owner"] = "Proprietario del sito";
 $a->strings["Email Address"] = "Indirizzo email";
@ -1524,6 +1525,7 @@ $a->strings["Tumblr password"] = "Tumblr password";
 $a->strings["Post to Tumblr by default"] = "Pubblica su Tumblr di default";
 $a->strings["Numfriends settings updated."] = "Impostazioni \"Numfriends' aggiornate.";
 $a->strings["Numfriends Settings"] = "Impostazioni Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Quanti contatti visualizzare nella barra laterale del profilo";
 $a->strings["Gnot settings updated."] = "Impostazioni di \"Gnot\" aggiornate.";
 $a->strings["Gnot Settings"] = "Impostazioni Gnot";
 $a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permetti di raggruppare le notifiche dei commenti in thread su Gmail e anonimizza l'oggetto";
@ -1537,6 +1539,7 @@ $a->strings["WordPress password"] = "password WordPress";
 $a->strings["WordPress API URL"] = "WordPress API URL";
 $a->strings["Post to WordPress by default"] = "Pubblica su WordPress di default";
 $a->strings["Provide a backlink to the Friendica post"] = "";
+$a->strings["Post from Friendica"] = "Messaggio da Friendica";
 $a->strings["Read the original post and comment stream on Friendica"] = "";
 $a->strings["\"Show more\" Settings"] = "Impostazioni \"Mostra altro\"";
 $a->strings["Enable Show More"] = "Abilita \"Mostra altro\"";
@ -1628,6 +1631,8 @@ $a->strings["Last tweets"] = "";
 $a->strings["Alignment"] = "Allineamento";
 $a->strings["Left"] = "Sinistra";
 $a->strings["Center"] = "Centrato";
+$a->strings["Posts font size"] = "";
+$a->strings["Textareas font size"] = "";
 $a->strings["Set colour scheme"] = "";
 $a->strings["j F, Y"] = "j F Y";
 $a->strings["j F"] = "j F";
@ -1954,6 +1959,7 @@ $a->strings["Categories:"] = "";
 $a->strings["Filed under:"] = "";
 $a->strings["remove"] = "rimuovi";
 $a->strings["Delete Selected Items"] = "Cancella elementi selezionati";
+$a->strings["Follow Thread"] = "";
 $a->strings["%s likes this."] = "Piace a %s.";
 $a->strings["%s doesn't like this."] = "Non piace a %s.";
 $a->strings["<span  %1\$s>%2\$d people</span> like this."] = "Piace a <span %1\$s>%2\$d persone</span>.";
@ -1967,15 +1973,6 @@ $a->strings["Please enter a video link/URL:"] = "Inserisci un collegamento video
 $a->strings["Please enter an audio link/URL:"] = "Inserisci un collegamento audio / URL:";
 $a->strings["Tag term:"] = "Tag:";
 $a->strings["Where are you right now?"] = "Dove sei ora?";
-$a->strings["upload photo"] = "carica foto";
-$a->strings["attach file"] = "allega file";
-$a->strings["web link"] = "link web";
-$a->strings["Insert video link"] = "Inserire collegamento video";
-$a->strings["video link"] = "link video";
-$a->strings["Insert audio link"] = "Inserisci collegamento audio";
-$a->strings["audio link"] = "link audio";
-$a->strings["set location"] = "posizione";
-$a->strings["clear location"] = "canc. pos.";
 $a->strings["permissions"] = "permessi";
 $a->strings["Click here to upgrade."] = "";
 $a->strings["This action exceeds the limits set by your subscription plan."] = "";
@ -2004,3 +2001,18 @@ $a->strings["Status Messages and Posts"] = "";
 $a->strings["Profile Details"] = "";
 $a->strings["Events and Calendar"] = "";
 $a->strings["Only You Can See This"] = "";
+$a->strings["toggle mobile"] = "";
+$a->strings["Bg settings updated."] = "";
+$a->strings["Bg Settings"] = "";
+$a->strings["Post to Drupal"] = "Invia a Drupal";
+$a->strings["Drupal Post Settings"] = "Impostazioni invio a Drupal";
+$a->strings["Enable Drupal Post Plugin"] = "Abilita il plugin di invio a Drupal";
+$a->strings["Drupal username"] = "Drupal username";
+$a->strings["Drupal password"] = "Drupal password";
+$a->strings["Post Type - article,page,or blog"] = "Tipo di post - article,page o blog";
+$a->strings["Drupal site URL"] = "Indirizzo del sito Drupal";
+$a->strings["Drupal site uses clean URLS"] = "Il sito Drupal usa URL puliti";
+$a->strings["Post to Drupal by default"] = "Invia a Drupal per impostazione predefinita";
+$a->strings["OEmbed settings updated"] = "Impostazioni OEmbed aggiornate";
+$a->strings["Use OEmbed for YouTube videos"] = "Usa OEmbed per i video di YouTube";
+$a->strings["URL to embed:"] = "URL da incorporare:";
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@ -158,21 +158,26 @@ function enableOnUser(){
 	});

 	function deleteCheckedItems() {
-		var checkedstr = '';
+		if(confirm('$delitems')) {
+			var checkedstr = '';

-		$('.item-select').each( function() {
-			if($(this).is(':checked')) {
-				if(checkedstr.length != 0) {
-					checkedstr = checkedstr + ',' + $(this).val();
+			$("#item-delete-selected").hide();
+			$('#item-delete-selected-rotator').show();
+
+			$('.item-select').each( function() {
+				if($(this).is(':checked')) {
+					if(checkedstr.length != 0) {
+						checkedstr = checkedstr + ',' + $(this).val();
+					}
+					else {
+						checkedstr = $(this).val();
+					}
 				}	
-				else {
-					checkedstr = $(this).val();
-				}
-			}	
-		});
-		$.post('item', { dropitems: checkedstr }, function(data) {
-			window.location.reload();
-		});
+			});
+			$.post('item', { dropitems: checkedstr }, function(data) {
+				window.location.reload();
+			});
+		}
 	}

 	function jotGetLink() {
--- a/view/jot.tpl
+++ b/view/jot.tpl
@ -14,6 +14,7 @@
 		<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" />
+		<input type="hidden" name="post_id_random" value="$rand_num" />
 		<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="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
 		<div id="jot-text-wrap">
--- a/view/theme/comix-plain/comment_item.tpl
+++ b/view/theme/comix-plain/comment_item.tpl
@ -6,6 +6,7 @@
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+				<input type="hidden" name="post_id_random" value="$rand_num" />

 				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
--- a/view/theme/comix/comment_item.tpl
+++ b/view/theme/comix/comment_item.tpl
@ -6,6 +6,7 @@
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+				<input type="hidden" name="post_id_random" value="$rand_num" />

 				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@ -40,6 +40,9 @@ nav #banner #logo-text a { color: #ffffff; }
 	-moz-border-radius: 0px 0px 3px 3px;
 	border-radius: 0px 0px 3px 3px;	
 }
+.editicon {
+    	background-color: #333;
+}
 .comment-edit-preview{ color: #000000; }
 .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
 .photo-top-album-name{ background-color: #333333; }
@ -67,6 +70,18 @@ nav #banner #logo-text a { color: #ffffff; }
 .wall-item-photo-menu li a:hover {
 	background-color: #CCCCCC; color: #333333;
 }
+
+code {
+  background:#2e2f2e !important;
+  color:#fff !important;
+}
+
+blockquote {
+  background:#2e2f2e !important;
+  color:#eec !important;
+}
+
+
 #page-footer { min-height: 1em;}
 footer {
 	margin: 0px 10%;
@ -108,14 +123,13 @@ input#dfrn-url {
 #jot-category:focus {
 	border: 1px solid #cccccc; 
 }
-blockquote {
-	background: #ddd;
-	color: #000;
-}

 .acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net {
        color: #eec;
 }
+#fancybox-content{
+  background:#444;
+}

 input#acl-search {
        background-color: #aaa;
@ -138,45 +152,10 @@ input#acl-search {
  background:#2e2f2e;
 }

-code {
-  background:#2e2f2e !important;
-  color:#fff !important;
-}
-
-blockquote {
-  background:#2e2f2e !important;
-  color:#eec !important;
-}
-
 .group-selected, .nets-selected, .fileas-selected, .categories-selected{
  background:#2e2f2e;
 }

-#fancybox-content{
-  background:#444;
-}
-
-.editicon {
-    	background-color: #333;
-}
-
-#datebrowse-sidebar select {
-color:#99CCFF !important;
-}
-
-.settings-widget .selected {
-background: #666;
-}
-
-#adminpage table tr:hover {
-    color: #eec;
-    background-color: #666;
-}
-
-input#prvmail-subject {
-background: #222 !important;
-}
-
 /* Events */

 .fc-state-highlight {
@ -186,3 +165,25 @@ background: #666 !important;
 .fc-state-disabled, .fc-state-disabled .fc-button-inner {
 color: #000 !important;
 }
+
+/*Admin page */
+
+#adminpage table tr:hover {
+    color: #eec;
+    background-color: #666;
+}
+
+.settings-widget .selected {
+background: #666;
+}
+
+
+/* Stuff that doesn't seem to fit with anything else */
+
+#datebrowse-sidebar select {
+color:#99CCFF !important;
+}
+
+input#prvmail-subject {
+background: #222 !important;
+}
--- a/view/theme/diabook/admin_site.tpl
+++ b/view/theme/diabook/admin_site.tpl
@ -1,61 +0,0 @@
-<script>
-	$(function(){
-				var theme = $("#id_theme :selected").val();
-				$("#cnftheme").attr('href',"$baseurl/admin/themes/"+theme);
-	});
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/site" method="post">
-	    <input type='hidden' name='form_security_token' value='$form_security_token'>
-	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
-	{{ 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=$ssl_policy }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	<h3>$registration</h3>
-	{{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
-	
-	{{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-
-	<h3>$upload</h3>
-	{{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
-	
-	<h3>$corporate</h3>
-	{{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
-	{{ 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>
-	
-	<h3>$advanced</h3>
-	{{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
-	{{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
-	
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
-	
-	</form>
-</div>
--- a/view/theme/diabook/admin_users.tpl
+++ b/view/theme/diabook/admin_users.tpl
@ -1,88 +0,0 @@
-<script>
-	function confirm_delete(uname){
-		return confirm( "$confirm_delete".format(uname));
-	}
-	function confirm_delete_multi(){
-		return confirm("$confirm_delete_multi");
-	}
-	function selectall(cls){
-		$("."+cls).attr('checked','checked');
-		return false;
-	}
-</script>
-<div id='adminpage'>
-	<h1>$title - $page</h1>
-	
-	<form action="$baseurl/admin/users" method="post">
-		        <input type='hidden' name='form_security_token' value='$form_security_token'>
-		<h3>$h_pending</h3>
-		{{ if $pending }}
-			<table id='pending'>
-				<thead>
-				<tr>
-					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-			{{ for $pending as $u }}
-				<tr>
-					<td class="created">$u.created</td>
-					<td class="name">$u.name</td>
-					<td class="email">$u.email</td>
-					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
-					<td class="tools">
-						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
-						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
-					</td>
-				</tr>
-			{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
-		{{ else }}
-			<p>$no_pending</p>
-		{{ endif }}
-	
-	
-		
-	
-		<h3>$h_users</h3>
-		{{ if $users }}
-			<table id='users'>
-				<thead>
-				<tr>
-					<th></th>
-					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
-					<th></th>
-					<th></th>
-				</tr>
-				</thead>
-				<tbody>
-				{{ for $users as $u }}
-					<tr>
-						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
-						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
-						<td class='email'>$u.email</td>
-						<td class='register_date'>$u.register_date</td>
-						<td class='login_date'>$u.login_date</td>
-						<td class='lastitem_date'>$u.lastitem_date</td>
-						<td class='login_date'>$u.page-flags</td>
-						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
-						<td class="tools" style="width:60px;">
-							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
-						</td>
-					</tr>
-				{{ endfor }}
-				</tbody>
-			</table>
-			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
-			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
-		{{ else }}
-			NO USERS?!?
-		{{ endif }}
-	</form>
-</div>
--- a/view/theme/diabook/comment_item.tpl
+++ b/view/theme/diabook/comment_item.tpl
@ -6,6 +6,7 @@
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+				<input type="hidden" name="post_id_random" value="$rand_num" />

 				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
--- a/view/theme/diabook/contact_template.tpl
+++ b/view/theme/diabook/contact_template.tpl
@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
--- a/view/theme/diabook/experimental
+++ b/view/theme/diabook/experimental
--- a/view/theme/diabook/jot.tpl
+++ b/view/theme/diabook/jot.tpl
@ -13,6 +13,7 @@
 		<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" />
+		<input type="hidden" name="post_id_random" value="$rand_num" />
 		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
 		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>		
 		<div id="character-counter" class="grey"></div>		
--- a/view/theme/diabook/message_side.tpl
+++ b/view/theme/diabook/message_side.tpl
@ -1,10 +0,0 @@
-<div id="message-sidebar" class="widget">
-	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
-	
-	<ul class="message-ul">
-		{{ for $tabs as $t }}
-			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@ -37,7 +37,6 @@ load_config("diabook");
 load_pconfig(local_user(), "diabook");

 //get statuses of boxes at right-hand-column
-$close_pages      = get_diabook_config( "close_pages", 1 );
 $close_profiles   = get_diabook_config( "close_profiles", 0 );
 $close_helpers    = get_diabook_config( "close_helpers", 0 );
 $close_services   = get_diabook_config( "close_services", 0 );
@ -297,11 +296,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	<script>
 	$("right_aside").ready(function(){

-	if('.$close_pages.')
-		{
-		document.getElementById( "close_pages" ).style.display = "none";
-			};
-
 	if('.$close_mapquery.')
 		{
 		document.getElementById( "close_mapquery" ).style.display = "none";
@ -368,7 +362,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 function diabook_community_info() {
 	$a = get_app();

-	$close_pages      = get_diabook_config( "close_pages", 1 );
 	$close_profiles   = get_diabook_config( "close_profiles", 0 );
 	$close_helpers    = get_diabook_config( "close_helpers", 0 );
 	$close_services   = get_diabook_config( "close_services", 0 );
@ -530,40 +523,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$aside['$nv'] = $nv;
 	}}

-   //Community_Pages at right_aside
-   if($close_pages != "1") {
-   if(local_user()) {
-   $page = '
-			<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="closeicon" href="#boxsettings" onClick="open_boxsettings(); return false;" style="text-decoration:none;" class="icon close_box" title="'.t("Settings").'"></a></h3>
-			<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
-
-	$pagelist = array();
-
-	$contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact`
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
-			ORDER BY `name` ASC",
-			intval($a->user['uid'])
-	);
-
-	$pageD = array();
-
-	// Look if the profile is a community page
-	foreach($contacts as $contact) {
-		$pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']);
-	};
-
-
-	$contacts = $pageD;
-
-	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
-				$contact["name"]."</a></li>";
-	}
-	$page .= '</ul></div>';
-	//if (sizeof($contacts) > 0)
-		$aside['$page'] = $page;
-	}}
-  //END Community Page

   //mapquery

@ -616,7 +575,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	}
   //end twitter
   if($ccCookie != "10") {
-	$close_pages      = get_diabook_config( "close_pages", 1 );
 	$close_profiles   = get_diabook_config( "close_profiles", 0 );
 	$close_helpers    = get_diabook_config( "close_helpers", 0 );
 	$close_services   = get_diabook_config( "close_services", 0 );
@ -629,7 +587,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$close_or_not = array('1'=>t("don't show"),	'0'=>t("show"),);
 	$boxsettings['title'] = Array("", t('Show/hide boxes at right-hand column:'), "", "");
 	$aside['$boxsettings'] = $boxsettings;
-	$aside['$close_pages'] = array('diabook_close_pages', t('Community Pages'), $close_pages, '', $close_or_not);
 	$aside['$close_mapquery'] = array('diabook_close_mapquery', t('Earth Layers'), $close_mapquery, '', $close_or_not);
 	$aside['$close_profiles'] = array('diabook_close_profiles', t('Community Profiles'), $close_profiles, '', $close_or_not);
 	$aside['$close_helpers'] = array('diabook_close_helpers', t('Help or @NewHere ?'), $close_helpers, '', $close_or_not);
@ -643,7 +600,6 @@ if ($color=="dark") $color_path = "/diabook-dark/";
   $baseurl = $a->get_baseurl($ssl_state);
   $aside['$baseurl'] = $baseurl;
   if (isset($_POST['diabook-settings-box-sub']) && $_POST['diabook-settings-box-sub']!=''){
-		set_pconfig(local_user(), 'diabook', 'close_pages', $_POST['diabook_close_pages']);
 		set_pconfig(local_user(), 'diabook', 'close_mapquery', $_POST['diabook_close_mapquery']);
 		set_pconfig(local_user(), 'diabook', 'close_profiles', $_POST['diabook_close_profiles']);
 		set_pconfig(local_user(), 'diabook', 'close_helpers', $_POST['diabook_close_helpers']);
--- a/view/theme/dispy/comment_item.tpl
+++ b/view/theme/dispy/comment_item.tpl
@ -6,6 +6,7 @@
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+				<input type="hidden" name="post_id_random" value="$rand_num" />

 				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@ -191,7 +191,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #jot-title-wrapper{margin-bottom:5px;}
 #jot-title-display{font-weight:bold;}
 .jothidden{display:none;}
-#jot-preview-content{background-color:#2e3436;color:#eeeecc;border:1px solid #2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
+#jot-preview-content{background-color:#2e3436;color:#eeeecc;border:1px solid #2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;margin:5em auto 1em;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
 #sectionmain{margin:1em;font-size:0.8em;min-width:475px;width:69%;float:left;display:inline;}
 .tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
 .tab{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
@ -519,7 +519,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
 .type-text{background-position:-60px 0px;}
 .type-unkn{background-position:-80px 0;}
 .cc-license{margin-top:100px;font-size:0.7em;}
-footer{display:block;clear:both;text-align:center;}
+footer{display:block;clear:both;}
 #sectionfooter{margin:1em 0 1em 0;}
 #profile-jot-text{height:20px;color:#eeeecc;background:#2e2f2e;border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;}
 #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#2e2f2e;color:#eeeecc;}
@ -549,4 +549,5 @@ footer{display:block;clear:both;text-align:center;}
 #sidebar-page-list ul{padding:0;margin:5px 0;}
 #sidebar-page-list li{list-style:none;}
 #jappix_mini{margin-left:130px;position:fixed;bottom:0;right:175px !important;z-index:999;}
+#fancybox-content{color:#111;}
@media handheld and screen{body{font-size:15pt;}}@media only screen and (min-device-width:320px) and (max-device-width:480px){body{font-size:12pt;}}@media only screen and (min-width:321px){body{font-size:12pt;}}@media only screen and (max-width:320px){body{font-size:12pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px){body{font-size:14pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:landscape){body{font-size:14pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:portrait){body{font-size:14pt;}}@media only screen and (min-width:1024px){body{font-size:14pt;}}@media only screen and (min-width:1520px){body{font-size:16pt;}}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-device-pixel-ratio:1.5){body{font-size:14pt;}}
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@ -1258,6 +1258,7 @@ nav #nav-notifications-linkmenu {
    .rounded_corners;
    .box_shadow(5px, 0, 10px);
    padding: 3px 3px 6px 10px;
+    margin: 5em auto 1em;
    .wall-item-outside-wrapper {
        border: 0;
        .rounded_corners(0px 0px 0px 0px);
@ -3230,4 +3231,8 @@ footer {
    z-index: 999;
 }

+#fancybox-content {
+	color: #111;
+}
+
@import "../css/media";
--- a/view/theme/dispy/head.tpl
+++ b/view/theme/dispy/head.tpl
@ -84,16 +84,8 @@
 		$(obj).val('');
 	}

-	function showHideComments(id) {
-		if( $('#collapsed-comments-' + id).is(':visible')) {
-			$('#collapsed-comments-' + id).hide();
-			$('#hide-comments-' + id).html('$showmore');
-		}
-		else {
-			$('#collapsed-comments-' + id).show();
-			$('#hide-comments-' + id).html('$showfewer');
-		}
-	}
+	window.showMore = "$showmore";
+	window.showFewer = "$showfewer";

 	function showHideCommentBox(id) {
 		if( $('#comment-edit-form-' + id).is(':visible')) {
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@ -9,6 +9,7 @@
 		<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" />
+		<input type="hidden" name="post_id_random" value="$rand_num" />
 		<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>
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@ -191,7 +191,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #jot-title-wrapper{margin-bottom:5px;}
 #jot-title-display{font-weight:bold;}
 .jothidden{display:none;}
-#jot-preview-content{background-color:#f2f2c3;color:#111111;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
+#jot-preview-content{background-color:#f2f2c3;color:#111111;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;margin:5em auto 1em;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
 #sectionmain{margin:1em;font-size:0.8em;min-width:475px;width:69%;float:left;display:inline;}
 .tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
 .tab{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
@ -519,7 +519,7 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
 .type-text{background-position:-60px 0px;}
 .type-unkn{background-position:-80px 0;}
 .cc-license{margin-top:100px;font-size:0.7em;}
-footer{display:block;clear:both;text-align:center;}
+footer{display:block;clear:both;}
 #sectionfooter{margin:1em 0 1em 0;}
 #profile-jot-text{height:20px;color:#666666;background:#cccccc;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;width:99.5%;}
 #photo-edit-perms-select,#photos-upload-permissions-wrapper,#profile-jot-acl-wrapper{display:block !important;background:#eeeeec;color:#111111;}
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@ -1259,6 +1259,7 @@ nav #nav-notifications-linkmenu {
    .rounded_corners;
    .box_shadow(5px, 0, 10px);
    padding: 3px 3px 6px 10px;
+    margin: 5em auto 1em;
    .wall-item-outside-wrapper {
        border: 0;
        .rounded_corners(0px 0px 0px 0px);
--- a/view/theme/duepuntozero/comment_item.tpl
+++ b/view/theme/duepuntozero/comment_item.tpl
@ -10,6 +10,7 @@
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+				<input type="hidden" name="post_id_random" value="$rand_num" />

 				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
--- a/view/theme/facepark/comment_item.tpl
+++ b/view/theme/facepark/comment_item.tpl
@ -6,6 +6,7 @@
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+				<input type="hidden" name="post_id_random" value="$rand_num" />

 				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
--- a/view/theme/facepark/contact_template.tpl
+++ b/view/theme/facepark/contact_template.tpl
@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
--- a/view/theme/facepark/conversation.tpl
+++ b/view/theme/facepark/conversation.tpl
@ -1,29 +0,0 @@
-$live_update
-
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-	{{ for $thread.items as $item }}
-		{{if $item.comment_firstcollapsed}}
-			<div class="hide-comments-outer">
-			<span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-			</div>
-			<div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-		{{endif}}
-		{{if $item.comment_lastcollapsed}}</div>{{endif}}
-		
-		{{ inc $item.template }}{{ endinc }}
-		
-		
-	{{ endfor }}
-</div>
-{{ endfor }}
-
-<div id="conversation-end"></div>
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}
--- a/view/theme/facepark/jot.tpl
+++ b/view/theme/facepark/jot.tpl
@ -14,6 +14,7 @@
 		<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" />
+		<input type="hidden" name="post_id_random" value="$rand_num" />
 		<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="jot-text-wrap">
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
--- a/view/theme/facepark/nets.tpl
+++ b/view/theme/facepark/nets.tpl
@ -1,10 +0,0 @@
-<div id="nets-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	<a href="$base?nets=all" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
-	<ul class="nets-ul">
-	{{ for $nets as $net }}
-	<li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
-	{{ endfor }}
-	</ul>
-</div>
--- a/view/theme/facepark/saved_searches_aside.tpl
+++ b/view/theme/facepark/saved_searches_aside.tpl
@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-	<h3 id="search">$title</h3>
-	$searchbox
-	
-	<ul id="saved-search-ul">
-		{{ for $saved as $search }}
-		<li class="saved-search-li clear">
-			<a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-			<a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-		</li>
-		{{ endfor }}
-	</ul>
-	<div class="clear"></div>
-</div>
--- a/view/theme/frost-mobile/comment_item.tpl
+++ b/view/theme/frost-mobile/comment_item.tpl
@ -21,6 +21,7 @@
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+				<input type="hidden" name="post_id_random" value="$rand_num" />

 				<!--<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->
 					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
--- a/view/theme/frost-mobile/jot.tpl
+++ b/view/theme/frost-mobile/jot.tpl
@ -15,6 +15,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="source" value="$sourceapp" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
+		<input type="hidden" name="post_id_random" value="$rand_num" />
 		<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="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
 		<div id="jot-text-wrap">
--- a/view/theme/frost-mobile/js/main.js
+++ b/view/theme/frost-mobile/js/main.js
@ -243,12 +243,13 @@
 					if($j('#live-profile').length)   { src = 'profile'; liveUpdate(); }
 					if($j('#live-community').length) { src = 'community'; liveUpdate(); }
 					if($j('#live-notes').length)     { src = 'notes'; liveUpdate(); }
-					if($j('#live-display').length) {
+					if($j('#live-display').length) { src = 'display'; liveUpdate(); }
+					/*if($j('#live-display').length) {
 						if(liking) {
 							liking = 0;
 							window.location.href=window.location.href 
 						}
-					}
+					}*/
 					if($j('#live-photos').length) {
 						if(liking) {
 							liking = 0;
@ -307,10 +308,26 @@
 					$j('#' + prev).after($j(this));
 				}
 				else {
+					// Find out if the hidden comments are open, so we can keep it that way
+					// if a new comment has been posted
+					var id = $j('.hide-comments-total', this).attr('id');
+					if(typeof id != 'undefined') {
+						id = id.split('-')[3];
+						var commentsOpen = $j("#collapsed-comments-" + id).is(":visible");
+					}
+
 					$j('img',this).each(function() {
 						$j(this).attr('src',$j(this).attr('dst'));
 					});
+					//vScroll = $j(document).scrollTop();
+					$j('html').height($j('html').height());
 					$j('#' + ident).replaceWith($j(this));
+
+					if(typeof id != 'undefined') {
+						if(commentsOpen) showHideComments(id);
+					}
+					$j('html').height('auto');
+					//$j(document).scrollTop(vScroll);
 				}
 				prev = ident;
 			});
@ -517,6 +534,17 @@
 	}


+	function showHideComments(id) {
+		if( $j("#collapsed-comments-" + id).is(":visible")) {
+			$j("#collapsed-comments-" + id).hide();
+			$j("#hide-comments-" + id).html(window.showMore);
+		}
+		else {
+			$j("#collapsed-comments-" + id).show();
+			$j("#hide-comments-" + id).html(window.showFewer);
+		}
+	}
+

 	function preview_post() {
 		$j("#jot-preview").val("1");
--- a/view/theme/frost-mobile/js/main.min.js
+++ b/view/theme/frost-mobile/js/main.min.js
--- a/view/theme/frost-mobile/js/theme.js
+++ b/view/theme/frost-mobile/js/theme.js
@ -533,17 +533,6 @@ function qCommentInsert(obj,id) {
 	$j(obj).val("");
 }

-function showHideComments(id) {
-	if( $j("#collapsed-comments-" + id).is(":visible")) {
-		$j("#collapsed-comments-" + id).hide();
-		$j("#hide-comments-" + id).html(window.showMore);
-	}
-	else {
-		$j("#collapsed-comments-" + id).show();
-		$j("#hide-comments-" + id).html(window.showFewer);
-	}
-}
-
 /*function showHideCommentBox(id) {
 	if( $j('#comment-edit-form-' + id).is(':visible')) {
 		$j('#comment-edit-form-' + id).hide();
--- a/view/theme/frost-mobile/js/theme.min.js
+++ b/view/theme/frost-mobile/js/theme.min.js
--- a/view/theme/frost-mobile/oembed_video.tpl
+++ b/view/theme/frost-mobile/oembed_video.tpl
@ -1,4 +0,0 @@
-<a href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url($baseurl/images/icons/48/play.png) no-repeat center center;'></div>
-</a>
--- a/view/theme/frost/comment_item.tpl
+++ b/view/theme/frost/comment_item.tpl
@ -20,6 +20,7 @@
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+				<input type="hidden" name="post_id_random" value="$rand_num" />

 <!--				<div class="comment-edit-photo" id="comment-edit-photo-$id" >-->
 					<a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
--- a/view/theme/frost/jot-header.tpl
+++ b/view/theme/frost/jot-header.tpl
@ -12,5 +12,6 @@
 	window.baseURL = "$baseurl";
 	window.geoTag = function () { $geotag }
 	window.ajaxType = 'jot-header';
+	window.delItems = '$delitems';
 </script>

--- a/view/theme/frost/jot.tpl
+++ b/view/theme/frost/jot.tpl
@ -14,6 +14,7 @@
 		<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" />
+		<input type="hidden" name="post_id_random" value="$rand_num" />
 		<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="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>
 		<div id="jot-text-wrap">
--- a/view/theme/frost/js/main.js
+++ b/view/theme/frost/js/main.js
@ -236,12 +236,13 @@
 					if($j('#live-profile').length)   { src = 'profile'; liveUpdate(); }
 					if($j('#live-community').length) { src = 'community'; liveUpdate(); }
 					if($j('#live-notes').length)     { src = 'notes'; liveUpdate(); }
-					if($j('#live-display').length) {
+					if($j('#live-display').length) { src = 'display'; liveUpdate(); }
+					/*if($j('#live-display').length) {
 						if(liking) {
 							liking = 0;
 							window.location.href=window.location.href 
 						}
-					}
+					}*/
 					if($j('#live-photos').length) {
 						if(liking) {
 							liking = 0;
@ -300,10 +301,26 @@
 					$j('#' + prev).after($j(this));
 				}
 				else {
+					// Find out if the hidden comments are open, so we can keep it that way
+					// if a new comment has been posted
+					var id = $j('.hide-comments-total', this).attr('id');
+					if(typeof id != 'undefined') {
+						id = id.split('-')[3];
+						var commentsOpen = $j("#collapsed-comments-" + id).is(":visible");
+					}
+
 					$j('img',this).each(function() {
 						$j(this).attr('src',$j(this).attr('dst'));
 					});
+					//vScroll = $j(document).scrollTop();
+					$j('html').height($j('html').height());
 					$j('#' + ident).replaceWith($j(this));
+
+					if(typeof id != 'undefined') {
+						if(commentsOpen) showHideComments(id);
+					}
+					$j('html').height('auto');
+					//$j(document).scrollTop(vScroll);
 				}
 				prev = ident;
 			});
@ -510,6 +527,17 @@
 	}


+	function showHideComments(id) {
+		if( $j("#collapsed-comments-" + id).is(":visible")) {
+			$j("#collapsed-comments-" + id).hide();
+			$j("#hide-comments-" + id).html(window.showMore);
+		}
+		else {
+			$j("#collapsed-comments-" + id).show();
+			$j("#hide-comments-" + id).html(window.showFewer);
+		}
+	}
+

 	function preview_post() {
 		$j("#jot-preview").val("1");
--- a/view/theme/frost/js/main.min.js
+++ b/view/theme/frost/js/main.min.js
--- a/view/theme/frost/js/theme.js
+++ b/view/theme/frost/js/theme.js
@ -584,17 +584,6 @@ function qCommentInsert(obj,id) {
 	$j(obj).val("");
 }

-function showHideComments(id) {
-	if( $j("#collapsed-comments-" + id).is(":visible")) {
-		$j("#collapsed-comments-" + id).hide();
-		$j("#hide-comments-" + id).html(window.showMore);
-	}
-	else {
-		$j("#collapsed-comments-" + id).show();
-		$j("#hide-comments-" + id).html(window.showFewer);
-	}
-}
-
 /*function showHideCommentBox(id) {
 	if( $j('#comment-edit-form-' + id).is(':visible')) {
 		$j('#comment-edit-form-' + id).hide();
@ -900,22 +889,26 @@ function wallInitEditor() {
 		$j("#prvmail-text").contact_autocomplete(baseurl+"/acl");
 }

-function deleteCheckedItems() {
-	var checkedstr = '';
+function deleteCheckedItems(delID) {
+	if(confirm(window.delItems)) {
+		var checkedstr = '';

-	$j('.item-select').each( function() {
-		if($j(this).is(':checked')) {
-			if(checkedstr.length != 0) {
-				checkedstr = checkedstr + ',' + $j(this).val();
+		$j(delID).hide();
+		$j(delID + '-rotator').show();
+		$j('.item-select').each( function() {
+			if($j(this).is(':checked')) {
+				if(checkedstr.length != 0) {
+					checkedstr = checkedstr + ',' + $j(this).val();
+				}
+				else {
+					checkedstr = $j(this).val();
+				}
 			}	
-			else {
-				checkedstr = $j(this).val();
-			}
-		}	
-	});
-	$j.post('item', { dropitems: checkedstr }, function(data) {
-		window.location.reload();
-	});
+		});
+		$j.post('item', { dropitems: checkedstr }, function(data) {
+			window.location.reload();
+		});
+	}
 }


--- a/view/theme/frost/js/theme.min.js
+++ b/view/theme/frost/js/theme.min.js
--- a/view/theme/frost/oembed_video.tpl
+++ b/view/theme/frost/oembed_video.tpl
@ -1,4 +0,0 @@
-<a href='$embedurl' onclick='this.innerHTML=Base64.decode("$escapedhtml"); return false;' style='float:left; margin: 1em; position: relative;'>
-	<img width='$tw' height='$th' src='$turl' >
-	<div style='position: absolute; top: 0px; left: 0px; width: $twpx; height: $thpx; background: url($baseurl/images/icons/48/play.png) no-repeat center center;'></div>
-</a>
--- a/view/theme/frost/threaded_conversation.tpl
+++ b/view/theme/frost/threaded_conversation.tpl
@ -1,8 +1,9 @@
 {{ if $dropping }}
-<div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems();">
+<div id="item-delete-selected-top" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected-top');">
  <div id="item-delete-selected-top-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
  <div id="item-delete-selected-top-desc" >$dropping</div>
 </div>
+<img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
 {{ endif }}

 $live_update
@ -14,9 +15,10 @@ $live_update
 <div id="conversation-end"></div>

 {{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems('#item-delete-selected');">
  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
  <div id="item-delete-selected-desc" >$dropping</div>
 </div>
+<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
 <div id="item-delete-selected-end"></div>
 {{ endif }}
--- a/view/theme/quattro/comment_item.tpl
+++ b/view/theme/quattro/comment_item.tpl
@ -6,6 +6,7 @@
 				<input type="hidden" name="return" value="$return_path" />
 				<input type="hidden" name="jsreload" value="$jsreload" />
 				<input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+				<input type="hidden" name="post_id_random" value="$rand_num" />

 				<div class="comment-edit-photo" id="comment-edit-photo-$id" >
 					<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
--- a/view/theme/quattro/jot.tpl
+++ b/view/theme/quattro/jot.tpl
@ -13,6 +13,7 @@
 		<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" />
+		<input type="hidden" name="post_id_random" value="$rand_num" />

 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>

--- a/view/theme/quattro/msg-header.tpl
+++ b/view/theme/quattro/msg-header.tpl
@ -1,97 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-var plaintext = '$editselect';
-
-if(plaintext != 'none') {
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "specific_textareas",
-		editor_selector: /(profile-jot-text|prvmail-text)/,
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		force_p_newlines : false,
-		force_br_newlines : true,
-		forced_root_block : '',
-		convert_urls: false,
-		content_css: "$baseurl/view/custom_tinymce.css",
-		     //Character count
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-				var editorId = ed.editorId;
-				var textarea = $('#'+editorId);
-				if (typeof(textarea.attr('tabindex')) != "undefined") {
-					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
-					textarea.attr('tabindex', null);
-				}
-			});
-		}
-	});
-}
-else
-	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
-
-
-</script>
-<script type="text/javascript" src="js/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'prvmail-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-	});
-
-	function jotGetLink() {
-		reply = prompt("$linkurl");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-</script>
-
--- a/view/theme/quattro/threaded_conversation.tpl
+++ b/view/theme/quattro/threaded_conversation.tpl
@ -1,3 +1,5 @@
+$live_update
+
 {{ for $threads as $item }}

 <div id="tread-wrapper-$item.id" class="tread-wrapper {{ if $item.threaded }}threaded{{ endif }}  $item.toplevel">
@ -15,9 +17,10 @@
 <div id="conversation-end"></div>

 {{ if $dropping }}
-<a href="#" onclick="deleteCheckedItems();return false;">
+<a id="item-delete-selected" href="#" onclick="deleteCheckedItems();return false;">
 	<span class="icon s22 delete text">$dropping</span>
 </a>
+<img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
 {{ endif }}

 <script>
--- a/view/theme/smoothly/categories_widget.tpl
+++ b/view/theme/smoothly/categories_widget.tpl
@ -1,12 +0,0 @@
-<div id="categories-sidebar" class="widget">
-	<h3>$title</h3>
-	<div id="nets-desc">$desc</div>
-	
-	<ul class="categories-ul">
-		<li class="widget-list"><a href="$base" class="categories-link categories-all{{ if $sel_all }} categories-selected{{ endif }}">$all</a></li>
-		{{ for $terms as $term }}
-			<li class="widget-list"><a href="$base?f=&category=$term.name" class="categories-link{{ if $term.selected }} categories-selected{{ endif }}">$term.name</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
--- a/view/theme/smoothly/contact_template.tpl
+++ b/view/theme/smoothly/contact_template.tpl
@ -1,24 +0,0 @@
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-	<div class="contact-entry-photo-wrapper" >
-		<div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-		onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-		onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-			<a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-			{{ if $contact.photo_menu }}
-			<span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-			{{ endif }}
-		</div>
-			
-	</div>
-	<div class="contact-entry-photo-end" ></div>
-		<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-	<div class="contact-entry-end" ></div>
-</div>
--- a/view/theme/smoothly/css/typography.css
+++ b/view/theme/smoothly/css/typography.css
@ -0,0 +1,283 @@
+/* global basic typography settings */
+
+textarea,
+pre,
+code,
+kbd,
+samp,
+var,
+tt {
+	font-family:Consolas, "Lucida Console", "Andale Mono", "Bitstream Vera Sans Mono", "Courier New", Courier;
+}
+
+/* (en) base layout gets standard font size 15px */
+/* (de) Basis-Layout erhält Standardschriftgröße von 15 Pixeln */
+
+body {
+	margin: 0 auto;
+	padding-bottom: 3em;
+	width: 960px;
+	font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif;
+	font-size: 15px;
+	font-size-adjust: none;
+	font-style: normal;
+	font-variant: normal;
+	font-weight: normal;
+	line-height: 18px;
+	color: #626262;
+	background-color: #F2F2F2;
+	color: #333333;
+/* (en) Prevent auto-scaling of text in mobile webkit browsers */
+/* (de) Automatische Schriftvergrößerung in mobilen Webkit-Browsern vermeiden */
+	-webkit-text-size-adjust:100%;
+}
+
+/*--- Headings | Überschriften ------------------------------------------------------------------------*/
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-family: "Lucida Grande","Lucida Sans Unicode",Arial,Verdana,sans-serif;
+	font-weight: 400;
+	color:#626262;
+	margin:0;
+}
+
+h1 {
+	font-size:200%;
+	line-height: 0.8571em;
+	margin: 0.4286em 0 0;
+}
+
+h2 {
+	font-size:170%;
+	line-height: 1.2em;
+	margin: 0.6em 0 0 0;
+}
+
+h3 {
+	font-size:145%;
+	margin:0 0 5px 0;
+}
+
+h4 {
+	font-size:133.33%;
+	line-height: 1.125em;
+	margin:1.125em 0 0 0;
+}
+
+h5 {
+	font-size:116.67%;
+	line-height: 1.2857em;
+	margin: 1.2857em 0 0 0;
+}
+
+h6 {
+	font-weight: bold;
+	font-size:100%;
+	line-height: 1.5em;
+	margin: 1.5em 0 0 0;
+}
+
+/*h3 > a, h4 > a {
+	font-size: 18px;
+	color: #626262;
+}*/
+
+/* --- Lists | Listen  -------------------------------------------------------------------------------- */
+
+ul,
+ol,
+dl {
+	font-size:1em;
+	line-height:1.5em;
+}
+
+ul {
+	list-style-type:disc;
+}
+
+ol {
+	list-style-type:decimal;
+}
+
+ul ul {
+	list-style-type:circle;
+	margin-top:0;
+}
+
+ol ol {
+	list-style-type:lower-latin;
+	margin-top:0;
+}
+
+ol ul {
+	list-style-type:circle;
+	margin-top:0;
+}
+
+li {
+	font-size:1em;
+	line-height:1.5em;
+	list-style: none outside none;
+}
+
+dt { font-weight:bold; }
+
+dd { }
+
+
+/* --- general text formatting | Allgemeine Textauszeichnung ------------------------------------------ */
+
+p {
+	max-width: 600px;
+	font-size:1em;
+	/*line-height:1.5em;*/
+	/*margin: 1.5em 0 0 0;*/
+}
+
+blockquote, cite, q {
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-style:italic;
+}
+
+blockquote {
+    background-color: #F4F8F9;
+    border-left: 4px solid #DAE4EE;
+    padding: 0.4em;
+}
+
+strong, b { font-weight:bold; }
+
+em, i { font-style:italic; }
+
+big {
+	font-size:116.667%;
+}
+
+small {
+	font-size:85.71%;
+}
+
+pre,
+code,
+kbd,
+tt,
+samp,
+var {
+	font-size:100%;
+}
+
+pre {
+	line-height:1.5em;
+	margin: 1.5em 0 0 0;
+	white-space: pre;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+pre, code { color:#800; }
+
+kbd, samp, var, tt {
+	color:#666;
+	font-weight:bold;
+}
+
+var, dfn { font-style:italic; }
+
+acronym, abbr {
+	border-bottom:1px #aaa dotted;
+	font-variant:small-caps;
+	letter-spacing:.07em;
+	cursor:help;
+}
+
+sub,
+sup {
+	font-size: 75%;
+	line-height: 0;
+	position: relative;
+	vertical-align: baseline;
+}
+
+sup { top: -0.5em; }
+sub { bottom: -0.25em; }
+
+mark {
+	background: #ff0;
+	color: #000;
+}
+
+hr {
+	color:#fff;
+	background:transparent;
+	margin:0 0 0.75em 0;
+	padding:0 0 0.75em 0;
+	border:0;
+	border-bottom:1px #eee solid;
+}
+
+.required {
+	display: inline;
+	color: #1873a2;
+}
+
+.hidden { 
+	display: none!important; 
+}
+
+/*--- Links ----------------------------------------------------------------------------------------- */
+
+a {
+	color: #1873a2;
+	text-decoration: none;
+	margin-bottom: 1px;
+	background:transparent;
+}
+
+a:active { outline: none; }
+
+/* (en) maximum constrast for tab focus - change with great care */
+/* (en) Maximaler Kontrast für Tab Focus - Ändern Sie diese Regel mit Bedacht */
+a:hover,
+a:focus {
+	color: #6da6c4;
+	text-decoration:none;
+}
+
+/*--- Images ----------------------------------------------------------------------------------------- */
+
+img,
+figure {
+	border: 0 none;
+	max-width: 550px;
+	margin: 0;
+}
+
+.flexible {
+	margin-top: 1.5em;
+	max-width: 100%;
+	height: auto;
+}
+
+* html .flexible {	/* IE6 support */
+	width: 98%;		/* 2% space for borders */
+}
+
+.bordered {
+	margin-top: 1.5em;
+	border: 2px #eee solid;
+	border: 2px rgba(255,255,255,1) solid;
+	-webkit-box-shadow: 0 0 3px rgba(0,0,0,.25);
+	-moz-box-shadow: 0 0 3px rgba(0,0,0,.25);
+	box-shadow: 0 0 3px rgba(0,0,0,.25);
+}
+
+/*--- Tables ----------------------------------------------------------------------------------------- */
+
+tr {
+	border: 1px solid #eeeeee;
+}
--- a/view/theme/smoothly/default.php
+++ b/view/theme/smoothly/default.php
@ -3,6 +3,11 @@
 <head>
  <title><?php if(x($page,'title')) echo $page['title'] ?></title>
  <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
+  <script type="text/javascript">
+	function ScrollToBottom(){
+	window.scrollTo(0,document.body.scrollHeight);
+	}
+  </script>
  <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
 <body>
--- a/view/theme/smoothly/footer.tpl
+++ b/view/theme/smoothly/footer.tpl
@ -1,3 +0,0 @@
-<div id="footerbox" style="display:none">
-<a style="float:right; color:#333;margin-right:10px;display: table;margin-top: 5px;" href="friendica" title="Site Info / Impressum" >Info / Impressum</a>
-</div>
--- a/view/theme/smoothly/generic_links_widget.tpl
+++ b/view/theme/smoothly/generic_links_widget.tpl
@ -1,11 +0,0 @@
-<div class="widget{{ if $class }} $class{{ endif }}">
-	{{if $title}}<h3>$title</h3>{{endif}}
-	{{if $desc}}<div class="desc">$desc</div>{{endif}}
-	
-	<ul>
-		{{ for $items as $item }}
-			<li class="widget-list"><a href="$item.url" class="{{ if $item.selected }}selected{{ endif }}">$item.label</a></li>
-		{{ endfor }}
-	</ul>
-	
-</div>
--- a/view/theme/smoothly/group_drop.tpl
+++ b/view/theme/smoothly/group_drop.tpl
@ -1,8 +0,0 @@
-<div class="group-delete-wrapper" id="group-delete-wrapper-$id" >
-	<a href="group/drop/$id" 
-		onclick="return confirmDelete();" 
-		title="$delete" 
-		id="group-delete-icon-$id" 
-		class="drophide group-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" >Delete Group</a>
-</div>
-<div class="group-delete-end"></div>
--- a/view/theme/smoothly/group_side.tpl
+++ b/view/theme/smoothly/group_side.tpl
@ -1,28 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-	<ul id="sidebar-group-ul">
-		{{ for $groups as $group }}
-			<li class="sidebar-group-li">
-				{{ if $group.cid }}
-					<input type="checkbox" 
-						class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-						onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-						{{ if $group.ismember }}checked="checked"{{ endif }}
-					/>
-				{{ endif }}			
-				{{ if $group.edit }}
-					<a class="groupsideedit" href="$group.edit.href"><span class="icon small-pencil"></span></a>
-				{{ endif }}
-				<a class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-			</li>
-		{{ endfor }}
-	</ul>
-	</div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
-
-
--- a/view/theme/smoothly/images/arrow.png
+++ b/view/theme/smoothly/images/arrow.png
--- a/view/theme/smoothly/images/calendar.png
+++ b/view/theme/smoothly/images/calendar.png
--- a/view/theme/smoothly/images/connect.png
+++ b/view/theme/smoothly/images/connect.png
--- a/view/theme/smoothly/images/dot.png
+++ b/view/theme/smoothly/images/dot.png
--- a/view/theme/smoothly/images/down.png
+++ b/view/theme/smoothly/images/down.png
--- a/view/theme/smoothly/images/file.gif
+++ b/view/theme/smoothly/images/file.gif
--- a/view/theme/smoothly/images/groups.png
+++ b/view/theme/smoothly/images/groups.png
--- a/view/theme/smoothly/images/icons.png
+++ b/view/theme/smoothly/images/icons.png
--- a/view/theme/smoothly/images/icons.svg
+++ b/view/theme/smoothly/images/icons.svg
--- a/view/theme/smoothly/images/login-bg.gif
+++ b/view/theme/smoothly/images/login-bg.gif
--- a/view/theme/smoothly/images/lrarrow.gif
+++ b/view/theme/smoothly/images/lrarrow.gif
--- a/view/theme/smoothly/images/menu-user-pin.jpg
+++ b/view/theme/smoothly/images/menu-user-pin.jpg
--- a/Show more
+++ b/Show more