From 83697cf3e561ceaf0365cd2b4e56fb4bcd00d1fa Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sat, 23 May 2015 22:35:02 +0200
Subject: [PATCH 01/20] Delete attachments on item deletion Delete video from
 videos page

---
 include/items.php            | 13 +++++
 mod/videos.php               | 96 ++++++++++++++++++++++++++++++------
 view/templates/video_top.tpl |  6 +++
 3 files changed, 101 insertions(+), 14 deletions(-)

diff --git a/include/items.php b/include/items.php
index 5a0aa9ed51..c5de29a6de 100644
--- a/include/items.php
+++ b/include/items.php
@@ -4745,6 +4745,18 @@ function drop_item($id,$interactive = true) {
 			// ignore the result
 		}
 
+		// If item has attachments, drop them
+
+		foreach(explode(",",$item['attach']) as $attach){
+			preg_match("|attach/(\d+)|", $attach, $matches);
+			q("DELETE FROM `attach` WHERE `id` = %d AND `uid` = %d",
+				intval($matches[1]),
+				local_user()
+			);
+			// ignore the result
+		}
+
+
 		// clean up item_id and sign meta-data tables
 
 		/*
@@ -4821,6 +4833,7 @@ function drop_item($id,$interactive = true) {
 			// Add a relayable_retraction signature for Diaspora.
 			store_diaspora_retract_sig($item, $a->user, $a->get_baseurl());
 		}
+
 		$drop_id = intval($item['id']);
 
 		// send the notification upstream/downstream as the case may be
diff --git a/mod/videos.php b/mod/videos.php
index 0f29e631bd..607c900eb5 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -43,12 +43,12 @@ function videos_init(&$a) {
 		if(count($albums)) {
 			$a->data['albums'] = $albums;
 
-			$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);	
+			$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
 
 			if($albums_visible) {
 				$o .= '<div id="side-bar-photos-albums" class="widget">';
 				$o .= '<h3>' . '<a href="' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
-					
+
 				$o .= '<ul>';
 				foreach($albums as $album) {
 
@@ -57,7 +57,7 @@ function videos_init(&$a) {
 
 					if((! strlen($album['album'])) || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
 						continue;
-					$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>'; 
+					$o .= '<li>' . '<a href="photos/' . $a->argv[1] . '/album/' . bin2hex($album['album']) . '" >' . $album['album'] . '</a></li>';
 				}
 				$o .= '</ul>';
 			}
@@ -92,9 +92,76 @@ function videos_init(&$a) {
 
 function videos_post(&$a) {
 
-	return;
+	$owner_uid = $a->data['user']['uid'];
+
+	if (local_user() != $owner_uid) goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+
+	if(($a->argc == 2) && x($_POST,'delete') && x($_POST, 'id')) {
+
+		// Check if we should do HTML-based delete confirmation
+		if(!x($_REQUEST,'confirm')) {
+			if(x($_REQUEST,'canceled')) goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+
+			$drop_url = $a->query_string;
+			$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
+				'$method' => 'post',
+				'$message' => t('Do you really want to delete this video?'),
+				'$extra_inputs' => [
+					['name'=>'id', 'value'=> $_POST['id']],
+					['name'=>'delete', 'value'=>'x']
+				],
+				'$confirm' => t('Delete Video'),
+				'$confirm_url' => $drop_url,
+				'$confirm_name' => 'confirm', // Needed so that confirmation will bring us back into this if statement
+				'$cancel' => t('Cancel'),
+
+			));
+			$a->error = 1; // Set $a->error so the other module functions don't execute
+			return;
+		}
+
+		$video_id = $_POST['id'];
+
+
+		$r = q("SELECT `id`  FROM `attach` WHERE `uid` = %d AND `id` = '%s' LIMIT 1",
+			intval(local_user()),
+			dbesc($video_id)
+		);
+
+		if(count($r)) {
+			q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'",
+				intval(local_user()),
+				dbesc($video_id)
+			);
+			$i = q("SELECT * FROM `item` WHERE `attach` like '%%attach/%s%%' AND `uid` = %d LIMIT 1",
+				dbesc($video_id),
+				intval(local_user())
+			);
+			#echo "<pre>"; var_dump($i); killme();
+			if(count($i)) {
+				q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
+					dbesc(datetime_convert()),
+					dbesc(datetime_convert()),
+					dbesc($i[0]['uri']),
+					intval(local_user())
+				);
+				create_tags_from_itemuri($i[0]['uri'], local_user());
+				delete_thread_uri($i[0]['uri'], local_user());
+
+				$url = $a->get_baseurl();
+				$drop_id = intval($i[0]['id']);
+
+				if($i[0]['visible'])
+					proc_run('php',"include/notifier.php","drop","$drop_id");
+			}
+		}
+
+		goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+		return; // NOTREACHED
+	}
+
+    goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
 
-	// DELETED -- look at mod/photos.php if you want to implement
 }
 
 
@@ -115,8 +182,8 @@ function videos_content(&$a) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
-	
-	
+
+
 	require_once('include/bbcode.php');
 	require_once('include/security.php');
 	require_once('include/conversation.php');
@@ -131,7 +198,7 @@ function videos_content(&$a) {
 	$_SESSION['video_return'] = $a->cmd;
 
 	//
-	// Parse arguments 
+	// Parse arguments
 	//
 
 	if($a->argc > 3) {
@@ -233,7 +300,7 @@ function videos_content(&$a) {
 
 	// tabs
 	$_is_owner = (local_user() && (local_user() == $owner_uid));
-	$o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);	
+	$o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);
 
 	//
 	// dispatch request
@@ -251,7 +318,7 @@ function videos_content(&$a) {
 		return; // no albums for now
 
 		// DELETED -- look at mod/photos.php if you want to implement
-	}	
+	}
 
 
 	if($datatype === 'video') {
@@ -307,20 +374,21 @@ function videos_content(&$a) {
 					'name'  => $name_e,
 					'alt'   => t('View Album'),
 				),
-				
+
 			);
 		}
 	}
-	
-	$tpl = get_markup_template('videos_recent.tpl'); 
+
+	$tpl = get_markup_template('videos_recent.tpl');
 	$o .= replace_macros($tpl, array(
 		'$title' => t('Recent Videos'),
 		'$can_post' => $can_post,
 		'$upload' => array(t('Upload New Videos'), $a->get_baseurl().'/videos/'.$a->data['user']['nickname'].'/upload'),
 		'$videos' => $videos,
+        '$delete_url' => (($can_post)?$a->get_baseurl().'/videos/'.$a->data['user']['nickname']:False)
 	));
 
-	
+
 	$o .= paginate($a);
 	return $o;
 }
diff --git a/view/templates/video_top.tpl b/view/templates/video_top.tpl
index 3a8680fd9d..207dd83f2f 100644
--- a/view/templates/video_top.tpl
+++ b/view/templates/video_top.tpl
@@ -9,5 +9,11 @@
 	</video>
 
 	{{*<div class="video-top-album-name"><a href="{{$video.album.link}}" class="video-top-album-link" title="{{$video.album.alt}}" >{{$video.album.name}}</a></div>*}}
+	{{if $delete_url }}
+		<form method="post" action="{{$delete_url}}">
+		<input type="submit" name="delete" value="X"></input>
+		<input type="hidden" name="id" value="{{$video.id}}"></input>
+		</form>
+	{{/if}}
 </div>
 

From 7c2608e07d54fe9f861cc9bcafa9e204adb05251 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sat, 23 May 2015 22:51:34 +0200
Subject: [PATCH 02/20] quattro: style video delete button

---
 view/templates/video_top.tpl       |   2 +-
 view/theme/quattro/dark/style.css  |  28 ++-
 view/theme/quattro/green/style.css |  28 ++-
 view/theme/quattro/lilac/style.css |  28 ++-
 view/theme/quattro/quattro.less    | 283 ++++++++++++++++-------------
 5 files changed, 219 insertions(+), 150 deletions(-)

diff --git a/view/templates/video_top.tpl b/view/templates/video_top.tpl
index 207dd83f2f..8348d702cd 100644
--- a/view/templates/video_top.tpl
+++ b/view/templates/video_top.tpl
@@ -11,7 +11,7 @@
 	{{*<div class="video-top-album-name"><a href="{{$video.album.link}}" class="video-top-album-link" title="{{$video.album.alt}}" >{{$video.album.name}}</a></div>*}}
 	{{if $delete_url }}
 		<form method="post" action="{{$delete_url}}">
-		<input type="submit" name="delete" value="X"></input>
+		<input type="submit" name="delete" value="X" class="video-delete"></input>
 		<input type="hidden" name="id" value="{{$video.id}}"></input>
 		</form>
 	{{/if}}
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 5f4b005c8e..3c109a440e 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -514,7 +514,6 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
-
   z-index: 110;
   color: #ffffff;
 }
@@ -844,7 +843,6 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
-
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -926,7 +924,6 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-
 }
 .widget h3 {
   padding: 0px;
@@ -1208,7 +1205,6 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -1283,9 +1279,6 @@ section {
     opacity: 0.5;
 }*/
 .wwto {
-  position: absolute !important;
-  width: 25px;
-  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
@@ -1969,6 +1962,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index c2826a3c0c..5e355ffa70 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -514,7 +514,6 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
-
   z-index: 110;
   color: #ffffff;
 }
@@ -844,7 +843,6 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
-
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -926,7 +924,6 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-
 }
 .widget h3 {
   padding: 0px;
@@ -1208,7 +1205,6 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -1283,9 +1279,6 @@ section {
     opacity: 0.5;
 }*/
 .wwto {
-  position: absolute !important;
-  width: 25px;
-  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
@@ -1969,6 +1962,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 28c5cd47a9..0f497d492f 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -514,7 +514,6 @@ header {
   margin: 0px;
   padding: 0px;
   /*width: 100%; height: 12px; */
-
   z-index: 110;
   color: #ffffff;
 }
@@ -844,7 +843,6 @@ aside #profiles-menu {
   overflow: auto;
   height: auto;
   /*.contact-block-div { width:60px; height: 60px; }*/
-
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -926,7 +924,6 @@ aside #profiles-menu {
   margin-bottom: 2em;
   /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-
 }
 .widget h3 {
   padding: 0px;
@@ -1208,7 +1205,6 @@ section {
   height: 32px;
   margin-left: 16px;
   /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-
 }
 .comment-edit-preview .contact-photo-menu-button {
   top: 15px !important;
@@ -1283,9 +1279,6 @@ section {
     opacity: 0.5;
 }*/
 .wwto {
-  position: absolute !important;
-  width: 25px;
-  height: 25px;
   background: #FFFFFF;
   border: 2px solid #364e59;
   height: 25px;
@@ -1969,6 +1962,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 172fad31b5..56eab54cc9 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -36,7 +36,7 @@ h4 { font-size: 1.1em }
 	-o-transition: all @d ease-in-out;
 	-ms-transition: all @d ease-in-out;
 	transition: all @d ease-in-out;
-}	
+}
 
 
 a, a:link { color: @Link; text-decoration: none; }
@@ -56,7 +56,7 @@ blockquote {
     padding: 1em;
     margin-left: 1em;
     border-left: 1em solid @BlockquoteBorderColor;
-    
+
 }
 
 code {
@@ -68,7 +68,7 @@ code {
 	background: #EEE;
 	color: #444;
 	padding: 10px;
-	margin-top: 20px; 
+	margin-top: 20px;
 }
 
 #panel {
@@ -81,8 +81,8 @@ code {
 	list-style: none;
 	border: 3px solid @MenuBorder;
 	z-index: 100000;
-	
-	.shadow();	
+
+	.shadow();
 }
 
 
@@ -134,7 +134,7 @@ header {
 	#site-location {
 		display: none;
 	}
-	
+
 	#banner {
 		overflow: hidden;
                 text-align: center;
@@ -145,7 +145,7 @@ header {
 	}
 }
 /* nav */
-nav { 
+nav {
 	width: 100%; height: 32px;
 	position: fixed; left: 0px; top: 0px;
 	padding: 0px;
@@ -159,13 +159,13 @@ nav {
 		ul {
 			margin: 0px;
 			padding: 0px 20px;
-			li { 
-				list-style: none; 
+			li {
+				list-style: none;
 				margin: 0px; padding: 0px;
 				float: left;
 				.menu-popup{ left: 0px; right: auto; }
 			}
-			
+
 		}
 
 		.nav-menu-icon {
@@ -174,11 +174,11 @@ nav {
 			padding: 5px;
 			margin: 0px 10px;
 			.roundtop();
-			
+
 			&.selected {
 				background-color: @NavbarSelectedBg;
 			}
-			
+
 				img { width: 22px; height: 22px; }
 				.nav-notify { top: 3px; }
 		}
@@ -193,7 +193,7 @@ nav {
 			&.selected {
 				border-bottom: 3px solid @NavbarSelectedBorder;
 			}
-			
+
 		}
 
 		.nav-notify {
@@ -207,26 +207,26 @@ nav {
 			right: -10px;
 			min-width: 15px;
 			text-align: right;
-			
+
 				&.show{ display: block; }
 		}
-		
-		
+
+
 		#nav-help-link,
 		#nav-search-link,
 		#nav-directory-link,
 		#nav-apps-link,
-		#nav-site-linkmenu { 
+		#nav-site-linkmenu {
 			float: right;
 			.menu-popup{ right: 0px; left: auto; }
 		}
-	
+
 		#nav-notifications-linkmenu.on .icon.s22.notify,
 		#nav-notifications-linkmenu.selected .icon.s22.notify   { background-image: url("../../../images/icons/22/notify_on.png") }
         #nav-introductions-link.on .icon.s22.intro,
 		#nav-introductions-link.selected .icon.s22.intro        { background-image: url("icons/contacts_on.png") }
 		#nav-messages-link.on .icon.s22.mail,
-		#nav-messages-link.selected .icon.s22.mail              { background-image: url("icons/messages_on.png") }		
+		#nav-messages-link.selected .icon.s22.mail              { background-image: url("icons/messages_on.png") }
 		#nav-apps-link.selected { background-color: @NavbarSelectedBg; }
 }
 
@@ -242,9 +242,9 @@ ul.menu-popup {
 	list-style: none;
 	border: 3px solid @MenuBorder;
 	z-index: 100000;
-	
+
 	.shadow();
-	
+
 		a { display: block; color: @MenuItem; padding: 5px 10px; text-decoration: none;}
 		a:hover { background-color: @MenuItemHoverBg; }
 		.menu-sep  { border-top: 1px solid @MenuItemSeparator; }
@@ -256,12 +256,12 @@ ul.menu-popup {
 			color: @MenuEmpty;
 		}
 		.toolbar {
-			background-color:  @MenuEmpty; 
+			background-color:  @MenuEmpty;
 			height: auto; overflow: auto;
 			a { float: right; }
 			a:hover { background-color: @MenuBg; }
 		}
-		
+
 }
 
 /* autocomplete popup */
@@ -275,7 +275,7 @@ ul.menu-popup {
 	z-index:100000;
 	.shadow();
 }
-.autocomplete > div, 
+.autocomplete > div,
 .acpopupitem {
 	color: @MenuItem; padding: 4px;
 	clear:left;
@@ -305,7 +305,7 @@ ul.menu-popup {
 
 
 /* aside 230px*/
-aside { 
+aside {
 	display: table-cell;
 	vertical-align: top;
 	width: 200px;
@@ -320,7 +320,7 @@ aside {
 		dl { height: auto; overflow: auto; }
 		dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
 		dd {float: left; margin-left: 4px; width: 60%;}
-	
+
 	}
 
 	#profile-extra-links {
@@ -337,7 +337,7 @@ aside {
 		text-transform:uppercase;
 		padding: 4px 2px 2px 35px;
                 margin-top: 3px;
-		
+
 		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
 	}
 	#dfrn-request-link {
@@ -348,7 +348,7 @@ aside {
 		font-weight: bold;
 		text-transform:uppercase;
 		padding: 4px 2px 2px 35px;
-		
+
 		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
 	}
 
@@ -420,11 +420,11 @@ aside {
 	width: 60px;
 	height: 60px;
 }*/
- 
+
 /* widget */
 .widget {
 	margin-bottom: 2em;
-	
+
 	h3 { padding: 0px; margin: 2px;}
 	.action { .opaque(0.1); }
 	input.action { .opaque(0.5); }
@@ -434,14 +434,14 @@ aside {
 
 	ul { padding: 0px;}
 	ul li {padding-left: 16px; min-height: 16px; list-style: none; }
-	
+
 	.tool.selected {
 		background: url('../../../images/selected.png') no-repeat left center;
 	}
-	
+
 	/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-	
+
 }
 
 /* widget: search */
@@ -452,7 +452,7 @@ aside {
 
 
 /* section 800px */
-section { 
+section {
 	display: table-cell;
 	vertical-align: top;
 	width: 770px;
@@ -464,7 +464,7 @@ section {
 }
 
 /* wall item */
-.tread-wrapper { 
+.tread-wrapper {
 	background-color: @ThreadBackgroundColor;
 	position: relative;
 	padding: 10px;
@@ -478,10 +478,10 @@ section {
 .wall-item-container {
 	display: table;
 	width: 750px;
-	
+
 	.wall-item-item,
 	.wall-item-bottom { display: table-row; }
-	
+
 	.wall-item-bottom { .opaque(0.5); }
 	&:hover .wall-item-bottom { .opaque(1); }
 	.wall-item-info {
@@ -489,8 +489,8 @@ section {
 		vertical-align: top;
 		text-align: left;
 		width: 60px;
-		
-	} 
+
+	}
 	.wall-item-location {
 		word-wrap: break-word;
 		width: 50px;
@@ -503,45 +503,45 @@ section {
 	}
 	.wall-item-content img { max-width: 700px; }
 	.wall-item-links,
-	.wall-item-actions { 
-		display: table-cell; 
-		vertical-align: middle; 
-		
+	.wall-item-actions {
+		display: table-cell;
+		vertical-align: middle;
+
 		.icon {
 			.opaque(0.5);
 		}
 		.icon:hover  {
 			.opaque(1.0);
-		}		
+		}
 	}
-	
+
 	.wall-item-ago { padding-right: 40px; }
 	.wall-item-name { font-weight: bold; }
-	
+
 	.wall-item-actions-author { float: left; width: 20em; margin-top: 0.5em; }
 	.wall-item-actions-social { float: left; margin-top: 0.5em;
 		a { margin-right: 3em; }
 	 }
-	.wall-item-actions-tools { float: right; width: 15%; 
+	.wall-item-actions-tools { float: right; width: 15%;
 		a { float: right; }
 		input { float: right; }
 	}
-		
+
 }
 
 
 .wall-item-container.comment {
 	.contact-photo-wrapper { margin-left: 16px; }
-	.contact-photo { 
-		width: 32px; height: 32px; 
+	.contact-photo {
+		width: 32px; height: 32px;
 	}
-	
+
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 0px !important;
 	}
 	.wall-item-links { padding-left: 12px; }
-	
+
 	.commentbox {
 		height: 0px;
 		overflow: hidden;
@@ -551,7 +551,7 @@ section {
 		}
 		.transition();
 	}
-	
+
 	&:hover .commentbox {
 		height:auto; overflow: visible;
 		.wall-item-comment-wrapper {
@@ -568,9 +568,9 @@ section {
 		.opaque(0.5);
 	}
 	.contact-photo-wrapper { margin-left: 32px; }
-	.contact-photo { 
+	.contact-photo {
 		width: 16px; height: 16px;
-	}	
+	}
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 15px !important;
@@ -581,8 +581,8 @@ section {
 .wall-item-comment-wrapper {
 	margin: 1em 2em 1em 60px;
 	.comment-edit-photo { display: none; }
-	
-	textarea {	
+
+	textarea {
 		height: 1em; width: 100%; font-size: 10px;
 		color: @CommentBoxEmptyColor;
 		border: 1px solid @CommentBoxEmptyBorderColor;
@@ -593,7 +593,7 @@ section {
 		color: @CommentBoxFullColor;
 		border: 1px solid @CommentBoxFullBorderColor;
 	}
-	
+
 	&.photo {
 		margin: 1em 2em 1em 0px;
 	}
@@ -606,10 +606,10 @@ section {
 	border: 1px solid @Grey5;
 	margin-top: 10px;
 	background-color: @JotPreviewBackgroundColor;
-	
+
 	.contact-photo { width: 32px; height: 32px; margin-left: 16px;
 		/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-	}	
+	}
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 15px !important;
@@ -617,8 +617,8 @@ section {
 	.wall-item-links { padding-left: 12px; }
 
 	.wall-item-container { width: 90%; }
-	.tread-wrapper { 
-		width: 90%; padding: 0; margin: 10px 0; 
+	.tread-wrapper {
+		width: 90%; padding: 0; margin: 10px 0;
 		background-color: @JotPreviewBackgroundColor;
 		border-bottom: 0px;
 	}
@@ -664,9 +664,9 @@ section {
     opacity: 0.5;
 }*/
 
-.wwto { 
-	position: absolute !important; 
-	width: 25px; height: 25px; 
+.wwto {
+	position: absolute !important;
+	width: 25px; height: 25px;
     background: #FFFFFF;
     border: 2px solid @Metalic3;
     height: 25px;
@@ -676,7 +676,7 @@ section {
     position: absolute !important;
     top: 40px;
     left: 30px;
-    
+
     .shadow(0px, 0px)
 }
 .wwto .contact-photo { width: 25px; height: 25px; }
@@ -695,7 +695,7 @@ section {
 		float: none;
 		margin-right: 0px;
 	}
-	
+
 }
 .type-link {
     blockquote {
@@ -715,14 +715,14 @@ section {
     border-top: 1px solid @ThreadBottomBorderColor;
     padding-top: 5px;
     margin-top: 5px;
-    
+
     img {
         -webkit-border-radius: 4px;
         -moz-border-radius: 4px;
         border-radius: 4px;
         float: left;
     }
-    
+
     span { margin-left: 9px; }
 }
 
@@ -735,7 +735,7 @@ blockquote.shared_content {
 
 
 .oembed.video {
-	> a.embed_video { 
+	> a.embed_video {
 		display: block;
 		float: none;
 		> div {
@@ -753,45 +753,45 @@ blockquote.shared_content {
 .children {
 	margin-top: 1em;
 	.hide-comments-outer { margin-left:60px; }
-	
+
 	.wwto { display: none; }
-	
+
 	.comment-edit-preview { width: 660px;
 		.wall-item-container { width: 610px; }
 	 }
-	
+
 	& .children {
-		
+
 		margin-left: 40px;
 		.wall-item-container { width: 710px; }
 		.comment-edit-preview { width: 620px;
 			.wall-item-container { width: 620px; }
 		 }
-	
+
 		& .children {
 			.wall-item-container { width: 670px; }
-			.comment-edit-preview { width: 580px; 
+			.comment-edit-preview { width: 580px;
 				.wall-item-container { width: 580px; }
 			}
-		
+
 			& .children {
 				.wall-item-container { width: 630px; }
-				.comment-edit-preview { width: 540px; 
+				.comment-edit-preview { width: 540px;
 					.wall-item-container { width: 540px; }
 				}
 
 				& .children {
 					.wall-item-container { width: 590px; }
-					.comment-edit-preview { width: 500px; 
+					.comment-edit-preview { width: 500px;
 						.wall-item-container { width: 500px; }
 					}
-					
+
 					.children {
 						margin-left: 0px;
 						.hide-comments-outer { margin-left: 0px; }
 					}
 				}
-			}		
+			}
 		}
 	}
 }
@@ -820,8 +820,8 @@ span[id^="showmore-wrap"] {
 .contact-select {	position: absolute; top:64px; left:64px; display:none; }
 .contact-select:checked,
 .contact-photo:hover .contact-select {	display:block; }
-#contacts-actions { 
-	position: absolute; 
+#contacts-actions {
+	position: absolute;
 	left: 800px;
 	width: 200px;
 	background-color: @MenuBg;
@@ -845,12 +845,12 @@ span[id^="showmore-wrap"] {
 	#contacts-actions { left: 40px; }
 }
 
-.contact-photo { 
+.contact-photo {
 	width: 48px; height: 48px;
 	img { width: 48px; height: 48px; }
 	overflow: hidden;
 	display: block;
- }		
+ }
 .contact-photo-menu-button {
 	display: none;
 	position: absolute;
@@ -864,30 +864,30 @@ span[id^="showmore-wrap"] {
 	height: 90px;
 	padding-right: 10px;
 	margin: 0 10px 10px 0px;
-	.contact-photo-wrapper { 
-		float: left; 
+	.contact-photo-wrapper {
+		float: left;
 		margin-right: 10px;
 	}
-	.contact-photo { 
+	.contact-photo {
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
 	}
 	.contact-photo-menu-button {
 		left: 0px;
 		top: 63px;
-	}	
+	}
 }
 .directory-item {
 	float: left;
 	width: 200px;
 	height: 200px;
-	.contact-photo { 
+	.contact-photo {
 		width: 175px; height: 175px;
 		img { width: 175px; height: 175px; }
 	}
 }
 .contact-name { font-weight: bold; padding-top: 15px; }
-.contact-details { 
+.contact-details {
 	color: @Grey3; white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -899,8 +899,8 @@ span[id^="showmore-wrap"] {
 
 	width: 100%;
 	margin: 0px 2em 20px 0px;
-	
-	
+
+
 	.profile-jot-text {
 		height: 1em; width: 99%; font-size: 10px;
 		color: @CommentBoxEmptyColor;
@@ -947,7 +947,7 @@ span[id^="showmore-wrap"] {
 				border-left: 10px solid @JotPermissionLockBackgroundColor;
 				background-color: @JotPermissionLockBackgroundColor;
 			}
-			
+
 		}
 		li.submit {
 			float: right;
@@ -993,12 +993,12 @@ span[id^="showmore-wrap"] {
 
 		&:-moz-placeholder {
 			font-weight: normal;
-		}		
-	
+		}
+
 		&:hover { border: 1px solid @CommentBoxEmptyBorderColor }
 		&:focus { border: 1px solid @CommentBoxEmptyBorderColor }
 	}
-	
+
 	#character-counter {
 		width: 40px;
 		float: right;
@@ -1007,7 +1007,7 @@ span[id^="showmore-wrap"] {
 		line-height: 20px;
 		padding-right: 20px;
 	}
-	
+
 	#jot-category {
 		border: 0px;
 		margin: 0px;
@@ -1076,7 +1076,7 @@ span[id^="showmore-wrap"] {
 	overflow: auto;
 }
 #acl-list-content {
-	
+
 }
 .acl-list-item {
 	display: block;
@@ -1093,7 +1093,7 @@ span[id^="showmore-wrap"] {
 	margin: 4px;
 }
 .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
+.acl-list-item a {
 	font-size: 8px;
 	display: block;
 	width: 40px;
@@ -1138,12 +1138,12 @@ ul.tabs {
     li {
         float: left;
         margin-left: 20px;
-        
+
         .active {
 			border-bottom: 1px solid @LinkVisited;
         }
     }
-    
+
 }
 
 
@@ -1152,7 +1152,7 @@ ul.tabs {
 #group-update-wrapper{
 	height: auto; overflow: auto;
 	#group {
-		width:300px; 
+		width:300px;
 		float:left;
 		margin-right:20px;
 	}
@@ -1194,13 +1194,13 @@ ul.tabs {
 	input[type="checkbox"], input[type="radio"]{
 		width: auto;
 	}
-	
+
 	textarea { height: 100px; }
 	.field_help {
 		display: block;
 		margin-left: 200px;
 		color: @FieldHelpColor;
-		
+
 	}
 
 
@@ -1275,7 +1275,7 @@ ul.tabs {
 }
 #profile-edit-profile-name,
 #profile-edit-name,
-#gender-select, 
+#gender-select,
 #profile-edit-pdesc,
 #profile-edit-gender,
 #profile-edit-dob,
@@ -1300,7 +1300,7 @@ ul.tabs {
 	height: auto; overflow: auto;
 	border-bottom: 2px solid #cccccc;
 	padding-bottom: 1em;
-	margin-bottom: 1em;	
+	margin-bottom: 1em;
 }
 .oauthapp img {
 	float: left;
@@ -1321,11 +1321,38 @@ ul.tabs {
 	width: 50px; float: left;
 }
 
+/* videos page */
+.videos {
+    .video-top-wrapper {
+        width: 200px; float: left;
+        margin: 0px 10px 10px 0px;
+        position: relative;
+
+        .video-js {
+            width: 200px!important;
+            height: 132px!important;
+        }
+
+        .video-delete {
+            position: absolute;
+            opacity: 0;
+            right: 0px;
+            top: 0px;
+            transition: opacity 0.5s;
+        }
+
+        &:hover .video-delete {
+            opacity: 1;
+        }
+    }
+}
+
+
 /* photo albums */
 @photosize: 150px;
 
 #photo-edit-link-wrap { margin-bottom: 10px; }
-	
+
 #album-edit-link {
 	border-right: 1px solid @MenuBorder;
 	float: left;
@@ -1358,21 +1385,21 @@ ul.tabs {
 	width:@photosize; height: @photosize;
 	position: relative;
 	overflow: hidden;
-	
+
 	img { width: @photosize; }
-		
+
 	.photo-top-album-name,
 	.caption{
 		position: absolute;
 		color: @Menu;
 		background-color: @MenuBg;
-		
+
 		width: 100%;
 		.shadow(0px, 5px);
 		.transition(0.5s);
 		bottom: -@photosize;
 	}
-	
+
 	&:hover .photo-top-album-name,
 	&:hover .caption {
 		bottom: 0px;
@@ -1392,8 +1419,8 @@ ul.tabs {
 	background: url("../../../images/icons/22/image.png") no-repeat top left;
 	padding-left: 23px;
 	min-height: 22px;
-	padding-top: 6px; 
-	/* a { display: block;}*/ 
+	padding-top: 6px;
+	/* a { display: block;}*/
 }
 
 #photo-caption {
@@ -1441,14 +1468,14 @@ ul.tabs {
             top: 10px;
 	    left: -10px;
         }
-	.contact-photo { 
+	.contact-photo {
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
 	}
 	.contact-photo-menu-button {
 		left: 0px;
 		top: 63px;
-	}	
+	}
 }
 
 /* messages */
@@ -1469,10 +1496,10 @@ ul.tabs {
 	background-color: @MailListBackgroundColor;
 	margin-bottom: 5px;
 	width: 100%; height: auto; overflow: hidden;
-	
+
 	span { display: block; float: left; width: 20%; overflow: hidden;}
-	
-	.mail-subject { 
+
+	.mail-subject {
 		width: 30%;
 		padding:4px 0px 0px 4px;
 		a { display: block; }
@@ -1481,7 +1508,7 @@ ul.tabs {
 	.mail-date { padding: 4px 4px 0px 4px; }
 	.mail-from { padding: 4px 4px 0px 4px; }
 	.mail-count { padding: 4px 4px 0px 4px; text-align: right;}
-	
+
 	.mail-delete { float: right; }
 }
 
@@ -1493,7 +1520,7 @@ ul.tabs {
 	span { float: left; overflow: hidden; padding: 4px 0px 0px 10px;}
 	.mail-delete { float: right;  .opaque(0.5);}
 	&:hover .mail-delete { .opaque(1); }
-	
+
 }
 
 /* theme screenshot */
@@ -1522,7 +1549,7 @@ footer { height: 100px; display: table-row; }
 	font-weight: bold;
 	background-color: #FF0000;
 	padding: 0em 0.3em;
-	
+
 }
 #adminpage {
     dl {
@@ -1569,20 +1596,20 @@ footer { height: 100px; display: table-row; }
     }
     table {
         width:100%;
-        border-bottom: 1px solid #000000; 
+        border-bottom: 1px solid #000000;
         margin: 5px 0px;
-        th { 
+        th {
             text-align: left;
         }
-        td .icon { 
+        td .icon {
             float: left;
         }
-        tr:hover { 
+        tr:hover {
             background-color: #bbc7d7;
         }
     }
-    table#users img { 
-            width: 16px; height: 16px; 
+    table#users img {
+            width: 16px; height: 16px;
     }
     .selectall { text-align: right; }
 }

From 646ea377acd4ed15e54b65a33c8e3a9c7b347b15 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 24 May 2015 10:28:15 +0200
Subject: [PATCH 03/20] quattro: readd video delete button styles because i'm
 not so good at resolving merge conflicts...

---
 view/theme/quattro/dark/style.css  |  21 +++
 view/theme/quattro/green/style.css |  21 +++
 view/theme/quattro/lilac/style.css |  21 +++
 view/theme/quattro/quattro.less    | 270 ++++++++++++++++-------------
 4 files changed, 211 insertions(+), 122 deletions(-)

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 1ec672d227..c8bd7d406b 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1965,6 +1965,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 89dc3dad86..9c18771fff 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1965,6 +1965,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 11adc44b92..97cf540fc2 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -1965,6 +1965,27 @@ ul.tabs li .active {
   width: 50px;
   float: left;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 200px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 200px!important;
+  height: 132px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}
 /* photo albums */
 #photo-edit-link-wrap {
   margin-bottom: 10px;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 480effd501..fbfb4bcb30 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -56,7 +56,7 @@ blockquote {
         padding: 1em;
         margin-left: 1em;
         border-left: 1em solid @BlockquoteBorderColor;
-    
+
 }
 
 code {
@@ -81,8 +81,8 @@ code {
 	list-style: none;
 	border: 3px solid @MenuBorder;
 	z-index: 100000;
-	
-	.shadow();	
+
+	.shadow();
 }
 
 
@@ -134,7 +134,7 @@ header {
 	#site-location {
 		display: none;
 	}
-	
+
 	#banner {
 		overflow: hidden;
                 text-align: center;
@@ -145,7 +145,7 @@ header {
 	}
 }
 /* nav */
-nav { 
+nav {
 	width: 100%; height: 32px;
 	position: fixed; left: 0px; top: 0px;
 	padding: 0px;
@@ -159,13 +159,13 @@ nav {
 		ul {
 			margin: 0px;
 			padding: 0px 20px;
-			li { 
-				list-style: none; 
+			li {
+				list-style: none;
 				margin: 0px; padding: 0px;
 				float: left;
 				.menu-popup{ left: 0px; right: auto; }
 			}
-			
+
 		}
 
 		.nav-menu-icon {
@@ -174,11 +174,11 @@ nav {
 			padding: 5px;
 			margin: 0px 10px;
 			.roundtop();
-			
+
 			&.selected {
 				background-color: @NavbarSelectedBg;
 			}
-			
+
 				img { width: 22px; height: 22px; }
 				.nav-notify { top: 3px; }
 		}
@@ -193,7 +193,7 @@ nav {
 			&.selected {
 				border-bottom: 3px solid @NavbarSelectedBorder;
 			}
-			
+
 		}
 
 		.nav-notify {
@@ -207,26 +207,26 @@ nav {
 			right: -10px;
 			min-width: 15px;
 			text-align: right;
-			
+
 				&.show{ display: block; }
 		}
-		
-		
+
+
 		#nav-help-link,
 		#nav-search-link,
 		#nav-directory-link,
 		#nav-apps-link,
-		#nav-site-linkmenu { 
+		#nav-site-linkmenu {
 			float: right;
 			.menu-popup{ right: 0px; left: auto; }
 		}
-	
+
 		#nav-notifications-linkmenu.on .icon.s22.notify,
 		#nav-notifications-linkmenu.selected .icon.s22.notify   { background-image: url("../../../images/icons/22/notify_on.png") }
                 #nav-introductions-link.on .icon.s22.intro,
 		#nav-introductions-link.selected .icon.s22.intro        { background-image: url("icons/contacts_on.png") }
 		#nav-messages-link.on .icon.s22.mail,
-		#nav-messages-link.selected .icon.s22.mail              { background-image: url("icons/messages_on.png") }		
+		#nav-messages-link.selected .icon.s22.mail              { background-image: url("icons/messages_on.png") }
 		#nav-apps-link.selected { background-color: @NavbarSelectedBg; }
 }
 
@@ -242,9 +242,9 @@ ul.menu-popup {
 	list-style: none;
 	border: 3px solid @MenuBorder;
 	z-index: 100000;
-	
+
 	.shadow();
-	
+
 		a { display: block; color: @MenuItem; padding: 5px 10px; text-decoration: none;}
 		a:hover { background-color: @MenuItemHoverBg; }
 		.menu-sep  { border-top: 1px solid @MenuItemSeparator; }
@@ -256,12 +256,12 @@ ul.menu-popup {
 			color: @MenuEmpty;
 		}
 		.toolbar {
-			background-color:  @MenuEmpty; 
+			background-color:  @MenuEmpty;
 			height: auto; overflow: auto;
 			a { float: right; }
 			a:hover { background-color: @MenuBg; }
 		}
-		
+
 }
 
 /* autocomplete popup */
@@ -275,7 +275,7 @@ ul.menu-popup {
 	z-index:100000;
 	.shadow();
 }
-.autocomplete > div, 
+.autocomplete > div,
 .acpopupitem {
 	color: @MenuItem; padding: 4px;
 	clear:left;
@@ -305,7 +305,7 @@ ul.menu-popup {
 
 
 /* aside 230px*/
-aside { 
+aside {
 	display: table-cell;
 	vertical-align: top;
 	width: 200px;
@@ -320,7 +320,7 @@ aside {
 		dl { height: auto; overflow: auto; }
 		dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
 		dd {float: left; margin-left: 4px; width: 60%;}
-	
+
 	}
 
 	#profile-extra-links {
@@ -337,7 +337,7 @@ aside {
 		text-transform:uppercase;
 		padding: 4px 2px 2px 35px;
                 margin-top: 3px;
-		
+
 		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
 	}
 	#dfrn-request-link {
@@ -348,12 +348,12 @@ aside {
 		font-weight: bold;
 		text-transform:uppercase;
 		padding: 4px 2px 2px 35px;
-		
+
 		&:hover { text-decoration: none; background-color: @AsideConnectHoverBg; }
 	}
 
 	#profiles-menu { width: 20em; }
-        
+
         .posted-date-selector-months { margin-left: 10px; }
 }
 
@@ -420,11 +420,11 @@ aside {
 	width: 60px;
 	height: 60px;
 }*/
- 
+
 /* widget */
 .widget {
 	margin-bottom: 2em;
-	
+
 	h3 { padding: 0px; margin: 2px;}
 	.action { .opaque(0.1); }
 	input.action { .opaque(0.5); }
@@ -434,14 +434,14 @@ aside {
 
 	ul { padding: 0px;}
 	ul li {padding-left: 16px; min-height: 16px; list-style: none; }
-	
+
 	.tool.selected {
 		background: url('../../../images/selected.png') no-repeat left center;
 	}
-	
+
 	/*.action .s10 { width: 10px; overflow: hidden; padding: 0px;}
 	.action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/
-	
+
 }
 
 /* widget: search */
@@ -452,7 +452,7 @@ aside {
 
 
 /* section 800px */
-section { 
+section {
 	display: table-cell;
 	vertical-align: top;
 	width: 770px;
@@ -464,7 +464,7 @@ section {
 }
 
 /* wall item */
-.tread-wrapper { 
+.tread-wrapper {
 	background-color: @ThreadBackgroundColor;
 	position: relative;
 	padding: 10px;
@@ -478,10 +478,10 @@ section {
 .wall-item-container {
 	display: table;
 	width: 750px;
-	
+
 	.wall-item-item,
 	.wall-item-bottom { display: table-row; }
-	
+
 	.wall-item-bottom { .opaque(0.5); }
 	&:hover .wall-item-bottom { .opaque(1); }
 	.wall-item-info {
@@ -489,8 +489,8 @@ section {
 		vertical-align: top;
 		text-align: left;
 		width: 60px;
-		
-	} 
+
+	}
 	.wall-item-location {
 		word-wrap: break-word;
 		width: 50px;
@@ -503,45 +503,45 @@ section {
 	}
 	.wall-item-content img { max-width: 700px; }
 	.wall-item-links,
-	.wall-item-actions { 
-		display: table-cell; 
-		vertical-align: middle; 
-		
+	.wall-item-actions {
+		display: table-cell;
+		vertical-align: middle;
+
 		.icon {
 			.opaque(0.5);
 		}
 		.icon:hover  {
 			.opaque(1.0);
-		}		
+		}
 	}
-	
+
 	.wall-item-ago { padding-right: 40px; }
 	.wall-item-name { font-weight: bold; }
-	
+
 	.wall-item-actions-author { float: left; width: 20em; margin-top: 0.5em; }
 	.wall-item-actions-social { float: left; margin-top: 0.5em;
 		a { margin-right: 3em; }
 	 }
-	.wall-item-actions-tools { float: right; width: 15%; 
+	.wall-item-actions-tools { float: right; width: 15%;
 		a { float: right; }
 		input { float: right; }
 	}
-		
+
 }
 
 
 .wall-item-container.comment {
 	.contact-photo-wrapper { margin-left: 16px; }
-	.contact-photo { 
-		width: 32px; height: 32px; 
+	.contact-photo {
+		width: 32px; height: 32px;
 	}
-	
+
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 0px !important;
 	}
 	.wall-item-links { padding-left: 12px; }
-	
+
 	.commentbox {
 		height: 0px;
 		overflow: hidden;
@@ -551,7 +551,7 @@ section {
 		}
 		.transition();
 	}
-	
+
 	&:hover .commentbox {
 		height:auto; overflow: visible;
 		.wall-item-comment-wrapper {
@@ -568,9 +568,9 @@ section {
 		.opaque(0.5);
 	}
 	.contact-photo-wrapper { margin-left: 32px; }
-	.contact-photo { 
+	.contact-photo {
 		width: 16px; height: 16px;
-	}	
+	}
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 15px !important;
@@ -581,8 +581,8 @@ section {
 .wall-item-comment-wrapper {
 	margin: 1em 2em 1em 60px;
 	.comment-edit-photo { display: none; }
-	
-	textarea {	
+
+	textarea {
 		height: 1em; width: 100%; font-size: 10px;
 		color: @CommentBoxEmptyColor;
 		border: 1px solid @CommentBoxEmptyBorderColor;
@@ -593,7 +593,7 @@ section {
 		color: @CommentBoxFullColor;
 		border: 1px solid @CommentBoxFullBorderColor;
 	}
-	
+
 	&.photo {
 		margin: 1em 2em 1em 0px;
 	}
@@ -606,10 +606,10 @@ section {
 	border: 1px solid @Grey5;
 	margin-top: 10px;
 	background-color: @JotPreviewBackgroundColor;
-	
+
 	.contact-photo { width: 32px; height: 32px; margin-left: 16px;
 		/*background: url(../../../images/icons/22/user.png) no-repeat center center;*/
-	}	
+	}
 	.contact-photo-menu-button {
 		top: 15px !important;
 		left: 15px !important;
@@ -617,8 +617,8 @@ section {
 	.wall-item-links { padding-left: 12px; }
 
 	.wall-item-container { width: 90%; }
-	.tread-wrapper { 
-		width: 90%; padding: 0; margin: 10px 0; 
+	.tread-wrapper {
+		width: 90%; padding: 0; margin: 10px 0;
 		background-color: @JotPreviewBackgroundColor;
 		border-bottom: 0px;
 	}
@@ -664,7 +664,7 @@ section {
     opacity: 0.5;
 }*/
 
-.wwto { 
+.wwto {
         position: absolute !important;
         background: #FFFFFF;
         border: 2px solid @Metalic3;
@@ -693,7 +693,7 @@ section {
                     float: none;
                     margin-right: 0px;
             }
-	
+
 }
 .type-link {
         blockquote {
@@ -733,7 +733,7 @@ blockquote.shared_content {
 
 
 .oembed.video {
-	> a.embed_video { 
+	> a.embed_video {
 		display: block;
 		float: none;
 		> div {
@@ -751,45 +751,45 @@ blockquote.shared_content {
 .children {
 	margin-top: 1em;
 	.hide-comments-outer { margin-left:60px; }
-	
+
 	.wwto { display: none; }
-	
+
 	.comment-edit-preview { width: 660px;
 		.wall-item-container { width: 610px; }
 	 }
-	
+
 	& .children {
-		
+
 		margin-left: 40px;
 		.wall-item-container { width: 710px; }
 		.comment-edit-preview { width: 620px;
 			.wall-item-container { width: 620px; }
 		 }
-	
+
 		& .children {
 			.wall-item-container { width: 670px; }
-			.comment-edit-preview { width: 580px; 
+			.comment-edit-preview { width: 580px;
 				.wall-item-container { width: 580px; }
 			}
-		
+
 			& .children {
 				.wall-item-container { width: 630px; }
-				.comment-edit-preview { width: 540px; 
+				.comment-edit-preview { width: 540px;
 					.wall-item-container { width: 540px; }
 				}
 
 				& .children {
 					.wall-item-container { width: 590px; }
-					.comment-edit-preview { width: 500px; 
+					.comment-edit-preview { width: 500px;
 						.wall-item-container { width: 500px; }
 					}
-					
+
 					.children {
 						margin-left: 0px;
 						.hide-comments-outer { margin-left: 0px; }
 					}
 				}
-			}		
+			}
 		}
 	}
 }
@@ -818,8 +818,8 @@ span[id^="showmore-wrap"] {
 .contact-select {	position: absolute; top:64px; left:64px; display:none; }
 .contact-select:checked,
 .contact-photo:hover .contact-select {	display:block; }
-#contacts-actions { 
-	position: absolute; 
+#contacts-actions {
+	position: absolute;
 	left: 800px;
 	width: 200px;
 	background-color: @MenuBg;
@@ -843,12 +843,12 @@ span[id^="showmore-wrap"] {
 	#contacts-actions { left: 40px; }
 }
 
-.contact-photo { 
+.contact-photo {
 	width: 48px; height: 48px;
 	img { width: 48px; height: 48px; }
 	overflow: hidden;
 	display: block;
- }		
+ }
 .contact-photo-menu-button {
 	display: none;
 	position: absolute;
@@ -862,30 +862,30 @@ span[id^="showmore-wrap"] {
 	height: 90px;
 	padding-right: 10px;
 	margin: 0 10px 10px 0px;
-	.contact-photo-wrapper { 
-		float: left; 
+	.contact-photo-wrapper {
+		float: left;
 		margin-right: 10px;
 	}
-	.contact-photo { 
+	.contact-photo {
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
 	}
 	.contact-photo-menu-button {
 		left: 0px;
 		top: 63px;
-	}	
+	}
 }
 .directory-item {
 	float: left;
 	width: 200px;
 	height: 200px;
-	.contact-photo { 
+	.contact-photo {
 		width: 175px; height: 175px;
 		img { width: 175px; height: 175px; }
 	}
 }
 .contact-name { font-weight: bold; padding-top: 15px; }
-.contact-details { 
+.contact-details {
 	color: @Grey3; white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -896,8 +896,8 @@ span[id^="showmore-wrap"] {
 #jot {
 
 	width: 100%;
-	margin: 0px 2em 20px 0px;	
-	
+	margin: 0px 2em 20px 0px;
+
 	.profile-jot-text {
 		height: 1em; width: 99%; font-size: 10px;
 		color: @CommentBoxEmptyColor;
@@ -944,7 +944,7 @@ span[id^="showmore-wrap"] {
 				border-left: 10px solid @JotPermissionLockBackgroundColor;
 				background-color: @JotPermissionLockBackgroundColor;
 			}
-			
+
 		}
 		li.submit {
 			float: right;
@@ -990,12 +990,12 @@ span[id^="showmore-wrap"] {
 
 		&:-moz-placeholder {
 			font-weight: normal;
-		}		
-	
+		}
+
 		&:hover { border: 1px solid @CommentBoxEmptyBorderColor }
 		&:focus { border: 1px solid @CommentBoxEmptyBorderColor }
 	}
-	
+
 	#character-counter {
 		width: 40px;
 		float: right;
@@ -1004,7 +1004,7 @@ span[id^="showmore-wrap"] {
 		line-height: 20px;
 		padding-right: 20px;
 	}
-	
+
 	#jot-category {
 		border: 0px;
 		margin: 0px;
@@ -1073,7 +1073,7 @@ span[id^="showmore-wrap"] {
 	overflow: auto;
 }
 #acl-list-content {
-	
+
 }
 .acl-list-item {
 	display: block;
@@ -1090,7 +1090,7 @@ span[id^="showmore-wrap"] {
 	margin: 4px;
 }
 .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
+.acl-list-item a {
 	font-size: 8px;
 	display: block;
 	width: 40px;
@@ -1135,12 +1135,12 @@ ul.tabs {
     li {
         float: left;
         margin-left: 20px;
-        
+
         .active {
 			border-bottom: 1px solid @LinkVisited;
         }
     }
-    
+
 }
 
 
@@ -1149,7 +1149,7 @@ ul.tabs {
 #group-update-wrapper{
 	height: auto; overflow: auto;
 	#group {
-		width:300px; 
+		width:300px;
 		float:left;
 		margin-right:20px;
 	}
@@ -1191,13 +1191,13 @@ ul.tabs {
 	input[type="checkbox"], input[type="radio"]{
 		width: auto;
 	}
-	
+
 	textarea { height: 100px; }
 	.field_help {
 		display: block;
 		margin-left: 200px;
 		color: @FieldHelpColor;
-		
+
 	}
 
 
@@ -1272,7 +1272,7 @@ ul.tabs {
 }
 #profile-edit-profile-name,
 #profile-edit-name,
-#gender-select, 
+#gender-select,
 #profile-edit-pdesc,
 #profile-edit-gender,
 #profile-edit-dob,
@@ -1297,7 +1297,7 @@ ul.tabs {
 	height: auto; overflow: auto;
 	border-bottom: 2px solid #cccccc;
 	padding-bottom: 1em;
-	margin-bottom: 1em;	
+	margin-bottom: 1em;
 }
 .oauthapp img {
 	float: left;
@@ -1318,11 +1318,37 @@ ul.tabs {
 	width: 50px; float: left;
 }
 
+/* videos page */
+.videos {
+	.video-top-wrapper {
+		width: 200px; float: left;
+		margin: 0px 10px 10px 0px;
+		position: relative;
+
+		.video-js {
+			width: 200px!important;
+			height: 132px!important;
+		}
+
+		.video-delete {
+			position: absolute;
+			opacity: 0;
+			right: 0px;
+			top: 0px;
+			transition: opacity 0.5s;
+		}
+
+		&:hover .video-delete {
+			opacity: 1;
+		}
+	}
+}
+
 /* photo albums */
 @photosize: 150px;
 
 #photo-edit-link-wrap { margin-bottom: 10px; }
-	
+
 #album-edit-link {
 	border-right: 1px solid @MenuBorder;
 	float: left;
@@ -1355,21 +1381,21 @@ ul.tabs {
 	width:@photosize; height: @photosize;
 	position: relative;
 	overflow: hidden;
-	
+
 	img { width: @photosize; }
-		
+
 	.photo-top-album-name,
 	.caption{
 		position: absolute;
 		color: @Menu;
 		background-color: @MenuBg;
-		
+
 		width: 100%;
 		.shadow(0px, 5px);
 		.transition(0.5s);
 		bottom: -@photosize;
 	}
-	
+
 	&:hover .photo-top-album-name,
 	&:hover .caption {
 		bottom: 0px;
@@ -1389,8 +1415,8 @@ ul.tabs {
 	background: url("../../../images/icons/22/image.png") no-repeat top left;
 	padding-left: 23px;
 	min-height: 22px;
-	padding-top: 6px; 
-	/* a { display: block;}*/ 
+	padding-top: 6px;
+	/* a { display: block;}*/
 }
 
 #photo-caption {
@@ -1438,14 +1464,14 @@ ul.tabs {
             top: 10px;
 	    left: -10px;
         }
-	.contact-photo { 
+	.contact-photo {
 		width: 80px; height: 80px;
 		img { width: 80px; height: 80px; }
 	}
 	.contact-photo-menu-button {
 		left: 0px;
 		top: 63px;
-	}	
+	}
 }
 
 /* messages */
@@ -1466,10 +1492,10 @@ ul.tabs {
 	background-color: @MailListBackgroundColor;
 	margin-bottom: 5px;
 	width: 100%; height: auto; overflow: hidden;
-	
+
 	span { display: block; float: left; width: 20%; overflow: hidden;}
-	
-	.mail-subject { 
+
+	.mail-subject {
 		width: 30%;
 		padding:4px 0px 0px 4px;
 		a { display: block; }
@@ -1478,7 +1504,7 @@ ul.tabs {
 	.mail-date { padding: 4px 4px 0px 4px; }
 	.mail-from { padding: 4px 4px 0px 4px; }
 	.mail-count { padding: 4px 4px 0px 4px; text-align: right;}
-	
+
 	.mail-delete { float: right; }
 }
 
@@ -1490,7 +1516,7 @@ ul.tabs {
 	span { float: left; overflow: hidden; padding: 4px 0px 0px 10px;}
 	.mail-delete { float: right;  .opaque(0.5);}
 	&:hover .mail-delete { .opaque(1); }
-	
+
 }
 
 /* theme screenshot */
@@ -1519,7 +1545,7 @@ footer { height: 100px; display: table-row; }
 	font-weight: bold;
 	background-color: #FF0000;
 	padding: 0em 0.3em;
-	
+
 }
 #adminpage {
     dl {
@@ -1566,20 +1592,20 @@ footer { height: 100px; display: table-row; }
     }
     table {
         width:100%;
-        border-bottom: 1px solid #000000; 
+        border-bottom: 1px solid #000000;
         margin: 5px 0px;
-        th { 
+        th {
             text-align: left;
         }
-        td .icon { 
+        td .icon {
             float: left;
         }
-        tr:hover { 
+        tr:hover {
             background-color: #bbc7d7;
         }
     }
-    table#users img { 
-            width: 16px; height: 16px; 
+    table#users img {
+            width: 16px; height: 16px;
     }
     .selectall { text-align: right; }
 }

From d204e2524b5e61f56f98ba8bfeda286c2fe79d6f Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 24 May 2015 10:34:17 +0200
Subject: [PATCH 04/20] vier: style video delete button

---
 view/theme/vier/style.css | 77 +++++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 28 deletions(-)

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index e75934c8c5..e36bad4e31 100644
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -7,7 +7,7 @@
 @import url("css/font-awesome.css") all;
 @import url("css/font2.css") all;
 
-img { 
+img {
   border: 0px;
 }
 
@@ -32,7 +32,7 @@ img {
 }
 
 .admin.linklist {
-        border: 0px; 
+        border: 0px;
 	padding: 0px;
 	list-style: none;
 	margin-top: 0px;
@@ -135,7 +135,7 @@ img {
   padding: 1px;
   color: #999;
   vertical-align: text-top;
-} 
+}
 
 .icon:hover {
   text-decoration: none;
@@ -201,8 +201,8 @@ div.pager a {
   margin-left: 5px;
   margin-right: 5px;
 }
- 
-span.pager_first a, span.pager_n a, 
+
+span.pager_first a, span.pager_n a,
 span.pager_last a, span.pager_prev a, span.pager_next a,
 span.scroll_loader_text {
   color: darkgray;
@@ -389,7 +389,7 @@ code {
   opacity: 1;
 }
 
-.sidebar-group-li:hover, #sidebar-new-group:hover, #hide-forum-list:hover, 
+.sidebar-group-li:hover, #sidebar-new-group:hover, #hide-forum-list:hover,
 #sidebar-ungrouped:hover, .side-link:hover, .nets-ul li:hover, #forum-list div:hover,
 .nets-all:hover, .saved-search-li:hover, li.tool:hover, .admin.link:hover, aside h4 a:hover, #message-new:hover {
   /* background-color: #ddd; */
@@ -1466,7 +1466,7 @@ section.minimal {
 }
 
 #profile-jot-form #jot-title, #profile-jot-form #jot-category {
-    
+
          border-radius: 5px 5px 5px 5px;
     font-weight: bold;
     height: 20px;
@@ -1966,13 +1966,13 @@ ul.tabs a {
     margin-bottom: 2px;
 }
 
-#event-notice:hover, #birthday-notice:hover, ul.tabs li .active, 
+#event-notice:hover, #birthday-notice:hover, ul.tabs li .active,
 .comment-edit-submit-wrapper .fakelink:hover {
     color: black;
 }
 
-span.pager_current, span.pager_n a:hover, 
-span.pager_first a:hover, span.pager_last a:hover, 
+span.pager_current, span.pager_n a:hover,
+span.pager_first a:hover, span.pager_last a:hover,
 span.pager_prev a:hover, span.pager_next a:hover,
 ul.tabs a:hover {
   border-bottom: 2px solid #244C5E;
@@ -2092,7 +2092,7 @@ aside form .field label {
 
 .profile-edit-side-div {
 /*  display: none; */
-  float: right; 
+  float: right;
 }
 
 /* aside div.clear {
@@ -2169,9 +2169,9 @@ aside form .field label {
 .contact-photo-menu-button {
         position: relative;
         background-image: url("../../../images/icons/16/menu.png");
-        background-position: top left; 
+        background-position: top left;
         background-repeat: no-repeat;
-        margin: 0px 0px -16px 0px; 
+        margin: 0px 0px -16px 0px;
 	padding: 0px;
         width: 16px;
         height: 16px;
@@ -2179,7 +2179,7 @@ aside form .field label {
         overflow: hidden;
         text-indent: 40px;
         display: none;
-        
+
 }
 .contact-photo-menu {
         width: 11em;
@@ -2194,13 +2194,13 @@ aside form .field label {
 }
 .contact-photo-menu ul { margin:0px; padding: 0px; list-style: none }
 .contact-photo-menu li a {
-	display: block; 
-	padding: 5px 10px; 
+	display: block;
+	padding: 5px 10px;
 	color: #2d2d2d;
 	text-decoration: none;
 }
 .contact-photo-menu li a:hover {
-	background-color: #bdcdd4; 
+	background-color: #bdcdd4;
 }
 
 /* page footer */
@@ -2237,7 +2237,7 @@ blockquote {
 }
 
 .contact-block-textdiv { width: 150px; height: 34px; float: left; }
-#contact-block-end { clear: both; } 
+#contact-block-end { clear: both; }
 
 #group-edit-wrapper {
         margin-bottom: 10px;
@@ -2426,7 +2426,7 @@ a.mail-list-link {
         clear: both;
 }
 
- 
+
 .calendar {
         font-family: Courier, monospace;
 }
@@ -2574,14 +2574,14 @@ a.mail-list-link {
         float: left;
         margin-top: 15px;
         margin-right: 15px;
-        width: 200px; height: 200px; 
-        overflow: hidden; 
+        width: 200px; height: 200px;
+        overflow: hidden;
 }
 .photo-top-album-name {
         width: 100%;
         min-height: 2em;
-        position: absolute; 
-        bottom: 0px; 
+        position: absolute;
+        bottom: 0px;
         padding: 0px 3px;
         padding-top: 0.5em;
         background-color: rgb(255, 255, 255);
@@ -2612,15 +2612,15 @@ a.mail-list-link {
 .menu-profile-list-item{
         padding-left: 5px;
         vertical-align: middle;
-        }       
-.menu-profile-list-item:hover{  
+        }
+.menu-profile-list-item:hover{
         text-decoration: none;
    }
 
 .autocomplete {
   width: 350px;
-  color: black; 
-  border: 1px solid rgb(210, 210, 210); 
+  color: black;
+  border: 1px solid rgb(210, 210, 210);
   background-color: white;
   cursor: pointer;
   text-align: left;
@@ -2628,7 +2628,7 @@ a.mail-list-link {
   overflow: auto;
   display: block;
   background-position: initial initial;
-  background-repeat: initial initial; 
+  background-repeat: initial initial;
 }
 .mail-list-wrapper {
   background-color: #f6f7f8;
@@ -2828,3 +2828,24 @@ a.mail-list-link {
 .profile-view-actions{
   float:right;
 }
+/* videos page */
+.videos .video-top-wrapper {
+  width: 300px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 300px!important;
+  height: 232px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}

From 8990a22dc066d91e1ca5613d1365a855677b4bdc Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 24 May 2015 10:35:55 +0200
Subject: [PATCH 05/20] duepuntozer: style video delete button

---
 view/theme/duepuntozero/style.css | 140 +++++++++++++++++-------------
 1 file changed, 81 insertions(+), 59 deletions(-)

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 024e63f5f6..34d7f1c25c 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -22,7 +22,7 @@ a:hover {text-decoration: underline; }
 input {
 	border: 1px solid #666666;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 	padding: 3px;
 }
 
@@ -50,7 +50,7 @@ code {
 	background: #EEE;
 	color: #444;
 	padding: 10px;
-	margin-top: 20px; 
+	margin-top: 20px;
 }
 
 blockquote {
@@ -91,7 +91,7 @@ nav {
 	display: block;
 	margin: 0px 10%;
 	border-bottom: 1px solid #babdb6;
-	position: relative; 
+	position: relative;
 }
 nav #site-location {
 	color: #888a85;
@@ -151,9 +151,9 @@ nav #banner #logo-text a:hover { text-decoration: none; }
 	border: 1px solid #babdb6;
 	border-bottom: 0px;
 	background-color: #aec0d3;
-	color: #565854;		
+	color: #565854;
 	-moz-border-radius: 3px 3px 0px 0px;
-	border-radius: 3px 3px 0px 0px;	
+	border-radius: 3px 3px 0px 0px;
 }
 nav .nav-link {
 	float: right;
@@ -173,7 +173,7 @@ nav .nav-link {
 .nav-ajax-left {
 	font-size: 0.8em;
 	float: left;
-	margin-top: 62px;	
+	margin-top: 62px;
 }
 
 
@@ -228,12 +228,12 @@ section {
 	background-position: top right;
 	background-repeat: no-repeat;
 	min-height: 112px;
-	
+
 }
 .tabs {
 	height: 27px;
 	background-image: url(head.jpg);
-	background-repeat: repeat-x;	
+	background-repeat: repeat-x;
 	background-position: 0px -20px;
 	border-bottom: 1px solid #babdb6;
 	padding:0px;
@@ -248,7 +248,7 @@ section {
 }
 .tab.active {
 	font-weight: bold;
-	
+
 }
 
 
@@ -278,14 +278,14 @@ div.wall-item-content-wrapper.shiny {
 }
 
 /* from default */
-#jot-perms-icon, 
+#jot-perms-icon,
 #profile-location,
 #profile-nolocation,
-#profile-youtube, 
-#profile-video, 
+#profile-youtube,
+#profile-video,
 #profile-audio,
 #profile-link,
-#profile-title, 
+#profile-title,
 #wall-image-upload,
 #wall-file-upload,
 #profile-upload-wrapper,
@@ -313,13 +313,13 @@ div.wall-item-content-wrapper.shiny {
 #jot-category::-webkit-input-placeholder{font-weight: normal;}
 #jot-title:-moz-placeholder{font-weight: normal;}
 #jot-category:-moz-placeholder{font-weight: normal;}
-		
-	
+
+
 #jot-title:hover,
 #jot-title:focus,
 #jot-category:hover,
 #jot-category:focus {
-	border: 1px solid #cccccc; 
+	border: 1px solid #cccccc;
 }
 
 .jothidden { display:none; }
@@ -343,7 +343,7 @@ div.wall-item-content-wrapper.shiny {
 .group-selected, .nets-selected, .fileas-selected, .categories-selected {
 	padding: 3px;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 	border: 1px solid #CCCCCC;
 	background: #F8F8F8;
 	font-weight: bold;
@@ -352,7 +352,7 @@ div.wall-item-content-wrapper.shiny {
 .settings-widget .selected {
 	padding: 3px;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 	border: 1px solid #CCCCCC;
 	background: #F8F8F8;
 	font-weight: bold;
@@ -813,7 +813,7 @@ input#dfrn-url {
     clear: left;
     color: #666666;
     display: block;
-    margin-bottom: 20px	
+    margin-bottom: 20px
 }
 
 #profile-edit-profile-name-end,
@@ -944,7 +944,7 @@ input#dfrn-url {
 	border: 1px solid #CCC;
 	position: relative;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 }
 
 .tread-wrapper .tread-wrapper {
@@ -987,7 +987,7 @@ input#dfrn-url {
 	display: block;
 	position: absolute;
 	background-image: url("photo-menu.jpg");
-	background-position: top left; 
+	background-position: top left;
 	background-repeat: no-repeat;
 	margin: 0px; padding: 0px;
 	width: 16px;
@@ -996,7 +996,7 @@ input#dfrn-url {
 	overflow: hidden;
 	text-indent: 40px;
 	display: none;
-	
+
 }
 .wall-item-photo-menu {
 	width: auto;
@@ -1047,7 +1047,7 @@ input#dfrn-url {
 	/*margin-top: 10px;*/
     left: 105px;
     position: absolute;
-    top: 1px;	
+    top: 1px;
 }
 .comment .wall-item-lock {
 	left: 65px;
@@ -1100,11 +1100,11 @@ input#dfrn-url {
 }
 .star-item {
 	margin-left: 10px;
-	float: left;	
+	float: left;
 }
 .tag-item {
 	margin-left: 10px;
-	float: left;	
+	float: left;
 }
 
 .filer-item {
@@ -1141,7 +1141,7 @@ input#dfrn-url {
 	border: none;
 }
 .comment .wall-item-photo {
-	width: 50px !important; 
+	width: 50px !important;
 	height: 50px !important;
 }
 .wall-item-content {
@@ -1240,7 +1240,7 @@ blockquote.shared_content {
 
 .comment .wall-item-tools {
 	background:none;
-} 
+}
 
 .comment-edit-wrapper {
 	margin-top: 15px;
@@ -1270,7 +1270,7 @@ blockquote.shared_content {
 	float: left;
 	margin-top: 10px;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 	border: 1px solid #cccccc;
 	padding: 3px 1px 1px 3px;
 }
@@ -1676,7 +1676,7 @@ blockquote.shared_content {
 .contact-photo-menu-button {
 	position: absolute;
 	background-image: url("photo-menu.jpg");
-	background-position: top left; 
+	background-position: top left;
 	background-repeat: no-repeat;
 	margin: 0px; padding: 0px;
 	width: 16px;
@@ -1685,7 +1685,7 @@ blockquote.shared_content {
 	overflow: hidden;
 	text-indent: 40px;
 	display: none;
-	
+
 }
 .contact-photo-menu {
 	width: auto;
@@ -1723,7 +1723,7 @@ blockquote.shared_content {
 	border: 1px solid #cccccc;
 	padding: 3px 0px 0px 5px;
 	-moz-border-radius: 3px;
-	border-radius: 3px;	
+	border-radius: 3px;
 }
 
 
@@ -1777,7 +1777,7 @@ blockquote.shared_content {
 	overflow: auto;
 }
 #acl-list-content {
-	
+
 }
 .acl-list-item {
 	display: block;
@@ -1794,7 +1794,7 @@ blockquote.shared_content {
 	margin: 4px;
 }
 .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}
-.acl-list-item a { 
+.acl-list-item a {
 	font-size: 8px;
 	display: block;
 	width: 40px;
@@ -2111,15 +2111,15 @@ aside input[type='text'] {
 	margin-top: 15px;
 	margin-right: 15px;
 	margin-left: 15px;
-/*	width: 200px; height: 200px; 
-	overflow: hidden; 
+/*	width: 200px; height: 200px;
+	overflow: hidden;
 	position: relative; */
 }
 .photo-album-image-wrapper .caption {
-	display: none; 
+	display: none;
  	width: 100%;
 /* 	position: absolute; */
- 	bottom: 0px; 
+ 	bottom: 0px;
  	padding: 0.5em 0.5em 0px 0.5em;
  	background-color: rgba(245, 245, 255, 0.8);
  	border-bottom: 2px solid #CCC;
@@ -2141,14 +2141,14 @@ aside input[type='text'] {
 	margin-right: 15px;
 	margin-left: 15px;
 	margin-bottom: 15px;
-/*	width: 200px; height: 200px; 
+/*	width: 200px; height: 200px;
 	overflow: hidden; */
 }
 .photo-top-album-name {
  	width: 100%;
  	min-height: 2em;
 /* 	position: absolute;  */
- 	bottom: 0px; 
+ 	bottom: 0px;
  	padding: 0px 3px;
  	padding-top: 0.5em;
  	background-color: rgb(255, 255, 255);
@@ -2236,7 +2236,7 @@ aside input[type='text'] {
 }
 
 #profile-jot-banner-end {
-	/* clear: both; */ 
+	/* clear: both; */
 }
 
 #photos-upload-select-files-text {
@@ -2464,7 +2464,7 @@ aside input[type='text'] {
 }
 
 /* end from default */
-	
+
 
 .fn {
 	padding: 0px 0px 5px 12px;
@@ -2483,7 +2483,7 @@ aside input[type='text'] {
 
 #birthday-title {
 	float: left;
-	font-weight: bold;	
+	font-weight: bold;
 }
 
 #birthday-adjust {
@@ -2607,7 +2607,7 @@ aside input[type='text'] {
 	clear: both;
 }
 
- 
+
 .calendar {
 	font-family: Courier, monospace;
 }
@@ -2791,7 +2791,7 @@ aside input[type='text'] {
 
 
 #netsearch-box {
-	margin-top: 20px;	
+	margin-top: 20px;
 }
 
 #netsearch-box #search-submit {
@@ -2898,7 +2898,7 @@ aside input[type='text'] {
 .settings-heading {
 	border-bottom: 1px solid #babdb6;
 }
- 
+
 
 /**
  * Form fields
@@ -2924,7 +2924,7 @@ aside input[type='text'] {
 	display: block;
 	margin-left: 200px;
 	color: #666666;
-	
+
 }
 
 
@@ -2972,7 +2972,7 @@ aside input[type='text'] {
 	font-weight: bold;
 	background-color: #FF0000;
 	padding: 0em 0.3em;
-	
+
 }
 #adminpage dl {
 	clear: left;
@@ -3027,7 +3027,7 @@ aside input[type='text'] {
 /*
  * UPDATE
  */
-.popup { 	
+.popup {
 	width: 100%; height: 100%;
 	top:0px; left:0px;
 	position: absolute;
@@ -3048,7 +3048,7 @@ aside input[type='text'] {
 	border: 4px solid #000000;
 	background-color: #FFFFFF;
 }
-.popup .panel .panel_text { display: block; overflow: auto; height: 80%; } 
+.popup .panel .panel_text { display: block; overflow: auto; height: 80%; }
 .popup .panel .panel_in { width: 100%; height: 100%;	position: relative; }
 .popup .panel .panel_actions {  width: 100%; bottom: 4px; left: 0px; position: absolute; }
 .panel_text .progress { width: 50%; overflow: hidden; height: auto; border: 1px solid #cccccc; margin-bottom: 5px}
@@ -3061,7 +3061,7 @@ aside input[type='text'] {
 	height: auto; overflow: auto;
 	border-bottom: 2px solid #cccccc;
 	padding-bottom: 1em;
-	margin-bottom: 1em;	
+	margin-bottom: 1em;
 }
 .oauthapp img {
 	float: left;
@@ -3365,7 +3365,7 @@ ul.menu-popup {
 }
 
 #recip {
-	
+
 }
 .autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
 .autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px;  _margin:0; _overflow-x:hidden; }
@@ -3400,10 +3400,10 @@ ul.menu-popup {
 }
 @media all and (max-width: 760px) {
 	body { background-image: none; }
-	nav, aside, section, footer { 
-		margin: 0px; 
-		float: none; 
-		position: relative; 
+	nav, aside, section, footer {
+		margin: 0px;
+		float: none;
+		position: relative;
 		width: 100%;
 		padding: 0.5em;
 		height: auto;
@@ -3416,11 +3416,11 @@ ul.menu-popup {
 	aside { overflow: hidden; min-height: 0; height: 1em;}
 	aside:hover, aside:focus { height: auto; }
 
-	nav .nav-link { 
+	nav .nav-link {
 		float: left;
 		width: 23%;
 		min-width: 100px;
-		height: 15px;	
+		height: 15px;
 		display: block;
 		margin: 0.4em 2px 0 0;
 
@@ -3431,11 +3431,11 @@ ul.menu-popup {
 		background-color: rgb(174, 192,211)!important;
 	}
 	.nav-commlink.selected,
-	.nav-commlink { 
+	.nav-commlink {
 		border-bottom: 0px;
 		padding: 6px 3px;
 		min-width: 100px;
-		float: left; 
+		float: left;
 		margin-top: 0.4em;
 		width: 23%;
 		bottom: auto;
@@ -3446,3 +3446,25 @@ ul.menu-popup {
 	ul.menu-popup { left: 0px; top 20px; }
 
 }
+
+/* videos page */
+.videos .video-top-wrapper {
+  width: 300px;
+  float: left;
+  margin: 0px 10px 10px 0px;
+  position: relative;
+}
+.videos .video-top-wrapper .video-js {
+  width: 300px!important;
+  height: 232px!important;
+}
+.videos .video-top-wrapper .video-delete {
+  position: absolute;
+  opacity: 0;
+  right: 0px;
+  top: 0px;
+  transition: opacity 0.5s;
+}
+.videos .video-top-wrapper:hover .video-delete {
+  opacity: 1;
+}

From 258612d20c799f316f9787d953302ddb8fe86c85 Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Sun, 24 May 2015 10:39:36 +0200
Subject: [PATCH 06/20] update messages.po

---
 util/messages.po | 328 ++++++++++++++++++++++++-----------------------
 1 file changed, 168 insertions(+), 160 deletions(-)

diff --git a/util/messages.po b/util/messages.po
index 8303b778be..bf91a8fa58 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-21 10:43+0200\n"
+"POT-Creation-Date: 2015-05-24 10:38+0200\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"
@@ -29,9 +29,9 @@ msgstr ""
 #: ../../mod/photos.php:1084 ../../mod/photos.php:1203
 #: ../../mod/photos.php:1514 ../../mod/photos.php:1565
 #: ../../mod/photos.php:1609 ../../mod/photos.php:1697
-#: ../../mod/invite.php:140 ../../mod/events.php:491 ../../mod/mood.php:137
+#: ../../mod/invite.php:140 ../../mod/events.php:500 ../../mod/mood.php:137
 #: ../../mod/message.php:335 ../../mod/message.php:564
-#: ../../mod/profiles.php:686 ../../mod/install.php:248
+#: ../../mod/profiles.php:682 ../../mod/install.php:248
 #: ../../mod/install.php:286 ../../mod/crepair.php:190
 #: ../../mod/content.php:710 ../../mod/poke.php:199 ../../mod/localtime.php:45
 msgid "Submit"
@@ -233,7 +233,7 @@ msgid "Your photos"
 msgstr ""
 
 #: ../../view/theme/diabook/theme.php:127 ../../boot.php:2156
-#: ../../include/nav.php:80 ../../mod/events.php:382
+#: ../../include/nav.php:80 ../../mod/events.php:385
 msgid "Events"
 msgstr ""
 
@@ -260,7 +260,7 @@ msgid "event"
 msgstr ""
 
 #: ../../view/theme/diabook/theme.php:466
-#: ../../view/theme/diabook/theme.php:475 ../../include/diaspora.php:2060
+#: ../../view/theme/diabook/theme.php:475 ../../include/diaspora.php:2061
 #: ../../include/conversation.php:121 ../../include/conversation.php:130
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../mod/like.php:149 ../../mod/like.php:319 ../../mod/subthread.php:87
@@ -268,14 +268,14 @@ msgstr ""
 msgid "status"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:471 ../../include/diaspora.php:2060
+#: ../../view/theme/diabook/theme.php:471 ../../include/diaspora.php:2061
 #: ../../include/conversation.php:126 ../../include/conversation.php:253
 #: ../../include/text.php:1995 ../../mod/like.php:149
 #: ../../mod/subthread.php:87 ../../mod/tagger.php:62
 msgid "photo"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:480 ../../include/diaspora.php:2076
+#: ../../view/theme/diabook/theme.php:480 ../../include/diaspora.php:2077
 #: ../../include/conversation.php:137 ../../mod/like.php:166
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -375,7 +375,7 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: ../../index.php:382 ../../include/items.php:4838 ../../mod/attach.php:33
+#: ../../index.php:382 ../../include/items.php:4851 ../../mod/attach.php:33
 #: ../../mod/wallmessage.php:9 ../../mod/wallmessage.php:33
 #: ../../mod/wallmessage.php:79 ../../mod/wallmessage.php:103
 #: ../../mod/group.php:19 ../../mod/delegate.php:12
@@ -389,9 +389,9 @@ msgstr ""
 #: ../../mod/notes.php:20 ../../mod/network.php:4 ../../mod/photos.php:134
 #: ../../mod/photos.php:1050 ../../mod/follow.php:9 ../../mod/follow.php:39
 #: ../../mod/follow.php:78 ../../mod/uimport.php:23 ../../mod/invite.php:15
-#: ../../mod/invite.php:101 ../../mod/events.php:152 ../../mod/mood.php:114
+#: ../../mod/invite.php:101 ../../mod/events.php:155 ../../mod/mood.php:114
 #: ../../mod/message.php:38 ../../mod/message.php:174
-#: ../../mod/profiles.php:165 ../../mod/profiles.php:618
+#: ../../mod/profiles.php:165 ../../mod/profiles.php:614
 #: ../../mod/install.php:151 ../../mod/crepair.php:119 ../../mod/poke.php:135
 #: ../../mod/display.php:501 ../../mod/dfrn_confirm.php:55
 #: ../../mod/item.php:169 ../../mod/item.php:185
@@ -415,8 +415,9 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: ../../boot.php:751 ../../include/contact_widgets.php:205
-#: ../../object/Item.php:393 ../../mod/content.php:606
+#: ../../boot.php:751 ../../include/items.php:4962
+#: ../../include/contact_widgets.php:205 ../../object/Item.php:393
+#: ../../mod/content.php:606
 msgid "show more"
 msgstr ""
 
@@ -515,28 +516,28 @@ msgstr ""
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../boot.php:1600 ../../boot.php:1626 ../../mod/profiles.php:804
+#: ../../boot.php:1600 ../../boot.php:1626 ../../mod/profiles.php:800
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../boot.php:1601 ../../mod/profiles.php:805
+#: ../../boot.php:1601 ../../mod/profiles.php:801
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../boot.php:1611 ../../mod/profiles.php:816
+#: ../../boot.php:1611 ../../mod/profiles.php:812
 msgid "Profile Image"
 msgstr ""
 
-#: ../../boot.php:1614 ../../mod/profiles.php:818
+#: ../../boot.php:1614 ../../mod/profiles.php:814
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../boot.php:1615 ../../mod/profiles.php:819
+#: ../../boot.php:1615 ../../mod/profiles.php:815
 msgid "Edit visibility"
 msgstr ""
 
 #: ../../boot.php:1637 ../../include/event.php:42
-#: ../../include/bb2diaspora.php:155 ../../mod/events.php:483
+#: ../../include/bb2diaspora.php:155 ../../mod/events.php:492
 #: ../../mod/directory.php:136
 msgid "Location:"
 msgstr ""
@@ -803,12 +804,12 @@ msgstr ""
 msgid "Ability to mute notifications for a thread"
 msgstr ""
 
-#: ../../include/items.php:2330 ../../include/datetime.php:477
+#: ../../include/items.php:2330 ../../include/datetime.php:457
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/items.php:2331 ../../include/datetime.php:478
+#: ../../include/items.php:2331 ../../include/datetime.php:458
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
@@ -839,21 +840,22 @@ msgstr ""
 #: ../../mod/contacts.php:411 ../../mod/register.php:233
 #: ../../mod/dfrn_request.php:845 ../../mod/api.php:105
 #: ../../mod/suggest.php:29 ../../mod/follow.php:54 ../../mod/message.php:209
-#: ../../mod/profiles.php:661 ../../mod/profiles.php:664
+#: ../../mod/profiles.php:657 ../../mod/profiles.php:660
 msgid "Yes"
 msgstr ""
 
 #: ../../include/items.php:4686 ../../include/conversation.php:1128
 #: ../../mod/settings.php:622 ../../mod/settings.php:648
-#: ../../mod/contacts.php:414 ../../mod/editpost.php:148
-#: ../../mod/dfrn_request.php:859 ../../mod/fbrowser.php:81
-#: ../../mod/fbrowser.php:116 ../../mod/suggest.php:32
-#: ../../mod/photos.php:203 ../../mod/photos.php:292 ../../mod/follow.php:65
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/message.php:212
+#: ../../mod/contacts.php:414 ../../mod/videos.php:116
+#: ../../mod/editpost.php:148 ../../mod/dfrn_request.php:859
+#: ../../mod/fbrowser.php:81 ../../mod/fbrowser.php:116
+#: ../../mod/suggest.php:32 ../../mod/photos.php:203 ../../mod/photos.php:292
+#: ../../mod/follow.php:65 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/message.php:212
 msgid "Cancel"
 msgstr ""
 
-#: ../../include/items.php:4904
+#: ../../include/items.php:4956
 msgid "Archives"
 msgstr ""
 
@@ -1349,11 +1351,11 @@ msgstr ""
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:714
+#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:710
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:716
+#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:712
 msgid "Hometown:"
 msgstr ""
 
@@ -1361,7 +1363,7 @@ msgstr ""
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:717
+#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:713
 msgid "Political Views:"
 msgstr ""
 
@@ -1373,11 +1375,11 @@ msgstr ""
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:721
+#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:717
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:722
+#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:718
 msgid "Dislikes:"
 msgstr ""
 
@@ -1783,71 +1785,75 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/datetime.php:153 ../../include/datetime.php:290
-msgid "year"
+#: ../../include/datetime.php:141
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:158 ../../include/datetime.php:291
-msgid "month"
-msgstr ""
-
-#: ../../include/datetime.php:163 ../../include/datetime.php:293
-msgid "day"
-msgstr ""
-
-#: ../../include/datetime.php:276
+#: ../../include/datetime.php:256
 msgid "never"
 msgstr ""
 
-#: ../../include/datetime.php:282
+#: ../../include/datetime.php:262
 msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/datetime.php:290
+#: ../../include/datetime.php:270
+msgid "year"
+msgstr ""
+
+#: ../../include/datetime.php:270
 msgid "years"
 msgstr ""
 
-#: ../../include/datetime.php:291
+#: ../../include/datetime.php:271
+msgid "month"
+msgstr ""
+
+#: ../../include/datetime.php:271
 msgid "months"
 msgstr ""
 
-#: ../../include/datetime.php:292
+#: ../../include/datetime.php:272
 msgid "week"
 msgstr ""
 
-#: ../../include/datetime.php:292
+#: ../../include/datetime.php:272
 msgid "weeks"
 msgstr ""
 
-#: ../../include/datetime.php:293
+#: ../../include/datetime.php:273
+msgid "day"
+msgstr ""
+
+#: ../../include/datetime.php:273
 msgid "days"
 msgstr ""
 
-#: ../../include/datetime.php:294
+#: ../../include/datetime.php:274
 msgid "hour"
 msgstr ""
 
-#: ../../include/datetime.php:294
+#: ../../include/datetime.php:274
 msgid "hours"
 msgstr ""
 
-#: ../../include/datetime.php:295
+#: ../../include/datetime.php:275
 msgid "minute"
 msgstr ""
 
-#: ../../include/datetime.php:295
+#: ../../include/datetime.php:275
 msgid "minutes"
 msgstr ""
 
-#: ../../include/datetime.php:296
+#: ../../include/datetime.php:276
 msgid "second"
 msgstr ""
 
-#: ../../include/datetime.php:296
+#: ../../include/datetime.php:276
 msgid "seconds"
 msgstr ""
 
-#: ../../include/datetime.php:305
+#: ../../include/datetime.php:285
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr ""
@@ -1986,7 +1992,7 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:2493
+#: ../../include/diaspora.php:2494
 msgid "Attachments:"
 msgstr ""
 
@@ -2261,7 +2267,7 @@ msgstr ""
 #: ../../include/conversation.php:1125 ../../object/Item.php:690
 #: ../../mod/editpost.php:145 ../../mod/photos.php:1566
 #: ../../mod/photos.php:1610 ../../mod/photos.php:1698
-#: ../../mod/events.php:489 ../../mod/content.php:719
+#: ../../mod/events.php:498 ../../mod/content.php:719
 msgid "Preview"
 msgstr ""
 
@@ -2533,7 +2539,7 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1424 ../../mod/videos.php:301
+#: ../../include/text.php:1424 ../../mod/videos.php:368
 msgid "View Video"
 msgstr ""
 
@@ -2546,7 +2552,7 @@ msgid "Click to open/close"
 msgstr ""
 
 #: ../../include/text.php:1674 ../../include/text.php:1684
-#: ../../mod/events.php:347
+#: ../../mod/events.php:350
 msgid "link to source"
 msgstr ""
 
@@ -3868,8 +3874,8 @@ msgstr ""
 #: ../../mod/settings.php:1108 ../../mod/settings.php:1109
 #: ../../mod/settings.php:1110 ../../mod/register.php:234
 #: ../../mod/dfrn_request.php:845 ../../mod/api.php:106
-#: ../../mod/follow.php:54 ../../mod/profiles.php:661
-#: ../../mod/profiles.php:665
+#: ../../mod/follow.php:54 ../../mod/profiles.php:657
+#: ../../mod/profiles.php:661
 msgid "No"
 msgstr ""
 
@@ -4643,30 +4649,38 @@ msgstr ""
 msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/videos.php:115 ../../mod/dfrn_request.php:777
+#: ../../mod/videos.php:108
+msgid "Do you really want to delete this video?"
+msgstr ""
+
+#: ../../mod/videos.php:113
+msgid "Delete Video"
+msgstr ""
+
+#: ../../mod/videos.php:182 ../../mod/dfrn_request.php:777
 #: ../../mod/viewcontacts.php:19 ../../mod/photos.php:920
 #: ../../mod/search.php:89 ../../mod/community.php:18
 #: ../../mod/display.php:214 ../../mod/directory.php:33
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/videos.php:125
+#: ../../mod/videos.php:192
 msgid "No videos selected"
 msgstr ""
 
-#: ../../mod/videos.php:226 ../../mod/photos.php:1031
+#: ../../mod/videos.php:293 ../../mod/photos.php:1031
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/videos.php:308 ../../mod/photos.php:1808
+#: ../../mod/videos.php:375 ../../mod/photos.php:1808
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/videos.php:317
+#: ../../mod/videos.php:384
 msgid "Recent Videos"
 msgstr ""
 
-#: ../../mod/videos.php:319
+#: ../../mod/videos.php:386
 msgid "Upload New Videos"
 msgstr ""
 
@@ -6642,72 +6656,67 @@ msgstr ""
 msgid "is interested in:"
 msgstr ""
 
-#: ../../mod/events.php:68 ../../mod/events.php:70
+#: ../../mod/events.php:71 ../../mod/events.php:73
 msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../mod/events.php:303
+#: ../../mod/events.php:306
 msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:325
+#: ../../mod/events.php:328
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:383
+#: ../../mod/events.php:386
 msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:384
+#: ../../mod/events.php:387
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:385 ../../mod/install.php:207
+#: ../../mod/events.php:388 ../../mod/install.php:207
 msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:458
-msgid "hour:minute"
-msgstr ""
-
-#: ../../mod/events.php:468
+#: ../../mod/events.php:480
 msgid "Event details"
 msgstr ""
 
-#: ../../mod/events.php:469
-#, php-format
-msgid "Format is %s %s. Starting date and Title are required."
+#: ../../mod/events.php:481
+msgid "Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:471
+#: ../../mod/events.php:482
 msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/events.php:471 ../../mod/events.php:485
+#: ../../mod/events.php:482 ../../mod/events.php:494
 msgid "Required"
 msgstr ""
 
-#: ../../mod/events.php:474
+#: ../../mod/events.php:484
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:476
+#: ../../mod/events.php:486
 msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/events.php:479
+#: ../../mod/events.php:488
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:481
+#: ../../mod/events.php:490
 msgid "Description:"
 msgstr ""
 
-#: ../../mod/events.php:485
+#: ../../mod/events.php:494
 msgid "Title:"
 msgstr ""
 
-#: ../../mod/events.php:487
+#: ../../mod/events.php:496
 msgid "Share this event"
 msgstr ""
 
@@ -6842,7 +6851,7 @@ msgid "Not available."
 msgstr ""
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:133
-#: ../../mod/profiles.php:179 ../../mod/profiles.php:630
+#: ../../mod/profiles.php:179 ../../mod/profiles.php:626
 #: ../../mod/dfrn_confirm.php:64
 msgid "Profile not found."
 msgstr ""
@@ -6867,278 +6876,277 @@ msgstr ""
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/profiles.php:340
+#: ../../mod/profiles.php:336
 msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/profiles.php:344
+#: ../../mod/profiles.php:340
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/profiles.php:348
+#: ../../mod/profiles.php:344
 msgid "Likes"
 msgstr ""
 
-#: ../../mod/profiles.php:352
+#: ../../mod/profiles.php:348
 msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/profiles.php:356
+#: ../../mod/profiles.php:352
 msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/profiles.php:359
+#: ../../mod/profiles.php:355
 msgid "Religion"
 msgstr ""
 
-#: ../../mod/profiles.php:363
+#: ../../mod/profiles.php:359
 msgid "Political Views"
 msgstr ""
 
-#: ../../mod/profiles.php:367
+#: ../../mod/profiles.php:363
 msgid "Gender"
 msgstr ""
 
-#: ../../mod/profiles.php:371
+#: ../../mod/profiles.php:367
 msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/profiles.php:375
+#: ../../mod/profiles.php:371
 msgid "Homepage"
 msgstr ""
 
-#: ../../mod/profiles.php:379 ../../mod/profiles.php:698
+#: ../../mod/profiles.php:375 ../../mod/profiles.php:694
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:379
 msgid "Address"
 msgstr ""
 
-#: ../../mod/profiles.php:390 ../../mod/profiles.php:694
+#: ../../mod/profiles.php:386 ../../mod/profiles.php:690
 msgid "Location"
 msgstr ""
 
-#: ../../mod/profiles.php:473
+#: ../../mod/profiles.php:469
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:568
+#: ../../mod/profiles.php:564
 msgid " and "
 msgstr ""
 
-#: ../../mod/profiles.php:576
+#: ../../mod/profiles.php:572
 msgid "public profile"
 msgstr ""
 
-#: ../../mod/profiles.php:579
+#: ../../mod/profiles.php:575
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/profiles.php:580
+#: ../../mod/profiles.php:576
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../mod/profiles.php:583
+#: ../../mod/profiles.php:579
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:658
+#: ../../mod/profiles.php:654
 msgid "Hide contacts and friends:"
 msgstr ""
 
-#: ../../mod/profiles.php:663
+#: ../../mod/profiles.php:659
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:685
+#: ../../mod/profiles.php:681
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:687
+#: ../../mod/profiles.php:683
 msgid "Change Profile Photo"
 msgstr ""
 
-#: ../../mod/profiles.php:688
+#: ../../mod/profiles.php:684
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:689
+#: ../../mod/profiles.php:685
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:690
+#: ../../mod/profiles.php:686
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:691
+#: ../../mod/profiles.php:687
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:692
+#: ../../mod/profiles.php:688
 msgid "Basic information"
 msgstr ""
 
-#: ../../mod/profiles.php:693
+#: ../../mod/profiles.php:689
 msgid "Profile picture"
 msgstr ""
 
-#: ../../mod/profiles.php:695
+#: ../../mod/profiles.php:691
 msgid "Preferences"
 msgstr ""
 
-#: ../../mod/profiles.php:696
+#: ../../mod/profiles.php:692
 msgid "Status information"
 msgstr ""
 
-#: ../../mod/profiles.php:697
+#: ../../mod/profiles.php:693
 msgid "Additional information"
 msgstr ""
 
-#: ../../mod/profiles.php:699 ../../mod/newmember.php:36
+#: ../../mod/profiles.php:695 ../../mod/newmember.php:36
 #: ../../mod/profile_photo.php:244
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/profiles.php:700
+#: ../../mod/profiles.php:696
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:701
+#: ../../mod/profiles.php:697
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:702
+#: ../../mod/profiles.php:698
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:703
+#: ../../mod/profiles.php:699
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:704
-#, php-format
-msgid "Birthday (%s):"
+#: ../../mod/profiles.php:700
+msgid "Birthday :"
 msgstr ""
 
-#: ../../mod/profiles.php:705
+#: ../../mod/profiles.php:701
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:706
+#: ../../mod/profiles.php:702
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:707
+#: ../../mod/profiles.php:703
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:708
+#: ../../mod/profiles.php:704
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:709
+#: ../../mod/profiles.php:705
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:710
+#: ../../mod/profiles.php:706
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:711
+#: ../../mod/profiles.php:707
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:712
+#: ../../mod/profiles.php:708
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:713
+#: ../../mod/profiles.php:709
 msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/profiles.php:715
+#: ../../mod/profiles.php:711
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:718
+#: ../../mod/profiles.php:714
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:719
+#: ../../mod/profiles.php:715
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:720
+#: ../../mod/profiles.php:716
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:723
+#: ../../mod/profiles.php:719
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:724
+#: ../../mod/profiles.php:720
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:725
+#: ../../mod/profiles.php:721
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:726
+#: ../../mod/profiles.php:722
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:727
+#: ../../mod/profiles.php:723
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:728
+#: ../../mod/profiles.php:724
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:729
+#: ../../mod/profiles.php:725
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:730
+#: ../../mod/profiles.php:726
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:731
+#: ../../mod/profiles.php:727
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:732
+#: ../../mod/profiles.php:728
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:733
+#: ../../mod/profiles.php:729
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:734
+#: ../../mod/profiles.php:730
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:735
+#: ../../mod/profiles.php:731
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:740
+#: ../../mod/profiles.php:736
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:750 ../../mod/directory.php:113
+#: ../../mod/profiles.php:746 ../../mod/directory.php:113
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:803
+#: ../../mod/profiles.php:799
 msgid "Edit/Manage Profiles"
 msgstr ""
 

From b754a79968bf6f86599daf475b62ddec24449ab5 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Sun, 24 May 2015 13:33:07 +0200
Subject: [PATCH 07/20] event can not end before it has started.

---
 mod/events.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/mod/events.php b/mod/events.php
index ec6d73863b..e9e1af05d8 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -59,21 +59,30 @@ function events_post(&$a) {
 	// and we'll waste a bunch of time responding to it. Time that
 	// could've been spent doing something else.
 
-	if(strcmp($finish,$start) < 0)
-		$finish = $start;
-
 	$summary  = escape_tags(trim($_POST['summary']));
 	$desc     = escape_tags(trim($_POST['desc']));
 	$location = escape_tags(trim($_POST['location']));
 	$type     = 'event';
 
+	$action = ($event_id == '') ? 'new' : "event/" . $event_id;
+	$onerror_url = $a->get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
+
+        if(strcmp($finish,$start) < 0 && !$nofinish) {
+		notice( t('Event can not end before it has started.') . EOL);
+                if(intval($_REQUEST['preview'])) {
+			echo( t('Event can not end before it has started.'));
+			killme();
+		}
+		goaway($onerror_url);
+	}
+
 	if((! $summary) || (! $start)) {
 		notice( t('Event title and start time are required.') . EOL);
 		if(intval($_REQUEST['preview'])) {
 			echo( t('Event title and start time are required.'));
 			killme();
 		}
-		goaway($a->get_baseurl() . '/events/new');
+		goaway($onerror_url);
 	}
 
 	$share = ((intval($_POST['share'])) ? intval($_POST['share']) : 0);

From e040b60f67c4e499539e787ef3deb401e1cee160 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Sun, 24 May 2015 20:46:40 +0200
Subject: [PATCH 08/20] make the heading of the search result translatable

---
 mod/search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/search.php b/mod/search.php
index 67702ac097..d1bd5d6310 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -177,9 +177,9 @@ function search_content(&$a) {
 
 
 	if($tag)
-		$o .= '<h2>Items tagged with: ' . $search . '</h2>';
+		$o .= '<h2>' . t('Items tagged with: ')  . $search . '</h2>';
 	else
-		$o .= '<h2>Search results for: ' . $search . '</h2>';
+		$o .= '<h2>' . t('Search results for: ') . $search . '</h2>';
 
 	logger("Start Conversation for '".$search."'", LOGGER_DEBUG);
 	$o .= conversation($a,$r,'search',false);

From 0c752a2190e5adecf4b83e6a204d3f0dddf32150 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 25 May 2015 13:27:45 +0200
Subject: [PATCH 09/20] Diaspora: Store the original XML and the object type.

---
 include/diaspora.php | 58 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 11 deletions(-)

diff --git a/include/diaspora.php b/include/diaspora.php
index 04588dffe6..c683ded1da 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -833,12 +833,19 @@ function diaspora_post($importer,$xml,$msg) {
 
 	$body = diaspora2bb($xml->raw_message);
 
-	// Add OEmbed and other information to the body
-	if (!diaspora_is_redmatrix($contact['url']))
-		$body = add_page_info_to_body($body, false, true);
-
 	$datarray = array();
 
+	$datarray["object"] = json_encode($xml);
+
+	if($xml->photo->remote_photo_path AND $xml->photo->remote_photo_name)
+		$datarray["object-type"] = ACTIVITY_OBJ_PHOTO;
+	else {
+		$datarray['object-type'] = ACTIVITY_OBJ_NOTE;
+		// Add OEmbed and other information to the body
+		if (!diaspora_is_redmatrix($contact['url']))
+			$body = add_page_info_to_body($body, false, true);
+	}
+
 	$str_tags = '';
 
 	$cnt = preg_match_all('/@\[url=(.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER);
@@ -872,7 +879,10 @@ function diaspora_post($importer,$xml,$msg) {
 	$datarray['author-avatar'] = $contact['thumb'];
 	$datarray['body'] = $body;
 	$datarray['tag'] = $str_tags;
-	$datarray['app']  = 'Diaspora';
+	if ($xml->provider_display_name)
+                $datarray["app"] = unxmlify($xml->provider_display_name);
+	else
+		$datarray['app']  = 'Diaspora';
 
 	// if empty content it might be a photo that hasn't arrived yet. If a photo arrives, we'll make it visible.
 
@@ -921,6 +931,8 @@ function diaspora_store_by_guid($guid, $server, $uid = 0) {
 	$author = $item["author"];
 	$guid = $item["guid"];
 	$private = $item["private"];
+	$object = $item["object"];
+	$objecttype = $item["object-type"];
 
 	$message_id = $author.':'.$guid;
 	$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `guid` = '%s' LIMIT 1",
@@ -954,6 +966,8 @@ function diaspora_store_by_guid($guid, $server, $uid = 0) {
 	$datarray['tag'] = $str_tags;
 	$datarray['app']  = $app;
 	$datarray['visible'] = ((strlen($body)) ? 1 : 0);
+	$datarray['object'] = $object;
+	$datarray['object-type'] = $objecttype;
 
 	if ($datarray['contact-id'] == 0)
 		return false;
@@ -1001,11 +1015,14 @@ function diaspora_fetch_message($guid, $server, $level = 0) {
 		$item["guid"] = unxmlify($source_xml->post->status_message->guid);
 
 	$item["private"] = (unxmlify($source_xml->post->status_message->public) == 'false');
+	$item["object"] = json_encode($source_xml->post);
 
 	if(strlen($source_xml->post->asphoto->objectId) && ($source_xml->post->asphoto->objectId != 0) && ($source_xml->post->asphoto->image_url)) {
+		$item["object-type"] = ACTIVITY_OBJ_PHOTO;
 		$body = '[url=' . notags(unxmlify($source_xml->post->asphoto->image_url)) . '][img]' . notags(unxmlify($source_xml->post->asphoto->objectId)) . '[/img][/url]' . "\n";
 		$body = scale_external_images($body,false);
 	} elseif($source_xml->post->asphoto->image_url) {
+		$item["object-type"] = ACTIVITY_OBJ_PHOTO;
 		$body = '[img]' . notags(unxmlify($source_xml->post->asphoto->image_url)) . '[/img]' . "\n";
 		$body = scale_external_images($body);
 	} elseif($source_xml->post->status_message) {
@@ -1015,18 +1032,25 @@ function diaspora_fetch_message($guid, $server, $level = 0) {
 		if($source_xml->post->status_message->photo->remote_photo_path AND
 			$source_xml->post->status_message->photo->remote_photo_name) {
 
+			$item["object-type"] = ACTIVITY_OBJ_PHOTO;
+
 			$remote_photo_path = notags(unxmlify($source_xml->post->status_message->photo->remote_photo_path));
 			$remote_photo_name = notags(unxmlify($source_xml->post->status_message->photo->remote_photo_name));
 
 			$body = '[img]'.$remote_photo_path.$remote_photo_name.'[/img]'."\n".$body;
 
 			logger('embedded picture link found: '.$body, LOGGER_DEBUG);
-		}
+		} else
+			$item["object-type"] = ACTIVITY_OBJ_NOTE;
 
 		$body = scale_external_images($body);
 
 		// Add OEmbed and other information to the body
-		$body = add_page_info_to_body($body, false, true);
+		// To-Do: It could be a repeated redmatrix item
+		// Then we shouldn't add further data to it
+		if ($item["object-type"] == ACTIVITY_OBJ_NOTE)
+			$body = add_page_info_to_body($body, false, true);
+
 	} elseif($source_xml->post->reshare) {
 		// Reshare of a reshare
 		return diaspora_fetch_message($source_xml->post->reshare->root_guid, $server, ++$level);
@@ -1105,6 +1129,8 @@ function diaspora_reshare($importer,$xml,$msg) {
 			$orig_author = $r[0]["author-link"];
 			$create_original_post = ($body != "");
 			$orig_url = $a->get_baseurl()."/display/".$orig_guid;
+			$object = $r[0]["object"];
+			$objecttype = $r[0]["object-type"];
 		}
 	}
 
@@ -1144,6 +1170,8 @@ function diaspora_reshare($importer,$xml,$msg) {
 			$orig_guid = $item["guid"];
 			$create_original_post = ($body != "");
 			$orig_url = $a->get_baseurl()."/display/".$orig_guid;
+			$object = $item["object"];
+			$objecttype = $item["object-type"];
 		}
 	}
 
@@ -1184,6 +1212,9 @@ function diaspora_reshare($importer,$xml,$msg) {
 		$datarray['body'] = $body;
 	}
 
+	$datarray["object"] = json_encode($xml);
+	$datarray['object-type'] = $objecttype;
+
 	$datarray['tag'] = $str_tags;
 	$datarray['app']  = $app;
 
@@ -1210,6 +1241,7 @@ function diaspora_reshare($importer,$xml,$msg) {
 		$datarray2['owner-link'] = $datarray2['author-link'];
 		$datarray2['owner-avatar'] = $datarray2['author-avatar'];
 		$datarray2['body'] = $body;
+		$datarray2["object"] = $object;
 
 		DiasporaFetchGuid($datarray2);
 		$message_id = item_store($datarray2);
@@ -1295,6 +1327,8 @@ function diaspora_asphoto($importer,$xml,$msg) {
 	$datarray['author-link'] = $contact['url'];
 	$datarray['author-avatar'] = $contact['thumb'];
 	$datarray['body'] = $body;
+	$datarray["object"] = json_encode($xml);
+	$datarray['object-type'] = ACTIVITY_OBJ_PHOTO;
 
 	$datarray['app']  = 'Diaspora/Cubbi.es';
 
@@ -1464,6 +1498,8 @@ function diaspora_comment($importer,$xml,$msg) {
 	$datarray['author-link'] = $person['url'];
 	$datarray['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']);
 	$datarray['body'] = $body;
+	$datarray["object"] = json_encode($xml);
+	$datarray["object-type"] = ACTIVITY_OBJ_COMMENT;
 
 	// We can't be certain what the original app is if the message is relayed.
 	if(($parent_item['origin']) && (! $parent_author_signature))
@@ -1790,7 +1826,7 @@ function diaspora_message($importer,$xml,$msg) {
 		dbesc($person['name']),
 		dbesc($person['photo']),
 		dbesc($person['url']),
-		intval($contact['id']),	 
+		intval($contact['id']),
 		dbesc($conversation['subject']),
 		dbesc($body),
 		0,
@@ -2059,7 +2095,7 @@ function diaspora_like($importer,$xml,$msg) {
 
 	$activity = ACTIVITY_LIKE;
 	$post_type = (($parent_item['resource-id']) ? t('photo') : t('status'));
-	$objtype = (($parent_item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); 
+	$objtype = (($parent_item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
 	$link = xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $parent_item['id'] . '" />' . "\n") ;
 	$body = $parent_item['body'];
 
@@ -2878,7 +2914,7 @@ function diaspora_send_retraction($item,$owner,$contact,$public_batch = false) {
 		$target_type = (($item['verb'] === ACTIVITY_LIKE) ? 'Like' : 'Comment');
 	}
 	else {
-		
+
 		$tpl = get_markup_template('diaspora_signed_retract.tpl');
 		$target_type = 'StatusMessage';
 	}
@@ -2924,7 +2960,7 @@ function diaspora_send_mail($item,$owner,$contact) {
 
 	$body = bb2diaspora($item['body']);
 	$created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d H:i:s \U\T\C');
- 
+
 	$signed_text =  $item['guid'] . ';' . $cnv['guid'] . ';' . $body .  ';' 
 		. $created . ';' . $myaddr . ';' . $cnv['guid'];
 

From 3ad674fa67b0899dee72e61c1c156e8cdec885f5 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Mon, 25 May 2015 16:49:57 +0200
Subject: [PATCH 10/20] better space handling

---
 mod/search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/search.php b/mod/search.php
index d1bd5d6310..f759a7f991 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -177,9 +177,9 @@ function search_content(&$a) {
 
 
 	if($tag)
-		$o .= '<h2>' . t('Items tagged with: ')  . $search . '</h2>';
+		$o .= '<h2>' . t('Items tagged with:')  . ' ' . $search . '</h2>';
 	else
-		$o .= '<h2>' . t('Search results for: ') . $search . '</h2>';
+		$o .= '<h2>' . t('Search results for:') . ' ' . $search . '</h2>';
 
 	logger("Start Conversation for '".$search."'", LOGGER_DEBUG);
 	$o .= conversation($a,$r,'search',false);

From 7e401ca199ce9c47c8b5c8ae96a476023be9a048 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Mon, 25 May 2015 19:07:59 +0200
Subject: [PATCH 11/20] Improved check for duplicates. Improvements with
 reshared Diaspora items.

---
 include/diaspora.php | 33 +++++++++++++++++++++------------
 include/items.php    | 15 ++++++++++++++-
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/include/diaspora.php b/include/diaspora.php
index c683ded1da..68e38f8c4c 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -785,12 +785,21 @@ function diaspora_is_redmatrix($url) {
 }
 
 function diaspora_plink($addr, $guid) {
-	$r = q("SELECT `url`, `nick` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", $addr);
+	$r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", $addr);
 
 	// Fallback
 	if (!$r)
 		return 'https://'.substr($addr,strpos($addr,'@')+1).'/posts/'.$guid;
 
+	// Friendica contacts are often detected as Diaspora contacts in the "fcontact" table
+	// So we try another way as well.
+	$s = q("SELECT `network` FROM `gcontact` WHERE `nurl`='%s' LIMIT 1", dbesc(normalise_link($r[0]["url"])));
+	if ($s)
+		$r[0]["network"] = $s[0]["network"];
+
+	if ($r[0]["network"] == NETWORK_DFRN)
+		return(str_replace("/profile/".$r[0]["nick"]."/", "/display/".$guid, $r[0]["url"]."/"));
+
 	if (diaspora_is_redmatrix($r[0]["url"]))
 		return $r[0]["url"]."/?f=&mid=".$guid;
 
@@ -1105,16 +1114,17 @@ function diaspora_reshare($importer,$xml,$msg) {
 
 	$orig_author = notags(unxmlify($xml->root_diaspora_id));
 	$orig_guid = notags(unxmlify($xml->root_guid));
+	$orig_url = $a->get_baseurl()."/display/".$orig_guid;
 
 	$create_original_post = false;
 
 	// Do we already have this item?
-	$r = q("SELECT `body`, `tag`, `app`, `created`, `author-link`, `plink` FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
+	$r = q("SELECT `body`, `tag`, `app`, `created`, `plink`, `object`, `object-type`, `uri` FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
 		dbesc($orig_guid),
 		dbesc(NETWORK_DIASPORA)
 	);
 	if(count($r)) {
-		logger('reshared message '.$orig_guid." reshared by ".$guid.' already exists on system: '.$orig_url);
+		logger('reshared message '.$orig_guid." reshared by ".$guid.' already exists on system.');
 
 		// Maybe it is already a reshared item?
 		// Then refetch the content, since there can be many side effects with reshared posts from other networks or reshares from reshares
@@ -1126,9 +1136,9 @@ function diaspora_reshare($importer,$xml,$msg) {
 			$str_tags = $r[0]["tag"];
 			$app = $r[0]["app"];
 			$orig_created = $r[0]["created"];
-			$orig_author = $r[0]["author-link"];
+			$orig_plink = $r[0]["plink"];
+			$orig_uri = $r[0]["uri"];
 			$create_original_post = ($body != "");
-			$orig_url = $a->get_baseurl()."/display/".$orig_guid;
 			$object = $r[0]["object"];
 			$objecttype = $r[0]["object-type"];
 		}
@@ -1139,8 +1149,6 @@ function diaspora_reshare($importer,$xml,$msg) {
 		$str_tags = "";
 		$app = "";
 
-		$orig_url = 'https://'.substr($orig_author,strpos($orig_author,'@')+1).'/posts/'.$orig_guid;
-
 		$server = 'https://'.substr($orig_author,strpos($orig_author,'@')+1);
 		logger('1st try: reshared message '.$orig_guid." reshared by ".$guid.' will be fetched from original server: '.$server);
 		$item = diaspora_fetch_message($orig_guid, $server);
@@ -1168,13 +1176,16 @@ function diaspora_reshare($importer,$xml,$msg) {
 			$orig_created = $item["created"];
 			$orig_author = $item["author"];
 			$orig_guid = $item["guid"];
+			$orig_plink = diaspora_plink($orig_author, $orig_guid);
+			$orig_uri = $orig_author.':'.$orig_guid;
 			$create_original_post = ($body != "");
-			$orig_url = $a->get_baseurl()."/display/".$orig_guid;
 			$object = $item["object"];
 			$objecttype = $item["object-type"];
 		}
 	}
 
+	$plink = diaspora_plink($diaspora_handle, $guid);
+
 	$person = find_diaspora_person_by_handle($orig_author);
 
 	$created = unxmlify($xml->created_at);
@@ -1182,8 +1193,6 @@ function diaspora_reshare($importer,$xml,$msg) {
 
 	$datarray = array();
 
-	$plink = diaspora_plink($diaspora_handle, $guid);
-
 	$datarray['uid'] = $importer['uid'];
 	$datarray['contact-id'] = $contact['id'];
 	$datarray['wall'] = 0;
@@ -1230,9 +1239,9 @@ function diaspora_reshare($importer,$xml,$msg) {
 		$datarray2['uid'] = 0;
 		$datarray2['contact-id'] = get_contact($person['url'], 0);
 		$datarray2['guid'] = $orig_guid;
-		$datarray2['uri'] = $datarray2['parent-uri'] = $orig_author.':'.$orig_guid;
+		$datarray2['uri'] = $orig_uri;
 		$datarray2['changed'] = $datarray2['created'] = $datarray2['edited'] = $datarray2['commented'] = $datarray2['received'] = datetime_convert('UTC','UTC',$orig_created);
-		$datarray2['plink'] = diaspora_plink($orig_author, $orig_guid);
+		$datarray2['plink'] = $orig_plink;
 
 		$datarray2['author-name'] = $person['name'];
 		$datarray2['author-link'] = $person['url'];
diff --git a/include/items.php b/include/items.php
index 85d02ab60d..58db71d479 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1351,9 +1351,22 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 		dbesc($arr['uri']),
 		intval($arr['uid'])
 	);
+
 	if($r && count($r)) {
-		logger('item-store: duplicate item ignored. ' . print_r($arr,true));
+		logger('duplicated item with the same uri found. ' . print_r($arr,true));
 		return 0;
+	} else {
+		// Check for an existing post with the same content. There seems to be a problem with OStatus.
+		$r = q("SELECT `id` FROM `item` WHERE `body` = '%s' AND `created` = '%s' AND `contact-id` = %d AND `uid` = %d LIMIT 1",
+			dbesc($arr['body']),
+			dbesc($arr['created']),
+			intval($arr['contact-id']),
+			intval($arr['uid'])
+		);
+		if($r && count($r)) {
+			logger('duplicated item with the same body found. ' . print_r($arr,true));
+			return 0;
+		}
 	}
 
 	// Is this item available in the global items (with uid=0)?

From f309f3a6810b5af5d3b778843533c1c69ddc090d Mon Sep 17 00:00:00 2001
From: rabuzarus <trebor@central-unit>
Date: Tue, 26 May 2015 14:32:40 +0200
Subject: [PATCH 12/20] remove html and use vcard-widget.tpl

---
 mod/allfriends.php              | 11 +++++------
 mod/common.php                  | 11 +++++------
 mod/crepair.php                 |  9 +++++----
 mod/photos.php                  | 12 ++++++++----
 mod/videos.php                  | 12 ++++++++----
 view/templates/vcard-widget.tpl | 13 ++++++++-----
 6 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/mod/allfriends.php b/mod/allfriends.php
index f675b8e29c..bbdc5ef458 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -20,12 +20,11 @@ function allfriends_content(&$a) {
 		intval(local_user())
 	);
 
-	$a->page['aside'] .= '<div class="vcard">' 
-		. '<div class="fn label">' . $c[0]['name'] . '</div>' 
-		. '<div id="profile-photo-wrapper">'
-		. '<a href="/contacts/' . $cid . '"><img class="photo" width="175" height="175" 
-		src="' . $c[0]['photo'] . '" alt="' . $c[0]['name'] . '" /></div>'
-		. '</div>';
+	$a->page['aside'] .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
+                '$name' => $c[0]['name'],
+                '$photo' => $c[0]['photo'],
+                'url' => $a->get_baseurl() . '/contacts/' . $cid
+                ));
 	
 
 	if(! count($c))
diff --git a/mod/common.php b/mod/common.php
index 617b5b670a..574443f483 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -28,12 +28,11 @@ function common_content(&$a) {
 		);
 	}	
 
-	$a->page['aside'] .= '<div class="vcard">' 
-		. '<div class="fn label">' . $c[0]['name'] . '</div>' 
-		. '<div id="profile-photo-wrapper">'
-		. '<img class="photo" width="175" height="175" 
-		src="' . $c[0]['photo'] . '" alt="' . $c[0]['name'] . '" /></div>'
-		. '</div>';
+	$a->page['aside'] .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
+                '$name' => $c[0]['name'],
+                '$photo' => $c[0]['photo'],
+                'url' => $a->get_baseurl() . '/contacts/' . $cid
+                ));
 	
 
 	if(! count($c))
diff --git a/mod/crepair.php b/mod/crepair.php
index 55231faf7d..7cc67d4c83 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -22,10 +22,11 @@ function crepair_init(&$a) {
 
 	if($contact_id) {
 			$a->data['contact'] = $r[0];
-			$o .= '<div class="vcard">';
-			$o .= '<div class="fn">' . $a->data['contact']['name'] . '</div>';
-			$o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->data['contact']['photo'] . '" alt="' . $a->data['contact']['name'] . '" /></div>';
-			$o .= '</div>';
+                        $tpl = get_markup_template("vcard-widget.tpl");
+                        $o .= replace_macros($tpl, array(
+                                '$name' => $a->data['contact']['name'],
+                                '$photo' => $a->data['contact']['photo']
+                        ));
 			$a->page['aside'] .= $o;
 
 	}
diff --git a/mod/photos.php b/mod/photos.php
index f8bba01b00..657f23236d 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -30,10 +30,14 @@ function photos_init(&$a) {
 
 		$a->data['user'] = $r[0];
 
-		$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>';
+                $profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
+
+                $tpl = get_markup_template("vcard-widget.tpl");
+
+		$o .= replace_macros($tpl, array(
+                        '$name' => $a->data['user']['username'],
+                        '$photo' => $profilephoto
+                ));
 
 
 		$sql_extra = permissions_sql($a->data['user']['uid']);
diff --git a/mod/videos.php b/mod/videos.php
index 0f29e631bd..bc076e740a 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -28,10 +28,14 @@ function videos_init(&$a) {
 
 		$a->data['user'] = $r[0];
 
-		$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>';
+                $profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
+
+                $tpl = get_markup_template("vcard-widget.tpl");
+
+		$o .= replace_macros($tpl, array(
+                        '$name' => $a->data['user']['username'],
+                        '$photo' => $profilephoto
+                ));
 
 
 		/*$sql_extra = permissions_sql($a->data['user']['uid']);
diff --git a/view/templates/vcard-widget.tpl b/view/templates/vcard-widget.tpl
index bc1a571bea..04e26607a1 100644
--- a/view/templates/vcard-widget.tpl
+++ b/view/templates/vcard-widget.tpl
@@ -1,6 +1,9 @@
 
-	<div class="vcard">
-		<div class="fn"><a href="{{$url}}">{{$name}}</a></div>
-		<div id="profile-photo-wrapper"><a href="{{$url}}"><img class="photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></a></div>
-	</div>
-
+<div class="vcard">
+        <div class="fn">{{$name}}</div>
+        {{if $url}}
+        <div id="profile-photo-wrapper"><a href="{{$url}}"><img class="vcard-photo photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></a></div>
+        {{else}}
+        <div id="profile-photo-wrapper"><img class="vcard-photo photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
+        {{/if}}
+</div>

From 46338f5e8752f2ec1fbc0f744e3c76c1b6ef27c5 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Tue, 26 May 2015 14:49:53 +0200
Subject: [PATCH 13/20] using sprintf

---
 mod/search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/search.php b/mod/search.php
index f759a7f991..5fc9617850 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -177,9 +177,9 @@ function search_content(&$a) {
 
 
 	if($tag)
-		$o .= '<h2>' . t('Items tagged with:')  . ' ' . $search . '</h2>';
+		$o .= '<h2>' . sprintf( t('Items tagged with: %s'), $search) . '</h2>';
 	else
-		$o .= '<h2>' . t('Search results for:') . ' ' . $search . '</h2>';
+		$o .= '<h2>' . sprintf( t('Search results for: %s'), $search) . '</h2>';
 
 	logger("Start Conversation for '".$search."'", LOGGER_DEBUG);
 	$o .= conversation($a,$r,'search',false);

From 03214254ff848521ec00d669006061692b02c01d Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Tue, 26 May 2015 23:33:38 +0200
Subject: [PATCH 14/20] OStatus: Improved duplicate check.

---
 include/diaspora.php             |  4 +-
 include/items.php                | 12 ++++-
 include/ostatus_conversation.php | 75 ++++++++++++++++++++++++++------
 3 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/include/diaspora.php b/include/diaspora.php
index 68e38f8c4c..b70cffdc39 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -1138,7 +1138,6 @@ function diaspora_reshare($importer,$xml,$msg) {
 			$orig_created = $r[0]["created"];
 			$orig_plink = $r[0]["plink"];
 			$orig_uri = $r[0]["uri"];
-			$create_original_post = ($body != "");
 			$object = $r[0]["object"];
 			$objecttype = $r[0]["object-type"];
 		}
@@ -1239,8 +1238,9 @@ function diaspora_reshare($importer,$xml,$msg) {
 		$datarray2['uid'] = 0;
 		$datarray2['contact-id'] = get_contact($person['url'], 0);
 		$datarray2['guid'] = $orig_guid;
-		$datarray2['uri'] = $orig_uri;
+		$datarray2['uri'] = $datarray2['parent-uri'] = $orig_uri;
 		$datarray2['changed'] = $datarray2['created'] = $datarray2['edited'] = $datarray2['commented'] = $datarray2['received'] = datetime_convert('UTC','UTC',$orig_created);
+		$datarray2['parent'] = 0;
 		$datarray2['plink'] = $orig_plink;
 
 		$datarray2['author-name'] = $person['name'];
diff --git a/include/items.php b/include/items.php
index 58db71d479..3b4a5a193d 100644
--- a/include/items.php
+++ b/include/items.php
@@ -864,7 +864,7 @@ function get_atom_elements($feed, $item, $contact = array()) {
 			$conversation = array_shift($link["attribs"]);
 
 			if ($conversation["rel"] == "ostatus:conversation") {
-				$res["ostatus_conversation"] = $conversation["href"];
+				$res["ostatus_conversation"] = ostatus_convert_href($conversation["href"]);
 				logger('get_atom_elements: found conversation url '.$res["ostatus_conversation"]);
 			}
 		};
@@ -1090,6 +1090,14 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 		unset($arr['dsprsig']);
 	}
 
+	// Converting the plink
+	if ($arr['network'] == NETWORK_OSTATUS) {
+		if (isset($arr['plink']))
+			$arr['plink'] = ostatus_convert_href($arr['plink']);
+		elseif (isset($arr['uri']))
+			$arr['plink'] = ostatus_convert_href($arr['uri']);
+	}
+
 	// if an OStatus conversation url was passed in, it is stored and then
 	// removed from the array.
 	$ostatus_conversation = null;
@@ -1115,7 +1123,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 
 	/* check for create  date and expire time */
 	$uid = intval($arr['uid']);
-	$r = q("SELECT expire FROM user WHERE uid = %d", $uid);
+	$r = q("SELECT expire FROM user WHERE uid = %d", intval($uid));
 	if(count($r)) {
 		$expire_interval = $r[0]['expire'];
 		if ($expire_interval>0) {
diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php
index 667f7dde42..da8dda292d 100644
--- a/include/ostatus_conversation.php
+++ b/include/ostatus_conversation.php
@@ -2,7 +2,30 @@
 define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 define('OSTATUS_DEFAULT_POLL_TIMEFRAME', 1440); // given in minutes
 
-function check_conversations() {
+function ostatus_convert_href($href) {
+	$elements = explode(":",$href);
+
+	if ((count($elements) <= 2) OR ($elements[0] != "tag"))
+		return $href;
+
+	$server = explode(",", $elements[1]);
+	$conversation = explode("=", $elements[2]);
+
+	if ((count($elements) == 4) AND ($elements[2] == "post"))
+		return "http://".$server[0]."/notice/".$elements[3];
+
+	if ((count($conversation) != 2) OR ($conversation[1] ==""))
+		return $href;
+
+	if ($elements[3] == "objectType=thread")
+		return "http://".$server[0]."/conversation/".$conversation[1];
+	else
+		return "http://".$server[0]."/notice/".$conversation[1];
+
+	return $href;
+}
+
+function check_conversations($override = false) {
         $last = get_config('system','ostatus_last_poll');
 
         $poll_interval = intval(get_config('system','ostatus_poll_interval'));
@@ -10,16 +33,16 @@ function check_conversations() {
                 $poll_interval = OSTATUS_DEFAULT_POLL_INTERVAL;
 
 	// Don't poll if the interval is set negative
-	if ($poll_interval < 0)
+	if (($poll_interval < 0) AND !$override)
 		return;
 
         $poll_timeframe = intval(get_config('system','ostatus_poll_timeframe'));
-        if(! $poll_timeframe)
+        if (!$poll_timeframe)
                 $poll_timeframe = OSTATUS_DEFAULT_POLL_TIMEFRAME;
 
-        if($last) {
+        if ($last AND !$override) {
                 $next = $last + ($poll_interval * 60);
-                if($next > time()) {
+                if ($next > time()) {
                         logger('poll interval not reached');
                         return;
                 }
@@ -36,7 +59,7 @@ function check_conversations() {
                 complete_conversation($id, $url);
         }
 
-        logger(' cron_end');
+        logger('cron_end');
 
         set_config('system','ostatus_last_poll', time());
 }
@@ -44,6 +67,8 @@ function check_conversations() {
 function complete_conversation($itemid, $conversation_url, $only_add_conversation = false) {
 	global $a;
 
+	$conversation_url = ostatus_convert_href($conversation_url);
+
 	if (intval(get_config('system','ostatus_poll_interval')) == -2)
 		return;
 
@@ -107,16 +132,24 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 	$items = array_reverse($items);
 
 	foreach ($items as $single_conv) {
-		// status.net changed the format of the activity streams. This is a quick fix.
-		if (@is_string($single_conv->object->id))
+		if (!isset($single_conv->id) AND isset($single_conv->object->id))
 			$single_conv->id = $single_conv->object->id;
+		elseif (!isset($single_conv->id) AND isset($single_conv->object->url))
+			$single_conv->id = $single_conv->object->url;
 
-		if (@!$single_conv->id AND $single_conv->provider->url AND $single_conv->statusnet_notice_info->local_id)
-			$single_conv->id = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
+		$plink = ostatus_convert_href($single_conv->id);
+
+		if (isset($single_conv->provider->url) AND isset($single_conv->statusnet_notice_info->local_id))
+			$plink = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
+		elseif (isset($single_conv->provider->url) AND isset($single_conv->statusnet->notice_info->local_id))
+			$plink = $single_conv->provider->url."notice/".$single_conv->statusnet->notice_info->local_id;
 
 		if (@!$single_conv->id)
 			continue;
 
+		//logger("OStatus conversation id ".$single_conv->id, LOGGER_DEBUG);
+		//logger("OStatus conversation data ".print_r($single_conv, true), LOGGER_DEBUG);
+
 		if ($first_id == "") {
 			$first_id = $single_conv->id;
 
@@ -136,8 +169,13 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 		else
 			$parent_uri = $parent["uri"];
 
-		$message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
+		$message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `plink` = '%s' LIMIT 1",
+							intval($message["uid"]), dbesc($plink));
+
+		if (!$message_exists)
+			$message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
 							intval($message["uid"]), dbesc($single_conv->id));
+
 		if ($message_exists) {
 			if ($parent["id"] != 0) {
 				$existing_message = $message_exists[0];
@@ -166,7 +204,7 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 		$arr = array();
 		$arr["network"] = NETWORK_OSTATUS;
 		$arr["uri"] = $single_conv->id;
-		$arr["plink"] = $single_conv->id;
+		$arr["plink"] = $plink;
 		$arr["uid"] = $message["uid"];
 		$arr["contact-id"] = $contact_id;
 		if ($parent["id"] != 0)
@@ -190,9 +228,16 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 		$arr["author-link"] = $single_conv->actor->id;
 		$arr["author-avatar"] = $single_conv->actor->image->url;
 		$arr["body"] = html2bbcode($single_conv->content);
-		$arr["app"] = strip_tags($single_conv->statusnet_notice_info->source);
-		if ($arr["app"] == "")
+
+		if (isset($single_conv->statusnet->notice_info->source))
+			$arr["app"] = strip_tags($single_conv->statusnet->notice_info->source);
+		elseif (isset($single_conv->statusnet_notice_info->source))
+			$arr["app"] = strip_tags($single_conv->statusnet_notice_info->source);
+		elseif (isset($single_conv->provider->displayName))
 			$arr["app"] = $single_conv->provider->displayName;
+		else
+			$arr["app"] = "OStatus";
+
 		$arr["verb"] = $parent["verb"];
 		$arr["visible"] = $parent["visible"];
 		$arr["location"] = $single_conv->location->displayName;
@@ -206,6 +251,8 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 
 		$newitem = item_store($arr);
 
+		logger('Stored new item '.$plink.' under id '.$newitem, LOGGER_DEBUG);
+
 		// Add the conversation entry (but don't fetch the whole conversation)
 		complete_conversation($newitem, $conversation_url, true);
 

From bdd5c05668fafbadbc19026b75269ff9e97dbc70 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Wed, 27 May 2015 08:16:05 +0200
Subject: [PATCH 15/20] OStatus: Don't be confused by posts from the statusnet
 connector.

---
 include/items.php                | 52 +++++++++++++++++++++++---------
 include/ostatus_conversation.php | 23 +++++++++-----
 2 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/include/items.php b/include/items.php
index 3b4a5a193d..69b4a0f259 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1149,6 +1149,19 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 		}
 	}
 
+	// If there is no guid then take the same guid that was taken before for the same plink
+	if ((trim($arr['guid']) == "") AND (trim($arr['plink']) != "")) {
+		logger('item_store: checking for an existing guid for plink '.$arr['plink'], LOGGER_DEBUG);
+		$r = q("SELECT `guid` FROM `item` WHERE `plink` = '%s' AND `guid` != '' LIMIT 1",
+			dbesc(trim($arr['plink']))
+		);
+
+		if(count($r)) {
+			$arr['guid'] = $r[0]["guid"];
+			logger('item_store: found guid '.$arr['guid'].' for plink '.$arr['plink'], LOGGER_DEBUG);
+		}
+	}
+
 	// Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin.
 	// Deactivated, since the bbcode parser can handle with it - and it destroys posts with some smileys that contain "<"
 	//if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false))
@@ -1355,26 +1368,37 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
 		}
 	}
 
-	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
 		dbesc($arr['uri']),
+		dbesc($arr['network']),
 		intval($arr['uid'])
 	);
-
 	if($r && count($r)) {
 		logger('duplicated item with the same uri found. ' . print_r($arr,true));
 		return 0;
-	} else {
-		// Check for an existing post with the same content. There seems to be a problem with OStatus.
-		$r = q("SELECT `id` FROM `item` WHERE `body` = '%s' AND `created` = '%s' AND `contact-id` = %d AND `uid` = %d LIMIT 1",
-			dbesc($arr['body']),
-			dbesc($arr['created']),
-			intval($arr['contact-id']),
-			intval($arr['uid'])
-		);
-		if($r && count($r)) {
-			logger('duplicated item with the same body found. ' . print_r($arr,true));
-			return 0;
-		}
+	}
+
+	$r = q("SELECT `id` FROM `item` WHERE `plink` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
+		dbesc($arr['plink']),
+		dbesc($arr['network']),
+		intval($arr['uid'])
+	);
+	if($r && count($r)) {
+		logger('duplicated item with the same plink found. ' . print_r($arr,true));
+		return 0;
+	}
+
+	// Check for an existing post with the same content. There seems to be a problem with OStatus.
+	$r = q("SELECT `id` FROM `item` WHERE `body` = '%s' AND `network` = '%s' AND `created` = '%s' AND `contact-id` = %d AND `uid` = %d LIMIT 1",
+		dbesc($arr['body']),
+		dbesc($arr['network']),
+		dbesc($arr['created']),
+		intval($arr['contact-id']),
+		intval($arr['uid'])
+	);
+	if($r && count($r)) {
+		logger('duplicated item with the same body found. ' . print_r($arr,true));
+		return 0;
 	}
 
 	// Is this item available in the global items (with uid=0)?
diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php
index da8dda292d..f21f8248f8 100644
--- a/include/ostatus_conversation.php
+++ b/include/ostatus_conversation.php
@@ -143,6 +143,8 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 			$plink = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
 		elseif (isset($single_conv->provider->url) AND isset($single_conv->statusnet->notice_info->local_id))
 			$plink = $single_conv->provider->url."notice/".$single_conv->statusnet->notice_info->local_id;
+		elseif (isset($single_conv->provider->url) AND isset($single_conv->status_net->notice_info->local_id))
+			$plink = $single_conv->provider->url."notice/".$single_conv->status_net->notice_info->local_id;
 
 		if (@!$single_conv->id)
 			continue;
@@ -153,8 +155,9 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 		if ($first_id == "") {
 			$first_id = $single_conv->id;
 
-			$new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
-				intval($message["uid"]), dbesc($first_id));
+			$new_parents = q("SELECT `id`, `uri`, `contact-id`, `type`, `verb`, `visible` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
+				intval($message["uid"]), dbesc($first_id),
+				dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
 			if ($new_parents) {
 				$parent = $new_parents[0];
 				logger('adopting new parent '.$parent["id"].' for '.$itemid);
@@ -169,17 +172,21 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 		else
 			$parent_uri = $parent["uri"];
 
-		$message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `plink` = '%s' LIMIT 1",
-							intval($message["uid"]), dbesc($plink));
+		$message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `plink` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
+							intval($message["uid"]), dbesc($plink),
+							dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
 
 		if (!$message_exists)
-			$message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1",
-							intval($message["uid"]), dbesc($single_conv->id));
+			$message_exists = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s','%s') LIMIT 1",
+							intval($message["uid"]), dbesc($single_conv->id),
+							dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN));
 
 		if ($message_exists) {
 			if ($parent["id"] != 0) {
 				$existing_message = $message_exists[0];
 
+				logger('updating id '.$existing_message["id"].' to parent '.$parent["id"].' uri '.$parent["uri"].' thread '.$parent_uri, LOGGER_DEBUG);
+
 				// This is partly bad, since the entry in the thread table isn't updated
 				$r = q("UPDATE `item` SET `parent` = %d, `parent-uri` = '%s', `thr-parent` = '%s' WHERE `id` = %d",
 					intval($parent["id"]),
@@ -229,7 +236,9 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 		$arr["author-avatar"] = $single_conv->actor->image->url;
 		$arr["body"] = html2bbcode($single_conv->content);
 
-		if (isset($single_conv->statusnet->notice_info->source))
+		if (isset($single_conv->status_net->notice_info->source))
+			$arr["app"] = strip_tags($single_conv->status_net->notice_info->source);
+		elseif (isset($single_conv->statusnet->notice_info->source))
 			$arr["app"] = strip_tags($single_conv->statusnet->notice_info->source);
 		elseif (isset($single_conv->statusnet_notice_info->source))
 			$arr["app"] = strip_tags($single_conv->statusnet_notice_info->source);

From bfcd3bbc9ec9b0c75ad97743167e5e6893b9bfd9 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Wed, 27 May 2015 09:58:20 +0200
Subject: [PATCH 16/20] CS update to the strings

---
 view/cs/messages.po | 1828 ++++++++++++++++++++++---------------------
 view/cs/strings.php |   21 +-
 2 files changed, 940 insertions(+), 909 deletions(-)

diff --git a/view/cs/messages.po b/view/cs/messages.po
index c52e3922ac..6ca450ea91 100644
--- a/view/cs/messages.po
+++ b/view/cs/messages.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-04 17:54+0200\n"
-"PO-Revision-Date: 2015-04-13 17:40+0000\n"
+"POT-Creation-Date: 2015-05-21 10:43+0200\n"
+"PO-Revision-Date: 2015-05-23 07:28+0000\n"
 "Last-Translator: Michal Šupler <msupler@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
 #: ../../view/theme/diabook/config.php:148
 #: ../../view/theme/diabook/theme.php:633
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:678 ../../mod/contacts.php:492
+#: ../../object/Item.php:681 ../../mod/contacts.php:562
 #: ../../mod/manage.php:110 ../../mod/fsuggest.php:107
 #: ../../mod/photos.php:1084 ../../mod/photos.php:1203
 #: ../../mod/photos.php:1514 ../../mod/photos.php:1565
 #: ../../mod/photos.php:1609 ../../mod/photos.php:1697
-#: ../../mod/invite.php:140 ../../mod/events.php:478 ../../mod/mood.php:137
+#: ../../mod/invite.php:140 ../../mod/events.php:491 ../../mod/mood.php:137
 #: ../../mod/message.php:335 ../../mod/message.php:564
 #: ../../mod/profiles.php:686 ../../mod/install.php:248
-#: ../../mod/install.php:286 ../../mod/crepair.php:186
+#: ../../mod/install.php:286 ../../mod/crepair.php:190
 #: ../../mod/content.php:710 ../../mod/poke.php:199 ../../mod/localtime.php:45
 msgid "Submit"
 msgstr "Odeslat"
@@ -69,7 +69,7 @@ msgstr "Barevné schéma"
 msgid "Set style"
 msgstr "Nastavit styl"
 
-#: ../../view/theme/duepuntozero/config.php:44 ../../include/text.php:1719
+#: ../../view/theme/duepuntozero/config.php:44 ../../include/text.php:1729
 #: ../../include/user.php:247
 msgid "default"
 msgstr "standardní"
@@ -204,9 +204,9 @@ msgstr "Domů"
 msgid "Your posts and conversations"
 msgstr "Vaše příspěvky a konverzace"
 
-#: ../../view/theme/diabook/theme.php:124 ../../boot.php:2133
+#: ../../view/theme/diabook/theme.php:124 ../../boot.php:2132
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:87
-#: ../../include/nav.php:77 ../../mod/profperm.php:103
+#: ../../include/nav.php:77 ../../mod/profperm.php:104
 #: ../../mod/newmember.php:32
 msgid "Profile"
 msgstr "Profil"
@@ -215,8 +215,8 @@ msgstr "Profil"
 msgid "Your profile page"
 msgstr "Vaše profilová stránka"
 
-#: ../../view/theme/diabook/theme.php:125 ../../include/nav.php:177
-#: ../../mod/contacts.php:718
+#: ../../view/theme/diabook/theme.php:125 ../../include/nav.php:178
+#: ../../mod/contacts.php:788
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -224,7 +224,7 @@ msgstr "Kontakty"
 msgid "Your contacts"
 msgstr "Vaše kontakty"
 
-#: ../../view/theme/diabook/theme.php:126 ../../boot.php:2140
+#: ../../view/theme/diabook/theme.php:126 ../../boot.php:2139
 #: ../../include/nav.php:78 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr "Fotografie"
@@ -233,8 +233,8 @@ msgstr "Fotografie"
 msgid "Your photos"
 msgstr "Vaše fotky"
 
-#: ../../view/theme/diabook/theme.php:127 ../../boot.php:2157
-#: ../../include/nav.php:80 ../../mod/events.php:370
+#: ../../view/theme/diabook/theme.php:127 ../../boot.php:2156
+#: ../../include/nav.php:80 ../../mod/events.php:382
 msgid "Events"
 msgstr "Události"
 
@@ -256,12 +256,12 @@ msgid "Community"
 msgstr "Komunita"
 
 #: ../../view/theme/diabook/theme.php:463 ../../include/conversation.php:118
-#: ../../include/conversation.php:245 ../../include/text.php:1983
+#: ../../include/conversation.php:245 ../../include/text.php:1993
 msgid "event"
 msgstr "událost"
 
 #: ../../view/theme/diabook/theme.php:466
-#: ../../view/theme/diabook/theme.php:475 ../../include/diaspora.php:2011
+#: ../../view/theme/diabook/theme.php:475 ../../include/diaspora.php:2060
 #: ../../include/conversation.php:121 ../../include/conversation.php:130
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
 #: ../../mod/like.php:149 ../../mod/like.php:319 ../../mod/subthread.php:87
@@ -269,14 +269,14 @@ msgstr "událost"
 msgid "status"
 msgstr "Stav"
 
-#: ../../view/theme/diabook/theme.php:471 ../../include/diaspora.php:2011
+#: ../../view/theme/diabook/theme.php:471 ../../include/diaspora.php:2060
 #: ../../include/conversation.php:126 ../../include/conversation.php:253
-#: ../../include/text.php:1985 ../../mod/like.php:149
+#: ../../include/text.php:1995 ../../mod/like.php:149
 #: ../../mod/subthread.php:87 ../../mod/tagger.php:62
 msgid "photo"
 msgstr "fotografie"
 
-#: ../../view/theme/diabook/theme.php:480 ../../include/diaspora.php:2027
+#: ../../view/theme/diabook/theme.php:480 ../../include/diaspora.php:2076
 #: ../../include/conversation.php:137 ../../mod/like.php:166
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -321,8 +321,8 @@ msgid "Invite Friends"
 msgstr "Pozvat přátele"
 
 #: ../../view/theme/diabook/theme.php:544
-#: ../../view/theme/diabook/theme.php:648 ../../include/nav.php:172
-#: ../../mod/settings.php:90 ../../mod/admin.php:1104 ../../mod/admin.php:1325
+#: ../../view/theme/diabook/theme.php:648 ../../include/nav.php:173
+#: ../../mod/settings.php:90 ../../mod/admin.php:1107 ../../mod/admin.php:1328
 #: ../../mod/newmember.php:22
 msgid "Settings"
 msgstr "Nastavení"
@@ -359,40 +359,42 @@ msgstr "Velikost písma textů"
 msgid "Set colour scheme"
 msgstr "Nastavit barevné schéma"
 
-#: ../../index.php:211 ../../mod/apps.php:7
+#: ../../index.php:225 ../../mod/apps.php:7
 msgid "You must be logged in to use addons. "
 msgstr "Musíte být přihlášeni pro použití rozšíření."
 
-#: ../../index.php:255 ../../mod/help.php:42
+#: ../../index.php:269 ../../mod/p.php:16 ../../mod/p.php:25
+#: ../../mod/help.php:42
 msgid "Not Found"
 msgstr "Nenalezen"
 
-#: ../../index.php:258 ../../mod/help.php:45
+#: ../../index.php:272 ../../mod/help.php:45
 msgid "Page not found."
 msgstr "Stránka nenalezena"
 
-#: ../../index.php:367 ../../mod/group.php:72 ../../mod/profperm.php:19
+#: ../../index.php:381 ../../mod/group.php:72 ../../mod/profperm.php:19
 msgid "Permission denied"
 msgstr "Nedostatečné oprávnění"
 
-#: ../../index.php:368 ../../include/items.php:4815 ../../mod/attach.php:33
+#: ../../index.php:382 ../../include/items.php:4838 ../../mod/attach.php:33
 #: ../../mod/wallmessage.php:9 ../../mod/wallmessage.php:33
 #: ../../mod/wallmessage.php:79 ../../mod/wallmessage.php:103
 #: ../../mod/group.php:19 ../../mod/delegate.php:12
 #: ../../mod/notifications.php:66 ../../mod/settings.php:20
-#: ../../mod/settings.php:107 ../../mod/settings.php:606
-#: ../../mod/contacts.php:258 ../../mod/wall_attach.php:55
+#: ../../mod/settings.php:107 ../../mod/settings.php:608
+#: ../../mod/contacts.php:322 ../../mod/wall_attach.php:55
 #: ../../mod/register.php:42 ../../mod/manage.php:96 ../../mod/editpost.php:10
 #: ../../mod/regmod.php:110 ../../mod/api.php:26 ../../mod/api.php:31
 #: ../../mod/suggest.php:58 ../../mod/nogroup.php:25 ../../mod/fsuggest.php:78
 #: ../../mod/viewcontacts.php:24 ../../mod/wall_upload.php:66
 #: ../../mod/notes.php:20 ../../mod/network.php:4 ../../mod/photos.php:134
-#: ../../mod/photos.php:1050 ../../mod/follow.php:9 ../../mod/uimport.php:23
-#: ../../mod/invite.php:15 ../../mod/invite.php:101 ../../mod/events.php:140
-#: ../../mod/mood.php:114 ../../mod/message.php:38 ../../mod/message.php:174
+#: ../../mod/photos.php:1050 ../../mod/follow.php:9 ../../mod/follow.php:39
+#: ../../mod/follow.php:78 ../../mod/uimport.php:23 ../../mod/invite.php:15
+#: ../../mod/invite.php:101 ../../mod/events.php:152 ../../mod/mood.php:114
+#: ../../mod/message.php:38 ../../mod/message.php:174
 #: ../../mod/profiles.php:165 ../../mod/profiles.php:618
 #: ../../mod/install.php:151 ../../mod/crepair.php:119 ../../mod/poke.php:135
-#: ../../mod/display.php:499 ../../mod/dfrn_confirm.php:55
+#: ../../mod/display.php:501 ../../mod/dfrn_confirm.php:55
 #: ../../mod/item.php:169 ../../mod/item.php:185
 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
@@ -400,53 +402,22 @@ msgstr "Nedostatečné oprávnění"
 msgid "Permission denied."
 msgstr "Přístup odmítnut."
 
-#: ../../index.php:427
+#: ../../index.php:441
 msgid "toggle mobile"
 msgstr "přepnout mobil"
 
-#: ../../addon-wrk/openidserver/lib/render/trust.php:30
-#, php-format
-msgid "Do you wish to confirm your identity (<tt>%s</tt>) with <tt>%s</tt>"
-msgstr "Přejete si potvrdit vaši identitu (<tt>%s</tt>) s <tt>%s</tt>"
-
-#: ../../addon-wrk/openidserver/lib/render/trust.php:43
-#: ../../mod/dfrn_request.php:676
-msgid "Confirm"
-msgstr "Potvrdit"
-
-#: ../../addon-wrk/openidserver/lib/render/trust.php:44
-msgid "Do not confirm"
-msgstr "Nepotvrzovat"
-
-#: ../../addon-wrk/openidserver/lib/render/trust.php:48
-msgid "Trust This Site"
-msgstr "Důvěřovat tomuto webu"
-
-#: ../../addon-wrk/openidserver/lib/render/trust.php:53
-msgid "No Identifier Sent"
-msgstr "Nezaslán žádný identifikátor"
-
-#: ../../addon-wrk/openidserver/lib/render/wronguser.php:5
-msgid "Requested identity don't match logged in user."
-msgstr "Požadovaná identita neodpovídá přihlášenému uživateli"
-
-#: ../../addon-wrk/openidserver/lib/render.php:27
-#, php-format
-msgid "Please wait; you are being redirected to <%s>"
-msgstr "Čekejte prosím, budete přesměrován na <%s>"
-
 #: ../../boot.php:749
 msgid "Delete this item?"
 msgstr "Odstranit tuto položku?"
 
-#: ../../boot.php:750 ../../object/Item.php:361 ../../object/Item.php:677
+#: ../../boot.php:750 ../../object/Item.php:364 ../../object/Item.php:680
 #: ../../mod/photos.php:1564 ../../mod/photos.php:1608
 #: ../../mod/photos.php:1696 ../../mod/content.php:709
 msgid "Comment"
 msgstr "Okomentovat"
 
 #: ../../boot.php:751 ../../include/contact_widgets.php:205
-#: ../../object/Item.php:390 ../../mod/content.php:606
+#: ../../object/Item.php:393 ../../mod/content.php:606
 msgid "show more"
 msgstr "zobrazit více"
 
@@ -529,7 +500,7 @@ msgid "Edit profile"
 msgstr "Upravit profil"
 
 #: ../../boot.php:1557 ../../include/contact_widgets.php:10
-#: ../../mod/suggest.php:90 ../../mod/match.php:58
+#: ../../mod/suggest.php:90 ../../mod/match.php:63
 msgid "Connect"
 msgstr "Spojit"
 
@@ -537,7 +508,7 @@ msgstr "Spojit"
 msgid "Message"
 msgstr "Zpráva"
 
-#: ../../boot.php:1595 ../../include/nav.php:175
+#: ../../boot.php:1595 ../../include/nav.php:176
 msgid "Profiles"
 msgstr "Profily"
 
@@ -565,8 +536,8 @@ msgstr "viditelné pro všechny"
 msgid "Edit visibility"
 msgstr "Upravit viditelnost"
 
-#: ../../boot.php:1637 ../../include/event.php:40
-#: ../../include/bb2diaspora.php:155 ../../mod/events.php:471
+#: ../../boot.php:1637 ../../include/event.php:42
+#: ../../include/bb2diaspora.php:155 ../../mod/events.php:483
 #: ../../mod/directory.php:136
 msgid "Location:"
 msgstr "Místo:"
@@ -591,71 +562,71 @@ msgstr "Domácí stránka:"
 msgid "About:"
 msgstr "O mě:"
 
-#: ../../boot.php:1711
+#: ../../boot.php:1710
 msgid "Network:"
 msgstr "Síť:"
 
-#: ../../boot.php:1743 ../../boot.php:1829
+#: ../../boot.php:1742 ../../boot.php:1828
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../boot.php:1744 ../../boot.php:1830
+#: ../../boot.php:1743 ../../boot.php:1829
 msgid "F d"
 msgstr "d. F"
 
-#: ../../boot.php:1789 ../../boot.php:1877
+#: ../../boot.php:1788 ../../boot.php:1876
 msgid "[today]"
 msgstr "[Dnes]"
 
-#: ../../boot.php:1801
+#: ../../boot.php:1800
 msgid "Birthday Reminders"
 msgstr "Připomínka narozenin"
 
-#: ../../boot.php:1802
+#: ../../boot.php:1801
 msgid "Birthdays this week:"
 msgstr "Narozeniny tento týden:"
 
-#: ../../boot.php:1864
+#: ../../boot.php:1863
 msgid "[No description]"
 msgstr "[Žádný popis]"
 
-#: ../../boot.php:1888
+#: ../../boot.php:1887
 msgid "Event Reminders"
 msgstr "Připomenutí událostí"
 
-#: ../../boot.php:1889
+#: ../../boot.php:1888
 msgid "Events this week:"
 msgstr "Události tohoto týdne:"
 
-#: ../../boot.php:2126 ../../include/nav.php:76
+#: ../../boot.php:2125 ../../include/nav.php:76
 msgid "Status"
 msgstr "Stav"
 
-#: ../../boot.php:2129
+#: ../../boot.php:2128
 msgid "Status Messages and Posts"
 msgstr "Statusové zprávy a příspěvky "
 
-#: ../../boot.php:2136
+#: ../../boot.php:2135
 msgid "Profile Details"
 msgstr "Detaily profilu"
 
-#: ../../boot.php:2143 ../../mod/photos.php:52
+#: ../../boot.php:2142 ../../mod/photos.php:52
 msgid "Photo Albums"
 msgstr "Fotoalba"
 
-#: ../../boot.php:2147 ../../boot.php:2150 ../../include/nav.php:79
+#: ../../boot.php:2146 ../../boot.php:2149 ../../include/nav.php:79
 msgid "Videos"
 msgstr "Videa"
 
-#: ../../boot.php:2160
+#: ../../boot.php:2159
 msgid "Events and Calendar"
 msgstr "Události a kalendář"
 
-#: ../../boot.php:2164 ../../mod/notes.php:44
+#: ../../boot.php:2163 ../../mod/notes.php:44
 msgid "Personal Notes"
 msgstr "Osobní poznámky"
 
-#: ../../boot.php:2167
+#: ../../boot.php:2166
 msgid "Only You Can See This"
 msgstr "Toto můžete vidět jen Vy"
 
@@ -833,57 +804,57 @@ msgstr "Utlumit upozornění na přísvěvky"
 msgid "Ability to mute notifications for a thread"
 msgstr "Možnost stlumit upozornění pro vlákno"
 
-#: ../../include/items.php:2307 ../../include/datetime.php:477
+#: ../../include/items.php:2330 ../../include/datetime.php:477
 #, php-format
 msgid "%s's birthday"
 msgstr "%s má narozeniny"
 
-#: ../../include/items.php:2308 ../../include/datetime.php:478
+#: ../../include/items.php:2331 ../../include/datetime.php:478
 #, php-format
 msgid "Happy Birthday %s"
 msgstr "Veselé narozeniny %s"
 
-#: ../../include/items.php:4111 ../../mod/dfrn_request.php:717
-#: ../../mod/dfrn_confirm.php:752
+#: ../../include/items.php:4135 ../../mod/dfrn_request.php:732
+#: ../../mod/dfrn_confirm.php:753
 msgid "[Name Withheld]"
 msgstr "[Jméno odepřeno]"
 
-#: ../../include/items.php:4619 ../../mod/admin.php:169
-#: ../../mod/admin.php:1052 ../../mod/admin.php:1265 ../../mod/viewsrc.php:15
-#: ../../mod/notice.php:15 ../../mod/display.php:82 ../../mod/display.php:284
-#: ../../mod/display.php:503
+#: ../../include/items.php:4642 ../../mod/admin.php:169
+#: ../../mod/admin.php:1055 ../../mod/admin.php:1268 ../../mod/viewsrc.php:15
+#: ../../mod/notice.php:15 ../../mod/display.php:82 ../../mod/display.php:286
+#: ../../mod/display.php:505
 msgid "Item not found."
 msgstr "Položka nenalezena."
 
-#: ../../include/items.php:4658
+#: ../../include/items.php:4681
 msgid "Do you really want to delete this item?"
 msgstr "Opravdu chcete smazat tuto položku?"
 
-#: ../../include/items.php:4660 ../../mod/settings.php:1015
-#: ../../mod/settings.php:1021 ../../mod/settings.php:1029
-#: ../../mod/settings.php:1033 ../../mod/settings.php:1038
-#: ../../mod/settings.php:1044 ../../mod/settings.php:1050
-#: ../../mod/settings.php:1056 ../../mod/settings.php:1086
-#: ../../mod/settings.php:1087 ../../mod/settings.php:1088
-#: ../../mod/settings.php:1089 ../../mod/settings.php:1090
-#: ../../mod/contacts.php:341 ../../mod/register.php:233
-#: ../../mod/dfrn_request.php:830 ../../mod/api.php:105
-#: ../../mod/suggest.php:29 ../../mod/message.php:209
+#: ../../include/items.php:4683 ../../mod/settings.php:1035
+#: ../../mod/settings.php:1041 ../../mod/settings.php:1049
+#: ../../mod/settings.php:1053 ../../mod/settings.php:1058
+#: ../../mod/settings.php:1064 ../../mod/settings.php:1070
+#: ../../mod/settings.php:1076 ../../mod/settings.php:1106
+#: ../../mod/settings.php:1107 ../../mod/settings.php:1108
+#: ../../mod/settings.php:1109 ../../mod/settings.php:1110
+#: ../../mod/contacts.php:411 ../../mod/register.php:233
+#: ../../mod/dfrn_request.php:845 ../../mod/api.php:105
+#: ../../mod/suggest.php:29 ../../mod/follow.php:54 ../../mod/message.php:209
 #: ../../mod/profiles.php:661 ../../mod/profiles.php:664
 msgid "Yes"
 msgstr "Ano"
 
-#: ../../include/items.php:4663 ../../include/conversation.php:1128
-#: ../../mod/settings.php:620 ../../mod/settings.php:646
-#: ../../mod/contacts.php:344 ../../mod/editpost.php:148
-#: ../../mod/dfrn_request.php:844 ../../mod/fbrowser.php:81
+#: ../../include/items.php:4686 ../../include/conversation.php:1128
+#: ../../mod/settings.php:622 ../../mod/settings.php:648
+#: ../../mod/contacts.php:414 ../../mod/editpost.php:148
+#: ../../mod/dfrn_request.php:859 ../../mod/fbrowser.php:81
 #: ../../mod/fbrowser.php:116 ../../mod/suggest.php:32
-#: ../../mod/photos.php:203 ../../mod/photos.php:292 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../mod/message.php:212
+#: ../../mod/photos.php:203 ../../mod/photos.php:292 ../../mod/follow.php:65
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/message.php:212
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../../include/items.php:4881
+#: ../../include/items.php:4904
 msgid "Archives"
 msgstr "Archív"
 
@@ -918,18 +889,22 @@ msgstr "Editovat skupinu"
 msgid "Create a new group"
 msgstr "Vytvořit novou skupinu"
 
-#: ../../include/group.php:273
+#: ../../include/group.php:273 ../../mod/group.php:94 ../../mod/group.php:180
+msgid "Group Name: "
+msgstr "Název skupiny: "
+
+#: ../../include/group.php:275
 msgid "Contacts not in any group"
 msgstr "Kontakty, které nejsou v žádné skupině"
 
-#: ../../include/group.php:275 ../../mod/network.php:195
+#: ../../include/group.php:277 ../../mod/network.php:195
 msgid "add"
 msgstr "přidat"
 
 #: ../../include/Photo_old.php:911 ../../include/Photo_old.php:926
 #: ../../include/Photo_old.php:933 ../../include/Photo_old.php:955
-#: ../../include/Photo.php:933 ../../include/Photo.php:948
-#: ../../include/Photo.php:955 ../../include/Photo.php:977
+#: ../../include/Photo.php:951 ../../include/Photo.php:966
+#: ../../include/Photo.php:973 ../../include/Photo.php:995
 #: ../../include/message.php:144 ../../mod/wall_upload.php:169
 #: ../../mod/wall_upload.php:178 ../../mod/wall_upload.php:185
 #: ../../mod/item.php:485
@@ -977,7 +952,7 @@ msgstr "Připojit / Následovat"
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr "Příklady: Robert Morgenstein, rybaření"
 
-#: ../../include/contact_widgets.php:34 ../../mod/contacts.php:724
+#: ../../include/contact_widgets.php:34 ../../mod/contacts.php:794
 #: ../../mod/directory.php:63
 msgid "Find"
 msgstr "Najít"
@@ -1002,7 +977,7 @@ msgstr "Všechno"
 msgid "Categories"
 msgstr "Kategorie"
 
-#: ../../include/contact_widgets.php:200 ../../mod/contacts.php:439
+#: ../../include/contact_widgets.php:200 ../../mod/contacts.php:509
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
@@ -1033,233 +1008,233 @@ msgstr "neodpovídat"
 msgid "%s <!item_type!>"
 msgstr "%s <!item_type!>"
 
-#: ../../include/enotify.php:68
+#: ../../include/enotify.php:78
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr "[Friendica:Upozornění] Obdržena nová zpráva na %s"
 
-#: ../../include/enotify.php:70
+#: ../../include/enotify.php:80
 #, php-format
 msgid "%1$s sent you a new private message at %2$s."
 msgstr "%1$s Vám poslal novou soukromou zprávu na %2$s."
 
-#: ../../include/enotify.php:71
+#: ../../include/enotify.php:81
 #, php-format
 msgid "%1$s sent you %2$s."
 msgstr "%1$s Vám poslal %2$s."
 
-#: ../../include/enotify.php:71
+#: ../../include/enotify.php:81
 msgid "a private message"
 msgstr "soukromá zpráva"
 
-#: ../../include/enotify.php:72
+#: ../../include/enotify.php:82
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr "Prosím navštivte %s pro zobrazení Vašich soukromých zpráv a možnost na ně odpovědět."
 
-#: ../../include/enotify.php:124
+#: ../../include/enotify.php:134
 #, php-format
 msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr "%1$s okomentoval na [url=%2$s]%3$s[/url]"
 
-#: ../../include/enotify.php:131
+#: ../../include/enotify.php:141
 #, php-format
 msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr "%1$s okomentoval na [url=%2$s]%3$s's %4$s[/url]"
 
-#: ../../include/enotify.php:139
+#: ../../include/enotify.php:149
 #, php-format
 msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr "%1$s okomentoval na [url=%2$s]Váš %3$s[/url]"
 
-#: ../../include/enotify.php:149
+#: ../../include/enotify.php:159
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 msgstr "[Friendica:Upozornění] Komentář ke konverzaci #%1$d od %2$s"
 
-#: ../../include/enotify.php:150
+#: ../../include/enotify.php:160
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr "Uživatel %s okomentoval vámi sledovanou položku/konverzaci."
 
-#: ../../include/enotify.php:153 ../../include/enotify.php:168
-#: ../../include/enotify.php:181 ../../include/enotify.php:194
-#: ../../include/enotify.php:212 ../../include/enotify.php:225
+#: ../../include/enotify.php:163 ../../include/enotify.php:178
+#: ../../include/enotify.php:191 ../../include/enotify.php:204
+#: ../../include/enotify.php:222 ../../include/enotify.php:235
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr "Prosím navštivte %s pro zobrazení konverzace a možnosti odpovědět."
 
-#: ../../include/enotify.php:160
+#: ../../include/enotify.php:170
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr "[Friendica:Upozornění] %s umístěn na Vaši profilovou zeď"
 
-#: ../../include/enotify.php:162
+#: ../../include/enotify.php:172
 #, php-format
 msgid "%1$s posted to your profile wall at %2$s"
 msgstr "%1$s přidal příspěvek na Vaši profilovou zeď na %2$s"
 
-#: ../../include/enotify.php:164
+#: ../../include/enotify.php:174
 #, php-format
 msgid "%1$s posted to [url=%2$s]your wall[/url]"
 msgstr "%1$s napřidáno na [url=%2$s]na Vaši zeď[/url]"
 
-#: ../../include/enotify.php:175
+#: ../../include/enotify.php:185
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr "[Friendica:Upozornění] %s Vás označil"
 
-#: ../../include/enotify.php:176
+#: ../../include/enotify.php:186
 #, php-format
 msgid "%1$s tagged you at %2$s"
 msgstr "%1$s Vás označil na %2$s"
 
-#: ../../include/enotify.php:177
+#: ../../include/enotify.php:187
 #, php-format
 msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr "%1$s [url=%2$s]Vás označil[/url]."
 
-#: ../../include/enotify.php:188
+#: ../../include/enotify.php:198
 #, php-format
 msgid "[Friendica:Notify] %s shared a new post"
 msgstr "[Friendica:Notify] %s nasdílel nový příspěvek"
 
-#: ../../include/enotify.php:189
+#: ../../include/enotify.php:199
 #, php-format
 msgid "%1$s shared a new post at %2$s"
 msgstr "%1$s nasdílel nový příspěvek na %2$s"
 
-#: ../../include/enotify.php:190
+#: ../../include/enotify.php:200
 #, php-format
 msgid "%1$s [url=%2$s]shared a post[/url]."
 msgstr "%1$s [url=%2$s]nasdílel příspěvek[/url]."
 
-#: ../../include/enotify.php:202
+#: ../../include/enotify.php:212
 #, php-format
 msgid "[Friendica:Notify] %1$s poked you"
 msgstr "[Friendica:Upozornění] %1$s Vás šťouchnul"
 
-#: ../../include/enotify.php:203
+#: ../../include/enotify.php:213
 #, php-format
 msgid "%1$s poked you at %2$s"
 msgstr "%1$s Vás šťouchnul na %2$s"
 
-#: ../../include/enotify.php:204
+#: ../../include/enotify.php:214
 #, php-format
 msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr "Uživatel %1$s [url=%2$s]Vás šťouchnul[/url]."
 
-#: ../../include/enotify.php:219
+#: ../../include/enotify.php:229
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr "[Friendica:Upozornění] %s označil Váš příspěvek"
 
-#: ../../include/enotify.php:220
+#: ../../include/enotify.php:230
 #, php-format
 msgid "%1$s tagged your post at %2$s"
 msgstr "%1$s označil Váš příspěvek na %2$s"
 
-#: ../../include/enotify.php:221
+#: ../../include/enotify.php:231
 #, php-format
 msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr "%1$s označil [url=%2$s]Váš příspěvek[/url]"
 
-#: ../../include/enotify.php:232
+#: ../../include/enotify.php:242
 msgid "[Friendica:Notify] Introduction received"
 msgstr "[Friendica:Upozornění] Obdrženo přestavení"
 
-#: ../../include/enotify.php:233
+#: ../../include/enotify.php:243
 #, php-format
 msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr "Obdržel jste žádost o spojení od '%1$s' na %2$s"
 
-#: ../../include/enotify.php:234
+#: ../../include/enotify.php:244
 #, php-format
 msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr "Obdržel jste [url=%1$s]žádost o spojení[/url] od %2$s."
 
-#: ../../include/enotify.php:237 ../../include/enotify.php:279
+#: ../../include/enotify.php:247 ../../include/enotify.php:289
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr "Můžete navštívit jejich profil na %s"
 
-#: ../../include/enotify.php:239
+#: ../../include/enotify.php:249
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr "Prosím navštivte %s pro schválení či zamítnutí představení."
 
-#: ../../include/enotify.php:247
+#: ../../include/enotify.php:257
 msgid "[Friendica:Notify] A new person is sharing with you"
 msgstr "[Friendica:Upozornění] Nový člověk s vámi sdílí"
 
-#: ../../include/enotify.php:248 ../../include/enotify.php:249
+#: ../../include/enotify.php:258 ../../include/enotify.php:259
 #, php-format
 msgid "%1$s is sharing with you at %2$s"
 msgstr "uživatel %1$s sdílí s vámi ma %2$s"
 
-#: ../../include/enotify.php:255
+#: ../../include/enotify.php:265
 msgid "[Friendica:Notify] You have a new follower"
 msgstr "[Friendica:Upozornění] Máte nového následovníka"
 
-#: ../../include/enotify.php:256 ../../include/enotify.php:257
+#: ../../include/enotify.php:266 ../../include/enotify.php:267
 #, php-format
 msgid "You have a new follower at %2$s : %1$s"
 msgstr "Máte nového následovníka na %2$s : %1$s"
 
-#: ../../include/enotify.php:270
+#: ../../include/enotify.php:280
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr "[Friendica:Upozornění] Obdržen návrh na přátelství"
 
-#: ../../include/enotify.php:271
+#: ../../include/enotify.php:281
 #, php-format
 msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr "Obdržel jste návrh přátelství od '%1$s' na %2$s"
 
-#: ../../include/enotify.php:272
+#: ../../include/enotify.php:282
 #, php-format
 msgid ""
 "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr "Obdržel jste [url=%1$s]návrh přátelství[/url] s %2$s from %3$s."
 
-#: ../../include/enotify.php:277
+#: ../../include/enotify.php:287
 msgid "Name:"
 msgstr "Jméno:"
 
-#: ../../include/enotify.php:278
+#: ../../include/enotify.php:288
 msgid "Photo:"
 msgstr "Foto:"
 
-#: ../../include/enotify.php:281
+#: ../../include/enotify.php:291
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr "Prosím navštivte %s pro schválení či zamítnutí doporučení."
 
-#: ../../include/enotify.php:289 ../../include/enotify.php:302
+#: ../../include/enotify.php:299 ../../include/enotify.php:312
 msgid "[Friendica:Notify] Connection accepted"
 msgstr "[Friendica:Upozornění] Spojení akceptováno"
 
-#: ../../include/enotify.php:290 ../../include/enotify.php:303
+#: ../../include/enotify.php:300 ../../include/enotify.php:313
 #, php-format
 msgid "'%1$s' has acepted your connection request at %2$s"
 msgstr "'%1$s' akceptoval váš požadavek na spojení na %2$s"
 
-#: ../../include/enotify.php:291 ../../include/enotify.php:304
+#: ../../include/enotify.php:301 ../../include/enotify.php:314
 #, php-format
 msgid "%2$s has accepted your [url=%1$s]connection request[/url]."
 msgstr "%2$s akceptoval váš [url=%1$s]požadavek na spojení[/url]."
 
-#: ../../include/enotify.php:294
+#: ../../include/enotify.php:304
 msgid ""
 "You are now mutual friends and may exchange status updates, photos, and email\n"
 "\twithout restriction."
 msgstr "Jste nyní vzájemnými přáteli a můžete si vyměňovat aktualizace statusu, fotografií a emailů\nbez omezení."
 
-#: ../../include/enotify.php:297 ../../include/enotify.php:311
+#: ../../include/enotify.php:307 ../../include/enotify.php:321
 #, php-format
 msgid "Please visit %s  if you wish to make any changes to this relationship."
 msgstr "Prosím navštivte %s  pokud chcete změnit tento vztah."
 
-#: ../../include/enotify.php:307
+#: ../../include/enotify.php:317
 #, php-format
 msgid ""
 "'%1$s' has chosen to accept you a \"fan\", which restricts some forms of "
@@ -1268,83 +1243,83 @@ msgid ""
 "automatically."
 msgstr "'%1$s' vás přijal jako \"fanouška\", což omezuje některé formy komunikace - jako jsou soukromé zprávy a některé interakce na profilech. Pokud se jedná o celebritu, případně o komunitní stránky, pak bylo toto nastavení provedeno automaticky.."
 
-#: ../../include/enotify.php:309
+#: ../../include/enotify.php:319
 #, php-format
 msgid ""
 "'%1$s' may choose to extend this into a two-way or more permissive "
 "relationship in the future. "
 msgstr "''%1$s' se může rozhodnout rozšířit tento vztah na oboustraný nebo méně restriktivní"
 
-#: ../../include/enotify.php:322
+#: ../../include/enotify.php:332
 msgid "[Friendica System:Notify] registration request"
 msgstr "[Systém Friendica :Upozornění] registrační požadavek"
 
-#: ../../include/enotify.php:323
+#: ../../include/enotify.php:333
 #, php-format
 msgid "You've received a registration request from '%1$s' at %2$s"
 msgstr "Obdržel jste požadavek na registraci od '%1$s' na %2$s"
 
-#: ../../include/enotify.php:324
+#: ../../include/enotify.php:334
 #, php-format
 msgid "You've received a [url=%1$s]registration request[/url] from %2$s."
 msgstr "Obdržel jste [url=%1$s]požadavek na registraci[/url] od '%2$s'."
 
-#: ../../include/enotify.php:327
+#: ../../include/enotify.php:337
 #, php-format
 msgid "Full Name:\t%1$s\\nSite Location:\t%2$s\\nLogin Name:\t%3$s (%4$s)"
 msgstr "Plné jméno:\t%1$s\\nUmístění webu:\t%2$s\\nPřihlašovací účet:\t%3$s (%4$s)"
 
-#: ../../include/enotify.php:330
+#: ../../include/enotify.php:340
 #, php-format
 msgid "Please visit %s to approve or reject the request."
 msgstr "Prosím navštivte %s k odsouhlasení nebo k zamítnutí požadavku."
 
-#: ../../include/api.php:304 ../../include/api.php:315
-#: ../../include/api.php:416 ../../include/api.php:1063
-#: ../../include/api.php:1065
+#: ../../include/api.php:310 ../../include/api.php:321
+#: ../../include/api.php:422 ../../include/api.php:1116
+#: ../../include/api.php:1118
 msgid "User not found."
 msgstr "Uživatel nenalezen"
 
-#: ../../include/api.php:770
+#: ../../include/api.php:776
 #, php-format
 msgid "Daily posting limit of %d posts reached. The post was rejected."
 msgstr "Bylo dosaženo denního limitu %d odeslaných příspěvků. Příspěvek byl odmítnut."
 
-#: ../../include/api.php:789
+#: ../../include/api.php:795
 #, php-format
 msgid "Weekly posting limit of %d posts reached. The post was rejected."
 msgstr "Bylo týdenního limitu %d odeslaných příspěvků. Příspěvek byl odmítnut."
 
-#: ../../include/api.php:808
+#: ../../include/api.php:814
 #, php-format
 msgid "Monthly posting limit of %d posts reached. The post was rejected."
 msgstr "Bylo dosaženo měsíčního limitu %d odeslaných příspěvků. Příspěvek byl odmítnut."
 
-#: ../../include/api.php:1271
+#: ../../include/api.php:1325
 msgid "There is no status with this id."
 msgstr "Není tu žádný status s tímto id."
 
-#: ../../include/api.php:1341
+#: ../../include/api.php:1399
 msgid "There is no conversation with this id."
 msgstr "Nemáme žádnou konverzaci s tímto id."
 
-#: ../../include/api.php:1613
+#: ../../include/api.php:1669
 msgid "Invalid request."
 msgstr "Neplatný požadavek."
 
-#: ../../include/api.php:1624
+#: ../../include/api.php:1680
 msgid "Invalid item."
 msgstr "Neplatná položka."
 
-#: ../../include/api.php:1634
+#: ../../include/api.php:1690
 msgid "Invalid action. "
 msgstr "Neplatná akce"
 
-#: ../../include/api.php:1642
+#: ../../include/api.php:1698
 msgid "DB error"
 msgstr "DB chyba"
 
-#: ../../include/network.php:890
+#: ../../include/network.php:959
 msgid "view full size"
 msgstr "zobrazit v plné velikosti"
 
@@ -1352,7 +1327,7 @@ msgstr "zobrazit v plné velikosti"
 msgid " on Last.fm"
 msgstr " na Last.fm"
 
-#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1133
+#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1153
 msgid "Full Name:"
 msgstr "Celé jméno:"
 
@@ -1489,8 +1464,8 @@ msgstr "Aplikace"
 msgid "Addon applications, utilities, games"
 msgstr "Doplňkové aplikace, nástroje, hry"
 
-#: ../../include/nav.php:119 ../../include/text.php:968
-#: ../../include/text.php:969 ../../mod/search.php:99
+#: ../../include/nav.php:119 ../../include/text.php:970
+#: ../../include/text.php:971 ../../mod/search.php:99
 msgid "Search"
 msgstr "Vyhledávání"
 
@@ -1538,87 +1513,87 @@ msgstr "Síťový Reset"
 msgid "Load Network page with no filters"
 msgstr "Načíst stránku Síť bez filtrů"
 
-#: ../../include/nav.php:154 ../../mod/notifications.php:98
+#: ../../include/nav.php:153 ../../mod/notifications.php:98
 msgid "Introductions"
 msgstr "Představení"
 
-#: ../../include/nav.php:154
+#: ../../include/nav.php:153
 msgid "Friend Requests"
 msgstr "Žádosti přátel"
 
-#: ../../include/nav.php:155 ../../mod/notifications.php:224
+#: ../../include/nav.php:156 ../../mod/notifications.php:224
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../../include/nav.php:156
+#: ../../include/nav.php:157
 msgid "See all notifications"
 msgstr "Zobrazit všechny upozornění"
 
-#: ../../include/nav.php:157
+#: ../../include/nav.php:158
 msgid "Mark all system notifications seen"
 msgstr "Označit všechny upozornění systému jako přečtené"
 
-#: ../../include/nav.php:161 ../../mod/message.php:182
+#: ../../include/nav.php:162 ../../mod/message.php:182
 msgid "Messages"
 msgstr "Zprávy"
 
-#: ../../include/nav.php:161
+#: ../../include/nav.php:162
 msgid "Private mail"
 msgstr "Soukromá pošta"
 
-#: ../../include/nav.php:162
+#: ../../include/nav.php:163
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: ../../include/nav.php:163
+#: ../../include/nav.php:164
 msgid "Outbox"
 msgstr "Odeslaná pošta"
 
-#: ../../include/nav.php:164 ../../mod/message.php:9
+#: ../../include/nav.php:165 ../../mod/message.php:9
 msgid "New Message"
 msgstr "Nová zpráva"
 
-#: ../../include/nav.php:167
+#: ../../include/nav.php:168
 msgid "Manage"
 msgstr "Spravovat"
 
-#: ../../include/nav.php:167
+#: ../../include/nav.php:168
 msgid "Manage other pages"
 msgstr "Spravovat jiné stránky"
 
-#: ../../include/nav.php:170 ../../mod/settings.php:67
+#: ../../include/nav.php:171 ../../mod/settings.php:67
 msgid "Delegations"
 msgstr "Delegace"
 
-#: ../../include/nav.php:170 ../../mod/delegate.php:130
+#: ../../include/nav.php:171 ../../mod/delegate.php:130
 msgid "Delegate Page Management"
 msgstr "Správa delegátů stránky"
 
-#: ../../include/nav.php:172
+#: ../../include/nav.php:173
 msgid "Account settings"
 msgstr "Nastavení účtu"
 
-#: ../../include/nav.php:175
+#: ../../include/nav.php:176
 msgid "Manage/Edit Profiles"
 msgstr "Spravovat/Editovat Profily"
 
-#: ../../include/nav.php:177
+#: ../../include/nav.php:178
 msgid "Manage/edit friends and contacts"
 msgstr "Spravovat/upravit přátelé a kontakty"
 
-#: ../../include/nav.php:184 ../../mod/admin.php:130
+#: ../../include/nav.php:185 ../../mod/admin.php:130
 msgid "Admin"
 msgstr "Administrace"
 
-#: ../../include/nav.php:184
+#: ../../include/nav.php:185
 msgid "Site setup and configuration"
 msgstr "Nastavení webu a konfigurace"
 
-#: ../../include/nav.php:188
+#: ../../include/nav.php:189
 msgid "Navigation"
 msgstr "Navigace"
 
-#: ../../include/nav.php:188
+#: ../../include/nav.php:189
 msgid "Site map"
 msgstr "Mapa webu"
 
@@ -1730,16 +1705,16 @@ msgstr[2] "%d kontakty nenaimporovány"
 msgid "Done. You can now login with your username and password"
 msgstr "Hotovo. Nyní  se můžete přihlásit se svými uživatelským účtem a heslem"
 
-#: ../../include/event.php:11 ../../include/bb2diaspora.php:133
+#: ../../include/event.php:13 ../../include/bb2diaspora.php:133
 #: ../../mod/localtime.php:12
 msgid "l F d, Y \\@ g:i A"
 msgstr "l F d, Y \\@ g:i A"
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:139
+#: ../../include/event.php:22 ../../include/bb2diaspora.php:139
 msgid "Starts:"
 msgstr "Začíná:"
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:147
+#: ../../include/event.php:32 ../../include/bb2diaspora.php:147
 msgid "Finishes:"
 msgstr "Končí:"
 
@@ -1799,11 +1774,11 @@ msgid ""
 "[pre]%s[/pre]"
 msgstr "Chybová zpráva je\n[pre]%s[/pre]"
 
-#: ../../include/dbstructure.php:150
+#: ../../include/dbstructure.php:152
 msgid "Errors encountered creating database tables."
 msgstr "Při vytváření databázových tabulek došlo k chybám."
 
-#: ../../include/dbstructure.php:208
+#: ../../include/dbstructure.php:210
 msgid "Errors encountered performing database changes."
 msgstr "Při provádění databázových změn došlo k chybám."
 
@@ -1912,19 +1887,19 @@ msgstr "OK, pravděpodobně neškodný"
 msgid "Reputable, has my trust"
 msgstr "Renomovaný, má mou důvěru"
 
-#: ../../include/contact_selectors.php:56 ../../mod/admin.php:571
+#: ../../include/contact_selectors.php:56 ../../mod/admin.php:573
 msgid "Frequently"
 msgstr "Často"
 
-#: ../../include/contact_selectors.php:57 ../../mod/admin.php:572
+#: ../../include/contact_selectors.php:57 ../../mod/admin.php:574
 msgid "Hourly"
 msgstr "každou hodinu"
 
-#: ../../include/contact_selectors.php:58 ../../mod/admin.php:573
+#: ../../include/contact_selectors.php:58 ../../mod/admin.php:575
 msgid "Twice daily"
 msgstr "Dvakrát denně"
 
-#: ../../include/contact_selectors.php:59 ../../mod/admin.php:574
+#: ../../include/contact_selectors.php:59 ../../mod/admin.php:576
 msgid "Daily"
 msgstr "denně"
 
@@ -1936,7 +1911,7 @@ msgstr "Týdenně"
 msgid "Monthly"
 msgstr "Měsíčně"
 
-#: ../../include/contact_selectors.php:76 ../../mod/dfrn_request.php:836
+#: ../../include/contact_selectors.php:76 ../../mod/dfrn_request.php:851
 msgid "Friendica"
 msgstr "Friendica"
 
@@ -1949,13 +1924,13 @@ msgid "RSS/Atom"
 msgstr "RSS/Atom"
 
 #: ../../include/contact_selectors.php:79
-#: ../../include/contact_selectors.php:86 ../../mod/admin.php:1003
-#: ../../mod/admin.php:1015 ../../mod/admin.php:1016 ../../mod/admin.php:1031
+#: ../../include/contact_selectors.php:86 ../../mod/admin.php:1006
+#: ../../mod/admin.php:1018 ../../mod/admin.php:1019 ../../mod/admin.php:1034
 msgid "Email"
 msgstr "E-mail"
 
-#: ../../include/contact_selectors.php:80 ../../mod/settings.php:741
-#: ../../mod/dfrn_request.php:838
+#: ../../include/contact_selectors.php:80 ../../mod/settings.php:761
+#: ../../mod/dfrn_request.php:853
 msgid "Diaspora"
 msgstr "Diaspora"
 
@@ -2004,17 +1979,17 @@ msgstr "Statusnet"
 msgid "App.net"
 msgstr "App.net"
 
-#: ../../include/diaspora.php:621 ../../include/conversation.php:172
-#: ../../mod/dfrn_confirm.php:486
+#: ../../include/diaspora.php:622 ../../include/conversation.php:172
+#: ../../mod/dfrn_confirm.php:487
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s je nyní přítel s %2$s"
 
-#: ../../include/diaspora.php:704
+#: ../../include/diaspora.php:705
 msgid "Sharing notification from Diaspora network"
 msgstr "Sdílení oznámení ze sítě Diaspora"
 
-#: ../../include/diaspora.php:2444
+#: ../../include/diaspora.php:2493
 msgid "Attachments:"
 msgstr "Přílohy:"
 
@@ -2047,36 +2022,36 @@ msgstr "příspěvek/položka"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "uživatel %1$s označil %2$s's %3$s jako oblíbeného"
 
-#: ../../include/conversation.php:612 ../../object/Item.php:129
+#: ../../include/conversation.php:612 ../../object/Item.php:130
 #: ../../mod/photos.php:1653 ../../mod/content.php:437
 #: ../../mod/content.php:740
 msgid "Select"
 msgstr "Vybrat"
 
-#: ../../include/conversation.php:613 ../../object/Item.php:130
-#: ../../mod/group.php:171 ../../mod/settings.php:682
-#: ../../mod/contacts.php:733 ../../mod/admin.php:1007
+#: ../../include/conversation.php:613 ../../object/Item.php:131
+#: ../../mod/group.php:171 ../../mod/settings.php:684
+#: ../../mod/contacts.php:803 ../../mod/admin.php:1010
 #: ../../mod/photos.php:1654 ../../mod/content.php:438
 #: ../../mod/content.php:741
 msgid "Delete"
 msgstr "Odstranit"
 
-#: ../../include/conversation.php:653 ../../object/Item.php:326
-#: ../../object/Item.php:327 ../../mod/content.php:471
+#: ../../include/conversation.php:653 ../../object/Item.php:329
+#: ../../object/Item.php:330 ../../mod/content.php:471
 #: ../../mod/content.php:852 ../../mod/content.php:853
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Zobrazit profil uživatele %s na %s"
 
-#: ../../include/conversation.php:665 ../../object/Item.php:316
+#: ../../include/conversation.php:665 ../../object/Item.php:319
 msgid "Categories:"
 msgstr "Kategorie:"
 
-#: ../../include/conversation.php:666 ../../object/Item.php:317
+#: ../../include/conversation.php:666 ../../object/Item.php:320
 msgid "Filed under:"
 msgstr "Vyplněn pod:"
 
-#: ../../include/conversation.php:673 ../../object/Item.php:340
+#: ../../include/conversation.php:673 ../../object/Item.php:343
 #: ../../mod/content.php:481 ../../mod/content.php:864
 #, php-format
 msgid "%s from %s"
@@ -2087,7 +2062,7 @@ msgid "View in context"
 msgstr "Pohled v kontextu"
 
 #: ../../include/conversation.php:691 ../../include/conversation.php:1108
-#: ../../object/Item.php:364 ../../mod/wallmessage.php:156
+#: ../../object/Item.php:367 ../../mod/wallmessage.php:156
 #: ../../mod/editpost.php:124 ../../mod/photos.php:1545
 #: ../../mod/message.php:334 ../../mod/message.php:565
 #: ../../mod/content.php:499 ../../mod/content.php:883
@@ -2190,7 +2165,7 @@ msgstr "Poslat příspěvek na e-mail"
 msgid "Connectors disabled, since \"%s\" is enabled."
 msgstr "Kontektory deaktivovány, od \"%s\" je aktivován."
 
-#: ../../include/conversation.php:1056 ../../mod/settings.php:1033
+#: ../../include/conversation.php:1056 ../../mod/settings.php:1053
 msgid "Hide your profile details from unknown viewers?"
 msgstr "Skrýt Vaše profilové detaily před neznámými uživateli?"
 
@@ -2286,10 +2261,10 @@ msgstr "Veřejný příspěvek"
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Příklad: bob@example.com, mary@example.com"
 
-#: ../../include/conversation.php:1125 ../../object/Item.php:687
+#: ../../include/conversation.php:1125 ../../object/Item.php:690
 #: ../../mod/editpost.php:145 ../../mod/photos.php:1566
 #: ../../mod/photos.php:1610 ../../mod/photos.php:1698
-#: ../../mod/content.php:719
+#: ../../mod/events.php:489 ../../mod/content.php:719
 msgid "Preview"
 msgstr "Náhled"
 
@@ -2305,43 +2280,43 @@ msgstr "Zveřejnit na Groups"
 msgid "Private post"
 msgstr "Soukromý příspěvek"
 
-#: ../../include/text.php:297
+#: ../../include/text.php:299
 msgid "newer"
 msgstr "novější"
 
-#: ../../include/text.php:299
+#: ../../include/text.php:301
 msgid "older"
 msgstr "starší"
 
-#: ../../include/text.php:304
+#: ../../include/text.php:306
 msgid "prev"
 msgstr "předchozí"
 
-#: ../../include/text.php:306
+#: ../../include/text.php:308
 msgid "first"
 msgstr "první"
 
-#: ../../include/text.php:338
+#: ../../include/text.php:340
 msgid "last"
 msgstr "poslední"
 
-#: ../../include/text.php:341
+#: ../../include/text.php:343
 msgid "next"
 msgstr "další"
 
-#: ../../include/text.php:396
+#: ../../include/text.php:398
 msgid "Loading more entries..."
 msgstr "Načítání více záznamů..."
 
-#: ../../include/text.php:397
+#: ../../include/text.php:399
 msgid "The end"
 msgstr "Konec"
 
-#: ../../include/text.php:870
+#: ../../include/text.php:872
 msgid "No contacts"
 msgstr "Žádné kontakty"
 
-#: ../../include/text.php:879
+#: ../../include/text.php:881
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
@@ -2349,257 +2324,257 @@ msgstr[0] "%d kontakt"
 msgstr[1] "%d kontaktů"
 msgstr[2] "%d kontaktů"
 
-#: ../../include/text.php:891 ../../mod/viewcontacts.php:78
+#: ../../include/text.php:893 ../../mod/viewcontacts.php:78
 msgid "View Contacts"
 msgstr "Zobrazit kontakty"
 
-#: ../../include/text.php:971 ../../mod/editpost.php:109
+#: ../../include/text.php:973 ../../mod/editpost.php:109
 #: ../../mod/notes.php:63 ../../mod/filer.php:31
 msgid "Save"
 msgstr "Uložit"
 
-#: ../../include/text.php:1020
+#: ../../include/text.php:1022
 msgid "poke"
 msgstr "šťouchnout"
 
-#: ../../include/text.php:1020
+#: ../../include/text.php:1022
 msgid "poked"
 msgstr "šťouchnut"
 
-#: ../../include/text.php:1021
+#: ../../include/text.php:1023
 msgid "ping"
 msgstr "cinknout"
 
-#: ../../include/text.php:1021
+#: ../../include/text.php:1023
 msgid "pinged"
 msgstr "cinkut"
 
-#: ../../include/text.php:1022
+#: ../../include/text.php:1024
 msgid "prod"
 msgstr "pobídnout"
 
-#: ../../include/text.php:1022
+#: ../../include/text.php:1024
 msgid "prodded"
 msgstr "pobídnut"
 
-#: ../../include/text.php:1023
+#: ../../include/text.php:1025
 msgid "slap"
 msgstr "dát facku"
 
-#: ../../include/text.php:1023
+#: ../../include/text.php:1025
 msgid "slapped"
 msgstr "být uhozen"
 
-#: ../../include/text.php:1024
+#: ../../include/text.php:1026
 msgid "finger"
 msgstr "osahávat"
 
-#: ../../include/text.php:1024
+#: ../../include/text.php:1026
 msgid "fingered"
 msgstr "osaháván"
 
-#: ../../include/text.php:1025
+#: ../../include/text.php:1027
 msgid "rebuff"
 msgstr "odmítnout"
 
-#: ../../include/text.php:1025
+#: ../../include/text.php:1027
 msgid "rebuffed"
 msgstr "odmítnut"
 
-#: ../../include/text.php:1039
+#: ../../include/text.php:1041
 msgid "happy"
 msgstr "šťasný"
 
-#: ../../include/text.php:1040
+#: ../../include/text.php:1042
 msgid "sad"
 msgstr "smutný"
 
-#: ../../include/text.php:1041
+#: ../../include/text.php:1043
 msgid "mellow"
 msgstr "jemný"
 
-#: ../../include/text.php:1042
+#: ../../include/text.php:1044
 msgid "tired"
 msgstr "unavený"
 
-#: ../../include/text.php:1043
+#: ../../include/text.php:1045
 msgid "perky"
 msgstr "emergický"
 
-#: ../../include/text.php:1044
+#: ../../include/text.php:1046
 msgid "angry"
 msgstr "nazlobený"
 
-#: ../../include/text.php:1045
+#: ../../include/text.php:1047
 msgid "stupified"
 msgstr "otupen"
 
-#: ../../include/text.php:1046
+#: ../../include/text.php:1048
 msgid "puzzled"
 msgstr "popletený"
 
-#: ../../include/text.php:1047
+#: ../../include/text.php:1049
 msgid "interested"
 msgstr "zajímavý"
 
-#: ../../include/text.php:1048
+#: ../../include/text.php:1050
 msgid "bitter"
 msgstr "hořký"
 
-#: ../../include/text.php:1049
+#: ../../include/text.php:1051
 msgid "cheerful"
 msgstr "radnostný"
 
-#: ../../include/text.php:1050
+#: ../../include/text.php:1052
 msgid "alive"
 msgstr "naživu"
 
-#: ../../include/text.php:1051
+#: ../../include/text.php:1053
 msgid "annoyed"
 msgstr "otráven"
 
-#: ../../include/text.php:1052
+#: ../../include/text.php:1054
 msgid "anxious"
 msgstr "znepokojený"
 
-#: ../../include/text.php:1053
+#: ../../include/text.php:1055
 msgid "cranky"
 msgstr "mrzutý"
 
-#: ../../include/text.php:1054
+#: ../../include/text.php:1056
 msgid "disturbed"
 msgstr "vyrušen"
 
-#: ../../include/text.php:1055
+#: ../../include/text.php:1057
 msgid "frustrated"
 msgstr "frustrovaný"
 
-#: ../../include/text.php:1056
+#: ../../include/text.php:1058
 msgid "motivated"
 msgstr "motivovaný"
 
-#: ../../include/text.php:1057
+#: ../../include/text.php:1059
 msgid "relaxed"
 msgstr "uvolněný"
 
-#: ../../include/text.php:1058
+#: ../../include/text.php:1060
 msgid "surprised"
 msgstr "překvapený"
 
-#: ../../include/text.php:1228
+#: ../../include/text.php:1230
 msgid "Monday"
 msgstr "Pondělí"
 
-#: ../../include/text.php:1228
+#: ../../include/text.php:1230
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: ../../include/text.php:1228
+#: ../../include/text.php:1230
 msgid "Wednesday"
 msgstr "Středa"
 
-#: ../../include/text.php:1228
+#: ../../include/text.php:1230
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: ../../include/text.php:1228
+#: ../../include/text.php:1230
 msgid "Friday"
 msgstr "Pátek"
 
-#: ../../include/text.php:1228
+#: ../../include/text.php:1230
 msgid "Saturday"
 msgstr "Sobota"
 
-#: ../../include/text.php:1228
+#: ../../include/text.php:1230
 msgid "Sunday"
 msgstr "Neděle"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "January"
 msgstr "Ledna"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "February"
 msgstr "Února"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "March"
 msgstr "Března"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "April"
 msgstr "Dubna"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "May"
 msgstr "Května"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "June"
 msgstr "Června"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "July"
 msgstr "Července"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "August"
 msgstr "Srpna"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "September"
 msgstr "Září"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "October"
 msgstr "Října"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "November"
 msgstr "Listopadu"
 
-#: ../../include/text.php:1232
+#: ../../include/text.php:1234
 msgid "December"
 msgstr "Prosinec"
 
-#: ../../include/text.php:1422 ../../mod/videos.php:301
+#: ../../include/text.php:1424 ../../mod/videos.php:301
 msgid "View Video"
 msgstr "Zobrazit video"
 
-#: ../../include/text.php:1454
+#: ../../include/text.php:1456
 msgid "bytes"
 msgstr "bytů"
 
-#: ../../include/text.php:1478 ../../include/text.php:1490
+#: ../../include/text.php:1488 ../../include/text.php:1500
 msgid "Click to open/close"
 msgstr "Klikněte pro otevření/zavření"
 
-#: ../../include/text.php:1664 ../../include/text.php:1674
-#: ../../mod/events.php:335
+#: ../../include/text.php:1674 ../../include/text.php:1684
+#: ../../mod/events.php:347
 msgid "link to source"
 msgstr "odkaz na zdroj"
 
-#: ../../include/text.php:1731
+#: ../../include/text.php:1741
 msgid "Select an alternate language"
 msgstr "Vyběr alternativního jazyka"
 
-#: ../../include/text.php:1987
+#: ../../include/text.php:1997
 msgid "activity"
 msgstr "aktivita"
 
-#: ../../include/text.php:1989 ../../object/Item.php:389
-#: ../../object/Item.php:402 ../../mod/content.php:605
+#: ../../include/text.php:1999 ../../object/Item.php:392
+#: ../../object/Item.php:405 ../../mod/content.php:605
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "komentář"
 
-#: ../../include/text.php:1990
+#: ../../include/text.php:2000
 msgid "post"
 msgstr "příspěvek"
 
-#: ../../include/text.php:2158
+#: ../../include/text.php:2168
 msgid "Item filed"
 msgstr "Položka vyplněna"
 
@@ -2622,28 +2597,28 @@ msgstr "Zaznamenali jsme problém s Vaším přihlášením prostřednictvím V
 msgid "The error message was:"
 msgstr "Chybová zpráva byla:"
 
-#: ../../include/bbcode.php:433 ../../include/bbcode.php:1066
-#: ../../include/bbcode.php:1067
+#: ../../include/bbcode.php:448 ../../include/bbcode.php:1094
+#: ../../include/bbcode.php:1095
 msgid "Image/photo"
 msgstr "Obrázek/fotografie"
 
-#: ../../include/bbcode.php:531
+#: ../../include/bbcode.php:546
 #, php-format
 msgid "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
 msgstr "<a href=\"%1$s\" target=\"_blank\">%2$s</a> %3$s"
 
-#: ../../include/bbcode.php:565
+#: ../../include/bbcode.php:580
 #, php-format
 msgid ""
 "<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a "
 "href=\"%s\" target=\"_blank\">post</a>"
 msgstr "<span><a href=\"%s\" target=\"_blank\">%s</a> napsal následující <a href=\"%s\" target=\"_blank\">příspěvek</a>"
 
-#: ../../include/bbcode.php:1030 ../../include/bbcode.php:1050
+#: ../../include/bbcode.php:1058 ../../include/bbcode.php:1078
 msgid "$1 wrote:"
 msgstr "$1 napsal:"
 
-#: ../../include/bbcode.php:1075 ../../include/bbcode.php:1076
+#: ../../include/bbcode.php:1103 ../../include/bbcode.php:1104
 msgid "Encrypted content"
 msgstr "Šifrovaný obsah"
 
@@ -2659,17 +2634,17 @@ msgstr "Prosím nahrejte profilovou fotografii"
 msgid "Welcome back "
 msgstr "Vítejte zpět "
 
-#: ../../include/security.php:366
+#: ../../include/security.php:375
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr "Formulářový bezpečnostní token nebyl správný. To pravděpodobně nastalo kvůli tom, že formulář byl otevřen příliš dlouho (>3 hodiny) před jeho odesláním."
 
-#: ../../include/oembed.php:213
+#: ../../include/oembed.php:218
 msgid "Embedded content"
 msgstr "vložený obsah"
 
-#: ../../include/oembed.php:222
+#: ../../include/oembed.php:227
 msgid "Embedding disabled"
 msgstr "Vkládání zakázáno"
 
@@ -3013,7 +2988,7 @@ msgid ""
 "\t\tThank you and welcome to %2$s."
 msgstr "\n\t\tVaše přihlašovací údaje jsou následující:\n\t\t\tAdresa webu:\t%3$s\n\t\t\tpřihlašovací jméno:\t%1$s\n\t\t\theslo:\t%5$s\n\n\t\tHeslo si můžete změnit na stránce \"Nastavení\" vašeho účtu poté, co se přihlásíte.\n\n\t\tProsím věnujte pár chvil revizi dalšího nastavení vašeho účtu na dané stránce.\n\n\t\tTaké su můžete přidat nějaké základní informace do svého výchozího profilu (na stránce \"Profily\"), takže ostatní lidé vás snáze najdou.\n\n\t\tDoporučujeme Vám uvést celé jméno a i foto. Přidáním nějakých \"klíčových slov\" (velmi užitečné pro hledání nových přátel) a možná také zemi, ve které žijete, pokud nechcete být více konkrétní.\n\n\t\tPlně resepktujeme vaše právo na soukromí a nic z výše uvedeného není povinné.\n\t\tPokud jste zde nový a neznáte zde nikoho, uvedením daných informací můžete získat nové přátele.\n\n\n\t\tDíky a vítejte na %2$s."
 
-#: ../../include/user.php:413 ../../mod/admin.php:838
+#: ../../include/user.php:413 ../../mod/admin.php:841
 #, php-format
 msgid "Registration details for %s"
 msgstr "Registrační údaje pro %s"
@@ -3022,103 +2997,103 @@ msgstr "Registrační údaje pro %s"
 msgid "Visible to everybody"
 msgstr "Viditelné pro všechny"
 
-#: ../../object/Item.php:94
+#: ../../object/Item.php:95
 msgid "This entry was edited"
 msgstr "Tento záznam byl editován"
 
-#: ../../object/Item.php:116 ../../mod/photos.php:1359
+#: ../../object/Item.php:117 ../../mod/photos.php:1359
 #: ../../mod/content.php:620
 msgid "Private Message"
 msgstr "Soukromá zpráva"
 
-#: ../../object/Item.php:120 ../../mod/settings.php:681
+#: ../../object/Item.php:121 ../../mod/settings.php:683
 #: ../../mod/content.php:728
 msgid "Edit"
 msgstr "Upravit"
 
-#: ../../object/Item.php:133 ../../mod/content.php:763
+#: ../../object/Item.php:134 ../../mod/content.php:763
 msgid "save to folder"
 msgstr "uložit do složky"
 
-#: ../../object/Item.php:195 ../../mod/content.php:753
+#: ../../object/Item.php:196 ../../mod/content.php:753
 msgid "add star"
 msgstr "přidat hvězdu"
 
-#: ../../object/Item.php:196 ../../mod/content.php:754
+#: ../../object/Item.php:197 ../../mod/content.php:754
 msgid "remove star"
 msgstr "odebrat hvězdu"
 
-#: ../../object/Item.php:197 ../../mod/content.php:755
+#: ../../object/Item.php:198 ../../mod/content.php:755
 msgid "toggle star status"
 msgstr "přepnout hvězdu"
 
-#: ../../object/Item.php:200 ../../mod/content.php:758
+#: ../../object/Item.php:201 ../../mod/content.php:758
 msgid "starred"
 msgstr "označeno hvězdou"
 
-#: ../../object/Item.php:208
+#: ../../object/Item.php:209
 msgid "ignore thread"
 msgstr "ignorovat vlákno"
 
-#: ../../object/Item.php:209
+#: ../../object/Item.php:210
 msgid "unignore thread"
 msgstr "přestat ignorovat vlákno"
 
-#: ../../object/Item.php:210
+#: ../../object/Item.php:211
 msgid "toggle ignore status"
 msgstr "přepnout stav Ignorování"
 
-#: ../../object/Item.php:213
+#: ../../object/Item.php:214
 msgid "ignored"
 msgstr "ignorován"
 
-#: ../../object/Item.php:220 ../../mod/content.php:759
+#: ../../object/Item.php:221 ../../mod/content.php:759
 msgid "add tag"
 msgstr "přidat štítek"
 
-#: ../../object/Item.php:231 ../../mod/photos.php:1542
+#: ../../object/Item.php:232 ../../mod/photos.php:1542
 #: ../../mod/content.php:684
 msgid "I like this (toggle)"
 msgstr "Líbí se mi to (přepínač)"
 
-#: ../../object/Item.php:231 ../../mod/content.php:684
+#: ../../object/Item.php:232 ../../mod/content.php:684
 msgid "like"
 msgstr "má rád"
 
-#: ../../object/Item.php:232 ../../mod/photos.php:1543
+#: ../../object/Item.php:233 ../../mod/photos.php:1543
 #: ../../mod/content.php:685
 msgid "I don't like this (toggle)"
 msgstr "Nelíbí se mi to (přepínač)"
 
-#: ../../object/Item.php:232 ../../mod/content.php:685
+#: ../../object/Item.php:233 ../../mod/content.php:685
 msgid "dislike"
 msgstr "nemá rád"
 
-#: ../../object/Item.php:234 ../../mod/content.php:687
+#: ../../object/Item.php:235 ../../mod/content.php:687
 msgid "Share this"
 msgstr "Sdílet toto"
 
-#: ../../object/Item.php:234 ../../mod/content.php:687
+#: ../../object/Item.php:235 ../../mod/content.php:687
 msgid "share"
 msgstr "sdílí"
 
-#: ../../object/Item.php:328 ../../mod/content.php:854
+#: ../../object/Item.php:331 ../../mod/content.php:854
 msgid "to"
 msgstr "pro"
 
-#: ../../object/Item.php:329
+#: ../../object/Item.php:332
 msgid "via"
 msgstr "přes"
 
-#: ../../object/Item.php:330 ../../mod/content.php:855
+#: ../../object/Item.php:333 ../../mod/content.php:855
 msgid "Wall-to-Wall"
 msgstr "Zeď-na-Zeď"
 
-#: ../../object/Item.php:331 ../../mod/content.php:856
+#: ../../object/Item.php:334 ../../mod/content.php:856
 msgid "via Wall-To-Wall:"
 msgstr "přes Zeď-na-Zeď "
 
-#: ../../object/Item.php:387 ../../mod/content.php:603
+#: ../../object/Item.php:390 ../../mod/content.php:603
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -3126,41 +3101,41 @@ msgstr[0] "%d komentář"
 msgstr[1] "%d komentářů"
 msgstr[2] "%d komentářů"
 
-#: ../../object/Item.php:675 ../../mod/photos.php:1562
+#: ../../object/Item.php:678 ../../mod/photos.php:1562
 #: ../../mod/photos.php:1606 ../../mod/photos.php:1694
 #: ../../mod/content.php:707
 msgid "This is you"
 msgstr "Nastavte Vaši polohu"
 
-#: ../../object/Item.php:679 ../../mod/content.php:711
+#: ../../object/Item.php:682 ../../mod/content.php:711
 msgid "Bold"
 msgstr "Tučné"
 
-#: ../../object/Item.php:680 ../../mod/content.php:712
+#: ../../object/Item.php:683 ../../mod/content.php:712
 msgid "Italic"
 msgstr "Kurzíva"
 
-#: ../../object/Item.php:681 ../../mod/content.php:713
+#: ../../object/Item.php:684 ../../mod/content.php:713
 msgid "Underline"
 msgstr "Podrtžené"
 
-#: ../../object/Item.php:682 ../../mod/content.php:714
+#: ../../object/Item.php:685 ../../mod/content.php:714
 msgid "Quote"
 msgstr "Citovat"
 
-#: ../../object/Item.php:683 ../../mod/content.php:715
+#: ../../object/Item.php:686 ../../mod/content.php:715
 msgid "Code"
 msgstr "Kód"
 
-#: ../../object/Item.php:684 ../../mod/content.php:716
+#: ../../object/Item.php:687 ../../mod/content.php:716
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../../object/Item.php:685 ../../mod/content.php:717
+#: ../../object/Item.php:688 ../../mod/content.php:717
 msgid "Link"
 msgstr "Odkaz"
 
-#: ../../object/Item.php:686 ../../mod/content.php:718
+#: ../../object/Item.php:689 ../../mod/content.php:718
 msgid "Video"
 msgstr "Video"
 
@@ -3251,10 +3226,6 @@ msgstr "Uložit Skupinu"
 msgid "Create a group of contacts/friends."
 msgstr "Vytvořit skupinu kontaktů / přátel."
 
-#: ../../mod/group.php:94 ../../mod/group.php:180
-msgid "Group Name: "
-msgstr "Název skupiny: "
-
 #: ../../mod/group.php:113
 msgid "Group removed."
 msgstr "Skupina odstraněna. "
@@ -3271,11 +3242,11 @@ msgstr "Editor skupin"
 msgid "Members"
 msgstr "Členové"
 
-#: ../../mod/group.php:194 ../../mod/contacts.php:586
+#: ../../mod/group.php:194 ../../mod/contacts.php:656
 msgid "All Contacts"
 msgstr "Všechny kontakty"
 
-#: ../../mod/group.php:224 ../../mod/profperm.php:105
+#: ../../mod/group.php:224 ../../mod/profperm.php:106
 msgid "Click on a contact to add or remove."
 msgstr "Klikněte na kontakt pro přidání nebo odebrání"
 
@@ -3324,8 +3295,8 @@ msgid "Discard"
 msgstr "Odstranit"
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:164
-#: ../../mod/notifications.php:214 ../../mod/contacts.php:455
-#: ../../mod/contacts.php:519 ../../mod/contacts.php:731
+#: ../../mod/notifications.php:214 ../../mod/contacts.php:525
+#: ../../mod/contacts.php:589 ../../mod/contacts.php:801
 msgid "Ignore"
 msgstr "Ignorovat"
 
@@ -3359,7 +3330,7 @@ msgid "suggested by %s"
 msgstr "navrhl %s"
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:208
-#: ../../mod/contacts.php:525
+#: ../../mod/contacts.php:595
 msgid "Hide this contact from others"
 msgstr "Skrýt tento kontakt před ostatními"
 
@@ -3372,7 +3343,7 @@ msgid "if applicable"
 msgstr "je-li použitelné"
 
 #: ../../mod/notifications.php:161 ../../mod/notifications.php:212
-#: ../../mod/admin.php:1005
+#: ../../mod/admin.php:1008
 msgid "Approve"
 msgstr "Schválit"
 
@@ -3495,7 +3466,7 @@ msgstr "Žádný profil"
 msgid "everybody"
 msgstr "Žádost o připojení selhala nebo byla zrušena."
 
-#: ../../mod/settings.php:41 ../../mod/admin.php:1016
+#: ../../mod/settings.php:41 ../../mod/admin.php:1019
 msgid "Account"
 msgstr "Účet"
 
@@ -3507,12 +3478,12 @@ msgstr "Další funkčnosti"
 msgid "Display"
 msgstr "Zobrazení"
 
-#: ../../mod/settings.php:57 ../../mod/settings.php:785
+#: ../../mod/settings.php:57 ../../mod/settings.php:805
 msgid "Social Networks"
 msgstr "Sociální sítě"
 
-#: ../../mod/settings.php:62 ../../mod/admin.php:106 ../../mod/admin.php:1102
-#: ../../mod/admin.php:1155
+#: ../../mod/settings.php:62 ../../mod/admin.php:106 ../../mod/admin.php:1105
+#: ../../mod/admin.php:1158
 msgid "Plugins"
 msgstr "Pluginy"
 
@@ -3532,620 +3503,651 @@ msgstr "Odstranit účet"
 msgid "Missing some important data!"
 msgstr "Chybí některé důležité údaje!"
 
-#: ../../mod/settings.php:137 ../../mod/settings.php:645
-#: ../../mod/contacts.php:729
+#: ../../mod/settings.php:137 ../../mod/settings.php:647
+#: ../../mod/contacts.php:799
 msgid "Update"
 msgstr "Aktualizace"
 
-#: ../../mod/settings.php:243
+#: ../../mod/settings.php:245
 msgid "Failed to connect with email account using the settings provided."
 msgstr "Nepodařilo se připojit k e-mailovému účtu pomocí dodaného nastavení."
 
-#: ../../mod/settings.php:248
+#: ../../mod/settings.php:250
 msgid "Email settings updated."
 msgstr "Nastavení e-mailu aktualizována."
 
-#: ../../mod/settings.php:263
+#: ../../mod/settings.php:265
 msgid "Features updated"
 msgstr "Aktualizované funkčnosti"
 
-#: ../../mod/settings.php:326
+#: ../../mod/settings.php:328
 msgid "Relocate message has been send to your contacts"
 msgstr "Správa o změně umístění byla odeslána vašim kontaktům"
 
-#: ../../mod/settings.php:340
+#: ../../mod/settings.php:342
 msgid "Passwords do not match. Password unchanged."
 msgstr "Hesla se neshodují. Heslo nebylo změněno."
 
-#: ../../mod/settings.php:345
+#: ../../mod/settings.php:347
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr "Prázdné hesla nejsou povolena. Heslo nebylo změněno."
 
-#: ../../mod/settings.php:353
+#: ../../mod/settings.php:355
 msgid "Wrong password."
 msgstr "Špatné heslo."
 
-#: ../../mod/settings.php:364
+#: ../../mod/settings.php:366
 msgid "Password changed."
 msgstr "Heslo bylo změněno."
 
-#: ../../mod/settings.php:366
+#: ../../mod/settings.php:368
 msgid "Password update failed. Please try again."
 msgstr "Aktualizace hesla se nezdařila. Zkuste to prosím znovu."
 
-#: ../../mod/settings.php:433
+#: ../../mod/settings.php:435
 msgid " Please use a shorter name."
 msgstr "Prosím použijte kratší jméno."
 
-#: ../../mod/settings.php:435
+#: ../../mod/settings.php:437
 msgid " Name too short."
 msgstr "Jméno je příliš krátké."
 
-#: ../../mod/settings.php:444
+#: ../../mod/settings.php:446
 msgid "Wrong Password"
 msgstr "Špatné heslo"
 
-#: ../../mod/settings.php:449
+#: ../../mod/settings.php:451
 msgid " Not valid email."
 msgstr "Neplatný e-mail."
 
-#: ../../mod/settings.php:455
+#: ../../mod/settings.php:457
 msgid " Cannot change to that email."
 msgstr "Nelze provést změnu na tento e-mail."
 
-#: ../../mod/settings.php:511
+#: ../../mod/settings.php:513
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr "Soukromé fórum nemá nastaveno zabezpečení. Používá se defaultní soukromá skupina."
 
-#: ../../mod/settings.php:515
+#: ../../mod/settings.php:517
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr "Soukromé fórum nemá nastaveno zabezpečení a ani žádnou defaultní soukromou skupinu."
 
-#: ../../mod/settings.php:545
+#: ../../mod/settings.php:547
 msgid "Settings updated."
 msgstr "Nastavení aktualizováno."
 
-#: ../../mod/settings.php:618 ../../mod/settings.php:644
-#: ../../mod/settings.php:680
+#: ../../mod/settings.php:620 ../../mod/settings.php:646
+#: ../../mod/settings.php:682
 msgid "Add application"
 msgstr "Přidat aplikaci"
 
-#: ../../mod/settings.php:619 ../../mod/settings.php:729
-#: ../../mod/settings.php:803 ../../mod/settings.php:885
-#: ../../mod/settings.php:1118 ../../mod/admin.php:620
-#: ../../mod/admin.php:1156 ../../mod/admin.php:1358 ../../mod/admin.php:1445
+#: ../../mod/settings.php:621 ../../mod/settings.php:731
+#: ../../mod/settings.php:754 ../../mod/settings.php:823
+#: ../../mod/settings.php:905 ../../mod/settings.php:1138
+#: ../../mod/admin.php:622 ../../mod/admin.php:1159 ../../mod/admin.php:1361
+#: ../../mod/admin.php:1448
 msgid "Save Settings"
 msgstr "Uložit Nastavení"
 
-#: ../../mod/settings.php:621 ../../mod/settings.php:647
-#: ../../mod/admin.php:1003 ../../mod/admin.php:1015 ../../mod/admin.php:1016
-#: ../../mod/admin.php:1029 ../../mod/crepair.php:165
+#: ../../mod/settings.php:623 ../../mod/settings.php:649
+#: ../../mod/admin.php:1006 ../../mod/admin.php:1018 ../../mod/admin.php:1019
+#: ../../mod/admin.php:1032 ../../mod/crepair.php:169
 msgid "Name"
 msgstr "Jméno"
 
-#: ../../mod/settings.php:622 ../../mod/settings.php:648
+#: ../../mod/settings.php:624 ../../mod/settings.php:650
 msgid "Consumer Key"
 msgstr "Consumer Key"
 
-#: ../../mod/settings.php:623 ../../mod/settings.php:649
+#: ../../mod/settings.php:625 ../../mod/settings.php:651
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: ../../mod/settings.php:624 ../../mod/settings.php:650
+#: ../../mod/settings.php:626 ../../mod/settings.php:652
 msgid "Redirect"
 msgstr "Přesměrování"
 
-#: ../../mod/settings.php:625 ../../mod/settings.php:651
+#: ../../mod/settings.php:627 ../../mod/settings.php:653
 msgid "Icon url"
 msgstr "URL ikony"
 
-#: ../../mod/settings.php:636
+#: ../../mod/settings.php:638
 msgid "You can't edit this application."
 msgstr "Nemůžete editovat tuto aplikaci."
 
-#: ../../mod/settings.php:679
+#: ../../mod/settings.php:681
 msgid "Connected Apps"
 msgstr "Připojené aplikace"
 
-#: ../../mod/settings.php:683
+#: ../../mod/settings.php:685
 msgid "Client key starts with"
 msgstr "Klienský klíč začíná"
 
-#: ../../mod/settings.php:684
+#: ../../mod/settings.php:686
 msgid "No name"
 msgstr "Bez názvu"
 
-#: ../../mod/settings.php:685
+#: ../../mod/settings.php:687
 msgid "Remove authorization"
 msgstr "Odstranit oprávnění"
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:699
 msgid "No Plugin settings configured"
 msgstr "Žádný doplněk není nastaven"
 
-#: ../../mod/settings.php:705
+#: ../../mod/settings.php:707
 msgid "Plugin Settings"
 msgstr "Nastavení doplňku"
 
-#: ../../mod/settings.php:719
+#: ../../mod/settings.php:721
 msgid "Off"
 msgstr "Vypnuto"
 
-#: ../../mod/settings.php:719
+#: ../../mod/settings.php:721
 msgid "On"
 msgstr "Zapnuto"
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:729
 msgid "Additional Features"
 msgstr "Další Funkčnosti"
 
-#: ../../mod/settings.php:741 ../../mod/settings.php:742
+#: ../../mod/settings.php:739 ../../mod/settings.php:743
+msgid "General Social Media Settings"
+msgstr "General Social Media nastavení"
+
+#: ../../mod/settings.php:749
+msgid "Disable intelligent shortening"
+msgstr "Vypnout inteligentní zkracování"
+
+#: ../../mod/settings.php:751
+msgid ""
+"Normally the system tries to find the best link to add to shortened posts. "
+"If this option is enabled then every shortened post will always point to the"
+" original friendica post."
+msgstr "Normálně se systém snaží nalézt nejlepší link pro přidání zkrácených příspěvků. Pokud je tato volba aktivní, pak každý zkrácený příspěvek bude vždy ukazovat na originální friencika příspěvek"
+
+#: ../../mod/settings.php:761 ../../mod/settings.php:762
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr "Vestavěná podpora pro připojení s %s je %s"
 
-#: ../../mod/settings.php:741 ../../mod/settings.php:742
+#: ../../mod/settings.php:761 ../../mod/settings.php:762
 msgid "enabled"
 msgstr "povoleno"
 
-#: ../../mod/settings.php:741 ../../mod/settings.php:742
+#: ../../mod/settings.php:761 ../../mod/settings.php:762
 msgid "disabled"
 msgstr "zakázáno"
 
-#: ../../mod/settings.php:742
+#: ../../mod/settings.php:762
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: ../../mod/settings.php:778
+#: ../../mod/settings.php:798
 msgid "Email access is disabled on this site."
 msgstr "Přístup k elektronické poště je na tomto serveru zakázán."
 
-#: ../../mod/settings.php:790
+#: ../../mod/settings.php:810
 msgid "Email/Mailbox Setup"
 msgstr "Nastavení e-mailu"
 
-#: ../../mod/settings.php:791
+#: ../../mod/settings.php:811
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr "Pokud chcete komunikovat pomocí této služby s Vašimi kontakty z e-mailu (volitelné), uveďte, jak se připojit k Vaší e-mailové schránce."
 
-#: ../../mod/settings.php:792
+#: ../../mod/settings.php:812
 msgid "Last successful email check:"
 msgstr "Poslední úspěšná kontrola e-mailu:"
 
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:814
 msgid "IMAP server name:"
 msgstr "jméno IMAP serveru:"
 
-#: ../../mod/settings.php:795
+#: ../../mod/settings.php:815
 msgid "IMAP port:"
 msgstr "IMAP port:"
 
-#: ../../mod/settings.php:796
+#: ../../mod/settings.php:816
 msgid "Security:"
 msgstr "Zabezpečení:"
 
-#: ../../mod/settings.php:796 ../../mod/settings.php:801
+#: ../../mod/settings.php:816 ../../mod/settings.php:821
 msgid "None"
 msgstr "Žádný"
 
-#: ../../mod/settings.php:797
+#: ../../mod/settings.php:817
 msgid "Email login name:"
 msgstr "přihlašovací jméno k e-mailu:"
 
-#: ../../mod/settings.php:798
+#: ../../mod/settings.php:818
 msgid "Email password:"
 msgstr "heslo k Vašemu e-mailu:"
 
-#: ../../mod/settings.php:799
+#: ../../mod/settings.php:819
 msgid "Reply-to address:"
 msgstr "Odpovědět na adresu:"
 
-#: ../../mod/settings.php:800
+#: ../../mod/settings.php:820
 msgid "Send public posts to all email contacts:"
 msgstr "Poslat veřejné příspěvky na všechny e-mailové kontakty:"
 
-#: ../../mod/settings.php:801
+#: ../../mod/settings.php:821
 msgid "Action after import:"
 msgstr "Akce po importu:"
 
-#: ../../mod/settings.php:801
+#: ../../mod/settings.php:821
 msgid "Mark as seen"
 msgstr "Označit jako přečtené"
 
-#: ../../mod/settings.php:801
+#: ../../mod/settings.php:821
 msgid "Move to folder"
 msgstr "Přesunout do složky"
 
-#: ../../mod/settings.php:802
+#: ../../mod/settings.php:822
 msgid "Move to folder:"
 msgstr "Přesunout do složky:"
 
-#: ../../mod/settings.php:833 ../../mod/admin.php:545
+#: ../../mod/settings.php:853 ../../mod/admin.php:547
 msgid "No special theme for mobile devices"
 msgstr "žádné speciální téma pro mobilní zařízení"
 
-#: ../../mod/settings.php:883
+#: ../../mod/settings.php:903
 msgid "Display Settings"
 msgstr "Nastavení Zobrazení"
 
-#: ../../mod/settings.php:889 ../../mod/settings.php:904
+#: ../../mod/settings.php:909 ../../mod/settings.php:924
 msgid "Display Theme:"
 msgstr "Vybrat grafickou šablonu:"
 
-#: ../../mod/settings.php:890
+#: ../../mod/settings.php:910
 msgid "Mobile Theme:"
 msgstr "Téma pro mobilní zařízení:"
 
-#: ../../mod/settings.php:891
+#: ../../mod/settings.php:911
 msgid "Update browser every xx seconds"
 msgstr "Aktualizovat prohlížeč každých xx sekund"
 
-#: ../../mod/settings.php:891
+#: ../../mod/settings.php:911
 msgid "Minimum of 10 seconds, no maximum"
 msgstr "Minimum 10 sekund, žádné maximum."
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:912
 msgid "Number of items to display per page:"
 msgstr "Počet položek zobrazených na stránce:"
 
-#: ../../mod/settings.php:892 ../../mod/settings.php:893
+#: ../../mod/settings.php:912 ../../mod/settings.php:913
 msgid "Maximum of 100 items"
 msgstr "Maximum 100 položek"
 
-#: ../../mod/settings.php:893
+#: ../../mod/settings.php:913
 msgid "Number of items to display per page when viewed from mobile device:"
 msgstr "Počet položek ke zobrazení na stránce při zobrazení na mobilním zařízení:"
 
-#: ../../mod/settings.php:894
+#: ../../mod/settings.php:914
 msgid "Don't show emoticons"
 msgstr "Nezobrazovat emotikony"
 
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:915
 msgid "Don't show notices"
 msgstr "Nezobrazovat oznámění"
 
-#: ../../mod/settings.php:896
+#: ../../mod/settings.php:916
 msgid "Infinite scroll"
 msgstr "Nekonečné posouvání"
 
-#: ../../mod/settings.php:897
+#: ../../mod/settings.php:917
 msgid "Automatic updates only at the top of the network page"
 msgstr "Automatické aktualizace pouze na hlavní stránce Síť."
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:994
 msgid "User Types"
 msgstr "Uživatelské typy"
 
-#: ../../mod/settings.php:975
+#: ../../mod/settings.php:995
 msgid "Community Types"
 msgstr "Komunitní typy"
 
-#: ../../mod/settings.php:976
+#: ../../mod/settings.php:996
 msgid "Normal Account Page"
 msgstr "Normální stránka účtu"
 
-#: ../../mod/settings.php:977
+#: ../../mod/settings.php:997
 msgid "This account is a normal personal profile"
 msgstr "Tento účet je běžný osobní profil"
 
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:1000
 msgid "Soapbox Page"
 msgstr "Stránka \"Soapbox\""
 
-#: ../../mod/settings.php:981
+#: ../../mod/settings.php:1001
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr "Automaticky schválit všechna spojení / přátelství jako fanoušky s právem pouze ke čtení"
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:1004
 msgid "Community Forum/Celebrity Account"
 msgstr "Komunitní fórum/ účet celebrity"
 
-#: ../../mod/settings.php:985
+#: ../../mod/settings.php:1005
 msgid ""
 "Automatically approve all connection/friend requests as read-write fans"
 msgstr "Automaticky schvalovat všechny žádosti o spojení / přátelství, jako fanoušky s právem ke čtení."
 
-#: ../../mod/settings.php:988
+#: ../../mod/settings.php:1008
 msgid "Automatic Friend Page"
 msgstr "Automatická stránka přítele"
 
-#: ../../mod/settings.php:989
+#: ../../mod/settings.php:1009
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr "Automaticky schvalovat všechny žádosti o spojení / přátelství jako přátele"
 
-#: ../../mod/settings.php:992
+#: ../../mod/settings.php:1012
 msgid "Private Forum [Experimental]"
 msgstr "Soukromé fórum [Experimentální]"
 
-#: ../../mod/settings.php:993
+#: ../../mod/settings.php:1013
 msgid "Private forum - approved members only"
 msgstr "Soukromé fórum - pouze pro schválené členy"
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1025
 msgid "OpenID:"
 msgstr "OpenID:"
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1025
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr "(Volitelné) Povolit OpenID pro přihlášení k tomuto účtu."
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1035
 msgid "Publish your default profile in your local site directory?"
 msgstr "Publikovat Váš výchozí profil v místním adresáři webu?"
 
-#: ../../mod/settings.php:1015 ../../mod/settings.php:1021
-#: ../../mod/settings.php:1029 ../../mod/settings.php:1033
-#: ../../mod/settings.php:1038 ../../mod/settings.php:1044
-#: ../../mod/settings.php:1050 ../../mod/settings.php:1056
-#: ../../mod/settings.php:1086 ../../mod/settings.php:1087
-#: ../../mod/settings.php:1088 ../../mod/settings.php:1089
-#: ../../mod/settings.php:1090 ../../mod/register.php:234
-#: ../../mod/dfrn_request.php:830 ../../mod/api.php:106
-#: ../../mod/profiles.php:661 ../../mod/profiles.php:665
+#: ../../mod/settings.php:1035 ../../mod/settings.php:1041
+#: ../../mod/settings.php:1049 ../../mod/settings.php:1053
+#: ../../mod/settings.php:1058 ../../mod/settings.php:1064
+#: ../../mod/settings.php:1070 ../../mod/settings.php:1076
+#: ../../mod/settings.php:1106 ../../mod/settings.php:1107
+#: ../../mod/settings.php:1108 ../../mod/settings.php:1109
+#: ../../mod/settings.php:1110 ../../mod/register.php:234
+#: ../../mod/dfrn_request.php:845 ../../mod/api.php:106
+#: ../../mod/follow.php:54 ../../mod/profiles.php:661
+#: ../../mod/profiles.php:665
 msgid "No"
 msgstr "Ne"
 
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1041
 msgid "Publish your default profile in the global social directory?"
 msgstr "Publikovat Váš výchozí profil v globální sociálním adresáři?"
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1049
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr "Skrýt Vaše kontaktní údaje a seznam přátel před návštěvníky ve Vašem výchozím profilu?"
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1053
 msgid ""
 "If enabled, posting public messages to Diaspora and other networks isn't "
 "possible."
 msgstr "Pokud je povoleno, není možné zasílání veřejných příspěvků do Diaspory a dalších sítí."
 
-#: ../../mod/settings.php:1038
+#: ../../mod/settings.php:1058
 msgid "Allow friends to post to your profile page?"
 msgstr "Povolit přátelům umisťování příspěvků na vaši profilovou stránku?"
 
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1064
 msgid "Allow friends to tag your posts?"
 msgstr "Povolit přátelům označovat Vaše příspěvky?"
 
-#: ../../mod/settings.php:1050
+#: ../../mod/settings.php:1070
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr "Chcete nám povolit abychom vás navrhovali jako přátelé pro nové členy?"
 
-#: ../../mod/settings.php:1056
+#: ../../mod/settings.php:1076
 msgid "Permit unknown people to send you private mail?"
 msgstr "Povolit neznámým lidem Vám zasílat soukromé zprávy?"
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1084
 msgid "Profile is <strong>not published</strong>."
 msgstr "Profil <strong>není zveřejněn</strong>."
 
-#: ../../mod/settings.php:1067 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:1087 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr "nebo"
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1092
 msgid "Your Identity Address is"
 msgstr "Vaše adresa identity je"
 
-#: ../../mod/settings.php:1083
+#: ../../mod/settings.php:1103
 msgid "Automatically expire posts after this many days:"
 msgstr "Automaticky expirovat příspěvky po zadaném počtu dní:"
 
-#: ../../mod/settings.php:1083
+#: ../../mod/settings.php:1103
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr "Pokud je prázdné, příspěvky nebudou nikdy expirovat. Expirované příspěvky budou vymazány"
 
-#: ../../mod/settings.php:1084
+#: ../../mod/settings.php:1104
 msgid "Advanced expiration settings"
 msgstr "Pokročilé nastavení expirací"
 
-#: ../../mod/settings.php:1085
+#: ../../mod/settings.php:1105
 msgid "Advanced Expiration"
 msgstr "Nastavení expirací"
 
-#: ../../mod/settings.php:1086
+#: ../../mod/settings.php:1106
 msgid "Expire posts:"
 msgstr "Expirovat příspěvky:"
 
-#: ../../mod/settings.php:1087
+#: ../../mod/settings.php:1107
 msgid "Expire personal notes:"
 msgstr "Expirovat osobní poznámky:"
 
-#: ../../mod/settings.php:1088
+#: ../../mod/settings.php:1108
 msgid "Expire starred posts:"
 msgstr "Expirovat příspěvky s hvězdou:"
 
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1109
 msgid "Expire photos:"
 msgstr "Expirovat fotografie:"
 
-#: ../../mod/settings.php:1090
+#: ../../mod/settings.php:1110
 msgid "Only expire posts by others:"
 msgstr "Přízpěvky expirovat pouze ostatními:"
 
-#: ../../mod/settings.php:1116
+#: ../../mod/settings.php:1136
 msgid "Account Settings"
 msgstr "Nastavení účtu"
 
-#: ../../mod/settings.php:1124
+#: ../../mod/settings.php:1144
 msgid "Password Settings"
 msgstr "Nastavení hesla"
 
-#: ../../mod/settings.php:1125
+#: ../../mod/settings.php:1145
 msgid "New Password:"
 msgstr "Nové heslo:"
 
-#: ../../mod/settings.php:1126
+#: ../../mod/settings.php:1146
 msgid "Confirm:"
 msgstr "Potvrďte:"
 
-#: ../../mod/settings.php:1126
+#: ../../mod/settings.php:1146
 msgid "Leave password fields blank unless changing"
 msgstr "Pokud nechcete změnit heslo, položku hesla nevyplňujte"
 
-#: ../../mod/settings.php:1127
+#: ../../mod/settings.php:1147
 msgid "Current Password:"
 msgstr "Stávající heslo:"
 
-#: ../../mod/settings.php:1127 ../../mod/settings.php:1128
+#: ../../mod/settings.php:1147 ../../mod/settings.php:1148
 msgid "Your current password to confirm the changes"
 msgstr "Vaše stávající heslo k potvrzení změn"
 
-#: ../../mod/settings.php:1128
+#: ../../mod/settings.php:1148
 msgid "Password:"
 msgstr "Heslo: "
 
-#: ../../mod/settings.php:1132
+#: ../../mod/settings.php:1152
 msgid "Basic Settings"
 msgstr "Základní nastavení"
 
-#: ../../mod/settings.php:1134
+#: ../../mod/settings.php:1154
 msgid "Email Address:"
 msgstr "E-mailová adresa:"
 
-#: ../../mod/settings.php:1135
+#: ../../mod/settings.php:1155
 msgid "Your Timezone:"
 msgstr "Vaše časové pásmo:"
 
-#: ../../mod/settings.php:1136
+#: ../../mod/settings.php:1156
 msgid "Default Post Location:"
 msgstr "Výchozí umístění příspěvků:"
 
-#: ../../mod/settings.php:1137
+#: ../../mod/settings.php:1157
 msgid "Use Browser Location:"
 msgstr "Používat umístění dle prohlížeče:"
 
-#: ../../mod/settings.php:1140
+#: ../../mod/settings.php:1160
 msgid "Security and Privacy Settings"
 msgstr "Nastavení zabezpečení a soukromí"
 
-#: ../../mod/settings.php:1142
+#: ../../mod/settings.php:1162
 msgid "Maximum Friend Requests/Day:"
 msgstr "Maximální počet žádostí o přátelství za den:"
 
-#: ../../mod/settings.php:1142 ../../mod/settings.php:1172
+#: ../../mod/settings.php:1162 ../../mod/settings.php:1192
 msgid "(to prevent spam abuse)"
 msgstr "(Aby se zabránilo spamu)"
 
-#: ../../mod/settings.php:1143
+#: ../../mod/settings.php:1163
 msgid "Default Post Permissions"
 msgstr "Výchozí oprávnění pro příspěvek"
 
-#: ../../mod/settings.php:1144
+#: ../../mod/settings.php:1164
 msgid "(click to open/close)"
 msgstr "(Klikněte pro otevření/zavření)"
 
-#: ../../mod/settings.php:1153 ../../mod/photos.php:1146
+#: ../../mod/settings.php:1173 ../../mod/photos.php:1146
 #: ../../mod/photos.php:1519
 msgid "Show to Groups"
 msgstr "Zobrazit ve Skupinách"
 
-#: ../../mod/settings.php:1154 ../../mod/photos.php:1147
+#: ../../mod/settings.php:1174 ../../mod/photos.php:1147
 #: ../../mod/photos.php:1520
 msgid "Show to Contacts"
 msgstr "Zobrazit v Kontaktech"
 
-#: ../../mod/settings.php:1155
+#: ../../mod/settings.php:1175
 msgid "Default Private Post"
 msgstr "Výchozí Soukromý příspěvek"
 
-#: ../../mod/settings.php:1156
+#: ../../mod/settings.php:1176
 msgid "Default Public Post"
 msgstr "Výchozí Veřejný příspěvek"
 
-#: ../../mod/settings.php:1160
+#: ../../mod/settings.php:1180
 msgid "Default Permissions for New Posts"
 msgstr "Výchozí oprávnění pro nové příspěvky"
 
-#: ../../mod/settings.php:1172
+#: ../../mod/settings.php:1192
 msgid "Maximum private messages per day from unknown people:"
 msgstr "Maximum soukromých zpráv od neznámých lidí:"
 
-#: ../../mod/settings.php:1175
+#: ../../mod/settings.php:1195
 msgid "Notification Settings"
 msgstr "Nastavení notifikací"
 
-#: ../../mod/settings.php:1176
+#: ../../mod/settings.php:1196
 msgid "By default post a status message when:"
 msgstr "Defaultně posílat statusové zprávy když:"
 
-#: ../../mod/settings.php:1177
+#: ../../mod/settings.php:1197
 msgid "accepting a friend request"
 msgstr "akceptuji požadavek na přátelství"
 
-#: ../../mod/settings.php:1178
+#: ../../mod/settings.php:1198
 msgid "joining a forum/community"
 msgstr "připojující se k fóru/komunitě"
 
-#: ../../mod/settings.php:1179
+#: ../../mod/settings.php:1199
 msgid "making an <em>interesting</em> profile change"
 msgstr "provedení <em>zajímavé</em> profilové změny"
 
-#: ../../mod/settings.php:1180
+#: ../../mod/settings.php:1200
 msgid "Send a notification email when:"
 msgstr "Poslat notifikaci e-mailem, když"
 
-#: ../../mod/settings.php:1181
+#: ../../mod/settings.php:1201
 msgid "You receive an introduction"
 msgstr "obdržíte žádost o propojení"
 
-#: ../../mod/settings.php:1182
+#: ../../mod/settings.php:1202
 msgid "Your introductions are confirmed"
 msgstr "Vaše žádosti jsou potvrzeny"
 
-#: ../../mod/settings.php:1183
+#: ../../mod/settings.php:1203
 msgid "Someone writes on your profile wall"
 msgstr "někdo Vám napíše na Vaši profilovou stránku"
 
-#: ../../mod/settings.php:1184
+#: ../../mod/settings.php:1204
 msgid "Someone writes a followup comment"
 msgstr "někdo Vám napíše následný komentář"
 
-#: ../../mod/settings.php:1185
+#: ../../mod/settings.php:1205
 msgid "You receive a private message"
 msgstr "obdržíte soukromou zprávu"
 
-#: ../../mod/settings.php:1186
+#: ../../mod/settings.php:1206
 msgid "You receive a friend suggestion"
 msgstr "Obdržel jste návrh přátelství"
 
-#: ../../mod/settings.php:1187
+#: ../../mod/settings.php:1207
 msgid "You are tagged in a post"
 msgstr "Jste označen v příspěvku"
 
-#: ../../mod/settings.php:1188
+#: ../../mod/settings.php:1208
 msgid "You are poked/prodded/etc. in a post"
 msgstr "Byl Jste šťouchnout v příspěvku"
 
-#: ../../mod/settings.php:1190
+#: ../../mod/settings.php:1210
+msgid "Activate desktop notifications"
+msgstr "Aktivovat upozornění na desktopu"
+
+#: ../../mod/settings.php:1211
+msgid ""
+"Note: This is an experimental feature, as being not supported by each "
+"browser"
+msgstr "Poznámka: Jedná se o experimentální funkci, protože není podporovaná všemi prohlížeči"
+
+#: ../../mod/settings.php:1212
+msgid "You will now receive desktop notifications!"
+msgstr "Nyní obdržíte notifikace na desktopu!"
+
+#: ../../mod/settings.php:1214
 msgid "Text-only notification emails"
 msgstr "Pouze textové notifikační e-maily"
 
-#: ../../mod/settings.php:1192
+#: ../../mod/settings.php:1216
 msgid "Send text only notification emails, without the html part"
 msgstr "Posílat pouze textové notifikační e-maily, bez html části."
 
-#: ../../mod/settings.php:1194
+#: ../../mod/settings.php:1218
 msgid "Advanced Account/Page Type Settings"
 msgstr "Pokročilé nastavení účtu/stránky"
 
-#: ../../mod/settings.php:1195
+#: ../../mod/settings.php:1219
 msgid "Change the behaviour of this account for special situations"
 msgstr "Změnit chování tohoto účtu ve speciálních situacích"
 
-#: ../../mod/settings.php:1198
+#: ../../mod/settings.php:1222
 msgid "Relocate"
 msgstr "Změna umístění"
 
-#: ../../mod/settings.php:1199
+#: ../../mod/settings.php:1223
 msgid ""
 "If you have moved this profile from another server, and some of your "
 "contacts don't receive your updates, try pushing this button."
 msgstr "Pokud jste přemístil tento profil z jiného serveru a nějaký z vašich kontaktů nedostává Vaše aktualizace, zkuste stisknout toto tlačítko."
 
-#: ../../mod/settings.php:1200
+#: ../../mod/settings.php:1224
 msgid "Resend relocate message to contacts"
 msgstr "Znovu odeslat správu o změně umístění Vašim kontaktům"
 
@@ -4165,7 +4167,7 @@ msgstr "Vzdálené soukromé informace nejsou k dispozici."
 msgid "Visible to:"
 msgstr "Viditelné pro:"
 
-#: ../../mod/contacts.php:112
+#: ../../mod/contacts.php:114
 #, php-format
 msgid "%d contact edited."
 msgid_plural "%d contacts edited"
@@ -4173,330 +4175,330 @@ msgstr[0] "%d kontakt upraven."
 msgstr[1] "%d kontakty upraveny"
 msgstr[2] "%d kontaktů upraveno"
 
-#: ../../mod/contacts.php:143 ../../mod/contacts.php:276
+#: ../../mod/contacts.php:145 ../../mod/contacts.php:340
 msgid "Could not access contact record."
 msgstr "Nelze získat přístup k záznamu kontaktu."
 
-#: ../../mod/contacts.php:157
+#: ../../mod/contacts.php:159
 msgid "Could not locate selected profile."
 msgstr "Nelze nalézt vybraný profil."
 
-#: ../../mod/contacts.php:190
+#: ../../mod/contacts.php:192
 msgid "Contact updated."
 msgstr "Kontakt aktualizován."
 
-#: ../../mod/contacts.php:192 ../../mod/dfrn_request.php:576
+#: ../../mod/contacts.php:194 ../../mod/dfrn_request.php:576
 msgid "Failed to update contact record."
 msgstr "Nepodařilo se aktualizovat kontakt."
 
-#: ../../mod/contacts.php:291
+#: ../../mod/contacts.php:361
 msgid "Contact has been blocked"
 msgstr "Kontakt byl zablokován"
 
-#: ../../mod/contacts.php:291
+#: ../../mod/contacts.php:361
 msgid "Contact has been unblocked"
 msgstr "Kontakt byl odblokován"
 
-#: ../../mod/contacts.php:302
+#: ../../mod/contacts.php:372
 msgid "Contact has been ignored"
 msgstr "Kontakt bude ignorován"
 
-#: ../../mod/contacts.php:302
+#: ../../mod/contacts.php:372
 msgid "Contact has been unignored"
 msgstr "Kontakt přestal být ignorován"
 
-#: ../../mod/contacts.php:314
+#: ../../mod/contacts.php:384
 msgid "Contact has been archived"
 msgstr "Kontakt byl archivován"
 
-#: ../../mod/contacts.php:314
+#: ../../mod/contacts.php:384
 msgid "Contact has been unarchived"
 msgstr "Kontakt byl vrácen z archívu."
 
-#: ../../mod/contacts.php:339 ../../mod/contacts.php:727
+#: ../../mod/contacts.php:409 ../../mod/contacts.php:797
 msgid "Do you really want to delete this contact?"
 msgstr "Opravdu chcete smazat tento kontakt?"
 
-#: ../../mod/contacts.php:356
+#: ../../mod/contacts.php:426
 msgid "Contact has been removed."
 msgstr "Kontakt byl odstraněn."
 
-#: ../../mod/contacts.php:394
+#: ../../mod/contacts.php:464
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr "Jste vzájemní přátelé s uživatelem %s"
 
-#: ../../mod/contacts.php:398
+#: ../../mod/contacts.php:468
 #, php-format
 msgid "You are sharing with %s"
 msgstr "Sdílíte s uživatelem %s"
 
-#: ../../mod/contacts.php:403
+#: ../../mod/contacts.php:473
 #, php-format
 msgid "%s is sharing with you"
 msgstr "uživatel %s sdílí s vámi"
 
-#: ../../mod/contacts.php:423
+#: ../../mod/contacts.php:493
 msgid "Private communications are not available for this contact."
 msgstr "Soukromá komunikace není dostupná pro tento kontakt."
 
-#: ../../mod/contacts.php:426 ../../mod/admin.php:569
+#: ../../mod/contacts.php:496 ../../mod/admin.php:571
 msgid "Never"
 msgstr "Nikdy"
 
-#: ../../mod/contacts.php:430
+#: ../../mod/contacts.php:500
 msgid "(Update was successful)"
 msgstr "(Aktualizace byla úspěšná)"
 
-#: ../../mod/contacts.php:430
+#: ../../mod/contacts.php:500
 msgid "(Update was not successful)"
 msgstr "(Aktualizace nebyla úspěšná)"
 
-#: ../../mod/contacts.php:432
+#: ../../mod/contacts.php:502
 msgid "Suggest friends"
 msgstr "Navrhněte přátelé"
 
-#: ../../mod/contacts.php:436
+#: ../../mod/contacts.php:506
 #, php-format
 msgid "Network type: %s"
 msgstr "Typ sítě: %s"
 
-#: ../../mod/contacts.php:444
+#: ../../mod/contacts.php:514
 msgid "View all contacts"
 msgstr "Zobrazit všechny kontakty"
 
-#: ../../mod/contacts.php:449 ../../mod/contacts.php:518
-#: ../../mod/contacts.php:730 ../../mod/admin.php:1009
+#: ../../mod/contacts.php:519 ../../mod/contacts.php:588
+#: ../../mod/contacts.php:800 ../../mod/admin.php:1012
 msgid "Unblock"
 msgstr "Odblokovat"
 
-#: ../../mod/contacts.php:449 ../../mod/contacts.php:518
-#: ../../mod/contacts.php:730 ../../mod/admin.php:1008
+#: ../../mod/contacts.php:519 ../../mod/contacts.php:588
+#: ../../mod/contacts.php:800 ../../mod/admin.php:1011
 msgid "Block"
 msgstr "Blokovat"
 
-#: ../../mod/contacts.php:452
+#: ../../mod/contacts.php:522
 msgid "Toggle Blocked status"
 msgstr "Přepnout stav Blokováno"
 
-#: ../../mod/contacts.php:455 ../../mod/contacts.php:519
-#: ../../mod/contacts.php:731
+#: ../../mod/contacts.php:525 ../../mod/contacts.php:589
+#: ../../mod/contacts.php:801
 msgid "Unignore"
 msgstr "Přestat ignorovat"
 
-#: ../../mod/contacts.php:458
+#: ../../mod/contacts.php:528
 msgid "Toggle Ignored status"
 msgstr "Přepnout stav Ignorováno"
 
-#: ../../mod/contacts.php:462 ../../mod/contacts.php:732
+#: ../../mod/contacts.php:532 ../../mod/contacts.php:802
 msgid "Unarchive"
 msgstr "Vrátit z archívu"
 
-#: ../../mod/contacts.php:462 ../../mod/contacts.php:732
+#: ../../mod/contacts.php:532 ../../mod/contacts.php:802
 msgid "Archive"
 msgstr "Archivovat"
 
-#: ../../mod/contacts.php:465
+#: ../../mod/contacts.php:535
 msgid "Toggle Archive status"
 msgstr "Přepnout stav Archivováno"
 
-#: ../../mod/contacts.php:468
+#: ../../mod/contacts.php:538
 msgid "Repair"
 msgstr "Opravit"
 
-#: ../../mod/contacts.php:471
+#: ../../mod/contacts.php:541
 msgid "Advanced Contact Settings"
 msgstr "Pokročilé nastavení kontaktu"
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:547
 msgid "Communications lost with this contact!"
 msgstr "Komunikace s tímto kontaktem byla ztracena!"
 
-#: ../../mod/contacts.php:480
+#: ../../mod/contacts.php:550
 msgid "Fetch further information for feeds"
 msgstr "Načítat další informace pro kanál"
 
-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:551
 msgid "Disabled"
 msgstr "Zakázáno"
 
-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:551
 msgid "Fetch information"
 msgstr "Načítat informace"
 
-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:551
 msgid "Fetch information and keywords"
 msgstr "Načítat informace a klíčová slova"
 
-#: ../../mod/contacts.php:490
+#: ../../mod/contacts.php:560
 msgid "Contact Editor"
 msgstr "Editor kontaktu"
 
-#: ../../mod/contacts.php:493
+#: ../../mod/contacts.php:563
 msgid "Profile Visibility"
 msgstr "Viditelnost profilu"
 
-#: ../../mod/contacts.php:494
+#: ../../mod/contacts.php:564
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr "Vyberte prosím profil, který chcete zobrazit %s při zabezpečeném prohlížení vašeho profilu."
 
-#: ../../mod/contacts.php:495
+#: ../../mod/contacts.php:565
 msgid "Contact Information / Notes"
 msgstr "Kontaktní informace / poznámky"
 
-#: ../../mod/contacts.php:496
+#: ../../mod/contacts.php:566
 msgid "Edit contact notes"
 msgstr "Editovat poznámky kontaktu"
 
-#: ../../mod/contacts.php:501 ../../mod/contacts.php:695
+#: ../../mod/contacts.php:571 ../../mod/contacts.php:765
 #: ../../mod/nogroup.php:40 ../../mod/viewcontacts.php:64
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr "Navštivte profil uživatele %s [%s]"
 
-#: ../../mod/contacts.php:502
+#: ../../mod/contacts.php:572
 msgid "Block/Unblock contact"
 msgstr "Blokovat / Odblokovat kontakt"
 
-#: ../../mod/contacts.php:503
+#: ../../mod/contacts.php:573
 msgid "Ignore contact"
 msgstr "Ignorovat kontakt"
 
-#: ../../mod/contacts.php:504
+#: ../../mod/contacts.php:574
 msgid "Repair URL settings"
 msgstr "Opravit nastavení adresy URL "
 
-#: ../../mod/contacts.php:505
+#: ../../mod/contacts.php:575
 msgid "View conversations"
 msgstr "Zobrazit konverzace"
 
-#: ../../mod/contacts.php:507
+#: ../../mod/contacts.php:577
 msgid "Delete contact"
 msgstr "Odstranit kontakt"
 
-#: ../../mod/contacts.php:511
+#: ../../mod/contacts.php:581
 msgid "Last update:"
 msgstr "Poslední aktualizace:"
 
-#: ../../mod/contacts.php:513
+#: ../../mod/contacts.php:583
 msgid "Update public posts"
 msgstr "Aktualizovat veřejné příspěvky"
 
-#: ../../mod/contacts.php:515 ../../mod/admin.php:1503
+#: ../../mod/contacts.php:585 ../../mod/admin.php:1506
 msgid "Update now"
 msgstr "Aktualizovat"
 
-#: ../../mod/contacts.php:522
+#: ../../mod/contacts.php:592
 msgid "Currently blocked"
 msgstr "V současnosti zablokováno"
 
-#: ../../mod/contacts.php:523
+#: ../../mod/contacts.php:593
 msgid "Currently ignored"
 msgstr "V současnosti ignorováno"
 
-#: ../../mod/contacts.php:524
+#: ../../mod/contacts.php:594
 msgid "Currently archived"
 msgstr "Aktuálně archivován"
 
-#: ../../mod/contacts.php:525
+#: ../../mod/contacts.php:595
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr "Odpovědi/Libí se na Vaše veřejné příspěvky <strong>mohou být</strong> stále viditelné"
 
-#: ../../mod/contacts.php:526
+#: ../../mod/contacts.php:596
 msgid "Notification for new posts"
 msgstr "Upozornění na nové příspěvky"
 
-#: ../../mod/contacts.php:526
+#: ../../mod/contacts.php:596
 msgid "Send a notification of every new post of this contact"
 msgstr "Poslat upozornění při každém novém příspěvku tohoto kontaktu"
 
-#: ../../mod/contacts.php:529
+#: ../../mod/contacts.php:599
 msgid "Blacklisted keywords"
 msgstr "Zakázaná klíčová slova"
 
-#: ../../mod/contacts.php:529
+#: ../../mod/contacts.php:599
 msgid ""
 "Comma separated list of keywords that should not be converted to hashtags, "
 "when \"Fetch information and keywords\" is selected"
 msgstr "Čárkou oddělený seznam klíčových slov, které by neměly být převáděna na hashtagy, když je zvoleno \"Načítat informace a klíčová slova\""
 
-#: ../../mod/contacts.php:580
+#: ../../mod/contacts.php:650
 msgid "Suggestions"
 msgstr "Doporučení"
 
-#: ../../mod/contacts.php:583
+#: ../../mod/contacts.php:653
 msgid "Suggest potential friends"
 msgstr "Navrhnout potenciální přátele"
 
-#: ../../mod/contacts.php:589
+#: ../../mod/contacts.php:659
 msgid "Show all contacts"
 msgstr "Zobrazit všechny kontakty"
 
-#: ../../mod/contacts.php:592
+#: ../../mod/contacts.php:662
 msgid "Unblocked"
 msgstr "Odblokován"
 
-#: ../../mod/contacts.php:595
+#: ../../mod/contacts.php:665
 msgid "Only show unblocked contacts"
 msgstr "Zobrazit pouze neblokované kontakty"
 
-#: ../../mod/contacts.php:599
+#: ../../mod/contacts.php:669
 msgid "Blocked"
 msgstr "Blokován"
 
-#: ../../mod/contacts.php:602
+#: ../../mod/contacts.php:672
 msgid "Only show blocked contacts"
 msgstr "Zobrazit pouze blokované kontakty"
 
-#: ../../mod/contacts.php:606
+#: ../../mod/contacts.php:676
 msgid "Ignored"
 msgstr "Ignorován"
 
-#: ../../mod/contacts.php:609
+#: ../../mod/contacts.php:679
 msgid "Only show ignored contacts"
 msgstr "Zobrazit pouze ignorované kontakty"
 
-#: ../../mod/contacts.php:613
+#: ../../mod/contacts.php:683
 msgid "Archived"
 msgstr "Archivován"
 
-#: ../../mod/contacts.php:616
+#: ../../mod/contacts.php:686
 msgid "Only show archived contacts"
 msgstr "Zobrazit pouze archivované kontakty"
 
-#: ../../mod/contacts.php:620
+#: ../../mod/contacts.php:690
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: ../../mod/contacts.php:623
+#: ../../mod/contacts.php:693
 msgid "Only show hidden contacts"
 msgstr "Zobrazit pouze skryté kontakty"
 
-#: ../../mod/contacts.php:671
+#: ../../mod/contacts.php:741
 msgid "Mutual Friendship"
 msgstr "Vzájemné přátelství"
 
-#: ../../mod/contacts.php:675
+#: ../../mod/contacts.php:745
 msgid "is a fan of yours"
 msgstr "je Váš fanoušek"
 
-#: ../../mod/contacts.php:679
+#: ../../mod/contacts.php:749
 msgid "you are a fan of"
 msgstr "jste fanouškem"
 
-#: ../../mod/contacts.php:696 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:766 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr "Editovat kontakt"
 
-#: ../../mod/contacts.php:722
+#: ../../mod/contacts.php:792
 msgid "Search your contacts"
 msgstr "Prohledat Vaše kontakty"
 
-#: ../../mod/contacts.php:723 ../../mod/directory.php:61
+#: ../../mod/contacts.php:793 ../../mod/directory.php:61
 msgid "Finding: "
 msgstr "Zjištění: "
 
@@ -4598,7 +4600,7 @@ msgstr "Členství na tomto webu je pouze na pozvání."
 msgid "Your invitation ID: "
 msgstr "Vaše pozvání ID:"
 
-#: ../../mod/register.php:255 ../../mod/admin.php:621
+#: ../../mod/register.php:255 ../../mod/admin.php:623
 msgid "Registration"
 msgstr "Registrace"
 
@@ -4637,7 +4639,7 @@ msgstr "Příspěvek úspěšně odeslán"
 msgid "System down for maintenance"
 msgstr "Systém vypnut z důvodů údržby"
 
-#: ../../mod/profile.php:155 ../../mod/display.php:332
+#: ../../mod/profile.php:155 ../../mod/display.php:334
 msgid "Access to this profile has been restricted."
 msgstr "Přístup na tento profil byl omezen."
 
@@ -4645,10 +4647,10 @@ msgstr "Přístup na tento profil byl omezen."
 msgid "Tips for New Members"
 msgstr "Tipy pro nové členy"
 
-#: ../../mod/videos.php:115 ../../mod/dfrn_request.php:762
+#: ../../mod/videos.php:115 ../../mod/dfrn_request.php:777
 #: ../../mod/viewcontacts.php:19 ../../mod/photos.php:920
 #: ../../mod/search.php:89 ../../mod/community.php:18
-#: ../../mod/display.php:212 ../../mod/directory.php:33
+#: ../../mod/display.php:214 ../../mod/directory.php:33
 msgid "Public access denied."
 msgstr "Veřejný přístup odepřen."
 
@@ -4698,7 +4700,7 @@ msgstr "Upravit příspěvek"
 msgid "People Search"
 msgstr "Vyhledávání lidí"
 
-#: ../../mod/dirfind.php:60 ../../mod/match.php:65
+#: ../../mod/dirfind.php:60 ../../mod/match.php:71
 msgid "No matches"
 msgstr "Žádné shody"
 
@@ -4807,72 +4809,76 @@ msgid ""
 "<strong>this</strong> profile."
 msgstr "Jste přihlášeni pod nesprávnou identitou  Prosím, přihlaste se do <strong>tohoto</strong> profilu."
 
-#: ../../mod/dfrn_request.php:671
+#: ../../mod/dfrn_request.php:674 ../../mod/dfrn_request.php:691
+msgid "Confirm"
+msgstr "Potvrdit"
+
+#: ../../mod/dfrn_request.php:686
 msgid "Hide this contact"
 msgstr "Skrýt tento kontakt"
 
-#: ../../mod/dfrn_request.php:674
+#: ../../mod/dfrn_request.php:689
 #, php-format
 msgid "Welcome home %s."
 msgstr "Vítejte doma %s."
 
-#: ../../mod/dfrn_request.php:675
+#: ../../mod/dfrn_request.php:690
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr "Prosím potvrďte Vaši žádost o propojení %s."
 
-#: ../../mod/dfrn_request.php:804
+#: ../../mod/dfrn_request.php:819
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr "Prosím zadejte Vaši adresu identity jedné z následujících podporovaných komunikačních sítí:"
 
-#: ../../mod/dfrn_request.php:824
+#: ../../mod/dfrn_request.php:839
 msgid ""
 "If you are not yet a member of the free social web, <a "
 "href=\"http://dir.friendica.com/siteinfo\">follow this link to find a public"
 " Friendica site and join us today</a>."
 msgstr "Pokud ještě nejste členem svobodné sociální sítě, <a href=\"http://dir.friendica.com/siteinfo\">následujte tento odkaz k nalezení veřejného Friendica serveru a přidejte se k nám ještě dnes</a>."
 
-#: ../../mod/dfrn_request.php:827
+#: ../../mod/dfrn_request.php:842
 msgid "Friend/Connection Request"
 msgstr "Požadavek o přátelství / kontaktování"
 
-#: ../../mod/dfrn_request.php:828
+#: ../../mod/dfrn_request.php:843
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr "Příklady: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca"
 
-#: ../../mod/dfrn_request.php:829
+#: ../../mod/dfrn_request.php:844 ../../mod/follow.php:53
 msgid "Please answer the following:"
 msgstr "Odpovězte, prosím, následující:"
 
-#: ../../mod/dfrn_request.php:830
+#: ../../mod/dfrn_request.php:845 ../../mod/follow.php:54
 #, php-format
 msgid "Does %s know you?"
 msgstr "Zná Vás uživatel %s ?"
 
-#: ../../mod/dfrn_request.php:834
+#: ../../mod/dfrn_request.php:849 ../../mod/follow.php:55
 msgid "Add a personal note:"
 msgstr "Přidat osobní poznámku:"
 
-#: ../../mod/dfrn_request.php:837
+#: ../../mod/dfrn_request.php:852
 msgid "StatusNet/Federated Social Web"
 msgstr "StatusNet / Federativní Sociální Web"
 
-#: ../../mod/dfrn_request.php:839
+#: ../../mod/dfrn_request.php:854
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search"
 " bar."
 msgstr " - prosím nepoužívejte tento formulář.  Místo toho zadejte %s do Vašeho Diaspora vyhledávacího pole."
 
-#: ../../mod/dfrn_request.php:840
+#: ../../mod/dfrn_request.php:855 ../../mod/follow.php:61
 msgid "Your Identity Address:"
 msgstr "Verze PHP pro příkazový řádek na Vašem systému nemá povolen \"register_argc_argv\"."
 
-#: ../../mod/dfrn_request.php:843
+#: ../../mod/dfrn_request.php:858 ../../mod/follow.php:64
 msgid "Submit Request"
 msgstr "Odeslat žádost"
 
@@ -4934,7 +4940,7 @@ msgstr "Navrhněte přátelé"
 msgid "Suggest a friend for %s"
 msgstr "Navrhněte přátelé pro uživatele %s"
 
-#: ../../mod/share.php:44
+#: ../../mod/share.php:38
 msgid "link"
 msgstr "odkaz"
 
@@ -4946,15 +4952,15 @@ msgstr "Žádné kontakty."
 msgid "Theme settings updated."
 msgstr "Nastavení téma zobrazení bylo aktualizováno."
 
-#: ../../mod/admin.php:104 ../../mod/admin.php:619
+#: ../../mod/admin.php:104 ../../mod/admin.php:621
 msgid "Site"
 msgstr "Web"
 
-#: ../../mod/admin.php:105 ../../mod/admin.php:998 ../../mod/admin.php:1013
+#: ../../mod/admin.php:105 ../../mod/admin.php:1001 ../../mod/admin.php:1016
 msgid "Users"
 msgstr "Uživatelé"
 
-#: ../../mod/admin.php:107 ../../mod/admin.php:1323 ../../mod/admin.php:1357
+#: ../../mod/admin.php:107 ../../mod/admin.php:1326 ../../mod/admin.php:1360
 msgid "Themes"
 msgstr "Témata"
 
@@ -4962,7 +4968,7 @@ msgstr "Témata"
 msgid "DB updates"
 msgstr "Aktualizace databáze"
 
-#: ../../mod/admin.php:123 ../../mod/admin.php:132 ../../mod/admin.php:1444
+#: ../../mod/admin.php:123 ../../mod/admin.php:132 ../../mod/admin.php:1447
 msgid "Logs"
 msgstr "Logy"
 
@@ -4986,19 +4992,19 @@ msgstr "diagnostika"
 msgid "User registrations waiting for confirmation"
 msgstr "Registrace uživatele čeká na potvrzení"
 
-#: ../../mod/admin.php:193 ../../mod/admin.php:952
+#: ../../mod/admin.php:193 ../../mod/admin.php:955
 msgid "Normal Account"
 msgstr "Normální účet"
 
-#: ../../mod/admin.php:194 ../../mod/admin.php:953
+#: ../../mod/admin.php:194 ../../mod/admin.php:956
 msgid "Soapbox Account"
 msgstr "Soapbox účet"
 
-#: ../../mod/admin.php:195 ../../mod/admin.php:954
+#: ../../mod/admin.php:195 ../../mod/admin.php:957
 msgid "Community/Celebrity Account"
 msgstr "Komunitní účet / Účet celebrity"
 
-#: ../../mod/admin.php:196 ../../mod/admin.php:955
+#: ../../mod/admin.php:196 ../../mod/admin.php:958
 msgid "Automatic Friend Account"
 msgstr "Účet s automatickým schvalováním přátel"
 
@@ -5014,9 +5020,9 @@ msgstr "Soukromé fórum"
 msgid "Message queues"
 msgstr "Fronty zpráv"
 
-#: ../../mod/admin.php:222 ../../mod/admin.php:618 ../../mod/admin.php:997
-#: ../../mod/admin.php:1101 ../../mod/admin.php:1154 ../../mod/admin.php:1322
-#: ../../mod/admin.php:1356 ../../mod/admin.php:1443
+#: ../../mod/admin.php:222 ../../mod/admin.php:620 ../../mod/admin.php:1000
+#: ../../mod/admin.php:1104 ../../mod/admin.php:1157 ../../mod/admin.php:1325
+#: ../../mod/admin.php:1359 ../../mod/admin.php:1446
 msgid "Administration"
 msgstr "Administrace"
 
@@ -5044,331 +5050,331 @@ msgstr "Aktivní pluginy"
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr "Nelze zpracovat výchozí url adresu. Musí obsahovat alespoň <schéma>://<doméma>"
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:518
 msgid "Site settings updated."
 msgstr "Nastavení webu aktualizováno."
 
-#: ../../mod/admin.php:562
+#: ../../mod/admin.php:564
 msgid "No community page"
 msgstr "Komunitní stránka neexistuje"
 
-#: ../../mod/admin.php:563
+#: ../../mod/admin.php:565
 msgid "Public postings from users of this site"
 msgstr "Počet veřejných příspěvků od uživatele na této stránce"
 
-#: ../../mod/admin.php:564
+#: ../../mod/admin.php:566
 msgid "Global community page"
 msgstr "Globální komunitní stránka"
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:572
 msgid "At post arrival"
 msgstr "Při obdržení příspěvku"
 
-#: ../../mod/admin.php:579
+#: ../../mod/admin.php:581
 msgid "Multi user instance"
 msgstr "Více uživatelská instance"
 
-#: ../../mod/admin.php:602
+#: ../../mod/admin.php:604
 msgid "Closed"
 msgstr "Uzavřeno"
 
-#: ../../mod/admin.php:603
+#: ../../mod/admin.php:605
 msgid "Requires approval"
 msgstr "Vyžaduje schválení"
 
-#: ../../mod/admin.php:604
+#: ../../mod/admin.php:606
 msgid "Open"
 msgstr "Otevřená"
 
-#: ../../mod/admin.php:608
+#: ../../mod/admin.php:610
 msgid "No SSL policy, links will track page SSL state"
 msgstr "Žádná SSL politika, odkazy budou následovat stránky SSL stav"
 
-#: ../../mod/admin.php:609
+#: ../../mod/admin.php:611
 msgid "Force all links to use SSL"
 msgstr "Vyžadovat u všech odkazů použití SSL"
 
-#: ../../mod/admin.php:610
+#: ../../mod/admin.php:612
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr "Certifikát podepsaný sám sebou, použít SSL pouze pro lokální odkazy (nedoporučeno)"
 
-#: ../../mod/admin.php:622
+#: ../../mod/admin.php:624
 msgid "File upload"
 msgstr "Nahrání souborů"
 
-#: ../../mod/admin.php:623
+#: ../../mod/admin.php:625
 msgid "Policies"
 msgstr "Politiky"
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:626
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: ../../mod/admin.php:625
+#: ../../mod/admin.php:627
 msgid "Performance"
 msgstr "Výkonnost"
 
-#: ../../mod/admin.php:626
+#: ../../mod/admin.php:628
 msgid ""
 "Relocate - WARNING: advanced function. Could make this server unreachable."
 msgstr "Změna umístění - Varování: pokročilá funkčnost. Tímto můžete znepřístupnit server."
 
-#: ../../mod/admin.php:629
+#: ../../mod/admin.php:631
 msgid "Site name"
 msgstr "Název webu"
 
-#: ../../mod/admin.php:630
+#: ../../mod/admin.php:632
 msgid "Host name"
 msgstr "Jméno hostitele (host name)"
 
-#: ../../mod/admin.php:631
+#: ../../mod/admin.php:633
 msgid "Sender Email"
 msgstr "Email ddesílatele"
 
-#: ../../mod/admin.php:632
+#: ../../mod/admin.php:634
 msgid "Banner/Logo"
 msgstr "Banner/logo"
 
-#: ../../mod/admin.php:633
+#: ../../mod/admin.php:635
 msgid "Shortcut icon"
 msgstr "Ikona zkratky"
 
-#: ../../mod/admin.php:634
+#: ../../mod/admin.php:636
 msgid "Touch icon"
 msgstr "Dotyková ikona"
 
-#: ../../mod/admin.php:635
+#: ../../mod/admin.php:637
 msgid "Additional Info"
 msgstr "Dodatečné informace"
 
-#: ../../mod/admin.php:635
+#: ../../mod/admin.php:637
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at dir.friendica.com/siteinfo."
 msgstr "Pro veřejné servery: zde můžete doplnit dodatečné informace, které budou uvedeny v seznamu na dir.friendica.com/siteinfo."
 
-#: ../../mod/admin.php:636
+#: ../../mod/admin.php:638
 msgid "System language"
 msgstr "Systémový jazyk"
 
-#: ../../mod/admin.php:637
+#: ../../mod/admin.php:639
 msgid "System theme"
 msgstr "Grafická šablona systému "
 
-#: ../../mod/admin.php:637
+#: ../../mod/admin.php:639
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr "Defaultní systémové téma - může být změněno v uživatelských profilech - <a href='#' id='cnftheme'> změnit  theme settings</a>"
 
-#: ../../mod/admin.php:638
+#: ../../mod/admin.php:640
 msgid "Mobile system theme"
 msgstr "Systémové téma zobrazení pro mobilní zařízení"
 
-#: ../../mod/admin.php:638
+#: ../../mod/admin.php:640
 msgid "Theme for mobile devices"
 msgstr "Téma zobrazení pro mobilní zařízení"
 
-#: ../../mod/admin.php:639
+#: ../../mod/admin.php:641
 msgid "SSL link policy"
 msgstr "Politika SSL odkazů"
 
-#: ../../mod/admin.php:639
+#: ../../mod/admin.php:641
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr "Určuje, zda-li budou generované odkazy používat SSL"
 
-#: ../../mod/admin.php:640
+#: ../../mod/admin.php:642
 msgid "Force SSL"
 msgstr "Vynutit SSL"
 
-#: ../../mod/admin.php:640
+#: ../../mod/admin.php:642
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead"
 " to endless loops."
 msgstr "Vynutit SSL pro všechny ne-SSL žádosti - Upozornění: na některých systémech může dojít k nekonečnému zacyklení."
 
-#: ../../mod/admin.php:641
+#: ../../mod/admin.php:643
 msgid "Old style 'Share'"
 msgstr "Sdílení \"postaru\""
 
-#: ../../mod/admin.php:641
+#: ../../mod/admin.php:643
 msgid "Deactivates the bbcode element 'share' for repeating items."
 msgstr "Deaktivovat bbcode element \"share\" pro opakující se položky."
 
-#: ../../mod/admin.php:642
+#: ../../mod/admin.php:644
 msgid "Hide help entry from navigation menu"
 msgstr "skrýt nápovědu z navigačního menu"
 
-#: ../../mod/admin.php:642
+#: ../../mod/admin.php:644
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr "Skryje menu ze stránek Nápověda z navigačního menu. Nápovědu můžete stále zobrazit přímo zadáním /help."
 
-#: ../../mod/admin.php:643
+#: ../../mod/admin.php:645
 msgid "Single user instance"
 msgstr "Jednouživatelská instance"
 
-#: ../../mod/admin.php:643
+#: ../../mod/admin.php:645
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr "Nastavit tuto instanci víceuživatelskou nebo jednouživatelskou pro pojmenovaného uživatele"
 
-#: ../../mod/admin.php:644
+#: ../../mod/admin.php:646
 msgid "Maximum image size"
 msgstr "Maximální velikost obrázků"
 
-#: ../../mod/admin.php:644
+#: ../../mod/admin.php:646
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr "Maximální velikost v bajtech nahraných obrázků. Defaultní je 0, což znamená neomezeno."
 
-#: ../../mod/admin.php:645
+#: ../../mod/admin.php:647
 msgid "Maximum image length"
 msgstr "Maximální velikost obrázků"
 
-#: ../../mod/admin.php:645
+#: ../../mod/admin.php:647
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr "Maximální délka v pixelech delší stránky nahrávaných obrázků. Defaultně je -1, což označuje bez limitu"
 
-#: ../../mod/admin.php:646
+#: ../../mod/admin.php:648
 msgid "JPEG image quality"
 msgstr "JPEG kvalita obrázku"
 
-#: ../../mod/admin.php:646
+#: ../../mod/admin.php:648
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr "Nahrávaný JPEG bude uložen se zadanou kvalitou v rozmezí [0-100]. Defaultní je 100, což znamená plnou kvalitu."
 
-#: ../../mod/admin.php:648
+#: ../../mod/admin.php:650
 msgid "Register policy"
 msgstr "Politika registrace"
 
-#: ../../mod/admin.php:649
+#: ../../mod/admin.php:651
 msgid "Maximum Daily Registrations"
 msgstr "Maximální počet denních registrací"
 
-#: ../../mod/admin.php:649
+#: ../../mod/admin.php:651
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user"
 " registrations to accept per day.  If register is set to closed, this "
 "setting has no effect."
 msgstr "Pokud je registrace výše povolena, zde se nastaví maximální počet registrací nových uživatelů za den.\nPokud je registrace zakázána, toto nastavení nemá žádný efekt."
 
-#: ../../mod/admin.php:650
+#: ../../mod/admin.php:652
 msgid "Register text"
 msgstr "Registrace textu"
 
-#: ../../mod/admin.php:650
+#: ../../mod/admin.php:652
 msgid "Will be displayed prominently on the registration page."
 msgstr "Bude zřetelně zobrazeno na registrační stránce."
 
-#: ../../mod/admin.php:651
+#: ../../mod/admin.php:653
 msgid "Accounts abandoned after x days"
 msgstr "Účet je opuštěn po x dnech"
 
-#: ../../mod/admin.php:651
+#: ../../mod/admin.php:653
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr "Neztrácejte systémové zdroje kontaktováním externích webů s opuštěnými účty. Zadejte 0 pro žádný časový limit."
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:654
 msgid "Allowed friend domains"
 msgstr "Povolené domény přátel"
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:654
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr "Čárkou oddělený seznam domén, kterým je povoleno navazovat přátelství s tímto webem. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolnou doménu."
 
-#: ../../mod/admin.php:653
+#: ../../mod/admin.php:655
 msgid "Allowed email domains"
 msgstr "Povolené e-mailové domény"
 
-#: ../../mod/admin.php:653
+#: ../../mod/admin.php:655
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr "Čárkou oddělený seznam domén emalových adres, kterým je povoleno provádět registraci na tomto webu. Zástupné znaky (wildcards) jsou povoleny. Prázné znamená libovolnou doménu."
 
-#: ../../mod/admin.php:654
+#: ../../mod/admin.php:656
 msgid "Block public"
 msgstr "Blokovat veřejnost"
 
-#: ../../mod/admin.php:654
+#: ../../mod/admin.php:656
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr "Označemím přepínače zablokujete veřejný přístup ke všem jinak veřejně přístupným soukromým stránkám uživatelům, kteří nebudou přihlášeni."
 
-#: ../../mod/admin.php:655
+#: ../../mod/admin.php:657
 msgid "Force publish"
 msgstr "Publikovat"
 
-#: ../../mod/admin.php:655
+#: ../../mod/admin.php:657
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr "Označením přepínače budou včechny profily na tomto webu uvedeny v adresáři webu."
 
-#: ../../mod/admin.php:656
+#: ../../mod/admin.php:658
 msgid "Global directory update URL"
 msgstr "aktualizace URL adresy Globálního adresáře "
 
-#: ../../mod/admin.php:656
+#: ../../mod/admin.php:658
 msgid ""
 "URL to update the global directory. If this is not set, the global directory"
 " is completely unavailable to the application."
 msgstr "URL adresa k aktualizaci globálního adresáře. Pokud není zadáno, funkce globálního adresáře není dostupná žádné aplikaci."
 
-#: ../../mod/admin.php:657
+#: ../../mod/admin.php:659
 msgid "Allow threaded items"
 msgstr "Povolit vícevláknové zpracování obsahu"
 
-#: ../../mod/admin.php:657
+#: ../../mod/admin.php:659
 msgid "Allow infinite level threading for items on this site."
 msgstr "Povolit zpracování obsahu tohoto webu neomezeným počtem paralelních vláken."
 
-#: ../../mod/admin.php:658
+#: ../../mod/admin.php:660
 msgid "Private posts by default for new users"
 msgstr "Nastavit pro nové uživatele příspěvky jako soukromé"
 
-#: ../../mod/admin.php:658
+#: ../../mod/admin.php:660
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr "Nastavit defaultní práva pro příspěvky od všech nových členů na výchozí soukromou skupinu raději než jako veřejné."
 
-#: ../../mod/admin.php:659
+#: ../../mod/admin.php:661
 msgid "Don't include post content in email notifications"
 msgstr "Nezahrnovat obsah příspěvků v emailových upozorněních"
 
-#: ../../mod/admin.php:659
+#: ../../mod/admin.php:661
 msgid ""
 "Don't include the content of a post/comment/private message/etc. in the "
 "email notifications that are sent out from this site, as a privacy measure."
 msgstr " V mailových upozorněních, které jsou odesílány z tohoto webu jako soukromé zprávy, nejsou z důvodů bezpečnosti obsaženy příspěvky/komentáře/soukromé zprávy apod. "
 
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:662
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr "Zakázat veřejný přístup k rozšířením uvedeným v menu aplikace."
 
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:662
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr "Označení této volby omezí rozšíření uvedená v menu aplikace pouze pro členy."
 
-#: ../../mod/admin.php:661
+#: ../../mod/admin.php:663
 msgid "Don't embed private images in posts"
 msgstr "Nepovolit přidávání soukromých správ v příspěvcích"
 
-#: ../../mod/admin.php:661
+#: ../../mod/admin.php:663
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
@@ -5376,319 +5382,327 @@ msgid ""
 "while."
 msgstr "Nereplikovat lokální soukromé fotografie v příspěvcích s přidáním kopie obrázku. To znamená, že kontakty, které obdrží příspěvek obsahující soukromé fotografie se budou muset přihlásit a načíst každý obrázek, což může zabrat nějaký čas."
 
-#: ../../mod/admin.php:662
+#: ../../mod/admin.php:664
 msgid "Allow Users to set remote_self"
 msgstr "Umožnit uživatelům nastavit "
 
-#: ../../mod/admin.php:662
+#: ../../mod/admin.php:664
 msgid ""
 "With checking this, every user is allowed to mark every contact as a "
 "remote_self in the repair contact dialog. Setting this flag on a contact "
 "causes mirroring every posting of that contact in the users stream."
 msgstr "S tímto označením má každý uživatel možnost označit jakékoliv ze svých kontakt jako \"remote_self\" v nastavení v dialogu opravit kontakt. Tímto označením se budou zrcadlit všechny správy tohoto kontaktu v uživatelově proudu."
 
-#: ../../mod/admin.php:663
+#: ../../mod/admin.php:665
 msgid "Block multiple registrations"
 msgstr "Blokovat více registrací"
 
-#: ../../mod/admin.php:663
+#: ../../mod/admin.php:665
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr "Znemožnit uživatelům registraci dodatečných účtů k použití jako stránky."
 
-#: ../../mod/admin.php:664
+#: ../../mod/admin.php:666
 msgid "OpenID support"
 msgstr "podpora OpenID"
 
-#: ../../mod/admin.php:664
+#: ../../mod/admin.php:666
 msgid "OpenID support for registration and logins."
 msgstr "Podpora OpenID pro registraci a přihlašování."
 
-#: ../../mod/admin.php:665
+#: ../../mod/admin.php:667
 msgid "Fullname check"
 msgstr "kontrola úplného jména"
 
-#: ../../mod/admin.php:665
+#: ../../mod/admin.php:667
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr "Přimět uživatele k registraci s mezerou mezi jménu a příjmením v poli Celé jméno, jako antispamové opatření."
 
-#: ../../mod/admin.php:666
+#: ../../mod/admin.php:668
 msgid "UTF-8 Regular expressions"
 msgstr "UTF-8 Regulární výrazy"
 
-#: ../../mod/admin.php:666
+#: ../../mod/admin.php:668
 msgid "Use PHP UTF8 regular expressions"
 msgstr "Použít PHP UTF8 regulární výrazy."
 
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:669
 msgid "Community Page Style"
 msgstr "Styl komunitní stránky"
 
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:669
 msgid ""
 "Type of community page to show. 'Global community' shows every public "
 "posting from an open distributed network that arrived on this server."
 msgstr "Typ komunitní stránky k zobrazení. 'Glogální komunita' zobrazuje každý veřejný příspěvek z otevřené distribuované sítě, která dorazí na tento server."
 
-#: ../../mod/admin.php:668
+#: ../../mod/admin.php:670
 msgid "Posts per user on community page"
 msgstr "Počet příspěvků na komunitní stránce"
 
-#: ../../mod/admin.php:668
+#: ../../mod/admin.php:670
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "'Global Community')"
 msgstr "Maximální počet příspěvků na uživatele na komunitní sptránce. (neplatí pro 'Globální komunitu')"
 
-#: ../../mod/admin.php:669
+#: ../../mod/admin.php:671
 msgid "Enable OStatus support"
 msgstr "Zapnout podporu OStatus"
 
-#: ../../mod/admin.php:669
+#: ../../mod/admin.php:671
 msgid ""
 "Provide built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr "Poskytnout zabudouvanou kompatibilitu s OStatus (StatusNet, GNU Social apod.). Veškerá komunikace s OStatus je veřejná, proto bude občas zobrazeno upozornění."
 
-#: ../../mod/admin.php:670
+#: ../../mod/admin.php:672
 msgid "OStatus conversation completion interval"
 msgstr "Interval dokončení konverzace OStatus"
 
-#: ../../mod/admin.php:670
+#: ../../mod/admin.php:672
 msgid ""
 "How often shall the poller check for new entries in OStatus conversations? "
 "This can be a very ressource task."
 msgstr "Jak často by mělo probíhat ověřování pro nové přísvěvky v konverzacích OStatus? Toto může být velmi výkonově náročný úkol."
 
-#: ../../mod/admin.php:671
+#: ../../mod/admin.php:673
 msgid "Enable Diaspora support"
 msgstr "Povolit podporu Diaspora"
 
-#: ../../mod/admin.php:671
+#: ../../mod/admin.php:673
 msgid "Provide built-in Diaspora network compatibility."
 msgstr "Poskytnout zabudovanou kompatibilitu sitě Diaspora."
 
-#: ../../mod/admin.php:672
+#: ../../mod/admin.php:674
 msgid "Only allow Friendica contacts"
 msgstr "Povolit pouze Friendica kontakty"
 
-#: ../../mod/admin.php:672
+#: ../../mod/admin.php:674
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr "Všechny kontakty musí používat Friendica protokol. Všchny jiné zabudované komunikační protokoly budou zablokované."
 
-#: ../../mod/admin.php:673
+#: ../../mod/admin.php:675
 msgid "Verify SSL"
 msgstr "Ověřit SSL"
 
-#: ../../mod/admin.php:673
+#: ../../mod/admin.php:675
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you"
 " cannot connect (at all) to self-signed SSL sites."
 msgstr "Pokud si přejete, můžete vynutit striktní ověřování certifikátů. To znamená že se nebudete moci připojit k žádnému serveru s vlastním SSL certifikátem."
 
-#: ../../mod/admin.php:674
+#: ../../mod/admin.php:676
 msgid "Proxy user"
 msgstr "Proxy uživatel"
 
-#: ../../mod/admin.php:675
+#: ../../mod/admin.php:677
 msgid "Proxy URL"
 msgstr "Proxy URL adresa"
 
-#: ../../mod/admin.php:676
+#: ../../mod/admin.php:678
 msgid "Network timeout"
 msgstr "čas síťového spojení vypršelo (timeout)"
 
-#: ../../mod/admin.php:676
+#: ../../mod/admin.php:678
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr "Hodnota ve vteřinách. Nastavte 0 pro neomezeno (není doporučeno)."
 
-#: ../../mod/admin.php:677
+#: ../../mod/admin.php:679
 msgid "Delivery interval"
 msgstr "Interval doručování"
 
-#: ../../mod/admin.php:677
+#: ../../mod/admin.php:679
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr "Prodleva mezi doručovacími procesy běžícími na pozadí snižuje zátěž systému. Doporučené nastavení: 4-5 pro sdílené instalace, 2-3 pro virtuální soukromé servery, 0-1 pro velké dedikované servery."
 
-#: ../../mod/admin.php:678
+#: ../../mod/admin.php:680
 msgid "Poll interval"
 msgstr "Dotazovací interval"
 
-#: ../../mod/admin.php:678
+#: ../../mod/admin.php:680
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr "Tímto nastavením ovlivníte prodlení mezi aktualizačními procesy běžícími na pozadí, čímž můžete snížit systémovou zátěž. Pokud 0, použijte doručovací interval."
 
-#: ../../mod/admin.php:679
+#: ../../mod/admin.php:681
 msgid "Maximum Load Average"
 msgstr "Maximální průměrné zatížení"
 
-#: ../../mod/admin.php:679
+#: ../../mod/admin.php:681
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr "Maximální zatížení systému před pozastavením procesů zajišťujících doručování aktualizací - defaultně 50"
 
-#: ../../mod/admin.php:681
+#: ../../mod/admin.php:682
+msgid "Maximum Load Average (Frontend)"
+msgstr "Maximální průměrné zatížení (Frontend)"
+
+#: ../../mod/admin.php:682
+msgid "Maximum system load before the frontend quits service - default 50."
+msgstr "Maximální zatížení systému předtím, než frontend ukončí službu - defaultně 50"
+
+#: ../../mod/admin.php:684
 msgid "Use MySQL full text engine"
 msgstr "Použít fulltextový vyhledávací stroj MySQL"
 
-#: ../../mod/admin.php:681
+#: ../../mod/admin.php:684
 msgid ""
 "Activates the full text engine. Speeds up search - but can only search for "
 "four and more characters."
 msgstr "Aktivuje fulltextový vyhledávací stroj. Zrychluje vyhledávání ale pouze pro vyhledávání čtyř a více znaků"
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:685
 msgid "Suppress Language"
 msgstr "Potlačit Jazyk"
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:685
 msgid "Suppress language information in meta information about a posting."
 msgstr "Potlačit jazykové informace v meta informacích o příspěvcích"
 
-#: ../../mod/admin.php:683
+#: ../../mod/admin.php:686
 msgid "Suppress Tags"
 msgstr "Potlačit štítky"
 
-#: ../../mod/admin.php:683
+#: ../../mod/admin.php:686
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr "Potlačit zobrazení listu hastagů na konci zprávy."
 
-#: ../../mod/admin.php:684
+#: ../../mod/admin.php:687
 msgid "Path to item cache"
 msgstr "Cesta k položkám vyrovnávací paměti"
 
-#: ../../mod/admin.php:685
+#: ../../mod/admin.php:688
 msgid "Cache duration in seconds"
 msgstr "Doba platnosti vyrovnávací paměti v sekundách"
 
-#: ../../mod/admin.php:685
+#: ../../mod/admin.php:688
 msgid ""
 "How long should the cache files be hold? Default value is 86400 seconds (One"
 " day). To disable the item cache, set the value to -1."
 msgstr "Jak dlouho by měla vyrovnávací paměť držet data? Výchozí hodnota je 86400 sekund (Jeden den). Pro vypnutí funkce vyrovnávací paměti nastavte hodnotu na -1."
 
-#: ../../mod/admin.php:686
+#: ../../mod/admin.php:689
 msgid "Maximum numbers of comments per post"
 msgstr "Maximální počet komentářů k příspěvku"
 
-#: ../../mod/admin.php:686
+#: ../../mod/admin.php:689
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr "Kolik komentářů by mělo být zobrazeno k každému příspěvku? Defaultní hodnota je 100."
 
-#: ../../mod/admin.php:687
+#: ../../mod/admin.php:690
 msgid "Path for lock file"
 msgstr "Cesta k souboru zámku"
 
-#: ../../mod/admin.php:688
+#: ../../mod/admin.php:691
 msgid "Temp path"
 msgstr "Cesta k dočasným souborům"
 
-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:692
 msgid "Base path to installation"
 msgstr "Základní cesta k instalaci"
 
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:693
 msgid "Disable picture proxy"
 msgstr "Vypnutí obrázkové proxy"
 
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:693
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on"
 " systems with very low bandwith."
 msgstr "Obrázková proxi zvyšuje výkonnost a soukromí. Neměla by být použita na systémech s pomalým připojením k síti."
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:694
 msgid "Enable old style pager"
 msgstr "Aktivovat \"old style\" stránkování "
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:694
 msgid ""
 "The old style pager has page numbers but slows down massively the page "
 "speed."
 msgstr " \"old style\" stránkování zobrazuje čísla stránek ale značně zpomaluje rychlost stránky."
 
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:695
 msgid "Only search in tags"
 msgstr "Hledat pouze ve štítkách"
 
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:695
 msgid "On large systems the text search can slow down the system extremely."
 msgstr "Textové vyhledávání může u rozsáhlých systémů znamenat velmi citelné zpomalení systému."
 
-#: ../../mod/admin.php:694
+#: ../../mod/admin.php:697
 msgid "New base url"
 msgstr "Nová výchozí url adresa"
 
-#: ../../mod/admin.php:711
+#: ../../mod/admin.php:714
 msgid "Update has been marked successful"
 msgstr "Aktualizace byla označena jako úspěšná."
 
-#: ../../mod/admin.php:719
+#: ../../mod/admin.php:722
 #, php-format
 msgid "Database structure update %s was successfully applied."
 msgstr "Aktualizace struktury databáze %s byla úspěšně aplikována."
 
-#: ../../mod/admin.php:722
+#: ../../mod/admin.php:725
 #, php-format
 msgid "Executing of database structure update %s failed with error: %s"
 msgstr "Provádění aktualizace databáze %s skončilo chybou: %s"
 
-#: ../../mod/admin.php:734
+#: ../../mod/admin.php:737
 #, php-format
 msgid "Executing %s failed with error: %s"
 msgstr "Vykonávání %s selhalo s chybou: %s"
 
-#: ../../mod/admin.php:737
+#: ../../mod/admin.php:740
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr "Aktualizace %s byla úspěšně aplikována."
 
-#: ../../mod/admin.php:741
+#: ../../mod/admin.php:744
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr "Aktualizace %s nevrátila žádný status. Není zřejmé, jestli byla úspěšná."
 
-#: ../../mod/admin.php:743
+#: ../../mod/admin.php:746
 #, php-format
 msgid "There was no additional update function %s that needed to be called."
 msgstr "Nebyla nalezena žádná další aktualizační funkce %s která by měla být volána."
 
-#: ../../mod/admin.php:762
+#: ../../mod/admin.php:765
 msgid "No failed updates."
 msgstr "Žádné neúspěšné aktualizace."
 
-#: ../../mod/admin.php:763
+#: ../../mod/admin.php:766
 msgid "Check database structure"
 msgstr "Ověření struktury databáze"
 
-#: ../../mod/admin.php:768
+#: ../../mod/admin.php:771
 msgid "Failed Updates"
 msgstr "Neúspěšné aktualizace"
 
-#: ../../mod/admin.php:769
+#: ../../mod/admin.php:772
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr "To nezahrnuje aktualizace do verze 1139, které nevracejí žádný status."
 
-#: ../../mod/admin.php:770
+#: ../../mod/admin.php:773
 msgid "Mark success (if update was manually applied)"
 msgstr "Označit za úspěšné (pokud byla aktualizace aplikována manuálně)"
 
-#: ../../mod/admin.php:771
+#: ../../mod/admin.php:774
 msgid "Attempt to execute this update step automatically"
 msgstr "Pokusit se provést tuto aktualizaci automaticky."
 
-#: ../../mod/admin.php:803
+#: ../../mod/admin.php:806
 #, php-format
 msgid ""
 "\n"
@@ -5696,7 +5710,7 @@ msgid ""
 "\t\t\t\tthe administrator of %2$s has set up an account for you."
 msgstr "\n\t\t\tDrahý %1$s,\n\t\t\t\tadministrátor webu %2$s pro Vás vytvořil uživatelský účet."
 
-#: ../../mod/admin.php:806
+#: ../../mod/admin.php:809
 #, php-format
 msgid ""
 "\n"
@@ -5726,7 +5740,7 @@ msgid ""
 "\t\t\tThank you and welcome to %4$s."
 msgstr "\n\t\t\tVaše přihlašovací údaje jsou následující:\n\n\t\t\tAdresa webu: \t%1$s\n\t\t\tpřihlašovací jméno:\t\t%2$s\n\t\t\theslo:\t\t%3$s\n\n\t\t\tHeslo si můžete změnit na stránce \"Nastavení\" vašeho účtu poté, co se přihlásíte.\n\n\t\t\tProsím věnujte pár chvil revizi dalšího nastavení vašeho účtu na dané stránce.\n\n\t\t\tTaké su můžete přidat nějaké základní informace do svého výchozího profilu (na stránce \"Profily\"), takže ostatní lidé vás snáze najdou. \n\n\t\t\tDoporučujeme Vám uvést celé jméno a i foto. Přidáním nějakých \"klíčových slov\" (velmi užitečné pro hledání nových přátel) a možná také zemi, ve které žijete, pokud nechcete být více konkrétní.\n\n\t\t\tPlně resepktujeme vaše právo na soukromí a nic z výše uvedeného není povinné. Pokud jste zde nový a neznáte zde nikoho, uvedením daných informací můžete získat nové přátele.\n\n\t\t\tDíky a vítejte na %4$s."
 
-#: ../../mod/admin.php:850
+#: ../../mod/admin.php:853
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
@@ -5734,7 +5748,7 @@ msgstr[0] "%s uživatel blokován/odblokován"
 msgstr[1] "%s uživatelů blokováno/odblokováno"
 msgstr[2] "%s uživatelů blokováno/odblokováno"
 
-#: ../../mod/admin.php:857
+#: ../../mod/admin.php:860
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
@@ -5742,194 +5756,194 @@ msgstr[0] "%s uživatel smazán"
 msgstr[1] "%s uživatelů smazáno"
 msgstr[2] "%s uživatelů smazáno"
 
-#: ../../mod/admin.php:896
+#: ../../mod/admin.php:899
 #, php-format
 msgid "User '%s' deleted"
 msgstr "Uživatel '%s' smazán"
 
-#: ../../mod/admin.php:904
+#: ../../mod/admin.php:907
 #, php-format
 msgid "User '%s' unblocked"
 msgstr "Uživatel '%s' odblokován"
 
-#: ../../mod/admin.php:904
+#: ../../mod/admin.php:907
 #, php-format
 msgid "User '%s' blocked"
 msgstr "Uživatel '%s' blokován"
 
-#: ../../mod/admin.php:999
+#: ../../mod/admin.php:1002
 msgid "Add User"
 msgstr "Přidat Uživatele"
 
-#: ../../mod/admin.php:1000
+#: ../../mod/admin.php:1003
 msgid "select all"
 msgstr "Vybrat vše"
 
-#: ../../mod/admin.php:1001
+#: ../../mod/admin.php:1004
 msgid "User registrations waiting for confirm"
 msgstr "Registrace uživatele čeká na potvrzení"
 
-#: ../../mod/admin.php:1002
+#: ../../mod/admin.php:1005
 msgid "User waiting for permanent deletion"
 msgstr "Uživatel čeká na trvalé smazání"
 
-#: ../../mod/admin.php:1003
+#: ../../mod/admin.php:1006
 msgid "Request date"
 msgstr "Datum žádosti"
 
-#: ../../mod/admin.php:1004
+#: ../../mod/admin.php:1007
 msgid "No registrations."
 msgstr "Žádné registrace."
 
-#: ../../mod/admin.php:1006
+#: ../../mod/admin.php:1009
 msgid "Deny"
 msgstr "Odmítnout"
 
-#: ../../mod/admin.php:1010
+#: ../../mod/admin.php:1013
 msgid "Site admin"
 msgstr "Site administrátor"
 
-#: ../../mod/admin.php:1011
+#: ../../mod/admin.php:1014
 msgid "Account expired"
 msgstr "Účtu vypršela platnost"
 
-#: ../../mod/admin.php:1014
+#: ../../mod/admin.php:1017
 msgid "New User"
 msgstr "Nový uživatel"
 
-#: ../../mod/admin.php:1015 ../../mod/admin.php:1016
+#: ../../mod/admin.php:1018 ../../mod/admin.php:1019
 msgid "Register date"
 msgstr "Datum registrace"
 
-#: ../../mod/admin.php:1015 ../../mod/admin.php:1016
+#: ../../mod/admin.php:1018 ../../mod/admin.php:1019
 msgid "Last login"
 msgstr "Datum posledního přihlášení"
 
-#: ../../mod/admin.php:1015 ../../mod/admin.php:1016
+#: ../../mod/admin.php:1018 ../../mod/admin.php:1019
 msgid "Last item"
 msgstr "Poslední položka"
 
-#: ../../mod/admin.php:1015
+#: ../../mod/admin.php:1018
 msgid "Deleted since"
 msgstr "Smazán od"
 
-#: ../../mod/admin.php:1018
+#: ../../mod/admin.php:1021
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Vybraní uživatelé budou smazáni!\\n\\n Vše, co tito uživatelé na těchto stránkách vytvořili, bude trvale odstraněno!\\n\\n Opravdu pokračovat?"
 
-#: ../../mod/admin.php:1019
+#: ../../mod/admin.php:1022
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr "Uživatel {0} bude smazán!\\n\\n Vše, co tento uživatel na těchto stránkách vytvořil, bude trvale odstraněno!\\n\\n Opravdu pokračovat?"
 
-#: ../../mod/admin.php:1029
+#: ../../mod/admin.php:1032
 msgid "Name of the new user."
 msgstr "Jméno nového uživatele"
 
-#: ../../mod/admin.php:1030
+#: ../../mod/admin.php:1033
 msgid "Nickname"
 msgstr "Přezdívka"
 
-#: ../../mod/admin.php:1030
+#: ../../mod/admin.php:1033
 msgid "Nickname of the new user."
 msgstr "Přezdívka nového uživatele."
 
-#: ../../mod/admin.php:1031
+#: ../../mod/admin.php:1034
 msgid "Email address of the new user."
 msgstr "Emailová adresa nového uživatele."
 
-#: ../../mod/admin.php:1064
+#: ../../mod/admin.php:1067
 #, php-format
 msgid "Plugin %s disabled."
 msgstr "Plugin %s zakázán."
 
-#: ../../mod/admin.php:1068
+#: ../../mod/admin.php:1071
 #, php-format
 msgid "Plugin %s enabled."
 msgstr "Plugin %s povolen."
 
-#: ../../mod/admin.php:1078 ../../mod/admin.php:1294
+#: ../../mod/admin.php:1081 ../../mod/admin.php:1297
 msgid "Disable"
 msgstr "Zakázat"
 
-#: ../../mod/admin.php:1080 ../../mod/admin.php:1296
+#: ../../mod/admin.php:1083 ../../mod/admin.php:1299
 msgid "Enable"
 msgstr "Povolit"
 
-#: ../../mod/admin.php:1103 ../../mod/admin.php:1324
+#: ../../mod/admin.php:1106 ../../mod/admin.php:1327
 msgid "Toggle"
 msgstr "Přepnout"
 
-#: ../../mod/admin.php:1111 ../../mod/admin.php:1334
+#: ../../mod/admin.php:1114 ../../mod/admin.php:1337
 msgid "Author: "
 msgstr "Autor: "
 
-#: ../../mod/admin.php:1112 ../../mod/admin.php:1335
+#: ../../mod/admin.php:1115 ../../mod/admin.php:1338
 msgid "Maintainer: "
 msgstr "Správce: "
 
-#: ../../mod/admin.php:1254
+#: ../../mod/admin.php:1257
 msgid "No themes found."
 msgstr "Nenalezeny žádná témata."
 
-#: ../../mod/admin.php:1316
+#: ../../mod/admin.php:1319
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
-#: ../../mod/admin.php:1362
+#: ../../mod/admin.php:1365
 msgid "[Experimental]"
 msgstr "[Experimentální]"
 
-#: ../../mod/admin.php:1363
+#: ../../mod/admin.php:1366
 msgid "[Unsupported]"
 msgstr "[Nepodporováno]"
 
-#: ../../mod/admin.php:1390
+#: ../../mod/admin.php:1393
 msgid "Log settings updated."
 msgstr "Nastavení protokolu aktualizováno."
 
-#: ../../mod/admin.php:1446
+#: ../../mod/admin.php:1449
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: ../../mod/admin.php:1452
+#: ../../mod/admin.php:1455
 msgid "Enable Debugging"
 msgstr "Povolit ladění"
 
-#: ../../mod/admin.php:1453
+#: ../../mod/admin.php:1456
 msgid "Log file"
 msgstr "Soubor s logem"
 
-#: ../../mod/admin.php:1453
+#: ../../mod/admin.php:1456
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr "Musí být editovatelné web serverem. Relativní cesta k vašemu kořenovému adresáři Friendica"
 
-#: ../../mod/admin.php:1454
+#: ../../mod/admin.php:1457
 msgid "Log level"
 msgstr "Úroveň auditu"
 
-#: ../../mod/admin.php:1504
+#: ../../mod/admin.php:1507
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../../mod/admin.php:1510
+#: ../../mod/admin.php:1513
 msgid "FTP Host"
 msgstr "Hostitel FTP"
 
-#: ../../mod/admin.php:1511
+#: ../../mod/admin.php:1514
 msgid "FTP Path"
 msgstr "Cesta FTP"
 
-#: ../../mod/admin.php:1512
+#: ../../mod/admin.php:1515
 msgid "FTP User"
 msgstr "FTP uživatel"
 
-#: ../../mod/admin.php:1513
+#: ../../mod/admin.php:1516
 msgid "FTP Password"
 msgstr "FTP heslo"
 
@@ -6014,7 +6028,7 @@ msgstr "S hvězdičkou"
 msgid "Favourite Posts"
 msgstr "Oblíbené přízpěvky"
 
-#: ../../mod/network.php:463
+#: ../../mod/network.php:458
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -6023,31 +6037,31 @@ msgstr[0] "Upozornění: Tato skupina obsahuje %s člena z nezabezpečené sít
 msgstr[1] "Upozornění: Tato skupina obsahuje %s členy z nezabezpečené sítě."
 msgstr[2] "Upozornění: Tato skupina obsahuje %s členy z nezabezpečené sítě."
 
-#: ../../mod/network.php:466
+#: ../../mod/network.php:461
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr "Soukromé zprávy této skupině jsou vystaveny riziku prozrazení."
 
-#: ../../mod/network.php:520 ../../mod/content.php:119
+#: ../../mod/network.php:524 ../../mod/content.php:119
 msgid "No such group"
 msgstr "Žádná taková skupina"
 
-#: ../../mod/network.php:537 ../../mod/content.php:130
+#: ../../mod/network.php:541 ../../mod/content.php:130
 msgid "Group is empty"
 msgstr "Skupina je prázdná"
 
-#: ../../mod/network.php:544 ../../mod/content.php:134
+#: ../../mod/network.php:548 ../../mod/content.php:134
 msgid "Group: "
 msgstr "Skupina: "
 
-#: ../../mod/network.php:554
+#: ../../mod/network.php:558
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../../mod/network.php:556
+#: ../../mod/network.php:560
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr "Soukromé zprávy této osobě jsou vystaveny riziku prozrazení."
 
-#: ../../mod/network.php:561
+#: ../../mod/network.php:565
 msgid "Invalid contact."
 msgstr "Neplatný kontakt."
 
@@ -6266,7 +6280,11 @@ msgstr "Aktuální fotografie"
 msgid "The post was created"
 msgstr "Příspěvek byl vytvořen"
 
-#: ../../mod/follow.php:27
+#: ../../mod/follow.php:21
+msgid "You already added this contact."
+msgstr "Již jste si tento kontakt přidali."
+
+#: ../../mod/follow.php:103
 msgid "Contact added"
 msgstr "Kontakt přidán"
 
@@ -6568,6 +6586,10 @@ msgstr "Vstupní data (ve formátu Diaspora): "
 msgid "diaspora2bb: "
 msgstr "diaspora2bb: "
 
+#: ../../mod/p.php:9
+msgid "Not Extended"
+msgstr "Nerozšířeně"
+
 #: ../../mod/tagrm.php:41
 msgid "Tag removed"
 msgstr "Štítek odstraněn"
@@ -6594,19 +6616,19 @@ msgstr "Tímto bude kompletně odstraněn váš účet. Jakmile bude účet odst
 msgid "Please enter your password for verification:"
 msgstr "Prosím, zadejte své heslo pro ověření:"
 
-#: ../../mod/profperm.php:25 ../../mod/profperm.php:55
+#: ../../mod/profperm.php:25 ../../mod/profperm.php:56
 msgid "Invalid profile identifier."
 msgstr "Neplatný identifikátor profilu."
 
-#: ../../mod/profperm.php:101
+#: ../../mod/profperm.php:102
 msgid "Profile Visibility Editor"
 msgstr "Editor viditelnosti profilu "
 
-#: ../../mod/profperm.php:114
+#: ../../mod/profperm.php:115
 msgid "Visible To"
 msgstr "Viditelný pro"
 
-#: ../../mod/profperm.php:130
+#: ../../mod/profperm.php:131
 msgid "All Contacts (with secure profile access)"
 msgstr "Všechny kontakty (se zabezpečeným přístupovým profilem )"
 
@@ -6618,121 +6640,121 @@ msgstr "Shoda profilu"
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr "Žádná klíčová slova k porovnání. Prosím, přidejte klíčová slova do Vašeho výchozího profilu."
 
-#: ../../mod/match.php:57
+#: ../../mod/match.php:62
 msgid "is interested in:"
 msgstr "zajímá se o:"
 
-#: ../../mod/events.php:66
+#: ../../mod/events.php:68 ../../mod/events.php:70
 msgid "Event title and start time are required."
 msgstr "Název události a datum začátku jsou vyžadovány."
 
-#: ../../mod/events.php:291
+#: ../../mod/events.php:303
 msgid "l, F j"
 msgstr "l, F j"
 
-#: ../../mod/events.php:313
+#: ../../mod/events.php:325
 msgid "Edit event"
 msgstr "Editovat událost"
 
-#: ../../mod/events.php:371
+#: ../../mod/events.php:383
 msgid "Create New Event"
 msgstr "Vytvořit novou událost"
 
-#: ../../mod/events.php:372
+#: ../../mod/events.php:384
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ../../mod/events.php:373 ../../mod/install.php:207
+#: ../../mod/events.php:385 ../../mod/install.php:207
 msgid "Next"
 msgstr "Dále"
 
-#: ../../mod/events.php:446
+#: ../../mod/events.php:458
 msgid "hour:minute"
 msgstr "hodina:minuta"
 
-#: ../../mod/events.php:456
+#: ../../mod/events.php:468
 msgid "Event details"
 msgstr "Detaily události"
 
-#: ../../mod/events.php:457
+#: ../../mod/events.php:469
 #, php-format
 msgid "Format is %s %s. Starting date and Title are required."
 msgstr "Formát je %s %s. Datum začátku a Název jsou vyžadovány."
 
-#: ../../mod/events.php:459
+#: ../../mod/events.php:471
 msgid "Event Starts:"
 msgstr "Událost začíná:"
 
-#: ../../mod/events.php:459 ../../mod/events.php:473
+#: ../../mod/events.php:471 ../../mod/events.php:485
 msgid "Required"
 msgstr "Vyžadováno"
 
-#: ../../mod/events.php:462
+#: ../../mod/events.php:474
 msgid "Finish date/time is not known or not relevant"
 msgstr "Datum/čas konce není zadán nebo není relevantní"
 
-#: ../../mod/events.php:464
+#: ../../mod/events.php:476
 msgid "Event Finishes:"
 msgstr "Akce končí:"
 
-#: ../../mod/events.php:467
+#: ../../mod/events.php:479
 msgid "Adjust for viewer timezone"
 msgstr "Nastavit časové pásmo pro uživatele s právem pro čtení"
 
-#: ../../mod/events.php:469
+#: ../../mod/events.php:481
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../../mod/events.php:473
+#: ../../mod/events.php:485
 msgid "Title:"
 msgstr "Název:"
 
-#: ../../mod/events.php:475
+#: ../../mod/events.php:487
 msgid "Share this event"
 msgstr "Sdílet tuto událost"
 
-#: ../../mod/ping.php:240
+#: ../../mod/ping.php:210 ../../mod/ping.php:234
 msgid "{0} wants to be your friend"
 msgstr "{0} chce být Vaším přítelem"
 
-#: ../../mod/ping.php:245
+#: ../../mod/ping.php:215 ../../mod/ping.php:239
 msgid "{0} sent you a message"
 msgstr "{0} vám poslal zprávu"
 
-#: ../../mod/ping.php:250
+#: ../../mod/ping.php:220 ../../mod/ping.php:244
 msgid "{0} requested registration"
 msgstr "{0} požaduje registraci"
 
-#: ../../mod/ping.php:256
+#: ../../mod/ping.php:250
 #, php-format
 msgid "{0} commented %s's post"
 msgstr "{0} komentoval příspěvek uživatele %s"
 
-#: ../../mod/ping.php:261
+#: ../../mod/ping.php:255
 #, php-format
 msgid "{0} liked %s's post"
 msgstr "{0} má rád příspěvek uživatele %s"
 
-#: ../../mod/ping.php:266
+#: ../../mod/ping.php:260
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr "{0} nemá rád příspěvek uživatele %s"
 
-#: ../../mod/ping.php:271
+#: ../../mod/ping.php:265
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr "{0} se skamarádil s %s"
 
-#: ../../mod/ping.php:276
+#: ../../mod/ping.php:270
 msgid "{0} posted"
 msgstr "{0} zasláno"
 
-#: ../../mod/ping.php:281
+#: ../../mod/ping.php:275
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr "{0} označen %s' příspěvek s #%s"
 
-#: ../../mod/ping.php:287
+#: ../../mod/ping.php:281
 msgid "{0} mentioned you in a post"
 msgstr "{0} vás zmínil v příspěvku"
 
@@ -7458,47 +7480,51 @@ msgstr "Zrcadlit pro přeposlané příspěvky"
 msgid "Mirror as my own posting"
 msgstr "Zrcadlit jako mé vlastní příspěvky"
 
-#: ../../mod/crepair.php:166
+#: ../../mod/crepair.php:168
+msgid "Refetch contact data"
+msgstr "Znovu načíst data kontaktu"
+
+#: ../../mod/crepair.php:170
 msgid "Account Nickname"
 msgstr "Přezdívka účtu"
 
-#: ../../mod/crepair.php:167
+#: ../../mod/crepair.php:171
 msgid "@Tagname - overrides Name/Nickname"
 msgstr "@Tagname - upřednostněno před Jménem/Přezdívkou"
 
-#: ../../mod/crepair.php:168
+#: ../../mod/crepair.php:172
 msgid "Account URL"
 msgstr "URL adresa účtu"
 
-#: ../../mod/crepair.php:169
+#: ../../mod/crepair.php:173
 msgid "Friend Request URL"
 msgstr "Žádost o přátelství URL"
 
-#: ../../mod/crepair.php:170
+#: ../../mod/crepair.php:174
 msgid "Friend Confirm URL"
 msgstr "URL adresa potvrzení přátelství"
 
-#: ../../mod/crepair.php:171
+#: ../../mod/crepair.php:175
 msgid "Notification Endpoint URL"
 msgstr "Notifikační URL adresa"
 
-#: ../../mod/crepair.php:172
+#: ../../mod/crepair.php:176
 msgid "Poll/Feed URL"
 msgstr "Poll/Feed URL adresa"
 
-#: ../../mod/crepair.php:173
+#: ../../mod/crepair.php:177
 msgid "New photo from this URL"
 msgstr "Nové foto z této URL adresy"
 
-#: ../../mod/crepair.php:174
+#: ../../mod/crepair.php:178
 msgid "Remote Self"
 msgstr "Remote Self"
 
-#: ../../mod/crepair.php:176
+#: ../../mod/crepair.php:180
 msgid "Mirror postings from this contact"
 msgstr "Zrcadlení správ od tohoto kontaktu"
 
-#: ../../mod/crepair.php:176
+#: ../../mod/crepair.php:180
 msgid ""
 "Mark this contact as remote_self, this will cause friendica to repost new "
 "entries from this contact."
@@ -7701,7 +7727,7 @@ msgstr "Vyberte, co si přejete příjemci udělat"
 msgid "Make this post private"
 msgstr "Změnit tento příspěvek na soukromý"
 
-#: ../../mod/display.php:496
+#: ../../mod/display.php:498
 msgid "Item has been removed."
 msgstr "Položka byla odstraněna."
 
@@ -7746,47 +7772,47 @@ msgstr "Dočasné selhání. Prosím, vyčkejte a zkuste to znovu."
 msgid "Introduction failed or was revoked."
 msgstr "Žádost o propojení selhala nebo byla zrušena."
 
-#: ../../mod/dfrn_confirm.php:429
+#: ../../mod/dfrn_confirm.php:430
 msgid "Unable to set contact photo."
 msgstr "Nelze nastavit fotografii kontaktu."
 
-#: ../../mod/dfrn_confirm.php:571
+#: ../../mod/dfrn_confirm.php:572
 #, php-format
 msgid "No user record found for '%s' "
 msgstr "Pro '%s' nenalezen žádný uživatelský záznam "
 
-#: ../../mod/dfrn_confirm.php:581
+#: ../../mod/dfrn_confirm.php:582
 msgid "Our site encryption key is apparently messed up."
 msgstr "Náš šifrovací klíč zřejmě přestal správně fungovat."
 
-#: ../../mod/dfrn_confirm.php:592
+#: ../../mod/dfrn_confirm.php:593
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr "Byla poskytnuta prázdná URL adresa nebo se nepodařilo URL adresu dešifrovat."
 
-#: ../../mod/dfrn_confirm.php:613
+#: ../../mod/dfrn_confirm.php:614
 msgid "Contact record was not found for you on our site."
 msgstr "Kontakt záznam nebyl nalezen pro vás na našich stránkách."
 
-#: ../../mod/dfrn_confirm.php:627
+#: ../../mod/dfrn_confirm.php:628
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr "V adresáři není k dispozici veřejný klíč pro URL %s."
 
-#: ../../mod/dfrn_confirm.php:647
+#: ../../mod/dfrn_confirm.php:648
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr "Váš systém poskytl duplicitní ID vůči našemu systému. Pokuste se akci zopakovat."
 
-#: ../../mod/dfrn_confirm.php:658
+#: ../../mod/dfrn_confirm.php:659
 msgid "Unable to set your contact credentials on our system."
 msgstr "Nelze nastavit Vaše přihlašovací údaje v našem systému."
 
-#: ../../mod/dfrn_confirm.php:725
+#: ../../mod/dfrn_confirm.php:726
 msgid "Unable to update your contact profile details on our system"
 msgstr "Nelze aktualizovat Váš profil v našem systému"
 
-#: ../../mod/dfrn_confirm.php:797
+#: ../../mod/dfrn_confirm.php:798
 #, php-format
 msgid "%1$s has joined %2$s"
 msgstr "%1$s se připojil k %2$s"
diff --git a/view/cs/strings.php b/view/cs/strings.php
index e642279dc5..57bb382eaf 100644
--- a/view/cs/strings.php
+++ b/view/cs/strings.php
@@ -76,13 +76,6 @@ $a->strings["Page not found."] = "Stránka nenalezena";
 $a->strings["Permission denied"] = "Nedostatečné oprávnění";
 $a->strings["Permission denied."] = "Přístup odmítnut.";
 $a->strings["toggle mobile"] = "přepnout mobil";
-$a->strings["Do you wish to confirm your identity (<tt>%s</tt>) with <tt>%s</tt>"] = "Přejete si potvrdit vaši identitu (<tt>%s</tt>) s <tt>%s</tt>";
-$a->strings["Confirm"] = "Potvrdit";
-$a->strings["Do not confirm"] = "Nepotvrzovat";
-$a->strings["Trust This Site"] = "Důvěřovat tomuto webu";
-$a->strings["No Identifier Sent"] = "Nezaslán žádný identifikátor";
-$a->strings["Requested identity don't match logged in user."] = "Požadovaná identita neodpovídá přihlášenému uživateli";
-$a->strings["Please wait; you are being redirected to <%s>"] = "Čekejte prosím, budete přesměrován na <%s>";
 $a->strings["Delete this item?"] = "Odstranit tuto položku?";
 $a->strings["Comment"] = "Okomentovat";
 $a->strings["show more"] = "zobrazit více";
@@ -194,6 +187,7 @@ $a->strings["edit"] = "editovat";
 $a->strings["Groups"] = "Skupiny";
 $a->strings["Edit group"] = "Editovat skupinu";
 $a->strings["Create a new group"] = "Vytvořit novou skupinu";
+$a->strings["Group Name: "] = "Název skupiny: ";
 $a->strings["Contacts not in any group"] = "Kontakty, které nejsou v žádné skupině";
 $a->strings["add"] = "přidat";
 $a->strings["Wall Photos"] = "Fotografie na zdi";
@@ -745,7 +739,6 @@ $a->strings["Group not found."] = "Skupina nenalezena.";
 $a->strings["Group name changed."] = "Název skupiny byl změněn.";
 $a->strings["Save Group"] = "Uložit Skupinu";
 $a->strings["Create a group of contacts/friends."] = "Vytvořit skupinu kontaktů / přátel.";
-$a->strings["Group Name: "] = "Název skupiny: ";
 $a->strings["Group removed."] = "Skupina odstraněna. ";
 $a->strings["Unable to remove group."] = "Nelze odstranit skupinu.";
 $a->strings["Group Editor"] = "Editor skupin";
@@ -844,6 +837,9 @@ $a->strings["Plugin Settings"] = "Nastavení doplňku";
 $a->strings["Off"] = "Vypnuto";
 $a->strings["On"] = "Zapnuto";
 $a->strings["Additional Features"] = "Další Funkčnosti";
+$a->strings["General Social Media Settings"] = "General Social Media nastavení";
+$a->strings["Disable intelligent shortening"] = "Vypnout inteligentní zkracování";
+$a->strings["Normally the system tries to find the best link to add to shortened posts. If this option is enabled then every shortened post will always point to the original friendica post."] = "Normálně se systém snaží nalézt nejlepší link pro přidání zkrácených příspěvků. Pokud je tato volba aktivní, pak každý zkrácený příspěvek bude vždy ukazovat na originální friencika příspěvek";
 $a->strings["Built-in support for %s connectivity is %s"] = "Vestavěná podpora pro připojení s %s je %s";
 $a->strings["enabled"] = "povoleno";
 $a->strings["disabled"] = "zakázáno";
@@ -950,6 +946,9 @@ $a->strings["You receive a private message"] = "obdržíte soukromou zprávu";
 $a->strings["You receive a friend suggestion"] = "Obdržel jste návrh přátelství";
 $a->strings["You are tagged in a post"] = "Jste označen v příspěvku";
 $a->strings["You are poked/prodded/etc. in a post"] = "Byl Jste šťouchnout v příspěvku";
+$a->strings["Activate desktop notifications"] = "Aktivovat upozornění na desktopu";
+$a->strings["Note: This is an experimental feature, as being not supported by each browser"] = "Poznámka: Jedná se o experimentální funkci, protože není podporovaná všemi prohlížeči";
+$a->strings["You will now receive desktop notifications!"] = "Nyní obdržíte notifikace na desktopu!";
 $a->strings["Text-only notification emails"] = "Pouze textové notifikační e-maily";
 $a->strings["Send text only notification emails, without the html part"] = "Posílat pouze textové notifikační e-maily, bez html části.";
 $a->strings["Advanced Account/Page Type Settings"] = "Pokročilé nastavení účtu/stránky";
@@ -1116,6 +1115,7 @@ $a->strings["Invalid profile URL."] = "Neplatné URL profilu.";
 $a->strings["Your introduction has been sent."] = "Vaše žádost o propojení byla odeslána.";
 $a->strings["Please login to confirm introduction."] = "Prosím přihlašte se k potvrzení žádosti o propojení.";
 $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Jste přihlášeni pod nesprávnou identitou  Prosím, přihlaste se do <strong>tohoto</strong> profilu.";
+$a->strings["Confirm"] = "Potvrdit";
 $a->strings["Hide this contact"] = "Skrýt tento kontakt";
 $a->strings["Welcome home %s."] = "Vítejte doma %s.";
 $a->strings["Please confirm your introduction/connection request to %s."] = "Prosím potvrďte Vaši žádost o propojení %s.";
@@ -1277,6 +1277,8 @@ $a->strings["Poll interval"] = "Dotazovací interval";
 $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Tímto nastavením ovlivníte prodlení mezi aktualizačními procesy běžícími na pozadí, čímž můžete snížit systémovou zátěž. Pokud 0, použijte doručovací interval.";
 $a->strings["Maximum Load Average"] = "Maximální průměrné zatížení";
 $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximální zatížení systému před pozastavením procesů zajišťujících doručování aktualizací - defaultně 50";
+$a->strings["Maximum Load Average (Frontend)"] = "Maximální průměrné zatížení (Frontend)";
+$a->strings["Maximum system load before the frontend quits service - default 50."] = "Maximální zatížení systému předtím, než frontend ukončí službu - defaultně 50";
 $a->strings["Use MySQL full text engine"] = "Použít fulltextový vyhledávací stroj MySQL";
 $a->strings["Activates the full text engine. Speeds up search - but can only search for four and more characters."] = "Aktivuje fulltextový vyhledávací stroj. Zrychluje vyhledávání ale pouze pro vyhledávání čtyř a více znaků";
 $a->strings["Suppress Language"] = "Potlačit Jazyk";
@@ -1451,6 +1453,7 @@ $a->strings["Private photo"] = "Soukromé fotografie";
 $a->strings["Public photo"] = "Veřejné fotografie";
 $a->strings["Recent Photos"] = "Aktuální fotografie";
 $a->strings["The post was created"] = "Příspěvek byl vytvořen";
+$a->strings["You already added this contact."] = "Již jste si tento kontakt přidali.";
 $a->strings["Contact added"] = "Kontakt přidán";
 $a->strings["Move account"] = "Přesunout účet";
 $a->strings["You can import an account from another Friendica server."] = "Můžete importovat účet z jiného Friendica serveru.";
@@ -1510,6 +1513,7 @@ $a->strings["bb2dia2bb: "] = "bb2dia2bb: ";
 $a->strings["bb2md2html2bb: "] = "bb2md2html2bb: ";
 $a->strings["Source input (Diaspora format): "] = "Vstupní data (ve formátu Diaspora): ";
 $a->strings["diaspora2bb: "] = "diaspora2bb: ";
+$a->strings["Not Extended"] = "Nerozšířeně";
 $a->strings["Tag removed"] = "Štítek odstraněn";
 $a->strings["Remove Item Tag"] = "Odebrat štítek položky";
 $a->strings["Select a tag to remove: "] = "Vyberte štítek k odebrání: ";
@@ -1717,6 +1721,7 @@ $a->strings["Return to contact editor"] = "Návrat k editoru kontaktu";
 $a->strings["No mirroring"] = "Žádné zrcadlení";
 $a->strings["Mirror as forwarded posting"] = "Zrcadlit pro přeposlané příspěvky";
 $a->strings["Mirror as my own posting"] = "Zrcadlit jako mé vlastní příspěvky";
+$a->strings["Refetch contact data"] = "Znovu načíst data kontaktu";
 $a->strings["Account Nickname"] = "Přezdívka účtu";
 $a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - upřednostněno před Jménem/Přezdívkou";
 $a->strings["Account URL"] = "URL adresa účtu";

From 1067718018610cda4b544c5b106a89af109a48c9 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Wed, 27 May 2015 12:44:40 +0200
Subject: [PATCH 17/20] little revision

---
 mod/allfriends.php | 7 +++++--
 mod/common.php     | 7 +++++--
 mod/crepair.php    | 4 ++--
 mod/photos.php     | 3 ++-
 mod/videos.php     | 4 ++--
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/mod/allfriends.php b/mod/allfriends.php
index bbdc5ef458..b73c55c226 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -20,12 +20,15 @@ function allfriends_content(&$a) {
 		intval(local_user())
 	);
 
-	$a->page['aside'] .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
+	$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
                 '$name' => $c[0]['name'],
                 '$photo' => $c[0]['photo'],
                 'url' => $a->get_baseurl() . '/contacts/' . $cid
                 ));
-	
+
+        if(! x($a->page,'aside'))
+                $a->page['aside'] = '';
+        $a->page['aside'] .= $vcard_widget;
 
 	if(! count($c))
 		return;
diff --git a/mod/common.php b/mod/common.php
index 574443f483..6a1bf4e31b 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -28,12 +28,15 @@ function common_content(&$a) {
 		);
 	}	
 
-	$a->page['aside'] .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
+	$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
                 '$name' => $c[0]['name'],
                 '$photo' => $c[0]['photo'],
                 'url' => $a->get_baseurl() . '/contacts/' . $cid
                 ));
-	
+
+        if(! x($a->page,'aside'))
+                $a->page['aside'] = '';
+        $a->page['aside'] .= $vcard_widget;	
 
 	if(! count($c))
 		return;
diff --git a/mod/crepair.php b/mod/crepair.php
index 7cc67d4c83..457a06685d 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -23,11 +23,11 @@ function crepair_init(&$a) {
 	if($contact_id) {
 			$a->data['contact'] = $r[0];
                         $tpl = get_markup_template("vcard-widget.tpl");
-                        $o .= replace_macros($tpl, array(
+                        $vcard_widget .= replace_macros($tpl, array(
                                 '$name' => $a->data['contact']['name'],
                                 '$photo' => $a->data['contact']['photo']
                         ));
-			$a->page['aside'] .= $o;
+			$a->page['aside'] .= $vcard_widget;
 
 	}
 }
diff --git a/mod/photos.php b/mod/photos.php
index 657f23236d..ebb88c7391 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -34,7 +34,7 @@ function photos_init(&$a) {
 
                 $tpl = get_markup_template("vcard-widget.tpl");
 
-		$o .= replace_macros($tpl, array(
+		$vcard_widget .= replace_macros($tpl, array(
                         '$name' => $a->data['user']['username'],
                         '$photo' => $profilephoto
                 ));
@@ -76,6 +76,7 @@ function photos_init(&$a) {
 
 		if(! x($a->page,'aside'))
 			$a->page['aside'] = '';
+                $a->page['aside'] .= $vcard_widget;
 		$a->page['aside'] .= $o;
 
 
diff --git a/mod/videos.php b/mod/videos.php
index bc076e740a..5553bbbeb3 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -32,7 +32,7 @@ function videos_init(&$a) {
 
                 $tpl = get_markup_template("vcard-widget.tpl");
 
-		$o .= replace_macros($tpl, array(
+		$vcard_widget = replace_macros($tpl, array(
                         '$name' => $a->data['user']['username'],
                         '$photo' => $profilephoto
                 ));
@@ -74,7 +74,7 @@ function videos_init(&$a) {
 
 		if(! x($a->page,'aside'))
 			$a->page['aside'] = '';
-		$a->page['aside'] .= $o;
+		$a->page['aside'] .= $vcard_widget;
 
 
 		$tpl = get_markup_template("videos_head.tpl");

From 24962f300229ffd54f88e3ec7ce58573603ed573 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 28 May 2015 07:51:12 +0200
Subject: [PATCH 18/20] OStatus completion: The id and the plink for fetched
 items should now have reliable values.

---
 include/ostatus_conversation.php | 50 +++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 14 deletions(-)

diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php
index f21f8248f8..a03330a820 100644
--- a/include/ostatus_conversation.php
+++ b/include/ostatus_conversation.php
@@ -1,4 +1,6 @@
 <?php
+require_once("include/Contact.php");
+
 define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 define('OSTATUS_DEFAULT_POLL_TIMEFRAME', 1440); // given in minutes
 
@@ -132,19 +134,28 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 	$items = array_reverse($items);
 
 	foreach ($items as $single_conv) {
-		if (!isset($single_conv->id) AND isset($single_conv->object->id))
+		if (isset($single_conv->object->id))
 			$single_conv->id = $single_conv->object->id;
-		elseif (!isset($single_conv->id) AND isset($single_conv->object->url))
-			$single_conv->id = $single_conv->object->url;
+
+		logger("Got id ".$single_conv->id, LOGGER_DEBUG);
+
+		//if (!isset($single_conv->id) AND isset($single_conv->object->id))
+		//	$single_conv->id = $single_conv->object->id;
+		//elseif (!isset($single_conv->id) AND isset($single_conv->object->url))
+		//	$single_conv->id = $single_conv->object->url;
 
 		$plink = ostatus_convert_href($single_conv->id);
+		if (isset($single_conv->object->url))
+			$plink = ostatus_convert_href($single_conv->object->url);
 
-		if (isset($single_conv->provider->url) AND isset($single_conv->statusnet_notice_info->local_id))
-			$plink = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
-		elseif (isset($single_conv->provider->url) AND isset($single_conv->statusnet->notice_info->local_id))
-			$plink = $single_conv->provider->url."notice/".$single_conv->statusnet->notice_info->local_id;
-		elseif (isset($single_conv->provider->url) AND isset($single_conv->status_net->notice_info->local_id))
-			$plink = $single_conv->provider->url."notice/".$single_conv->status_net->notice_info->local_id;
+		logger("Got url ".$plink, LOGGER_DEBUG);
+
+		//if (isset($single_conv->provider->url) AND isset($single_conv->statusnet_notice_info->local_id))
+		//	$plink = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
+		//elseif (isset($single_conv->provider->url) AND isset($single_conv->statusnet->notice_info->local_id))
+		//	$plink = $single_conv->provider->url."notice/".$single_conv->statusnet->notice_info->local_id;
+		//elseif (isset($single_conv->provider->url) AND isset($single_conv->status_net->notice_info->local_id))
+		//	$plink = $single_conv->provider->url."notice/".$single_conv->status_net->notice_info->local_id;
 
 		if (@!$single_conv->id)
 			continue;
@@ -197,14 +208,25 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 			continue;
 		}
 
+		$actor = $single_conv->actor->id;
+		if (isset($single_conv->actor->url))
+			$actor = $single_conv->actor->url;
+
 		$contact = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'",
-				$message["uid"], normalise_link($single_conv->actor->id), NETWORK_STATUSNET);
+				$message["uid"], normalise_link($actor), NETWORK_STATUSNET);
 
 		if (count($contact)) {
-			logger("Found contact for url ".$single_conv->actor->id, LOGGER_DEBUG);
+			logger("Found contact for url ".$actor, LOGGER_DEBUG);
 			$contact_id = $contact[0]["id"];
 		} else {
-			logger("No contact found for url ".$single_conv->actor->id, LOGGER_DEBUG);
+			logger("No contact found for url ".$actor, LOGGER_DEBUG);
+
+			// Adding a global contact
+			// To-Do: Use this data for the post
+			$global_contact_id = get_contact($actor, 0);
+
+			logger("Global contact ".$global_contact_id." found for url ".$actor, LOGGER_DEBUG);
+
 			$contact_id = $parent["contact-id"];
 		}
 
@@ -227,12 +249,12 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 		if ($arr["owner-name"] == '')
 			$arr["owner-name"] =  $single_conv->actor->displayName;
 
-		$arr["owner-link"] = $single_conv->actor->id;
+		$arr["owner-link"] = $actor;
 		$arr["owner-avatar"] = $single_conv->actor->image->url;
 		//$arr["author-name"] = $single_conv->actor->contact->displayName;
 		//$arr["author-name"] = $single_conv->actor->contact->preferredUsername;
 		$arr["author-name"] = $arr["owner-name"];
-		$arr["author-link"] = $single_conv->actor->id;
+		$arr["author-link"] = $actor;
 		$arr["author-avatar"] = $single_conv->actor->image->url;
 		$arr["body"] = html2bbcode($single_conv->content);
 

From 487d57df4569d2be1200f0e03c0b85bdc0ee0bfe Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 28 May 2015 08:02:34 +0200
Subject: [PATCH 19/20] Fetch the author url and not the id.

---
 include/items.php                | 30 +++++++++++++++++++++++++++---
 include/ostatus_conversation.php | 15 ---------------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/include/items.php b/include/items.php
index 69b4a0f259..ef164bc2ce 100644
--- a/include/items.php
+++ b/include/items.php
@@ -464,12 +464,27 @@ function get_atom_elements($feed, $item, $contact = array()) {
 
 	// look for a photo. We should check media size and find the best one,
 	// but for now let's just find any author photo
+	// Additionally we look for an alternate author link. On OStatus this one is the one we want.
+
+	// Search for ostatus conversation url
+	$authorlinks = $item->feed->data["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["feed"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["author"][0]["child"]["http://www.w3.org/2005/Atom"]["link"];
+	if (is_array($authorlinks)) {
+		foreach ($authorlinks as $link) {
+			$linkdata = array_shift($link["attribs"]);
+
+			if ($linkdata["rel"] == "alternate")
+				$res["author-link"] = $linkdata["href"];
+		};
+	}
 
 	$rawauthor = $item->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10,'author');
 
 	if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
 		$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
 		foreach($base as $link) {
+			if($link['attribs']['']['rel'] === 'alternate')
+				$res['author-link'] = unxmlify($link['attribs']['']['href']);
+
 			if(!x($res, 'author-avatar') || !$res['author-avatar']) {
 				if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
 					$res['author-avatar'] = unxmlify($link['attribs']['']['href']);
@@ -828,7 +843,7 @@ function get_atom_elements($feed, $item, $contact = array()) {
 		logger('get_atom_elements: Looking for status.net repeated message');
 
 		$message = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["content"][0]["data"];
-		$orig_uri = $child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["id"][0]["data"];
+		$orig_id = ostatus_convert_href($child["http://activitystrea.ms/spec/1.0/"]["object"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10]["id"][0]["data"]);
 		$author = $child[SIMPLEPIE_NAMESPACE_ATOM_10]["author"][0]["child"][SIMPLEPIE_NAMESPACE_ATOM_10];
 		$uri = $author["uri"][0]["data"];
 		$name = $author["name"][0]["data"];
@@ -836,10 +851,10 @@ function get_atom_elements($feed, $item, $contact = array()) {
 		$avatar = $avatar["href"];
 
 		if (($name != "") and ($uri != "") and ($avatar != "") and ($message != "")) {
-			logger('get_atom_elements: fixing sender of repeated message.');
+			logger('get_atom_elements: fixing sender of repeated message. '.$orig_id, LOGGER_DEBUG);
 
 			if (!intval(get_config('system','wall-to-wall_share'))) {
-				$prefix = share_header($name, $uri, $avatar, "", "", $orig_uri);
+				$prefix = share_header($name, $uri, $avatar, "", "", $orig_link);
 
 				$res["body"] = $prefix.html2bbcode($message)."[/share]";
 			} else {
@@ -866,6 +881,9 @@ function get_atom_elements($feed, $item, $contact = array()) {
 			if ($conversation["rel"] == "ostatus:conversation") {
 				$res["ostatus_conversation"] = ostatus_convert_href($conversation["href"]);
 				logger('get_atom_elements: found conversation url '.$res["ostatus_conversation"]);
+			} elseif ($conversation["rel"] == "alternate") {
+				$res["plink"] = $conversation["href"];
+				logger('get_atom_elements: found plink '.$res["plink"]);
 			}
 		};
 	}
@@ -2212,6 +2230,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 		return;
 	}
 
+	// Test - remove before flight
+//	if ($contact['network'] === NETWORK_OSTATUS) {
+//		$tempfile = tempnam(get_temppath(), "ostatus");
+//		file_put_contents($tempfile, $xml);
+//	}
+
 	$feed = new SimplePie();
 	$feed->set_raw_data($xml);
 	if($datedir)
diff --git a/include/ostatus_conversation.php b/include/ostatus_conversation.php
index a03330a820..f40c4827b9 100644
--- a/include/ostatus_conversation.php
+++ b/include/ostatus_conversation.php
@@ -139,30 +139,15 @@ function complete_conversation($itemid, $conversation_url, $only_add_conversatio
 
 		logger("Got id ".$single_conv->id, LOGGER_DEBUG);
 
-		//if (!isset($single_conv->id) AND isset($single_conv->object->id))
-		//	$single_conv->id = $single_conv->object->id;
-		//elseif (!isset($single_conv->id) AND isset($single_conv->object->url))
-		//	$single_conv->id = $single_conv->object->url;
-
 		$plink = ostatus_convert_href($single_conv->id);
 		if (isset($single_conv->object->url))
 			$plink = ostatus_convert_href($single_conv->object->url);
 
 		logger("Got url ".$plink, LOGGER_DEBUG);
 
-		//if (isset($single_conv->provider->url) AND isset($single_conv->statusnet_notice_info->local_id))
-		//	$plink = $single_conv->provider->url."notice/".$single_conv->statusnet_notice_info->local_id;
-		//elseif (isset($single_conv->provider->url) AND isset($single_conv->statusnet->notice_info->local_id))
-		//	$plink = $single_conv->provider->url."notice/".$single_conv->statusnet->notice_info->local_id;
-		//elseif (isset($single_conv->provider->url) AND isset($single_conv->status_net->notice_info->local_id))
-		//	$plink = $single_conv->provider->url."notice/".$single_conv->status_net->notice_info->local_id;
-
 		if (@!$single_conv->id)
 			continue;
 
-		//logger("OStatus conversation id ".$single_conv->id, LOGGER_DEBUG);
-		//logger("OStatus conversation data ".print_r($single_conv, true), LOGGER_DEBUG);
-
 		if ($first_id == "") {
 			$first_id = $single_conv->id;
 

From 5990d62b06c1de259e6844341c9de1c191e5a5ac Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Thu, 28 May 2015 16:15:48 +0200
Subject: [PATCH 20/20] use z_root

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

diff --git a/mod/allfriends.php b/mod/allfriends.php
index b73c55c226..c32a05a2ce 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -23,7 +23,7 @@ function allfriends_content(&$a) {
 	$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
                 '$name' => $c[0]['name'],
                 '$photo' => $c[0]['photo'],
-                'url' => $a->get_baseurl() . '/contacts/' . $cid
+                'url' => z_root() . '/contacts/' . $cid
                 ));
 
         if(! x($a->page,'aside'))
diff --git a/mod/common.php b/mod/common.php
index 6a1bf4e31b..a4320f9eb9 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -31,12 +31,12 @@ function common_content(&$a) {
 	$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
                 '$name' => $c[0]['name'],
                 '$photo' => $c[0]['photo'],
-                'url' => $a->get_baseurl() . '/contacts/' . $cid
+                'url' => z_root() . '/contacts/' . $cid
                 ));
 
         if(! x($a->page,'aside'))
                 $a->page['aside'] = '';
-        $a->page['aside'] .= $vcard_widget;	
+        $a->page['aside'] .= $vcard_widget;
 
 	if(! count($c))
 		return;